diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 32176bff17..a6cea8ae4e 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -127,7 +127,12 @@ class html
 	function htmlspecialchars($str)
 	{
 		// add @ by lkneschke to supress warning about unknown charset
-		return @htmlspecialchars($str,ENT_COMPAT,$this->charset);
+		$str = @htmlspecialchars($str,ENT_COMPAT,$this->charset);
+		
+		// we need '&#' unchanged, so we translate it back
+		$str = str_replace('&#','&#',$str);
+
+		return $str;
 	}
 
 	/*!