diff --git a/UI/MailerUI/UIxMailView.m b/UI/MailerUI/UIxMailView.m
index 2929ea111..f51a0536e 100644
--- a/UI/MailerUI/UIxMailView.m
+++ b/UI/MailerUI/UIxMailView.m
@@ -289,12 +289,13 @@ static NSString *mailETag = nil;
     }
 
   data = [NSMutableDictionary dictionaryWithObjectsAndKeys:
-                       [self formattedDate], @"date",
                        [self attachmentAttrs], @"attachmentAttrs",
                        [self shouldAskReceipt], @"shouldAskReceipt",
                        [NSNumber numberWithBool: [self mailIsDraft]], @"isDraft",
                        [[self contentViewerComponent] renderedPart], @"parts",
                        nil];
+  if ([self formattedDate])
+    [data setObject: [self formattedDate] forKey: @"date"];
   if ([self messageSubject])
     [data setObject: [self messageSubject] forKey: @"subject"];
   if ((addresses = [addressFormatter dictionariesForArray: [co fromEnvelopeAddresses]]))