diff --git a/workflow/engine/methods/mails/emailsAjax.php b/workflow/engine/methods/mails/emailsAjax.php
index d8bd64e2b..d83cf5d07 100644
--- a/workflow/engine/methods/mails/emailsAjax.php
+++ b/workflow/engine/methods/mails/emailsAjax.php
@@ -133,8 +133,6 @@ switch ($req) {
             $row = $result->getRow();
             $row['APP_MSG_STATUS'] = ucfirst($row['APP_MSG_STATUS']);
             $row['APP_MSG_DATE'] = DateTime::convertUtcToTimeZone($row['APP_MSG_DATE']);
-            $row['APP_MSG_TO'] = htmlentities($row['APP_MSG_TO'], ENT_HTML5, "UTF-8");
-            $row['APP_MSG_ERROR'] = htmlentities($row['APP_MSG_ERROR'], ENT_HTML5, "UTF-8");
 
             switch ($filterBy) {
                 case 'CASES':
diff --git a/workflow/engine/templates/mails/emailList.js b/workflow/engine/templates/mails/emailList.js
index 0a9650bf6..0600f8f0e 100644
--- a/workflow/engine/templates/mails/emailList.js
+++ b/workflow/engine/templates/mails/emailList.js
@@ -54,6 +54,9 @@ Ext.onReady(function(){
                 data = PMExt.emailConst.numberColumn.defaultValue;
             }
         }
+        if (metadata.id === 'APP_MSG_TO' || metadata.id === 'APP_MSG_ERROR') {
+            return Ext.util.Format.htmlEncode(data);
+        }
         var new_text = metadata.style.split(';');
         var style = '';
         for (var i = 0; i < new_text.length -1 ; i++) {