diff -urp Mail-Mbox-MessageParser-1.5000/lib/Mail/Mbox/MessageParser/Config.pm Mail-Mbox-MessageParser-1.5000-PF1XEm/lib/Mail/Mbox/MessageParser/Config.pm
--- Mail-Mbox-MessageParser-1.5000/lib/Mail/Mbox/MessageParser/Config.pm	2007-01-11 14:43:55.000000000 +0100
+++ Mail-Mbox-MessageParser-1.5000-PF1XEm/lib/Mail/Mbox/MessageParser/Config.pm	2008-02-09 09:13:18.000000000 +0100
@@ -19,7 +19,7 @@ $VERSION = sprintf "%d.%02d%02d", q/0.1.
 
   'read_chunk_size' => 20000,
 
-  'from_pattern' => q/(?x)^
+  'from_pattern' => q/(?mx)^
     (From\s
       # Skip names, months, days
       (?> [^:\n]+ )
diff -urp Mail-Mbox-MessageParser-1.5000/lib/Mail/Mbox/MessageParser/Grep.pm Mail-Mbox-MessageParser-1.5000-PF1XEm/lib/Mail/Mbox/MessageParser/Grep.pm
--- Mail-Mbox-MessageParser-1.5000/lib/Mail/Mbox/MessageParser/Grep.pm	2007-01-11 15:37:20.000000000 +0100
+++ Mail-Mbox-MessageParser-1.5000-PF1XEm/lib/Mail/Mbox/MessageParser/Grep.pm	2008-02-09 09:59:11.000000000 +0100
@@ -289,7 +289,7 @@ sub _read_email_parts
   # RFC 1521 says the boundary can be no longer than 70 characters. Back up a
   # little more than that.
   my $endline = $self->{'endline'};
-  $self->_read_until_match(qr/^--\Q$boundary\E--$endline/,76)
+  $self->_read_until_match(qr/^--\Q$boundary\E--$endline/m,76)
     or return 0;
 
   return 1;
diff -urp Mail-Mbox-MessageParser-1.5000/lib/Mail/Mbox/MessageParser/Perl.pm Mail-Mbox-MessageParser-1.5000-PF1XEm/lib/Mail/Mbox/MessageParser/Perl.pm
--- Mail-Mbox-MessageParser-1.5000/lib/Mail/Mbox/MessageParser/Perl.pm	2007-01-11 15:37:26.000000000 +0100
+++ Mail-Mbox-MessageParser-1.5000-PF1XEm/lib/Mail/Mbox/MessageParser/Perl.pm	2008-02-09 10:00:26.000000000 +0100
@@ -265,7 +265,7 @@ sub _read_email_parts
   # RFC 1521 says the boundary can be no longer than 70 characters. Back up a
   # little more than that.
   my $endline = $self->{'endline'};
-  $self->_read_until_match(qr/^--\Q$boundary\E--$endline/,76)
+  $self->_read_until_match(qr/^--\Q$boundary\E--$endline/m,76)
     or return 0;
 
   return 1;