diff -Nur Mail-SpamAssassin-3.4.1.orig/lib/Mail/SpamAssassin/PerMsgStatus.pm Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm --- Mail-SpamAssassin-3.4.1.orig/lib/Mail/SpamAssassin/PerMsgStatus.pm 2015-04-28 12:56:49.000000000 -0700 +++ Mail-SpamAssassin-3.4.1/lib/Mail/SpamAssassin/PerMsgStatus.pm 2017-10-23 16:05:06.703069400 -0700 @@ -914,16 +914,16 @@ $str .= shift @{$ary}; } undef $ary; - chomp ($str); $str .= " [...]\n"; # in case the last line was huge, trim it back to around 200 chars local $1; - $str =~ s/^(.{,200}).*$/$1/gs; + $str =~ s/^(.{200}).+$/$1 [...]/gm; + chomp ($str); $str .= "\n"; # now, some tidy-ups that make things look a bit prettier - $str =~ s/-----Original Message-----.*$//gs; + $str =~ s/-----Original Message-----.*$//gm; $str =~ s/This is a multi-part message in MIME format\.//gs; - $str =~ s/[-_\*\.]{10,}//gs; + $str =~ s/[-_*.]{10,}//gs; $str =~ s/\s+/ /gs; # add "Content preview:" ourselves, so that the text aligns