reduce scope of mbox From_ line removal

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

diff --git a/lib/PublicInbox/Mbox.pm b/lib/PublicInbox/Mbox.pm
index 16de1a728ab6345f58c0637f537bfca6485a44ce..9995140cd8228db8b26313927d04e432a3007cf2 100644 (file)
--- a/lib/PublicInbox/Mbox.pm
+++ b/lib/PublicInbox/Mbox.pm
@@ -106,8 +106,11 @@ sub msg_hdr ($$;$) {
                'List-Post', "<mailto:$ibx->{-primary_address}>",
        );
        my $crlf = $header_obj->crlf;
-       my $buf = 'From mboxrd@z Thu Jan  1 00:00:00 1970' . $crlf .
-                       $header_obj->as_string;
+       my $buf = $header_obj->as_string;
+       # fixup old bug from import (pre-a0c07cba0e5d8b6a)
+       $buf =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s;
+       $buf = "From mboxrd\@z Thu Jan  1 00:00:00 1970" . $crlf . $buf;
+
        for (my $i = 0; $i < @append; $i += 2) {
                my $k = $append[$i];
                my $v = $append[$i + 1];