From b658faa8f27508c52a24dbff1147d8af98f863ba Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 29 Aug 2018 11:28:08 -0400 Subject: [PATCH] Fix support for SOGoMaximumMessageSizeLimit --- SoObjects/Mailer/SOGoDraftObject.m | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m index b212f30e0..c12aee115 100644 --- a/SoObjects/Mailer/SOGoDraftObject.m +++ b/SoObjects/Mailer/SOGoDraftObject.m @@ -1743,6 +1743,7 @@ static NSString *userAgent = nil; - (NSData *) mimeMessageForRecipient: (NSString *) theRecipient { NGMimeMessageGenerator *generator, *partGenerator; + NGMimeMessage *mimeMessage; NSData *certificate, *content; NGMutableHashMap *hashMap; NGMimeMessage *message; @@ -1751,8 +1752,14 @@ static NSString *userAgent = nil; // Nothing to sign or encrypt, let's generate the message and return immediately if (![self sign] && ![self encrypt]) { - generator = [[[NGMimeMessageGenerator alloc] init] autorelease]; - return [generator generateMimeFromPart: [self mimeMessageWithHeaders: nil excluding: nil extractingImages: YES bodyOnly: NO]]; + mimeMessage = [self mimeMessageWithHeaders: nil excluding: nil extractingImages: YES bodyOnly: NO]; + if (mimeMessage) + { + generator = [[[NGMimeMessageGenerator alloc] init] autorelease]; + return [generator generateMimeFromPart: mimeMessage]; + } + else + return nil; } // We'll sign and/or encrypt our message. Let's generate the actual body of the message to work with