diff --git a/ChangeLog b/ChangeLog
index f82c0b8bb..de28d39b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-02-23  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* SoObjects/Mailer/SOGoMailObject.m (-lookupInfoForBodyPart:): we
+	now compare the path with a string only if it is a string (and not
+	an array).
+
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
 	(-fixupCycleRecord:cycleRange:firstInstanceCalendarDateRange:withEventTimeZone:):
 	avoid fixing the timezone if no event timezone is defined.
diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m
index 9d1cd3d53..7db3d8d69 100644
--- a/SoObjects/Mailer/SOGoMailObject.m
+++ b/SoObjects/Mailer/SOGoMailObject.m
@@ -349,14 +349,10 @@ static BOOL debugSoParts       = NO;
     return nil;
   }
 
-  if ([_path isEqualToString: @"text"]) {
-    return info;
-  }
-
   /* ensure array argument */
   
   if ([_path isKindOfClass:[NSString class]]) {
-    if ([_path length] == 0)
+    if ([_path length] == 0 || [_path isEqualToString: @"text"])
       return info;
     
     _path = [_path componentsSeparatedByString: @"."];