merge changes from dla source

diff --git a/scripts/spamscan-sa b/scripts/spamscan-sa
index 3dd5f19efd1f5cd3eb238e084abefff3e08a2a03..02d6ae5234877f6b0c883a6ae5e923706dc0a151 100755 (executable)
--- a/scripts/spamscan-sa
+++ b/scripts/spamscan-sa
@@ -101,13 +101,10 @@ while (my $id = <STDIN>) {
            $out .= "  spam $score\n";
            $nseen = $score;
        } else {
+           my ($before, $received, $after) = $headers =~
+               /(^.*?)(^Received\: \(at .*?\n)(.*$)/ms;
            open OUT, "> incoming/I$id" or die "open incoming/I$id: $!";
-           my ($received, $from, $other_headers) =
-               split(/\n/, $headers, 3);
-           if ($recevied =~ /^From /) {
-               ($received, $from) = ($from, $received);
-           }
-           print OUT "$received\n$from\n$other_headers"
+           print OUT $received . $before . $after
                or die "print incoming/I$id: $!";
            if ($ca_score > 1) {
                print OUT "X-CrossAssassin-Score: $ca_score\n"