Merge pull request #834 from matrix-org/dbkr/fix_email_from

Fix email notif From
This commit is contained in:
David Baker 2016-06-03 16:54:29 +01:00
commit 81d226888f

View File

@ -186,7 +186,7 @@ class Mailer(object):
multipart_msg = MIMEMultipart('alternative') multipart_msg = MIMEMultipart('alternative')
multipart_msg['Subject'] = "[%s] %s" % (self.app_name, summary_text) multipart_msg['Subject'] = "[%s] %s" % (self.app_name, summary_text)
multipart_msg['From'] = self.hs.config.email_notif_from multipart_msg['From'] = from_string
multipart_msg['To'] = email_address multipart_msg['To'] = email_address
multipart_msg['Date'] = email.utils.formatdate() multipart_msg['Date'] = email.utils.formatdate()
multipart_msg['Message-ID'] = email.utils.make_msgid() multipart_msg['Message-ID'] = email.utils.make_msgid()