diff --git a/allmakefiles.sh b/allmakefiles.sh
index 38a9f75b8594..ba85c30689d7 100755
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -941,6 +941,7 @@ toolkit/components/commandlines/Makefile
 toolkit/components/commandlines/public/Makefile
 toolkit/components/commandlines/src/Makefile
 toolkit/components/console/Makefile
+toolkit/components/cookie/Makefile
 toolkit/components/downloads/public/Makefile
 toolkit/components/downloads/Makefile
 toolkit/components/downloads/src/Makefile
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
index a67548519b89..3bb788533d6f 100644
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
@@ -51,9 +51,6 @@
     locale/browser/sidebar/sidebar.properties      (%chrome/browser/sidebar/sidebar.properties)
     locale/browser-region/region.properties        (%chrome/browser-region/region.properties)
 *   locale/browser-region/contents.rdf             (generic/chrome/browser-region/contents.rdf)
-*   locale/@AB_CD@/cookie/contents.rdf                     (generic/chrome/cookie/contents.rdf)
-    locale/@AB_CD@/cookie/cookieAcceptDialog.dtd           (%chrome/cookie/cookieAcceptDialog.dtd)
-    locale/@AB_CD@/cookie/cookieAcceptDialog.properties    (%chrome/cookie/cookieAcceptDialog.properties)
 #ifndef MOZ_USE_OFFICIAL_BRANDING
 *   locale/branding/contents.rdf      (generic/chrome/branding/contents.rdf)
     locale/branding/brand.dtd         (%chrome/branding/brand.dtd)
diff --git a/config/make-chromelist.pl b/config/make-chromelist.pl
index 29da55b4d04b..631e55538b64 100644
--- a/config/make-chromelist.pl
+++ b/config/make-chromelist.pl
@@ -142,7 +142,14 @@ while (<JARFILE>)
   if ($macos) { $chromefile =~ tr|/|:|; }
   if ($win32) { $chromefile =~ tr|/|\\|; }
 
-  $cvsfile = File::Spec::Unix->catfile($stub, $cvsfile);
+  # Deal with leading slashes, if there is one we do not need
+  # to add the stub and need to remove that slash
+  if ($cvsfile =~ m|^/|) {
+    $cvsfile =~ s/^\///;
+    $cvsfile = File::Spec::Unix->catfile($cvsfile);
+  } else {
+    $cvsfile = File::Spec::Unix->catfile($stub, $cvsfile);
+  }
   
   print BIGLIST "$chromefile ($cvsfile)\n";
 }
diff --git a/extensions/wallet/jar.mn b/extensions/wallet/jar.mn
index b87612c2ec19..73aed93b8f2c 100644
--- a/extensions/wallet/jar.mn
+++ b/extensions/wallet/jar.mn
@@ -7,9 +7,6 @@ comm.jar:
     content/wallet/pref-wallet.xul                      (resources/content/pref-wallet.xul)
     content/wallet/pref-passwords.xul                   (resources/content/pref-passwords.xul)
     content/wallet/walletOverlay.js                     (resources/content/walletOverlay.js)
-    content/communicator/wallet/nsWalletTreeUtils.js    (cookieviewer/resources/content/nsWalletTreeUtils.js)
-    content/communicator/wallet/CookieViewer.js         (cookieviewer/resources/content/CookieViewer.js)
-    content/communicator/wallet/CookieViewer.xul        (cookieviewer/resources/content/CookieViewer.xul)
     content/communicator/wallet/SignonViewer.js         (signonviewer/resources/content/SignonViewer.js)
     content/communicator/wallet/SignonViewer.xul        (signonviewer/resources/content/SignonViewer.xul)
     content/communicator/wallet/WalletPreview.js        (walletpreview/resources/content/WalletPreview.js)
@@ -25,8 +22,6 @@ en-US.jar:
     locale/en-US/wallet/walletPrefsOverlay.dtd                (resources/locale/en-US/walletPrefsOverlay.dtd)
     locale/en-US/wallet/pref-wallet.dtd                       (resources/locale/en-US/pref-wallet.dtd)
     locale/en-US/wallet/pref-passwords.dtd                    (resources/locale/en-US/pref-passwords.dtd)
-    locale/en-US/communicator/wallet/CookieViewer.properties  (cookieviewer/resources/locale/en-US/CookieViewer.properties)
-    locale/en-US/communicator/wallet/CookieViewer.dtd         (cookieviewer/resources/locale/en-US/CookieViewer.dtd)
     locale/en-US/communicator/wallet/WalletEditor.properties  (editor/resources/locale/en-US/WalletEditor.properties)
     locale/en-US/communicator/wallet/WalletEditor.dtd         (editor/resources/locale/en-US/WalletEditor.dtd)
     locale/en-US/communicator/wallet/SignonViewer.properties  (signonviewer/resources/locale/en-US/SignonViewer.properties)
diff --git a/extensions/wallet/signonviewer/resources/content/SignonViewer.xul b/extensions/wallet/signonviewer/resources/content/SignonViewer.xul
index cb28f980988b..c64b8c85e19b 100644
--- a/extensions/wallet/signonviewer/resources/content/SignonViewer.xul
+++ b/extensions/wallet/signonviewer/resources/content/SignonViewer.xul
@@ -55,7 +55,7 @@
 
   <script src="chrome://communicator/content/wallet/SignonViewer.js"/>
   <script src="chrome://global/content/strres.js"/>
-  <script src="chrome://communicator/content/wallet/nsWalletTreeUtils.js"/>
+  <script src="chrome://communicator/content/permissions/treeUtils.js"/>
   <script src="chrome://help/content/contextHelp.js"/>
 
   <stringbundle id="signonBundle"
diff --git a/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul b/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
index fa494352e3bc..6e47530b2a5c 100644
--- a/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
+++ b/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
@@ -21,7 +21,7 @@
       case "chrome://communicator/content/pref/pref-appearance.xul":
         _elementIDs.push("generalStartupMail");
         break;
-      case "chrome://cookie/content/pref-images.xul":
+      case "chrome://communicator/content/pref/pref-images.xul":
         _elementIDs.push("networkImageDisableImagesInMailNews");
         break;
       }
diff --git a/mailnews/base/resources/content/contents.rdf b/mailnews/base/resources/content/contents.rdf
index 9d81aa778bba..4ce577d33706 100644
--- a/mailnews/base/resources/content/contents.rdf
+++ b/mailnews/base/resources/content/contents.rdf
@@ -22,8 +22,8 @@
     <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
     <RDF:li resource="chrome://communicator/content/pref/pref-appearance.xul"/>
     <RDF:li resource="chrome://communicator/content/pref/pref-scripts.xul"/>
-    <RDF:li resource="chrome://cookie/content/pref-cookies.xul"/>
-    <RDF:li resource="chrome://cookie/content/pref-images.xul"/>
+    <RDF:li resource="chrome://communicator/content/pref/pref-cookies.xul"/>
+    <RDF:li resource="chrome://communicator/content/pref/pref-images.xul"/>
     <RDF:li resource="chrome://navigator/content/navigatorOverlay.xul"/>
     <RDF:li resource="chrome://messenger/content/messenger.xul"/>
     <RDF:li resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul"/>
@@ -51,12 +51,12 @@
   </RDF:Seq>
 
   <!-- messenger cookie toggle pref -->
-  <RDF:Seq about="chrome://cookie/content/pref-cookies.xul">
+  <RDF:Seq about="chrome://communicator/content/pref/pref-cookies.xul">
     <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
   </RDF:Seq>
 
   <!-- messenger image toggle pref -->
