--- perfect_maildir.pl	2005-12-18 12:10:15.000000000 -0300
+++ perfect_maildir.ori.pl	2005-12-18 12:09:53.000000000 -0300
@@ -73,7 +73,7 @@
 
   if ($datestyle eq "from") {
     # Get date from the "From " line (this should appears here for the first message only)
-		$date = $1 if $line =~ /^From .*?(.{24})(\s(\-|\+)\d{4})?$/;
+    $date = $1 if $line =~ /^From [^ ^\t]+[ \t]+(.{24})/;
   } elsif ($datestyle eq "date") {
     # Get date from the "Date: " header
     $date = $1 if $line =~ /^Date: (.*)$/;
@@ -120,8 +120,7 @@
 while (my $line = <STDIN>) {
   if ($datestyle eq "from") {
     # Get date from the "From " line (this should appears here for the first message only)
-		$date = $1 if $line =~ /^From .*?(.{24})(\s(\-|\+)\d{4})?$/;
-
+    $date = $1 if $line =~ /^From [^ ^\t]+[ \t]+(.{24})/;
   }
     # End of current message 
   last if ($line =~ /^From ./);