From d4e01a83a07b2a365278c78f0d841cfe40ff1c64 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 4 Feb 2016 11:36:26 -0500
Subject: [PATCH] Handle broken messages with no date

Fixes #3498
---
 UI/MailerUI/UIxMailView.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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]]))