diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py
index 997690898..89c8d5c7c 100644
--- a/synapse/app/pusher.py
+++ b/synapse/app/pusher.py
@@ -20,6 +20,7 @@ from synapse.server import HomeServer
 from synapse.config._base import ConfigError
 from synapse.config.database import DatabaseConfig
 from synapse.config.logger import LoggingConfig
+from synapse.config.emailconfig import EmailConfig
 from synapse.http.site import SynapseSite
 from synapse.metrics.resource import MetricsResource, METRICS_PREFIX
 from synapse.replication.slave.storage.events import SlavedEventStore
@@ -91,7 +92,7 @@ class SlaveConfig(DatabaseConfig):
         """ % locals()
 
 
-class PusherSlaveConfig(SlaveConfig, LoggingConfig):
+class PusherSlaveConfig(SlaveConfig, LoggingConfig, EmailConfig):
     pass
 
 
diff --git a/synapse/push/mailer.py b/synapse/push/mailer.py
index 1e6654e2b..037bc990d 100644
--- a/synapse/push/mailer.py
+++ b/synapse/push/mailer.py
@@ -152,6 +152,8 @@ class Mailer(object):
         multipart_msg['Subject'] = "New Matrix Notifications"
         multipart_msg['From'] = self.hs.config.email_notif_from
         multipart_msg['To'] = email_address
+        multipart_msg['Date'] = email.utils.formatdate()
+        multipart_msg['Message-ID'] = email.utils.make_msgid()
         multipart_msg.attach(text_part)
         multipart_msg.attach(html_part)