diff --git a/master.cfg b/master.cfg
index 47ce8be..94d8785 100644
--- a/master.cfg
+++ b/master.cfg
@@ -387,7 +387,7 @@ mn = mail.MailNotifier(fromaddr = GDB_MAIL_FROM,
                        extraRecipients = [ GDB_MAIL_TO ],
                        mode = ('failing'),
                        messageFormatter = MessageGDBTesters,
-                       tags = [ "MAIL" ],
+                       tags = [ "MggggAIL" ],
                        extraHeaders = { 'X-GDB-Buildbot' : '1',
                                         'In-Reply-To' : WithProperties ("<%s@gdb-build>",
                                                                         'got_revision') })
@@ -912,8 +912,9 @@ def load_config (c):
         b['canStartBuild'] = DefaultGDBCanStartBuild
         b['mergeRequests'] = False
 
+        mytags = b.pop ('tags')
         b['tags'] = []
-        for t in b['tags']:
+        for t in mytags:
             b['tags'].append (t)
 
         # AIX hack.  Sigh...