--- Message.pm.old	2004-02-21 18:00:37.000000000 +0000
+++ Message.pm	2004-02-24 09:42:31.000000000 +0000
@@ -1698,13 +1698,14 @@
   open($textfh, $reportname)
     or MailScanner::Log::WarnLog("Cannot open message file %s, %s",
                                  $reportname, $!);
-  while(<$textfh>) {
-    chomp;
-    s#"#\\"#g; # Escape any " characters
-    s#@#\\@#g; # Escape any @ characters
+  my $line;
+  while(defined ($line = <$textfh>)) {
+    chomp $line;
+    $line =~ s/"/\\"/g; # Escape any " characters
+    $line =~ s/@/\\@/g; # Escape any @ characters
     # Untainting joy...
-    /(.*)/;
-    $result = eval "\"$1\"";
+    $line =~ $1 if /(.*)/;
+    $result = eval "\"$line\"";
     $output .= $result . "\n";
   }
   $output;