- fixed html signatures replacement in text mode

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

1 files changed, 6 insertions, 2 deletions

diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index 0e5aa0183..3c5a11d74 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -2034,8 +2034,12 @@ function rcube_webmail()
       // remove the 'old' signature
       if (this.env.identity && this.env.signatures && this.env.signatures[this.env.identity])
         {
-        sig = this.env.signatures[this.env.identity]['text'];
-        if (sig.indexOf('-- ')!=0)
+        if (this.env.signatures[this.env.identity]['is_html'])
+          sig = this.env.signatures[this.env.identity]['plain_text'];
+        else
+	  sig = this.env.signatures[this.env.identity]['text'];
+        
+	if (sig.indexOf('-- ')!=0)
           sig = '-- \n'+sig;
 
         p = message.lastIndexOf(sig);