diff --git a/ChangeLog b/ChangeLog
index c2dec5f4a..40e35f914 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-18  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* UI/MailPartViewers/UIxMailPartMessageViewer.m
+	([UIxMailPartMessageViewer -formattedComponents:components]):
+	don't report nil components.
+
 2008-08-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/iCalEventChanges+SOGo.m
diff --git a/UI/MailPartViewers/UIxMailPartMessageViewer.m b/UI/MailPartViewers/UIxMailPartMessageViewer.m
index 123941cbe..04cb6aa16 100644
--- a/UI/MailPartViewers/UIxMailPartMessageViewer.m
+++ b/UI/MailPartViewers/UIxMailPartMessageViewer.m
@@ -141,7 +141,8 @@
   for (count = 0; count < max; count++)
     {
       component = [[components objectAtIndex: count] email];
-      [formattedComponents addObject: component];
+      if (component)
+	[formattedComponents addObject: component];
     }
 
   return [formattedComponents componentsJoinedByString: @", "];