diff --git a/libraries/decorator.inc.php b/libraries/decorator.inc.php
index 65311f6b2..8f3dc1550 100644
--- a/libraries/decorator.inc.php
+++ b/libraries/decorator.inc.php
@@ -63,7 +63,7 @@ function value(&$var, &$fields, $esc = null) {
 					'<' => '&lt;', '>' => '&gt;'
 				));
 			case 'html':
-				return htmlspecialchars($val);
+				return htmlentities($val, ENT_COMPAT, 'UTF-8');
 			case 'url':
 				return urlencode($val);
 		}