diff --git a/ChangeLog b/ChangeLog
index e386e4299..e95eeeeae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,12 @@
 	a value of SOGoSMTPServer. This fixes
 	http://www.scalableogo.org/bugs/view.php?id=201
 
+	* SoObjects/Mailer/SOGoMailForward.m (init):
+	Now consider SOGoMailComposeMessageType instead
+	of ComposeMessagesType when checking if we are
+	using HTML mails composition mode. This fixes
+	http://www.scalableogo.org/bugs/view.php?id=280
+
 2009-12-25  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* Tools/SOGoToolBackup.m (-fetchUserIDs:):
diff --git a/SoObjects/Mailer/SOGoMailForward.m b/SoObjects/Mailer/SOGoMailForward.m
index f2a127f12..70683503e 100644
--- a/SoObjects/Mailer/SOGoMailForward.m
+++ b/SoObjects/Mailer/SOGoMailForward.m
@@ -38,7 +38,12 @@
     {
       SOGoUserDefaults *ud;
       ud = [[context activeUser] userDefaults];
-      htmlComposition = [[ud objectForKey: @"ComposeMessagesType"] isEqualToString: @"html"];
+      
+      // Backward comptability with <= 1.1.0 (ComposeMessagesType)
+      if ([ud objectForKey: @"ComposeMessagesType"])
+	 htmlComposition = [[ud objectForKey: @"ComposeMessagesType"] isEqualToString: @"html"];
+      else
+	htmlComposition = [[ud objectForKey: @"SOGoMailComposeMessageType"] isEqualToString: @"html"];
 
       sourceMail = nil;
       currentValue = nil;