diff --git a/SoObjects/Mailer/SOGoMailForward.m b/SoObjects/Mailer/SOGoMailForward.m
index 52159376e..3eb5d8980 100644
--- a/SoObjects/Mailer/SOGoMailForward.m
+++ b/SoObjects/Mailer/SOGoMailForward.m
@@ -34,17 +34,13 @@
 
 - (id) init
 {
+  SOGoUserDefaults *ud;
+
   if ((self = [super init]))
     {
-      SOGoUserDefaults *ud;
       ud = [[context activeUser] userDefaults];
-      
-      // Backward comptability with <= 1.1.0 (ComposeMessagesType)
-      if ([ud objectForKey: @"ComposeMessagesType"])
-	htmlComposition = [[ud objectForKey: @"ComposeMessagesType"] isEqualToString: @"html"];
-      else
-	htmlComposition = [[ud objectForKey: @"SOGoMailComposeMessageType"] isEqualToString: @"html"];
-
+      htmlComposition
+        = [[ud mailComposeMessageType] isEqualToString: @"html"];
       sourceMail = nil;
       currentValue = nil;
     }