-  <RDF:Seq about="chrome://cookie/content/pref-images.xul">
+  <RDF:Seq about="chrome://communicator/content/pref/pref-images.xul">
     <RDF:li>chrome://messenger/content/mailPrefsOverlay.xul</RDF:li>
   </RDF:Seq>
 
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 8c5c591bcc03..5cdabcd310e0 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -644,7 +644,7 @@ pref("network.cookie.prefsMigrated",        false);
 pref("network.cookie.lifetime.days",        90);
 
 // The following default value is for p3p medium mode.
-// See extensions/cookie/resources/content/p3p.xul for the definitions of low/medium/hi
+// See xpfe/components/permissions/content/cookieP3P.xul for the definitions of low/medium/hi
 pref("network.cookie.p3p",                  "ffffaaaa");
 pref("network.cookie.p3plevel",             1); // 0=low, 1=medium, 2=high, 3=custom
 
diff --git a/netwerk/test/jarlist.dat b/netwerk/test/jarlist.dat
index 3b0165d27fb1..b4c59f93efe8 100644
--- a/netwerk/test/jarlist.dat
+++ b/netwerk/test/jarlist.dat
@@ -142,12 +142,12 @@ jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/viewZoomOverlay.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/tasksOverlay.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/messenger/mailTasksOverlay.dtd
 jar:resource:///chrome/venkman.jar!/locale/en-US/venkman/venkman-overlay.dtd
-jar:resource:///chrome/en-US.jar!/locale/en-US/cookie/cookieTasksOverlay.dtd
+jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/permissions/cookieTasksOverlay.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/wallet/walletTasksOverlay.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/global/charsetOverlay.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/navigator/linkToolbar.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/sidebar/sidebarOverlay.dtd
-jar:resource:///chrome/en-US.jar!/locale/en-US/cookie/cookieContextOverlay.dtd
+jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/permissions/imageContextOverlay.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/wallet/walletContextOverlay.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/securityOverlay.dtd
 jar:resource:///chrome/en-US.jar!/locale/en-US/communicator/bookmarks/bookmarksOverlay.dtd
@@ -167,7 +167,7 @@ jar:resource:///chrome/comm.jar!/content/communicator/viewZoomOverlay.xul
 jar:resource:///chrome/comm.jar!/content/communicator/tasksOverlay.xul
 jar:resource:///chrome/messenger.jar!/content/messenger/mailTasksOverlay.xul
 jar:resource:///chrome/venkman.jar!/content/venkman/venkman-overlay.xul
-jar:resource:///chrome/comm.jar!/content/cookie/cookieTasksOverlay.xul
+jar:resource:///chrome/comm.jar!/content/communicator/permissions/cookieTasksOverlay.xul
 jar:resource:///chrome/comm.jar!/content/wallet/walletTasksOverlay.xul
 jar:resource:///chrome/toolkit.jar!/content/global/charsetOverlay.xul
 jar:resource:///chrome/comm.jar!/content/navigator/platformNavigationBindings.xul
@@ -175,7 +175,7 @@ jar:resource:///chrome/comm.jar!/content/navigator/navExtraOverlay.xul
 jar:resource:///chrome/comm.jar!/content/navigator/linkToolbarOverlay.xul
 jar:resource:///chrome/comm.jar!/content/communicator/sidebar/sidebarOverlay.xul
 jar:resource:///chrome/comm.jar!/content/communicator/contentAreaContextOverlay.xul
-jar:resource:///chrome/comm.jar!/content/cookie/cookieContextOverlay.xul
+jar:resource:///chrome/comm.jar!/content/communicator/permissions/imageContextOverlay.xul
 jar:resource:///chrome/comm.jar!/content/wallet/walletContextOverlay.xul
 jar:resource:///chrome/comm.jar!/content/communicator/securityOverlay.xul
 jar:resource:///chrome/comm.jar!/content/communicator/communicatorOverlay.xul
diff --git a/themes/classic/jar.mn b/themes/classic/jar.mn
index 6e207854324c..ce30f9dd3cf2 100644
--- a/themes/classic/jar.mn
+++ b/themes/classic/jar.mn
@@ -30,6 +30,8 @@ classic.jar:
   skin/classic/communicator/directory/folder-clsd.gif                   (communicator/directory/folder-clsd.gif)
   skin/classic/communicator/directory/folder-open.gif                   (communicator/directory/folder-open.gif)
   skin/classic/communicator/directory/file.gif                          (communicator/directory/file.gif)
+  skin/classic/communicator/permissions/taskbar-cookie.gif              (communicator/permissions/taskbar-cookie.gif)
+  skin/classic/communicator/permissions/status-cookie.gif               (communicator/permissions/status-cookie.gif)
   skin/classic/communicator/profile/migrate.gif                         (communicator/profile/migrate.gif)
   skin/classic/communicator/profile/profile.css                         (communicator/profile/profile.css)
   skin/classic/communicator/profile/profileManager.css                  (communicator/profile/profileManager.css)
diff --git a/themes/classic/navigator/navigator.css b/themes/classic/navigator/navigator.css
index d14f11a5f214..a6e011a64da9 100644
--- a/themes/classic/navigator/navigator.css
+++ b/themes/classic/navigator/navigator.css
@@ -333,7 +333,7 @@
 }
 
 #privacy-button {
-  list-style-image: url("chrome://communicator/skin/cookie/taskbar-cookie.gif");
+  list-style-image: url("chrome://communicator/skin/permissions/taskbar-cookie.gif");
 }
 
 #popupIcon {
diff --git a/themes/modern/jar.mn b/themes/modern/jar.mn
index 59dc01a6cff3..77838fffd79b 100644
--- a/themes/modern/jar.mn
+++ b/themes/modern/jar.mn
@@ -54,6 +54,8 @@ modern.jar:
   skin/modern/communicator/icons/smileys/innocent_n.gif            (communicator/icons/smileys/innocent_n.gif)
   skin/modern/communicator/icons/smileys/cry_n.gif                 (communicator/icons/smileys/cry_n.gif)
   skin/modern/communicator/icons/smileys/sealed_n.gif              (communicator/icons/smileys/sealed_n.gif)
+  skin/modern/communicator/permissions/taskbar-cookie.gif          (communicator/permissions/taskbar-cookie.gif)
+  skin/modern/communicator/permissions/status-cookie.gif           (communicator/permissions/status-cookie.gif)
   skin/modern/communicator/profile/migrate.gif                     (communicator/profile/migrate.gif)
   skin/modern/communicator/profile/profile.gif                     (communicator/profile/profile.gif)
   skin/modern/communicator/profile/profile.css                     (communicator/profile/profile.css)
diff --git a/themes/modern/navigator/navigator.css b/themes/modern/navigator/navigator.css
index 365b06197abd..fbaffe3d9a33 100644
--- a/themes/modern/navigator/navigator.css
+++ b/themes/modern/navigator/navigator.css
@@ -576,7 +576,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 }
 
 #privacy-button {
-  list-style-image: url("chrome://communicator/skin/cookie/taskbar-cookie.gif");
+  list-style-image: url("chrome://communicator/skin/permissions/taskbar-cookie.gif");
 }
 
 #popupIcon {
diff --git a/toolkit/components/Makefile.in b/toolkit/components/Makefile.in
index 2056f450ec1a..62037f3818e5 100644
--- a/toolkit/components/Makefile.in
+++ b/toolkit/components/Makefile.in
@@ -51,6 +51,7 @@ else
 DIRS = 		\
 	autocomplete \
 	console \
+	cookie \
 	filepicker \
 	help \
 	history \
