1 files changed, 2 insertions, 0 deletions
diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index 9c61d54b4..a8ab64913 100644
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -71,6 +71,8 @@ sub MessageToMTA {
                 utf8::decode($value);
             }
             my $encoded = encode('MIME-Q', $value);
+            # Encode adds unnecessary line breaks, with two spaces after each.
+            $encoded =~ s/\n  / /g;
             $email->header_set($header, $encoded);
         }
     }