diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py
index 88bc553c6..6184458d8 100644
--- a/ietf/doc/mails.py
+++ b/ietf/doc/mails.py
@@ -179,7 +179,7 @@ def generate_approval_mail_approved(request, doc):
         doc.group.name_with_wg = doc.group.name + " Working Group"
         if doc.group.list_email:
             cc.append("%s mailing list <%s>" % (doc.group.acronym, doc.group.list_email))
-        cc.append("%s chair <%s-chairs@tools.ietf.org>" % (doc.group.acronym, doc.group.acronym))
+        cc.append("%s chair <%s-chairs@ietf.org>" % (doc.group.acronym, doc.group.acronym))
     else:
         doc.group.name_with_wg = doc.group.name
 
diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py
index c3bf73fa3..bd0ef5c96 100644
--- a/ietf/doc/utils.py
+++ b/ietf/doc/utils.py
@@ -467,7 +467,7 @@ def collect_email_addresses(emails, doc):
             if role.email.address not in emails:
                 emails[role.email.address] = '"%s"' % (role.person.name)
         if doc.group.type.slug == 'wg':
-            address = '%s-ads@tools.ietf.org' % doc.group.acronym
+            address = '%s-ads@ietf.org' % doc.group.acronym
             if address not in emails:
                 emails[address] = '"%s-ads"' % (doc.group.acronym)
         elif doc.group.type.slug == 'rg':
diff --git a/ietf/doc/views_draft.py b/ietf/doc/views_draft.py
index 2e358d855..92357e255 100644
--- a/ietf/doc/views_draft.py
+++ b/ietf/doc/views_draft.py
@@ -582,7 +582,7 @@ def to_iesg(request,name):
             doc.save()
 
             extra = {}
-            extra['Cc'] = "%s-chairs@tools.ietf.org, iesg-secretary@ietf.org, %s" % (doc.group.acronym,doc.notify)
+            extra['Cc'] = "%s-chairs@ietf.org, iesg-secretary@ietf.org, %s" % (doc.group.acronym,doc.notify)
             send_mail(request=request,
                       to = doc.ad.email_address(),
                       frm = login.formatted_email(),
diff --git a/ietf/secr/drafts/email.py b/ietf/secr/drafts/email.py
index a06b3aa62..d3a506401 100644
--- a/ietf/secr/drafts/email.py
+++ b/ietf/secr/drafts/email.py
@@ -147,7 +147,7 @@ def get_fullcc_list(draft):
                 emails[role.email.address] = '"%s"' % (role.person.name)
         # add AD
         if draft.group.type.slug == 'wg':    
-            emails['%s-ads@tools.ietf.org' % draft.group.acronym] = '"%s-ads"' % (draft.group.acronym)
+            emails['%s-ads@ietf.org' % draft.group.acronym] = '"%s-ads"' % (draft.group.acronym)
         elif draft.group.type.slug == 'rg':
             email = draft.group.parent.role_set.filter(name='chair')[0].email
             emails[email.address] = '"%s"' % (email.person.name)
diff --git a/ietf/secr/utils/mail.py b/ietf/secr/utils/mail.py
index 01133dd27..386622ca6 100644
--- a/ietf/secr/utils/mail.py
+++ b/ietf/secr/utils/mail.py
@@ -6,7 +6,7 @@ def get_ad_email_list(group):
     '''
     emails = []
     if group.type.slug == 'wg':    
-        emails.append('%s-ads@tools.ietf.org' % group.acronym)
+        emails.append('%s-ads@ietf.org' % group.acronym)
     elif group.type.slug == 'rg' and group.parent:
         emails.append(group.parent.role_set.filter(name='chair')[0].email.address)
     return emails
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index 28c6a4631..ab0803964 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -413,7 +413,7 @@
   </table>
 
   <div class="buttonlist">
-    <a class="btn btn-default btn-xs" href="mailto:{{ doc.name }}@tools.ietf.org?subject=Mail%20regarding%20{{ doc.name }}"><span class="fa fa-envelope-o"></span> Email authors</a>
+    <a class="btn btn-default btn-xs" href="mailto:{{ doc.name }}@ietf.org?subject=Mail%20regarding%20{{ doc.name }}"><span class="fa fa-envelope-o"></span> Email authors</a>
     <a class="btn btn-default btn-xs" href="{% url "ipr_search" %}?submit=draft&amp;id={{ doc.name }}" rel="nofollow"><span class="fa fa-bolt"></span> IPR {% if doc.related_ipr %} <span class="badge">{{doc.related_ipr|length}}</span>{% endif %}</a>
     <a class="btn btn-default btn-xs" href="{% url "doc_references" doc.canonical_name %}" rel="nofollow"><span class="fa fa-long-arrow-left"></span> References</a>
     <a class="btn btn-default btn-xs" href="{% url "doc_referenced_by" doc.canonical_name %}" rel="nofollow"><span class="fa fa-long-arrow-right"></span> Referenced by</a>