From 2d3e88881719c1e9e07ea75b3c39a90966622977 Mon Sep 17 00:00:00 2001
From: "ben%netscape.com" <ben%netscape.com>
Date: Sat, 17 Jun 2000 03:26:47 +0000
Subject: [PATCH] partial fixes for 32347, 30536, 41120

---
 .../composer/content/TextEditorAppShell.xul   |  2 +-
 editor/ui/composer/content/editor.xul         |  2 +-
 editor/ui/composer/content/editorOverlay.xul  |  5 -
 extensions/irc/xul/content/chatzilla.xul      |  2 +-
 extensions/psm-glue/res/content/Makefile.in   | 15 +--
 .../psm-glue/res/content/PSMTaskMenu.xul      | 28 +++---
 extensions/psm-glue/res/content/makefile.win  | 14 ++-
 .../psm-glue/res/content/securityOverlay.xul  | 14 +++
 extensions/psm-glue/res/content/securityUI.js | 45 +++++++++
 extensions/psm-glue/res/locale/en-US/MANIFEST |  2 +
 .../psm-glue/res/locale/en-US/Makefile.in     |  9 +-
 .../psm-glue/res/locale/en-US/makefile.win    | 13 +--
 .../res/locale/en-US/securityOverlay.dtd      |  2 +
 .../resources/content/addressbook.xul         |  5 +-
 .../base/prefs/resources/content/MANIFEST     |  1 +
 .../base/prefs/resources/content/Makefile.in  |  1 +
 .../resources/content/mailPrefsOverlay.xul    | 81 ++++++++++++++++
 .../base/prefs/resources/content/makefile.win |  1 +
 .../prefs/resources/locale/en-US/MANIFEST     |  1 +
 .../prefs/resources/locale/en-US/Makefile.in  |  1 +
 .../locale/en-US/mailPrefsOverlay.dtd         | 15 +++
 .../prefs/resources/locale/en-US/makefile.win |  1 +
 mailnews/base/resources/content/MANIFEST      |  7 ++
 mailnews/base/resources/content/Makefile.in   |  7 ++
 .../base/resources/content/folderPane.xul     | 11 +--
 .../content/mail3PaneWindowVertLayout.xul     |  3 +-
 .../base/resources/content/mailABOverlay.xul  | 16 ++++
 .../resources/content/mailEditorOverlay.xul   | 43 +++++++++
 .../content/mailMessengerComposeOverlay.xul   | 16 ++++
 .../content/mailMessengerOverlay.xul          | 16 ++++
 .../content/mailNavigatorOverlay.xul          | 53 ++++++++++
 .../base/resources/content/mailOverlay.xul    | 41 ++++++++
 .../resources/content/mailTasksOverlay.xul    | 60 ++++++++++++
 .../resources/content/mailWindowOverlay.xul   |  4 -
 mailnews/base/resources/content/makefile.win  |  7 ++
 mailnews/base/resources/content/manifest.rdf  | 63 ++++++++++++
 .../base/resources/content/messageWindow.xul  |  2 +-
 mailnews/base/resources/content/messenger.xul |  3 +-
 mailnews/base/resources/content/subscribe.xul |  8 +-
 .../base/resources/content/threadPane.xul     | 22 ++---
 mailnews/base/resources/locale/en-US/MANIFEST |  4 +
 .../base/resources/locale/en-US/Makefile.in   |  4 +
 .../locale/en-US/mailEditorOverlay.dtd        |  3 +
 .../locale/en-US/mailNavigatorOverlay.dtd     | 11 +++
 .../resources/locale/en-US/mailOverlay.dtd    |  8 ++
 .../locale/en-US/mailTasksOverlay.dtd         |  6 ++
 .../base/resources/locale/en-US/makefile.win  |  4 +
 .../resources/content/messengercompose.xul    |  6 +-
 .../news/resources/content/downloadheaders.js | 28 +++++-
 .../resources/content/downloadheaders.xul     | 58 +++++------
 .../resources/locale/en-US/news.properties    |  4 +-
 xpfe/browser/resources/content/navigator.js   | 71 ++++++++++++--
 xpfe/browser/resources/content/navigator.xul  |  9 +-
 .../resources/content/navigatorOverlay.xul    | 11 +--
 .../resources/locale/en-US/navigator.dtd      |  2 -
 .../locale/en-US/navigator.properties         |  1 +
 .../resources/locale/en-US/MANIFEST           |  3 +
 .../resources/locale/en-US/Makefile.in        |  3 +
 .../resources/locale/en-US/makefile.win       |  3 +
 .../resources/locale/en-US/taskbar.rdf        | 47 +++++++++
 .../resources/locale/en-US/taskbarOverlay.dtd | 10 ++
 .../resources/locale/en-US/tasksOverlay.dtd   | 52 ++++++++++
 .../resources/locale/en-US/utilityOverlay.dtd |  7 --
 .../console/resources/content/MANIFEST        |  2 +
 .../console/resources/content/Makefile.in     |  2 +
 .../console/resources/content/console.css     | 16 ++++
 .../console/resources/content/console.js      | 55 ++++++++---
 .../console/resources/content/console.xul     | 76 ++++++++++-----
 .../resources/content/consoleBindings.xml     | 37 +++++++
 .../console/resources/content/makefile.win    |  2 +
 .../resources/locale/en-US/console.dtd        | 10 ++
 .../resources/content/pref-advanced.xul       | 13 +--
 .../resources/content/pref-appearance.xul     | 12 +--
 .../resources/content/pref-themes.js          | 48 ++++++++++
 .../resources/content/pref-themes.xul         | 96 +++++++++++--------
 .../prefwindow/resources/content/pref.xul     |  4 +-
 .../prefwindow/resources/content/preftree.xul | 41 +-------
 .../resources/locale/en-US/pref-advanced.dtd  |  3 -
 .../locale/en-US/pref-appearance.dtd          |  3 -
 .../resources/locale/en-US/pref-themes.dtd    |  9 ++
 .../resources/locale/en-US/preftree.dtd       |  7 --
 xpfe/global/resources/content/MANIFEST        |  4 -
 xpfe/global/resources/content/Makefile.in     |  4 -
 .../global/resources/content/hiddenWindow.xul |  2 +-
 xpfe/global/resources/content/makefile.win    |  4 -
 .../resources/content/menulistBindings.xml    | 51 ++--------
 xpfe/global/resources/locale/en-US/MANIFEST   |  3 -
 .../global/resources/locale/en-US/Makefile.in |  3 -
 .../resources/locale/en-US/makefile.win       |  3 -
 89 files changed, 1142 insertions(+), 365 deletions(-)
 create mode 100644 extensions/psm-glue/res/content/securityOverlay.xul
 create mode 100644 extensions/psm-glue/res/content/securityUI.js
 create mode 100644 extensions/psm-glue/res/locale/en-US/securityOverlay.dtd
 create mode 100644 mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
 create mode 100644 mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd
 create mode 100644 mailnews/base/resources/content/mailABOverlay.xul
 create mode 100644 mailnews/base/resources/content/mailEditorOverlay.xul
 create mode 100644 mailnews/base/resources/content/mailMessengerComposeOverlay.xul
 create mode 100644 mailnews/base/resources/content/mailMessengerOverlay.xul
 create mode 100644 mailnews/base/resources/content/mailNavigatorOverlay.xul
 create mode 100644 mailnews/base/resources/content/mailOverlay.xul
 create mode 100644 mailnews/base/resources/content/mailTasksOverlay.xul
 create mode 100644 mailnews/base/resources/locale/en-US/mailEditorOverlay.dtd
 create mode 100644 mailnews/base/resources/locale/en-US/mailNavigatorOverlay.dtd
 create mode 100644 mailnews/base/resources/locale/en-US/mailOverlay.dtd
 create mode 100644 mailnews/base/resources/locale/en-US/mailTasksOverlay.dtd
 create mode 100644 xpfe/communicator/resources/locale/en-US/taskbar.rdf
 create mode 100644 xpfe/communicator/resources/locale/en-US/taskbarOverlay.dtd
 create mode 100644 xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd
 create mode 100644 xpfe/components/console/resources/content/console.css
 create mode 100644 xpfe/components/console/resources/content/consoleBindings.xml

diff --git a/editor/ui/composer/content/TextEditorAppShell.xul b/editor/ui/composer/content/TextEditorAppShell.xul
index 4e8b899ce2c3..585ab66b28d0 100644
--- a/editor/ui/composer/content/TextEditorAppShell.xul
+++ b/editor/ui/composer/content/TextEditorAppShell.xul
@@ -26,7 +26,7 @@
 <?xml-stylesheet href="chrome://editor/skin/editor.css" type="text/css"?> 
 <?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/editor.dtd"> 
 
diff --git a/editor/ui/composer/content/editor.xul b/editor/ui/composer/content/editor.xul
index c26f9e0aef3f..9b8309fa0429 100644
--- a/editor/ui/composer/content/editor.xul
+++ b/editor/ui/composer/content/editor.xul
@@ -30,7 +30,7 @@
 <?xul-overlay href="chrome://editor/content/EditorContextMenuOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
diff --git a/editor/ui/composer/content/editorOverlay.xul b/editor/ui/composer/content/editorOverlay.xul
index b7b016233096..9d5f1cc89c4a 100644
--- a/editor/ui/composer/content/editorOverlay.xul
+++ b/editor/ui/composer/content/editorOverlay.xul
@@ -42,7 +42,6 @@
 
     <!-- defined in globalOverlay -->
     <key id="key_newNavigator"/>
-    <key id="key_newMessage"/>
     <key id="key_newBlankPage"/>
 
     <key id="openeditorkb"  xulkey="true" key="&fileopen.keybinding;"  observes="cmd_open" />
@@ -84,7 +83,6 @@
 					events="create"
 					oncommandupdate="goUpdateComposerMenuItems(this)"
   >
-    <command id="cmd_sendPage"/>
 
     <command id="cmd_open"                                          oncommand="goDoCommand('cmd_open')"/>
     <command id="cmd_openRemote"   value="&openremoteCmd.label;"    oncommand="goDoCommand('cmd_openRemote')"/>
@@ -264,8 +262,6 @@
             <menuseparator/>
 -->
             <menuitem id="menu_newNavigator" observes="cmd_newNavigator"/>
-            <menuitem id="menu_newMessage"   observes="cmd_newMessage"/>
-            <menuitem id="menu_newCard"      observes="cmd_newCard"/>
           </menupopup>
         </menu>
       <menuitem accesskey="&fileopenremote.accesskey;"      key="openremoteeditorkb" observes="cmd_openRemote"/>
@@ -282,7 +278,6 @@
       <menuitem accesskey="&filesaveascharset.accesskey;"                               observes="cmd_saveAsCharset"/>
       <menuseparator />
       <!-- FRAME, LINK should go here, but nav must put them in global files -->
-      <menuitem id="menu_sendPage" observes="cmd_sendPage"/>
       <menuitem id="menu_preview" value="&previewCmd.label;" accesskey="&filepreview.accesskey;" observes="cmd_preview"/>
       <menuseparator />
       <menuitem accesskey="&fileprintsetup.accesskey;"                           observes="cmd_printSetup" />
diff --git a/extensions/irc/xul/content/chatzilla.xul b/extensions/irc/xul/content/chatzilla.xul
index 433cdff95e55..c0470c55fe81 100644
--- a/extensions/irc/xul/content/chatzilla.xul
+++ b/extensions/irc/xul/content/chatzilla.xul
@@ -30,7 +30,7 @@
 <?xml-stylesheet href="chrome://chatzilla/skin" type="text/css"?>
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 
 <window id="main-window"
         xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/extensions/psm-glue/res/content/Makefile.in b/extensions/psm-glue/res/content/Makefile.in
index 52e26649670a..c3922ab57956 100644
--- a/extensions/psm-glue/res/content/Makefile.in
+++ b/extensions/psm-glue/res/content/Makefile.in
@@ -27,17 +27,12 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
-NAVIGATOR_CONTENT_DIR = $(DIST)/bin/chrome/packages/core/navigator/content/
-NAVIGATOR_EXPORT_CONTENT = \
-  $(srcdir)/NavSecurityOverlay.xul \
-  $(srcdir)/NavSecurityUI.js       \
-  $(NULL)
-
-GLOBAL_CONTENT_DIR = $(DIST)/bin/chrome/packages/widget-toolkit/global/content/
-GLOBAL_EXPORT_CONTENT = \
+COMMUNICATOR_CONTENT_DIR = $(DIST)/bin/chrome/packages/core/communicator/content/
+COMMUNICATOR_EXPORT_CONTENT = \
+  $(srcdir)/securityOverlay.xul \
+  $(srcdir)/securityUI.js       \
   $(srcdir)/PSMTaskMenu.xul \
   $(NULL)
 
 install::
-	$(INSTALL) $(NAVIGATOR_EXPORT_CONTENT) $(NAVIGATOR_CONTENT_DIR)
-	$(INSTALL) $(GLOBAL_EXPORT_CONTENT) $(GLOBAL_CONTENT_DIR)
+	$(INSTALL) $(COMMUNICATOR_EXPORT_CONTENT) $(COMMUNICATOR_CONTENT_DIR)
diff --git a/extensions/psm-glue/res/content/PSMTaskMenu.xul b/extensions/psm-glue/res/content/PSMTaskMenu.xul
index c118ae19541d..3953b6104ce9 100644
--- a/extensions/psm-glue/res/content/PSMTaskMenu.xul
+++ b/extensions/psm-glue/res/content/PSMTaskMenu.xul
@@ -1,24 +1,22 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE window SYSTEM "chrome://global/locale/PSMTaskMenu.dtd" >
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/PSMTaskMenu.dtd" >
 
 <overlay id="psmTaskMenuID"
-xmlns:html="http://www.w3.org/1999/xhtml"
-xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<html:script language="JavaScript">
+  <script language="JavaScript">
+    function displaySecurityAdvisor()
+    {
+      var psm = Components.classes["component://netscape/psm"].getService();
+      psm = psm.QueryInterface(Components.interfaces.nsIPSMComponent);
+      psm.displaySecurityAdvisor( null, null );
+    }
+  </script>
 
-function displaySecurityAdvisor()
-{
-    var psm = Components.classes["component://netscape/psm"].getService();
-    psm = psm.QueryInterface(Components.interfaces.nsIPSMComponent);
-    psm.displaySecurityAdvisor( null, null );
-}
-
-</html:script>
-
-<menupopup id="personalManagers">
+  <menupopup id="personalManagers">
     <menuitem id="PSMMentItem" position="1" value="&PSMCmd.label;" oncommand="displaySecurityAdvisor()"/>
-</menupopup>
+  </menupopup>
 
 </overlay>
diff --git a/extensions/psm-glue/res/content/makefile.win b/extensions/psm-glue/res/content/makefile.win
index 57211b3c7e72..b6271832de03 100644
--- a/extensions/psm-glue/res/content/makefile.win
+++ b/extensions/psm-glue/res/content/makefile.win
@@ -24,14 +24,12 @@ include <$(DEPTH)/config/config.mak>
 include <$(DEPTH)\config\rules.mak>
 
 install:: $(DLL)
-    $(MAKE_INSTALL) NavSecurityOverlay.xul     $(DIST)\bin\chrome\packages\core\navigator\content
-    $(MAKE_INSTALL) NavSecurityUI.js           $(DIST)\bin\chrome\packages\core\navigator\content
-
-install:: $(DLL)
-    $(MAKE_INSTALL) PSMTaskMenu.xul	$(DIST)\bin\chrome\packages\widget-toolkit\global\content
+    $(MAKE_INSTALL) securityOverlay.xul     $(DIST)\bin\chrome\packages\core\communicator\content
+    $(MAKE_INSTALL) securityUI.js           $(DIST)\bin\chrome\packages\core\communicator\content
+    $(MAKE_INSTALL) PSMTaskMenu.xul	$(DIST)\bin\chrome\packages\core\communicator\content
     
 clobber::
