diff --git a/buildbot/master/files/config/master.cfg b/buildbot/master/files/config/master.cfg
index 9b288328..3f71170f 100644
--- a/buildbot/master/files/config/master.cfg
+++ b/buildbot/master/files/config/master.cfg
@@ -1,5 +1,6 @@
 from buildbot.plugins import buildslave, changes, schedulers, status, util
 from buildbot.status import html, status_push, web, words
+from buildbot.status.mail import MailNotifier
 
 import environments as envs
 import factories
@@ -14,6 +15,17 @@ CROSS_SLAVES = ["servo-linux-cross{}".format(i) for i in range(1, 3)]
 WINDOWS_SLAVES = ["servo-windows{}".format(i) for i in range(1, 3)]
 
 
+NIGHTLY_BUILDERS = [
+    "android-nightly",
+    "linux-nightly",
+    "linux-rel-intermittent",
+    "mac-nightly",
+    "mac-rel-intermittent",
+    "windows-gnu-nightly",
+    "windows-msvc-nightly",
+]
+
+
 c = BuildmasterConfig = {}
 c['protocols'] = {'pb': {'port': 9001}}
 c['caches'] = {
@@ -111,15 +123,7 @@ c['schedulers'].append(schedulers.ForceScheduler(
 c['schedulers'].append(schedulers.Nightly(
     name="Nightly",
     branch="master",
-    builderNames=[
-        "android-nightly",
-        "linux-nightly",
-        "linux-rel-intermittent",
-        "mac-nightly",
-        "mac-rel-intermittent",
-        "windows-gnu-nightly",
-        "windows-msvc-nightly",
-    ],
+    builderNames=NIGHTLY_BUILDERS,
     hour=1,
     minute=0,
 ))
@@ -231,8 +235,16 @@ c['status'] = [
             'failure': 1,
         },
     ),
-]
+    MailNotifier(
+        fromaddr="buildbot@example.org",
+        sendToInterestedUsers=False,
+        mode=["failing", "exception"],
+        addPatch=False,
+        extraRecipients=["listaddr@example.org"],
+        builders=NIGHTLY_BUILDERS,
+    ),
 
+]
 
 ##################
 # PROJECT IDENTITY