diff --git a/NEWS b/NEWS
index 8a1dd9917..5d8039102 100644
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,7 @@ Enhancements
  - updated CKEditor to version 4.3.0 and added tab module
 
 Bug fixes
- -
+ - put the text part before the HTML part when composing mail to fix a display issue with Thunderbird (#2512)
 
 2.1.1a (2013-11-22)
 -------------------
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 4a9ea4ece..2e0da59d7 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -1129,11 +1129,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];
@@ -1343,11 +1343,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);