--- /mavisd-new~	2007-08-19 17:24:17.000000000 -0600
+++ amavisd-new	2007-09-23 09:30:07.000000000 -0600
@@ -3307,9 +3308,9 @@
     # we mainly avoid stop-characters in the domain names of source route
     $source_route = $1; $addr = $2;
   }
-  if ($addr =~ m{^ (    (?: [^"@]+ | " (?: \\. | [^"\\] )* " | . )*? )
-                   ( \@ (?: [^"@\[\]\\ \t]+ | \[ (?: \\. | [^\]\\] )* \]
-                          | [^@] )* )? \z}xs) {
+  if ($addr =~ m{^ ( .*? )
+                 ( \@ (?: [^@\[\]]+ | \[ (?: \\. | [^\]\\] )* \] | [^@] )* )?
+                 \z}xs) {
     ($localpart,$domain) = ($1,$2);
   } else {
     ($localpart,$domain) = ($addr,'');