diff --git a/toolkit/components/cookie/Makefile.in b/toolkit/components/cookie/Makefile.in
new file mode 100755
index 000000000000..0de5366ab4f4
--- /dev/null
+++ b/toolkit/components/cookie/Makefile.in
@@ -0,0 +1,31 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+
+DEPTH     = ../../..
+topsrcdir = @top_srcdir@
+srcdir    = @srcdir@
+VPATH     = @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+include $(topsrcdir)/config/rules.mk
+
diff --git a/toolkit/components/cookie/content/contents.rdf b/toolkit/components/cookie/content/contents.rdf
new file mode 100755
index 000000000000..72037e3fb44a
--- /dev/null
+++ b/toolkit/components/cookie/content/contents.rdf
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+  <!-- list all the packages being supplied by this jar -->
+  <RDF:Seq about="urn:mozilla:package:root">
+    <RDF:li resource="urn:mozilla:package:cookie"/>
+  </RDF:Seq>
+
+  <!-- package information -->
+  <RDF:Description about="urn:mozilla:package:cookie"
+        chrome:displayName="Cookie Manager"
+        chrome:author="mozilla.org"
+        chrome:name="cookie"
+#expand  	chrome:localeVersion="__MOZILLA_LOCALE_VERSION__">
+  </RDF:Description>
+
+</RDF:RDF>
diff --git a/toolkit/components/cookie/jar.mn b/toolkit/components/cookie/jar.mn
new file mode 100755
index 000000000000..25d9d9c93e5b
--- /dev/null
+++ b/toolkit/components/cookie/jar.mn
@@ -0,0 +1,3 @@
+comm.jar:
+  content/cookie/cookieAcceptDialog.xul          (content/cookieAcceptDialog.xul)
+  content/cookie/cookieAcceptDialog.js           (content/cookieAcceptDialog.js)
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index 29f6f8fa089f..29185165eba8 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -84,6 +84,9 @@
   locale/@AB_CD@/mozapps/update/errors.dtd                        (%chrome/mozapps/update/errors.dtd)
   locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.dtd           (%chrome/mozapps/xpinstall/xpinstallConfirm.dtd)
   locale/@AB_CD@/mozapps/xpinstall/xpinstallConfirm.properties    (%chrome/mozapps/xpinstall/xpinstallConfirm.properties)
+* locale/@AB_CD@/cookie/contents.rdf                     (generic/chrome/cookie/contents.rdf)
+  locale/@AB_CD@/cookie/cookieAcceptDialog.dtd           (%chrome/cookie/cookieAcceptDialog.dtd)
+  locale/@AB_CD@/cookie/cookieAcceptDialog.properties    (%chrome/cookie/cookieAcceptDialog.properties)
 * locale/@AB_CD@/passwordmgr/contents.rdf           (generic/chrome/passwordmgr/contents.rdf)
 * locale/@AB_CD@/passwordmgr/passwordmgr.properties (%chrome/passwordmgr/passwordmgr.properties)
 * locale/@AB_CD@/passwordmgr/passwordManager.dtd    (%chrome/passwordmgr/passwordManager.dtd)
