diff --git a/include/text.php b/include/text.php
index 097b02bbc..599c5d445 100644
--- a/include/text.php
+++ b/include/text.php
@@ -972,6 +972,7 @@ function smilies($s, $sample = false) {
|| (local_user() && intval(get_pconfig(local_user(),'system','no_smilies'))))
return $s;
+
$s = preg_replace_callback('{<(pre|code)>.*?\1>}ism','smile_shield',$s);
$s = preg_replace_callback('/<[a-z]+ .*?>/ism','smile_shield',$s);
@@ -1046,8 +1047,8 @@ function smilies($s, $sample = false) {
'
',
'
',
'
',
- 'red
matrix',
- 'red
matrix',
+ 'red
matrix',
+ 'red
matrix',
'red
matrix'
);