diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index bf9a5c43f..5907fb281 100755
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -2287,10 +2287,10 @@ sub safe_html
 {
 local $html = $_[0];
 local $bodystuff;
-if ($html =~ s/^([\000-\377]*?)<BODY([^>]*)>/$1/i) {
+if ($html =~ s/^[\000-\377]*?<BODY([^>]*)>//i) {
 	$bodystuff = $1;
 	}
-$html =~ s/<\/BODY>([\000-\377]*)$/$1/i;
+$html =~ s/<\/BODY>[\000-\377]*$//i;
 $html =~ s/<base[^>]*>//i;
 $html = &filter_javascript($html);
 $html = &safe_urls($html);