diff --git a/ChangeLog b/ChangeLog
index 2dc5c6932..187d01e5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-02-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoMailObject.m (-lookupInfoForBodyPart:):
+	accept "text" as path parameter and return the main bodyStructure
+	in that case.
+
 	* OpenChange/MAPIStoreMailMessageTable.m
 	(-getChildProperty:forKey:withTag:): enhanced treatment of
 	PR_BODY_UNICODE to accept text/plain parts when more than one is
diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m
index 4319c50b5..b8394823c 100644
--- a/SoObjects/Mailer/SOGoMailObject.m
+++ b/SoObjects/Mailer/SOGoMailObject.m
@@ -349,6 +349,10 @@ static BOOL debugSoParts       = NO;
     return nil;
   }
 
+  if ([_path isEqualToString: @"text"]) {
+    return info;
+  }
+
   /* ensure array argument */
   
   if ([_path isKindOfClass:[NSString class]]) {