diff --git a/ChangeLog b/ChangeLog
index 4255b1745..775458aa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-09  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* SoObjects/Mailer/SOGoDraftObject.m - don't encode message/rfc822
+	parts in base64 - it's not allowed.
+
 2012-05-08  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/Contacts/UIxContactView.m (-primaryEmail): in the mailto
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index b751f8171..3d0c540ee 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -1181,11 +1181,6 @@ static NSString    *userAgent      = nil;
     content = [[NSData alloc] initWithContentsOfMappedFile:p];
     [content autorelease];
 
-    content = [content dataByEncodingBase64];
-    [map setObject: @"base64" forKey: @"content-transfer-encoding"];
-    [map setObject:[NSNumber numberWithInt:[content length]] 
-	 forKey: @"content-length"];
-    
     /* Note: the -init method will create a temporary file! */
     body = [[NGMimeFileData alloc] initWithBytes:[content bytes]
                                           length:[content length]];