summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-06-03 16:31:23 +0100
committerDavid Baker <dave@matrix.org>2016-06-03 16:31:23 +0100
commit06d40c8b9841cd877e70e205d55a08f423ff2ec9 (patch)
treedf1f22c443da6fa2bcc88fffd17e29298b2deffa
parentMerge branch 'release-v0.16.0' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-06d40c8b9841cd877e70e205d55a08f423ff2ec9.tar.xz
Add substitutions to email notif From
Diffstat (limited to '')
-rw-r--r--synapse/push/mailer.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py
index 88402e42a6..933a53fc3e 100644
--- a/synapse/push/mailer.py
+++ b/synapse/push/mailer.py
@@ -186,7 +186,7 @@ class Mailer(object):
 
         multipart_msg = MIMEMultipart('alternative')
         multipart_msg['Subject'] = "[%s] %s" % (self.app_name, summary_text)
-        multipart_msg['From'] = self.hs.config.email_notif_from
+        multipart_msg['From'] = self.hs.config.email_notif_from % (self.app_name, )
         multipart_msg['To'] = email_address
         multipart_msg['Date'] = email.utils.formatdate()
         multipart_msg['Message-ID'] = email.utils.make_msgid()