diff --git a/suite/common/pref/pref-advanced.xul b/suite/common/pref/pref-advanced.xul
index c0b4f0d1cab..d10e6951516 100644
--- a/suite/common/pref/pref-advanced.xul
+++ b/suite/common/pref/pref-advanced.xul
@@ -25,25 +25,15 @@
+ onload="parent.initPanel(panel);">
@@ -53,9 +43,6 @@
-
diff --git a/suite/common/pref/pref-cookies.xul b/suite/common/pref/pref-cookies.xul
index e0ae1b827d2..aa30bfbae9b 100644
--- a/suite/common/pref/pref-cookies.xul
+++ b/suite/common/pref/pref-cookies.xul
@@ -33,53 +33,26 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
class="color-dialog"
align="vertical"
- onload="imageBlockingEnabled(); parent.initPanel('chrome://communicator/content/pref/pref-cookies.xul');">
+ onload="parent.initPanel('chrome://communicator/content/pref/pref-cookies.xul');">
-
+
-
+
&cookieDetails;
@@ -98,28 +71,4 @@
-
-
-
- &imageDetails;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/suite/common/pref/pref-images.xul b/suite/common/pref/pref-images.xul
new file mode 100644
index 00000000000..4a2bb4a8181
--- /dev/null
+++ b/suite/common/pref/pref-images.xul
@@ -0,0 +1,125 @@
+
+
+
+
+
+
+
+%brandDTD;
+
+%prefImagesDTD;
+]>
+
+
+
+
+
+
+
+
+
+
+ &imageDetails;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/suite/common/pref/pref.xul b/suite/common/pref/pref.xul
index 09f2698077f..b0bda56ad43 100644
--- a/suite/common/pref/pref.xul
+++ b/suite/common/pref/pref.xul
@@ -38,14 +38,6 @@
// If this call worked, we could center the window here:
// centerWindowOnScreen();
- // modify the cookie tree entry if imageblocking is disabled.
- if( hPrefWindow.getPref( "bool", "imageblocker.enabled" ) )
- {
- dump("*** foopy = " + hPrefWindow.getPref( "bool", "imageblocker.enabled" ) + "\n");
- var element = document.getElementById( "cookiesCell" );
- element.setAttribute( "value", element.getAttribute( "valueWithImages" ) );
- }
-
}
]]>
diff --git a/suite/common/pref/preftree.xul b/suite/common/pref/preftree.xul
index 73c1d8664c7..7ffc2bd0db0 100644
--- a/suite/common/pref/preftree.xul
+++ b/suite/common/pref/preftree.xul
@@ -129,10 +129,16 @@
+
+
+
+
+
diff --git a/suite/locales/en-US/chrome/common/pref/pref-cookies.dtd b/suite/locales/en-US/chrome/common/pref/pref-cookies.dtd
index f2bf3cfecbb..217549a23b3 100644
--- a/suite/locales/en-US/chrome/common/pref/pref-cookies.dtd
+++ b/suite/locales/en-US/chrome/common/pref/pref-cookies.dtd
@@ -1,11 +1,9 @@
-
-
-
+
@@ -25,20 +23,3 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/suite/locales/en-US/chrome/common/pref/pref-images.dtd b/suite/locales/en-US/chrome/common/pref/pref-images.dtd
new file mode 100644
index 00000000000..6ae20922b85
--- /dev/null
+++ b/suite/locales/en-US/chrome/common/pref/pref-images.dtd
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/suite/locales/en-US/chrome/common/pref/preftree.dtd b/suite/locales/en-US/chrome/common/pref/preftree.dtd
index 7699e3e0164..1d2771dcbd7 100644
--- a/suite/locales/en-US/chrome/common/pref/preftree.dtd
+++ b/suite/locales/en-US/chrome/common/pref/preftree.dtd
@@ -20,7 +20,7 @@
-
+