Ticket #9214: 9214-EmailMessage-r9084.diff

django/core/mail.py

@@ -245 +245 @@
                 else:
                     msg.attach(self._create_attachment(*attachment))
         msg['Subject'] = self.subject
-        msg['From'] = self.from_email
+        msg['From'] = self.extra_headers.get('From', self.from_email)
         msg['To'] = ', '.join(self.to)
         msg['Date'] = formatdate()
         msg['Message-ID'] = make_msgid()
         for name, value in self.extra_headers.items():
-            msg[name] = value
+            if name != 'From':
+                msg[name] = value
         return msg
 
     def recipients(self):

tests/regressiontests/mail/tests.py

@@ -52 +52 @@
 >>> 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'
 
+# Test override of From header (#9214).
+
+>>> email = EmailMessage('Subject', 'Content', 'bounce@example.com', ['to@example.com'], headers={'From': 'from@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: Subject\nFrom: from@example.com\nTo: to@example.com\nDate: ...\nMessage-ID: <...>\n\nContent'
+
 """