diff --git a/ChangeLog b/ChangeLog
index 250d8e3cb..3a60e3085 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-26  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/MailerUI/UIxMailListActions.m
+	(-getUIDsInFolder:withHeaders:): we check if the array of messages
+	UIDs is nil prior adding it to the returned dictionary.
+
 2011-07-25  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Mailer/SOGoMailAccount.m (-hasCapability): new proxy
diff --git a/UI/MailerUI/UIxMailListActions.m b/UI/MailerUI/UIxMailListActions.m
index e6789405f..d122bfb33 100644
--- a/UI/MailerUI/UIxMailListActions.m
+++ b/UI/MailerUI/UIxMailListActions.m
@@ -663,7 +663,8 @@
       else
         sortByThread = NO;
     }
-  [data setObject: uids forKey: @"uids"];
+  if (uids != nil)
+    [data setObject: uids forKey: @"uids"];
   [data setObject: [NSNumber numberWithBool: sortByThread] forKey: @"threaded"];
 
   // We also return the inbox quota