-    $(RM) $(DIST)\bin\chrome\packages\core\navigator\content\NavSecurityOverlay.xul
-    $(RM) $(DIST)\bin\chrome\packages\core\navigator\content\NavSecurityUI.js
-    $(RM) $(DIST)\bin\chrome\packages\widget-toolkit\global\content\PSMTaskMenu.xul
+    $(RM) $(DIST)\bin\chrome\packages\core\communicator\content\securityOverlay.xul
+    $(RM) $(DIST)\bin\chrome\packages\core\communicator\content\securityUI.js
+    $(RM) $(DIST)\bin\chrome\packages\core\communicator\content\PSMTaskMenu.xul
 
diff --git a/extensions/psm-glue/res/content/securityOverlay.xul b/extensions/psm-glue/res/content/securityOverlay.xul
new file mode 100644
index 000000000000..ff775edda625
--- /dev/null
+++ b/extensions/psm-glue/res/content/securityOverlay.xul
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://communicator/skin/securityOverlay.css" type="text/css"?> 
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/securityOverlay.dtd">
+
+<overlay id="NavSecurityOverlay"
+         xmlns:html="http://www.w3.org/TR/REC-html40"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script language="JavaScript" src="chrome://communicator/content/securityUI.js" />
+
+  <statusbarpanel id="security-button" onclick="displayPageInfo()" tooltip="aToolTip" tooltiptext="&lockIcon.label;"/>    
+      
+</overlay>
diff --git a/extensions/psm-glue/res/content/securityUI.js b/extensions/psm-glue/res/content/securityUI.js
new file mode 100644
index 000000000000..db5efe2708e2
--- /dev/null
+++ b/extensions/psm-glue/res/content/securityUI.js
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+*/
+
+window.addEventListener("load", SetSecurityButton, false);
+
+var securityUI;
+
+function SetSecurityButton()
+{
+    dump("in SetSecurityButton\n");
+
+    var ui = Components.classes["component://netscape/secure_browser_ui"].createInstance();
+    securityUI = ui.QueryInterface(Components.interfaces.nsSecureBrowserUI);
+
+    var button  = document.getElementById('security-button');
+	if (button && window.content)
+		securityUI.init(window.content, button);
+}
+
+function displayPageInfo()
+{
+   if (securityUI)
+     securityUI.displayPageInfoUI();
+}
+
+
diff --git a/extensions/psm-glue/res/locale/en-US/MANIFEST b/extensions/psm-glue/res/locale/en-US/MANIFEST
index d49233ee84fb..bceee4da4bdc 100644
--- a/extensions/psm-glue/res/locale/en-US/MANIFEST
+++ b/extensions/psm-glue/res/locale/en-US/MANIFEST
@@ -1 +1,3 @@
 PSMTaskMenu.dtd
+securityOverlay.dtd
+security.properties
diff --git a/extensions/psm-glue/res/locale/en-US/Makefile.in b/extensions/psm-glue/res/locale/en-US/Makefile.in
index 88e83a3bf9d8..5957f5a8ff83 100644
--- a/extensions/psm-glue/res/locale/en-US/Makefile.in
+++ b/extensions/psm-glue/res/locale/en-US/Makefile.in
@@ -26,19 +26,16 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-EXPORT_RESOURCE_CONTENT = \
+COMMUNICATOR_RESOURCE_CONTENT = \
 	$(srcdir)/PSMTaskMenu.dtd \
-	$(NULL)
-
-EXPORT_NAV_RESOURCE_CONTENT = \
 	$(srcdir)/security.properties \
+	$(srcdir)/securityOverlay.dtd \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 install:: 
-	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/locales/en-US/global/locale
-	$(INSTALL) $(EXPORT_NAV_RESOURCE_CONTENT) $(DIST)/bin/chrome/locales/en-US/navigator/locale
+	$(INSTALL) $(COMMUNICATOR_RESOURCE_CONTENT) $(DIST)/bin/chrome/locales/en-US/communicator/locale
 
 
 
diff --git a/extensions/psm-glue/res/locale/en-US/makefile.win b/extensions/psm-glue/res/locale/en-US/makefile.win
index cadd13b20647..3d458045836e 100644
--- a/extensions/psm-glue/res/locale/en-US/makefile.win
+++ b/extensions/psm-glue/res/locale/en-US/makefile.win
@@ -23,14 +23,15 @@ DEPTH=..\..\..\..\..
 
 include <$(DEPTH)\config\rules.mak>
 
-GLOBAL_DIST=$(DIST)\bin\chrome\locales\en-US\global\locale
-NAV_DIST=$(DIST)\bin\chrome\locales\en-US\navigator\locale
+COMMUNICATOR_DIST=$(DIST)\bin\chrome\locales\en-US\communicator\locale
 
 
 install::
-	$(MAKE_INSTALL) PSMTaskMenu.dtd $(GLOBAL_DIST)
-	$(MAKE_INSTALL) security.properties $(NAV_DIST)
+	$(MAKE_INSTALL) PSMTaskMenu.dtd $(COMMUNICATOR_DIST)
+	$(MAKE_INSTALL) security.properties $(COMMUNICATOR_DIST)
+	$(MAKE_INSTALL) securityOverlay.dtd $(COMMUNICATOR_DIST)
 
 clobber::
-  $(RM) -f $(DIST)\bin\chrome\locales\en-US\global\locale\PSMTaskMenu.dtd
-  $(RM) -f $(DIST)\bin\chrome\locales\en-US\navigator\locale\security.properties
+  $(RM) -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\PSMTaskMenu.dtd
+  $(RM) -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\security.properties
+  $(RM) -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\securityOverlay.dtd
diff --git a/extensions/psm-glue/res/locale/en-US/securityOverlay.dtd b/extensions/psm-glue/res/locale/en-US/securityOverlay.dtd
new file mode 100644
index 000000000000..19e1003c183e
--- /dev/null
+++ b/extensions/psm-glue/res/locale/en-US/securityOverlay.dtd
@@ -0,0 +1,2 @@
+
+<!ENTITY  lockIcon.label  "Show security information for this window">
\ No newline at end of file
diff --git a/mailnews/addrbook/resources/content/addressbook.xul b/mailnews/addrbook/resources/content/addressbook.xul
index b47ea730c1d6..42436d56dfbc 100644
--- a/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mailnews/addrbook/resources/content/addressbook.xul
@@ -23,15 +23,14 @@ Rights Reserved.
 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/addressbook/abDirTreeOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/addressbook/abResultsTreeOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/addressbook/abCardViewOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abMainWindow.dtd">
 
-
 <window xmlns:html="http://www.w3.org/1999/xhtml"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 		xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/mailnews/base/prefs/resources/content/MANIFEST b/mailnews/base/prefs/resources/content/MANIFEST
index ad04cb949dc1..7816736b633a 100644
--- a/mailnews/base/prefs/resources/content/MANIFEST
+++ b/mailnews/base/prefs/resources/content/MANIFEST
@@ -70,3 +70,4 @@ SmtpServerEdit.xul
 SmtpServerEdit.js
 smtpEditOverlay.xul
 smtpEditOverlay.js
+mailPrefsOverlay.xul
diff --git a/mailnews/base/prefs/resources/content/Makefile.in b/mailnews/base/prefs/resources/content/Makefile.in
index 762a5d965649..d4513f7a0aad 100644
--- a/mailnews/base/prefs/resources/content/Makefile.in
+++ b/mailnews/base/prefs/resources/content/Makefile.in
@@ -80,6 +80,7 @@ CHROME_CONTENT = \
 		smtpEditOverlay.js \
 		SmtpServerEdit.xul \
 		SmtpServerEdit.js \
+		mailPrefsOverlay.xul \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul b/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
new file mode 100644
index 000000000000..ada1c0c27dbf
--- /dev/null
+++ b/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
@@ -0,0 +1,81 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % mailPrefsOverlayDTD SYSTEM "chrome://messenger/locale/mailPrefsOverlay.dtd" >
+%mailPrefsOverlayDTD;
+]>
+
+<overlay id="mailPrefsOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script language="JavaScript">
+  <![CDATA[
+    if (panel) {
+      switch(panel) 
+      {
+      case "chrome://communicator/content/pref/pref-advanced.xul":
+        _elementIDs.push("javascriptAllowMailNews");
+        break;
+      case "chrome://communicator/content/pref/pref-appearance.xul":
+        _elementIDs.push("generalStartupMail");
+        break;
+      }
+    }
+  ]]>
+  </script>         
+
+  <!-- javascript toggle for mail/news -->
+  <titledbox id="advancedSettings">
+    <checkbox id="javascriptAllowMailNews" position="5"
+              value="&enbJsCheckMailNews.label;" accesskey="&enbJsCheckMailNews.accesskey;"
+              pref="true" preftype="bool" prefstring="javascript.allow.mailnews"
+              prefattribute="checked"/>
+  </titledbox>
+
+  <!-- mail startup toggle -->
+  <titledbox id="generalStartupPreferences">           
+    <checkbox id="generalStartupMail" wsm_persist="true" position="3"
+              value="&mesCheck.label;" accesskey="&mesCheck.accesskey;"
+              pref="true" preftype="bool" prefstring="general.startup.mail"
+              prefattribute="checked"/>         
+  </titledbox>
+
+  <!-- category tree entries for mail/news -->
+  <treechildren id="panelChildren">
+    <treeitem container="true" open="true" id="mailnews" position="3">
+      <treerow>       
+        <treecell class="treecell-indent" url="chrome://messenger/content/pref-mailnews.xul" value="&mail.label;"/> 
+      </treerow>
+      <treechildren id="messengerChildren">
+        <treeitem>
+          <treerow>
+            <treecell class="treecell-indent" url="chrome://messenger/content/pref-viewing_messages.xul" value="&viewingMessages.label;"/> 
+          </treerow>
+        </treeitem>
+        <treeitem>
+          <treerow>
+            <treecell class="treecell-indent" url="chrome://messenger/content/messengercompose/pref-composing_messages.xul" value="&composingMessages.label;"/> 
+          </treerow>
+        </treeitem>
+        <treeitem>
+          <treerow>
+            <treecell class="treecell-indent" url="chrome://messenger/content/messengercompose/pref-formatting.xul" value="&format.label;"/> 
+          </treerow>
+        </treeitem>
+        <treeitem>
+          <treerow>
+            <treecell class="treecell-indent" url="chrome://messenger/content/addressbook/pref-addressing.xul" value="&address.label;"/> 
+          </treerow>
+        </treeitem>
+        <treeitem>
+          <treerow>
+            <treecell class="treecell-indent" url="chrome://messenger/content/pref-diskspace.xul" value="&disk.label;"/> 
+          </treerow>
+        </treeitem>
+      </treechildren>
+    </treeitem>
+  </treechildren>
+           
+</overlay>         
diff --git a/mailnews/base/prefs/resources/content/makefile.win b/mailnews/base/prefs/resources/content/makefile.win
index 139a7647c442..bc84f705ddfe 100644
--- a/mailnews/base/prefs/resources/content/makefile.win
+++ b/mailnews/base/prefs/resources/content/makefile.win
@@ -75,6 +75,7 @@ CHROME_CONTENT = \
 	.\SmtpServerEdit.js \
 	.\smtpEditOverlay.xul \
 	.\smtpEditOverlay.js \
+	.\mailPrefsOverlay.xul \
 	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/mailnews/base/prefs/resources/locale/en-US/MANIFEST b/mailnews/base/prefs/resources/locale/en-US/MANIFEST
index ae30719c0b7d..dc8e9ecff8c5 100644
--- a/mailnews/base/prefs/resources/locale/en-US/MANIFEST
+++ b/mailnews/base/prefs/resources/locale/en-US/MANIFEST
@@ -45,3 +45,4 @@ prefs.properties
 am-serverwithnoidentities.dtd
 SmtpServerList.dtd
 smtpEditOverlay.dtd
+mailPrefsOverlay.dtd
diff --git a/mailnews/base/prefs/resources/locale/en-US/Makefile.in b/mailnews/base/prefs/resources/locale/en-US/Makefile.in
index 95b243ab3529..97f6da913a05 100644
--- a/mailnews/base/prefs/resources/locale/en-US/Makefile.in
+++ b/mailnews/base/prefs/resources/locale/en-US/Makefile.in
@@ -55,6 +55,7 @@ CHROME_L10N = \
 		am-serverwithnoidentities.dtd   \
 		SmtpServerList.dtd \
 		smtpEditOverlay.dtd \
+		mailPrefsOverlay.dtd \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd b/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd
new file mode 100644
index 000000000000..04290072231a
--- /dev/null
+++ b/mailnews/base/prefs/resources/locale/en-US/mailPrefsOverlay.dtd
@@ -0,0 +1,15 @@
+
+<!ENTITY enbJsCheckMailNews.label     "Enable JavaScript for Mail and News">
+<!ENTITY enbJsCheckMailNews.accesskey "m">
+
+<!--LOCALIZATION NOTE (mesCheck.label): DONT_TRANSLATE -->
+<!ENTITY mesCheck.label "&vendorShortName; Mail">
+<!ENTITY mesCheck.accesskey "m">
+
+<!ENTITY mail.label "Mail and Newsgroups">
+<!ENTITY address.label "Addressing">
+<!ENTITY viewingMessages.label "Viewing Messages">
+<!ENTITY composingMessages.label "Composing Messages">
+<!ENTITY format.label "Formatting">
+<!ENTITY return.label "Return Receipts">
+<!ENTITY disk.label "Disk Space">
diff --git a/mailnews/base/prefs/resources/locale/en-US/makefile.win b/mailnews/base/prefs/resources/locale/en-US/makefile.win
index e2084390b0e7..6b89b98d9adf 100644
--- a/mailnews/base/prefs/resources/locale/en-US/makefile.win
+++ b/mailnews/base/prefs/resources/locale/en-US/makefile.win
@@ -50,6 +50,7 @@ CHROME_L10N = \
 	.\am-serverwithnoidentities.dtd \
 	.\SmtpServerList.dtd \
 	.\smtpEditOverlay.dtd \
+	.\mailPrefsOverlay.dtd \
 	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/mailnews/base/resources/content/MANIFEST b/mailnews/base/resources/content/MANIFEST
index 9da76ad78b74..deb3edb61cd2 100644
--- a/mailnews/base/resources/content/MANIFEST
+++ b/mailnews/base/resources/content/MANIFEST
@@ -54,3 +54,10 @@ msgPrintEngine.js
 msgPrintEngine.xul
 openSaveAttachment.xul
 openSaveAttachment.js
+mailTasksOverlay.xul
+mailNavigatorOverlay.xul
+mailEditorOverlay.xul
+mailABOverlay.xul
+mailMessengerOverlay.xul
+mailMessengerComposeOverlay.xul
+mailOverlay.xul
diff --git a/mailnews/base/resources/content/Makefile.in b/mailnews/base/resources/content/Makefile.in
index 7d27beb55b87..a42af852397e 100644
--- a/mailnews/base/resources/content/Makefile.in
+++ b/mailnews/base/resources/content/Makefile.in
@@ -76,6 +76,13 @@ CHROME_CONTENT = \
 		imapTest.js \
 		openSaveAttachment.xul \
 		openSaveAttachment.js \
