diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index f86f89ef3..4ba04ac6f 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -4116,15 +4116,24 @@ class e_parser
 	function isHtml($text)
 	{
 
-		if(strpos($text,'[html]') !== false || (htmlentities($text, ENT_NOQUOTES,'UTF-8') != $text && $this->isBBcode($text) === false ) || preg_match('#(?<=<)\w+(?=[^<]*?>)#', $text))
+		if(strpos($text,'[html]'))
 		{
 			return true;
 		}
-		else
+
+		if($this->isBBcode($text))
 		{
 			return false;
 		}
 
+		if(preg_match('#(?<=<)\w+(?=[^<]*?>)#', $text))
+		{
+			return true;
+		}
+
+		return false;
+
+
 	}