Fix bug where signature could have been inserted twice after plain-to-html switch (#1490239)

CHANGELOG

@@ -16,6 +16,7 @@ CHANGELOG Roundcube Webmail
 - Fix bug where drafts list wasn't refreshed after draft message was sent from another window (#1490238)
 - Fix keyboard navigation and css in datepicker widget across many Firefox versions
 - Fix false warning when opening attached text/plain files (#1490241)
+- Fix bug where signature could have been inserted twice after plain-to-html switch (#1490239)
 
 RELEASE 1.1-rc
 --------------

program/js/editor.js

@@ -213,8 +213,10 @@ function rcube_text_editor(config, id)
       content = input.val();
 
       // replace current text signature with temp mark
-      if (is_sig)
-        content = content.replace(signature.text, sig_mark);
+      if (is_sig) {
+        content = content.replace(/\r\n/, "\n");
+        content = content.replace(signature.text.replace(/\r\n/, "\n"), sig_mark);
+      }
 
       var init_editor = function(data) {
         // replace signature mark with html version of the signature