diff --git a/ChangeLog b/ChangeLog
index 0ba503a8a..ea89b892d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-06  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/UIxPreferences.js
+	(displayAccountSignature): fixed an issue with an HTML signature
+	that start with a paragraph tag.
+
 2011-05-05  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* UI/MailerUI/UIxMailAccountActions.m - fixed an issue
diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js
index eb247bfc1..417a08e4c 100644
--- a/UI/WebServerResources/UIxPreferences.js
+++ b/UI/WebServerResources/UIxPreferences.js
@@ -670,9 +670,7 @@ function displayAccountSignature(mailAccount) {
     var identity = (mailAccount["identities"]
                     ? mailAccount["identities"][0]
                     : {} );
-    var value = identity["signature"].replace(/^[ \n\r]*$/, "");
-    if (CKEDITOR.instances["signature"])
-	value = value.stripTags().unescapeHTML();
+    var value = identity["signature"].stripTags().unescapeHTML().replace(/^[ \n\r]*/, "");
     if (value && value.length > 0) {
         if (value.length < 30) {
             actSignatureValue = value;