diff --git a/suite/common/pref/pref-cookies.xul b/suite/common/pref/pref-cookies.xul
index f0c434116a37..8738ae2533b4 100644
--- a/suite/common/pref/pref-cookies.xul
+++ b/suite/common/pref/pref-cookies.xul
@@ -36,20 +36,17 @@
         align="vertical"
         onload="init();">
           
-  <script>
+  <script type="text/javascript">
   <![CDATA[
   
   var _elementIDs = ["networkCookieBehaviour", "networkWarnAboutCookies"];
 
-
   function init()
   {
     parent.initPanel('chrome://communicator/content/pref/pref-cookies.xul'); 
 
-    if (document.getElementById("networkCookieBehaviour").data == "2")
-      disableWarnAboutCookies();
-    else
-      enableWarnAboutCookies();
+    var enabled = document.getElementById("networkCookieBehaviour").data != "2";
+    setWarnAboutCookiesEnabled(enabled);
   }
       
   function viewCookies() 
@@ -63,20 +60,9 @@
       ("chrome://communicator/content/wallet/privacy.xul","","modal=yes,chrome,resizable=yes,height=400,width=600", 0);
   }  
  
-  function enableWarnAboutCookies()
+  function setWarnAboutCookiesEnabled(aEnabled)
   {
-    var box = document.getElementById("networkWarnAboutCookies");
-
-    if (box.getAttribute("disabled"))
-      box.removeAttribute("disabled");
-  }
-
-  function disableWarnAboutCookies()
-  {
-    var box = document.getElementById("networkWarnAboutCookies");
-
-    if (!box.getAttribute("disabled"))
-      box.setAttribute("disabled","true");
+    document.getElementById("networkWarnAboutCookies").disabled = !aEnabled;
   }
 
   ]]>
@@ -94,21 +80,21 @@
                 prefattribute="data">
 
       <radio group="networkCookieBehaviour" data="2" value="&disableCookies.label;" 
-             accesskey="&disableCookies.accesskey;" oncommand="disableWarnAboutCookies();"/>
+             accesskey="&disableCookies.accesskey;" oncommand="setWarnAboutCookiesEnabled(false);"/>
       <radio group="networkCookieBehaviour" data="0" value="&accAllCookiesRadio.label;" 
-             accesskey="&accAllCookiesRadio.accesskey;" oncommand="enableWarnAboutCookies();"/>
+             accesskey="&accAllCookiesRadio.accesskey;" oncommand="setWarnAboutCookiesEnabled(true);"/>
       <radio group="networkCookieBehaviour" data="1" value="&accOrgCookiesRadio.label;" 
-             accesskey="&accOrgCookiesRadio.accesskey;" oncommand="enableWarnAboutCookies();"/>
+             accesskey="&accOrgCookiesRadio.accesskey;" oncommand="setWarnAboutCookiesEnabled(true);"/>
 
     </radiogroup>
 
-    <separator class="thin"/>
+    <separator/>
 
     <checkbox id="networkWarnAboutCookies" value="&warnAboutCookies.label;" accesskey="&warnAboutCookies.accesskey;"
               pref="true" preftype="bool" prefstring="network.cookie.warnAboutCookies"
               prefattribute="checked"/>
 
-    <separator class="thin"/>
+    <separator/>
 
     <box autostretch="never" halign="right">
       <button class="dialog" value="&viewCookies.label;" accesskey="&viewCookies.accesskey;" oncommand="viewCookies();"/>
diff --git a/suite/common/pref/pref-images.xul b/suite/common/pref/pref-images.xul
index 147d5c9bc4fe..6166b1846142 100644
--- a/suite/common/pref/pref-images.xul
+++ b/suite/common/pref/pref-images.xul
@@ -18,6 +18,7 @@
    Rights Reserved.
    
    Contributor(s): 
+     Håkan Waara <hwaara@chello.se>
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
@@ -33,69 +34,47 @@
         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-images.xul');">
+        onload="init();">
           
