diff --git a/NEWS b/NEWS
index 47e378896..e0fbbe3a0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+2.2.12a (2014-12-19)
+--------------------
+
+Bug fixes
+ - fix empty HTML mails being sent (#3034)
+
 2.2.12 (2014-12-18)
 -------------------
 
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index c70e56c09..6967a6262 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -1217,13 +1217,13 @@ static NSString    *userAgent      = nil;
   
   if (!isHTML)
     {
-      [map setObject: contentTypeValue  forKey: @"content-type"];
+      [message setHeader: contentTypeValue  forKey: @"content-type"];
       body = text;
     }
   else
     {
       body = [[[NGMimeMultipartBody alloc] initWithPart: message] autorelease];
-      [map addObject: MultiAlternativeType forKey: @"content-type"];
+      [message setHeader: MultiAlternativeType forKey: @"content-type"];
 
       // Get the text part from it and add it
       [body addBodyPart: [self plainTextBodyPartForText]];