diff --git a/mailnews/base/search/resources/locale/en-US/.cvsignore b/mailnews/base/search/resources/locale/en-US/.cvsignore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/mailnews/base/search/resources/locale/en-US/Makefile.in b/mailnews/base/search/resources/locale/en-US/Makefile.in
index d1d78311007..c69e024aafd 100644
--- a/mailnews/base/search/resources/locale/en-US/Makefile.in
+++ b/mailnews/base/search/resources/locale/en-US/Makefile.in
@@ -29,13 +29,10 @@ include $(topsrcdir)/config/rules.mk
 SAMPLES_DIR = $(DIST)/bin/chrome/messenger/locale/en-US
 
 EXPORT_RESOURCE_SAMPLES = \
-	$(srcdir)/SearchDialog.xul	\
-	$(srcdir)/SearchOptions.xul	\
-	$(srcdir)/SearchDialog.js	\
-	$(srcdir)/FilterListDialog.xul	\
-	$(srcdir)/FilterListDialog.js	\
-	$(srcdir)/FilterEditor.xul		\
-	$(srcdir)/FilterEditor.js		\
+	$(srcdir)/FilterEditor.dtd		\
+	$(srcdir)/FilterListDialog.dtd		\
+	$(srcdir)/SearchDialog.dtd		\
+	$(srcdir)/SearchOptions.dtd		\
 	$(NULL)
 
 EXPORT_RESOURCE_SAMPLES_TO_REMOVE := $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES))
diff --git a/mailnews/base/search/resources/locale/en-US/makefile.win b/mailnews/base/search/resources/locale/en-US/makefile.win
index 5b467cacc67..187c202839b 100644
--- a/mailnews/base/search/resources/locale/en-US/makefile.win
+++ b/mailnews/base/search/resources/locale/en-US/makefile.win
@@ -20,18 +20,14 @@ DEPTH=..\..\..\..\..
 include <$(DEPTH)\config\rules.mak>
 
 install:: 
-	$(MAKE_INSTALL) .\SearchDialog.xul		$(DIST)\bin\chrome\messenger\locale\en-US
-	$(MAKE_INSTALL) .\SearchOptions.xul		$(DIST)\bin\chrome\messenger\locale\en-US
-	$(MAKE_INSTALL) .\SearchDialog.js			$(DIST)\bin\chrome\messenger\locale\en-US
-	$(MAKE_INSTALL) .\FilterListDialog.xul	$(DIST)\bin\chrome\messenger\locale\en-US
-	$(MAKE_INSTALL) .\FilterListDialog.js	$(DIST)\bin\chrome\messenger\locale\en-US
-	$(MAKE_INSTALL) .\FilterEditor.xul		$(DIST)\bin\chrome\messenger\locale\en-US
-	$(MAKE_INSTALL) .\FilterEditor.js			$(DIST)\bin\chrome\messenger\locale\en-US
+	$(MAKE_INSTALL) .\SearchDialog.dtd		$(DIST)\bin\chrome\messenger\locale\en-US
+	$(MAKE_INSTALL) .\SearchOptions.dtd		$(DIST)\bin\chrome\messenger\locale\en-US
+	$(MAKE_INSTALL) .\FilterListDialog.dtd	$(DIST)\bin\chrome\messenger\locale\en-US
+	$(MAKE_INSTALL) .\FilterEditor.dtd		$(DIST)\bin\chrome\messenger\locale\en-US
 
 clobber::
-	rm -f $(DIST)\chrome\messenger\locale\en-US\SearchDialog.xul
-	rm -f $(DIST)\chrome\messenger\locale\en-US\SearchDialog.js
-	rm -f $(DIST)\chrome\messenger\locale\en-US\FilterListDialog.xul
-	rm -f $(DIST)\chrome\messenger\locale\en-US\FilterListDialog.js
-	rm -f $(DIST)\chrome\messenger\locale\en-US\FilterEditor.xul
-	rm -f $(DIST)\chrome\messenger\locale\en-US\FilterEditor.js
+	rm -f $(DIST)\chrome\messenger\locale\en-US\SearchDialog.dtd
+	rm -f $(DIST)\chrome\messenger\locale\en-US\FilterListDialog.dtd
+	rm -f $(DIST)\chrome\messenger\locale\en-US\FilterEditor.dtd
+	rm -f $(DIST)\chrome\messenger\locale\en-US\SearchOptions.dtd
+