diff --git a/mail/components/prefwindow/content/pref-advanced.xul b/mail/components/prefwindow/content/pref-advanced.xul
index 6151b4635d5..9c7b2b7c7a9 100644
--- a/mail/components/prefwindow/content/pref-advanced.xul
+++ b/mail/components/prefwindow/content/pref-advanced.xul
@@ -76,7 +76,6 @@
                        
                        // return receipts
                        "alwaysRequest", "receiptFolder", "receiptSend", "notInToCcPref", "outsideDomainPref", "otherCasesPref",
-                       "mailPaneConfig",
                        
                        // addressing prefs
                        "emailCollectionOutgoing", "addressingAutocomplete", "autocompleteLDAP",
@@ -158,7 +157,7 @@
     <expander id="privacySettings" class="prefExpander" label="&privacyTitle.label;" persist="open">
       <label class="expanderDescription" value="&privacyFeature.label;" flex="1"/>
 
-      <vbox id="contentEnablingBox">
+      <vbox id="contentEnablingBox" class="indent">
         <checkbox id="javascriptAllowMailNews" 
                   label="&enbJsCheckMailNews.label;" accesskey="&enbJsCheckMailNews.accesskey;"
                   prefstring="javascript.allow.mailnews"/>
@@ -168,7 +167,7 @@
                   prefattribute="checked"/>
         <checkbox id="networkImageDisableImagesInMailNews" 
                   label="&disableImageInMailNews.label;" accesskey="&disableImageInMailNews.accesskey;"
-                  pref="true" preftype="bool" prefstring="mailnews.message_display.disable_remote_image"
+                  pref="true" preftype="bool" prefstring="mailnews.message_+"
                   prefinverted="true" prefattribute="checked"/>
         <checkbox id="networkDisableCookieForMailNews"
                   label="&disableCookieForMailNews.label;" accesskey="&disableCookieForMailNews.accesskey;"
@@ -223,17 +222,6 @@
                accesskey="&editDirectories.accesskey;"/>
       </hbox>
     </expander>
-    
-    <!-- Window Settings -->
-    <expander id="windowSettings" class="prefExpander" label="&windowSettings.label;" persist="open">
-      <label class="expanderDescription" value="&selectWindowLayout.label;" control="mailPaneConfig" flex="1"/>
-      <hbox align="center" class="indent">
-        <radiogroup id="mailPaneConfig" prefstring="mail.pane_config" orient="horizontal">
-          <radio class="iconic" value="0" id="classic"/>
-          <radio class="iconic" value="1" id="wide"/>
-        </radiogroup>
-      </hbox> 
-    </expander>
 
     <!-- Return Receipts -->
     <expander id="returnReceipts" class="prefExpander" label="&receiptSettings.label;" persist="open"> 
diff --git a/mail/components/prefwindow/content/pref-mailnews.xul b/mail/components/prefwindow/content/pref-mailnews.xul
index 975f2d20fd6..29cec40f510 100644
--- a/mail/components/prefwindow/content/pref-mailnews.xul
+++ b/mail/components/prefwindow/content/pref-mailnews.xul
@@ -39,8 +39,7 @@
   <script type="application/x-javascript">
   <![CDATA[
 
-    var _elementIDs = ["mailnewsConfirmMoveFoldersToTrash", 
-                       "mailnewsStartPageEnabled", "mailnewsStartPageUrl", "mailRememberLastMsg",
+    var _elementIDs = ["mailnewsStartPageEnabled", "mailnewsStartPageUrl", "mailPaneConfig", "mailRememberLastMsg",
                        "mailnewsSoundFileUrl", "newMailNotification", "newMailNotificationType",
                         "newMailNotificationAlert"];
   ]]>
@@ -49,12 +48,6 @@
   <groupbox>
     <caption label="&generalSettings.label;"/>
     
-    <hbox align="center">
-      <checkbox id="mailnewsConfirmMoveFoldersToTrash" label="&confirmMove.label;"
-                prefstring="mailnews.confirm.moveFoldersToTrash"
-                accesskey="&confirmMove.accesskey;"/>
-    </hbox>
-
     <hbox align="start" id="mapi"/>
 
     <hbox align="center">
@@ -66,6 +59,17 @@
     <separator class="thin"/>
     
   </groupbox>
+  
+  <groupbox>
+    <caption label="&windowSettings.label;"/>
+    <label value="&selectWindowLayout.label;" accesskey="&selectWindowLayout.accesskey;" control="mailPaneConfig"/>
+    <hbox align="center" class="indent">
+      <radiogroup id="mailPaneConfig" prefstring="mail.pane_config" orient="horizontal">
+        <radio class="iconic" value="0" id="classic"/>
+        <radio class="iconic" value="1" id="wide"/>
+      </radiogroup>
+    </hbox> 
+  </groupbox>
 
   <groupbox>
     <caption label="&messengerStartPage.label;"/>
@@ -118,5 +122,4 @@
       </hbox>
     </hbox>
   </groupbox>
-
 </page>
diff --git a/mail/components/prefwindow/locale/pref-advanced.dtd b/mail/components/prefwindow/locale/pref-advanced.dtd
index 7dafc46a395..84d7bed6ead 100644
--- a/mail/components/prefwindow/locale/pref-advanced.dtd
+++ b/mail/components/prefwindow/locale/pref-advanced.dtd
@@ -57,6 +57,3 @@
 <!ENTITY  noproxy.accesskey             "n">
 <!ENTITY  noproxyExplain.label          "Example: .mozilla.org, .net.nz">
 
-<!ENTITY windowSettings.label             "Windows">
-<!ENTITY selectWindowLayout.label         "Select the window layout you prefer for Mail.">
-<!ENTITY selectWindowLayout.accesskey     "l">
diff --git a/mail/components/prefwindow/locale/pref-mailnews.dtd b/mail/components/prefwindow/locale/pref-mailnews.dtd
index 41e3dfea662..a2f5f6e5eff 100644
--- a/mail/components/prefwindow/locale/pref-mailnews.dtd
+++ b/mail/components/prefwindow/locale/pref-mailnews.dtd
@@ -18,3 +18,6 @@
 <!ENTITY warnOnSendAccelKey.label         "Confirm when using keyboard shortcut to send message">
 <!ENTITY warnOnSendAccelKey.accesskey     "o">
 
+<!ENTITY windowSettings.label             "Windows">
+<!ENTITY selectWindowLayout.label         "Select the window layout you prefer for Mail.">
+<!ENTITY selectWindowLayout.accesskey     "S">
\ No newline at end of file