diff --git a/UI/MailerUI/UIxMailListActions.m b/UI/MailerUI/UIxMailListActions.m
index ce090705a..0ee7ba64f 100644
--- a/UI/MailerUI/UIxMailListActions.m
+++ b/UI/MailerUI/UIxMailListActions.m
@@ -668,7 +668,13 @@
       [msg addObject: [self msgRowID]];
 
       // uid
-      [msg addObject: [message objectForKey: @"uid"]];
+      if ([message objectForKey: @"uid"])
+	{
+	  [msg addObject: [message objectForKey: @"uid"]];
+	  [headers addObject: msg];
+	}
+      else
+	[self logWithFormat: @"Invalid UID for message: %@", message];
       
       [headers addObject: msg];