diff --git a/navigator/base/content/helpMessengerOverlay.xul b/navigator/base/content/helpMessengerOverlay.xul
deleted file mode 100644
index 75c1a125..00000000
--- a/navigator/base/content/helpMessengerOverlay.xul
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<overlay id="helpMessengerOverlay"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <script type="application/javascript"
-          src="chrome://help/content/contextHelp.js"/>
-  <script type="application/javascript">
-    setHelpFileURI('chrome://communicator/locale/help/suitehelp.rdf');
-  </script>
-
-  <dialog id="editDirectories"
-          buttons="accept,help"
-          ondialoghelp="return openHelp('mail-ldap-properties');"/>
-
-  <dialog id="addDirectory"
-          buttons="accept,cancel,help"
-          ondialoghelp="return openHelp('mail-ldap-properties');"/>
-
-  <dialog id="accountManager"
-          buttons="accept,cancel,help"
-          ondialoghelp="return doHelpButton();"/>
-
-  <dialog id="FilterEditor"
-          buttons="accept,cancel,help"
-          ondialoghelp="return openHelp('mail-filters');"/>
-
-  <dialog id="junkMailInfo"
-          buttons="accept,help"
-          ondialoghelp="return openHelp('mail-junk');"/>
-
-  <dialog id="select-offline"
-          buttons="accept,cancel,help"
-          ondialoghelp="return openHelp('mail-offline-items');"/>
-
-  <dialog id="subscribeWindow"
-          buttons="accept,cancel,help"
-          ondialoghelp="return openHelp('mail-subscribe');"/>
-
-  <dialog id="mailViewListDialog"
-          buttons="help"
-          ondialoghelp="return openHelp('message-views-using');"/>
-
-  <dialog id="mailViewSetupDialog"
-          buttons="accept,cancel,help"
-          ondialoghelp="return openHelp('message-views-create-new');"/>
-
-  <dialog id="msgCompSecurityInfo"
-          buttons="accept,help"
-          ondialoghelp="return openHelp('compose_security');"/>
-
-  <dialog id="msgReadSecurityInfo"
-          buttons="accept,help"
-          ondialoghelp="return openHelp('received_security');"/>
-</overlay>
diff --git a/navigator/base/content/platform/mac/platformMailOverlay.xul b/navigator/base/content/platform/mac/platformMailOverlay.xul
deleted file mode 100644
index cda725c2..00000000
--- a/navigator/base/content/platform/mac/platformMailOverlay.xul
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
-<!DOCTYPE overlay SYSTEM "chrome://navigator/locale/mailNavigatorOverlay.dtd">
-
-<overlay id="platformMailOverlay.xul"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <keyset id="tasksKeys">
-    <key id="key_newMessage" key="&newMessageCmd.key;" modifiers="accel,shift" command="cmd_newMessage"/>
-  </keyset>
-
-</overlay>
diff --git a/navigator/base/content/platform/unix/platformMailOverlay.xul b/navigator/base/content/platform/unix/platformMailOverlay.xul
deleted file mode 100644
index 8acd41cd..00000000
--- a/navigator/base/content/platform/unix/platformMailOverlay.xul
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
-<overlay id="platformMailOverlay.xul"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-</overlay>
diff --git a/navigator/base/content/platform/win/platformMailOverlay.xul b/navigator/base/content/platform/win/platformMailOverlay.xul
deleted file mode 100644
index 8acd41cd..00000000
--- a/navigator/base/content/platform/win/platformMailOverlay.xul
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-
-<overlay id="platformMailOverlay.xul"
-         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-</overlay>
diff --git a/navigator/base/jar.mn b/navigator/base/jar.mn
index 4ca9e6fb..b01a575c 100644
--- a/navigator/base/jar.mn
+++ b/navigator/base/jar.mn
@@ -37,14 +37,11 @@ navigator.jar:
 
 #ifdef XP_MACOSX
   content/navigator/platformNavigationBindings.xul                 (content/platform/mac/platformNavigationBindings.xul)
-  content/navigator/platformMailOverlay.xul                        (content/platform/mac/platformMailOverlay.xul)
 #else
 #ifdef XP_WIN
   content/navigator/platformNavigationBindings.xul                 (content/platform/win/platformNavigationBindings.xul)
-  content/navigator/platformMailOverlay.xul                        (content/platform/win/platformMailOverlay.xul)
 #else
   content/navigator/platformNavigationBindings.xul                 (content/platform/unix/platformNavigationBindings.xul)
-  content/navigator/platformMailOverlay.xul                        (content/platform/unix/platformMailOverlay.xul)
 #endif
 #endif
 
@@ -63,7 +60,6 @@ en-US.jar:
 % locale navigator-platform en-US %locale/en-US/navigator-platform/
 % locale navigator-region en-US %locale/en-US/navigator-region/
 
-  locale/en-US/navigator/mailNavigatorOverlay.dtd                         (locale/mailNavigatorOverlay.dtd)
   locale/en-US/navigator/metadata.dtd                                     (locale/metadata.dtd)
   locale/en-US/navigator/metadata.properties                              (locale/metadata.properties)
   locale/en-US/navigator/navigator.dtd                                    (locale/navigator.dtd)
diff --git a/navigator/base/locale/mailNavigatorOverlay.dtd b/navigator/base/locale/mailNavigatorOverlay.dtd
deleted file mode 100644
index f6505986..00000000
--- a/navigator/base/locale/mailNavigatorOverlay.dtd
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!ENTITY newMessageCmd.label             "Message">
-<!ENTITY newMessageCmd.accesskey         "M">
-<!ENTITY newMessageCmd.key               "M">
-
-<!ENTITY newContactCmd.label             "Contact…">
-<!ENTITY newContactCmd.accesskey         "C">
-
-<!ENTITY sendPage.label                  "Send Page…">
-<!ENTITY sendPage.accesskey              "S">
-
-<!ENTITY contextSendThisPage.label       "Send This Page…">
-<!ENTITY contextSendThisPage.accesskey   "d">
-<!ENTITY contextSendThisLink.label       "Send This Link…">
-<!ENTITY contextSendThisLink.accesskey   "k">
-<!ENTITY contextSendImage.label          "Send Image…">
-<!ENTITY contextSendImage.accesskey      "n">
-<!ENTITY contextSendVideo.label          "Send Video…">
-<!ENTITY contextSendVideo.accesskey      "n">
-<!ENTITY contextSendAudio.label          "Send Audio…">
-<!ENTITY contextSendAudio.accesskey      "n">
-<!ENTITY contextSendFrame.label          "Send Frame…">
-<!ENTITY contextSendFrame.accesskey      "d">
-
-<!ENTITY sendLinkCmd.label               "Send Link…"> 
-<!ENTITY sendLinkCmd.accesskey           "d">
-