Bug 411544: Subject lines in emails were still being improperly line-broken. This...

Patch By Jeff Lawson <jlawson-mozilla@bovine.net> r=mkanat, a=mkanat

diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm
index 956f30139d94ecae7268416ea89099dc9d0fd511..8e18d5e319f2a7bdee36ae5aefa5cebd05b82c92 100644 (file)
--- a/Bugzilla/Mailer.pm
+++ b/Bugzilla/Mailer.pm
@@ -44,6 +44,7 @@ use Bugzilla::Util;
 use Date::Format qw(time2str);
 
 use Encode qw(encode);
+use Encode::MIME::Header;
 use Email::Address;
 use Email::MIME;
 # Loading this gives us encoding_set.
@@ -68,9 +69,11 @@ sub MessageToMTA {
     foreach my $header qw(From To Cc Reply-To Sender Errors-To Subject) {
         if (my $value = $email->header($header)) {
             $value = Encode::decode("UTF-8", $value) if Bugzilla->params->{'utf8'};
+
+            # avoid excessive line wrapping done by Encode.
+            local $Encode::Encoding{'MIME-Q'}->{'bpl'} = 998;
+
             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);
         }
     }