+		mailTasksOverlay.xul \
+		mailNavigatorOverlay.xul \
+		mailEditorOverlay.xul \
+		mailABOverlay.xul \
+		mailMessengerOverlay.xul \
+		mailMessengerComposeOverlay.xul \
+		mailOverlay.xul \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mailnews/base/resources/content/folderPane.xul b/mailnews/base/resources/content/folderPane.xul
index ce17afad9820..e235f52d3f5e 100644
--- a/mailnews/base/resources/content/folderPane.xul
+++ b/mailnews/base/resources/content/folderPane.xul
@@ -41,9 +41,13 @@
 		ondragdrop="return DropOnFolderTree(event);"
 		onclick="FolderPaneOnClick(event);"> 
 
+    <treecols>
+	    <treecol persist="width" flex="3*" id="FolderColumn" rdf:resource="http://home.netscape.com/NC-rdf#FolderTreeName"/>
+    </treecols>
+
 	  <template>
 	  	<rule>
-	      <treechildren>
+	      <treechildren flex="1">
 			<treeitem class="folderTreeItem" uri="..." 
 			  SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
 			  BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
@@ -82,11 +86,6 @@
 		</rule>
 	  </template>
 
-	  <treecol persist="width" width="3*" id="FolderColumn" rdf:resource="http://home.netscape.com/NC-rdf#FolderTreeName"/>
-          <treehead>
-            <treerow>
-            </treerow>
-          </treehead>
 	</tree>
 
 </overlay>
diff --git a/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul b/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
index 34cd39218b88..2f426e69e931 100644
--- a/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
+++ b/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
@@ -27,8 +27,9 @@ Rights Reserved.
 <?xul-overlay href="chrome://messenger/content/folderPane.xul"?>
 <?xul-overlay href="chrome://messenger/content/msgHdrViewOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/mailWindowOverlay.xul"?>
+<?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messenger.dtd">
                      
diff --git a/mailnews/base/resources/content/mailABOverlay.xul b/mailnews/base/resources/content/mailABOverlay.xul
new file mode 100644
index 000000000000..3a485b800068
--- /dev/null
+++ b/mailnews/base/resources/content/mailABOverlay.xul
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<!-- retrieve generic commands -->
+<?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
+
+<overlay id="mailABOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <!-- addressbook specific UI items -->
+  <menupopup id="menu_NewPopup">
+    <menuitem id="menu_newMessage"   observes="cmd_newMessage" position="6"/>
+    <menuitem id="menu_newCard"      observes="cmd_newCard" position="7"/>
+  </menupopup>
+
+</overlay>
+
diff --git a/mailnews/base/resources/content/mailEditorOverlay.xul b/mailnews/base/resources/content/mailEditorOverlay.xul
new file mode 100644
index 000000000000..f00a4d65843b
--- /dev/null
+++ b/mailnews/base/resources/content/mailEditorOverlay.xul
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+
+<!-- retrieve generic commands -->
+<?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/content/mailEditorOverlay.dtd">
+
+<overlay id="mailEditorOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script language="JavaScript">
+  <![CDATA[
+
+    function sendPage()
+      {
+        var pageUrl = window.content.location.href;
+        var pageTitle =  window.content.document.title;
+        window.openDialog( "chrome://messenger/content/messengercompose/messengercompose.xul", "_blank", 
+                           "chrome,all,dialog=no", 
+                           "attachment='" + pageUrl + "',body='" + pageUrl +
+                           "',subject='" + pageTitle + "',bodyislink=true");
+      }
+  
+  ]]>
+  </script>         
+
+  <!-- editor specific commands -->
+  <broadcasterset id="broadcasterset">
+  	<broadcaster id="cmd_sendPage" value="&sendPage.label;" accesskey="&sendPage.accesskey;" oncommand="SendPage();"/>
+  </broadcasterset>
+
+  <!-- editor specific UI items -->
+  <menupopup id="menu_NewPopup">
+    <menuitem id="menu_newMessage"   observes="cmd_newMessage" position="2"/>
+    <menuitem id="menu_newCard"      observes="cmd_newCard" position="3"/>
+  </menupopup>
+
+  <menupopup id="menu_FilePopup">
+    <menuitem id="menu_sendPage" observes="cmd_sendPage" position="11"/>
+  </menupopup>  
+  
+</overlay>
+
diff --git a/mailnews/base/resources/content/mailMessengerComposeOverlay.xul b/mailnews/base/resources/content/mailMessengerComposeOverlay.xul
new file mode 100644
index 000000000000..254fa1f4c469
--- /dev/null
+++ b/mailnews/base/resources/content/mailMessengerComposeOverlay.xul
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<!-- retrieve generic commands -->
+<?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
+
+<overlay id="mailMessengerComposeOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <!-- messengercompose specific UI items -->
+  <menupopup id="menu_NewPopup">
+    <menuitem id="menu_newMessage"   observes="cmd_newMessage" position="2"/>
+    <menuitem id="menu_newCard"      observes="cmd_newCard" position="3"/>
+  </menupopup>
+
+</overlay>
+
diff --git a/mailnews/base/resources/content/mailMessengerOverlay.xul b/mailnews/base/resources/content/mailMessengerOverlay.xul
new file mode 100644
index 000000000000..437692917c3f
--- /dev/null
+++ b/mailnews/base/resources/content/mailMessengerOverlay.xul
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+
+<!-- retrieve generic commands -->
+<?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
+
+<overlay id="mailABOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <!-- addressbook specific UI items -->
+  <menupopup id="menu_NewPopup">
+    <menuitem id="menu_newMessage"   observes="cmd_newMessage" position="5"/>
+    <menuitem id="menu_newCard"      observes="cmd_newCard" position="6"/>
+  </menupopup>
+
+</overlay>
+
diff --git a/mailnews/base/resources/content/mailNavigatorOverlay.xul b/mailnews/base/resources/content/mailNavigatorOverlay.xul
new file mode 100644
index 000000000000..b9708c1ef056
--- /dev/null
+++ b/mailnews/base/resources/content/mailNavigatorOverlay.xul
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+
+<!-- retrieve generic commands -->
+<?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/mailNavigatorOverlay.dtd">
+
+<overlay id="mailNavigatorOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script language="JavaScript">
+  <![CDATA[
+
+    function sendLink(pageUrl, pageTitle)
+      {
+        window.openDialog( "chrome://messenger/content/messengercompose/messengercompose.xul", "_blank", 
+                           "chrome,all,dialog=no",
+                           "body='" + pageUrl + "',subject='" + pageTitle +
+                           "',bodyislink=true");
+      }
+
+    function sendPage()
+      {
+        var pageUrl = window.content.location.href;
+        var pageTitle =  window.content.document.title;
+        window.openDialog( "chrome://messenger/content/messengercompose/messengercompose.xul", "_blank", 
+                           "chrome,all,dialog=no", 
+                           "attachment='" + pageUrl + "',body='" + pageUrl +
+                           "',subject='" + pageTitle + "',bodyislink=true");
+      }
+  
+  ]]>
+  </script>         
+
+  <!-- navigator specific commands -->
+  <broadcasterset id="broadcasterset">
+  	<broadcaster id="cmd_sendPage" value="&sendPage.label;" accesskey="&sendPage.accesskey;" oncommand="SendPage();"/>
+  	<broadcaster id="Browser:SendLink" value="&sendLinkCmd.label;" accesskey="&sendLinkCmd.accesskey;" oncommand="sendLink(window.content.location.href, window.content.document.title);"/>
+  </broadcasterset>
+         
+  <!-- navigator specific UI items -->
+  <menupopup id="menu_NewPopup">
+    <menuitem id="menu_newMessage"   observes="cmd_newMessage" position="2"/>
+    <menuitem id="menu_newCard"      observes="cmd_newCard" position="3"/>
+  </menupopup>
+
+  <menupopup id="menu_FilePopup">
+    <menuitem id="menu_sendPage" observes="cmd_sendPage" position="11"/>
+	  <menuitem id="menu_sendLink" observes="Browser:SendLink" position="12"/>
+  </menupopup>
+  
+</overlay>
+
diff --git a/mailnews/base/resources/content/mailOverlay.xul b/mailnews/base/resources/content/mailOverlay.xul
new file mode 100644
index 000000000000..9d704e9cb83b
--- /dev/null
+++ b/mailnews/base/resources/content/mailOverlay.xul
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/mailOverlay.dtd">
+
+<overlay id="mailOverlay.xul"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script language="JavaScript">
+  <![CDATA[
+    function goNewCardDialog(selectedAB)
+      {
+      	window.openDialog("chrome://messenger/content/addressbook/abNewCardDialog.xul",
+      					  "",
+    	  				  "chrome,resizeable=no,modal",
+    		  			  {selectedAB:selectedAB});
+      }
+
+    function goOpenNewMessage()
+      {
+      	var msgComposeService = Components.classes["component://netscape/messengercompose"].getService(); 
+      	msgComposeService = msgComposeService.QueryInterface(Components.interfaces.nsIMsgComposeService); 
+        msgComposeService.OpenComposeWindow(null, null,
+										                        Components.interfaces.nsIMsgCompType.New,
+                        										Components.interfaces.nsIMsgCompFormat.Default,
+                        										null); 
+      }  
+
+  ]]>
+  </script>
+         
+  <!-- generic commands -->  
+  <broadcasterset id="broadcasterset">
+  	<broadcaster id="cmd_newMessage" value="&newMessageCmd.label;" accesskey="&newMessageCmd.accesskey;" oncommand="goOpenNewMessage();"/>
+	  <broadcaster id="cmd_newCard" value="&newCardCmd.label;" accesskey="&newCardCmd.accesskey;" oncommand="goNewCardDialog(0)"/>
+  </broadcasterset>    
+
+  <keyset id="keyset">
+  	<key id="key_newMessage" xulkey="true" key="&newMessageCmd.key;" observes="cmd_newMessage"/>
+  </keyset>
+         
+</overlay>
\ No newline at end of file
diff --git a/mailnews/base/resources/content/mailTasksOverlay.xul b/mailnews/base/resources/content/mailTasksOverlay.xul
new file mode 100644
index 000000000000..78ae2145534d
--- /dev/null
+++ b/mailnews/base/resources/content/mailTasksOverlay.xul
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % mailTasksOverlayDTD SYSTEM "chrome://messenger/locale/mailTasksOverlay.dtd" >
+%mailTasksOverlayDTD;
+]>
+
+<overlay id="mailPrefsOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script language="JavaScript">
+  <![CDATA[
+    // uses "toOpenWindowByType" function provided by utilityOverlay.js
+    // which is included by most clients. 
+    function toMessengerWindow()
+      {
+        var windowDoc = "chrome://messenger/content/messenger.xul";
+      	try
+          {
+    	    	var layoutType = pref.GetIntPref("mail.pane_config");
+    			  windowDoc = !layoutType ? "chrome://messenger/content/messenger.xul" : 
+                                          "chrome://messenger/content/mail3PaneWindowVertLayout.xul";
+    	    }
+    	  catch(ex)
+    	    {
+    	    }
+		    toOpenWindowByType("mail:3pane", windowDoc);
+      }
+    
+    function toAddressBook() 
+      {
+    	  toOpenWindowByType("mail:addressbook", "chrome://messenger/content/addressbook/addressbook.xul");
+      }
+    
+    function toNewsgroups() 
+      {
+        dump ("Sorry, command not implemented.\n");
+      }
+
+    function toImport()
+      {
+      	window.openDialog("chrome://messenger/content/importDialog.xul","importDialog","chrome, modal", {importType: "addressbook"});
+      }
+
+  ]]>
+  </script>         
+         
+  <box id="taskButtons">
+    <button class="button-toolbar-4 plain taskbutton" id="mini-mail" onclick="toMessengerWindow()" 
+            position="2" tooltip="aTooltip" tooltiptext="&taskMessenger.tooltip;"/>
+  </box>
+  
+  <menupopup id="taskPopup">
+    <menuitem position="2" value="&messengerCmd.label;" oncommand="toMessengerWindow()"/>
+  </menupopup>
+  
+</overlay>         
+
diff --git a/mailnews/base/resources/content/mailWindowOverlay.xul b/mailnews/base/resources/content/mailWindowOverlay.xul
index 729d96085691..3444bdd83e70 100644
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -39,7 +39,6 @@ Rights Reserved.
 <broadcasterset id="broadcasterset">
 	<!-- File Menu -->
 	<broadcaster id="cmd_newNavigator"/>
-	<broadcaster id="cmd_newMessage"/>
 	<broadcaster id="cmd_newEditor"/>
 	<broadcaster id="cmd_close" oncommand="CloseMailWindow()"/>
  	<broadcaster id="cmd_quit"/>
@@ -102,7 +101,6 @@ Rights Reserved.
 <keyset id="keyset">
 	<!-- File Menu -->
 	<key id="key_newNavigator"/>
-	<key id="key_newMessage"/>
 	<key id="key_close"/>
 	<key id="key_quit"/>
 	<!-- Edit Menu -->
@@ -338,8 +336,6 @@ Rights Reserved.
                      oncommand="MsgAccountWizard();"/>
 					<menuseparator/>
 					<menuitem id="menu_newNavigator"/>
-					<menuitem id="menu_newMessage"/>
-					<menuitem id="cmd_newCard"/>
 					<menuitem id="menu_newEditor"/>
 				</menupopup>
 			</menu>
diff --git a/mailnews/base/resources/content/makefile.win b/mailnews/base/resources/content/makefile.win
index ea140d3f61b7..b4a71b480e63 100644
--- a/mailnews/base/resources/content/makefile.win
+++ b/mailnews/base/resources/content/makefile.win
@@ -67,6 +67,13 @@ CHROME_CONTENT = \
 	.\msgPrintEngine.xul \
 	.\openSaveAttachment.xul \
 	.\openSaveAttachment.js \
+	.\mailTasksOverlay.xul \
+	.\mailNavigatorOverlay.xul \
+	.\mailEditorOverlay.xul \
+	.\mailABOverlay.xul \
+	.\mailMessengerOverlay.xul \
+	.\mailMessengerComposeOverlay.xul \
+	.\mailOverlay.xul \
 	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/mailnews/base/resources/content/manifest.rdf b/mailnews/base/resources/content/manifest.rdf
index d51848d67541..6823b66c7dd9 100644
--- a/mailnews/base/resources/content/manifest.rdf
+++ b/mailnews/base/resources/content/manifest.rdf
@@ -13,4 +13,67 @@
         chrome:author="mozilla.org"
         chrome:name="messenger">
   </RDF:Description>
