use strict;
use warnings;
use Search::Xapian;
-use Email::Address qw//;
use POSIX qw//;
use Date::Parse qw/str2time/;
use PublicInbox::MID qw/mid_clean/;
+use PublicInbox::Address;
use Encode qw/find_encoding/;
my $enc_utf8 = find_encoding('UTF-8');
our $PFX2TERM_RE = undef;
my ($self) = @_;
my $from = __hdr($self, 'from');
if (defined $from && !defined $self->{from_name}) {
- $from =~ tr/\t\r\n/ /;
- my @from = Email::Address->parse($from);
- $self->{from_name} = $from[0]->name;
+ $self->{from_name} = PublicInbox::Address::from_name($from);
}
$from;
}
sub mini_mime {
my ($self) = @_;
$self->ensure_metadata;
- my @hs = (
+ my @h = (
'Subject' => $self->subject,
'X-PI-From' => $self->from_name,
- );
-
- my @h = (
# prevent Email::Simple::Creator from running,
# this header is useless for threading as we use X-PI-TS
# for sorting and display:
if (my $refs = $self->{references}) {
push @h, References => $refs;
}
- my $mime = Email::MIME->create(header_str => \@hs, header => \@h);
+ my $mime = Email::MIME->create(header => \@h);
my $h = $mime->header_obj;
# set these headers manually since Encode::encode('MIME-Q', ...)