--- a/hs12	Fri Sep 07 13:53:21 2007 +0000
+++ b/hs12	Fri Sep 07 13:53:41 2007 +0000
@@ -60,7 +60,7 @@
 
     while (<$m>) {
         print;
-        last if $arg{to} and /$arg{to}/;
+        last if $arg{to} and /^--\Q$arg{to}\E/;
     }
 }
 
@@ -83,14 +83,14 @@
     if (not $type or pass_mime($type)) {
         warn "passing: " . ($type ? $type : "no mime type") . "\n";
         print $header;
-        print_message($m, to => $boundary ? "^--$boundary" : undef);
+        print_message($m, to => $boundary);
         return;
     }
 
     if ($type =~ m{^multipart/}) {
         warn "forward to next multipart boundary: $boundary\n";
         print $header;
-        print_message($m, to => "^--$boundary");
+        print_message($m, to => $boundary);
 
         while (not eof($m)) {
             process($m, boundary => $boundary);
@@ -111,7 +111,7 @@
 	. $eol;
 
     while (<$m>) {
-	if (/^--$boundary/) {
+	if (/^--\Q$boundary\E/) {
 	    print;
 	    last;
 	}