diff --git a/UI/MailerUI/UIxMailAccountActions.m b/UI/MailerUI/UIxMailAccountActions.m
index 2f9911ee8..5f1ab0c2a 100644
--- a/UI/MailerUI/UIxMailAccountActions.m
+++ b/UI/MailerUI/UIxMailAccountActions.m
@@ -209,11 +209,11 @@
 
 - (WOResponse *) composeAction
 {
-  SOGoDraftsFolder *drafts;
+  NSString *urlBase, *url, *value, *signature, *nl;
   SOGoDraftObject *newDraftMessage;
-  NSString *urlBase, *url, *value, *signature;
-  id mailTo;
   NSMutableDictionary *headers;
+  SOGoDraftsFolder *drafts;
+  id mailTo;
   BOOL save;
 
   drafts = [[self clientObject] draftsFolderInContext: context];
@@ -246,8 +246,10 @@
   signature = [[self clientObject] signature];
   if ([signature length])
     {
+      nl = ([[[[context activeUser] userDefaults] mailComposeMessageType] isEqualToString: @"html"] ? @"<br/>" : @"\n");
+
       [newDraftMessage
-	setText: [NSString stringWithFormat: @"\n\n-- \n%@", signature]];
+	setText: [NSString stringWithFormat: @"%@%@-- %@%@", nl, nl, nl, signature]];
       save = YES;
     }
   if (save)
diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index 04cbd629c..037bb4bb1 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -141,6 +141,7 @@
 "messageforward_inline" = "Inline";
 "messageforward_attached" = "As Attachment";
 
+"When replying to a message:" = "When replying to a message:";
 "replyplacement_above" = "Start my reply above the quote";
 "replyplacement_below" = "Start my reply below the quote";
 "And place my signature" = "And place my signature";
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index ccae9b6d1..52c34b9c1 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -223,7 +223,7 @@
                     const:name="messageForwarding"
                     string="itemMessageForwardingText"
                     selection="userMessageForwarding"/></dd>
-              <dt></dt>
+              <dt><var:string label:value="When replying to a message:"/></dt>
               <dd><var:popup list="replyPlacementList" item="item"
                     const:id="replyPlacementList"
                     const:name="replyPlacementList"