+
+  <!-- overlay information -->
+  <RDF:Seq about="urn:mozilla:overlays">
+    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
+    <RDF:li resource="chrome://communicator/content/pref/pref-appearance.xul"/>
+    <RDF:li resource="chrome://communicator/content/pref/pref-advanced.xul"/>
+    <RDF:li resource="chrome://communicator/content/tasksOverlay.xul"/>
+    <RDF:li resource="chrome://navigator/content/navigatorOverlay.xul"/>
+    <RDF:li resource="chrome://messenger/content/messenger.xul"/>
+    <RDF:li resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul"/>
+    <RDF:li resource="chrome://messenger/content/addressbook/addressbook.xul"/>
+    <RDF:li resource="chrome://editor/content/editor.xul"/>
+  </RDF:Seq>
+
+
+  <!-- messenger preferences branches -->
+  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
+    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger startup pref -->
+  <RDF:Seq about="chrome://communicator/content/pref/pref-appearance.xul">
+    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger js toggle pref -->
+  <RDF:Seq about="chrome://communicator/content/pref/pref-advanced.xul">
+    <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger taskbar/tasks menu items -->
+  <RDF:Seq about="chrome://communicator/content/tasksOverlay.xul">
+    <RDF:li>chrome://messenger/content/mailTasksOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for Navigator -->
+  <RDF:Seq about="chrome://navigator/content/navigatorOverlay.xul">
+    <RDF:li>chrome://messenger/content/mailNavigatorOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for Messenger -->
+  <RDF:Seq about="chrome://messenger/content/messenger.xul">
+    <RDF:li>chrome://messenger/content/mailMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+  <RDF:Seq about="chrome://messenger/content/mail3PaneWindowVertLayout.xul">
+    <RDF:li>chrome://messenger/content/mailMessengerOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <!-- messenger items for Mail Compose -->
+  <RDF:Seq about="chrome://messenger/content/messengercompose/messengercompose.xul">
+    <RDF:li>chrome://messenger/content/mailMessengerComposeOverlay.xul</RDF:li>
+  </RDF:Seq>
+  
+  <!-- messenger items for Addressbook -->
+  <RDF:Seq about="chrome://messenger/content/addressbook/addressbook.xul">
+    <RDF:li>chrome://messenger/content/mailABOverlay.xul</RDF:li>
+  </RDF:Seq>
+  
+  <!-- messenger items for Composer -->
+  <RDF:Seq about="chrome://editor/content/editor.xul">
+    <RDF:li>chrome://messenger/content/mailEditorOverlay.xul</RDF:li>
+  </RDF:Seq>
+  
 </RDF:RDF>
diff --git a/mailnews/base/resources/content/messageWindow.xul b/mailnews/base/resources/content/messageWindow.xul
index 2a7e3b091a64..8f55325137bc 100644
--- a/mailnews/base/resources/content/messageWindow.xul
+++ b/mailnews/base/resources/content/messageWindow.xul
@@ -22,7 +22,7 @@ Rights Reserved.
 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/platformMailnewsOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/msgHdrViewOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/mailWindowOverlay.xul"?>
diff --git a/mailnews/base/resources/content/messenger.xul b/mailnews/base/resources/content/messenger.xul
index 1041414e9526..1ad42a6ea153 100644
--- a/mailnews/base/resources/content/messenger.xul
+++ b/mailnews/base/resources/content/messenger.xul
@@ -27,8 +27,9 @@ Rights Reserved.
 <?xul-overlay href="chrome://messenger/content/folderPane.xul"?>
 <?xul-overlay href="chrome://messenger/content/msgHdrViewOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/mailWindowOverlay.xul"?>
+<?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
 
 <!DOCTYPE window [
diff --git a/mailnews/base/resources/content/subscribe.xul b/mailnews/base/resources/content/subscribe.xul
index c9a998205927..36ba6ea42f82 100644
--- a/mailnews/base/resources/content/subscribe.xul
+++ b/mailnews/base/resources/content/subscribe.xul
@@ -86,7 +86,7 @@ Rights Reserved.
               onclick="SubscribeOnClick(event);"> 
           <template>
             <rule>    
-              <treechildren>
+              <treechildren flex="1">
                 <treeitem uri="..." name="rdf:http://home.netscape.com/NC-rdf#Name" Subscribed="rdf:http://home.netscape.com/NC-rdf#Subscribed">
                   <treerow>
                     <treecell indent="true" class="treecell-indent" value="rdf:http://home.netscape.com/NC-rdf#LeafName"/>
@@ -99,9 +99,9 @@ Rights Reserved.
           </template>
     
           <treecolgroup id="theSubscribeColumns">
-            <treecol width="7*" id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
-            <treecol width="1*" id="SubscribedColumn" rdf:resource="http://home.netscape.com/NC-rdf#Subscribed"/>
-            <treecol width="1*" id="TotalMessagesColumn" rdf:resource="http://home.netscape.com/NC-rdf#TotalMessages"/>
+            <treecol flex="7*" id="NameColumn" rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
+            <treecol flex="1*" id="SubscribedColumn" rdf:resource="http://home.netscape.com/NC-rdf#Subscribed"/>
+            <treecol flex="1*" id="TotalMessagesColumn" rdf:resource="http://home.netscape.com/NC-rdf#TotalMessages"/>
           </treecolgroup>
     
           <treehead>	
diff --git a/mailnews/base/resources/content/threadPane.xul b/mailnews/base/resources/content/threadPane.xul
index ce552a99da73..79239a767736 100644
--- a/mailnews/base/resources/content/threadPane.xul
+++ b/mailnews/base/resources/content/threadPane.xul
@@ -89,21 +89,21 @@ Rights Reserved.
 	</rule>
   </template>
 
-  <treecolgroup id="theThreadColumns">
+  <treecols id="theThreadColumns">
 	  <treecol persist="hidden width" fixed="true" width="20" id="ThreadColumn" rdf:resource="http://home.netscape.com/NC-rdf#Thread"/>
-	  <treecol persist="hidden width" width="7*" id="SubjectColumn" rdf:resource="http://home.netscape.com/NC-rdf#Subject"/>
-	  <treecol persist="hidden width" width="4*" id="AuthorColumn" rdf:resource="http://home.netscape.com/NC-rdf#Sender"/>
+	  <treecol persist="hidden width" flex="7*" id="SubjectColumn" rdf:resource="http://home.netscape.com/NC-rdf#Subject"/>
+	  <treecol persist="hidden width" flex="4*" id="AuthorColumn" rdf:resource="http://home.netscape.com/NC-rdf#Sender"/>
 	  <treecol persist="hidden width" fixed="true" width="20" id="UnreadButtonColumn"/>
-	  <treecol persist="hidden width" width="2*" id="DateColumn" rdf:resource="http://home.netscape.com/NC-rdf#Date"/>
-	  <treecol persist="hidden width" width="1*" id="PriorityColumn" rdf:resource="http://home.netscape.com/NC-rdf#Priority"/>
+	  <treecol persist="hidden width" flex="2*" id="DateColumn" rdf:resource="http://home.netscape.com/NC-rdf#Date"/>
+	  <treecol persist="hidden width" flex="1*" id="PriorityColumn" rdf:resource="http://home.netscape.com/NC-rdf#Priority"/>
 	  <treecol persist="hidden width" fixed="true" width="20" id="FlaggedButtonColumn"/>
-	  <treecol persist="hidden width" width="1*" id="StatusColumn" rdf:resource="http://home.netscape.com/NC-rdf#Status"/>
-	  <treecol persist="hidden width" width="1*" id="SizeColumn" rdf:resource="http://home.netscape.com/NC-rdf#Size"/>
-	  <treecol persist="hidden width" width="1*" id="UnreadColumn" rdf:resource="http://home.netscape.com/NC-rdf#TotalUnreadMessages"/>
-	  <treecol persist="hidden width" width="1*" id="TotalColumn" rdf:resource="http://home.netscape.com/NC-rdf#TotalMessages"/>
+	  <treecol persist="hidden width" flex="1*" id="StatusColumn" rdf:resource="http://home.netscape.com/NC-rdf#Status"/>
+	  <treecol persist="hidden width" flex="1*" id="SizeColumn" rdf:resource="http://home.netscape.com/NC-rdf#Size"/>
+	  <treecol persist="hidden width" flex="1*" id="UnreadColumn" rdf:resource="http://home.netscape.com/NC-rdf#TotalUnreadMessages"/>
+	  <treecol persist="hidden width" flex="1*" id="TotalColumn" rdf:resource="http://home.netscape.com/NC-rdf#TotalMessages"/>
 	  <treecol persist="hidden width" fixed="true" width="1" id="OrderReceivedColumn" rdf:resource="http://home.netscape.com/NC-rdf#OrderReceived"/>
 	  <treecol persist="width" fixed="true" width="16" id="PopupColumn"/>
-  </treecolgroup>
+  </treecols>
 
   <treehead>
     <treerow id="headRow">
@@ -130,6 +130,6 @@ Rights Reserved.
 		</treecell>
 	</treerow>
   </treehead>
-
+  <treechildren flex="1"/>
 </tree>
 </overlay>
diff --git a/mailnews/base/resources/locale/en-US/MANIFEST b/mailnews/base/resources/locale/en-US/MANIFEST
index f8dc8c8b6b47..e3a8d0129179 100644
--- a/mailnews/base/resources/locale/en-US/MANIFEST
+++ b/mailnews/base/resources/locale/en-US/MANIFEST
@@ -9,3 +9,7 @@ sidebar-messenger.dtd
 sidebar-messenger-rdf.dtd
 msgFolderPickerOverlay.dtd
 msgHdrViewOverlay.dtd
+mailTasksOverlay.dtd
+mailNavigatorOverlay.dtd
+mailEditorOverlay.dtd
+mailOverlay.dtd
diff --git a/mailnews/base/resources/locale/en-US/Makefile.in b/mailnews/base/resources/locale/en-US/Makefile.in
index e607e7660a6a..a94346b0a287 100644
--- a/mailnews/base/resources/locale/en-US/Makefile.in
+++ b/mailnews/base/resources/locale/en-US/Makefile.in
@@ -41,6 +41,10 @@ CHROME_L10N = \
 		sidebar-messenger.dtd \
 		sidebar-messenger-rdf.dtd \
 		msgFolderPickerOverlay.dtd	\
+		mailTasksOverlay.dtd \
+		mailNavigatorOverlay.dtd \
+		mailEditorOverlay.dtd \
+		mailOverlay.dtd \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mailnews/base/resources/locale/en-US/mailEditorOverlay.dtd b/mailnews/base/resources/locale/en-US/mailEditorOverlay.dtd
new file mode 100644
index 000000000000..871472d08c03
--- /dev/null
+++ b/mailnews/base/resources/locale/en-US/mailEditorOverlay.dtd
@@ -0,0 +1,3 @@
+
+<!ENTITY sendPage.label                   "Send Page">
+<!ENTITY sendPage.accesskey               "g">
diff --git a/mailnews/base/resources/locale/en-US/mailNavigatorOverlay.dtd b/mailnews/base/resources/locale/en-US/mailNavigatorOverlay.dtd
new file mode 100644
index 000000000000..68a5911b0a8a
--- /dev/null
+++ b/mailnews/base/resources/locale/en-US/mailNavigatorOverlay.dtd
@@ -0,0 +1,11 @@
+
+<!-- File->New->Message -->
+<!ENTITY  newMessageCmd.label             "Message">
+<!ENTITY  newMessageCmd.accesskey         "m">
+
+<!ENTITY sendPage.label                   "Send Page">
+<!ENTITY sendPage.accesskey               "g">
+
+<!ENTITY sendLinkCmd.label                "Send Link"> 
+<!ENTITY sendLinkCmd.accesskey            "i">
+
diff --git a/mailnews/base/resources/locale/en-US/mailOverlay.dtd b/mailnews/base/resources/locale/en-US/mailOverlay.dtd
new file mode 100644
index 000000000000..e4884db27b14
--- /dev/null
+++ b/mailnews/base/resources/locale/en-US/mailOverlay.dtd
@@ -0,0 +1,8 @@
+
+<!ENTITY  newMessageCmd.key               "M">
+<!ENTITY  newMessageCmd.label             "Message">
+<!ENTITY  newMessageCmd.accesskey         "m">
+ 
+<!ENTITY  newCardCmd.label                "Address Book Card">
+<!ENTITY  newCardCmd.accesskey            "a">
+ 
diff --git a/mailnews/base/resources/locale/en-US/mailTasksOverlay.dtd b/mailnews/base/resources/locale/en-US/mailTasksOverlay.dtd
new file mode 100644
index 000000000000..98e128a0b3e8
--- /dev/null
+++ b/mailnews/base/resources/locale/en-US/mailTasksOverlay.dtd
@@ -0,0 +1,6 @@
+
+<!-- LOCALIZATION NOTE (messengerCmd.label): DONT_TRANSLATE -->
+<!ENTITY messengerCmd.label					"&vendorShortName; Mail">
+
+<!ENTITY taskMessenger.tooltip  "&brandShortName; Mail">
+
diff --git a/mailnews/base/resources/locale/en-US/makefile.win b/mailnews/base/resources/locale/en-US/makefile.win
index 519b85787421..0ff1a7b0a6d7 100644
--- a/mailnews/base/resources/locale/en-US/makefile.win
+++ b/mailnews/base/resources/locale/en-US/makefile.win
@@ -36,6 +36,10 @@ CHROME_L10N = \
 	.\sidebar-messenger-rdf.dtd \
 	.\msgFolderPickerOverlay.dtd \
 	.\msgHdrViewOverlay.dtd \
+	.\mailTasksOverlay.dtd \
+	.\mailNavigatorOverlay.dtd \
+	.\mailEditorOverlay.dtd \
+	.\mailOverlay.dtd \
 	$(NULL)
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/mailnews/compose/resources/content/messengercompose.xul b/mailnews/compose/resources/content/messengercompose.xul
index 7031db355245..5b5ccd81e717 100644
--- a/mailnews/compose/resources/content/messengercompose.xul
+++ b/mailnews/compose/resources/content/messengercompose.xul
@@ -22,7 +22,7 @@
   -->
 
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/messengercompose/addressingWidgetOverlay.xul"?>
 <?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
 
@@ -87,7 +87,6 @@ Rights Reserved.
 <broadcasterset id="broadcasterset">
 	<!-- File Menu -->
 	<broadcaster id="cmd_newNavigator"/>
-	<broadcaster id="cmd_newMessage"/>
 	<broadcaster id="cmd_newEditor"/>
 	<broadcaster id="cmd_close" oncommand="if (ComposeCanClose()) CloseWindow()"/>
 	<broadcaster id="cmd_attachFile" oncommand="AttachFile()"/>
@@ -124,7 +123,6 @@ Rights Reserved.
 <keyset id="keyset">
 	<!-- File Menu -->
 	<key id="key_newNavigator"/>
-	<key id="key_newMessage"/>
 	<key id="key_close"/>
 	<key id="key_save" xulkey="true" key="&saveCmd.key;" disabled="true"/>
 	<!-- key id="key_attachFile" xulkey="true" key="&attachFileCmd.key;" observes="cmd_attachFile"/ -->
@@ -183,8 +181,6 @@ ACTUALLY, EVERY TIME YOU TYPE ANY OF THE KEY DEFINED HERE AFTER WITHOUT ANY OF T
         <menu id="menu_New">
           <menupopup id="menu_NewPopup">
             <menuitem id="menu_newNavigator"/>
-            <menuitem id="menu_newMessage"/>
-            <menuitem id="cmd_newCard"/>
             <menuitem id="menu_newEditor"/>
           </menupopup>
         </menu>
diff --git a/mailnews/news/resources/content/downloadheaders.js b/mailnews/news/resources/content/downloadheaders.js
index c0954fb1d7f0..2440cc41e992 100644
--- a/mailnews/news/resources/content/downloadheaders.js
+++ b/mailnews/news/resources/content/downloadheaders.js
@@ -19,6 +19,7 @@
  *
  * Contributor(s):
  *	Seth Spitzer <sspitzer@netscape.com>
+ *  Ben Goodger <ben@netscape.com>
  */  
 
 var newmessages = "";
@@ -63,11 +64,15 @@ function OnLoad()
 		var downloadHeadersTitlePrefix = Bundle.GetStringFromName("downloadHeadersTitlePrefix");
 		var downloadHeadersInfoText1 = Bundle.GetStringFromName("downloadHeadersInfoText1");
 		var downloadHeadersInfoText2 = Bundle.GetStringFromName("downloadHeadersInfoText2");
+    var okButtonText = Bundle.GetStringFromName("okButtonText");
 
 		// doesn't JS have a printf?
-		window.title = downloadHeadersTitlePrefix + " " + newsgroupname;
+		window.title = downloadHeadersTitlePrefix;
 		var infotext = downloadHeadersInfoText1 + " " + newmessages + " " + downloadHeadersInfoText2;
-		setText('info',infotext);
+		setText('info',infotext); 
+    var okbutton = document.getElementById("ok");
+    okbutton.setAttribute("value", okButtonText);
+    setText("newsgroupLabel", newsgroupname);
 	}
 
 
