--- webmail_plus/webmail_plus.module.orig	2009-04-22 10:35:21.000000000 -0700
+++ webmail_plus/webmail_plus.module	2009-04-22 10:36:03.000000000 -0700
@@ -1452,9 +1452,10 @@
     if(trim($line)=="") continue;
 
 
-    if(preg_match("/\t/", $line)) {
+    if(ord($line) == 9) {
       //echo "tab found\n";
-      $rs[$key] .= "\n".trim($line);
+      if($key=="") continue;
+      $rs[$key] .= "\n".htmlentities(trim($line));
       continue;
     }