diff --git a/include/class.mailparse.php b/include/class.mailparse.php
index f56006fa9c1e35c88d67165302a7797f43f562d7..8d162e52a6d9182b6cca5284ff061538b4124ff9 100644
--- a/include/class.mailparse.php
+++ b/include/class.mailparse.php
@@ -140,7 +140,7 @@ class Mail_Parse {
                 //Cleanup the html.
                 $body=str_replace("</DIV><DIV>", "\n", $body);                        
                 $body=str_replace(array("<br>", "<br />", "<BR>", "<BR />"), "\n", $body);
-                $body=Format::striptags($body);
+                $body=Format::striptags(Format::html($body));
             }
         }
         return $body;