diff --git a/inc/functions.php b/inc/functions.php
index caaa6894..4a0258c6 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1339,7 +1339,7 @@
 	}
 
 	function utf8tohtml($utf8) {
-		return mb_encode_numericentity($utf8, Array(0xff, 0xffff, 0, 0xffff), 'UTF-8');
+		return mb_encode_numericentity(htmlspecialchars($utf8, ENT_NOQUOTES, 'UTF-8'), Array(0xff, 0xffff, 0, 0xffff), 'UTF-8');
 	}
 
 	function buildThread($id, $return=false, $mod=false) {