diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js
index 95dab0cf0..542ebf2a8 100644
--- a/dev/Common/Utils.js
+++ b/dev/Common/Utils.js
@@ -1240,17 +1240,6 @@
 		return sResult;
 	};
 
-	/**
-	 * @param {string} sPlain
-	 * @return {string}
-	 */
-	Utils.convertPlainTextToHtml = function (sPlain)
-	{
-		return sPlain.toString()
-			.replace(/&/g, '&amp;').replace(/>/g, '&gt;').replace(/</g, '&lt;')
-			.replace(/\r/g, '').replace(/\n/g, '<br />');
-	};
-
 	Utils.draggeblePlace = function ()
 	{
 		return $('<div class="draggablePlace"><span class="text"></span>&nbsp;<i class="icon-copy icon-white visible-on-ctrl"></i><i class="icon-mail icon-white hidden-on-ctrl"></i></div>').appendTo('#rl-hidden');
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index f26a8cda8..44344bdf7 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -679,7 +679,7 @@
 
 			if (!bHtml)
 			{
-				sSignature = Utils.convertPlainTextToHtml(sSignature);
+				sSignature = Utils.plainToHtml(sSignature, true);
 			}
 		}
 
@@ -935,7 +935,7 @@
 			if (bSignatureToAll && '' !== sSignature)
 			{
 				sText = this.convertSignature(sSignature, '',
-					Utils.convertPlainTextToHtml(sText), sComposeType);
+					Utils.plainToHtml(sText, true), sComposeType);
 			}
 
 			this.editor(function (oEditor) {