--- lib/Mail/SpamAssassin/PerMsgStatus.pm
+++ lib/Mail/SpamAssassin/PerMsgStatus.pm
@@ -619,7 +619,11 @@
 
   # Make the line endings appropriate for the situation
   if ($self->{msg}->{line_ending} ne "\n") {
-    $msg =~ s/\r?\n/$self->{msg}->{line_ending}/g;
+		$msg =~ m/\r?\n\r?\n/;
+		my $msghead = $`;
+		my $msgbody = $';
+		$msghead =~ s/\r?\n/$self->{msg}->{line_ending}/g;
+		$msg=$msghead.$self->{msg}->{line_ending}.$self->{msg}->{line_ending}.$msgbody;
   }
 
   return $msg;