diff --git a/common.inc.php b/common.inc.php
index c1265b0..2a3d643 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -1274,8 +1274,15 @@ function getTextFromHtml($html) {
 	$text=eregi_replace('<br[[:space:]]*/?[[:space:]]*>',chr(13).chr(10),$text);
 	//and strip the rest of the tags
 	$text=strip_tags($text);
-	//and replace &nbsp;
+
+	//a few common html entities
+	//replace &amp; with & first, so multiply-encoded entities will decode (like "&amp;#160;")
+	$text=str_replace("&amp;","&",$text);
 	$text=str_replace("&nbsp;"," ",$text);
+	$text=str_replace("&#160;"," ",$text);
+	$text=str_replace("&lt;","<",$text);
+	$text=str_replace("&gt;",">",$text);
+
 	return $text;
 }