diff --git a/mozilla/mail/base/content/askViewZoom.xul b/mozilla/mail/base/content/askViewZoom.xul
new file mode 100644
index 00000000000..8ed3ec30768
--- /dev/null
+++ b/mozilla/mail/base/content/askViewZoom.xul
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+
+<!--
+   - 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 this file as it was released on
+   - September 7, 2000.
+   - 
+   - The Initial Developer of the Original Code is Peter Annema.
+   - Portions created by Peter Annema are Copyright (C) 2000
+   - Peter Annema.  All Rights Reserved.
+   - 
+   - Contributor(s):
+   -   Peter Annema <disttsc@bart.nl> (Original Author)
+   - 
+   - Alternatively, the contents of this file may be used under the
+   - terms of the GNU General Public License Version 2 or later (the
+   - "GPL"), in which case the provisions of the GPL are applicable 
+   - instead of those above.  If you wish to allow use of your 
+   - version of this file only under the terms of the GPL and not to
+   - allow others to use your version of this file under the MPL,
+   - indicate your decision by deleting the provisions above and
+   - replace them with the notice and other provisions required by
+   - the GPL.  If you do not delete the provisions above, a recipient
+   - may use your version of this file under either the MPL or the
+   - GPL.
+  -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/askViewZoom.dtd">
+
+<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  id="askViewZoom"
+  title="&askViewZoom.title;"
+  ondialogaccept="return onAccept();"
+  onload="onLoad();">
+
+  <script type="application/x-javascript" src="chrome://communicator/content/askViewZoom.js"/>
+
+  <hbox>
+    <label value="&selectZoom.label;"/>
+  </hbox>
+
+  <hbox>
+    <textbox id="zoomValue" oninput="doEnabling();"/>
+  </hbox>
+
+</dialog>
diff --git a/mozilla/mail/base/content/finddialog.xul b/mozilla/mail/base/content/finddialog.xul
new file mode 100644
index 00000000000..1bd55de39cb
--- /dev/null
+++ b/mozilla/mail/base/content/finddialog.xul
@@ -0,0 +1,84 @@
+<?xml version="1.0"?> <!-- -*- Mode: HTML -*- -->
+
+<!--
+The contents of this file are subject to the Netscape 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/NPL/
+
+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 Communicator client code, released
+March 31, 1998.
+
+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>
+                Bill Law         <law@netscape.com>
+                Blake Ross       <blakeross@telocity.com>
+                Dan Rosen        <dr@netscape.com>
+                Dean Tessman     <dean_tessman@hotmail.com>
+                Simon Fraser     <sfraser@netscape.com>
+                Stuart Parmenter <pavlov@netscape.com>
+-->
+
+<!-- Bah this is totally bogus but we don't define chrome://navigator/skin...that's the only 
+     reason why this file is forked -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+
+<!DOCTYPE dialog SYSTEM "chrome://global/locale/finddialog.dtd">
+
+<dialog id="findDialog"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  buttonpack="center"
+  ondialogaccept="return onAccept();"
+  windowtype="findInPage"
+  onload="onLoad();"
+  onunload="onUnload();"
+  style="width: 30em;"
+  title="&findDialog.title;"
+  persist="screenX screenY">
+
+  <script type="application/x-javascript" src="chrome://global/content/finddialog.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js"/>
+  <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
+  
+  <grid>
+    <columns>
+      <column/>
+      <column flex="1"/>
+    </columns>
+    <rows>
+      <row>
+        <hbox align="center">
+          <label value="&findField.label;" accesskey="&findField.accesskey;" control="dialog.findKey"/>
+        </hbox>
+        <hbox align="center">
+          <textbox id="dialog.findKey" flex="1" oninput="doEnabling();"/>
+        </hbox>
+      </row>
+      <row>
+        <spacer/>
+        <vbox align="start">
+          <checkbox id="dialog.caseSensitive" label="&caseSensitiveCheckbox.label;" accesskey="&caseSensitiveCheckbox.accesskey;"/>
+          <checkbox id="dialog.wrap" label="&wrapCheckbox.label;" accesskey="&wrapCheckbox.accesskey;"/>
+          <checkbox id="dialog.searchBackwards" label="&backwardsCheckbox.label;" accesskey="&backwardsCheckbox.accesskey;"/>
+        </vbox>
+      </row>
+    </rows>
+  </grid>
+
+  <!-- used to store the find text -->
+  <data style="display:none;" id="fBLT" label="&findButton.label;" accesskey="&findButton.accesskey;"/>
+
+  <separator/>
+  
+</dialog>
diff --git a/mozilla/mail/base/content/mailWindowOverlay.xul b/mozilla/mail/base/content/mailWindowOverlay.xul
index be1b831758e..ef4ebdb5f96 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.xul
+++ b/mozilla/mail/base/content/mailWindowOverlay.xul
@@ -1132,20 +1132,6 @@ Rights Reserved.
            </menupopup>
           </menu>
           
