From f0dfe37a55a692bc505708782d3c70ccb5b2951b Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 30 May 2014 08:41:42 -0400
Subject: [PATCH] Avoid crashing when forwarding mails with no Subject header

---
 NEWS                               | 10 ++++++++++
 SoObjects/Mailer/SOGoDraftObject.m |  9 +++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 5f2502ed7..4db2f7adf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+2.2.5 (2014-XX-XX)
+------------------
+
+New features
+
+Enhancements
+
+Bug fixes
+ - avoid crashing when we forward an email with no Subject header
+
 2.2.4 (2014-05-29)
 ------------------
 
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index ac6aaeed4..585d3baa1 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -1602,10 +1602,11 @@ static NSString    *userAgent      = nil;
   /* add subject */
   if ([(s = [headers objectForKey: @"subject"]) length] > 0)
     [map setObject: [s asQPSubjectString: @"utf-8"]
-	 forKey: @"subject"];
-
-  [map setObject: [headers objectForKey: @"message-id"]
-       forKey: @"message-id"];
+            forKey: @"subject"];
+  
+  if ([(s = [headers objectForKey: @"message-id"]) length] > 0)
+    [map setObject: s
+            forKey: @"message-id"];
 
   /* add standard headers */
   dateString = [[NSCalendarDate date] rfc822DateString];