diff --git a/ChangeLog b/ChangeLog
index fddc5fa7c..ed2a6bd67 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailListView.m ([UIxMailListView
+	-hasMessageAttachment]): consider an attachment any content that
+	has a non-nil disposition.
+
 	* SoObjects/SOGo/SOGoParentFolder.m ([SOGoParentFolder
 	-newFolderWithName:nameandNameInContainer:newNameInContainer]):
 	fixed method to make use of the parameters instead of the useless
diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index ed4d74f41..13cf5fc47 100644
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -221,8 +221,7 @@
 	= [[parts objectsForKey: @"disposition"] objectEnumerator];
       while (!hasAttachment
 	     && (currentDisp = [dispositions nextObject]))
-	hasAttachment = ([[currentDisp objectForKey: @"type"]
-			   isEqualToString: @"ATTACHMENT"]);
+	  hasAttachment = ([currentDisp objectForKey: @"type"]);
     }
 
   return hasAttachment;