diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js
index a1a9db694..5b25de176 100644
--- a/dev/Stores/User/Message.js
+++ b/dev/Stores/User/Message.js
@@ -507,7 +507,7 @@ export const MessageUserStore = new class {
 
 						body = Element.fromHTML('<div id="' + id + '" hidden="" class="b-text-part '
 							+ (isHtml ? 'html' : 'plain') + '">'
-							+ findEmailAndLinks(resultHtml)
+							+ (isHtml ? resultHtml : findEmailAndLinks(resultHtml))
 							+ '</div>');
 
 						if (isHtml) {