- $options{'from'} =~ /\@([\w\.\-]+)/ or $1 = 'example.com';
- my $message_id = join('.', rand()*(2**32), $$, time). "\@$1";
+ my $domain;
+ if ( $options{'from'} =~ /\@([\w\.\-]+)/ ) {
+ $domain = $1;
+ } else {
+ warn 'no domain found in invoice from address '. $options{'from'}.
+ '; constructing Message-ID @example.com';
+ $domain = 'example.com';
+ }
+ my $message_id = join('.', rand()*(2**32), $$, time). "\@$domain";