diff --git a/include/bbcode.php b/include/bbcode.php
index d83cd35814..97e9d76f83 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -3,7 +3,24 @@
 require_once("include/oembed.php");
 require_once('include/event.php');
 
+function cleancss($input) {
 
+	$cleaned = "";
+
+	$input = strtolower($input);
+
+	for ($i = 0; $i < strlen($input); $i++) {
+		$char = substr($input, $i, 1);
+
+		if (($char >= "a") and ($char <= "z"))
+			$cleaned .= $char;
+
+		if (!(strpos(" #;:0123456789", $char) === false))
+			$cleaned .= $char;
+	}
+
+	return($cleaned);
+}
 
 function stripcode_br_cb($s) {
 	return '[code]' . str_replace('<br />', '', $s[1]) . '[/code]';
diff --git a/include/items.php b/include/items.php
index 701a7ada7e..1a664b3010 100755
--- a/include/items.php
+++ b/include/items.php
@@ -378,10 +378,12 @@ function title_is_body($title, $body) {
 
 	$title = strip_tags($title);
 	$title = trim($title);
+	$title = html_entity_decode($title, ENT_QUOTES, 'UTF-8');
 	$title = str_replace(array("\n", "\r", "\t", " "), array("","","",""), $title);
 
 	$body = strip_tags($body);
 	$body = trim($body);
+	$body = html_entity_decode($body, ENT_QUOTES, 'UTF-8');
 	$body = str_replace(array("\n", "\r", "\t", " "), array("","","",""), $body);
 
 	if (strlen($title) < strlen($body))