-  <script language="JavaScript">
+  <script type="text/javascript">
   <![CDATA[
   
-  _elementIDs = ["accOrgImages", "networkImageBehaviour", "networkImageWarnAboutImages"];
+  var _elementIDs = ["accOrgImages", "networkImageBehaviour", "networkImageWarnAboutImages"];
+
+  function init()
+  {
+    parent.initPanel('chrome://communicator/content/pref/pref-images.xul');
+
+    imageBlockingEnabled();
+
+    var enabled = document.getElementById("networkImageBehaviour").data != "2";
+    setWarnAboutImagesEnabled(enabled);
+  }
 
   // Present finer control over image loading to the user.
   // enable image blocker if "imageblocker.enabled" pref is true
   function imageBlockingEnabled()
-    {
-
-      if( !parent.hPrefWindow.getPref( "bool", "imageblocker.enabled" ) ) 
-        {
-
-          // Hide originating server option.
-          var orgImages = document.getElementById( "accOrgImages" );
-          orgImages.setAttribute("hidden", "true");
-
-          // Hide warn about images button.
-          var networkImageWarnAboutImages = document.getElementById( "networkImageWarnAboutImages");
-          networkImageWarnAboutImages.setAttribute("hidden", "true");
-
-          // Hide viewImages button.
-          var viewImages = document.getElementById( "viewImages");
-          viewImages.setAttribute("hidden", "true");
-
-        } else {
-
-          // Show originating server option.
-          var orgImages = document.getElementById( "accOrgImages" );
-          orgImages.setAttribute("hidden", "false");
-
-          // Show warn about images button.
-          var networkImageWarnAboutImages = document.getElementById( "networkImageWarnAboutImages");
-          networkImageWarnAboutImages.setAttribute("hidden", "false");
-
-          // Show viewImages button.
-          var viewImages = document.getElementById( "viewImages");
-          viewImages.setAttribute("hidden", "false");
-
-        }
-    }
-
-  function updateImageFields( aInteger, aBoolean )
   {
-    var imageBehaviourField = document.getElementById("networkImageBehaviour");
-    var imageBehaviourCheckbox = document.getElementById("networkImageWarnAboutImages");
-    
-    imageBehaviourField.value = aInteger;
-    imageBehaviourCheckbox.checked = aBoolean;
+    if (parent.hPrefWindow.getPref("bool", "imageblocker.enabled"))
+      document.getElementById("haveImageBlocking").removeAttribute("hidden");
   }
 
   function viewImages() 
   {
     window.openDialog("chrome://communicator/content/wallet/CookieViewer.xul","",
-                      "modal=yes,chrome,resizable=yes", 2 );
+                      "modal=yes,chrome,resizable=yes", 2);
   }
 
+  function setWarnAboutImagesEnabled(aEnabled)
+  {
+    document.getElementById("networkImageWarnAboutImages").disabled = !aEnabled;
+  }
  
   ]]>
   </script>
 
+  <broadcaster id="haveImageBlocking" hidden="true"/>
+
   <box class="box-smallheader" id="imagesHeader" title="&lHeader;"/>
 
   <titledbox orient="vertical" id="imagesArea">
@@ -106,20 +85,32 @@
     <radiogroup id="networkImageBehaviour" orient="vertical" autostretch="never"
                 pref="true" preftype="int" prefstring="network.image.imageBehavior"
                 prefattribute="data">
-      <radio group="networkImageBehaviour" data="0" value="&accAllImagesRadio.label;" accesskey="&accAllImagesRadio.accesskey;"/>
-      <radio id="accOrgImages" group="networkImageBehaviour" data="1" value="&accOrgImagesRadio.label;" accesskey="&accOrgImagesRadio.accesskey;"/>
-      <radio group="networkImageBehaviour" data="2" value="&disableImages.label;" accesskey="&disableImages.accesskey;"/>
+      <radio group="networkImageBehaviour" data="2" value="&disableImages.label;"
+             accesskey="&disableImages.accesskey;"
+             oncommand="setWarnAboutImagesEnabled(false);"/>
+      <radio group="networkImageBehaviour" data="0" value="&accAllImagesRadio.label;"
+             accesskey="&accAllImagesRadio.accesskey;"
+             oncommand="setWarnAboutImagesEnabled(true);"/>
+      <radio group="networkImageBehaviour" data="1" value="&accOrgImagesRadio.label;"
+             accesskey="&accOrgImagesRadio.accesskey;"
+             id="accOrgImages" observes="haveImageBlocking"
+             oncommand="setWarnAboutImagesEnabled(true);"/>
     </radiogroup>
-    
-    <checkbox class="indent" id="networkImageWarnAboutImages" value="&warnAboutImages.label;" accesskey="&warnAboutImages.accesskey;"
-              pref="true" preftype="bool" prefstring="network.image.warnAboutImages" 
-              prefattribute="checked"/>
 
-    <box autostretch="never" halign="right">
-      <button class="dialog" id="viewImages" value="&viewImages.label;" accesskey="&viewImages.accesskey;" oncommand="viewImages();"/>
+    <separator observes="haveImageBlocking"/>
+
+    <checkbox id="networkImageWarnAboutImages" value="&warnAboutImages.label;"
+              accesskey="&warnAboutImages.accesskey;" observes="haveImageBlocking"
+              pref="true" preftype="bool" prefattribute="checked"
+              prefstring="network.image.warnAboutImages"/>
+
+    <separator observes="haveImageBlocking"/>
+
+    <box autostretch="never" halign="right" observes="haveImageBlocking">
+      <button class="dialog" id="viewImages" value="&viewImages.label;"
+              accesskey="&viewImages.accesskey;" oncommand="viewImages();"/>
     </box>
 
   </titledbox>
 
-
 </window>