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;