- Fix adding signature separator in html mode (#1485350)

git-svn-id: https://svn.roundcube.net/trunk@2379 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 7 insertions, 0 deletions

diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 7f1e7241b..51cce5df3 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -2210,6 +2210,13 @@ function rcube_webmail()
 	  {
 	  newsig = this.env.signatures[id]['text'];
 	  htmlsig = this.env.signatures[id]['is_html'];
+        
+	  if (newsig) {
+	    if (htmlsig && this.env.signatures[id]['plain_text'].indexOf('-- ')!=0)
+              newsig = '<p>-- </p>' + newsig;
+	    else if (!htmlsig && newsig.indexOf('-- ')!=0)
+              newsig = '-- \n' + newsig;
+	    }
 	  }
 
         if (htmlsig)