@@ -83,7 +88,10 @@ function OnLoad()
 function setText(id, value) {
     var element = document.getElementById(id);
     if (!element) return;
- 	element.setAttribute('value',value);
+ 	  if (element.hasChildNodes())  
+      element.removeChild(element.firstChild);
+    var textNode = document.createTextNode(value);
+    element.appendChild(textNode);
 }
 
 function OkButtonCallback() {
@@ -111,3 +119,17 @@ function CancelButtonCallback() {
     param.SetInt(0, 0); /* user hit Cancel */
 	return true;
 }
+
+function doCheckboxEnabling() {
+  var allRadio = document.getElementById("all");
+  var checkbox = document.getElementById("markread");
+  var numberFld = document.getElementById("number");
+  if (allRadio && allRadio.checked) {
+    checkbox.setAttribute("disabled", "true");
+    numberFld.setAttribute("disabled", "true");
+  }
+  else {
+    checkbox.removeAttribute("disabled");
+    numberFld.removeAttribute("disabled");
+  }
+}
\ No newline at end of file
diff --git a/mailnews/news/resources/content/downloadheaders.xul b/mailnews/news/resources/content/downloadheaders.xul
index 23c6cdb741fa..e7f65d1f4977 100644
--- a/mailnews/news/resources/content/downloadheaders.xul
+++ b/mailnews/news/resources/content/downloadheaders.xul
@@ -17,6 +17,10 @@ The Initial Developer of the Original Code is Netscape
 Communications Corporation. Portions created by Netscape are
  Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
+
+Contributor(s):
+  Ben Goodger <ben@netscape.com>
+
 --> 
 
 <?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?> 
@@ -27,35 +31,33 @@ Rights Reserved.
 
 <window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        class="dialog" style="max-width: 27em; user-focus: ignore !important"
         orient="vertical"
-        class="dialog"
-		onload="OnLoad()">
+        onload="OnLoad()">
 
-<script language="JavaScript" src="chrome://global/content/strres.js" />
-<script language="JavaScript" src="chrome://messenger/content/downloadheaders.js" />
+  <script language="JavaScript" src="chrome://global/content/strres.js" />
+  <script language="JavaScript" src="chrome://messenger/content/downloadheaders.js" />
 
-	<box orient="vertical">
-		<spring flex="100%"/>
-		<text id="info"/>
-		<radiogroup orient="vertical" id="downloadGroup">
-			<box orient="horizontal">
-				<radio group="downloadGroup" id="all" /> 
-				<text value="&all.label;" />
-			</box>
-			<box orient="horizontal">
-				<radio group="downloadGroup" id="some" checked="true" />
-				<text value="&download.label;" />
-				<textfield id="number" size="10"/>
-				<text value="&headers.label;" />
-			</box>
-		</radiogroup>
-
-		<box orient="horizontal" flex="100%">
-			<checkbox id="markread"/>
-			<text value="&mark.label;" />
-		</box>
-
-		<spring flex="100%"/>
-		<box id="okCancelButtons"/>
-	</box>
+  <keyset id="keyset"/>
+  
+  <html class="header" style="width: 25em; max-width: 25em;" id="newsgroupLabel"/> 
+  <html style="width: 25em; max-width: 25em;" id="info"/>
+  <separator class="thin"/>
+  <box class="indent" orient="vertical">
+    <radiogroup orient="vertical" id="downloadGroup" autostretch="never">
+      <radio group="downloadGroup" id="all" value="&all.label;" oncommand="doCheckboxEnabling(this);"/> 
+      <separator class="thin"/>
+      <box autostretch="never" valign="middle">
+        <radio group="downloadGroup" id="some" checked="true" value="&download.label;" oncommand="doCheckboxEnabling(this);"/>
+        <textfield id="number" size="7"/>
+        <text class="label" value="&headers.label;" />
+      </box>
+    </radiogroup>
+    <box class="indent" autostretch="never">
+      <checkbox id="markread" value="&mark.label;"/>
+    </box>
+  </box>
+  <separator/>
+  <box id="okCancelButtonsRight"/>
+  
 </window>
diff --git a/mailnews/news/resources/locale/en-US/news.properties b/mailnews/news/resources/locale/en-US/news.properties
index 102a40abc1b9..e0d615b646bb 100644
--- a/mailnews/news/resources/locale/en-US/news.properties
+++ b/mailnews/news/resources/locale/en-US/news.properties
@@ -19,7 +19,7 @@
 #	Seth Spitzer <sspitzer@netscape.com>
 #	David Bienvenu <bienvenu@netscape.com>
 #
-downloadHeadersTitlePrefix=Download headers for:
+downloadHeadersTitlePrefix=Download Headers
 downloadHeadersInfoText1=There are
 downloadHeadersInfoText2=new message headers to download for this newsgroup.
 htmlNewsError=<TITLE>Error!</TITLE>\n<H1>Error!</H1> newsgroup server responded: <b>%.256s</b><p>\n
@@ -32,3 +32,5 @@ errorFromServer=A News (NNTP) error occurred:
 enterUsername=Please enter a username for news server access
 enterPassword=Please enter a password for news server access
 enterPasswordTitle=News Password
+okButtonText=Download
+
diff --git a/xpfe/browser/resources/content/navigator.js b/xpfe/browser/resources/content/navigator.js
index 68b9db6c7218..0565e95a29cb 100644
--- a/xpfe/browser/resources/content/navigator.js
+++ b/xpfe/browser/resources/content/navigator.js
@@ -438,6 +438,8 @@ function Startup()
     }
     if (homepage)
       setTooltipText("homebutton", homepage);
+
+    initConsoleListener();
   }
 
 function Shutdown()
@@ -1220,14 +1222,6 @@ function BrowserEditBookmarks()
 	window.open("chrome://messenger/content/addressbook/addressbook.xul", "_blank", "chrome,menubar,toolbar,resizable");
   }
 
