--- Mail/SpamAssassin/PerMsgStatus.pm.orig 2015-04-28 21:56:49.000000000 +0200 +++ Mail/SpamAssassin/PerMsgStatus.pm 2017-07-12 16:47:36.669981000 +0200 @@ -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