diff --git a/mozilla/xpfe/components/prefwindow/resources/content/MANIFEST b/mozilla/xpfe/components/prefwindow/resources/content/MANIFEST
index 970a0f1a608..21174f2cd90 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/MANIFEST
+++ b/mozilla/xpfe/components/prefwindow/resources/content/MANIFEST
@@ -8,6 +8,7 @@ pref-cache.js
 pref-cache.xul
 pref-colors.js
 pref-colors.xul
+pref-cookies.xul
 pref-themes.xul
 pref-composer.js
 pref-composer.xul
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/Makefile.in b/mozilla/xpfe/components/prefwindow/resources/content/Makefile.in
index 928cfdb995f..b78a5ad15e5 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/Makefile.in
+++ b/mozilla/xpfe/components/prefwindow/resources/content/Makefile.in
@@ -38,6 +38,7 @@ EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/pref-charset.xul \
 		$(srcdir)/pref-charset.js \
 		$(srcdir)/pref-colors.xul \
+		$(srcdir)/pref-cookies.xul \
 		$(srcdir)/pref-colors.js \
 		$(srcdir)/pref-themes.xul \
 		$(srcdir)/pref-composer.xul \
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/makefile.win b/mozilla/xpfe/components/prefwindow/resources/content/makefile.win
index 460d89cd5d6..134069d1e11 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/makefile.win
+++ b/mozilla/xpfe/components/prefwindow/resources/content/makefile.win
@@ -32,6 +32,7 @@ install::
 	$(MAKE_INSTALL) pref-cache.xul  $(DIST)\bin\chrome\communicator\content\pref
 	$(MAKE_INSTALL) pref-colors.js  $(DIST)\bin\chrome\communicator\content\pref
 	$(MAKE_INSTALL) pref-colors.xul  $(DIST)\bin\chrome\communicator\content\pref
+	$(MAKE_INSTALL) pref-cookies.xul  $(DIST)\bin\chrome\communicator\content\pref
 	$(MAKE_INSTALL) pref-themes.xul  $(DIST)\bin\chrome\communicator\content\pref
 	$(MAKE_INSTALL) pref-charset.js  $(DIST)\bin\chrome\communicator\content\pref
 	$(MAKE_INSTALL) pref-charset.xul  $(DIST)\bin\chrome\communicator\content\pref
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
index 26052f3c0b1..30e9cda25c9 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
@@ -32,47 +32,18 @@
 
   <script language="JavaScript">
   <![CDATA[
-    _elementIDs = ["advancedAlwaysLoadImages", "advancedJavaAllow", "javascriptAllowMailNews", "javascriptEnabled", "CSSAllow", "advancedMailFTP", "networkImageBehaviour", "networkImageWarnAboutImages", "networkCookieBehaviour", "networkWarnAboutCookies"];
+    _elementIDs = ["advancedAlwaysLoadImages", "advancedJavaAllow", "javascriptAllowMailNews", "javascriptEnabled", "CSSAllow", "advancedMailFTP"];
   ]]>
   </script>
-          
-  <script>
-  <![CDATA[
-  
-  function displayImageDialog()
-  {
-    window.openDialog("chrome://communicator/content/pref/pref-imageblocking.xul", "", "chrome,resizable=no");
-  }
-
-  function updateImageFields( aInteger, aBoolean )
-  {
-    var imageBehaviourField = document.getElementById("networkImageBehaviour");
-    var imageBehaviourCheckbox = document.getElementById("networkImageWarnAboutImages");
-    
-    imageBehaviourField.value = aInteger;
-    imageBehaviourCheckbox.checked = aBoolean;
-  }
-
-  function viewCookies() 
-  {
-    window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul","","modal=yes,chrome,resizable=no", 0);
-  }  
-
-  ]]>
-  </script>        
+     
         
   <box class="box-smallheader" title="&lHeader;"/>
 
