diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py
index 86a5266..6b9baf7 100644
--- a/apps/patchwork/models.py
+++ b/apps/patchwork/models.py
@@ -281,13 +281,13 @@ class Patch(models.Model):
         mail['Subject'] = self.name
         mail['Date'] = email.utils.formatdate(
                         time.mktime(self.date.utctimetuple()))
-        mail['From'] = unicode(self.submitter)
+        mail['X-Patchwork-Submitter'] = unicode(self.submitter)
         mail['X-Patchwork-Id'] = str(self.id)
         mail['Message-Id'] = self.msgid
         mail.set_unixfrom('From patchwork ' + self.date.ctime())
 
 
-        copied_headers = ['To', 'Cc']
+        copied_headers = ['To', 'Cc', 'From']
         orig_headers = HeaderParser().parsestr(str(self.headers))
         for header in copied_headers:
             if header in orig_headers: