From cd938f4654271a8417571e703e9b35f4875ab2b8 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 18 Aug 2008 15:23:30 +0000
Subject: [PATCH] Monotone-Parent: 8dfe1852810c498475191f263ec7a309097f9881
 Monotone-Revision: ca86ebb874f81019a9e4dfc6bc2ab4782b5b814b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-08-18T15:23:30
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                                     | 6 ++++++
 UI/MailPartViewers/UIxMailPartMessageViewer.m | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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: @", "];