diff --git a/mozilla/mailnews/base/search/resources/content/FilterEditor.xul b/mozilla/mailnews/base/search/resources/content/FilterEditor.xul
index 428494ab29c..90cdb8d5d0c 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterEditor.xul
+++ b/mozilla/mailnews/base/search/resources/content/FilterEditor.xul
@@ -2,31 +2,7 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
-<!DOCTYPE window
-[
-<!ENTITY subject.label "subject">
-<!ENTITY sender.label "sender">
-<!ENTITY date.label "date">
-<!ENTITY anyText.label "any text">
-<!ENTITY keyword.label "keyword">
-<!ENTITY age.label "age in days">
-<!ENTITY contains.label "contains">
-<!ENTITY nocontains.label "doesn't contain">
-<!ENTITY description.label "Description:">
-<!ENTITY matchAny.label "Match any of the following">
-<!ENTITY matchAll.label "Match all of the following">
-<!ENTITY filterAction.label "Filter Action:">
-<!ENTITY moveToFolder.label "Move To Folder">
-<!ENTITY changePriority.label "Change Priority">
-<!ENTITY delete.label "Delete">
-<!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">
-]>
-
+<!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"
diff --git a/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul b/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
index a79ae2d1484..0800098b7ff 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
+++ b/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
@@ -2,20 +2,7 @@
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
-<!DOCTYPE window
-[
-	<!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:">
-]>
-
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/FilterListDialog.dtd" >
 <window
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/mailnews/base/search/resources/content/SearchDialog.xul b/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
index f906e0be38b..c1788ebafcc 100644
--- a/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
+++ b/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
@@ -22,28 +22,7 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 -->
 
-<!DOCTYPE window
-[
-    <!ENTITY searchHeading.label "Search for messages in:">
-    <!ENTITY matchAll.label "Match all of the following:">
-    <!ENTITY matchAny.label "Match any of the following:">
-    <!ENTITY scopeSubject.label "subject">
-    <!ENTITY scopeSender.label  "sender">
-    <!ENTITY scopeDate.label    "date">
-    <!ENTITY scopeText.label    "any text">
-    <!ENTITY scopeKeyword.label "keyword">
-    <!ENTITY scopeAgeDays.label "age in days">
-    <!ENTITY critContains.label "contains">
-    <!ENTITY critNotContains.label "doesn't contain">
-    <!ENTITY buttonMore.label "More">
-    <!ENTITY buttonFewer.label "Fewer">
-    <!ENTITY buttonClear.label "Clear">
-    <!ENTITY buttonSearch.label "Search">
-    <!ENTITY buttonOptions.label "Options">
-    <!ENTITY buttonClose.label "Close">
-	<!ENTITY searchDialogTitle.label "Search Messages">
-]>
-<window id="msg-search-dialog" xmlns:html="http://www.w3.org/TR/REC-html40"
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/SearchDialog.dtd" >
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     title="&searchDialogTitle.label;">
 
diff --git a/mozilla/mailnews/base/search/resources/content/SearchOptions.xul b/mozilla/mailnews/base/search/resources/content/SearchOptions.xul
index ba7e2959425..9d149b72fad 100644
--- a/mozilla/mailnews/base/search/resources/content/SearchOptions.xul
+++ b/mozilla/mailnews/base/search/resources/content/SearchOptions.xul
@@ -22,17 +22,7 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 -->
 
-<!DOCTYPE window
-[
-<!ENTITY searchOptionsTitle.label "Search Options">
-<!ENTITY searchSubfoldersCheckbox.label "Search Subfolders">
-<!ENTITY localRemoteTitle.label "When online, search for messages:">
-<!ENTITY localSearchRadio.label "on your local system">
-<!ENTITY removeSearchRadio.label "on the specified serer">
-<!ENTITY ok.label "OK">
-<!ENTITY cancel.label "Cancel">
-]>
-
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/SearchOptions.dtd" >
 
 <window id="search-options-dialog" xmlns:html="http://www.w3.org/TR/REC-html40"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"