update copyright headers and email addresses

[public-inbox.git] / lib / PublicInbox / SearchMsg.pm

diff --git a/lib/PublicInbox/SearchMsg.pm b/lib/PublicInbox/SearchMsg.pm
index 389182369943ffce7e7c6e3f39082268f706c373..e3a04605b9b0925efdd97e390ba38496b94331ef 100644 (file)
--- a/lib/PublicInbox/SearchMsg.pm
+++ b/lib/PublicInbox/SearchMsg.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015, all contributors <meta@public-inbox.org>
+# Copyright (C) 2015 all contributors <meta@public-inbox.org>
 # License: GPLv3 or later (https://www.gnu.org/licenses/agpl-3.0.txt)
 # based on notmuch, but with no concept of folders, files or flags
 package PublicInbox::SearchMsg;
@@ -127,22 +127,27 @@ sub ensure_metadata {
 sub mini_mime {
        my ($self) = @_;
        $self->ensure_metadata;
-       my @h = (
-               Subject => $self->subject,
+       my @hs = (
+               'Subject' => $self->subject,
                'X-PI-From' => $self->from_name,
-               'X-PI-TS' => $self->ts,
-               'Message-ID' => "<$self->{mid}>",
+       );
 
+       my @h = (
                # prevent Email::Simple::Creator from running,
                # this header is useless for threading as we use X-PI-TS
                # for sorting and display:
                'Date' => EPOCH_822,
+               'Message-ID' => "<$self->{mid}>",
+               'X-PI-TS' => $self->ts,
        );
-
-       my $refs = $self->{references_sorted};
-       my $mime = Email::MIME->create(header_str => \@h);
+       if (my $refs = $self->{references_sorted}) {
+               push @h, References => $refs;
+       }
+       my $mime = Email::MIME->create(header_str => \@hs, header => \@h);
        my $h = $mime->header_obj;
-       $h->header_set('References', $refs) if (defined $refs);
+
+       # set these headers manually since Encode::encode('MIME-Q', ...)
+       # will add spaces to long values when using header_str above.
 
        # drop useless headers Email::MIME set for us
        $h->header_set('Date');