From 638dbc904c5900acc2b73a6439a7702bc0e5f20e Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 18 Mar 2016 12:54:00 -0400
Subject: [PATCH] (fix) handle empty body data correctly (fixes #3581)

---
 SoObjects/Mailer/SOGoDraftObject.m | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 96bf80f8e..1901e35a7 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -832,7 +832,10 @@ static NSString    *userAgent      = nil;
   while ((currentKey = [attachmentKeys nextObject]))
     {
       body = [fetch objectForKey: [currentKey lowercaseString]];
-      [bodies addObject: [body objectForKey: @"data"]];
+      if (body)
+        [bodies addObject: [body objectForKey: @"data"]];
+      else
+        [bodies addObject: [NSData data]];
     }
 
   return bodies;