-          <menu label="&msgsMenu.label;" id="viewMessagesMenu" accesskey="&msgsMenu.accesskey;">
-            <menupopup onpopupshowing="InitViewMessagesMenu()">
-              <menuitem id="viewAllMessagesMenuItem" type="radio" name="viewmessages" label="&allMsgsCmd.label;" accesskey="&allMsgsCmd.accesskey;" disabled="true" observes="cmd_viewAllMsgs"/>
-              <menuitem id="viewUnreadMessagesMenuItem" type="radio" name="viewmessages" label="&unreadMsgsCmd.label;" accesskey="&unreadMsgsCmd.accesskey;" disabled="true" observes="cmd_viewUnreadMsgs"/>
-              <menuitem id="viewThreadsWithUnreadMenuItem" type="radio" name="viewmessages" label="&threadsWithUnreadCmd.label;" accesskey="&threadsWithUnreadCmd.accesskey;" disabled="true" observes="cmd_viewThreadsWithUnread"/>
-              <menuitem id="viewWatchedThreadsWithUnreadMenuItem" type="radio" name="viewmessages" label="&watchedThreadsWithUnreadCmd.label;" accesskey="&watchedThreadsWithUnreadCmd.accesskey;" disabled="true" observes="cmd_viewWatchedThreadsWithUnread"/>
-              <menuseparator/>
-              <menuitem id="viewIgnoredThreadsMenuItem" type="checkbox" label="&ignoredThreadsCmd.label;" disabled="true" observes="cmd_viewIgnoredThreads" accesskey="&ignoredThreadsCmd.accesskey;"/>
-              <menuseparator/>
-              <menuitem label="&expandAllThreadsCmd.label;" accesskey="&expandAllThreadsCmd.accesskey;" key="key_expandAllThreads" disabled="true" observes="cmd_expandAllThreads"/>
-              <menuitem label="&collapseAllThreadsCmd.label;" accesskey="&collapseAllThreadsCmd.accesskey;" key="key_collapseAllThreads" disabled="true" observes="cmd_collapseAllThreads"/>
-            </menupopup>
-          </menu>
-
           <menuseparator/>
           <menu id="viewheadersmenu" label="&headersMenu.label;" accesskey="&headersMenu.accesskey;">
             <menupopup  onpopupshowing="InitViewHeadersMenu();">
diff --git a/mozilla/mail/base/jar.mn b/mozilla/mail/base/jar.mn
index 8f84cb2bba0..bc38a35a5cc 100644
--- a/mozilla/mail/base/jar.mn
+++ b/mozilla/mail/base/jar.mn
@@ -26,6 +26,7 @@ classic.jar:
 comm.jar:
 +   content/navigator/viewSource.xul                (content/viewSource.xul)
 +   content/navigator/contents.rdf                  (content/navigator.rdf)
++   content/communicator/askViewZoom.xul            (content/askViewZoom.xul)
     content/help/contents.rdf                       (content/help.rdf)
     content/help/contextHelp.js                     (content/contextHelp.js)
 
@@ -37,7 +38,8 @@ toolkit.jar:
 +   content/global/xul.css                          (content/xul.css) 
 +   content/communicator/nsContextMenu.js           (content/nsContextMenu.js)
 +   content/communicator/tasksOverlay.xul           (content/tasksOverlay.xul)
-+   content/communicator/utilityOverlay.xul         (content/utilityOverlay.xul) 
++   content/communicator/utilityOverlay.xul         (content/utilityOverlay.xul)
++   content/global/finddialog.xul                   (content/finddialog.xul) 
 
 
 en-US.jar: