diff --git a/modules/core/message_functions.php b/modules/core/message_functions.php
index 1eaac26d5..6ab2664a0 100644
--- a/modules/core/message_functions.php
+++ b/modules/core/message_functions.php
@@ -449,8 +449,7 @@ class HTMLToText {
 
     function __construct($html) {
         $doc = new DOMDocument();
-        $html = mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8');
-        $doc->loadHTML(htmlentities($html, ENT_QUOTES, 'UTF-8'));
+        $doc->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
         if (trim($html) && $doc->hasChildNodes()) {
             $this->parse_nodes($doc->childNodes);
         }