diff --git a/ChangeLog b/ChangeLog
index 82c31a3ec..582902b49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-02-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/MAPIStoreMailMessage.m
+	(_fetchAttachmentPartsInBodyInfo:withPrefix:): detect attachment
+	parts based on the existence of the "filename" info parameter.
+
 	* OpenChange/MAPIStoreTable.m: refactored class to be used as an
 	accessor on MAPIStoreFolder or other MAPIStoreObject derivatives
 	based on a defined set of methods. Now strictly handle the sorting
diff --git a/OpenChange/MAPIStoreMailMessage.m b/OpenChange/MAPIStoreMailMessage.m
index 56c7b3322..2010a369d 100644
--- a/OpenChange/MAPIStoreMailMessage.m
+++ b/OpenChange/MAPIStoreMailMessage.m
@@ -603,12 +603,12 @@ static Class NSExceptionK;
                               withPrefix: (NSString *) keyPrefix
 {
   NSArray *parts;
-  NSString *dispType;
+  NSDictionary *parameters;
   NSUInteger count, max;
 
-  dispType = [[bodyInfo objectForKey: @"disposition"]
-                  objectForKey: @"type"];
-  if ([[dispType lowercaseString] isEqualToString: @"attachment"])
+  parameters = [[bodyInfo objectForKey: @"disposition"]
+                 objectForKey: @"parameterList"];
+  if ([[parameters objectForKey: @"filename"] length] > 0)
     {
       if ([keyPrefix length] == 0)
         keyPrefix = @"0";