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;