mime_entity_to_mbox: Fix "From "-escaping

* It was dropping the space in the replacement text
* It didn't actually enable QP encoding as required

1 files changed, 7 insertions, 5 deletions

diff --git a/scripts/LinuxStableQueue.pm b/scripts/LinuxStableQueue.pm
index 20e895dc..d5cf5b3b 100644
--- a/scripts/LinuxStableQueue.pm
+++ b/scripts/LinuxStableQueue.pm
@@ -123,18 +123,20 @@ sub common_mail_header {
 sub mime_entity_to_mbox {
     my ($entity, $mbox_fh) = @_;
 
-    for my $i (0 .. $entity->parts - 1) {
-	my $part = $entity->parts($i);
+    for my $part ($entity->parts || $entity) {
 	if ($part->as_string =~ /^From /m) {
-	    # We have to use QP and escape this later
-	    $part->head->add(Encoding => 'quoted-printable');
+	    # We have to use QP and escape this later.  The as_string
+	    # method will take care of escaping everything else as
+	    # needed for QP.
+	    $part->head->replace('Content-Transfer-Encoding',
+				 'quoted-printable');
 	}
     }
 
     # Escape 'From ' within the message and ensure are at least two '\n'
     # before the 'From ' of the next message
     my $text = $entity->as_string;
-    $text =~ s/^From /=46rom/gm;
+    $text =~ s/^From /=46rom /gm;
     while ($text !~ /\n\n$/) {
 	$text .= "\n";
     }