diff --git a/ChangeLog b/ChangeLog
index 0a75e5fc2..a6879aaef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* UI/MailPartViewers/UIxMailRenderingContext.m: Display .tiff as
 	attachments, some browsers don't support tiff.
+	* SoObjects/Mailer/SOGoDraftObject.m: Fixed content type for multipart
+	messages.
 
 2009-07-07  Francis Lachapelle  <flachapelle@inverse.ca>
 
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 9b94914fa..ca308136c 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -851,6 +851,9 @@ static BOOL        showTextAttachmentsInline  = NO;
   */
   NGMutableHashMap *map;
   NGMimeBodyPart   *bodyPart;
+  NSUserDefaults *ud;
+
+  ud = [[context activeUser] userDefaults];
   
   /* prepare header of body part */
 
@@ -859,7 +862,13 @@ static BOOL        showTextAttachmentsInline  = NO;
   // TODO: set charset in header!
   [map setObject: @"text/plain" forKey: @"content-type"];
   if (text)
-    [map setObject: contentTypeValue forKey: @"content-type"];
+    {
+      if ([[ud stringForKey: @"ComposeMessagesType"] isEqualToString: @"html"])
+             [map setObject: htmlContentTypeValue
+                     forKey: @"content-type"];
+      else
+        [map setObject: contentTypeValue forKey: @"content-type"];
+    }
 
 //   if ((body = text) != nil) {
 //     if ([body isKindOfClass: [NSString class]]) {