diff --git a/ChangeLog b/ChangeLog
index 2278ba7c1..aaebeac99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-11-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailListView.m ([UIxMailListView
+	-hasMessageAttachment]): initialize hasAttachment with "NO" to
+	avoid false positives.
+
 	* OGoContentStore/OCSiCalFieldExtractor.m ([OCSiCalFieldExtractor -extractQuickFieldsFromEvent:_event])
 	([OCSiCalFieldExtractor -extractQuickFieldsFromTodo:_task]):
 	set title to an empty string where the event/task summary is null.
diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index 6f7767d4c..2ccc79b26 100644
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -208,6 +208,8 @@
   NSDictionary *currentDisp;
   BOOL hasAttachment;
 
+  hasAttachment = NO;
+
   parts = [[message objectForKey: @"body"] objectForKey: @"parts"];
   if ([parts count] > 1)
     {
@@ -218,8 +220,6 @@
 	hasAttachment = ([[currentDisp objectForKey: @"type"]
 			   isEqualToString: @"ATTACHMENT"]);
     }
-  else
-    hasAttachment = NO;
 
   return hasAttachment;
 }