diff --git a/include/text.php b/include/text.php
index f5c440e4a..4cb7a1d5e 100755
--- a/include/text.php
+++ b/include/text.php
@@ -891,6 +891,7 @@ function smilies($s, $sample = false) {
 
 	$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_encode',$s);
 	$s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_encode',$s);
+	$s = preg_replace_callback('/<(.*?)>/s','smile_encode',$s);
 
 	$texts =  array( 
 		'&lt;3', 
@@ -983,6 +984,7 @@ function smilies($s, $sample = false) {
 
 	$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','smile_decode',$s);
 	$s = preg_replace_callback('/<code>(.*?)<\/code>/ism','smile_decode',$s);
+	$s = preg_replace_callback('/<(.*?)>/s','smile_decode',$s);
 
 	return $s;