diff --git a/mail/base/content/mailWindowOverlay.xul b/mail/base/content/mailWindowOverlay.xul
index a91593f680b..989aad3a9f7 100644
--- a/mail/base/content/mailWindowOverlay.xul
+++ b/mail/base/content/mailWindowOverlay.xul
@@ -1864,12 +1864,11 @@
                   checked="true" oncommand="changeQuickSearchMode(this)"/>
         <menuitem value="3" label="&searchMessageBody.label;" type="radio" 
                   oncommand="changeQuickSearchMode(this)"/>
-        <menuseparator/>
-        <menuitem value="4" label="&saveAsVirtualFolderMenu.label;" 
-                  oncommand="saveViewAsVirtualFolder()"/>
-        <menuseparator/>
-        <menuitem value="5" label="&findInMessageMenu.label;" type="radio" 
+        <menuitem value="4" label="&findInMessageMenu.label;" type="radio" 
                   oncommand="changeQuickSearchMode(this)"/>
+        <menuseparator/>
+        <menuitem value="5" label="&saveAsVirtualFolderMenu.label;" 
+                  oncommand="saveViewAsVirtualFolder()"/>
       </menupopup>
     </button>
   </textbox>
diff --git a/mail/locales/en-US/chrome/messenger/messenger.dtd b/mail/locales/en-US/chrome/messenger/messenger.dtd
index 6d34088dbbb..81a93f68940 100644
--- a/mail/locales/en-US/chrome/messenger/messenger.dtd
+++ b/mail/locales/en-US/chrome/messenger/messenger.dtd
@@ -504,9 +504,9 @@
 <!ENTITY searchSubjectMenu.label "Subject">
 <!ENTITY searchSenderMenu.label "Sender">
 <!ENTITY searchSubjectOrSenderMenu.label "Subject Or Sender">
-<!ENTITY saveAsVirtualFolderMenu.label "Save as Virtual Folder">
-<!ENTITY searchMessageBody.label "Message Body">
+<!ENTITY searchMessageBody.label "Entire Message">
 <!ENTITY findInMessageMenu.label "Find In Message">
+<!ENTITY saveAsVirtualFolderMenu.label "Save as Virtual Folder...">
 
 <!-- Thread Pane -->
 <!ENTITY threadColumn.label "Thread">