X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=perlmail-accept;h=9cea4a80b6bc3ef25dd0dac9540a30188c7997e4;hp=ab934b029067bba6baad8a038ebb7a8aab20ede5;hb=cc8901bc5751c88150b4529d23518ca30b28ea12;hpb=d3a5ca9c40b4f139358524dcb9e0641802c46060

diff --git a/perlmail-accept b/perlmail-accept
index ab934b0..9cea4a8 100755
--- a/perlmail-accept
+++ b/perlmail-accept
@@ -638,7 +638,8 @@ sub Received_for
 		my($for)=($hdr=~/\bfor\s+\<?(\S+)\>?\b/);
 		return $for if !wantarray();
 		push @r,$for if $for;
-		my($from,$fromaddr)=($hdr=~/\bfrom\s+(\S+)\b.*?\[((?:\d{1,3}\.){3}\d{1,3})\]/);
+		my($from,$fromaddr)=($hdr=~/\bfrom\s+(?:(\S+)\b.*?)??\[((?:\d{1,3}\.){3}\d{1,3})\]/);
+		$from=$fromaddr if !defined $from;
 		push @r,"$from:$fromaddr" if $from;
 		}
 	return @r;