diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index 2a723ba1a..565c14736 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -531,7 +531,7 @@
         markInstance.mark(this.$mailbox.getHighlightWords());
       }
       else{
-        dom.textContent = encodeEntities ? data.encodeEntities() : data;
+        dom.textContent = data;
       }
       data = dom.innerHTML;
       dom.remove();