diff --git a/include/html2bbcode.php b/include/html2bbcode.php
index 80841375e..31ede1a8e 100644
--- a/include/html2bbcode.php
+++ b/include/html2bbcode.php
@@ -17,8 +17,7 @@ $htmltags = array(
'/\(.*?)\<\/strong\>/is',
'/\(.*?)\<\/a\>/is',
'/\(.*?)\<\/code\>/is',
- '/\(.*?)\<\/font\>/is',
- '/\(.*?)\<\/font\>/is',
+ '/\(.*?)\<\/span\>/is',
'/\(.*?)\<\/blockquote\>/is',
);
@@ -37,7 +36,6 @@ $bbtags = array(
'[url=$1]$3[/url]',
'[code]$1[/code]',
'[color="$1"]$2[/color]',
- '[color="$1"]$2[/color]',
'[quote]$1[/quote]',
);