- my $simple = $self->message;
- my $subj = utf8_header($simple, "Subject");
- my $mid = utf8_header($simple, "Message-ID");
- $mid =~ s/\A<//;
- $mid =~ s/>\z//;
- my $url = $args->[1] . xs_html(uri_escape($mid));
- my $from = utf8_header($simple, "From");
+ my $mime = $self->message;
+ my $subj = $mime->header('Subject');
+ my $mid = $mime->header_obj->header_raw('Message-ID');
+ $mid = PublicInbox::Hval->new_msgid($mid);
+ my $url = $args->[1] . $mid->as_href;
+ my $from = mime_header($mime, 'From');
+