collapse msgViewPickerOverlay directly into mailWindowOverlay.xul

Thanks to Stephen Walker for the patch.

mail/base/content/mailWindowOverlay.xul

@@ -38,11 +38,12 @@
   xmlns:nc="http://home.netscape.com/NC-rdf#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script src="chrome://messenger/content/mailCommands.js"/>
-<script src="chrome://messenger/content/mailWindowOverlay.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
 <script type="application/x-javascript" src="chrome://messenger/content/mailCore.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
 <script type="application/x-javascript" src="chrome://communicator/content/printing.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/msgViewPickerOverlay.js"/>
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/> 
@@ -1628,13 +1629,29 @@
 </toolbox>
 
 <hbox id="searchBox" persist="collapsed" align="center">
+  <label value="&viewPicker.label;" control="viewPicker"  accesskey="&viewPicker.accesskey;"/>
+  <menulist id="viewPicker" oncreate="FillLabelValues();" oncommand="viewChange(this);">
+    <menupopup id="viewPickerPopup">
+      <menuitem value="0" id="viewPickerAll" label="&viewPickerAll.label;"/>
+      <menuitem value="1" id="viewPickerUnread" label="&viewPickerUnread.label;"/>
+      <menuseparator/>
+      <menuitem value="2" id="labelMenuItem1"/>
+      <menuitem value="3" id="labelMenuItem2"/>
+      <menuitem value="4" id="labelMenuItem3"/>
+      <menuitem value="5" id="labelMenuItem4"/>
+      <menuitem value="6" id="labelMenuItem5"/>
+      <menuseparator id="lastDefaultView"/>
+      <menuseparator id="createCustomViewSeparator"/>
+      <menuitem id="createCustomView" value="7" label="&viewPickerCustomView.label;"/>
+    </menupopup>
+  </menulist>
   <label id="searchCriteria" value="&SearchSubjectOrSender.label;" control="searchInput" 
          accesskey="&SearchSubjectOrSender.accesskey;"/>
   <textbox id="searchInput" flex="5" onfocus="this.select();" onclick="this.select();" oninput="onSearchInput(false);" onkeypress="onSearchKeyPress(event);"/>
   <button id="clearButton" label="&clearButton.label;" disabled="true" tooltiptext="&clearButton.tooltip;" oncommand="onClearSearch();" 
           accesskey="&clearButton.accesskey;"/>
   <button id="advancedButton" label="&advancedButton.label;" tooltiptext="&advancedButton.tooltip;" oncommand="onAdvancedSearch();"
-          accesskey="&advancedButton.accesskey;"/>
+          accesskey="&advancedButton.accesskey;" hidden="true"/>
 </hbox>
 
 <hbox id="junkBar" collapsed="true">

mail/base/content/messenger-views.rdf

@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:messenger-views"/>
+  </RDF:Seq>
+
+  <RDF:Description about="urn:mozilla:package:messenger-views"
+        chrome:displayName="Messenger"
+        chrome:author="mozilla.org"
+        chrome:name="messenger-views"
+        chrome:localeVersion="1.5a"
+        chrome:skinVersion="1.2">
+  </RDF:Description>
+</RDF:RDF>

mail/base/jar.mn

@@ -20,6 +20,7 @@ messenger.jar:
 *+  content/messenger/aboutDialog.xul               (content/aboutDialog.xul)
 *+  content/messenger/junkMail.xul                  (content/junkMail.xul)
 *+  content/messenger/junkMail.js                   (content/junkMail.js)
++   content/messenger-views/contents.rdf            (content/messenger-views.rdf)
     content/messenger/about-thunderbird.png         (content/about-thunderbird.png)
     
 classic.jar:

mail/base/locale/messenger.dtd

@@ -474,6 +474,11 @@
 <!ENTITY folderContextCopyLocation.accesskey "C">
 
 <!-- Search Bar -->
+<!ENTITY viewPicker.label "View:">
+<!ENTITY viewPicker.accesskey "i">
+<!ENTITY viewPickerAll.label "All">
+<!ENTITY viewPickerUnread.label "Unread">
+<!ENTITY viewPickerCustomView.label "Customize...">
 <!ENTITY SearchSubjectOrSender.label "Subject or Sender contains:">
 <!ENTITY SearchSubjectOrSender.accesskey "S">
 <!ENTITY SearchNameOrEmail.label "Name or Email contains:">