Add a pref option for blocking remote images and for enabling JS in the message pane to the advanced prefs panel

under 'privacy'.

Make the background of the advanced prefs panel be a moz-Field because kerz likes it that way and I can't say no
to kerz!

mail/components/prefwindow/content/pref-advanced.xul

@@ -158,20 +158,27 @@
       <label class="expanderDescription" value="&privacyFeature.label;" flex="1"/>
 
       <vbox id="contentEnablingBox" class="indent">
-        <checkbox id="javascriptAllowMailNews" 
+
+        <checkbox id="networkImageDisableImagesInMailNews" 
+                  label="&disableImageInMailNews.label;" accesskey="&disableImageInMailNews.accesskey;"
+                  pref="true" preftype="bool" prefstring="mailnews.message_display.disable_remote_image"
+                  prefattribute="checked"/>
+        
+        <checkbox id="javascriptAllowMailNews"
                   label="&enbJsCheckMailNews.label;" accesskey="&enbJsCheckMailNews.accesskey;"
                   prefstring="javascript.allow.mailnews"/>
+
+        <!-- thunderbird doesn't support cookies or plugins so these options don't make sense 
+        
+        <checkbox id="networkDisableCookieForMailNews"
+                  label="&disableCookieForMailNews.label;" accesskey="&disableCookieForMailNews.accesskey;"
+                  preftype="bool" prefinverted="true" prefstring="network.cookie.disableCookieForMailNews"/>
         <checkbox id="pluginAllowMailNews"
                   label="&enbPluginCheckMailNews.label;" accesskey="&enbPluginCheckMailNews.accesskey;"
                   pref="true" preftype="bool" prefstring="mailnews.message_display.allow.plugins"
                   prefattribute="checked"/>
-        <checkbox id="networkImageDisableImagesInMailNews" 
-                  label="&disableImageInMailNews.label;" accesskey="&disableImageInMailNews.accesskey;"
-                  pref="true" preftype="bool" prefstring="mailnews.message_+"
-                  prefinverted="true" prefattribute="checked"/>
-        <checkbox id="networkDisableCookieForMailNews"
-                  label="&disableCookieForMailNews.label;" accesskey="&disableCookieForMailNews.accesskey;"
-                  preftype="bool" prefinverted="true" prefstring="network.cookie.disableCookieForMailNews"/>
+        -->
+
       </vbox>      
     </expander>  
 

mail/components/prefwindow/locale/pref-advanced.dtd

@@ -7,21 +7,21 @@
 
 <!-- Privacy Settings -->
 <!ENTITY privacyTitle.label "Privacy">
-<!ENTITY privacyFeature.label "Allow the following features:">
-<!ENTITY enbJsCheckMailNews.label     "JavaScript">
-<!ENTITY enbJsCheckMailNews.accesskey "s">
-<!ENTITY enbPluginCheckMailNews.label     "Plugins">
-<!ENTITY enbPluginCheckMailNews.accesskey "p">
-<!ENTITY disableImageInMailNews.label       "Loading of remote images">
-<!ENTITY disableImageInMailNews.accesskey   "L">
+<!ENTITY privacyFeature.label "Configure features to protect your privacy:">
+<!ENTITY disableImageInMailNews.label       "Block loading of remote images in mail messages.">
+<!ENTITY disableImageInMailNews.accesskey   "B">
 <!ENTITY disableCookieForMailNews.label "Cookies">
 <!ENTITY disableCookieForMailNews.accesskey "C">
+<!ENTITY enbJsCheckMailNews.label     "Enable JavaScript in mail messages.">
+<!ENTITY enbJsCheckMailNews.accesskey "J">
+<!ENTITY enbPluginCheckMailNews.label     "Plugins">
+<!ENTITY enbPluginCheckMailNews.accesskey "p">
 
 <!ENTITY returnReceiptsDescription.label "Configure Return Receipts.">
 
 <!--LOCALIZATION NOTE : FILE The Proxies preferences dialog -->
 <!ENTITY  lHeader.label                 "Connection">
-<!ENTITY  proxyTitle.label              "Configure Proxies to Access the Internet.">
+<!ENTITY  proxyTitle.label              "Configure Proxies to Access the Internet:">
 <!ENTITY  directTypeRadio.label         "Direct connection to the Internet">
 <!ENTITY  directTypeRadio.accesskey     "d">
 <!ENTITY  manualTypeRadio.label         "Manual proxy configuration">

mail/components/prefwindow/skin/prefPanels.css

@@ -61,7 +61,7 @@
 {
   margin: 0px 6px 2px 6px;
   padding: 0px 3px;
-  background-color: -moz-Dialog;
+  background-color: -moz-Field;
 }
 
 .expanderDescription 
@@ -69,3 +69,13 @@
   padding: 5px 5px;
 }
 
+.listBox {
+  -moz-appearance: listbox;
+  margin: 2px 4px;
+  border: 2px solid;
+  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
+  -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
+  -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
+  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
+  background-color: -moz-Field;
+}