diff --git a/xpfe/browser/resources/content/navigator.js b/xpfe/browser/resources/content/navigator.js
index d9701658e616..f1354c1d5aae 100644
--- a/xpfe/browser/resources/content/navigator.js
+++ b/xpfe/browser/resources/content/navigator.js
@@ -2304,7 +2304,7 @@ function onPopupWindow(aEvent) {
       }
     }
     if (showDialog) {
-      window.openDialog("chrome://communicator/content/aboutPopups.xul", "",
+      window.openDialog("chrome://communicator/content/permissions/aboutPopups.xul", "",
                         "chrome,centerscreen,dependent", true);
       pref.setBoolPref("privacy.popups.first_popup", false);
     }
@@ -2384,7 +2384,7 @@ function StatusbarViewPopupManager() {
   catch(ex) { }
   
   // open whitelist with site prefilled to unblock
-  window.openDialog("chrome://communicator/content/popupManager.xul", "",
+  window.openDialog("chrome://communicator/content/permissions/permissionsManager.xul", "",
                       "chrome,resizable=yes", hostPort);
 }
 
diff --git a/xpfe/communicator/jar.mn b/xpfe/communicator/jar.mn
index b79688e0f048..8b69ccdb6f07 100644
--- a/xpfe/communicator/jar.mn
+++ b/xpfe/communicator/jar.mn
@@ -27,9 +27,6 @@ comm.jar:
     content/communicator/findUtils.js                    (resources/content/findUtils.js)
     content/communicator/printPreviewBindings.xml        (resources/content/printPreviewBindings.xml)
     content/communicator/printing.js                     (resources/content/printing.js)
-    content/communicator/popupManager.js                 (resources/content/popupManager.js)
-    content/communicator/popupManager.xul                (resources/content/popupManager.xul)
-    content/communicator/aboutPopups.xul                 (resources/content/aboutPopups.xul)
 #ifndef MOZ_XUL_APP
 *   content/branding/contents.rdf                        (resources/content/contents-branding.rdf)
 #endif
@@ -47,9 +44,6 @@ en-US.jar:
     locale/en-US/communicator/viewZoomOverlay.dtd               (resources/locale/en-US/viewZoomOverlay.dtd)
     locale/en-US/communicator/viewZoomOverlay.properties        (resources/locale/en-US/viewZoomOverlay.properties)
     locale/en-US/communicator/printPreview.dtd                  (resources/locale/en-US/printPreview.dtd)
-    locale/en-US/communicator/popupManager.dtd                  (resources/locale/en-US/popupManager.dtd)
-    locale/en-US/communicator/popupManager.properties           (resources/locale/en-US/popupManager.properties)
-    locale/en-US/communicator/aboutPopups.dtd                   (resources/locale/en-US/aboutPopups.dtd)
 #ifndef MOZ_XUL_APP
 *   locale/en-US/branding/contents.rdf                          (resources/locale/en-US/contents-branding.rdf)
 *   locale/en-US/branding/brand.dtd                             (resources/locale/en-US/brand.dtd)
diff --git a/xpfe/communicator/resources/content/contents.rdf b/xpfe/communicator/resources/content/contents.rdf
index 427e91004ad2..9e2b826faedc 100644
--- a/xpfe/communicator/resources/content/contents.rdf
+++ b/xpfe/communicator/resources/content/contents.rdf
@@ -16,5 +16,30 @@
 #expand         chrome:skinVersion="__MOZILLA_SKIN_VERSION__">
   </RDF:Description>
 
+  <!-- overlay information -->
+  <RDF:Seq about="urn:mozilla:overlays">
+    <RDF:li resource="chrome://communicator/content/contentAreaContextOverlay.xul"/>
+    <RDF:li resource="chrome://communicator/content/pref/preftree.xul"/>
+    <RDF:li resource="chrome://navigator/content/navigatorOverlay.xul"/>
+    <RDF:li resource="chrome://messenger/content/mailWindowOverlay.xul"/>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://communicator/content/contentAreaContextOverlay.xul">
+    <RDF:li>chrome://communicator/content/permissions/imageContextOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://communicator/content/pref/preftree.xul">
+    <RDF:li>chrome://communicator/content/pref/permissionsPrefsOverlay.xul</RDF:li>
+  </RDF:Seq>
+  
+  <RDF:Seq about="chrome://navigator/content/navigatorOverlay.xul">
+    <RDF:li>chrome://communicator/content/permissions/permissionsNavigatorOverlay.xul</RDF:li>
+    <RDF:li>chrome://communicator/content/permissions/cookieTasksOverlay.xul</RDF:li>
+  </RDF:Seq>
+
+  <RDF:Seq about="chrome://messenger/content/mailWindowOverlay.xul">
+    <RDF:li>chrome://communicator/content/permissions/imageContextOverlay.xul</RDF:li>
+  </RDF:Seq>
+
 </RDF:RDF>
 
diff --git a/xpfe/components/jar.mn b/xpfe/components/jar.mn
index b4ea30ed1849..04316ef870f2 100644
--- a/xpfe/components/jar.mn
+++ b/xpfe/components/jar.mn
@@ -11,6 +11,18 @@ comm.jar:
     content/communicator/history/history-test.js                (history/resources/history-test.js)
     content/communicator/history/findHistory.js                 (history/resources/findHistory.js)
     content/communicator/history/findHistory.xul                (history/resources/findHistory.xul)
+    content/communicator/permissions/aboutPopups.xul            (permissions/content/aboutPopups.xul)
+    content/communicator/permissions/cookieP3P.xul              (permissions/content/cookieP3P.xul)
+    content/communicator/permissions/cookieP3PDialog.xul        (permissions/content/cookieP3PDialog.xul)
+    content/communicator/permissions/cookieTasksOverlay.xul     (permissions/content/cookieTasksOverlay.xul)
+    content/communicator/permissions/cookieViewer.js            (permissions/content/cookieViewer.js)
+    content/communicator/permissions/cookieViewer.xul           (permissions/content/cookieViewer.xul)
+    content/communicator/permissions/imageContextOverlay.xul    (permissions/content/imageContextOverlay.xul)
+    content/communicator/permissions/permissionsManager.js      (permissions/content/permissionsManager.js)
+    content/communicator/permissions/permissionsManager.xul     (permissions/content/permissionsManager.xul)
+    content/communicator/permissions/permissionsNavigatorOverlay.xul (permissions/content/permissionsNavigatorOverlay.xul)
+    content/communicator/permissions/permissionsOverlay.js      (permissions/content/permissionsOverlay.js)
+    content/communicator/permissions/treeUtils.js               (permissions/content/treeUtils.js)
     content/communicator/pref/pref-advanced.xul                 (prefwindow/resources/content/pref-advanced.xul)
     content/communicator/pref/pref-appearance.xul               (prefwindow/resources/content/pref-appearance.xul)
     content/communicator/pref/pref-applications.xul             (prefwindow/resources/content/pref-applications.xul)
@@ -65,6 +77,10 @@ comm.jar:
     content/communicator/pref/pref-mousewheel.xul               (prefwindow/resources/content/pref-mousewheel.xul)
     content/communicator/pref/pref-winhooks.xul                 (prefwindow/resources/content/pref-winhooks.xul)
     content/communicator/pref/pref-winhooks.js                  (prefwindow/resources/content/pref-winhooks.js)
+    content/communicator/pref/permissionsPrefsOverlay.xul       (prefwindow/resources/content/permissionsPrefsOverlay.xul)
+    content/communicator/pref/pref-cookies.xul                  (prefwindow/resources/content/pref-cookies.xul)
+    content/communicator/pref/pref-images.xul                   (prefwindow/resources/content/pref-images.xul)
+    content/communicator/pref/pref-popups.xul                   (prefwindow/resources/content/pref-popups.xul)
     content/communicator/related/related-panel.xul              (related/resources/related-panel.xul)
     content/communicator/related/related-panel.js               (related/resources/related-panel.js)
     content/communicator/search/search-editor.js                (search/resources/search-editor.js)
@@ -88,6 +104,9 @@ comm.jar:
     content/communicator/sidebar/local-panels.rdf               (sidebar/resources/local-panels.rdf)
     content/communicator/alerts/alert.xul                       (alerts/resources/content/alert.xul)  
     content/communicator/alerts/alert.js                        (alerts/resources/content/alert.js)  
+*   content/cookie/contents.rdf                                 (/toolkit/components/cookie/content/contents.rdf)
+    content/cookie/cookieAcceptDialog.xul                       (/toolkit/components/cookie/content/cookieAcceptDialog.xul)
+    content/cookie/cookieAcceptDialog.js                        (/toolkit/components/cookie/content/cookieAcceptDialog.js)
 
 en-US.jar:
     locale/en-US/communicator/directory/directory.dtd           (directory/locale/en-US/directory.dtd)
@@ -95,6 +114,15 @@ en-US.jar:
     locale/en-US/communicator/history/historyTreeOverlay.dtd    (history/resources/locale/en-US/historyTreeOverlay.dtd)
     locale/en-US/communicator/history/history.properties        (history/resources/locale/en-US/history.properties)
     locale/en-US/communicator/history/findHistory.dtd           (history/resources/locale/en-US/findHistory.dtd)
+    locale/en-US/communicator/permissions/aboutPopups.dtd       (permissions/locale/en-US/aboutPopups.dtd)
+    locale/en-US/communicator/permissions/cookieP3P.dtd         (permissions/locale/en-US/cookieP3P.dtd)
+    locale/en-US/communicator/permissions/cookieTasksOverlay.dtd (permissions/locale/en-US/cookieTasksOverlay.dtd)
+    locale/en-US/communicator/permissions/cookieViewer.properties (permissions/locale/en-US/cookieViewer.properties)
+    locale/en-US/communicator/permissions/cookieViewer.dtd      (permissions/locale/en-US/cookieViewer.dtd)
+    locale/en-US/communicator/permissions/imageContextOverlay.dtd (permissions/locale/en-US/imageContextOverlay.dtd)
+    locale/en-US/communicator/permissions/permissionsManager.dtd (permissions/locale/en-US/permissionsManager.dtd)
+    locale/en-US/communicator/permissions/permissionsManager.properties (permissions/locale/en-US/permissionsManager.properties)
+    locale/en-US/communicator/permissions/permissionsNavigatorOverlay.dtd (permissions/locale/en-US/permissionsNavigatorOverlay.dtd)
     locale/en-US/communicator/pref/pref-advanced.dtd            (prefwindow/resources/locale/en-US/pref-advanced.dtd)
     locale/en-US/communicator/pref/pref-appearance.dtd          (prefwindow/resources/locale/en-US/pref-appearance.dtd)
     locale/en-US/communicator/pref/pref-applications.dtd        (prefwindow/resources/locale/en-US/pref-applications.dtd)
@@ -130,6 +158,10 @@ en-US.jar:
     locale/en-US/communicator/pref/pref.dtd                     (prefwindow/resources/locale/en-US/pref.dtd)
     locale/en-US/communicator/pref/pref-mousewheel.dtd          (prefwindow/resources/locale/en-US/pref-mousewheel.dtd)
     locale/en-US/communicator/pref/pref-winhooks.dtd            (prefwindow/resources/locale/en-US/pref-winhooks.dtd)
+    locale/en-US/communicator/pref/permissionsPrefsOverlay.dtd  (prefwindow/resources/locale/en-US/permissionsPrefsOverlay.dtd)
+    locale/en-US/communicator/pref/pref-cookies.dtd             (prefwindow/resources/locale/en-US/pref-cookies.dtd)
+    locale/en-US/communicator/pref/pref-images.dtd              (prefwindow/resources/locale/en-US/pref-images.dtd)
+    locale/en-US/communicator/pref/pref-popups.dtd              (prefwindow/resources/locale/en-US/pref-popups.dtd)
     locale/en-US/communicator/pref/autocomplete-autofill-on.gif (prefwindow/resources/locale/en-US/autocomplete-autofill-on.gif)
     locale/en-US/communicator/pref/autocomplete-autofill-off.gif (prefwindow/resources/locale/en-US/autocomplete-autofill-off.gif)
     locale/en-US/communicator/pref/autocomplete-showpopup.gif   (prefwindow/resources/locale/en-US/autocomplete-showpopup.gif)
@@ -152,8 +184,12 @@ en-US.jar:
     locale/en-US/global/console.dtd                             (console/resources/locale/en-US/console.dtd)
     locale/en-US/global/console.properties                      (console/resources/locale/en-US/console.properties)
     locale/en-US/global/finddialog.dtd                          (find/resources/locale/en-US/finddialog.dtd)
-    locale/en-US/global/finddialog.properties                          (find/resources/locale/en-US/finddialog.properties)
+    locale/en-US/global/finddialog.properties                   (find/resources/locale/en-US/finddialog.properties)
     locale/en-US/global/ldapAutoCompErrs.properties             (autocomplete/resources/locale/en-US/ldapAutoCompErrs.properties)
+*   locale/en-US/cookie/contents.rdf                            (cookie/locale/en-US/contents.rdf)
+    locale/en-US/cookie/cookie.properties                       (/toolkit/locales/en-US/chrome/cookie/cookie.properties)
+    locale/en-US/cookie/cookieAcceptDialog.properties           (/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.properties)
+    locale/en-US/cookie/cookieAcceptDialog.dtd                  (/toolkit/locales/en-US/chrome/cookie/cookieAcceptDialog.dtd)
 
 toolkit.jar:
     content/global/console.js                                   (console/resources/content/console.js)
diff --git a/xpfe/components/permissions/content/aboutPopups.xul b/xpfe/components/permissions/content/aboutPopups.xul
index 82d05f5865d6..78ee63100b5e 100644
--- a/xpfe/components/permissions/content/aboutPopups.xul
+++ b/xpfe/components/permissions/content/aboutPopups.xul
@@ -40,7 +40,7 @@
 <!DOCTYPE dialog [
   <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
   %brandDTD;
-  <!ENTITY % aboutPopupsDTD SYSTEM "chrome://communicator/locale/aboutPopups.dtd" >
+  <!ENTITY % aboutPopupsDTD SYSTEM "chrome://communicator/locale/permissions/aboutPopups.dtd" >
   %aboutPopupsDTD;
 ]>
 
@@ -80,7 +80,7 @@
         }
         catch(ex) { }
         
-        goPreferences("securityItem", "chrome://cookie/content/pref-popups.xul", "popupspref");
+        goPreferences("securityItem", "chrome://communicator/content/pref/pref-popups.xul", "popupspref");
       }
 
       function doHelpButton() {
diff --git a/xpfe/components/permissions/content/cookieP3P.xul b/xpfe/components/permissions/content/cookieP3P.xul
index d946903492f4..ce6c6a484ad7 100644
--- a/xpfe/components/permissions/content/cookieP3P.xul
+++ b/xpfe/components/permissions/content/cookieP3P.xul
@@ -42,7 +42,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 
 <!-- CHANGE THIS WHEN MOVING FILES -->
-<!DOCTYPE dialog SYSTEM "chrome://cookie/locale/p3p.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/permissions/cookieP3P.dtd">
 
 <dialog id="privacySettings"
         buttons="accept,cancel,help"
diff --git a/xpfe/components/permissions/content/cookieP3PDialog.xul b/xpfe/components/permissions/content/cookieP3PDialog.xul
index ff13004847a4..a092f5874bdb 100644
--- a/xpfe/components/permissions/content/cookieP3PDialog.xul
+++ b/xpfe/components/permissions/content/cookieP3PDialog.xul
@@ -42,7 +42,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 
 <!-- CHANGE THIS WHEN MOVING FILES -->
-<!DOCTYPE dialog SYSTEM "chrome://cookie/locale/p3p.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/permissions/cookieP3P.dtd">
 
 <dialog id="p3pDialog"
         buttons="accept,cancel,extra1,extra2,help"
diff --git a/xpfe/components/permissions/content/cookieTasksOverlay.xul b/xpfe/components/permissions/content/cookieTasksOverlay.xul
index 418bf1f36541..784e906e99fd 100644
--- a/xpfe/components/permissions/content/cookieTasksOverlay.xul
+++ b/xpfe/components/permissions/content/cookieTasksOverlay.xul
@@ -37,12 +37,12 @@
 
  ***** END LICENSE BLOCK ***** -->
 
-<!DOCTYPE overlay SYSTEM "chrome://cookie/locale/cookieTasksOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/permissions/cookieTasksOverlay.dtd">
 
 <overlay id="cookieTasksOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>
 
   <script type="application/x-javascript">
   <![CDATA[
@@ -72,7 +72,7 @@
       observerService.notifyObservers(null, "cookieIcon", "off");
 
       window.openDialog
-        ("chrome://cookie/content/p3pDialog.xul","_blank","modal=yes,chrome,resizable=no", this);
+        ("chrome://communicator/content/permissions/cookieP3PDialog.xul","_blank","modal=yes,chrome,resizable=no", this);
       if (gButtonPressed == "cookie") {
         viewCookiesFromIcon();
       } else if (gButtonPressed == "p3p") {
diff --git a/xpfe/components/permissions/content/cookieViewer.xul b/xpfe/components/permissions/content/cookieViewer.xul
index cdb0b68a5d07..5bc6b7443b89 100644
--- a/xpfe/components/permissions/content/cookieViewer.xul
+++ b/xpfe/components/permissions/content/cookieViewer.xul
@@ -41,7 +41,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 
 <!-- CHANGE THIS WHEN MOVING FILES -->
-<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/wallet/CookieViewer.dtd" >
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/permissions/cookieViewer.dtd" >
 
 <dialog id="cookieviewer"
         buttons="accept,help"
@@ -54,14 +54,14 @@
         ondialoghelp="doHelpButton();"
         persist="screenX screenY width height">
 
-  <script src="chrome://communicator/content/wallet/CookieViewer.js"/>
+  <script src="chrome://communicator/content/permissions/cookieViewer.js"/>
   <script src="chrome://global/content/strres.js"/>
-  <script src="chrome://communicator/content/wallet/nsWalletTreeUtils.js"/>
+  <script src="chrome://communicator/content/permissions/treeUtils.js"/>
   <script type="application/x-javascript" src="chrome://help/content/contextHelp.js" />
 
   <keyset id="dialogKeys"/>
   <stringbundle id="cookieBundle"
-                src="chrome://communicator/locale/wallet/CookieViewer.properties"/>
+                src="chrome://communicator/locale/permissions/cookieViewer.properties"/>
            
   <tabbox id="tabbox" flex="1">
     <tabs>
diff --git a/xpfe/components/permissions/content/imageContextOverlay.xul b/xpfe/components/permissions/content/imageContextOverlay.xul
index a804c23dd536..17b6ca67d55a 100644
--- a/xpfe/components/permissions/content/imageContextOverlay.xul
+++ b/xpfe/components/permissions/content/imageContextOverlay.xul
@@ -37,12 +37,12 @@
 
  ***** END LICENSE BLOCK ***** -->
 
-<!DOCTYPE overlay SYSTEM "chrome://cookie/locale/cookieContextOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/permissions/imageContextOverlay.dtd">
 
 <overlay id="cookieContextOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>
 
   <script type="application/x-javascript">
   <![CDATA[
diff --git a/xpfe/components/permissions/content/permissionsManager.xul b/xpfe/components/permissions/content/permissionsManager.xul
index 6d8b2b030f18..12e305d617e5 100644
--- a/xpfe/components/permissions/content/permissionsManager.xul
+++ b/xpfe/components/permissions/content/permissionsManager.xul
@@ -36,7 +36,7 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 
-<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/popupManager.dtd" >
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/permissions/permissionsManager.dtd" >
 
 <dialog id="popupManager"
         buttons="accept,cancel,help"
@@ -48,14 +48,14 @@
         ondialogaccept="return onAccept();"
         ondialoghelp="return doHelpButton();">
 
-  <script type="application/x-javascript" src="chrome://communicator/content/popupManager.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsManager.js"/>
   <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/wallet/nsWalletTreeUtils.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/permissions/treeUtils.js"/>
   <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
 
   <keyset id="dialogKeys"/>
   <stringbundle id="popupStringBundle"
-                src="chrome://communicator/locale/popupManager.properties"/>
+                src="chrome://communicator/locale/permissions/permissionsManager.properties"/>
  
   <vbox id="servers" flex="1">
   
diff --git a/xpfe/components/permissions/content/permissionsNavigatorOverlay.xul b/xpfe/components/permissions/content/permissionsNavigatorOverlay.xul
index ed5d82db1461..d06aca4ec26d 100644
--- a/xpfe/components/permissions/content/permissionsNavigatorOverlay.xul
+++ b/xpfe/components/permissions/content/permissionsNavigatorOverlay.xul
@@ -37,12 +37,12 @@
 
  ***** END LICENSE BLOCK ***** -->
 
-<!DOCTYPE overlay SYSTEM "chrome://cookie/locale/cookieNavigatorOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/permissions/permissionsNavigatorOverlay.dtd">
 
 <overlay id="cookieNavigatorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="chrome://cookie/content/cookieOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>
   <script type="application/x-javascript">
   <![CDATA[
     /******* THE FOLLOWING IS FOR THE TASKMENU OVERLAY *******/
@@ -180,13 +180,13 @@
     }
 
     function OpenAboutPopups() {
-      window.openDialog("chrome://communicator/content/aboutPopups.xul", "", 
+      window.openDialog("chrome://communicator/content/permissions/aboutPopups.xul", "", 
                         "chrome,centerscreen,dependent", 
                         false);
     }
 
     function OpenManagePopups(host) {
-      window.openDialog("chrome://communicator/content/popupManager.xul", "",
+      window.openDialog("chrome://communicator/content/permissions/permissionsManager.xul", "",
                         "chrome,resizable=yes", 
                         host);
     }
diff --git a/xpfe/components/permissions/content/permissionsOverlay.js b/xpfe/components/permissions/content/permissionsOverlay.js
index 45328e4cf2ac..5df8e79f8e5e 100644
--- a/xpfe/components/permissions/content/permissionsOverlay.js
+++ b/xpfe/components/permissions/content/permissionsOverlay.js
@@ -49,7 +49,7 @@ function openCookieViewer(viewerType)
       return;
     }
   }
-  window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul",
+  window.openDialog("chrome://communicator/content/permissions/cookieViewer.xul",
                     "_blank", "chrome,resizable", viewerType);
 }
 
@@ -67,5 +67,5 @@ function viewCookiesFromIcon() {
 
 function viewP3P() {
   window.openDialog
-    ("chrome://cookie/content/p3p.xul","_blank","chrome,resizable=no");
+    ("chrome://communicator/content/permissions/cookieP3P.xul","_blank","chrome,resizable=no");
 }  
diff --git a/xpfe/components/prefwindow/resources/content/permissionsPrefsOverlay.xul b/xpfe/components/prefwindow/resources/content/permissionsPrefsOverlay.xul
index 89086e721592..ab4267f1fc6f 100644
--- a/xpfe/components/prefwindow/resources/content/permissionsPrefsOverlay.xul
+++ b/xpfe/components/prefwindow/resources/content/permissionsPrefsOverlay.xul
@@ -37,28 +37,28 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
-<!DOCTYPE overlay SYSTEM "chrome://cookie/locale/cookiePrefsOverlay.dtd" >
+<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/pref/permissionsPrefsOverlay.dtd" >
 
-<overlay id="cookiePrefsOverlay"
+<overlay id="permissionsPrefsOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <treechildren id="securityChildren">
     <treeitem position="1">
       <treerow>
-        <treecell url="chrome://cookie/content/pref-cookies.xul"
+        <treecell url="chrome://communicator/content/pref/pref-cookies.xul"
                       label="&cookies.label;"
                       id="cookiesCell"/> 
       </treerow>
     </treeitem>
     <treeitem position="2">
       <treerow>
-        <treecell url="chrome://cookie/content/pref-images.xul"
+        <treecell url="chrome://communicator/content/pref/pref-images.xul"
                       label="&images.label;"/> 
       </treerow>
     </treeitem>
     <treeitem id="popupspref" position="3">
       <treerow>
-        <treecell url="chrome://cookie/content/pref-popups.xul"
+        <treecell url="chrome://communicator/content/pref/pref-popups.xul"
                       label="&popups.label;"/> 
       </treerow>
     </treeitem>
diff --git a/xpfe/components/prefwindow/resources/content/pref-cookies.xul b/xpfe/components/prefwindow/resources/content/pref-cookies.xul
new file mode 100644
index 000000000000..56a35ffcbdfd
--- /dev/null
+++ b/xpfe/components/prefwindow/resources/content/pref-cookies.xul
@@ -0,0 +1,163 @@
+<?xml version="1.0"?>
+
+<!-- ***** BEGIN LICENSE BLOCK *****
+ Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+ The contents of this file are subject to the Mozilla Public License Version
+ 1.1 (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the specific language governing rights and limitations under the
+ License.
+
+ The Original Code is Mozilla Communicator client code, released
+ March 31, 1998.
+
+ The Initial Developer of the Original Code is
+ Netscape Communications Corporation.
+ Portions created by the Initial Developer are Copyright (C) 1998-1999
+ the Initial Developer. All Rights Reserved.
+
+ Contributor(s):
+   Håkan Waara <hwaara@chello.se>
+   Peter Annema <disttsc@bart.nl>
+
+ Alternatively, the contents of this file may be used under the terms of
+ either the GNU General Public License Version 2 or later (the "GPL"), or
+ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ in which case the provisions of the GPL or the LGPL are applicable instead
+ of those above. If you wish to allow use of your version of this file only
+ under the terms of either the GPL or the LGPL, and not to allow others to
+ use your version of this file under the terms of the MPL, indicate your
+ decision by deleting the provisions above and replace them with the notice
+ and other provisions required by the GPL or the LGPL. If you do not delete
+ the provisions above, a recipient may use your version of this file under
+ the terms of any one of the MPL, the GPL or the LGPL.
+
+ ***** END LICENSE BLOCK ***** -->
+
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-cookies.dtd">
+
+<page id="cookiesPanel" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="init();"
+      headertitle="&lHeader;">
+
+  <script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>
+
+  <script type="application/x-javascript">
+  <![CDATA[
+  var panel = "chrome://communicator/content/pref/pref-cookies.xul";
+  var _elementIDs = ["networkCookieBehavior", "networkCookieLifetime", 
+                     "alwaysAcceptSession", "lifetimeDays"];
+
+  function init()
+  {
+    parent.initPanel('chrome://communicator/content/pref/pref-cookies.xul');
+    setDisables(false);
+
+    const NS_COOKIECONSENT_CONTRACTID = '@mozilla.org/cookie-consent;1';
+    if (NS_COOKIECONSENT_CONTRACTID in Components.classes) {
+      var p3pRadioButton = document.getElementById("p3pRadioButton");
+      p3pRadioButton.removeAttribute("hidden");
+    }
+  }
+
+  const cookies_disabled = "2";
+  const cookies_no_third_party = "1";
+  const cookies_p3p = "3";
+  const cookies_enabled = "0";
+  
+  const accept_normally = "0";
+  const accept_session = "2";
+  const accept_for_n_days = "3";
+  const ask_before_accepting = "1";
+
+  function setDisables(setFocus)
+  {
+    var cookieBehavior = document.getElementById("networkCookieBehavior");
+
+    var p3pButton = document.getElementById("p3pDialog");
+    p3pButton.disabled = (cookieBehavior.value != cookies_p3p);
+    if (parent.hPrefWindow.getPrefIsLocked(p3pButton.getAttribute("prefstring")) )
+      p3pButton.disabled = true;
+
+    var cookieLifetime = document.getElementById("networkCookieLifetime");
+    var lifetimeDays = document.getElementById("lifetimeDays");
+    var alwaysAcceptSession = document.getElementById("alwaysAcceptSession");
+
+    var cookiesDisabled = (cookieBehavior.value == cookies_disabled);
+    cookieLifetime.disabled = cookiesDisabled;
+    lifetimeDays.disabled = cookiesDisabled || (cookieLifetime.value != accept_for_n_days);
+    alwaysAcceptSession.disabled = cookiesDisabled || (cookieLifetime.value != ask_before_accepting);
+
+    if (parent.hPrefWindow.getPrefIsLocked(alwaysAcceptSession.getAttribute("prefstring")) )
+      alwaysAcceptSession.disabled = true;
+
+    if (parent.hPrefWindow.getPrefIsLocked(lifetimeDays.getAttribute("prefstring")) )
+      lifetimeDays.disabled = true;
+
+    if (parent.hPrefWindow.getPrefIsLocked(cookieLifetime.getAttribute("prefstring")) )
+      cookieLifetime.disabled = true;
+
+    if (!lifetimeDays.disabled && setFocus)
+      lifetimeDays.focus();
+  }
+  ]]>
+  </script>
+
+  <groupbox id="networkCookieAcceptPolicy">
+    <caption label="&cookiePolicy.label;"/>
+    <radiogroup id="networkCookieBehavior"
+                prefstring="network.cookie.cookieBehavior">
+      <radio value="2" label="&disableCookies.label;"
+             accesskey="&disableCookies.accesskey;" oncommand="setDisables(false);"/>
+      <radio value="1" label="&accOrgCookiesRadio.label;"
+             accesskey="&accOrgCookiesRadio.accesskey;" oncommand="setDisables(false);"/>
+      <hbox id="p3pRadioButton" hidden="true">
+        <radio value="3" label="&accP3PCookiesRadio.label;"
+               accesskey="&accP3PCookiesRadio.accesskey;" oncommand="setDisables(false);"/>
+        <button label="&viewP3P.label;" accesskey="&viewP3P.accesskey;" oncommand="viewP3P();"
+                id="p3pDialog"
+                prefstring="pref.advanced.cookies.disable_button.more_info"/>
+      </hbox>
+      <radio value="0" label="&accAllCookiesRadio.label;"
+             accesskey="&accAllCookiesRadio.accesskey;" oncommand="setDisables(false);"/>
+    </radiogroup>
+  </groupbox>
+  <groupbox id="networkCookieLifetimePolicy">
+    <caption label="&cookieRetentionPolicy.label;"/>
+    <radiogroup id="networkCookieLifetime"
+                prefstring="network.cookie.lifetimePolicy">
+      <radio value="0" label="&acceptNormally.label;" accesskey="&acceptNormally.accesskey;" oncommand="setDisables(false);"/>
+      <radio value="2" label="&acceptForSession.label;" accesskey="&acceptForSession.accesskey;" oncommand="setDisables(false);"/>
+      <hbox align="center">
+        <radio value="3" accesskey="&acceptforNDays.accesskey;" label="&acceptforNDays.label;"
+               oncommand="setDisables(true);"/>
+        <textbox id="lifetimeDays" pref="true" size="4"
+                 preftype="int" prefstring="network.cookie.lifetime.days"/>
+        <label value="&days.label;" control="lifetimeDays"/>
+      </hbox>
+      <hbox>
+        <radio value="1" label="&warnAboutCookies.label;" 
+               accesskey="&warnAboutCookies.accesskey;" oncommand="setDisables(false);"/>
+        <checkbox id="alwaysAcceptSession" label="&forCurrentSession.label;" 
+                  accesskey="&forCurrentSession.accesskey;"
+                  prefstring="network.cookie.alwaysAcceptSessionCookies"/>
+      </hbox>
+    </radiogroup>
+  </groupbox>
+  <groupbox id="manageCookiesAndSites">
+    <caption label="&manageCookies.label;"/>
+    <description>&manageCookiesDescription.label;</description>
+    <hbox pack="end">
+      <button label="&viewCookies.label;" accesskey="&viewCookies.accesskey;" oncommand="viewCookies();"
+		     id="viewCookieButton"
+		     prefstring="pref.advanced.cookies.disable_button.view_cookies"/>
+    </hbox>
+  </groupbox>
+</page>
diff --git a/xpfe/components/prefwindow/resources/content/pref-help.js b/xpfe/components/prefwindow/resources/content/pref-help.js
index de8c11b23bb8..45f2541dd966 100644
--- a/xpfe/components/prefwindow/resources/content/pref-help.js
+++ b/xpfe/components/prefwindow/resources/content/pref-help.js
@@ -34,9 +34,9 @@ var fm = {
   "chrome://messenger/content/addressbook/pref-addressing.xul": "mail_prefs_addressing",
   "chrome://messenger/content/pref-offline.xul": "mail_prefs_offline",
   "chrome://communicator/content/pref/pref-security.xul": "sec_gen",
-  "chrome://cookie/content/pref-cookies.xul": "cookies_prefs",
-  "chrome://cookie/content/pref-images.xul": "images_prefs",
-  "chrome://cookie/content/pref-popups.xul": "pop_up_blocking",
+  "chrome://communicator/content/pref/pref-cookies.xul": "cookies_prefs",
+  "chrome://communicator/content/pref/pref-images.xul": "images_prefs",
+  "chrome://communicator/content/pref/pref-popups.xul": "pop_up_blocking",
   "chrome://wallet/content/pref-wallet.xul": "forms_prefs",
   "chrome://pippki/content/pref-masterpass.xul": "passwords_master",
   "chrome://wallet/content/pref-passwords.xul": "passwords_prefs",
diff --git a/xpfe/components/prefwindow/resources/content/pref-images.xul b/xpfe/components/prefwindow/resources/content/pref-images.xul
new file mode 100644
index 000000000000..442dd1c69940
--- /dev/null
+++ b/xpfe/components/prefwindow/resources/content/pref-images.xul
@@ -0,0 +1,133 @@
+<?xml version="1.0"?> 
+
+<!-- ***** BEGIN LICENSE BLOCK *****
+ Version: MPL 1.1/GPL 2.0/LGPL 2.1
+
+ The contents of this file are subject to the Mozilla Public License Version
+ 1.1 (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+ http://www.mozilla.org/MPL/
+
+ Software distributed under the License is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the specific language governing rights and limitations under the
+ License.
+
+ The Original Code is Mozilla Communicator client code, released
+ March 31, 1998.
+
+ The Initial Developer of the Original Code is
+ Netscape Communications Corporation.
+ Portions created by the Initial Developer are Copyright (C) 1998-1999
+ the Initial Developer. All Rights Reserved.
+
+ Contributor(s):
+   Håkan Waara <hwaara@chello.se>
+   Peter Annema <disttsc@bart.nl>
+
+ Alternatively, the contents of this file may be used under the terms of
+ either the GNU General Public License Version 2 or later (the "GPL"), or
+ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ in which case the provisions of the GPL or the LGPL are applicable instead
+ of those above. If you wish to allow use of your version of this file only
+ under the terms of either the GPL or the LGPL, and not to allow others to
+ use your version of this file under the terms of the MPL, indicate your
+ decision by deleting the provisions above and replace them with the notice
+ and other provisions required by the GPL or the LGPL. If you do not delete
+ the provisions above, a recipient may use your version of this file under
+ the terms of any one of the MPL, the GPL or the LGPL.
+
+ ***** END LICENSE BLOCK ***** -->
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+
+<!DOCTYPE page [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % prefImagesDTD SYSTEM "chrome://communicator/locale/pref/pref-images.dtd" >
+%prefImagesDTD;
+]>
+
+<page id="imagesPanel" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      onload="init();"
+      headertitle="&lHeader;">
+          
+  <script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>
+
+  <script type="application/x-javascript">
+  <![CDATA[
+  
+  var panel = "chrome://communicator/content/pref/pref-images.xul";
+  var _elementIDs = ["accOrgImages", "networkImageBehaviour", "imageLooping"];
+
+  function init()
+  {
+    parent.initPanel('chrome://communicator/content/pref/pref-images.xul');
+
+    setDisables();
+  }
+
+  function setDisables()
+  {
+    var imageBehavior = document.getElementById("networkImageBehaviour");
+
+    // if mailnews is installed then we will have networkImageDisableImagesInMailNews checkbox
+    var networkImageDisableImagesInMailNews = document.getElementById("networkImageDisableImagesInMailNews");
+    if (networkImageDisableImagesInMailNews)
+    {
+      var prefString = networkImageDisableImagesInMailNews.getAttribute("prefstring");
+      networkImageDisableImagesInMailNews.disabled = (imageBehavior.value == 2)
+         || parent.hPrefWindow.getPrefIsLocked(prefString);
+    }
+  }
+
+  ]]>
+  </script>
+
+  <broadcaster id="haveImageBlocking"/>
+  <broadcaster id="haveImageBlockingOrMailnews"/>
+
+  <groupbox id="imagesArea">
+    <caption label="&imageBlocking.label;"/>
+
+    <description>&imageDetails;</description>
+
+    <radiogroup id="networkImageBehaviour"
+                prefstring="permissions.default.image">
+      <radio value="2" label="&disableImages.label;"
+             accesskey="&disableImages.accesskey;"
+             oncommand="setDisables();"/>
+      <radio value="3" label="&accOrgImagesRadio.label;"
+             accesskey="&accOrgImagesRadio.accesskey;"
+             id="accOrgImages" observes="haveImageBlocking"
+             oncommand="setDisables();"/>
+      <radio value="1" label="&accAllImagesRadio.label;"
+             accesskey="&accAllImagesRadio.accesskey;"
+             oncommand="setDisables();"/>
+    </radiogroup>
+
+    <separator id="networkImagesBehaviorSeparator" observes="haveImageBlockingOrMailnews"/>
+
+    <separator observes="haveImageBlocking"/>
+
+    <hbox pack="end">
+      <button id="viewImages" label="&viewImages.label;"
+              accesskey="&viewImages.accesskey;" oncommand="viewImages();"
+              observes="haveImageBlocking"
+              prefstring="pref.advanced.images.disable_button.view_image"/>
+    </hbox>
+
+  </groupbox>
+  <groupbox>
+    <caption label="&animLoopingTitle.label;"/>
+    <radiogroup id="imageLooping"
+                preftype="string" prefstring="image.animation_mode">
+        <radio value="normal" label="&animLoopAsSpecified.label;"
+               accesskey="&animLoopAsSpecified.accesskey;"/>
+        <radio value="once" label="&animLoopOnce.label;"
+               accesskey="&animLoopOnce.accesskey;"/>
+        <radio value="none" label="&animLoopNever.label;"
+               accesskey="&animLoopNever.accesskey;"/>
+    </radiogroup>
+  </groupbox>
+
+</page>
diff --git a/xpfe/components/prefwindow/resources/content/pref-popups.xul b/xpfe/components/prefwindow/resources/content/pref-popups.xul
index e2f8e0b500a9..9f2e7ab4246f 100644
--- a/xpfe/components/prefwindow/resources/content/pref-popups.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-popups.xul
@@ -39,13 +39,13 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
 <!DOCTYPE page [
-<!ENTITY % prefPopupsDTD SYSTEM "chrome://cookie/locale/pref-popups.dtd" >
+<!ENTITY % prefPopupsDTD SYSTEM "chrome://communicator/locale/pref/pref-popups.dtd" >
 %prefPopupsDTD;
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       id="popupsPanel"
-      onload="parent.initPanel('chrome://cookie/content/pref-popups.xul');"
+      onload="parent.initPanel('chrome://communicator/content/pref/pref-popups.xul');"
       headertitle="&title;">
           
   <script type="application/x-javascript">
@@ -92,7 +92,7 @@
           document.getElementById("prefillWhitelist").setAttribute("value", false);
         }
 
-        if (parent.queuedTag == "chrome://cookie/content/pref-popups.xul") {
+        if (parent.queuedTag == "chrome://communicator/content/pref/pref-popups.xul") {
           // opened from About Popups menuitem
           gPolicyCheckbox.checked = true;
           parent.queuedTag = null;
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd
new file mode 100644
index 000000000000..647b22dfecfb
--- /dev/null
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd
@@ -0,0 +1,43 @@
+<!ENTITY lHeader                        "Cookies">
+
+<!-- cookies -->
+
+<!ENTITY cookiePolicy.label             "Cookie Acceptance Policy">
+
+<!ENTITY accAllCookiesRadio.label       "Allow all cookies">
+<!ENTITY accAllCookiesRadio.accesskey   "c">
+
+<!ENTITY accOrgCookiesRadio.label       "Allow cookies for the originating website only">
+<!ENTITY accOrgCookiesRadio.accesskey   "o">
+
+<!ENTITY accP3PCookiesRadio.label       "Allow cookies based on privacy settings">
+<!ENTITY accP3PCookiesRadio.accesskey   "p">
+
+<!ENTITY disableCookies.label           "Block cookies">
+<!ENTITY disableCookies.accesskey       "B">
+
+<!ENTITY cookieRetentionPolicy.label    "Cookie Retention Policy">
+
+<!ENTITY acceptNormally.label           "Accept cookies normally">
+<!ENTITY acceptNormally.accesskey       "n">
+
+<!ENTITY acceptForSession.label         "Accept for current session only">
+<!ENTITY acceptForSession.accesskey     "s">
+
+<!ENTITY acceptforNDays.label           "Accept cookies for">
+<!ENTITY acceptforNDays.accesskey       "f">
+<!ENTITY days.label                     "days">
+
+<!ENTITY warnAboutCookies.label         "Ask for each cookie">
+<!ENTITY warnAboutCookies.accesskey     "A">
+<!ENTITY forCurrentSession.label        "except for session cookies">
+<!ENTITY forCurrentSession.accesskey    "e">
+
+<!ENTITY manageCookies.label            "Manage Cookies and Sites">
+<!ENTITY manageCookiesDescription.label "Allows you to view and manage stored cookies and per-site settings for accepting and rejecting cookies. Per-site settings will override the settings above.">
+
+<!ENTITY viewCookies.label              "Cookie Manager">
+<!ENTITY viewCookies.accesskey          "M">
+<!ENTITY viewP3P.label                  "View Privacy Settings">
+<!ENTITY viewP3P.accesskey              "V">
+
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-images.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-images.dtd
new file mode 100644
index 000000000000..aa6e859130e9
--- /dev/null
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-images.dtd
@@ -0,0 +1,28 @@
+<!ENTITY lHeader                        "Images">
+
+<!ENTITY imageBlocking.label            "Image Acceptance Policy">
+
+<!--LOCALIZATION NOTE (onStartLegend.label): Don't translate "&brandShortName;".
+    Place "&brandShortName;" in the phrase where the name of the application should
+	 appear
+-->
+<!ENTITY imageDetails                   "Specify how &brandShortName; handles images.">
+
+<!ENTITY accAllImagesRadio.label        "Accept all images">
+<!ENTITY accAllImagesRadio.accesskey    "A">
+<!ENTITY accOrgImagesRadio.label        "Accept images that come from the originating server only">
+<!ENTITY accOrgImagesRadio.accesskey    "r">
+<!ENTITY disableImages.label            "Do not load any images">
+<!ENTITY disableImages.accesskey        "n">
+<!ENTITY warnAboutImages.label          "Ask me before downloading an image">
+<!ENTITY warnAboutImages.accesskey      "k">
+<!ENTITY viewImagesExplanation.label    "View list of sites about which image acceptance information is stored">
+<!ENTITY viewImages.label               "Manage Image Permissions">
+<!ENTITY viewImages.accesskey           "P">
+<!ENTITY animLoopingTitle.label         "Animated images should loop">
+<!ENTITY animLoopAsSpecified.label      "As many times as the image specifies">
+<!ENTITY animLoopAsSpecified.accesskey  "m">
+<!ENTITY animLoopOnce.label             "Once">
+<!ENTITY animLoopOnce.accesskey         "O">
+<!ENTITY animLoopNever.label            "Never">
+<!ENTITY animLoopNever.accesskey        "v">