-  <titledbox orient="vertical" id="advancedSettings">
+  <titledbox orient="vertical" id="advancedSettings" autostretch="never"f>
 	  <title><text value="&advancedTitle.label;"/></title>
-    <box autostretch="never">
-      <checkbox id="advancedAlwaysLoadImages" value="&autoLoadImgCheck.label;" accesskey="&autoLoadImgCheck.accesskey;"
-                pref="true" preftype="bool" prefstring="advanced.always_load_images"
-                prefattribute="checked"/>
-      <spring flex="1"/>                
-      <button class="dialog" value="&imageBlocking.label;" accesskey="&imageBlocking.accesskey;"
-              oncommand="displayImageDialog();"/>             
-    </box>            
+    <checkbox id="advancedAlwaysLoadImages" value="&autoLoadImgCheck.label;" accesskey="&autoLoadImgCheck.accesskey;"
+              pref="true" preftype="bool" prefstring="advanced.always_load_images"
+              prefattribute="checked"/>
     <checkbox id="advancedJavaAllow" value="&enbJavaCheck.label;" accesskey="&enbJavaCheck.accesskey;"
               pref="true" preftype="bool" prefstring="security.enable_java"
               prefattribute="checked"/>
@@ -99,10 +70,6 @@
     <html>&description.label;</html>
 	</titledbox>
 
-  <!-- hidden elements to contain image blocking prefs -->
-  <broadcaster id="networkImageBehaviour" pref="true" preftype="int" prefstring="network.image.imageBehavior" prefattribute="value" wsm_attributes="value"/>
-  <broadcaster id="networkImageWarnAboutImages" pref="true" preftype="bool" prefstring="network.image.warnAboutImages" prefattribute="checked" wsm_attributes="checked"/>
-
  	<titledbox orient="vertical">
   	<title><text value="&cookies;"/></title>  
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul
index c8468af3526..ef80255665a 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-cookies.xul
@@ -19,21 +19,44 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://pref/locale/pref-cookies.dtd" >
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-cookies.dtd" >
 
 <window debug="false" 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"
         class="dialog"
         align="vertical" title="&window.title;"
-  		  onload="if( parent.handle ) parent.handle.onpageload( 'pref-cookies' ); else parent.queuedTag = 'pref-cookies';">
+        onload="parent.initPanel('chrome://communicator/content/pref/pref-cookies.xul');">
+          
+  <script>
+  <![CDATA[
+  
+  _elementIDs = ["networkCookieBehaviour", "networkWarnAboutCookies", "networkImageBehaviour", "networkImageWarnAboutImages"];
 
-  <box class="box-smallheader" title="&lHeader;" description="&rHeader;"/>
+  function updateImageFields( aInteger, aBoolean )
+  {
+    var imageBehaviourField = document.getElementById("networkImageBehaviour");
+    var imageBehaviourCheckbox = document.getElementById("networkImageWarnAboutImages");
+    
+    imageBehaviourField.value = aInteger;
+    imageBehaviourCheckbox.checked = aBoolean;
+  }
 
- 	<titledbox orient="vertical">
-  	<title><text value="&cookies;"/></title>  
+  function viewCookies() 
+  {
+    window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul","","modal=yes,chrome,resizable=no", 0);
+  }  
+
+  ]]>
+  </script>   
+
+  <box class="box-smallheader" title="&lHeader;"/>
+
+
+  <titledbox orient="vertical">
+    <title><text value="&cookies;"/></title>  
 
     <html>&cookieDetails;</html>
 
@@ -44,12 +67,34 @@
       <radio data="1" value="&accOrgCookiesRadio.label;" accesskey="&accOrgCookiesRadio.accesskey;"/>
       <radio data="2" value="&disableCookies.label;" accesskey="&disableCookies.accesskey;"/>
     </radiogroup>
