diff --git a/mozilla/mailnews/base/search/resources/content/FilterEditor.js b/mozilla/mailnews/base/search/resources/content/FilterEditor.js
index 7d66db811a9..e448c29ab24 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterEditor.js
+++ b/mozilla/mailnews/base/search/resources/content/FilterEditor.js
@@ -1,3 +1,7 @@
+function filterEditorOnLoad(pickerID)
+{
+	MsgFolderPickerOnLoad(pickerID);
+}
 
 
 function updateRule(boxnode) {
diff --git a/mozilla/mailnews/base/search/resources/content/FilterEditor.xul b/mozilla/mailnews/base/search/resources/content/FilterEditor.xul
index 4f5045155d6..5ba7f1dc450 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterEditor.xul
+++ b/mozilla/mailnews/base/search/resources/content/FilterEditor.xul
@@ -1,12 +1,18 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/FilterEditor.dtd" >
 <window
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:html="http://www.w3.org/TR/REC-html40"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<html:script language="JavaScript" src="FilterEditor.js"/>
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  title="&window.title;"
+  onload="filterEditorOnLoad('msgFccFolderPicker');">
+
+<html:script language="JavaScript" src="chrome://messenger/content/FilterEditor.js"/>
+<html:script language="JavaScript" src="chrome://messenger/content/widgetglue.js"/>
+<html:script language="JavaScript" src="chrome://global/content/strres.js"/>
 
 <box align="vertical" style="width: 100%;">
   <box align="horizontal" class="padded">
@@ -62,12 +68,11 @@
       <html:option>&watchThread.label;</html:option>
     </html:select>
     <spring class="spacer"/>
-    <html:select flex="100%">
-      <html:option>Server1</html:option>
-      <html:option>  Folder 1</html:option>
-    </html:select>
-    <spring class="spacer"/>
-    <titledbutton class="push" value="&newFolderButton.label;"/>
+    <box align="horizontal">
+<!-- we can use fcc folder picker, because that follows the "can file into here" rules -->
+	<menu id="msgFccFolderPicker"/>
+	<spring flex="100%"/>
+    </box>
   </box>
   <box alignment="vertical" class="cleanborder">
     <html:div>&description.label;</html:div>
diff --git a/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul b/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
index 8479927b98f..88a1ada2e4e 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
+++ b/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
@@ -5,9 +5,11 @@
 <window
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:html="http://www.w3.org/TR/REC-html40"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  title="&window.title;">
+
+<html:script language="JavaScript" src="chrome://messenger/content/FilterListDialog.js"/>
 
-<html:script language="JavaScript" src="FilterListDialog.js"/>
 <box align="vertical" style="width: 100%">
   <box align="horizontal" flex="100%">
     <box align="vertical" style="width:100%;" flex="100%" class="cleanborder">
diff --git a/mozilla/mailnews/base/search/resources/locale/en-US/FilterEditor.dtd b/mozilla/mailnews/base/search/resources/locale/en-US/FilterEditor.dtd
index 67d1cf27ab7..86c23632352 100644
--- a/mozilla/mailnews/base/search/resources/locale/en-US/FilterEditor.dtd
+++ b/mozilla/mailnews/base/search/resources/locale/en-US/FilterEditor.dtd
@@ -1,5 +1,4 @@
-<!-- extracted from FilterEditor.xul -->
-
+<!ENTITY window.title "Edit Filter">
 <!ENTITY subject.label "subject">
 <!ENTITY sender.label "sender">
 <!ENTITY date.label "date">
@@ -18,6 +17,5 @@
 <!ENTITY markRead.label "Mark read">
 <!ENTITY ignoreThread.label "Ignore thread">
 <!ENTITY watchThread.label "Watch thread">
-<!ENTITY newFolderButton.label "New Folder...">
 <!ENTITY more.label "More">
 <!ENTITY less.label "Less">
diff --git a/mozilla/mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd b/mozilla/mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd
index ca70d08b4db..7f4cc66968d 100644
--- a/mozilla/mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd
+++ b/mozilla/mailnews/base/search/resources/locale/en-US/FilterListDialog.dtd
@@ -1,12 +1,11 @@
-<!-- extracted from FilterListDialog.xul -->
-
-	<!ENTITY numberColumn.label "Number">
-	<!ENTITY nameColumn.label "Name">
-	<!ENTITY activeColumn.label "Active">
-	<!ENTITY newButton.label "New">
-	<!ENTITY editButton.label "Edit">
-	<!ENTITY deleteButton.label "Delete">
-	<!ENTITY logFilterUseCheckbox.label "Log Filter Use">
-	<!ENTITY viewLogButton.label "View Log">
-	<!ENTITY description.label "Description">
-    <!ENTITY filterHeader.label "Filters will be applied in the following order:">
+<!ENTITY window.title "Message Filters">
+<!ENTITY numberColumn.label "Number">
+<!ENTITY nameColumn.label "Name">
+<!ENTITY activeColumn.label "Active">
+<!ENTITY newButton.label "New">
+<!ENTITY editButton.label "Edit">
+<!ENTITY deleteButton.label "Delete">
+<!ENTITY logFilterUseCheckbox.label "Log Filter Use">
+<!ENTITY viewLogButton.label "View Log">
+<!ENTITY description.label "Description">
+<!ENTITY filterHeader.label "Filters will be applied in the following order:">
diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/FilterEditor.dtd b/mozilla/suite/locales/en-US/chrome/mailnews/FilterEditor.dtd
index 67d1cf27ab7..86c23632352 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/FilterEditor.dtd
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/FilterEditor.dtd
@@ -1,5 +1,4 @@
-<!-- extracted from FilterEditor.xul -->
-
+<!ENTITY window.title "Edit Filter">
 <!ENTITY subject.label "subject">
 <!ENTITY sender.label "sender">
 <!ENTITY date.label "date">
@@ -18,6 +17,5 @@
 <!ENTITY markRead.label "Mark read">
 <!ENTITY ignoreThread.label "Ignore thread">
 <!ENTITY watchThread.label "Watch thread">
-<!ENTITY newFolderButton.label "New Folder...">
 <!ENTITY more.label "More">
 <!ENTITY less.label "Less">
diff --git a/mozilla/suite/locales/en-US/chrome/mailnews/FilterListDialog.dtd b/mozilla/suite/locales/en-US/chrome/mailnews/FilterListDialog.dtd
index ca70d08b4db..7f4cc66968d 100644
--- a/mozilla/suite/locales/en-US/chrome/mailnews/FilterListDialog.dtd
+++ b/mozilla/suite/locales/en-US/chrome/mailnews/FilterListDialog.dtd
@@ -1,12 +1,11 @@
-<!-- extracted from FilterListDialog.xul -->
-
-	<!ENTITY numberColumn.label "Number">
-	<!ENTITY nameColumn.label "Name">
-	<!ENTITY activeColumn.label "Active">
-	<!ENTITY newButton.label "New">
-	<!ENTITY editButton.label "Edit">
-	<!ENTITY deleteButton.label "Delete">
-	<!ENTITY logFilterUseCheckbox.label "Log Filter Use">
-	<!ENTITY viewLogButton.label "View Log">
-	<!ENTITY description.label "Description">
-    <!ENTITY filterHeader.label "Filters will be applied in the following order:">
+<!ENTITY window.title "Message Filters">
+<!ENTITY numberColumn.label "Number">
+<!ENTITY nameColumn.label "Name">
+<!ENTITY activeColumn.label "Active">
+<!ENTITY newButton.label "New">
+<!ENTITY editButton.label "Edit">
+<!ENTITY deleteButton.label "Delete">
+<!ENTITY logFilterUseCheckbox.label "Log Filter Use">
+<!ENTITY viewLogButton.label "View Log">
+<!ENTITY description.label "Description">
+<!ENTITY filterHeader.label "Filters will be applied in the following order:">