diff --git a/mozilla/mail/locales/en-US/chrome/messenger/virtualFolderProperties.dtd b/mozilla/mail/locales/en-US/chrome/messenger/virtualFolderProperties.dtd
index 300bc4512e4..fc8a4ea75f5 100644
--- a/mozilla/mail/locales/en-US/chrome/messenger/virtualFolderProperties.dtd
+++ b/mozilla/mail/locales/en-US/chrome/messenger/virtualFolderProperties.dtd
@@ -1,11 +1,8 @@
 <!ENTITY virtualFolderProperties.title "New Saved Search Folder">
 <!ENTITY name.label                 "Name:">
-<!ENTITY name.accesskey             "n">
+<!ENTITY name.accesskey             "N">
 <!ENTITY description.label          "Create as a subfolder of:">
 <!ENTITY description.accesskey      "C">
-<!ENTITY searchCriteriaText.label   "Modify the search criteria used for this saved search:">
-<!ENTITY searchCriteriaButton.label "Search Criteria...">
-<!ENTITY searchCriteriaButton.accesskey "S">
 
 <!ENTITY searchTermCaption.label "Configure the search criteria used for this saved search folder: ">
 
@@ -14,4 +11,4 @@
 <!ENTITY chooseFoldersButton.accesskey "h">
 
 <!ENTITY searchOnline.label "Search Online (Gives up-to-date results for IMAP and News folders but increases time to open the folder)">
-<!ENTITY searchOnline.accesskey "O">
+<!ENTITY searchOnline.accesskey "S">
diff --git a/mozilla/mailnews/base/resources/locale/en-US/virtualFolderProperties.dtd b/mozilla/mailnews/base/resources/locale/en-US/virtualFolderProperties.dtd
index 300bc4512e4..36377747a05 100644
--- a/mozilla/mailnews/base/resources/locale/en-US/virtualFolderProperties.dtd
+++ b/mozilla/mailnews/base/resources/locale/en-US/virtualFolderProperties.dtd
@@ -1,17 +1,14 @@
 <!ENTITY virtualFolderProperties.title "New Saved Search Folder">
-<!ENTITY name.label                 "Name:">
-<!ENTITY name.accesskey             "n">
-<!ENTITY description.label          "Create as a subfolder of:">
-<!ENTITY description.accesskey      "C">
-<!ENTITY searchCriteriaText.label   "Modify the search criteria used for this saved search:">
-<!ENTITY searchCriteriaButton.label "Search Criteria...">
-<!ENTITY searchCriteriaButton.accesskey "S">
+<!ENTITY name.label                    "Name:">
+<!ENTITY name.accesskey                "N">
+<!ENTITY description.label             "Create as a subfolder of:">
+<!ENTITY description.accesskey         "C">
 
-<!ENTITY searchTermCaption.label "Configure the search criteria used for this saved search folder: ">
+<!ENTITY searchTermCaption.label       "Configure the search criteria used for this saved search folder: ">
 
-<!ENTITY folderSelectionCaption.label "Select the folders to search: ">
-<!ENTITY chooseFoldersButton.label "Choose...">
+<!ENTITY folderSelectionCaption.label  "Select the folders to search: ">
+<!ENTITY chooseFoldersButton.label     "Choose...">
 <!ENTITY chooseFoldersButton.accesskey "h">
 
-<!ENTITY searchOnline.label "Search Online (Gives up-to-date results for IMAP and News folders but increases time to open the folder)">
-<!ENTITY searchOnline.accesskey "O">
+<!ENTITY searchOnline.label            "Search Online (Gives up-to-date results for IMAP and News folders but increases time to open the folder)">
+<!ENTITY searchOnline.accesskey        "S">