-    <checkbox id="networkWarnAboutCookies" value="&warnAboutCookies.label;" accesskey="&warnAboutCookies.accesskey;"
+    <checkbox class="indent" id="networkWarnAboutCookies" value="&warnAboutCookies.label;" accesskey="&warnAboutCookies.accesskey;"
               pref="true" preftype="bool" prefstring="network.cookie.warnAboutCookies"
               prefattribute="checked"/>
     <box autostretch="never" halign="right">
       <button class="dialog" value="&viewCookies.label;" accesskey="&viewCookies.accesskey;" oncommand="viewCookies();"/>
     </box>              
   </titledbox>
- 
+
+  <titledbox orient="vertical">
+    <title><text value="&imageDetails;"/></title>
+    <radiogroup id="networkImageBehaviour" orient="vertical" autostretch="never">
+      <radio data="0" value="&accAllImagesRadio.label;" accesskey="&accAllImagesRadio.accesskey;"/>
+      <radio data="1" value="&accOrgImagesRadio.label;" accesskey="&accOrgImagesRadio.accesskey;"/>
+      <radio data="2" value="&disableImages.label;" accesskey="&disableImages.accesskey;"/>
+    </radiogroup>
+    
+    <checkbox class="indent" id="networkImageWarnAboutImages" value="&warnAboutImages.label;" accesskey="&warnAboutImages.accesskey;"/>
+
+    <separator/>
+
+    <box autostretch="never">
+      <box style="max-width: 22em;">
+        <html style="max-width: 20em;">&viewImagesExplanation.label;</html>
+      </box>
+      <button class="dialog" value="&viewImages.label;" accesskey="&viewImages.accesskey;" oncommand="viewImages();"/>
+    </box>
+
+  </titledbox>
+
+
 </window>
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/MANIFEST b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/MANIFEST
index 8a38fd37c63..b44beb59127 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/MANIFEST
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/MANIFEST
@@ -4,6 +4,7 @@ pref-appearance.dtd
 pref-applications.dtd
 pref-cache.dtd
 pref-charset.dtd
+pref-cookies.dtd
 pref-colors.dtd
 pref-editing.dtd
 pref-themes.dtd
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/Makefile.in b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/Makefile.in
index 6eb74826751..38b5ed12895 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/Makefile.in
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/Makefile.in
@@ -36,6 +36,7 @@ EXPORT_RESOURCE_CONTENT = \
 		$(srcdir)/pref-themes.dtd \
 		$(srcdir)/pref-charset.dtd \
 		$(srcdir)/pref-composer.dtd \
+		$(srcdir)/pref-cookies.dtd \
 		$(srcdir)/pref-editing.dtd \
 		$(srcdir)/pref-debug.dtd \
 		$(srcdir)/pref-download.dtd \
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/makefile.win b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/makefile.win
index f403450dc37..19b6248cdf1 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/makefile.win
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/makefile.win
@@ -33,6 +33,7 @@ install::
 	$(MAKE_INSTALL) pref-colors.dtd  $(DIST)\bin\chrome\communicator\locale\pref
 	$(MAKE_INSTALL) pref-themes.dtd  $(DIST)\bin\chrome\communicator\locale\pref
 	$(MAKE_INSTALL) pref-composer.dtd  $(DIST)\bin\chrome\communicator\locale\pref
+	$(MAKE_INSTALL) pref-cookies.dtd  $(DIST)\bin\chrome\communicator\locale\pref
 	$(MAKE_INSTALL) pref-download.dtd  $(DIST)\bin\chrome\communicator\locale\pref
 	$(MAKE_INSTALL) pref-debug.dtd  $(DIST)\bin\chrome\communicator\locale\pref
 	$(MAKE_INSTALL) pref-editing.dtd  $(DIST)\bin\chrome\communicator\locale\pref
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
index 974f982d671..97b399f9711 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-advanced.dtd
@@ -30,24 +30,3 @@
 <!ENTITY imageBlocking.accesskey      "b">
 
 <!ENTITY description.label            "Checked items are automatically enabled when you visit web pages that use them. If you uncheck an item, pages may load faster but some functionality will be limited.">
