From 199c9d92373e91abc09f9dad6603f5e0e9bde93d Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 27 Jul 2016 14:01:22 -0400
Subject: [PATCH] (js) Improve extraction of HTML signature

---
 NEWS                                    | 1 +
 UI/WebServerResources/UIxPreferences.js | 9 +++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index 96329d0df..37e4ee5ff 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ Enhancements
 
 Bug fixes
  - [eas] fixed long GUID issue preventing sometimes synchronisation (#3460)
+ - [web] improved extraction of HTML signature in Preferences module
 
 2.3.13 (2016-07-06)
 -------------------
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index a15e1a933..cda69eba5 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -1,3 +1,5 @@
+/* -*- Mode: javascript; indent-tabs-mode: nil; js-indent-level: 4; -*- */
+
 var filters = [];
 var mailAccounts = null;
 var dialogs = {};
@@ -887,8 +889,11 @@ function displayAccountSignature(mailAccount) {
                     ? mailAccount["identities"][0]
                     : {} );
     var value = identity["signature"];
-    if (value && value.length > 0)
-        value = value.stripTags().unescapeHTML().replace(/^[ \n\r]*/, "");
+    var element;
+    if (value && value.length > 0) {
+        element = new Element('div').update(value);
+        value = element.allTextContent().unescapeHTML().replace(/^[ \n\r]*/, "");
+    }
     if (value && value.length > 0) {
         if (value.length < 30) {
             actSignatureValue = value;