-  function BrowserSendLink(pageUrl, pageTitle)
-  {
-    window.openDialog( "chrome://messenger/content/messengercompose/messengercompose.xul", "_blank", 
-                       "chrome,all,dialog=no",
-                       "body='" + pageUrl + "',subject='" + pageTitle +
-                       "',bodyislink=true");
-  }
-
   function BrowserSendPage(pageUrl, pageTitle)
   {
     window.openDialog( "chrome://messenger/content/messengercompose/messengercompose.xul", "_blank", 
@@ -1476,4 +1470,63 @@ function dumpMemoryLeaks() {
 	if (leakDetector != null)
 		leakDetector.dumpLeaks();
 }
- 
+
+var consoleListener = {
+  observe: function (aMsgObject) 
+    {
+      const nsIScriptError = Components.interfaces.nsIScriptError;
+      var scriptError = aMsgObject.QueryInterface(nsIScriptError);
+      var isWarning = scriptError.flags & nsIScriptError.warningFlag != 0;
+      if (!isWarning) 
+        {
+          var statusbarDisplay = document.getElementById("statusbar-display");
+          statusbarDisplay.setAttribute("error", "true");
+          statusbarDisplay.addEventListener("click", loadErrorConsole, true);
+          statusbarDisplay.value = bundle.GetStringFromName("jserror");
+          this.isShowingError = true;
+        }
+    },
+
+  // whether or not an error alert is being displayed
+  isShowingError: false,
+    
+};
+
+function initConsoleListener()
+{
+  var consoleService = nsJSComponentManager.getService("mozilla.consoleservice.1", "nsIConsoleService");
+
+  /**
+   * XXX - console launch hookup requires some work that I'm not sure how to
+   *       do.
+   *
+   *       1) ideally, the notification would disappear when the document that had the
+   *          error was flushed. how do I know when this happens? All the nsIScriptError
+   *          object I get tells me is the URL. Where is it located in the content area?
+   *       2) the notification service should not display chrome script errors.
+   *          web developers and users are not interested in the failings of our shitty, 
+   *          exception unsafe js. One could argue that this should also extend to
+   *          the console by default (although toggle-able via setting for chrome authors)
+   *          At any rate, no status indication should be given for chrome script
+   *          errors. 
+   * 
+   *       As a result I am commenting out this for the moment. 
+   **/  
+  //if (consoleService)
+  //  consoleService.registerListener(consoleListener);
+} 
+
+function loadErrorConsole(aEvent)
+{
+  if (aEvent.detail == 2)
+    toJavaScriptConsole();
+}
+
+function clearErrorNotification()
+{
+  var statusbarDisplay = document.getElementById("statusbar-display");
+  statusbarDisplay.removeAttribute("error");
+  statusbarDisplay.removeEventListener("click", loadErrorConsole, true);
+  consoleListener.isShowingError = false;
+}
+
diff --git a/xpfe/browser/resources/content/navigator.xul b/xpfe/browser/resources/content/navigator.xul
index 7ecc9dadf8d2..0dd34b92bbbe 100644
--- a/xpfe/browser/resources/content/navigator.xul
+++ b/xpfe/browser/resources/content/navigator.xul
@@ -24,10 +24,10 @@ Contributor(s): ______________________________________. -->
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 
 <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
-<?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
-<?xul-overlay href="chrome://navigator/content/NavSecurityOverlay.xul"?>
 <?xul-overlay href="chrome://navigator/content/navExtraOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/securityOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
 
 <!DOCTYPE window [
@@ -109,6 +109,7 @@ Contributor(s): ______________________________________. -->
                   value="&openLinkCmd.label;"
                   accesskey=""
                   oncommand="contextMenu.openLink();"/>
+        <!-- XXX - DEPENDENT ON PRESENCE OF EDITOR!! - XXX -->
         <menuitem id="context-editlink"
                   value="&editLinkCmd.label;"
                   accesskey=""
@@ -163,7 +164,7 @@ Contributor(s): ______________________________________. -->
                   oncommand="contextMenu.blockImage();"/>
         <menuseparator/>
         <!-- Misc ==================================== -->
-		<menuitem id="context-bookmarkpage"
+    		<menuitem id="context-bookmarkpage"
                   value="&bookmarkPageCmd.label;"
                   accesskey="&bookmarkPageCmd.accesskey;"
                   oncommand="BrowserAddBookmark( window.content.location.href,
diff --git a/xpfe/browser/resources/content/navigatorOverlay.xul b/xpfe/browser/resources/content/navigatorOverlay.xul
index b76c58fc6ede..5af6aea0645c 100644
--- a/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -39,7 +39,6 @@ Contributor(s): ______________________________________. -->
 <keyset id="keyset">
 	<!-- File Menu -->
 	<key id="key_newNavigator"/>
-	<key id="key_newMessage"/>
 	<key id="key_newBlankPage"/>
 	<key id="openBrowserKb"     xulkey="true" key="&openCmd.commandkey;" observes="Browser:Open" />
 	<key id="openFileKb"        xulkey="true" key="&openFileCmd.commandkey;" observes="Browser:OpenFile" />
@@ -86,12 +85,9 @@ Contributor(s): ______________________________________. -->
 <broadcasterset id="broadcasterset">
 	<!-- File Menu -->
 	<broadcaster id="cmd_newNavigator"/>
-	<broadcaster id="cmd_newMessage"/>
-	<broadcaster id="cmd_newCard"/>
 	<broadcaster id="cmd_newEditor"/>
 	<broadcaster id="cmd_newEditorTemplate"/>
 	<broadcaster id="cmd_newEditorDraft"/>
-	<broadcaster id="cmd_sendPage"/>
 	<broadcaster id="cmd_quit"/>
 
 	<!-- Edit Menu -->
@@ -119,7 +115,6 @@ Contributor(s): ______________________________________. -->
 
 	<broadcaster id="cmd_close" oncommand="BrowserClose()"/>
 
-	<broadcaster id="Browser:SendLink"  value="&sendLinkCmd.label;" oncommand="BrowserSendLink(window.content.location.href, window.content.document.title);"/>
 	<broadcaster id="Browser:EditPage"  value="&editPageCmd.label;" oncommand="BrowserEditPage(window.content.location.href);"/>
  	
 	<broadcaster id="Browser:PrintSetup"  value="&printSetupCmd.label;"     disabled ="true" oncommand="BrowserReload();"/>
@@ -146,14 +141,12 @@ Contributor(s): ______________________________________. -->
 <!-- Menu -->
 <menubar id="main-menubar" class="chromeclass-menubar">
 	<menu id="menu_File">
-	    <menupopup id="menu_FilePopup">
+    <menupopup id="menu_FilePopup">
 			<menuitem value="&browserCmd.label;" accesskey="&browserCmd.accesskey;" key="key_newNavigator" observes="cmd_newNavigator"/>
 			<menu id="menu_New">
 				<menupopup id="menu_NewPopup">
 					<!-- From globalOverlay.xul -->
 					<menuitem id="menu_newNavigator" observes="cmd_newNavigator"/>
-					<menuitem id="menu_newMessage"   observes="cmd_newMessage"/>
-					<menuitem id="menu_newCard"      observes="cmd_newCard"/>
 					<menuitem id="menu_newEditor"    observes="cmd_newEditor"/>
 				</menupopup>
 			</menu>
@@ -164,8 +157,6 @@ Contributor(s): ______________________________________. -->
 		    <menuitem id="context-savepage" key="savePage" observes="Browser:SavePage"/>
 		    <menuitem id="savepage" value="&saveFrameCmd.label;" accesskey="&saveFrameCmd.accesskey;" oncommand="savePage(gFocusedURL);" hidden="true"/>
 	      <menuseparator/>
-	      <menuitem id="menu_sendPage"  observes="cmd_sendPage"/>
-	      <menuitem accesskey="&sendLinkCmd.accesskey;" observes="Browser:SendLink"/>
 	      <menuitem accesskey="&editPageCmd.accesskey;" observes="Browser:EditPage" />
 	      <menuseparator/>
 	      <menuitem accesskey="&printSetupCmd.accesskey;" observes="Browser:PrintSetup"/>
diff --git a/xpfe/browser/resources/locale/en-US/navigator.dtd b/xpfe/browser/resources/locale/en-US/navigator.dtd
index 911b22a35244..80c672d42ba5 100644
--- a/xpfe/browser/resources/locale/en-US/navigator.dtd
+++ b/xpfe/browser/resources/locale/en-US/navigator.dtd
@@ -19,8 +19,6 @@
 <!ENTITY openFileCmd.label "Open File...">
 <!ENTITY openFileCmd.accesskey "o">
 <!ENTITY openFileCmd.commandkey "o">
-<!ENTITY sendLinkCmd.label "Send Link"> 
-<!ENTITY sendLinkCmd.accesskey "i">
 <!ENTITY editPageCmd.label					"Edit Page">
 <!ENTITY editPageCmd.accesskey				"d">
 <!ENTITY editFrameCmd.label					"Edit Frame">
diff --git a/xpfe/browser/resources/locale/en-US/navigator.properties b/xpfe/browser/resources/locale/en-US/navigator.properties
index 8ad1f6150f49..46a90e64fb97 100644
--- a/xpfe/browser/resources/locale/en-US/navigator.properties
+++ b/xpfe/browser/resources/locale/en-US/navigator.properties
@@ -18,3 +18,4 @@ droponhomemsg2=to be your new home page?
 dontremindme=Always check when I drag an address to the Home button (This can also be set in the 'Navigator' category of Preferences)
 droponhomeokbutton=Set Home Page
 
+jserror=An error has occurred on this page. Double click here for details. 
\ No newline at end of file
diff --git a/xpfe/communicator/resources/locale/en-US/MANIFEST b/xpfe/communicator/resources/locale/en-US/MANIFEST
index 108d1ef0b03e..8e9327178361 100644
--- a/xpfe/communicator/resources/locale/en-US/MANIFEST
+++ b/xpfe/communicator/resources/locale/en-US/MANIFEST
@@ -1,2 +1,5 @@
 utilityOverlay.dtd
 utilityOverlay.properties
+taskbar.rdf
+taskbarOverlay.dtd
+tasksOverlay.dtd
diff --git a/xpfe/communicator/resources/locale/en-US/Makefile.in b/xpfe/communicator/resources/locale/en-US/Makefile.in
index b2f8662baff1..c27d096dc065 100644
--- a/xpfe/communicator/resources/locale/en-US/Makefile.in
+++ b/xpfe/communicator/resources/locale/en-US/Makefile.in
@@ -38,6 +38,9 @@ CHROME_MISC = \
 CHROME_L10N = \
 		utilityOverlay.dtd \
 		utilityOverlay.properties \
+		taskbar.rdf \
+		taskbarOverlay.dtd \
+		tasksOverlay.dtd \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/xpfe/communicator/resources/locale/en-US/makefile.win b/xpfe/communicator/resources/locale/en-US/makefile.win
index d3d49318b832..3f58aea46d9a 100644
--- a/xpfe/communicator/resources/locale/en-US/makefile.win
+++ b/xpfe/communicator/resources/locale/en-US/makefile.win
@@ -33,6 +33,9 @@ CHROME_MISC = \
 CHROME_L10N = \
 	.\utilityOverlay.dtd \
 	.\utilityOverlay.properties \
+	.\taskbar.rdf \
+	.\tasksOverlay.dtd \
+	.\taskbarOverlay.dtd \
 	$(NULL)
   
 include <$(DEPTH)\config\rules.mak>
diff --git a/xpfe/communicator/resources/locale/en-US/taskbar.rdf b/xpfe/communicator/resources/locale/en-US/taskbar.rdf
new file mode 100644
index 000000000000..97954601ef90
--- /dev/null
+++ b/xpfe/communicator/resources/locale/en-US/taskbar.rdf
@@ -0,0 +1,47 @@
+<?xml version="1.0"?>
+<!DOCTYPE RDF 
+[
+<!-- LOCALIZATION NOTE  (mozillaButton.label): DONT_TRANSLATE -->
+<!ENTITY  mozillaButton.label "Mozilla">
+<!ENTITY  mozillaTooltip.label  "Links to mozilla.org webtools">
+<!-- taskbar popups -->
+<!-- LOCALIZATION NOTE  (bugzillaButton.label): Do NOT translate "Bugzilla" -->
+<!ENTITY  bugzillaButton.label "Go to Bugzilla">
+<!ENTITY  tinderboxButton.label "Look at Tinderbox">
+<!-- LOCALIZATION NOTE  (bonsai.label): Do NOT translate "Bonsai" -->
+<!ENTITY  bonsai.label "Look at Bonsai">
+
+]
+>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:NC="http://home.netscape.com/NC-rdf#">
+
+<!-- root start  -->
+  <RDF:Seq ID="root">
+
+    <RDF:li>
+      <RDF:Seq about="urn:taskbar:mozilla-group">
+        <RDF:li resource="urn:taskbar:mozilla-group:bonsai" />
+        <RDF:li resource="urn:taskbar:mozilla-group:bugzilla" />
+     </RDF:Seq>
+    </RDF:li>
+
+  </RDF:Seq>
+<!-- root end -->
+
+<!-- Description -->
+<RDF:Description about="urn:taskbar:mozilla-group">
+    <NC:title>&mozillaButton.label;</NC:title>
+    <NC:tooltip>&mozillaTooltip.label;</NC:tooltip>
+</RDF:Description>
+
+  <RDF:Description about="urn:taskbar:mozilla-group:bonsai">
+    <NC:title>&bonsai.label;</NC:title> 
+    <NC:content>openTopWin('http://bonsai.mozilla.org/toplevel.cgi?treeid=SeaMonkey')</NC:content>
+  </RDF:Description>
+
+  <RDF:Description about="urn:taskbar:mozilla-group:bugzilla">
+    <NC:title>&bugzillaButton.label;</NC:title> 
+    <NC:content>openTopWin('http://bugzilla.mozilla.org')</NC:content>
+  </RDF:Description>
+</RDF:RDF>
diff --git a/xpfe/communicator/resources/locale/en-US/taskbarOverlay.dtd b/xpfe/communicator/resources/locale/en-US/taskbarOverlay.dtd
new file mode 100644
index 000000000000..8b47ab1f4fa9
--- /dev/null
+++ b/xpfe/communicator/resources/locale/en-US/taskbarOverlay.dtd
@@ -0,0 +1,10 @@
+<!-- taskbar -->
+<!-- LOCALIZATION NOTE  (shoppingButton.label): DONT_TRANSLATE -->
+<!ENTITY  shoppingButton.label "Shopping">
+<!ENTITY  entertainment.label "Entertainment">
+<!ENTITY  openWinButton.label "Open Windows">
+<!-- taskbar popups -->
+<!-- LOCALIZATION NOTE  (tinderboxButton.label): Do NOT translate "Tinderbox" -->
+<!ENTITY  tinderboxButton.label "Look at Tinderbox">
+
+<!ENTITY taskWindowList.tooltip "List of open windows">
\ No newline at end of file
diff --git a/xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd b/xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd
new file mode 100644
index 000000000000..20c26242919e
--- /dev/null
+++ b/xpfe/communicator/resources/locale/en-US/tasksOverlay.dtd
@@ -0,0 +1,52 @@
+<!-- extracted from tasksOverlay.xul -->
+<!ENTITY tasksMenu.label				"Tasks">
+<!-- LOCALIZATION NOTE (navigatorCmd.label): DONT_TRANSLATE -->  
+<!ENTITY navigatorCmd.label					"Navigator">  
+<!-- LOCALIZATION NOTE (editorCmd.label): DONT_TRANSLATE -->
+<!ENTITY editorCmd.label					  "Composer">
+<!ENTITY addressBookCmd.label				"Address Book">  
+
+<!ENTITY newsgroupsCmd.label				".Newsgroups">  
+<!ENTITY toolsMenu.label					"Tools"> 
+<!ENTITY historyCmd.label						"History">  
+<!ENTITY securityInfoCmd.label					".Security Info">  
+<!ENTITY importUtilCmd.label					"Import Utility">  
+<!ENTITY javaConsoleCmd.label					"Java Console">
+
+<!ENTITY javaScriptConsoleCmd.label                             "JavaScript Console">
+
+
+<!-- LOCALIZATION NOTE (walletMenu.label): DONT_TRANSLATE -->
+<!ENTITY walletMenu.label "Privacy and Security">
+<!ENTITY walletFormManager.label "Form Manager">
+<!ENTITY walletPasswordManager.label "Password Manager">
+<!ENTITY walletSafeFillCmd.label "Prefill Form Safely">
+<!ENTITY walletQuickFillCmd.label "Prefill Form Quickly">
+<!ENTITY walletRequestToCaptureCmd.label "Capture Data from Form">
+<!-- LOCALIZATION NOTE (walletContentsCmd.label): Do NOT translate "Wallet"-->
+<!ENTITY walletContentsCmd.label "View Stored Form Data">
+<!ENTITY walletDisplaySignonsCmd.label "View Stored Passwords">
+<!ENTITY walletDisplayCookiesCmd.label "View Stored Cookies">
+<!ENTITY walletAllowCookiesCmd.label "Allow Site to Set Cookies">
+<!ENTITY walletAllowCookiesMsg.label "Cookies from this site will always be accepted">
+<!ENTITY walletBlockCookiesCmd.label "Block Site from Setting Cookies">
+<!ENTITY walletBlockCookiesMsg.label "Cookies from this site will always be rejected">
+<!ENTITY walletDisplayImagesCmd.label "View Sites that can/cannot Display Images">
+<!ENTITY walletAllowImagesCmd.label "Allow Site to Display Images">
+<!ENTITY walletAllowImagesMsg.label "Images from this site will always be downloaded">
+<!ENTITY walletBlockImagesCmd.label "Block Site from Displaying Images">
+<!ENTITY walletBlockImagesMsg.label "Images from this site will never be downloaded">
+<!ENTITY walletInterviewCmd.label "Interview">
+<!ENTITY walletSamplesCmd.label "Demonstration">
+<!ENTITY walletChangePasswordCmd.label "Change Master Password...">
+<!ENTITY walletExpirePasswordCmd.label "Log Out">
+<!ENTITY walletEncryptCmd.label "Encrypt Stored Data">
+<!ENTITY walletObscureCmd.label "Obscure Stored Data">
+<!ENTITY walletCookieManager.label "Cookie Manager">
+<!ENTITY walletImageManager.label "Image Manager">
+
+<!ENTITY taskNavigator.tooltip  "Navigator">
+<!ENTITY taskComposer.tooltip  "Composer">
+<!ENTITY taskAddressBook.tooltip  "Address Book">
+<!ENTITY taskBar.tooltip  "Taskbar">
+
diff --git a/xpfe/communicator/resources/locale/en-US/utilityOverlay.dtd b/xpfe/communicator/resources/locale/en-US/utilityOverlay.dtd
index 90f3274eba60..a13d5e390252 100644
--- a/xpfe/communicator/resources/locale/en-US/utilityOverlay.dtd
+++ b/xpfe/communicator/resources/locale/en-US/utilityOverlay.dtd
@@ -24,13 +24,6 @@
 <!ENTITY newNavigatorCmd.label				"Navigator Window">
 <!ENTITY newNavigatorCmd.key				"N">
 <!ENTITY newNavigatorCmd.accesskey			"n">
-<!ENTITY newMessageCmd.label				"Message">
-<!ENTITY newMessageCmd.key					"M">
-<!ENTITY newMessageCmd.accesskey			"m">
-<!ENTITY newCardCmd.label					"Address Book Card">
-<!ENTITY newCardCmd.accesskey				"a">
-<!ENTITY sendPage.label                                 "Send Page">
-<!ENTITY sendPage.accesskey                             "g">
 
 <!ENTITY pageSetupCmd.label					".Page Setup...">  
 
diff --git a/xpfe/components/console/resources/content/MANIFEST b/xpfe/components/console/resources/content/MANIFEST
index 7f7842f408c8..539a6cb24d9d 100644
--- a/xpfe/components/console/resources/content/MANIFEST
+++ b/xpfe/components/console/resources/content/MANIFEST
@@ -1,2 +1,4 @@
 console.js
 console.xul
+console.css
+consoleBindings.xml
diff --git a/xpfe/components/console/resources/content/Makefile.in b/xpfe/components/console/resources/content/Makefile.in
index e381a134e9a1..8bda5b139e7a 100644
--- a/xpfe/components/console/resources/content/Makefile.in
+++ b/xpfe/components/console/resources/content/Makefile.in
@@ -33,6 +33,8 @@ CHROME_CONTENT_DIR = global/content
 CHROME_CONTENT = \
 	console.js \
 	console.xul \
+	console.css \
+	consoleBindings.xml \
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/xpfe/components/console/resources/content/console.css b/xpfe/components/console/resources/content/console.css
new file mode 100644
index 000000000000..dd320543836c
--- /dev/null
+++ b/xpfe/components/console/resources/content/console.css
@@ -0,0 +1,16 @@
+
+.treecell-error
+  {
+    behavior              : url("chrome://global/content/consoleBindings.xml#errormsg");
+  }
+  
+#console[mode="errors"] > treechildren > treeitem > treerow > treecell[type="warning"]
+  {
+    display               : none;
+  }
+  
+#console[mode="warnings"] > treechildren > treeitem > treerow > treecell[type="error"]
+  {
+    display               : none;
+  }  
+  
\ No newline at end of file
diff --git a/xpfe/components/console/resources/content/console.js b/xpfe/components/console/resources/content/console.js
index cd8c0a7b3359..23b4eddee4e1 100644
--- a/xpfe/components/console/resources/content/console.js
+++ b/xpfe/components/console/resources/content/console.js
@@ -103,8 +103,11 @@ function onUnloadJSConsole()
  */
 function appendMessage(messageObject)
 {
-    var c = document.getElementById("console");
-    var el = document.createElement("message");
+    var c = document.getElementById("consoleTreeChildren");
+    var item = document.createElement("treeitem");
+    var row = document.createElement("treerow");
+    var cell = document.createElement("treecell");
+    cell.setAttribute("class", "treecell-error");
     var msgContent;
     var text;
     try {
@@ -136,23 +139,49 @@ function appendMessage(messageObject)
          *
          * But for now, I'm just pushing it out the door.
          */
-        text = scriptError.category + ": ";
-        text += "JavaScript " + (warning ? "Warning: " : "Error: ");
-        text += scriptError.sourceName;
-        text += " line " + scriptError.lineNumber +
-            ", column " + scriptError.columnNumber + ": " + scriptError.message;
-        text += " Source line: " + scriptError.sourceLine;
-
-        msgContent = document.createTextNode(text);
+         
+        cell.setAttribute("type", warning ? "warning" : "error");
+        // XXX localize
+        cell.setAttribute("typetext", warning ? "Warning: " : "Error: ");
+        cell.setAttribute("url", scriptError.sourceName);
+        cell.setAttribute("line", scriptError.lineNumber);
+        cell.setAttribute("col", scriptError.columnNumber);
+        cell.setAttribute("msg", scriptError.message);
+        cell.setAttribute("error", scriptError.sourceLine);
     } catch (exn) {
         dump(exn + '\n');
         // QI failed, just try to treat it as an nsIConsoleMessage
         text = messageObject.message;
-        msgContent = document.createTextNode(text);
+        cell.setAttribute("value", text);
     }
+    row.appendChild(cell);
+    item.appendChild(row);
+    c.appendChild(item);
+}
 
-    el.appendChild(msgContent);
-    c.appendChild(el);
+function changeMode (aMode, aElement)
+{
+  var broadcaster = document.getElementById(aElement.getAttribute("observes"));
+  var bcset = document.getElementById("broadcasterset");
+  for (var i = 0; i < bcset.childNodes.length; i++) {
+    bcset.childNodes[i].removeAttribute("toggled");
+    bcset.childNodes[i].removeAttribute("checked");
+  }
+  broadcaster.setAttribute("toggled", "true");
+  broadcaster.setAttribute("checked", "true");
+  var tree = document.getElementById("console");
+  switch (aMode) {
+    case "errors":
+      tree.setAttribute("mode", "errors");
+      break;
+    case "warnings":
+      tree.setAttribute("mode", "warnings");
+      break;
+    default:
+    case "all":
+      tree.removeAttribute("mode");
+      break;
+  }
 }
 
 // XXX q: if window is open, does it grow forever?  Is that OK?
diff --git a/xpfe/components/console/resources/content/console.xul b/xpfe/components/console/resources/content/console.xul
index 2feb0e0bda39..0593b59587db 100644
--- a/xpfe/components/console/resources/content/console.xul
+++ b/xpfe/components/console/resources/content/console.xul
@@ -21,10 +21,12 @@ Rights Reserved.
 Contributor(s): ______________________________________. -->
 
 <?xml-stylesheet href="chrome://global/skin/console.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
+<?xml-stylesheet href="chrome://global/content/console.css" type="text/css"?> 
 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://global/locale/console.dtd" >
 
@@ -48,31 +50,55 @@ Contributor(s): ______________________________________. -->
         <broadcaster id="cmd_quit"/>
 </broadcasterset>
 
-<menubar id="main-menubar" class="chromeclass-menubar">
+<toolbox>
+  <menubar id="main-menubar" class="chromeclass-menubar">
+    <menu id="menu_File">
+      <menupopup id="menu_FilePopup">
+        <menuitem id="menu_close" oncommand="window.close()"/>
+      </menupopup>
+    </menu>
 
-        <menu id="menu_File">
-                <menupopup id="menu_FilePopup">
-                        <menuitem id="menu_close" oncommand="window.close()"/>
-                </menupopup>
-        </menu>
+    <menu id="menu_Edit">
+      <menupopup id="dummyid">
+        <menuitem id="menu_cut" disabled="true"/>
+        <menuitem id="menu_copy" disabled="true"/>
+        <menuitem id="menu_paste" disabled="true"/>
+      </menupopup>
+    </menu>
+  
+    <!-- tasks menu filled from tasksOverlay -->
+    <menu accesskey="t" id="tasksMenu"/>
 
-        <menu id="menu_Edit">
-                <menupopup id="dummyid">
-                        <menuitem id="menu_cut" disabled="true"/>
-                        <menuitem id="menu_copy" disabled="true"/>
-                        <menuitem id="menu_paste" disabled="true"/>
-                </menupopup>
-        </menu>
+    <!-- help menu filled from globalOverlay -->
+    <menu accesskey="h" id="menu_Help"/>
+  </menubar>
 
-        <!-- tasks menu filled from tasksOverlay -->
-        <menu accesskey="t" id="tasksMenu"/>
+  <toolbar id="toolbar">
+    <button class="button-toolbar" observes="Console:ShowAll" oncommand="changeMode('all', this);" value="&all.label;"/>
+    <button class="button-toolbar" observes="Console:ShowErrors" oncommand="changeMode('errors', this);" value="&errors.label;"/>
+    <button class="button-toolbar" observes="Console:ShowWarnings" oncommand="changeMode('warnings', this);" value="&warnings.label;"/>
+  </toolbar>
+</toolbox>
+  
+  <tree flex="1" id="console" context="context">
+    <treecolgroup>
+      <treecol flex="1"/>
+    </treecolgroup>
+    <treechildren id="consoleTreeChildren" flex="1"/>
+  </tree>
 
-        <!-- help menu filled from globalOverlay -->
-        <menu accesskey="h" id="menu_Help"/>
-</menubar>
-
-<box align="vertical" id="console" style="overflow:auto" flex="1"/>
-
-<toolbar id="taskbar"/>
-
-</window>
+  <popupset>
+    <popup id="context">
+      <menuitem type="radio" observes="Console:ShowAll" value="&all.label;" oncommand="changeMode('all', this);"/>
+      <menuitem type="radio" observes="Console:ShowErrors" value="&errors.label;" oncommand="changeMode('errors', this);"/>
+      <menuitem type="radio" observes="Console:ShowWarnings" value="&warnings.label;" oncommand="changeMode('warnings', this);"/>
+    </popup>
+  </popupset>  
+  
+  <broadcasterset id="broadcasterset">
+    <broadcaster id="Console:ShowAll" toggled="true" checked="true"/>
+    <broadcaster id="Console:ShowErrors"/>
+    <broadcaster id="Console:ShowWarnings"/>
+  </broadcasterset>
+  
+</window>
\ No newline at end of file
diff --git a/xpfe/components/console/resources/content/consoleBindings.xml b/xpfe/components/console/resources/content/consoleBindings.xml
new file mode 100644
index 000000000000..7202e1a01d79
--- /dev/null
+++ b/xpfe/components/console/resources/content/consoleBindings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE window SYSTEM "chrome://global/locale/console.dtd">
+
+<bindings id="consoleBindings"
+          xmlns="http://www.mozilla.org/xbl"
+          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <binding id="errormsg">
+    <content>
+
+      <xul:box flex="1">
+        <xul:box autostretch="never" valign="top" class="error-icon-box">
+          <xul:image class="error-icon" inherits="src,type"/>
+        </xul:box>
+        <xul:box orient="vertical" flex="1">
+          <xul:box autostretch="never" valign="top">
+            <xul:text class="label" inherits="typetext:value"/>
+            <xul:html inherits="msg:value" flex="1"/>
+          </xul:box>
+          <xul:box>
+            <xul:text class="label" value="&url.label;"/>
+            <xul:text class="label" inherits="url:value" crop="right"/>
+          </xul:box>
+          <xul:box>
+            <xul:text class="label" value="&line.label;"/>
+            <xul:text class="label" inherits="line:value" flex="1"/>
+            <xul:text class="label" value="&col.label;"/>
+            <xul:text class="label" inherits="col:value" flex="1"/>
+          </xul:box>
+          <xul:html inherits="error:value"/>
+        </xul:box>
+      </xul:box>
+    </content>
+  </binding>
+
+</bindings>          
\ No newline at end of file
diff --git a/xpfe/components/console/resources/content/makefile.win b/xpfe/components/console/resources/content/makefile.win
index 76bf41f443d2..c955d5a9c511 100644
--- a/xpfe/components/console/resources/content/makefile.win
+++ b/xpfe/components/console/resources/content/makefile.win
@@ -29,6 +29,8 @@ CHROME_CONTENT_DIR = global\content
 CHROME_CONTENT = \
 	.\console.js \
         .\console.xul \
+        .\console.css \
+        .\consoleBindings.xml \
         $(NULL)
 
 include <$(DEPTH)\config\rules.mak>
diff --git a/xpfe/components/console/resources/locale/en-US/console.dtd b/xpfe/components/console/resources/locale/en-US/console.dtd
index 9051aea37a7f..55866389818f 100644
--- a/xpfe/components/console/resources/locale/en-US/console.dtd
+++ b/xpfe/components/console/resources/locale/en-US/console.dtd
@@ -19,3 +19,13 @@ Rights Reserved.
 Contributor(s): ______________________________________. -->
 
 <!ENTITY console.title "JavaScript Console">
+
+<!ENTITY url.label     "Source File:">
+<!ENTITY line.label    "Line:">
+<!ENTITY col.label     "Column:">
+<!ENTITY error.label   "Error:">
+
+<!ENTITY all.label      "All Messages">
+<!ENTITY errors.label   "Errors">
+<!ENTITY warnings.label "Warnings">
+
diff --git a/xpfe/components/prefwindow/resources/content/pref-advanced.xul b/xpfe/components/prefwindow/resources/content/pref-advanced.xul
index 27e2913f88c6..c0b4f0d1caba 100644
--- a/xpfe/components/prefwindow/resources/content/pref-advanced.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-advanced.xul
@@ -28,11 +28,12 @@
 	    	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
         align="vertical" title="&window.title;"
-  		  onload="imageBlockingEnabled(); parent.initPanel('chrome://communicator/content/pref/pref-advanced.xul');">
+  		  onload="imageBlockingEnabled(); parent.initPanel(panel);">
 
   <script language="JavaScript">
   <![CDATA[
-    _elementIDs = ["advancedAlwaysLoadImages", "advancedJavaAllow", "javascriptAllowMailNews", "javascriptEnabled", "advancedMailFTP"];
+    var panel = "chrome://communicator/content/pref/pref-advanced.xul";
+    _elementIDs = ["advancedAlwaysLoadImages", "advancedJavaAllow", "javascriptEnabled", "advancedMailFTP"];
     
   function imageBlockingEnabled()
     {
@@ -61,14 +62,6 @@
     <checkbox id="javascriptEnabled" value="&enbJsCheck.label;" accesskey="&enbJsCheck.accesskey;"
               pref="true" preftype="bool" prefstring="javascript.enabled"
               prefattribute="checked"/>
-
-    <!-- XXX remove when overlays.rdf for messenger works -->
-    <checkbox class="indent" id="javascriptAllowMailNews" position="4"
-              value="&enbJsCheckMailNews.label;" accesskey="&enbJsCheckMailNews.accesskey;"
-              pref="true" preftype="bool" prefstring="javascript.allow.mailnews"
-              prefattribute="checked"/>
-    <!-- XXX -->              
-              
     <checkbox id="advancedMailFTP" value="&sendAddFtpCheck.label;" accesskey="&sendAddFtpCheck.accesskey;"
               pref="true" preftype="bool" prefstring="advanced.mailftp"
               prefattribute="checked"/>
diff --git a/xpfe/components/prefwindow/resources/content/pref-appearance.xul b/xpfe/components/prefwindow/resources/content/pref-appearance.xul
index 5a3900a9d134..ec82cbbc2b09 100644
--- a/xpfe/components/prefwindow/resources/content/pref-appearance.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-appearance.xul
@@ -35,13 +35,14 @@
     		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
     		orient="vertical"
-  		  onload="parent.initPanel('chrome://communicator/content/pref/pref-appearance.xul');">
+  		  onload="parent.initPanel(panel);">
 
   <script language="JavaScript">
   <![CDATA[
+    var panel = "chrome://communicator/content/pref/pref-appearance.xul";
     // the first elements in this array will be poked from chromeregistry loaded
     // overlays once overlays.rdf works properly 
-    _elementIDs = ["generalStartupBrowser", "generalStartupMail", "generalStartupEditor", /*"toolbarStyle" */];
+    _elementIDs = ["generalStartupBrowser", "generalStartupEditor", /*"toolbarStyle" */];
   ]]>
   </script>
           
@@ -57,13 +58,6 @@
               prefattribute="checked"/>
     <!-- XXX -->
 
-    <!-- XXX remove when mailnews overlays.rdf works -->
-    <checkbox id="generalStartupMail" wsm_persist="true" position="2"
-              value="&mesCheck.label;" accesskey="&mesCheck.accesskey;"
-              pref="true" preftype="bool" prefstring="general.startup.mail"
-              prefattribute="checked"/>         
-    <!-- XXX -->    
-
     <!-- XXX remove when editor overlays.rdf works -->
     <checkbox id="generalStartupEditor" wsm_persist="true"
               value="&compCheck.label;" accesskey="&compCheck.accesskey;"
diff --git a/xpfe/components/prefwindow/resources/content/pref-themes.js b/xpfe/components/prefwindow/resources/content/pref-themes.js
index 111aabab36fd..596a1efa353a 100644
--- a/xpfe/components/prefwindow/resources/content/pref-themes.js
+++ b/xpfe/components/prefwindow/resources/content/pref-themes.js
@@ -38,3 +38,51 @@ function installSkin()
     var themeURL = prompt( "Enter URL for a skin to install:","");
     chromeRegistry.installSkin( themeURL, DEBUG_USE_PROFILE, false );
   }
+
+function themeSelect()
+  {
+    var tree = document.getElementById("skinsTree");
+    var selectedItem = tree.selectedItems.length ? tree.selectedItems[0] : null;
+    if (selectedItem && selectedItem.getAttribute("skin") == "true") 
+      {
+        var displayName = document.getElementById("displayName");
+        displayName.setAttribute("value", selectedItem.getAttribute("displayName"));
+        var author = document.getElementById("author");
+        author.setAttribute("value", selectedItem.getAttribute("author"));
+        var email = document.getElementById("email");
+        var address = selectedItem.getAttribute("email");
+        if (address)
+          {
+            email.removeAttribute("disabled");
+            email.setAttribute("emailaddress", address);
+            email.setAttribute("tooltiptext", address);
+            email.setAttribute("emailtitle", selectedItem.getAttribute("displayName"));
+          }
+        else
+          email.setAttribute("disabled", "true");
+        var website = document.getElementById("website");
+        var url = selectedItem.getAttribute("website");
+        if (url)  
+          {
+            website.removeAttribute("disabled");
+            website.setAttribute("website", url);
+            website.setAttribute("tooltiptext", url);
+          }
+        else 
+          website.setAttribute("disabled", "true");
+        var image = document.getElementById("previewImage");
+        image.setAttribute("src", selectedItem.getAttribute("image"));
+      }
+  }
+  
+function gotoWebsite(aElement)
+  {
+    openTopWin(aElement.getAttribute("website"));
+  } 
+  
+function sendEmail(aElement)
+  {
+    window.openDialog( "chrome://messenger/content/messengercompose/messengercompose.xul", "_blank", 
+                     "chrome,all,dialog=no", "subject='" + aElement.getAttribute('displayName') + "',bodyislink=true");
+    
+  } 
\ No newline at end of file
diff --git a/xpfe/components/prefwindow/resources/content/pref-themes.xul b/xpfe/components/prefwindow/resources/content/pref-themes.xul
index 89a010816968..a4a91b559534 100644
--- a/xpfe/components/prefwindow/resources/content/pref-themes.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-themes.xul
@@ -24,6 +24,8 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-themes.dtd" >
 
@@ -41,53 +43,71 @@
   <html>&installedThemes.label;</html>
   
   <tree class="inset" id="skinsTree" datasources="rdf:chrome" 
-         ref="urn:mozilla:skin:root" flex="1">
+        onselect="themeSelect();"
+        ref="urn:mozilla:skin:root" flex="1">
     <treecolgroup>
-       <treecol/>
+      <treecol flex="1"/>
     </treecolgroup>
     <template>
       <rule>
-        <conditions>
-          <content uri="?uri"/>
-          <triple subject="?uri"
-                  predicate="http://www.mozilla.org/rdf/chrome#packages"
-                  object="?packageList"/>
-          <member container="?packageList"
-                  child="?entry"/>
-          <triple subject="?entry"
-                  predicate="http://www.mozilla.org/rdf/chrome#package"
-                  object="?package"/>
-          <triple subject="?package"
-                  predicate="http://www.mozilla.org/rdf/chrome#displayName"
-                  object="?displayName"/>
-        </conditions>
-        <action>
-          <treechildren>
-            <treeitem uri="?entry"> 
-              <treerow>
-                <treecell class="treecell-indent" value="?displayName"/>
-              </treerow>
-            </treeitem>
-          </treechildren>
-        </action>
-      </rule>
-      <rule>
-          <treechildren>
-            <treeitem uri="?child" author="rdf:http://www.mozilla.org/rdf/chrome#author"
-                      container="true" name="rdf:http://www.mozilla.org/rdf/chrome#name">
-              <treerow>
-                <treecell class="treecell-indent" value="rdf:http://www.mozilla.org/rdf/chrome#displayName"/>
-              </treerow>
-            </treeitem>
-          </treechildren>
+        <treechildren flex="1">
+          <treeitem uri="?child" skin="true"
+                    author="rdf:http://www.mozilla.org/rdf/chrome#author"
+                    displayName="rdf:http://www.mozilla.org/rdf/chrome#displayName"
+                    name="rdf:http://www.mozilla.org/rdf/chrome#name"
+                    email="rdf:http://www.mozilla.org/rdf/chrome#email"
+                    website="rdf:http://www.mozilla.org/rdf/chrome#website"
+                    image="rdf:http://www.mozilla.org/rdf/chrome#image">
+            <treerow>
+              <treecell value="rdf:http://www.mozilla.org/rdf/chrome#displayName"/>
+            </treerow>
+          </treeitem>
+        </treechildren>
       </rule>
     </template>
   </tree>
-   
+
+  <tabcontrol orient="vertical">
+    <tabpanel>
+      <grid flex="1">
+        <columns>
+          <column/>
+          <column flex="1"/>
+        </columns>
+        <rows>
+          <row>
+            <text class="label" value="&displayName.label;"/>
+            <text class="label" id="displayName"/>
+          </row>
+          <row>
+            <text class="label" value="&author.label;"/>
+            <text class="label" id="author"/>
+          </row>
+          <row>
+            <spring/>
+            <box>
+              <button id="email" value="&email.label;" accesskey="&email.accesskey;" 
+                      oncommand="sendEmail(this);" tooltip="aTooltip" disabled="true"/>
+              <button id="website" value="&website.label;" accesskey="&website.accesskey;" 
+                      oncommand="gotoWebsite(this);" tooltip="aTooltip" disabled="true"/>
+            </box>
+          </row>
+        </rows>
+      </grid>
+      <box class="inset" style="overflow: auto; height: 8em;">
+        <image id="previewImage"/>
+      </box>
+    </tabpanel>
+    <tabbox>
+      <tab value="&general.label;"/>
+      <tab value="&preview.label;"/>
+    </tabbox>
+  </tabcontrol>
+
+  <separator class="thin"/>
+  
   <box autostretch="never">
     <button value="&selectSkin.label;" accesskey="&selectSkin.accesskey;" oncommand="selectSkin();"/>
-    <spring flex="1"/>
-    <button value="&installSkin.label;" accesskey="&installSkin.accesskey;" oncommand="installSkin();"/>
   </box>
   
 </window>
diff --git a/xpfe/components/prefwindow/resources/content/pref.xul b/xpfe/components/prefwindow/resources/content/pref.xul
index cb2189fabc4a..ff6ac420bed7 100644
--- a/xpfe/components/prefwindow/resources/content/pref.xul
+++ b/xpfe/components/prefwindow/resources/content/pref.xul
@@ -84,9 +84,9 @@
 
   <box flex="1">
     <!-- tree sidebar -->
-    <tree class="inset" id="prefsTree" flex="2" style="width: 170px;"/>      
+    <tree class="inset" id="prefsTree" flex="1"/>      
 
-    <iframe id="panelFrame" name="panelFrame" style="width:0px" flex="6"/>
+    <iframe id="panelFrame" name="panelFrame" style="width:0px" flex="7"/>
     <script language="JavaScript">
     <![CDATA[
       if( window.arguments && window.arguments[0] ) {
diff --git a/xpfe/components/prefwindow/resources/content/preftree.xul b/xpfe/components/prefwindow/resources/content/preftree.xul
index e5242010bb7d..68d8f833e99c 100644
--- a/xpfe/components/prefwindow/resources/content/preftree.xul
+++ b/xpfe/components/prefwindow/resources/content/preftree.xul
@@ -32,13 +32,17 @@
 <tree id="prefsTree" 
       onselect="if( hPrefWindow ) hPrefWindow.switchPage();">
 
+  <treecolgroup>
+    <treecol flex="1"/>
+  </treecolgroup>      
+      
   <treehead name="tree">
     <treerow>
       <treecell class="treecell-header outset" url="__header" value="&categoryHeader;"/>
     </treerow>
   </treehead>
 
-  <treechildren id="panelChildren">
+  <treechildren id="panelChildren" flex="1">
 
     
     <treeitem container="true" open="true" id="appearance">
@@ -99,41 +103,6 @@
     </treeitem>
     <!-- XXX -->
 
-    <!-- XXX remove once mailnews overlays.rdf works properly -->
-    <treeitem container="true" open="true" id="mailnews">
-      <treerow>       
-        <treecell class="treecell-indent" url="chrome://messenger/content/pref-mailnews.xul" value="&mail.label;"/> 
-      </treerow>
-      <treechildren id="messengerChildren">
-        <treeitem>
-          <treerow>
-            <treecell class="treecell-indent" url="chrome://messenger/content/pref-viewing_messages.xul" value="&viewingMessages.label;"/> 
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell class="treecell-indent" url="chrome://messenger/content/messengercompose/pref-composing_messages.xul" value="&composingMessages.label;"/> 
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell class="treecell-indent" url="chrome://messenger/content/messengercompose/pref-formatting.xul" value="&format.label;"/> 
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell class="treecell-indent" url="chrome://messenger/content/addressbook/pref-addressing.xul" value="&address.label;"/> 
-          </treerow>
-        </treeitem>
-        <treeitem>
-          <treerow>
-            <treecell class="treecell-indent" url="chrome://messenger/content/pref-diskspace.xul" value="&disk.label;"/> 
-          </treerow>
-        </treeitem>
-      </treechildren>
-    </treeitem>
-    <!-- XXX -->
- 
     <!-- XXX remove once overlays.rdf works properly for editor -->
     <treeitem container="true" open="true" id="editor">
       <treerow>       
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
index 3f7e20490083..523b94b12283 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
@@ -17,9 +17,6 @@
 <!ENTITY enbJsCheck.label             "Enable JavaScript for Navigator">
 <!ENTITY enbJsCheck.accesskey         "r">
 
-<!ENTITY enbJsCheckMailNews.label     "Enable JavaScript for Mail and News">
-<!ENTITY enbJsCheckMailNews.accesskey "m">
-
 <!ENTITY sendAddFtpCheck.label        "Send email address as anonymous FTP password">
 <!ENTITY sendAddFtpCheck.accesskey    "e">
 
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
index ed78e1e15b4b..67f972e56e3a 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-appearance.dtd
@@ -8,9 +8,6 @@
 <!--LOCALIZATION NOTE (navCheck.label): DONT_TRANSLATE -->
 <!ENTITY navCheck.label "Navigator">
 <!ENTITY navCheck.accesskey "n">
-<!--LOCALIZATION NOTE (mesCheck.label): DONT_TRANSLATE -->
-<!ENTITY mesCheck.label "&vendorShortName; Mail">
-<!ENTITY mesCheck.accesskey "m">
 <!--LOCALIZATION NOTE (compCheck.label): DONT_TRANSLATE -->
 <!ENTITY compCheck.label "Composer">
 <!ENTITY compCheck.accesskey "c">
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-themes.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-themes.dtd
index 8abd6de47c10..1400de50c004 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-themes.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-themes.dtd
@@ -11,3 +11,12 @@
 <!ENTITY  installSkin.label       "Install Theme...">
 <!ENTITY  installSkin.accesskey   "i">
 
+<!ENTITY  general.label           "General">
+<!ENTITY  preview.label           "Preview Image">
+<!ENTITY  displayName.label       "Theme Name">
+<!ENTITY  author.label            "Author">
+<!ENTITY  email.label             "Email">
+<!ENTITY  email.accesskey         "e">
+<!ENTITY  website.label           "Website">
+<!ENTITY  website.accesskey       "w">
+
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd b/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd
index 640aabc0cdf6..81c48a3f58d7 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/preftree.dtd
@@ -12,13 +12,6 @@
 <!ENTITY applications.label "Helper Applications">
 <!--LOCALIZATION NOTE (smartBrowse.label): DONT_TRANSLATE -->
 <!ENTITY smartBrowse.label "Smart Browsing">
-<!ENTITY mail.label "Mail and Newsgroups">
-<!ENTITY address.label "Addressing">
-<!ENTITY viewingMessages.label "Viewing Messages">
-<!ENTITY composingMessages.label "Composing Messages">
-<!ENTITY format.label "Formatting">
-<!ENTITY return.label "Return Receipts">
-<!ENTITY disk.label "Disk Space">
 <!ENTITY compose.label "Composer">
 <!ENTITY editing.label "New Page Settings">
 <!ENTITY publish.label "Publish">
diff --git a/xpfe/global/resources/content/MANIFEST b/xpfe/global/resources/content/MANIFEST
index a5c80d6d8151..efddbcae2ffb 100644
--- a/xpfe/global/resources/content/MANIFEST
+++ b/xpfe/global/resources/content/MANIFEST
@@ -5,12 +5,8 @@ textAreaBindings.xul
 hiddenWindow.xul
 globalOverlay.xul
 globalOverlay.js
-tasksOverlay.xul
-tasksOverlay.js
-taskbarOverlay.xul
 dialogOverlay.xul
 dialogOverlay.js
-dialogBindings.xml
 commonDialog.xul
 commonDialog.js
 strres.js
diff --git a/xpfe/global/resources/content/Makefile.in b/xpfe/global/resources/content/Makefile.in
index 0e2b8c5233b6..056ae51a7580 100644
--- a/xpfe/global/resources/content/Makefile.in
+++ b/xpfe/global/resources/content/Makefile.in
@@ -50,12 +50,8 @@ CHROME_CONTENT= \
 		hiddenWindow.xul \
 		globalOverlay.xul \
 		globalOverlay.js \
-		tasksOverlay.xul \
-		tasksOverlay.js \
-		taskbarOverlay.xul \
 		dialogOverlay.xul \
 		dialogOverlay.js \
-		dialogBindings.xml \
 		commonDialog.xul \
 		commonDialog.js \
 		charsetOverlay.xul \
diff --git a/xpfe/global/resources/content/hiddenWindow.xul b/xpfe/global/resources/content/hiddenWindow.xul
index 7ea8dbfbecd8..fb0e25a21cd9 100644
--- a/xpfe/global/resources/content/hiddenWindow.xul
+++ b/xpfe/global/resources/content/hiddenWindow.xul
@@ -21,7 +21,7 @@ Rights Reserved.
 Contributor(s): ______________________________________. -->
 
 <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
-<?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 
 <!-- hiddenwindow is a "minimal" XUL window intended for creating the,
      er, hidden window.  This window is never shown, but on platforms
diff --git a/xpfe/global/resources/content/makefile.win b/xpfe/global/resources/content/makefile.win
index c9e3d50ae2cc..dc1e1b4260e5 100644
--- a/xpfe/global/resources/content/makefile.win
+++ b/xpfe/global/resources/content/makefile.win
@@ -41,12 +41,8 @@ CHROME_CONTENT= \
 	.\hiddenWindow.xul \
 	.\globalOverlay.xul \
 	.\globalOverlay.js \
-	.\tasksOverlay.xul \
-	.\tasksOverlay.js \
-	.\taskbarOverlay.xul \
 	.\dialogOverlay.xul \
 	.\dialogOverlay.js \
-	.\dialogBindings.xml \
 	.\commonDialog.xul \
 	.\commonDialog.js \
 	.\strres.js \
diff --git a/xpfe/global/resources/content/menulistBindings.xml b/xpfe/global/resources/content/menulistBindings.xml
index 76d3f15322a3..5b76714e11d7 100644
--- a/xpfe/global/resources/content/menulistBindings.xml
+++ b/xpfe/global/resources/content/menulistBindings.xml
@@ -83,85 +83,48 @@
         <xul:button class="menubutton-dual-button top" allowevents="true" 
                     inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey"/>
         <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
-          <xul:image class="menubutton-dropmarker" inherits="disabled"/>
+          <xul:image class="menubutton-dropmarker"/>
         </xul:box>
       </xul:box>
     </content>
-    <handlers>
-      <handler type="mouseover">
-      <![CDATA[
-        this.setAttribute("mouseover","true"); // hack to pass mouseover event inwards
-      ]]>
-      </handler>
-      <handler type="mouseout">
-      <![CDATA[
-        this.removeAttribute("mouseover");
-      ]]>
-      </handler>
-    </handlers>
   </binding>
 
-  <binding id="menubutton-dual-left" extends="chrome://global/content/menulistBindings.xml#menubutton-dual-top">
+  <binding id="menubutton-dual-left">
     <content excludes="template,observes,menupopup">
       <xul:box class="menubutton-internal-box">
         <xul:button class="menubutton-dual-button left" allowevents="true" 
                     inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey"/>
         <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
-          <xul:image class="menubutton-dropmarker" inherits="disabled"/>
+          <xul:image class="menubutton-dropmarker"/>
         </xul:box>
       </xul:box>
     </content>
   </binding>
 
-  <binding id="menubutton-dual-right" extends="chrome://global/content/menulistBindings.xml#menubutton-dual-top">
+  <binding id="menubutton-dual-right">
     <content excludes="template,observes,menupopup">
       <xul:box class="menubutton-internal-box">
         <xul:button class="menubutton-dual-button right" allowevents="true" 
                     inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey"/>
         <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
-          <xul:image class="menubutton-dropmarker" inherits="disabled"/>
+          <xul:image class="menubutton-dropmarker"/>
         </xul:box>
       </xul:box>
     </content>
   </binding>
 
-  <binding id="menubutton-dual-bottom" extends="chrome://global/content/menulistBindings.xml#menubutton-dual-top">
+  <binding id="menubutton-dual-bottom">
     <content excludes="template,observes,menupopup">
       <xul:box class="menubutton-internal-box">
         <xul:button class="menubutton-dual-button bottom" allowevents="true" 
                     inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey"/>
         <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle">
-          <xul:image class="menubutton-dropmarker" inherits="disabled"/>
+          <xul:image class="menubutton-dropmarker"/>
         </xul:box>
       </xul:box>
     </content>
   </binding>
 
-  <!-- need ability to fire events -->
-  <binding id="menubutton-toolbar">
-    <content excludes="observes,template,menupopup">
-      <xul:button class="menubutton-dual-button button-toolbar-1 top" allowevents="true" 
-                  inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey,disabled"
-                  onmouseover="parentNode.setAttribute('buttonover','true');"
-                  onmouseout="parentNode.removeAttribute('buttonover');"/>
-      <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="middle" flex="1">
-        <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
-      </xul:box>
-    </content>
-    <handlers>
-      <handler type="mouseover">
-      <![CDATA[
-        this.setAttribute('markerover','true');
-      ]]>
-      </handler>
-      <handler type="mouseout">
-      <![CDATA[
-        this.removeAttribute('markerover');
-      ]]>
-      </handler>
-    </handlers>
-  </binding>  
-  
 <!--
   BINDING : menubutton-item
   XUL REPRESENTATION : menuitem
diff --git a/xpfe/global/resources/locale/en-US/MANIFEST b/xpfe/global/resources/locale/en-US/MANIFEST
index e74cdec54be5..aafaac7dac76 100644
--- a/xpfe/global/resources/locale/en-US/MANIFEST
+++ b/xpfe/global/resources/locale/en-US/MANIFEST
@@ -1,9 +1,6 @@
 intl.css
 globalOverlay.dtd
 dialogOverlay.dtd
-tasksOverlay.dtd
-taskbarOverlay.dtd
-taskbar.rdf
 builtinURLs.rdf
 commonDialog.dtd
 charsetOverlay.dtd
diff --git a/xpfe/global/resources/locale/en-US/Makefile.in b/xpfe/global/resources/locale/en-US/Makefile.in
index 05a26e9f9bc0..200e15e7ff9e 100644
--- a/xpfe/global/resources/locale/en-US/Makefile.in
+++ b/xpfe/global/resources/locale/en-US/Makefile.in
@@ -35,9 +35,6 @@ CHROME_L10N = \
 		intl.css \
 		globalOverlay.dtd \
 		dialogOverlay.dtd \
-		tasksOverlay.dtd \
-		taskbarOverlay.dtd \
-		taskbar.rdf \
 		builtinURLs.rdf \
 		commonDialog.dtd \
 		charsetOverlay.dtd \
diff --git a/xpfe/global/resources/locale/en-US/makefile.win b/xpfe/global/resources/locale/en-US/makefile.win
index db96bad9351a..736714817ee3 100644
--- a/xpfe/global/resources/locale/en-US/makefile.win
+++ b/xpfe/global/resources/locale/en-US/makefile.win
@@ -30,9 +30,6 @@ CHROME_L10N = \
 	.\intl.css \
 	.\globalOverlay.dtd \
 	.\dialogOverlay.dtd \
-	.\tasksOverlay.dtd \
-	.\taskbarOverlay.dtd \
-	.\taskbar.rdf \
 	.\builtinURLs.rdf \
 	.\commonDialog.dtd \
 	.\charsetOverlay.dtd \