diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m
index b6dd7054d..b0cb27cbf 100644
--- a/SoObjects/Mailer/SOGoMailObject.m
+++ b/SoObjects/Mailer/SOGoMailObject.m
@@ -253,13 +253,13 @@ static BOOL debugSoParts       = NO;
 
 - (id) bodyStructure
 {
-  id body;
+  id bodyStructure;
 
-  body = [[self fetchCoreInfos] valueForKey: @"body"];
+  bodyStructure = [[self fetchCoreInfos] valueForKey: @"bodystructure"];
   if (debugBodyStructure)
-    [self logWithFormat: @"BODY: %@", body];
+    [self logWithFormat: @"BODYSTRUCTURE: %@", bodyStructure];
 
-  return body;
+  return bodyStructure;
 }
 
 - (NGImap4Envelope *) envelope
@@ -746,7 +746,7 @@ static BOOL debugSoParts       = NO;
   if ([prefix hasSuffix: @"/"])
     prefix = [prefix substringToIndex: [prefix length] - 1];
   [self _feedAttachmentIds: attachmentIds
-	withInfos: [coreInfos objectForKey: @"body"]
+	withInfos: [coreInfos objectForKey: @"bodystructure"]
 	andPrefix: prefix];
 
   return attachmentIds;
diff --git a/UI/MailerUI/UIxMailListActions.m b/UI/MailerUI/UIxMailListActions.m
index b6c2e6e4e..55a768e97 100644
--- a/UI/MailerUI/UIxMailListActions.m
+++ b/UI/MailerUI/UIxMailListActions.m
@@ -299,7 +299,7 @@
 
   hasAttachment = NO;
 
-  parts = [[message objectForKey: @"body"] objectForKey: @"parts"];
+  parts = [[message objectForKey: @"bodystructure"] objectForKey: @"parts"];
   if ([parts count] > 1)
     {
       dispositions = [[parts objectsForKey: @"disposition"