Ticket #7747: long_email_subject_wrapping_fix_and_test.diff

django/django/core/mail.py

@@ -86 +86 @@
             val = ', '.join(result)
         else:
             val = Header(val, settings.DEFAULT_CHARSET)
+    else:
+        if name.lower() == 'subject':
+            val = Header(val)
     return name, val
 
 class SafeMIMEText(MIMEText):

django/tests/regressiontests/mail/tests.py

@@ -10 +10 @@
 >>> email = EmailMessage('Subject', 'Content', 'from@example.com', ['to@example.com'])
 >>> message = email.message()
 >>> message['Subject']
+<email.header.Header instance at 0x...>
+>>> message['Subject'].encode()
 'Subject'
 >>> message.get_payload()
 'Content'
@@ -23 +25 @@
 >>> email = EmailMessage('Subject', 'Content', 'from@example.com', ['to@example.com','other@example.com'])
 >>> message = email.message()
 >>> message['Subject']
+<email.header.Header instance at 0x...>
+>>> message['Subject'].encode()
 'Subject'
 >>> message.get_payload()
 'Content'
@@ -45 +49 @@
     ...
 BadHeaderError: Header values can't contain newlines (got u'Subject\nInjection Test' for header 'Subject')
 
+# Test for space continuation character in long (ascii) subject headers
+
+>>> email = EmailMessage('Long subject lines that get wrapped should use a space continuation character to get expected behaviour in Outlook and Thunderbird', 'Content', 'from@example.com', ['to@example.com'])
+>>> message = email.message()
+>>> message.as_string()
+'Content-Type: text/plain; charset="utf-8"\nMIME-Version: 1.0\nContent-Transfer-Encoding: quoted-printable\nSubject: Long subject lines that get wrapped should use a space continuation\n character to get expected behaviour in Outlook and Thunderbird\nFrom: from@example.com\nTo: to@example.com\nDate: ...\nMessage-ID: <...>\n\nContent'
+
 """