From 5f04b065cd50ce6615074da0d0ca47e25798b24c Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 25 Nov 2013 09:52:18 -0500 Subject: [PATCH] Mail composition: add text part before html part Fixes #2512 --- SoObjects/Mailer/SOGoDraftObject.m | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m index 9ce6b4136..ca436aa8f 100644 --- a/SoObjects/Mailer/SOGoDraftObject.m +++ b/SoObjects/Mailer/SOGoDraftObject.m @@ -1081,11 +1081,11 @@ static NSString *userAgent = nil; body = [[[NGMimeMultipartBody alloc] initWithPart: message] autorelease]; [map addObject: MultiAlternativeType forKey: @"content-type"]; + // Get the text part from it and add it + [body addBodyPart: [self plainTextBodyPartForText]]; + // Add the HTML part [body addBodyPart: [self bodyPartForText]]; - - // Get the text part from it and add it too - [body addBodyPart: [self plainTextBodyPartForText]]; } [message setBody: body]; @@ -1289,11 +1289,11 @@ static NSString *userAgent = nil; textParts = [[NGMimeMultipartBody alloc] initWithPart: part]; + // Get the text part from it and add it + [textParts addBodyPart: [self plainTextBodyPartForText]]; + // Add the HTML part [textParts addBodyPart: [self bodyPartForText]]; - - // Get the text part from it and add it too - [textParts addBodyPart: [self plainTextBodyPartForText]]; [part setBody: textParts]; RELEASE(textParts);