scripts/import_slrnspool | 11 +++++++---- scripts/slrnspool2maildir | 11 +++++++---- diff --git a/scripts/import_slrnspool b/scripts/import_slrnspool index fec7ebf15b092ce2118aa43bb96e7af8af4fe902..ea7a97bf69689bdf85950264d9919cd1fccd5b17 100755 --- a/scripts/import_slrnspool +++ b/scripts/import_slrnspool @@ -50,10 +50,13 @@ my $f = Email::Filter->new(data => eval { local $/; <$fh> }); my $s = $f->simple; # gmane rewrites Received headers, which increases spamminess - my @h = $s->header('Original-Received'); - if (@h) { - $s->header_set('Received', @h); - $s->header_set('Original-Received'); + # Some older archives set Original-To + foreach my $x (qw(Received To)) { + my @h = $s->header("Original-$x"); + if (@h) { + $s->header_set($x, @h); + $s->header_set("Original-$x"); + } } # triggers for the SA HEADER_SPAM rule diff --git a/scripts/slrnspool2maildir b/scripts/slrnspool2maildir index 12510a327fbbae114abed540ee5797e6eaa4665f..08313973364a889c9578ecc04c26c5980e9191eb 100755 --- a/scripts/slrnspool2maildir +++ b/scripts/slrnspool2maildir @@ -27,10 +27,13 @@ my $f = Email::Filter->new(data => eval { local $/; <$fh> }); my $s = $f->simple; # gmane rewrites Received headers, which increases spamminess - my @h = $s->header('Original-Received'); - if (@h) { - $s->header_set('Received', @h); - $s->header_set('Original-Received'); + # Some older archives set Original-To + foreach my $x (qw(Received To)) { + my @h = $s->header("Original-$x"); + if (@h) { + $s->header_set($x, @h); + $s->header_set("Original-$x"); + } } # triggers for the SA HEADER_SPAM rule