-
-<!-- cookies -->
-
-<!ENTITY cookies                        "Cookies">
-
-<!ENTITY accAllCookiesRadio.label       "Accept all cookies">
-<!ENTITY accAllCookiesRadio.accesskey   "a">
-
-<!ENTITY accOrgCookiesRadio.label       "Accept cookies that get sent back to the originating server only">
-<!ENTITY accOrgCookiesRadio.accesskey   "o">
-
-<!ENTITY disableCookies.label           "Reject all cookies">
-<!ENTITY disableCookies.accesskey       "r">
-
-<!ENTITY warnAboutCookies.label         "Warn me before accepting a cookie">
-<!ENTITY warnAboutCookies.accesskey     "w">
-
-<!ENTITY cookieDetails                  "Cookies are small pieces of information that websites store on your computer. This allows them to customize their websites to suit your individual preferences.">
-
-<!ENTITY viewCookies.label              "View Stored Cookies">
-<!ENTITY viewCookies.accesskey          "v">
\ No newline at end of file
diff --git a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd
index 3d766de4b41..c1752c87f92 100644
--- a/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd
+++ b/mozilla/xpfe/components/prefwindow/resources/locale/en-US/pref-cookies.dtd
@@ -1,30 +1,38 @@
-
 <!ENTITY window.title                   "Cookies/Images">
 <!ENTITY lHeader                        "Cookies/Images">
-<!ENTITY remSignCheck.label             "Automatically prefill usernames and passwords">
-<!ENTITY rHeader                        "Control how cookies and images are handled.">
+
+
+<!-- cookies -->
+
 <!ENTITY cookies                        "Cookies">
+
 <!ENTITY accAllCookiesRadio.label       "Accept all cookies">
 <!ENTITY accAllCookiesRadio.accesskey   "a">
+
 <!ENTITY accOrgCookiesRadio.label       "Accept cookies that get sent back to the originating server only">
 <!ENTITY accOrgCookiesRadio.accesskey   "o">
+
 <!ENTITY disableCookies.label           "Reject all cookies">
 <!ENTITY disableCookies.accesskey       "r">
+
 <!ENTITY warnAboutCookies.label         "Warn me before accepting a cookie">
 <!ENTITY warnAboutCookies.accesskey     "w">
+
 <!ENTITY cookieDetails                  "Cookies are small pieces of information that websites store on your computer. This allows them to customize their websites to suit your individual preferences.">
+
 <!ENTITY viewCookies.label              "View Stored Cookies">
 <!ENTITY viewCookies.accesskey          "v">
 
-<!ENTITY images                         "Image Blocking">
-<!ENTITY imageDetails                   "Images are the pictures that websites display on your computer.">
+
+<!ENTITY imageDetails                   "Specify how &brandShortName; handles images on webpages">
 <!ENTITY accAllImagesRadio.label        "Accept all images">
 <!ENTITY accAllImagesRadio.accesskey    "i">
 <!ENTITY accOrgImagesRadio.label        "Accept images that come from the originating server only">
 <!ENTITY accOrgImagesRadio.accesskey    "n">
 <!ENTITY disableImages.label            "Do not load any images">
 <!ENTITY disableImages.accesskey        "y">
-<!ENTITY warnAboutImages.label          "Warn me before accepting an image">
+<!ENTITY warnAboutImages.label          "Alert me before downloading an image">
 <!ENTITY warnAboutImages.accesskey      "e">
-<!ENTITY viewImages.label               "View Image Sites">
+<!ENTITY viewImagesExplanation.label    "View list of sites about which image acceptance information is stored">
+<!ENTITY viewImages.label               "View Sites...">
 <!ENTITY viewImages.accesskey           "s">
\ No newline at end of file