diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index 28c45c96b..2a723ba1a 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -527,13 +527,12 @@
       var dom = document.createElement("DIV");
       if(isHtml){
         dom.innerHTML = encodeEntities ? data.encodeEntities() : data;
+        var markInstance = new Mark(dom);
+        markInstance.mark(this.$mailbox.getHighlightWords());
       }
       else{
         dom.textContent = encodeEntities ? data.encodeEntities() : data;
       }
-
-      var markInstance = new Mark(dom);
-      markInstance.mark(this.$mailbox.getHighlightWords());
       data = dom.innerHTML;
       dom.remove();
     } else if (encodeEntities) {