diff --git a/mozilla/editor/ui/composer/content/editorOverlay.xul b/mozilla/editor/ui/composer/content/editorOverlay.xul
index d4204d4496e..09fcbb66fa4 100644
--- a/mozilla/editor/ui/composer/content/editorOverlay.xul
+++ b/mozilla/editor/ui/composer/content/editorOverlay.xul
@@ -204,7 +204,7 @@
       <menuseparator id="edEditMenuSep4" />
       <menuitem id="menu_checkspelling" accesskey="&editcheckspelling.accesskey;"   key="checkspellingkb" observes="cmd_checkSpelling"/>
       <menuseparator id="edEditMenuSep5" />
-      <menuitem id="menu_preferences" oncommand="goPreferences('navigator.xul', 'chrome://communicator/content/pref/pref-composer.xul')"/>
+      <menuitem id="menu_preferences" oncommand="goPreferences('navigator.xul', 'chrome://communicator/content/pref/pref-composer.xul','editor')"/>
     </menupopup>
   </menu>
 
diff --git a/mozilla/mailnews/addrbook/prefs/resources/content/MANIFEST b/mozilla/mailnews/addrbook/prefs/resources/content/MANIFEST
index 84da0e38799..5f1e0e73a93 100644
--- a/mozilla/mailnews/addrbook/prefs/resources/content/MANIFEST
+++ b/mozilla/mailnews/addrbook/prefs/resources/content/MANIFEST
@@ -21,3 +21,4 @@
 #
 
 pref-addressing.xul
+pref-addressbookOverlay.xul
diff --git a/mozilla/mailnews/addrbook/prefs/resources/content/Makefile.in b/mozilla/mailnews/addrbook/prefs/resources/content/Makefile.in
index 93ad37bef06..bff4d8e0c6b 100644
--- a/mozilla/mailnews/addrbook/prefs/resources/content/Makefile.in
+++ b/mozilla/mailnews/addrbook/prefs/resources/content/Makefile.in
@@ -30,6 +30,7 @@ SAMPLES_DIR	= $(DIST)/bin/chrome/messenger/content/addressbook
 
 EXPORT_RESOURCE_SAMPLES = \
 		pref-addressing.xul \
+		pref-addressbookOverlay.xul \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/mailnews/addrbook/prefs/resources/content/makefile.win b/mozilla/mailnews/addrbook/prefs/resources/content/makefile.win
index 30ae6e724a6..90acd04e7e6 100644
--- a/mozilla/mailnews/addrbook/prefs/resources/content/makefile.win
+++ b/mozilla/mailnews/addrbook/prefs/resources/content/makefile.win
@@ -25,6 +25,7 @@ include <$(DEPTH)\config\rules.mak>
 
 install:: 
 	$(MAKE_INSTALL) pref-addressing.xul $(DIST)\bin\chrome\messenger\content\addressbook
+	$(MAKE_INSTALL) pref-addressbookOverlay.xul $(DIST)\bin\chrome\messenger\content\addressbook
 
 clobber::
 	rm -f $(DIST)\chrome\messenger\content\addressbook\pref-addressing.xul
diff --git a/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressbookOverlay.xul b/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressbookOverlay.xul
new file mode 100644
index 00000000000..0a405f39444
--- /dev/null
+++ b/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressbookOverlay.xul
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<overlay id="addressbookPrefOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <treechildren id="messengerChildren">
+    <treeitem open="true" position="3">
+      <treerow>
+        <treecell indent="true" url="chrome://messenger/content/addressbook/pref-addressing.xul" value="&address.label;"/> 
+      </treerow>
+    </treeitem>
+  </treechildren>
+
+</overlay>         
\ No newline at end of file
diff --git a/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul b/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
index 7fe1071427c..179cb29a5bf 100644
--- a/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
+++ b/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
@@ -6,77 +6,46 @@
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/pref-addressing.dtd">
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
-		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-		onload="if (parent.handle) parent.handle.onpageload('pref-addressing'); else parent.queuedTag='pref-addressing';"
-        class="dialog"
-		align="vertical">
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="parent.initPanel('chrome://messenger/content/addressbook/pref-addressing.xul');"
+        class="color-dialog"
+        orient="vertical">
 
-  <box type="smallheader" title="&pane.title;" description="&pane.description;"/>
-	<titledbox orient="vertical">
-		<title>
-			<text value="&pinpoint.label;"/>
-		</title>
+  <script language="javascript">
+  <![CDATA[
+    var _elementIDs = ["padCheck", "dirCheck", "showDialogForMultipleMatches", "useAddress"];
+  ]]>
+  </script>  
+    
+  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
+
+  <titledbox orient="vertical">
+    <title><text value="&pinpoint.label;"/></title>
 			
-		<html:div>&lookFor.label;</html:div>
+    <html>&lookFor.label;</html>
+    <checkbox id="padCheck" value="&padCheck.label;" accesskey="&padCheck.accesskey;"/>
+    <box autostretch="never">
+      <checkbox id="dirCheck" value="&dirCheck.label;" accesskey="&dirCheck.accesskey;"/>
+      <menulist>
+        <menupopup/>
+      </menulist>
+    </box>
 		
-		<html:div>
-			<html:input id="padCheck" type="checkbox" class="indent"/>
-			<html:label for="padCheck">&padCheck.label;</html:label>
-		</html:div>
-		
-		<html:div>
-			<html:input id="dirCheck" type="checkbox" class="indent"/>
-			<html:label for="dirCheck">&dirCheck.label;</html:label>
-			<html:select>
-			</html:select>
-		</html:div>
-		
-		<html:div class="vertical-gap">&mulFound.label;</html:div>
+    <separator class="thin"/>
 
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="ldap_2.autoComplete.showDialogForMultipleMatches" prefindex="false" id="ldap_2.autoComplete.showDialogForMultipleMatches1" name="multilist" type="radio"/>
-			<html:label for="ldap_2.autoComplete.showDialogForMultipleMatches1">&acceptList.label;</html:label>
-		</html:div>
-		
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="ldap_2.autoComplete.showDialogForMultipleMatches" prefindex="true" id="ldap_2.autoComplete.showDialogForMultipleMatches0" name="multilist" type="radio"/>
-			<html:label for="ldap_2.autoComplete.showDialogForMultipleMatches0">&showList.label;</html:label>
-		</html:div>
-		
-		<html:div class="vertical-gap">&oneMatch.label;</html:div>
-		
-		<html:div>
-			<html:input id="useAddress" type="checkbox" class="indent"/>
-			<html:label for="useAddress">&useAddress.label;</html:label>
-		</html:div>
-		
-		
-		<!--html:table>
-		<html:tr><html:td>&lookFor.label;</html:td></html:tr>
-			<html:tr><html:td>
-				<html:input id="padCheck" type="checkbox"/>
-				<html:label for="padCheck">&padCheck.label;</html:label>
-			</html:td></html:tr>
-			<html:tr><html:td>
-				<html:input type="checkbox"/>
-				<html:label>&dirCheck.label;</html:label>
-			</html:td></html:tr>
-		<html:tr><html:td>&mulFound.label;</html:td></html:tr>
-			<html:tr><html:td>
-				<html:input name="multilist" type="radio"/>
-				<html:label>&showList.label;</html:label>
-			</html:td></html:tr>
-			<html:tr><html:td>
-				<html:input name="multilist" type="radio"/>
-				<html:label>&acceptList.label;</html:label>
-			</html:td></html:tr>
-			<html:tr><html:td>&oneMatch.label;</html:td></html:tr>
-			<html:tr><html:td>
-				<html:input type="checkbox"/>
-				<html:label>&useAddress.label;</html:label>
-			</html:td></html:tr>
-		</html:table-->
+    <html>&mulFound.label;</html>
+    <radiogroup id="showDialogForMultipleMatches" orient="vertical" autostretch="never"
+              pref="true" preftype="bool" prefstring="ldap_2.autoComplete.showDialogForMultipleMatches"
+              prefattribute="data">
+      <radio data="false" value="&acceptList.label;" accesskey="&acceptList.accesskey;"/>
+      <radio data="true" value="&showList.label;" accesskey="&showList.accesskey;"/>
+    </radiogroup>
+
+    <separator class="thin"/>
+    
+    <html>&oneMatch.label;</html>		
+    <checkbox id="useAddress" value="&useAddress.label;" accesskey="&useAddress.accesskey;"/>
 	
-	</titledbox>
+  </titledbox>
 
 </window>
diff --git a/mozilla/mailnews/addrbook/prefs/resources/locale/en-US/pref-addressing.dtd b/mozilla/mailnews/addrbook/prefs/resources/locale/en-US/pref-addressing.dtd
index 9e63e3558d4..917f3dd3c16 100644
--- a/mozilla/mailnews/addrbook/prefs/resources/locale/en-US/pref-addressing.dtd
+++ b/mozilla/mailnews/addrbook/prefs/resources/locale/en-US/pref-addressing.dtd
@@ -18,15 +18,21 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 
 
-<!ENTITY window.title "Addressing">
-<!ENTITY pane.title "Addressing">
-<!ENTITY pane.description "Settings for addressing messages">
-<!ENTITY pinpoint.label "Pinpoint Addressing">
-<!ENTITY lookFor.label "Look for addresses in the following:">
-<!ENTITY padCheck.label "Address Books">
-<!ENTITY dirCheck.label "Directory Server">
-<!ENTITY mulFound.label "When there are multiple addresses found:">
-<!ENTITY showList.label "Show me a list of choices">
-<!ENTITY acceptList.label "Accept what I have typed">
-<!ENTITY oneMatch.label "If there is one match in your personal address books:">
-<!ENTITY useAddress.label "Use the address and do not search in the directory">
+<!ENTITY window.title           "Addressing">
+<!ENTITY pane.title             "Addressing">
+<!ENTITY pane.description       "Settings for addressing messages">
+<!ENTITY pinpoint.label         "Pinpoint Addressing">
+<!ENTITY lookFor.label          "Look for addresses in the following:">
+<!ENTITY padCheck.label         "Address Books">
+<!ENTITY padCheck.accesskey     "a">
+<!ENTITY dirCheck.label         "Directory Server">
+<!ENTITY dirCheck.accesskey     "d">
+<!ENTITY mulFound.label         "When there are multiple addresses found:">
+<!ENTITY showList.label         "Show me a list of choices">
+<!ENTITY showList.accesskey     "s">
+<!ENTITY acceptList.label       "Accept what I have typed">
+<!ENTITY acceptList.accesskey   "c">
+<!ENTITY oneMatch.label         "If there is one match in your personal address books:">
+<!ENTITY useAddress.label       "Use the address and do not search in the directory">
+<!ENTITY useAddress.accesskey   "u">
+
diff --git a/mozilla/mailnews/base/prefs/resources/content/MANIFEST b/mozilla/mailnews/base/prefs/resources/content/MANIFEST
index c4b13da509b..1d0c5993bcb 100644
--- a/mozilla/mailnews/base/prefs/resources/content/MANIFEST
+++ b/mozilla/mailnews/base/prefs/resources/content/MANIFEST
@@ -40,10 +40,13 @@ am-imap-advanced.xul
 am-imap-advanced.js
 am-smtp.xul
 am-smtp.js
+pref-appearance_overlay.xul
+pref-advanced_overlay.xul
+pref-tree_overlay.xul
 pref-mailnews.xul
 pref-mailnews.js
-pref-winsetting.xul
 pref-receipts.xul
+pref-viewing_messages.xul
 custreceipt.xul
 pref-diskspace.xul
 AccountWizard.xul
diff --git a/mozilla/mailnews/base/prefs/resources/content/Makefile.in b/mozilla/mailnews/base/prefs/resources/content/Makefile.in
index c84393c799d..8c954112b37 100644
--- a/mozilla/mailnews/base/prefs/resources/content/Makefile.in
+++ b/mozilla/mailnews/base/prefs/resources/content/Makefile.in
@@ -49,9 +49,12 @@ EXPORT_RESOURCE_SAMPLES = \
 		am-imap-advanced.js \
 		am-smtp.xul \
 		am-smtp.js \
+		pref-advanced_overlay.xul \
+		pref-appearance_overlay.xul \
+		pref-tree_overlay.xul \
+		pref-viewing_messages.xul \
 		pref-mailnews.xul \
 		pref-mailnews.js \
-		pref-winsetting.xul \
 		pref-receipts.xul \
 		custreceipt.xul \
 		pref-diskspace.xul \
diff --git a/mozilla/mailnews/base/prefs/resources/content/makefile.win b/mozilla/mailnews/base/prefs/resources/content/makefile.win
index cd373485d39..6437682b10c 100644
--- a/mozilla/mailnews/base/prefs/resources/content/makefile.win
+++ b/mozilla/mailnews/base/prefs/resources/content/makefile.win
@@ -42,9 +42,12 @@ install::
 	$(MAKE_INSTALL) am-imap-advanced.js	$(DIST)\bin\chrome\messenger\content
 	$(MAKE_INSTALL) am-smtp.xul		$(DIST)\bin\chrome\messenger\content
 	$(MAKE_INSTALL) am-smtp.js		$(DIST)\bin\chrome\messenger\content
+	$(MAKE_INSTALL) pref-advanced_overlay.xul	$(DIST)\bin\chrome\messenger\content
+	$(MAKE_INSTALL) pref-appearance_overlay.xul	$(DIST)\bin\chrome\messenger\content
+	$(MAKE_INSTALL) pref-tree_overlay.xul	$(DIST)\bin\chrome\messenger\content
 	$(MAKE_INSTALL) pref-mailnews.xul	$(DIST)\bin\chrome\messenger\content
 	$(MAKE_INSTALL) pref-mailnews.js	$(DIST)\bin\chrome\messenger\content
-	$(MAKE_INSTALL) pref-winsetting.xul $(DIST)\bin\chrome\messenger\content
+	$(MAKE_INSTALL) pref-viewing_messages.xul $(DIST)\bin\chrome\messenger\content
 	$(MAKE_INSTALL) pref-receipts.xul	$(DIST)\bin\chrome\messenger\content
 	$(MAKE_INSTALL) custreceipt.xul		$(DIST)\bin\chrome\messenger\content
 	$(MAKE_INSTALL) pref-diskspace.xul	$(DIST)\bin\chrome\messenger\content
@@ -100,9 +103,12 @@ clobber::
 	rm -f $(DIST)\chrome\messenger\content\aw-login.xul
 	rm -f $(DIST)\chrome\messenger\content\aw-accname.xul
 	rm -f $(DIST)\chrome\messenger\content\aw-done.xul
+	rm -f $(DIST)\chrome\messenger\content\pref-tree_overlay.xul
+	rm -f $(DIST)\chrome\messenger\content\pref-appearance_overlay.xul
+	rm -f $(DIST)\chrome\messenger\content\pref-advanced_overlay.xul
 	rm -f $(DIST)\chrome\messenger\content\pref-mailnews.xul
 	rm -f $(DIST)\chrome\messenger\content\pref-mailnews.js
-	rm -f $(DIST)\chrome\messenger\content\pref-winsetting.xul
+	rm -f $(DIST)\chrome\messenger\content\pref-viewing_messages.xul
 	rm -f $(DIST)\chrome\messenger\content\pref-receipts.xul
 	rm -f $(DIST)\chrome\messenger\content\custreceipt.xul
 	rm -f $(DIST)\chrome\messenger\content\pref-diskspace.xul
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-advanced_overlay.xul b/mozilla/mailnews/base/prefs/resources/content/pref-advanced_overlay.xul
new file mode 100644
index 00000000000..c9ee673e214
--- /dev/null
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-advanced_overlay.xul
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+
+<overlay id="messengerPrefOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script language="JavaScript">
+  <![CDATA[
+    // this appends this element to the wsm ID array
+    if( _elementIDs )
+      {
+        _elementIDs.push("javascriptAllowMailNews");
+      }
+  ]]>
+  </script>
+         
+  <!-- advanced settings -->
+  <titledbox id="advancedSettings">
+    <checkbox class="indent" id="javascriptAllowMailNews" position="4"
+              value="&enbJsCheckMailNews.label;" accesskey="&enbJsCheckMailNews.accesskey;"
+              pref="true" preftype="bool" prefstring="javascript.allow.mailnews"
+              prefattribute="checked"/>
+  </titledbox>        
+
+    
+         
+</overlay> 
\ No newline at end of file
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-appearance_overlay.xul b/mozilla/mailnews/base/prefs/resources/content/pref-appearance_overlay.xul
new file mode 100644
index 00000000000..ee00a596b30
--- /dev/null
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-appearance_overlay.xul
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+
+<overlay id="messengerPrefAppearanceOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script language="JavaScript">
+  <![CDATA[
+    // this appends this element to the wsm ID array
+    if( _elementIDs )
+      {
+        _elementIDs.push("generalStartupMail");
+      }
+  ]]>
+  </script>
+       
+  <!-- startup entry in appearance prefs -->
+  <titledbox id="generalStartupPreferences">
+    <checkbox id="generalStartupMail" wsm_persist="true" position="2"
+              value="&mesCheck.label;" accesskey="&mesCheck.accesskey;"
+              pref="true" preftype="bool" prefstring="general.startup.mail"
+              prefattribute="checked"/>         
+  </titledbox>        
+
+</overlay> 
\ No newline at end of file
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-diskspace.xul b/mozilla/mailnews/base/prefs/resources/content/pref-diskspace.xul
index 0ad82f3b589..e72274e14aa 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-diskspace.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-diskspace.xul
@@ -1,74 +1,84 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-diskspace.dtd">
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
-		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="dialog"
-		onload="if (parent.handle) parent.handle.onpageload('pref-diskspace'); else parent.queuedTag='pref-diskspace';"
-		align="vertical">
+		    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        class="color-dialog"
+		    onload="parent.initPanel('chrome://messenger/content/pref-diskspace.xul');"
+		    orient="vertical">
+        
+  <script language="javascript">
+  <![CDATA[
+    var _elementIDs = ["limitMessageSize", "maxSize", "newsKeepMethod", "newsKeepDays",
+                       "newsKeepCount", "newsKeepOnlyUnread", "newsRemoveBodiesByAge",
+                       "newsRemoveBodiesDays"];
+  ]]>
+  </script>
+
+  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
 
-  <box type="smallheader" title="&pane.title;" description="&pane.description;"/>
 	<titledbox orient="vertical">
-		<title>
-			<text value="&allMsg.label;"/>
-		</title>
+		<title><text value="&allMsg.label;"/></title>
 		
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mail.limit_message_size" id="mail.limit_message_size" type="checkbox"/>
-			<html:label for="mail.limit_message_size">&storeMsgLimit.label;</html:label>
-			<html:input name="maxsize" pref="true" preftype="int" prefstring="mail.max_size" id="mail.max_size" size="4" type="text"/>
-			<html:label>&kb.label;</html:label>
-		</html:div>
-		
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mail.prompt_purge_threshhold" id="mail.prompt_purge_threshhold" type="checkbox"/>
-			<html:label for="mail.prompt_purge_threshhold">&autoCompact.label;</html:label>
-			<html:input name="purgesize" pref="true" preftype="int" prefstring="mail.purge_threshhold" id="mail.purge_threshhold" size="4" type="text"/>
-			<html:label>&kb.label;</html:label>
-		</html:div>
+    <box autostretch="never">
+      <checkbox id="limitMessageSize" value="&storeMsgLimit.label;" accesskey="&storeMsgLimit.accesskey;"
+                pref="true" preftype="bool" prefstring="mail.limit_message_size" 
+                prefattribute="checked"/>
+      <textfield id="maxSize" size="4" pref="true" preftype="int"
+                 prefstring="mail.max_size" prefattribute="value"/>
+      <text class="label" value="&kb.label;"/>
+    </box>                                 
+  
+	  <box autostretch="never">
+      <checkbox id="promptPurgeThreshold" value="&autoCompact.label;" accesskey="&autoCompact.accesskey;"
+                pref="true" preftype="bool" prefstring="mail.prompt_purge_threshold"
+                prefattribute="checked"/>
+      <textfield id="purgeThreshhold" size="4" pref="true" preftype="int"
+                 prefstring="mail.purge_threshhold" prefattribute="value"/>
+      <text class="label" value="&kb.label;"/>
+    </box>                                   
 	</titledbox>
 
 	<titledbox orient="vertical">
-		<title>
-			<text value="&newgroupMsgOnly.label;"/>
-		</title>
+		<title><text value="&newgroupMsgOnly.label;"/></title>
 		
-		<html:div class="vertical-gap">&whenToClean.label;</html:div>
+    <html>&whenToClean.label;</html>
 
-		<html:div>
-			<html:input pref="true" preftype="int" prefstring="news.keep.method" prefindex="1" id="news.keep.method1" class="indent" name="keepmsg" type="radio"/>
-			<html:label for="news.keep.method1">&keepMsgs.label;</html:label>
-			<html:input name="keepdays" pref="true" preftype="int" prefstring="news.keep.days" id="news.keep.days" size="4" type="text"/>
-			<html:label>&days.label;</html:label>
-		</html:div>
+    <radiogroup id="newsKeepMethod" orient="vertical" autostretch="never" 
+                pref="true" preftype="int" prefstring="news.keep.method" 
+                prefattribute="data">
+      <box autostretch="never">
+        <radio data="1" value="&keepMsgs.label;" accesskey="&keepMsgs.accesskey;"/>
+        <textfield id="newsKeepDays" size="4" pref="true" preftype="int"
+                   prefstring="news.keep.days" prefattribute="value"/>
+        <text class="label" value="&days.label;"/>
+      </box>
+      <radio data="0" value="&keepAllMsg.label;" accesskey="&keepAllMsg.accesskey;"/>
+      <box autostretch="never">
+        <radio data="2" value="&keepTheNewest.label;" accesskey="&keepTheNewest.accesskey;"/>
+        <textfield id="newsKeepCount" size="4" pref="true" preftype="int"
+                   prefstring="news.keep.count" prefattribute="value"/>
+        <text class="label" value="&messages.label;"/>
+      </box>
+    </radiogroup>
 
-		<html:div>
-			<html:input pref="true" preftype="int" prefstring="news.keep.method" prefindex="0" id="news.keep.method0" class="indent" name="keepmsg" type="radio"/>
-			<html:label for="news.keep.method0">&keepAllMsg.label;</html:label>
-		</html:div>
-
-		<html:div>
-			<html:input pref="true" preftype="int" prefstring="news.keep.method" prefindex="2" id="news.keep.method2" class="indent" name="keepmsg" type="radio"/>
-			<html:label for="news.keep.method2">&keepTheNewest.label;</html:label>
-			<html:input name="keepmsgcount" pref="true" preftype="int" prefstring="news.keep.count" id="news.keep.count" size="4" type="text"/>
-			<html:label>&messages.label;</html:label>
-		</html:div>
-
-		<html:div class="vertical-gap">
-			<html:input pref="true" preftype="bool" prefstring="news.keep.only_unread" id="news.keep.only_unread" type="checkbox"/>
-			<html:label for="news.keep.only_unread">&keepUnread.label;</html:label>
-		</html:div>
-
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="news.remove_bodies.by_age" id="news.remove_bodies.by_age" type="checkbox"/>
-			<html:label for="news.remove_bodies.by_age">&removeMsg.label;</html:label>
-			<html:input name="removedays" pref="true" preftype="int" prefstring="news.remove_bodies.days" id="news.remove_bodies.days" size="4" type="text"/>
-			<html:label>&days.label;</html:label>
-		</html:div>
+    <separator/>
+    
+    <checkbox id="newsKeepOnlyUnread" value="&keepUnread.label;" accesskey="&keepUnread.accesskey;"
+              pref="true" preftype="bool" prefstring="news.keep.only_unread"
+              prefattribute="checked"/>
+    <box autostretch="never">
+      <checkbox id="newsRemoveBodiesByAge" value="&removeMsg.label;" accesskey="&removeMsg.accesskey;"
+                pref="true" preftype="bool" prefstring="news.remove_bodies.by_age"
+                prefattribute="checked"/>
+      <textfield id="newsRemoveBodiesDays" size="4" pref="true" preftype="int" 
+                 prefstring="news.remove_bodies.days" prefattribute="value"/>
+      <text class="label" value="&days.label;"/>
+    </box>
 	</titledbox>
 
 </window>
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul b/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
index 8fcbb39a561..75077312b7f 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
@@ -1,128 +1,88 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/pref-mailnews.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-mailnews.dtd">
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
-		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="dialog"
-		onload="if (parent.handle) parent.handle.onpageload('pref-mailnews'); else parent.queuedTag='pref-mailnews';"
-		align="vertical">
-<html:script language="javascript" src="chrome://global/content/strres.js"/>
-<html:script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
-<html:script language="javascript" src="chrome://messenger/content/pref-mailnews.js"/>
+		    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        class="color-dialog"
+		    onload="parent.initPanel('chrome://messenger/content/pref-mailnews.xul');"
+		    orient="vertical">
 
-	  <box type="smallheader" title="&pane.title;" description="&pane.description;"/>
-	<titledbox orient="vertical">
+  <script language="javascript">
+  <![CDATA[
+    var _elementIDs = ["mailPaneConfig", "mailPlaySound", "mailnewsConfirmMoveFoldersToTrash", 
+                       "mailUseMapiServer", "reuseThreadWindow2", "reuseThreadWindow", 
+                       "mailnewsStartPageEnabled", "mailnewsStartPageUrl"];
+  ]]>
+  </script>
+  <script language="javascript" src="chrome://global/content/strres.js"></script>
+  <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
+  
+  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
 
-		<title>
-			<text value="&textBegin.label;"/>
-		</title>
+  <titledbox orient="vertical">
+    <title><text value="&windowSettings.label;"/></title>
+    
+    <box autostretch="never">
+      <text class="label" value="&selectWindowLayout.label;"/>
+      <spring flex="1"/>
+      <radiogroup id="mailPaneConfig" pref="true" preftype="int" prefstring="mail.pane_config"
+                  prefattribute="data">
+        <radio class="iconic" data="0" id="classic"/>
+        <radio class="iconic" data="1" id="wide"/>
+      </radiogroup>
+    </box>
+    
+    <html>&chooseExp.label;</html>
+  </titledbox>
 
-		<box align="horizontal">
-		
-			<html:div>
-				<html:label for="mail.quoted_style">&style.label;</html:label>
-				<html:select pref="true"
-	                         preftype="int"
-	                         prefstring="mail.quoted_style"
-	                         id="mail.quoted_style">
-					<html:option value="0" label="&regular.label;"/>
-					<html:option value="1" label="&bold.label;"/>
-					<html:option value="2" label="&italic.label;"/>
-					<html:option value="3" label="&boldItalic.label;"/>
-				</html:select>
-			</html:div>
-
-			<html:label for="mail.quoted_size">&size.label;</html:label>
-
-			<html:div>
-				<html:select pref="true" preftype="int" id="mail.quoted_size" prefstring="mail.quoted_size">
-					<html:option value="0" label="&regular.label;"/>
-					<html:option value="1" label="&bigger.label;"/>
-					<html:option value="2" label="&smaller.label;"/>
-				</html:select>
-			</html:div>
-
-			<menu id="citationmenu">
-				<titledbutton value="&color.label;" class="popup" align="right"/> 
-				<html:div nopref="true" preftype="string" prefstring="mail.citation_color" style="width:30px; background-color:white"/>
-				<menupopup>
-					<colorpicker id="citation" palettename="standard" onclick="setColorWell(this.parentNode.parentNode,null,false);"/>
-				</menupopup>
-        	</menu>  
-		
-        </box>
-
-	</titledbox>
-
-	<titledbox orient="vertical">
-		<title>
-			<text value="&displayWidth.label;"/>
-		</title>
-
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mail.fixed_width_messages" prefindex="true" id="fixed_width" name="fontwidth" type="radio"/>
-			<html:label for="fixed_width">&fixedWidth.label;</html:label>
-		</html:div>
-			
-		<html:div>
-            <html:input id="var_width" name="fontwidth" type="radio"/>
-			<html:label for="var_width">&variableWidth.label;</html:label>
-		</html:div>
-
-	</titledbox>
-	 
-	<titledbox orient="vertical">
-
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mail.play_sound" id="mail.play_sound" type="checkbox"/>
-			<html:label for="mail.play_sound">&playSound.label;</html:label>
-		</html:div>
-			
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mailnews.remember_selected_message" id="mailnews.remember_selected_message" type="checkbox"/>
-			<html:label for="mailnews.remember_selected_message">&rememberLastMsg.label;</html:label>
-		</html:div>
-			
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mailnews.confirm.moveFoldersToTrash" id="mailnews.confirm.moveFoldersToTrash" type="checkbox"/>
-			<html:label for="mailnews.confirm.moveFoldersToTrash">&confirmMove.label;</html:label>
-		</html:div>
-			
+  <titledbox orient="vertical" autostretch="never">
+	  <checkbox id="mailPlaySound" value="&playSound.label;" accesskey="&playSound.accesskey;"
+              pref="true" preftype="bool" prefstring="mail.play_sound"
+              prefattribute="checked"/>
+    <checkbox id="mailnewsRememberSelectedMessage" value="&rememberLastMsg.label;" accesskey="&rememberLastMsg.accesskey;"
+              pref="true" preftype="bool" prefstring="mailnews.remember_selected_message" 
+              prefattribute="checked"/>
+    <checkbox id="mailnewsConfirmMoveFoldersToTrash" value="&confirmMove.label;" accesskey="&confirmMove.label;"
+              pref="true" preftype="bool" prefstring="mailnews.confirm.moveFoldersToTrash"
+              prefattribute="checked"/>
 		<!-- this should be in a platform specific overlay, as Linux and Mac don't have MAPI -->
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mail.use_mapi_server" id="mail.use_mapi_server" type="checkbox"/>
-			<html:label for="mail.use_mapi_server">&useMessenger.label;</html:label>
-		</html:div>
-
+    <checkbox id="mailUseMapiServer" value="&useMessenger.label;" accesskey="&useMessenger.label;" 
+              pref="true" preftype="bool" prefstring="mail.use_mapi_server" 
+              prefattribute="checked"/>
+  </titledbox>
+  
+  <titledbox orient="vertical" autostretch="never">              
+    <checkbox id="reuseThreadWindow2" value="&reuseThread.label;" accesskey="&reuseThread.accesskey;"
+              pref="true" preftype="bool" prefstring="mailnews.reuse_thread_window2"
+              prefattribute="checked"/>
+    <checkbox id="reuseThreadWindow" value="&reuseMessage.label;" accesskey="&reuseMessage.accesskey;"
+              pref="true" preftype="bool" prefstring="mailnews.reuse_message_window"
+              prefattribute="checked"/>
+		<html>&reuseExp.label;</html>		
 	</titledbox>
+
 	<titledbox orient="vertical">
-		<title>
-			<text value="&startPageHeader.label;"/>
-		</title>
-		<html:div>
-			<html:input type="checkbox" pref="true" preftype="bool" prefstring="mailnews.start_page.enabled" id="mailnews.start_page.enabled"/>
-			<html:label for="mailnews.start_page.enabled">
-			&enableStartPage.label;
-			</html:label>
-        </html:div>
+    <title><text value="&messengerStartPage.label;"/></title>
 
-		<html:div>
-			<html:label>&location;</html:label>
-
-			<html:input name="homepage" size="30" type="text" pref="true" preftype="string" 
-			prefstring="mailnews.start_page.url" id="mailnews.start_page.url"/>
-		</html:div>
-		<box align="horizontal">
-			<titledbutton class="dialog push" name="starts" type="button" 
-			value="&useCurrent;" onclick="setHomePageToCurrentPage('mailnews.start_page.url');" />
-
-			<titledbutton class="dialog push" name="browse" type="button" 
-			value="&browseFile;" onclick="prefNavSelectFile('mailnews.start_page.url', 'choosehomepage', false)"/>
-		</box>
+    <checkbox allowevents="true" id="mailnewsStartPageEnabled" value="&enableStartPage.label;" accesskey="&enableStartPage.accesskey;"
+              pref="true" preftype="bool" prefstring="mailnews.start_page_enabled"
+              prefattribute="checked"/>
+    <box autostretch="never" class="indent">
+      <text class="label" value="&location.label;" accesskey="&location.label;" for="mailnews.start_page.url"/>
+      <textfield id="mailnewsStartPageUrl" flex="1" pref="true" preftype="string"
+                 prefstring="mailnews.start_page.url" prefattribute="value"/>
+    </box>
+    <box autostretch="never" halign="right">
+      <button class="dialog" value="&useCurrent.label;" accesskey="&useCurrent.accesskey;"
+              oncommand="setHomePageToCurrentPage('mailnews.start_page.url');" />
+      <button class="dialog" value="&chooseFile.label;" accesskey="&chooseFile.accesskey;"
+              oncommand="prefNavSelectFile('mailnews.start_page.url', 'choosehomepage', false)"/>
+    </box>
 
 	</titledbox>
 
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul b/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul
index 31b79bb3f4f..b3033784050 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul
@@ -6,76 +6,64 @@
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-receipts.dtd">
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
-		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        class="dialog"
-		onload="if (parent.handle) parent.handle.onpageload('pref-receipts'); else parent.queuedTag='pref-receipts';"
-		align="vertical">
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        class="color-dialog"
+        onload="parent.initPanel('chrome://messenger/content/pref-receipts.xul');"
+        orient="vertical">
 
-<html:script language="javascript">
-
-function DoCustomize() 
-{
-	var dialog = window.openDialog("chrome://messenger/content/custreceipt.xul",
-								   "",
-								   "chrome");
-}
-
-</html:script>
+  <script language="javascript">
+  <![CDATA[
+    _elementIDs = ["requestReturnReceipt", "mdnReportEnabled", "incorporateReturnReceipt"];
+    
+    function doCustomize() 
+    {
+    	var dialog = window.openDialog("chrome://messenger/content/custreceipt.xul","","chrome");
+    }
+  ]]>  
+  </script>
 
 
-  <box type="smallheader" title="&pane.title;" description="&pane.description;"/>
-	<titledbox orient="vertical">
-		<title>
-			<text value="&requestReceipt.label;"/>
-		</title>
+  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
+
+  <titledbox orient="vertical">
+    <title><text value="&requestReceipt.label;"/></title>
 		
-		<html:div>
-			<html:input pref="true" preftype="int" prefstring="mail.request.return_receipt" prefindex="1" id="mail.request.return_receipt1" name="msgreceipt" type="radio"/>
-			<html:label for="mail.request.return_receipt1">&dsn.label;</html:label> 
-		</html:div>
-		
-		<html:div>
-			<html:input pref="true" preftype="int" prefstring="mail.request.return_receipt" prefindex="2" id="mail.request.return_receipt2" name="msgreceipt" type="radio"/>
-			<html:label for="mail.request.return_receipt2">&mdn.label;</html:label>
-		</html:div>
+    <radiogroup id="requestReturnReceipt" orient="vertical" autostretch="never"
+                pref="true" preftype="int" prefstring="mail.request.return_receipt"
+                prefattribute="data">
+      <radio data="1" value="&dsn.label;" accesskey="&dsn.accesskey;"/>
+      <radio data="2" value="&mdn.label;" accesskey="&mdn.accesskey;"/>
+      <radio data="3" value="&both.label;" accesskey="&both.accesskey;"/>		
+    </radiogroup>
+    
+  </titledbox>
+
+  <titledbox orient="vertical">
+    <title><text value="&receiptArrive.label;"/></title>
+		
+    <radiogroup id="incorporateReturnReceipt" orient="vertical" autostretch="never"
+                pref="true" preftype="int" prefstring="mail.incorporate.return_receipt"
+                prefattribute="data">
+      <radio data="0" value="&leaveIt.label;" accesskey="&leaveIt.accesskey;"/>
+      <radio data="1" value="&moveToSent.label;" accesskey="&moveToSent.accesskey;"/>		
+    </radiogroup>
 
-		<html:div>
-			<html:input pref="true" preftype="int" prefstring="mail.request.return_receipt" prefindex="3" id="mail.request.return_receipt3" name="msgreceipt" type="radio"/>
-			<html:label for="mail.request.return_receipt3">&both.label;</html:label>
-		</html:div>
 	</titledbox>
 
-	<titledbox orient="vertical">
-		<title>
-			<text value="&receiptArrive.label;"/>
-		</title>
-		
-		<html:div>
-			<html:input pref="true" preftype="int" prefstring="mail.incorporate.return_receipt" prefindex="0" id="mail.incorporate.return_receipt0" name="getreceipt" type="radio"/>
-			<html:label for="mail.incorporate.return_receipt0">&leaveIt.label;</html:label>
-		</html:div>
-		
-		<html:div>
-			<html:input pref="true" preftype="int" prefstring="mail.incorporate.return_receipt" prefindex="1" id="mail.incorporate.return_receipt1" name="getreceipt" type="radio"/>
-			<html:label for="mail.incorporate.return_receipt1">&moveToSent.label;</html:label>
-		</html:div>
-	</titledbox>
-
-	<titledbox orient="vertical">
-		<title>
-			<text value="&requestMDN.label;"/>
-		</title>
-		
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mail.mdn.report.enabled" prefindex="false" id="mail.mdn.report.enabled0" name="returnreceipt" type="radio"/>
-			<html:label for="mail.mdn.report.enabled0">&never.label;</html:label>
-		</html:div>
-		
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mail.mdn.report.enabled" prefindex="true" id="mail.mdn.report.enabled1" name="returnreceipt" type="radio"/>
-			<html:label for="mail.mdn.report.enabled1">&returnSome.label;</html:label>
-			<titledbutton class="push dialog" value="&custom.label;"/>
-		</html:div>
-	</titledbox>
+  <titledbox orient="vertical">
+    <title><text value="&requestMDN.label;"/></title>
+	
+    <radiogroup id="mdnReportEnabled" orient="vertical"
+                pref="true" preftype="bool" prefstring="mail.mdn.report.enabled"
+                prefattribute="data">
+      <radio data="false" value="&never.label;" accesskey="&never.accesskey;"/>
+      <box autostretch="never">
+        <radio data="true" value="&returnSome.label;" accesskey="&returnSome.accesskey;"/>	
+        <spring flex="1"/>
+        <button class="dialog" value="&custom.label;" accesskey="&custom.accesskey;"
+                oncommand="doCustomize();"/>
+      </box>
+    </radiogroup>
+  </titledbox>
 
 </window>
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-tree_overlay.xul b/mozilla/mailnews/base/prefs/resources/content/pref-tree_overlay.xul
new file mode 100644
index 00000000000..0eeebd1d405
--- /dev/null
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-tree_overlay.xul
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+
+<overlay id="messengerPrefTreeOverlay"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <!-- pref tree overlay -->
+  <treechildren id="panelChildren">
+    <treeitem container="true" open="true" position="3">
+      <treerow>       
+        <treecell indent="true" url="chrome://messenger/content/pref-mailnews.xul" value="&mail.label;"/> 
+      </treerow>
+      <treechildren id="messengerChildren">
+        <treeitem open="true">
+          <treerow>
+            <treecell indent="true" url="chrome://messenger/content/pref-viewing_messages.xul" value="&viewingMessages.label;"/> 
+          </treerow>
+        </treeitem>
+        <treeitem open="true">
+          <treerow>
+            <treecell indent="true" url="chrome://messengercompose/content/pref-composing_messages.xul" value="&composingMessages.label;"/> 
+          </treerow>
+        </treeitem>
+        <treeitem open="true">
+          <treerow>
+            <treecell indent="true" url="chrome://messengercompose/content/pref-formatting.xul" value="&format.label;"/> 
+          </treerow>
+        </treeitem>
+        <treeitem open="true">
+          <treerow>
+            <treecell indent="true" url="chrome://messenger/content/pref-receipts.xul" value="&return.label;"/> 
+          </treerow>
+        </treeitem>
+        <treeitem open="true">
+          <treerow>
+            <treecell indent="true" url="chrome://messenger/content/pref-diskspace.xul" value="&disk.label;"/> 
+          </treerow>
+        </treeitem>
+      </treechildren>
+    </treeitem>
+  </treechildren>
+         
+</overlay> 
\ No newline at end of file
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul b/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
new file mode 100644
index 00000000000..5ebb3f2733d
--- /dev/null
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-viewing_messages.dtd">
+
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        class="color-dialog"
+        onload="parent.initPanel('chrome://messenger/content/pref-viewing_messages.xul');"
+        orient="vertical">
+
+  <script language="javascript">
+  <![CDATA[
+    _elementIDs = ["mailFixedWidthMessages", "mailQuotedStyle", "mailQuotedSize", "wrapLongLines", "displayGlyph", "displayStruct", "mailCitationColor"];
+
+    function Startup()
+    {
+      getColorFromPickerAndSetWell('citationmenu', 'mailCitationColor');
+    }
+
+    function getColorFromPickerAndSetWell(menuID, colorfield)
+    {
+      var menu = document.getElementById( menuID );
+      var colorValue = document.getElementById( colorfield );
+      if( menu ) {
+      	var colorWell = menu.firstChild.nextSibling;
+      	var colorPicker = menu.firstChild.nextSibling.nextSibling.firstChild;
+        colorWell.style.backgroundColor = colorValue.getAttribute("value");
+        colorPicker.setAttribute( "color", colorValue.getAttribute("value") );
+      }
+    }
+    
+    function setColorWell(menu, colorfield) 
+    {
+    	// Find the colorWell and colorPicker in the hierarchy.
+    	var colorWell = menu.firstChild.nextSibling;
+    	var colorPicker = menu.firstChild.nextSibling.nextSibling.firstChild;
+    
+    	// Extract color from colorPicker and assign to colorWell.
+    	var color = colorPicker.getAttribute('color');
+    	colorWell.style.backgroundColor = color;
+      document.getElementById(colorfield).setAttribute("value",color);
+    }
+
+    dump("*** foopy noopy\n");
+
+
+  ]]>
+  </script>
+        
+  <script language="javascript" src="chrome://global/content/strres.js"></script>
+  <script language="javascript" src="chrome://communicator/content/pref/prefutilities.js"></script>
+
+  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
+
+  <titledbox orient="vertical">
+	  <title><text value="&displayWidth.label;"/></title>
+    
+    <radiogroup id="mailFixedWidthMessages" orient="vertical" autostretch="never"
+                pref="true" preftype="bool" prefstring="mail.fixed_width_messages"
+                prefattribute="data">
+      <radio data="true" value="&fixedWidth.label;" accesskey="&fixedWidth.accesskey;"/>
+      <radio data="false" value="&variableWidth.label;" accesskey="&variableWidth.accesskey;"/>                
+    </radiogroup>
+	</titledbox>
+	   
+  <titledbox orient="vertical">
+    <title><text value="&textBegin.label;"/></title>
+
+    <box>
+      <text class="label" value="&style.label;" accesskey="&style.accesskey;" for="mailQuotedStyle"/>
+      <menulist id="mailQuotedStyle" pref="true" preftype="int" prefstring="mail.quoted_style"
+                prefattribute="data">
+        <menupopup>
+          <menuitem data="0" value="&regular.label;"/>
+          <menuitem data="1" value="&bold.label;"/>
+          <menuitem data="2" value="&italic.label;"/>
+          <menuitem data="3" value="&boldItalic.label;"/>
+        </menupopup>
+      </menulist>
+
+      <text class="label" value="&size.label;" accesskey="&size.label;" for="mailQuotedSize"/>
+      <menulist id="mailQuotedSize" pref="true" preftype="int" prefstring="mail.quoted_size"
+                prefattribute="data">
+        <menupopup>
+          <menuitem data="0" value="&regular.label;"/>
+          <menuitem data="1" value="&bigger.label;"/>
+          <menuitem data="2" value="&smaller.label;"/>
+        </menupopup>
+      </menulist>
+      
+      <menu id="citationmenu">
+        <titledbutton value="&color.label;" class="popup" align="right"/> 
+        <html:div style="width:30px; background-color:white"/>
+        <menupopup>
+          <colorpicker id="citation" palettename="standard" onclick="setColorWell(this.parentNode.parentNode,'mailCitationColor');"/>
+        </menupopup>
+        <broadcaster id="mailCitationColor" pref="true" preftype="color" prefstring="mail.citation_color" prefattribute="value" wsm_attributes="value"/>
+      </menu>  
+    </box>		
+  </titledbox>
+
+	<titledbox orient="vertical" autostretch="never">
+		<title><text value="&readingMessagesHeader.label;"/></title>
+
+    <checkbox id="wrapLongLines" value="&wrapInMsg.label;" accesskey="&wrapInMsg.accesskey;"
+              pref="true" preftype="bool" prefstring="mail.wrap_long_lines" 
+              prefattribute="checked"/>
+    <checkbox id="displayGlyph" value="&convertEmoticons.label;" accesskey="&convertEmoticons.accesskey;"
+              pref="true" preftype="bool" prefstring="mail.display_glyph"
+              prefattribute="checked"/>		
+    <checkbox id="displayStruct" value="&convertStructs.label;" accesskey="&convertStructs.accesskey;" 
+              pref="true" preftype="bool" prefstring="mail.display_struct"
+              prefattribute="checked"/>
+  </titledbox>
+
+  
+</window>
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-winsetting.xul b/mozilla/mailnews/base/prefs/resources/content/pref-winsetting.xul
index c9f1c3317d6..6e192b6174f 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-winsetting.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-winsetting.xul
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
+<?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-winsetting.dtd">
@@ -11,7 +10,7 @@
 		onload="if (parent.handle) parent.handle.onpageload('pref-winsetting'); else parent.queuedTag='pref-winsetting';"
 		align="vertical">
 
-	  <box type="smallheader" title="&pane.title;" description="&pane.description;"/>
+	  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
 	<titledbox orient="vertical">
 		<title>
 			<text value="&chooseLayout.label;"/>
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/MANIFEST b/mozilla/mailnews/base/prefs/resources/locale/en-US/MANIFEST
index 15c299f8672..ae30719c0b7 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/MANIFEST
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/MANIFEST
@@ -24,7 +24,7 @@ custreceipt.dtd
 pref-diskspace.dtd
 pref-mailnews.dtd
 pref-receipts.dtd
-pref-winsetting.dtd
+pref-viewing_messages.dtd
 aw-accname.dtd
 aw-accounttype.dtd
 aw-done.dtd
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/Makefile.in b/mozilla/mailnews/base/prefs/resources/locale/en-US/Makefile.in
index ca140548ca7..d081978c99f 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/Makefile.in
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/Makefile.in
@@ -30,10 +30,10 @@ SAMPLES_DIR	= $(DIST)/bin/chrome/messenger/locale
 
 EXPORT_RESOURCE_SAMPLES = \
 		custreceipt.dtd \
+		pref-viewing_messages.dtd \
 		pref-diskspace.dtd \
 		pref-mailnews.dtd \
 		pref-receipts.dtd \
-		pref-winsetting.dtd \
 		aw-accname.dtd \
 		aw-accounttype.dtd \
 		aw-done.dtd \
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/makefile.win b/mozilla/mailnews/base/prefs/resources/locale/en-US/makefile.win
index 84e4284d872..dcf1a640857 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/makefile.win
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/makefile.win
@@ -30,7 +30,7 @@ install::
 	$(MAKE_INSTALL) pref-diskspace.dtd $(DISTBROWSER)
 	$(MAKE_INSTALL) pref-mailnews.dtd $(DISTBROWSER)
 	$(MAKE_INSTALL) pref-receipts.dtd $(DISTBROWSER)
-	$(MAKE_INSTALL) pref-winsetting.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) pref-viewing_messages.dtd $(DISTBROWSER)
 	$(MAKE_INSTALL) aw-accname.dtd $(DISTBROWSER)
 	$(MAKE_INSTALL) aw-accounttype.dtd $(DISTBROWSER)
 	$(MAKE_INSTALL) aw-done.dtd $(DISTBROWSER)
@@ -57,7 +57,7 @@ clobber::
 	rm -f $(DIST)\bin\chrome\messenger\locale\pref-diskspace.dtd
 	rm -f $(DIST)\bin\chrome\messenger\locale\pref-mailnews.dtd
 	rm -f $(DIST)\bin\chrome\messenger\locale\pref-receipts.dtd
-	rm -f $(DIST)\bin\chrome\messenger\locale\pref-winsetting.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\pref-viewing_messages.dtd
 	rm -f $(DIST)\bin\chrome\messenger\locale\aw-accname.dtd
 	rm -f $(DIST)\bin\chrome\messenger\locale\aw-accounttype.dtd
 	rm -f $(DIST)\bin\chrome\messenger\locale\aw-done.dtd
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-diskspace.dtd b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-diskspace.dtd
index ccb59fd016d..e9e552b11d7 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-diskspace.dtd
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-diskspace.dtd
@@ -19,23 +19,30 @@ Rights Reserved.
 --> 
 
 <!-- LOCALIZATION NOTE pref-diskspace.dtd: UI for Mail/News Disk Space prefs -->
-<!ENTITY pane.title "Disk Space">
-<!ENTITY pane.description "Manage the amount of disk space taken by messages">
-<!ENTITY allMsg.label "All Messages">
+<!ENTITY pane.title                     "Disk Space">
+<!ENTITY pane.description               "Manage the amount of disk space taken by messages">
+<!ENTITY allMsg.label                   "All Messages">
 <!-- LOCALIZATION NOTE storeMsgLimit.label: This string is followed by a number, then by kb.label -->
-<!ENTITY storeMsgLimit.label "Do not store messages locally that are larger than">
+<!ENTITY storeMsgLimit.label            "Do not store messages locally that are larger than">
+<!ENTITY storeMsgLimit.accesskey        "s">
 <!-- LOCALIZATION NOTE autoCompact.label: This string is followed by a number, then by kb.label -->
-<!ENTITY autoCompact.label "Automatically compact folders when it will save over">
-<!ENTITY kb.label " kB">
-<!ENTITY newgroupMsgOnly.label " Newsgroup Messages Only">
-<!ENTITY whenToClean.label "When it's time to clean up messages:">
+<!ENTITY autoCompact.label              "Automatically compact folders when it will save over">
+<!ENTITY autoCompact.accesskey          "c">
+<!ENTITY kb.label                       "kB">
+<!ENTITY newgroupMsgOnly.label          "Newsgroup Messages Only">
+<!ENTITY whenToClean.label              "When it's time to clean up messages:">
 <!-- LOCALIZATION NOTE keepMsgs.label: This string is followed by a number, then by days.label -->
-<!ENTITY keepMsgs.label "Keep messages which have arrived within the past">
-<!ENTITY days.label "days">
-<!ENTITY keepAllMsg.label "Keep all messages">
+<!ENTITY keepMsgs.label                 "Keep messages which have arrived within the past">
+<!ENTITY keepMsgs.accesskey             "k">
+<!ENTITY days.label                     "days">
+<!ENTITY keepAllMsg.label               "Keep all messages">
+<!ENTITY keepAllMsg.accesskey           "a">
 <!-- LOCALIZATION NOTE keepTheNewest.label: This string is followed by a number, then by messages.label -->
-<!ENTITY keepTheNewest.label "Keep the newest">
-<!ENTITY messages.label "messages">
-<!ENTITY keepUnread.label "Keep only unread messages">
+<!ENTITY keepTheNewest.label            "Keep the newest">
+<!ENTITY keepTheNewest.accesskey        "n">
+<!ENTITY messages.label                 "messages">
+<!ENTITY keepUnread.label               "Keep only unread messages">
+<!ENTITY keepUnread.accesskey           "u">
 <!-- LOCALIZATION NOTE removeMsg.label: This string is followed by a number, then by days.label -->
-<!ENTITY removeMsg.label "Remove message bodies only older than">
+<!ENTITY removeMsg.label                "Remove message bodies only older than">
+<!ENTITY removeMsg.accesskey            "r">
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
index 5646b4938e8..373538b5390 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
@@ -18,29 +18,32 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 
 
-<!-- LOCALIZATION NOTE pref-mailnews.dtd: UI for Mail/News prefs -->
-<!ENTITY pane.title "Mail and Newsgroups">
-<!ENTITY pane.description "General Mail/News settings">
-<!ENTITY textBegin.label "Quoted plain text appearance">
-<!ENTITY style.label "Style:">
-<!ENTITY regular.label "Regular">
-<!ENTITY bold.label "Bold">
-<!ENTITY italic.label "Italic">
-<!ENTITY boldItalic.label "Bold Italic">
-<!ENTITY size.label "Size:">
-<!ENTITY regular.label "Regular">
-<!ENTITY bigger.label "Bigger">
-<!ENTITY smaller.label "Smaller">
-<!ENTITY color.label "Color:">
-<!ENTITY displayWidth.label "Display plain text messages and articles with">
-<!ENTITY fixedWidth.label "Fixed width font">
-<!ENTITY variableWidth.label "Variable width font">
-<!ENTITY playSound.label "Play sound when messages arrive">
-<!ENTITY rememberLastMsg.label "Remember the last selected message">
-<!ENTITY confirmMove.label "Confirm when moving folders to the trash">
-<!ENTITY useMessenger.label "Use Messenger from MAPI-based applications">
-<!ENTITY startPageHeader.label "Messenger Start Page">
-<!ENTITY location "Location:">
-<!ENTITY useCurrent "Use Current Page">
-<!ENTITY browseFile "Select File...">
-<!ENTITY enableStartPage.label "Enabled">
+<!ENTITY pane.title                       "Mail and Newsgroups">
+<!ENTITY pane.description                 "General Mail/News settings">
+
+<!ENTITY windowSettings.label             "Window Settings">
+<!ENTITY selectWindowLayout.label         "Choose a window layout for Mail:">
+<!ENTITY chooseExp.label                  "Note: changes to this setting will only take effect the next time you open a Mail window.">
+<!ENTITY playSound.label                  "Play sound when messages arrive">
+<!ENTITY playSound.accesskey              "p">
+<!ENTITY rememberLastMsg.label            "Remember the last selected message">
+<!ENTITY rememberLastMsg.accesskey        "r">
+<!ENTITY confirmMove.label                "Confirm when moving folders to the trash">
+<!ENTITY confirmMove.accesskey            "m">
+<!ENTITY useMessenger.label               "Use Mail from MAPI-based applications">
+<!ENTITY useMessenger.accesskey           "u">
+<!ENTITY messengerStartPage.label         "Mail Start Page">
+<!ENTITY enableStartPage.label            "When Mail launches, show the start page in the message area">
+<!ENTITY enableStartPage.accesskey        "t">
+<!ENTITY location.label                   "Location:">
+<!ENTITY location.accesskey               "l">
+<!ENTITY useCurrent.label                 "Use Current Page">
+<!ENTITY useCurrent.accesskey             "g">
+<!ENTITY chooseFile.label                 "Choose File...">
+<!ENTITY chooseFile.accesskey             "h">
+
+<!ENTITY reuseThread.label                "Double-clicking a folder opens it in a new window.">
+<!ENTITY reuseThread.accesskey            "f">
+<!ENTITY reuseMessage.label               "Double-clicking a message opens it in a new window.">
+<!ENTITY reuseMessage.accesskey           "n">
+<!ENTITY reuseExp.label                   "If you prefer fewer windows, unselect these options, and Mail will open items into existing windows.">
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
index 6037f3c1e9c..580c727444b 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
@@ -19,17 +19,25 @@ Rights Reserved.
 --> 
 
 <!-- LOCALIZATION NOTE pref-receipts.dtd: UI for Mail/News Return Receipts prefs -->
-<!ENTITY pane.title "Return Receipts">
-<!ENTITY pane.description "Settings for requesting or returning receipts">
-<!ENTITY requestReceipt.label " If I request a receipt when sending a message, I want">
-<!ENTITY dsn.label "A delivery receipt from the receiving server (DSN)">
-<!ENTITY mdn.label "A read receipt, notifying me when recipients display the message (MDN)">
-<!ENTITY both.label "Both types of receipt">
-<!ENTITY receiptArrive.label " When a receipt arrives">
-<!ENTITY leaveIt.label "Leave it in my Inbox">
+<!ENTITY pane.title                   "Return Receipts">
+<!ENTITY pane.description             "Settings for requesting or returning receipts">
+<!ENTITY requestReceipt.label         "If I request a receipt when sending a message, I want">
+<!ENTITY dsn.label                    "A delivery receipt from the receiving server (DSN)">
+<!ENTITY dsn.accesskey                "d">
+<!ENTITY mdn.label                    "A read receipt, notifying me when recipients display the message (MDN)">
+<!ENTITY mdn.accesskey                "m">
+<!ENTITY both.label                   "Both types of receipt">
+<!ENTITY both.accesskey               "b">
+<!ENTITY receiptArrive.label          "When a receipt arrives">
+<!ENTITY leaveIt.label                "Leave it in my Inbox">
+<!ENTITY leaveIt.accesskey            "i">
 <!-- LOCALIZATION NOTE moveToSent.label Translate: 'Sent Mail' according to Netscape glossary -->
-<!ENTITY moveToSent.label "Move it to my Sent Mail folder">
-<!ENTITY requestMDN.label " When I receive a message and the sender requested a receipt (MDN)">
-<!ENTITY returnSome.label "Return receipts for some messages">
-<!ENTITY never.label "Never return a receipt">
-<!ENTITY custom.label "Customize...">
+<!ENTITY moveToSent.label             "Move it to my Sent Mail folder">
+<!ENTITY moveToSent.accesskey         "m">
+<!ENTITY requestMDN.label             "When I receive a message and the sender requested a receipt (MDN)">
+<!ENTITY returnSome.label             "Return receipts for some messages">
+<!ENTITY returnSome.accesskey         "r">
+<!ENTITY never.label                  "Never return a receipt">
+<!ENTITY never.accesskey              "n">
+<!ENTITY custom.label                 "Customize...">
+<!ENTITY custom.accesskey             "c">
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd
new file mode 100644
index 00000000000..3790657b5b4
--- /dev/null
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/pref-viewing_messages.dtd
@@ -0,0 +1,50 @@
+<!--
+The contents of this file are subject to the Netscape Public
+License Version 1.1 (the "License"); you may not use this file
+except in compliance with the License. You may obtain a copy of
+the License at http://www.mozilla.org/NPL/
+
+Software distributed under the License is distributed on an "AS
+IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+implied. See the License for the specific language governing
+rights and limitations under the License.
+
+The Original Code is Mozilla Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+--> 
+
+<!ENTITY pane.title                       "Viewing Messages">
+<!ENTITY pane.description                 "Settings for message display">
+<!ENTITY textBegin.label                  "Quoted plain text appearance">
+<!ENTITY style.label                      "Style:">
+<!ENTITY style.accesskey                  "y">
+<!ENTITY regular.label                    "Regular">
+<!ENTITY bold.label                       "Bold">
+<!ENTITY italic.label                     "Italic">
+<!ENTITY boldItalic.label                 "Bold Italic">
+<!ENTITY size.label                       "Size:">
+<!ENTITY size.accesskey                   "z">
+<!ENTITY regular.label                    "Regular">
+<!ENTITY bigger.label                     "Bigger">
+<!ENTITY smaller.label                    "Smaller">
+<!ENTITY color.label                      "Color:">
+<!ENTITY color.accesskey                  "c">
+<!ENTITY displayWidth.label               "Display plain text messages and articles with">
+<!ENTITY fixedWidth.label                 "Fixed width font">
+<!ENTITY fixedWidth.accesskey             "x">
+<!ENTITY variableWidth.label              "Variable width font">
+<!ENTITY variableWidth.accesskey          "v">
+<!ENTITY readingMessagesHeader.label      "For incoming messages">
+<!ENTITY messageWrapping.label            "Message Wrapping">
+<!ENTITY wrapInMsg.label                  "Wrap plain text messages to fit window width">
+<!ENTITY wrapInMsg.accesskey              "w">
+<!-- LOCALIZATION NOTE : (emoticonsAndStructs.label) 'Emoticons' are also known as 'Smileys', e.g. :-)   -->
+<!ENTITY convertEmoticons.label           "Convert emoticons to graphics.">
+<!ENTITY convertEmoticons.accesskey       "c">
+<!ENTITY convertStructs.label             "Add html styles to structured phrases. For example, format text contained within asterisks as bold.">
+<!ENTITY convertStructs.accesskey         "s">
diff --git a/mozilla/mailnews/base/prefs/resources/locale/en-US/prefs.properties b/mozilla/mailnews/base/prefs/resources/locale/en-US/prefs.properties
index fd13473743d..43d405b3531 100644
--- a/mozilla/mailnews/base/prefs/resources/locale/en-US/prefs.properties
+++ b/mozilla/mailnews/base/prefs/resources/locale/en-US/prefs.properties
@@ -17,7 +17,6 @@
 #
 # Contributor(s): 
 #	Seth Spitzer <sspitzer@netscape.com>
-# Alec Flett <alecf@netscape.com>     
 #
 
 #
@@ -34,9 +33,3 @@ enterValidHostname=Please enter a valid hostname.
 failedDeleteAccount=Failed to delete this account.
 failedDuplicateAccount=Failed to duplicate this account.
 confirmDeleteAccount=Are you sure you want to delete this account?
-
-# account manager stuff
-prefPanel-server=Server
-prefPanel-copies=Copies and Folders
-prefPanel-advanced=Advanced
-prefPanel-smtp=Outgoing (SMTP) Server
diff --git a/mozilla/mailnews/base/prefs/resources/skin/MANIFEST b/mozilla/mailnews/base/prefs/resources/skin/MANIFEST
index 97f30e892a8..7f8e2258cc7 100644
--- a/mozilla/mailnews/base/prefs/resources/skin/MANIFEST
+++ b/mozilla/mailnews/base/prefs/resources/skin/MANIFEST
@@ -22,6 +22,7 @@
 
 AccountManager.css
 accounttree.css
+pref-mailnews.css
 wizard.css
 winclassic.gif
 winwide.gif
diff --git a/mozilla/mailnews/base/prefs/resources/skin/Makefile.in b/mozilla/mailnews/base/prefs/resources/skin/Makefile.in
index 6ef6fcadd5c..4ece75b85dd 100644
--- a/mozilla/mailnews/base/prefs/resources/skin/Makefile.in
+++ b/mozilla/mailnews/base/prefs/resources/skin/Makefile.in
@@ -30,6 +30,7 @@ SAMPLES_DIR	= $(DIST)/bin/chrome/messenger/skin
 
 EXPORT_RESOURCE_SAMPLES = \
 		AccountManager.css \
+		pref-mailnews.css \
 		wizard.css \
 		winclassic.gif \
 		winwide.gif \
diff --git a/mozilla/mailnews/base/prefs/resources/skin/makefile.win b/mozilla/mailnews/base/prefs/resources/skin/makefile.win
index 9cb6bc3e5cc..48ab37bc273 100644
--- a/mozilla/mailnews/base/prefs/resources/skin/makefile.win
+++ b/mozilla/mailnews/base/prefs/resources/skin/makefile.win
@@ -26,12 +26,14 @@ include <$(DEPTH)\config\rules.mak>
 install:: 
 	$(MAKE_INSTALL) accounttree.css		$(DIST)\bin\chrome\messenger\skin
 	$(MAKE_INSTALL) AccountManager.css	$(DIST)\bin\chrome\messenger\skin
+	$(MAKE_INSTALL) pref-mailnews.css		$(DIST)\bin\chrome\messenger\skin
 	$(MAKE_INSTALL) wizard.css		$(DIST)\bin\chrome\messenger\skin
 	$(MAKE_INSTALL) winclassic.gif	$(DIST)\bin\chrome\messenger\skin
 	$(MAKE_INSTALL) winwide.gif	$(DIST)\bin\chrome\messenger\skin
 
 clobber::
 	rm -f $(DIST)\chrome\messenger\skin\accounttree.css
+	rm -f $(DIST)\chrome\messenger\skin\pref-mailnews.css
 	rm -f $(DIST)\chrome\messenger\skin\wizard.css
 	rm -f $(DIST)\chrome\messenger\skin\winclassic.gif
 	rm -f $(DIST)\chrome\messenger\skin\winwide.gif
diff --git a/mozilla/mailnews/base/prefs/resources/skin/pref-mailnews.css b/mozilla/mailnews/base/prefs/resources/skin/pref-mailnews.css
new file mode 100644
index 00000000000..a0d7c91dbd5
--- /dev/null
+++ b/mozilla/mailnews/base/prefs/resources/skin/pref-mailnews.css
@@ -0,0 +1,10 @@
+
+#classic
+  {
+    list-style-image : url("chrome://messenger/skin/winclassic.gif");
+  }
+
+#wide
+  {
+    list-style-image : url("chrome://messenger/skin/winwide.gif");
+  }
\ No newline at end of file
diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index 73a5051a303..5525da99d09 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -159,7 +159,7 @@ Rights Reserved.
 			<menuitem value="&folderPropsCmd.label;" disabled="true" oncommand="MsgFolderProperties();"/>
 			<menuseparator/>
 			<menuitem value="&accountManagerCmd.label;" oncommand="MsgAccountManager();"/>
-			<menuitem id="menu_preferences" oncommand="goPreferences('messenger.xul', 'chrome://messenger/content/pref-mailnews.xul')"/>
+			<menuitem id="menu_preferences" oncommand="goPreferences('messenger.xul', 'chrome://messenger/content/pref-mailnews.xul','mailnews')"/>
 		</menupopup>
 	</menu>
 
diff --git a/mozilla/mailnews/compose/prefs/resources/content/MANIFEST b/mozilla/mailnews/compose/prefs/resources/content/MANIFEST
index 2b6ae05a7e1..063b0e3c1cf 100644
--- a/mozilla/mailnews/compose/prefs/resources/content/MANIFEST
+++ b/mozilla/mailnews/compose/prefs/resources/content/MANIFEST
@@ -20,5 +20,5 @@
 # This is a list of local files which get copied to the res\mailnews\messenger directory
 #
 
-pref-messages.xul
+pref-composing_messages.xul
 pref-formatting.xul
diff --git a/mozilla/mailnews/compose/prefs/resources/content/Makefile.in b/mozilla/mailnews/compose/prefs/resources/content/Makefile.in
index 331100b3e5e..4eb99786e59 100644
--- a/mozilla/mailnews/compose/prefs/resources/content/Makefile.in
+++ b/mozilla/mailnews/compose/prefs/resources/content/Makefile.in
@@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 SAMPLES_DIR	= $(DIST)/bin/chrome/messenger/content/messengercompose
 
 EXPORT_RESOURCE_SAMPLES = \
-		pref-messages.xul \
+		pref-composing_messages.xul \
 		pref-formatting.xul \
 		$(NULL)
 
diff --git a/mozilla/mailnews/compose/prefs/resources/content/makefile.win b/mozilla/mailnews/compose/prefs/resources/content/makefile.win
index fcdc30611cf..95c658d53a5 100644
--- a/mozilla/mailnews/compose/prefs/resources/content/makefile.win
+++ b/mozilla/mailnews/compose/prefs/resources/content/makefile.win
@@ -25,9 +25,9 @@ MODULE=msgcompo
 include <$(DEPTH)\config\rules.mak>
 
 install:: 
-	$(MAKE_INSTALL) pref-messages.xul $(DIST)\bin\chrome\messenger\content\messengercompose
+	$(MAKE_INSTALL) pref-composing_messages.xul $(DIST)\bin\chrome\messenger\content\messengercompose
 	$(MAKE_INSTALL) pref-formatting.xul $(DIST)\bin\chrome\messenger\content\messengercompose
 
 clobber::
-	rm -f $(DIST)\chrome\messenger\content\messengercompose\pref-messages.xul
+	rm -f $(DIST)\chrome\messenger\content\messengercompose\pref-composing_messages.xul
 	rm -f $(DIST)\chrome\messenger\content\messengercompose\pref-formatting.xul
diff --git a/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.xul b/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
new file mode 100644
index 00000000000..a0bd1ed4e01
--- /dev/null
+++ b/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
+<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+
+<!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/pref-composing_messages.dtd">
+
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="parent.initPanel('chrome://messenger/content/messengercompose/pref-composing_messages.xul');"
+        orient="vertical"
+        class="color-dialog">
+    
+  <script language="JavaScript">
+  <![CDATA[
+    var _elementIDs = ["forwardMessageMode", "autoQuote", "replyOnTop", "spellCheckBeforeSend", "sendStruct", "wrapLength", "strictlyMime"];
+    
+    function Startup()
+    {
+      doEnabling();
+    }
+    
+    function doEnabling()
+    {
+      var quotebox = document.getElementById("thenBox");
+      var quotecheck = document.getElementById("autoQuote");
+      if( quotecheck.checked ) {
+        quotebox.firstChild.removeAttribute("disabled");
+        quotebox.lastChild.removeAttribute("disabled");
+      }
+      else {
+        quotebox.firstChild.setAttribute("disabled","true");
+        quotebox.lastChild.setAttribute("disabled","true");
+      }
+    }
+  ]]>
+  </script>  
+    
+  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
+
+	<titledbox orient="vertical">
+		<title><text value="&forwardReply.label;"/></title>
+		
+    <box autostretch="never">
+      <text class="label" value="&forwardMsg.label;" accesskey="&forwardMsg.accesskey;"/>
+      <menulist id="forwardMessageMode" 
+                pref="true" preftype="int" prefstring="mail.forward_message_mode"
+                prefattribute="data">
+        <menupopup>
+          <menuitem data="0" value="&asAttachment.label;" accesskey="&asAttachment.accesskey;"/>
+          <menuitem data="1" value="&quoted.label;" accesskey="&quoted.accesskey;"/>
+          <menuitem data="2" value="&inline.label;" accesskey="&inline.accesskey;"/>
+        </menupopup>
+      </menulist>
+    </box>
+    
+    <checkbox id="autoQuote" value="&autoQuote.label;" accesskey="&autoQuote.accesskey;" 
+              pref="true" preftype="bool" prefstring="mail.auto_quote"
+              prefattribute="checked" oncommand="doEnabling();"/>		
+    <box class="indent" autostretch="never" id="thenBox">
+      <text class="label" value="&then.label;" accesskey="&then.accesskey;" for="replyOnTop"/>
+      <menulist id="replyOnTop" pref="true" preftype="int" prefstring="mailnews.reply_on_top"
+                prefattribute="data">
+        <menupopup>
+          <menuitem data="1" value="&aboveQuote.label;" accesskey="&aboveQuote.accesskey;"/>
+          <menuitem data="0" value="&belowQuote.label;" accesskey="&belowQuote.accesskey;"/>
+          <menuitem data="2" value="&selectAndAboveQuote.label;" accesskey="&selectAndAboveQuote.accesskey;"/>
+          <menuitem data="3" value="&selectAndBelowQuote.label;" accesskey="&selectAndBelowQuote.accesskey;"/>
+        </menupopup>
+      </menulist>        
+    </box>
+  </titledbox>
+
+	<!-- Composing Mail -->
+	<titledbox orient="vertical" autostretch="never">
+		<title><text value="&sendingMessagesHeader.label;"/></title>
+        
+    <checkbox id="spellCheckBeforeSend" value="&spellCheck.label;" accesskey="&spellCheck.accesskey;"
+              pref="true" preftype="bool" prefstring="mail.SpellCheckBeforeSend"
+              prefattribute="checked"/>
+    <checkbox id="sendStruct" value="&convertStructs.label;" accesskey="&convertStructs.accesskey;"
+              pref="true" preftype="bool" prefstring="mail.send_struct"
+              prefattribute="checked"/>
+  </titledbox>
+              
+  <titledbox autostretch="never">
+    <title><text value="&messageWrapping.label;"/></title>
+    <text class="label" value="&wrapOutMsg.label;" accesskey="&wrapOutMsg.accesskey;" for="wrapLength"/>
+    <textfield id="wrapLength" size="3" pref="true" preftype="int"
+               prefstring="mailnews.wraplength" prefattribute="value"/>
+    <text class="label" value="&char.label;"/>
+  </titledbox>
+    
+  <titledbox orient="vertical">
+    <title><text value="&use8Bits.label;"/></title>
+    <radiogroup id="strictlyMime" orient="vertical" autostretch="never"
+                pref="true" preftype="bool" prefstring="mail.strictly_mime"
+                prefattribute="data">
+      <radio data="false" value="&asIs.label;" accesskey="&asIs.accesskey;"/>
+      <radio data="true" value="&useMIME.label;" accesskey="&useMIME.accesskey;"/>
+    </radiogroup>                
+	</titledbox>
+
+</window>
diff --git a/mozilla/mailnews/compose/prefs/resources/content/pref-formatting.xul b/mozilla/mailnews/compose/prefs/resources/content/pref-formatting.xul
index 4452a8733aa..95114f9715f 100644
--- a/mozilla/mailnews/compose/prefs/resources/content/pref-formatting.xul
+++ b/mozilla/mailnews/compose/prefs/resources/content/pref-formatting.xul
@@ -6,45 +6,34 @@
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/pref-formatting.dtd">
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
-		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-		onload="if (parent.handle) parent.handle.onpageload('pref-formatting'); else parent.queuedTag='pref-formatting';"
-		align="vertical"
-		class="dialog">
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        onload="parent.initPanel('chrome://messenger/content/messengercompose/pref-formatting.xul');"
+        orient="vertical"
+        class="color-dialog">
 
-  <box type="smallheader" title="&pane.title;" description="&pane.description;"/>
-	<titledbox orient="vertical">
-		<html:div class="vertical-gap">&sendMail.label;</html:div>
-		<spring class="vgap"/>
+  <script language="javascript">
+  <![CDATA[
+    var _elementIDs = ["mailDefaultHTMLAction"];
+  ]]>
+  </script>  
+    
+  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
 
-		<html:div>
-			<html:input pref="true" preftype="int" prefstring="mail.default_html_action" prefindex="0" id="mail.default_html_action0" class="indent" name="recipients" type="radio"/>
-   			<html:label for="mail.default_html_action0">&askMe.label;</html:label>
-            <html:br/>
-  		    <html:label for="mail.default_html_action0" class="indent-second-label">&askMe2.label;</html:label>
-		</html:div>
+  <titledbox orient="vertical">
+    <title><html>&sendMail.label;</html></title>
 
-		<html:div>
-			<html:input pref="true" preftype="int" prefstring="mail.default_html_action" prefindex="1" id="mail.default_html_action1" class="indent" name="recipients" type="radio"/>
-			<html:label for="mail.default_html_action1">&convertPlain.label;</html:label>
-			<html:br/>
-			<html:label for="mail.default_html_action1" class="indent-second-label">&convertPlain2.label;</html:label>
-		</html:div>
+    <radiogroup id="mailDefaultHTMLAction" orient="vertical" autostretch="never"
+                pref="true" preftype="int" prefstring="mail.default_html_action"
+                prefattribute="data">
+      <radio data="0" value="&askMe.label;" accesskey="&askMe.accesskey;"/>
+      <radio data="1" value="&convertPlain.label;" accesskey="&convertPlain.accesskey;"/>                
+      <radio data="2" value="&sendHTML.label;" accesskey="&sendHTML.accesskey;"/>
+      <radio data="3" value="&sendBoth.label;" accesskey="&sendBoth.accesskey;"/>
+    </radiogroup>
+    
+    <separator/>
 
-		<html:div>
-			<html:input pref="true" preftype="int" prefstring="mail.default_html_action" prefindex="2" id="mail.default_html_action2" class="indent" name="recipients" type="radio"/>
-			<html:label for="mail.default_html_action2">&sendHTML.label;</html:label>
-			<html:br/>
-			<html:label for="mail.default_html_action2" class="indent-second-label">&sendHTML2.label;</html:label>
-		</html:div>
-
-		<html:div>
-			<html:input pref="true" preftype="int" prefstring="mail.default_html_action" prefindex="3" id="mail.default_html_action3" class="indent" name="recipients" type="radio"/>
-			<html:label for="pref:3:int:mail.default_html_action3">&sendBoth.label;</html:label>
-			<html:br/>
-			<html:label for="mail.default_html_action3" class="indent-second-label">&sendBoth2.label;</html:label>
-		</html:div>
-
-		<html:div class="vertical-gap">&override.label;</html:div>
-	</titledbox>
+    <html>&override.label;</html>
+  </titledbox>
 
 </window>
diff --git a/mozilla/mailnews/compose/prefs/resources/content/pref-messages.xul b/mozilla/mailnews/compose/prefs/resources/content/pref-messages.xul
index 95727414bc6..16009beb997 100644
--- a/mozilla/mailnews/compose/prefs/resources/content/pref-messages.xul
+++ b/mozilla/mailnews/compose/prefs/resources/content/pref-messages.xul
@@ -1,155 +1,89 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
+<?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/pref-messages.dtd">
+<!DOCTYPE window SYSTEM "chrome://messengercompose/locale/pref-messages.dtd">
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-		onload="if (parent.handle) parent.handle.onpageload('pref-messages'); else parent.queuedTag='pref-messages';"
-		align="vertical"
-		class="dialog">
+		onload="parent.initPanel('chrome://messengercompose/content/pref-messages.xul');"
+		orient="vertical"
+		class="color-dialog">
     
-  <box type="smallheader" title="&pane.title;" description="&pane.description;"/>
+  <box class="box-smallheader" title="&pane.title;" description="&pane.description;"/>
 
 	<titledbox orient="vertical">
-		<title>
-			<text value="&forwardReply.label;"/>
-		</title>
+		<title><text value="&forwardReply.label;"/></title>
 		
-		<html:div>
-			<html:label for="mail.forward_message_mode">&forwardMsg.label;</html:label>
-			<html:select pref="true" preftype="int" prefstring="mail.forward_message_mode" id="mail.forward_message_mode">
-				<html:option value="0" label="&asAttachment.label;"/>
-				<html:option value="2" label="&inline.label;"/>
-			</html:select>
-		</html:div>
-		
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mail.auto_quote" id="mail.auto_quote" type="checkbox"/>
-			<html:label for="mail.auto_quote">&autoQuote.label;</html:label>
-		</html:div>
-
-		<html:div>
-			<html:label for="mailnews.reply_on_top">&then.label;</html:label>
-			<html:select pref="true" preftype="int" prefstring="mailnews.reply_on_top" id="mailnews.reply_on_top">
-				<html:option value="1" label="&aboveQuote.label;"/>
-				<html:option value="0" label="&belowQuote.label;"/>
-				<html:option value="2" label="&selectAndAboveQuote.label;"/>
-				<html:option value="3" label="&selectAndBelowQuote.label;"/>
-			</html:select>
-		</html:div>
-	</titledbox>
+    <box autostretch="never">
+      <text class="label" value="&forwardMsg.label;" accesskey="&forwardMsg.accesskey;"/>
+      <menulist id="forwardMessageMode" 
+                pref="true" preftype="int" prefstring="mail.forward_message_mode"
+                prefattribute="data">
+        <menupopup>
+          <menuitem data="0" value="&asAttachment.label;" accesskey="&asAttachment.accesskey;"/>
+          <menuitem data="1" value="&quoted.label;" accesskey="&quoted.accesskey;"/>
+          <menuitem data="2" value="&inline.label;" accesskey="&inline.accesskey;"/>
+        </menupopup>
+      </menulist>
+    </box>
+    
+    <checkbox id="autoQuote" value="&autoQuote.label;" accesskey="&autoQuote.accesskey;" 
+              pref="true" preftype="bool" prefstring="mail.auto_quote"
+              prefattribute="checked"/>		
+    <box autostretch="never">
+      <text class="label" value="&then.label;" accesskey="&then.accesskey;" for="replyOnTop"/>
+      <menulist id="replyOnTop" pref="true" preftype="int" prefstring="mailnews.reply_on_top"
+                prefattribute="data">
+        <menupopup>
+          <menuitem data="1" value="&aboveQuote.label;" accesskey="&aboveQuote.accesskey;"/>
+          <menuitem data="0" value="&belowQuote.label;" accesskey="&belowQuote.accesskey;"/>
+          <menuitem data="2" value="&selectAndAboveQuote.label;" accesskey="&selectAndAboveQuote.accesskey;"/>
+          <menuitem data="3" value="&selectAndBelowQuote.label;" accesskey="&selectAndBelowQuote.accesskey;"/>
+        </menupopup>
+      </menulist>        
+    </box>
+  </titledbox>
 
 	<!-- Reading -->
-	<titledbox orient="vertical">
-		<title>
-			<text value="&readingMessagesHeader.label;"/>
-        </title>
+	<titledbox orient="vertical" autostretch="never">
+		<title><text value="&readingMessagesHeader.label;"/></title>
 
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mail.wrap_long_lines" id="mail.wrap_long_lines" type="checkbox"/>
-			<html:label for="mail.wrap_long_lines">&wrapInMsg.label;</html:label>
-		</html:div>
-		
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mail.display_glyph" id="mail.display_glyph" type="checkbox"/>
-			<html:label for="mail.display_glyph" style="vertical-align: bottom">&convertEmoticons.label1;<html:img src="chrome://messenger/skin/smile.gif" style="vertical-align: bottom"/>&convertEmoticons.label2;</html:label>
-		</html:div>
-		
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mail.display_struct" id="mail.display_struct" type="checkbox"/>
-			<html:label for="mail.display_struct">&convertStructs.label1;</html:label>
-		</html:div>
-		<html:label for="mail.display_struct" class="indent-second-label">&convertStructs.label2;<html:b>&convertStructs.label3;</html:b>&convertStructs.label4;</html:label>
-	
-		<html:div>
-			<html:label for="mailnews.view_default_charset">&viewDefaultCharset.label;</html:label>
-			<html:select pref="true" preftype="string" prefstring="mailnews.view_default_charset" id="mailnews.view_default_charset">
-				<html:option value="ISO-8859-1" label="&defaultCharset1.label;"/>
-				<html:option value="ISO-8859-2" label="&defaultCharset2.label;"/>
-				<html:option value="ISO-8859-3" label="&defaultCharset3.label;"/>
-				<html:option value="ISO-8859-4" label="&defaultCharset4.label;"/>
-				<html:option value="ISO-8859-9" label="&defaultCharset5.label;"/>
-				<html:option value="ISO-8859-10" label="&defaultCharset6.label;"/>
-				<html:option value="ISO-8859-14" label="&defaultCharset7.label;"/>
-				<html:option value="ISO-8859-15" label="&defaultCharset8.label;"/>
-				<html:option value="ISO-2022-JP" label="&defaultCharset9.label;"/>
-				<html:option value="Big5" label="&defaultCharset10.label;"/>
-				<html:option value="GB2312" label="&defaultCharset11.label;"/>
-				<html:option value="EUC-KR" label="&defaultCharset12.label;"/>
-				<html:option value="UTF-8" label="&defaultCharset13.label;"/>
-				<html:option value="KOI8-R" label="&defaultCharset14.label;"/>
-				<html:option value="KOI8-U" label="&defaultCharset15.label;"/>
-				<html:option value="ISO-8859-7" label="&defaultCharset16.label;"/>
-				<html:option value="VISCII" label="&defaultCharset17.label;"/>
-				<html:option value="TIS-620" label="&defaultCharset18.label;"/>
-				<html:option value="ARMSCII-8" label="&defaultCharset19.label;"/>
-			</html:select>
-		</html:div>
-
-	</titledbox>
+    <checkbox id="wrapLongLines" value="&wrapInMsg.label;" accesskey="&wrapInMsg.accesskey;"
+              pref="true" preftype="bool" prefstring="mail.wrap_long_lines" 
+              prefattribute="checked"/>
+    <checkbox id="displayGlyph" value="&convertEmoticons.label;" accesskey="&convertEmoticons.accesskey;"
+              pref="true" preftype="bool" prefstring="mail.display_glyph"
+              prefattribute="checked"/>		
+    <checkbox id="displayStruct" value="&convertStructs.label;" accesskey="&convertStructs.accesskey;" 
+              pref="true" preftype="bool" prefstring="mail.display_struct"
+              prefattribute="checked"/>
+  </titledbox>
 
 	<!-- Sending -->
 	<titledbox orient="vertical">
-		<title>
-			<text value="&sendingMessagesHeader.label;"/>
-        </title>
+		<title><text value="&sendingMessagesHeader.label;"/></title>
         
-        <html:div>
-			<html:input pref="true" preftype="bool" prefstring="mail.SpellCheckBeforeSend" id="mail.SpellCheckBeforeSend" type="checkbox"/>
-			<html:label for="mail.SpellCheckBeforeSend">&spellCheck.label;</html:label>
-         </html:div>
-	
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mail.send_struct" id="mail.send_struct" type="checkbox"/>
-			<html:label for="mail.send_struct">&convertStructs.label1;</html:label>
-		</html:div>
-		<html:label for="mail.send_struct" class="indent-second-label">&convertStructs.label2;<html:b>&convertStructs.label3;</html:b>&convertStructs.label4;</html:label>
-	
-		<html:div>
-			<html:label for="mailnews.wraplength">&wrapOutMsg.label;</html:label>
-			<html:input pref="true" preftype="int" prefstring="mailnews.wraplength" id="mailnews.wraplength" name="wraplength" type="text" size="3"/>
-			<html:label for="mailnews.wraplength">&char.label;</html:label>
-		</html:div>
+    <checkbox id="spellCheckBeforeSend" value="&spellCheck.label;" accesskey="&spellCheck.accesskey;"
+              pref="true" preftype="bool" prefstring="mail.SpellCheckBeforeSend"
+              prefattribute="checked"/>
+    <checkbox id="sendStruct" value="&convertStructs.label;" accesskey="&convertStructs.accesskey;"
+              pref="true" preftype="bool" prefstring="mail.send_struct"
+              prefattribute="checked"/>
+    <box autostretch="never">
+      <text class="label" value="&wrapOutMsg.label;" accesskey="&wrapOutMsg.accesskey;" for="wrapLength"/>
+      <textfield id="wrapLength" size="3" pref="true" preftype="int"
+                 prefstring="mailnews.wraplength" prefattribute="value"/>
+      <text class="label" value="&char.label;"/>
+    </box>	
 
-		<text value="&use8Bits.label;" class="vspace"/>
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mail.strictly_mime" prefindex="false" id="mail.strictly_mime0" name="strictly_mime" type="radio"/>
-			<html:label for="mail.strictly_mime0">&asIs.label;</html:label>
-		</html:div>
-
-		<html:div>
-			<html:input pref="true" preftype="bool" prefstring="mail.strictly_mime" prefindex="true" id="mail.strictly_mime1" name="strictly_mime" type="radio"/>
-			<html:label for="mail.strictly_mime1">&useMIMEpart1.label;</html:label>
-		</html:div>
-		<html:label for="mail.strictly_mime1" class="indent-second-label">&useMIMEpart2.label;</html:label>
-
-		<html:div>
-			<html:label for="mailnews.send_default_charset">&sendDefaultCharset.label;</html:label>
-			<html:select pref="true" preftype="string" prefstring="mailnews.send_default_charset" id="mailnews.send_default_charset">
-				<html:option value="ISO-8859-1" label="&defaultCharset1.label;"/>
-				<html:option value="ISO-8859-2" label="&defaultCharset2.label;"/>
-				<html:option value="ISO-8859-3" label="&defaultCharset3.label;"/>
-				<html:option value="ISO-8859-4" label="&defaultCharset4.label;"/>
-				<html:option value="ISO-8859-9" label="&defaultCharset5.label;"/>
-				<html:option value="ISO-8859-10" label="&defaultCharset6.label;"/>
-				<html:option value="ISO-8859-14" label="&defaultCharset7.label;"/>
-				<html:option value="ISO-8859-15" label="&defaultCharset8.label;"/>
-				<html:option value="ISO-2022-JP" label="&defaultCharset9.label;"/>
-				<html:option value="Big5" label="&defaultCharset10.label;"/>
-				<html:option value="GB2312" label="&defaultCharset11.label;"/>
-				<html:option value="EUC-KR" label="&defaultCharset12.label;"/>
-				<html:option value="UTF-8" label="&defaultCharset13.label;"/>
-				<html:option value="KOI8-R" label="&defaultCharset14.label;"/>
-				<html:option value="KOI8-U" label="&defaultCharset15.label;"/>
-				<html:option value="ISO-8859-7" label="&defaultCharset16.label;"/>
-				<html:option value="VISCII" label="&defaultCharset17.label;"/>
-				<html:option value="TIS-620" label="&defaultCharset18.label;"/>
-				<html:option value="ARMSCII-8" label="&defaultCharset19.label;"/>
-			</html:select>
-		</html:div>
+    <html>&use8Bits.label;</html>
+    <radiogroup id="strictlyMime" orient="vertical" autostretch="never"
+                pref="true" preftype="bool" prefstring="mail.strictly_mime"
+                prefattribute="data">
+      <radio data="false" value="&asIs.label;" accesskey="&asIs.accesskey;"/>
+      <radio data="true" value="&useMIME.label;" accesskey="&useMIME.accesskey;"/>
+    </radiogroup>                
 	</titledbox>
 
 </window>
diff --git a/mozilla/mailnews/compose/prefs/resources/locale/en-US/MANIFEST b/mozilla/mailnews/compose/prefs/resources/locale/en-US/MANIFEST
index a83e146d306..17d7504feed 100644
--- a/mozilla/mailnews/compose/prefs/resources/locale/en-US/MANIFEST
+++ b/mozilla/mailnews/compose/prefs/resources/locale/en-US/MANIFEST
@@ -20,5 +20,5 @@
 # This is a list of local files which get copied to the res\mailnews\messenger directory
 #
 
-pref-messages.dtd
+pref-composing_messages.dtd
 pref-formatting.dtd
diff --git a/mozilla/mailnews/compose/prefs/resources/locale/en-US/Makefile.in b/mozilla/mailnews/compose/prefs/resources/locale/en-US/Makefile.in
index 115ceffb523..83e97d5dfd3 100644
--- a/mozilla/mailnews/compose/prefs/resources/locale/en-US/Makefile.in
+++ b/mozilla/mailnews/compose/prefs/resources/locale/en-US/Makefile.in
@@ -29,7 +29,7 @@ include $(DEPTH)/config/autoconf.mk
 SAMPLES_DIR	= $(DIST)/bin/chrome/messenger/locale/messengercompose
 
 EXPORT_RESOURCE_SAMPLES = \
-		pref-messages.dtd \
+		pref-composing_messages.dtd \
 		pref-formatting.dtd \
 		$(NULL)
 
diff --git a/mozilla/mailnews/compose/prefs/resources/locale/en-US/makefile.win b/mozilla/mailnews/compose/prefs/resources/locale/en-US/makefile.win
index 7caa4ada3cc..500974725eb 100644
--- a/mozilla/mailnews/compose/prefs/resources/locale/en-US/makefile.win
+++ b/mozilla/mailnews/compose/prefs/resources/locale/en-US/makefile.win
@@ -26,9 +26,9 @@ include <$(DEPTH)\config\rules.mak>
 DISTBROWSER=$(DIST)\bin\chrome\messenger\locale\messengercompose
 
 install::
-	$(MAKE_INSTALL) pref-messages.dtd $(DISTBROWSER)
+	$(MAKE_INSTALL) pref-composing_messages.dtd $(DISTBROWSER)
 	$(MAKE_INSTALL) pref-formatting.dtd $(DISTBROWSER)
 
 clobber::
-	rm -f $(DIST)\bin\chrome\messenger\locale\messengercompose\pref-messages.dtd
+	rm -f $(DIST)\bin\chrome\messenger\locale\messengercompose\pref-composing_messages.dtd
 	rm -f $(DIST)\bin\chrome\messenger\locale\messengercompose\pref-formatting.dtd
diff --git a/mozilla/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd b/mozilla/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd
new file mode 100644
index 00000000000..6d08f722130
--- /dev/null
+++ b/mozilla/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd
@@ -0,0 +1,62 @@
+<!--
+The contents of this file are subject to the Netscape Public
+License Version 1.1 (the "License"); you may not use this file
+except in compliance with the License. You may obtain a copy of
+the License at http://www.mozilla.org/NPL/
+
+Software distributed under the License is distributed on an "AS
+IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+implied. See the License for the specific language governing
+rights and limitations under the License.
+
+The Original Code is Mozilla Communicator client code, released
+March 31, 1998.
+
+The Initial Developer of the Original Code is Netscape
+Communications Corporation. Portions created by Netscape are
+ Copyright (C) 1998-1999 Netscape Communications Corporation. All
+Rights Reserved.
+--> 
+
+<!ENTITY pane.title                           "Composing Messages">
+<!ENTITY pane.description                     "Composing mail messages">
+<!ENTITY forwardReply.label                   "Forwarding and replying to messages">
+<!ENTITY forwardMsg.label                     "Forward messages:">
+<!ENTITY forwardMsg.accesskey                 "f">
+<!ENTITY inline.label                         "Inline">
+<!ENTITY inline.accesskey                     "i">
+<!ENTITY quoted.label                         "Quoted">
+<!ENTITY quoted.accesskey                     "q">
+<!ENTITY asAttachment.label                   "As Attachment">
+<!ENTITY asAttachment.accesskey               "a">
+<!ENTITY autoQuote.label                      "Automatically quote the original message when replying">
+<!ENTITY autoQuote.accesskey                  "u">
+<!ENTITY then.label                           "then,">
+<!ENTITY then.accesskey                       "h">
+<!ENTITY aboveQuote.label                     "start my reply above the quoted text">
+<!ENTITY aboveQuote.accesskey                 "v">
+<!ENTITY belowQuote.label                     "start my reply below the quoted text">
+<!ENTITY belowQuote.accesskey                 "b">
+<!ENTITY selectAndAboveQuote.label            "start my reply above, and select the quoted text">
+<!ENTITY selectAndAboveQuote.accesskey        "e">
+<!ENTITY selectAndBelowQuote.label            "start my reply below, and select the quoted text">
+<!ENTITY selectAndBelowQuote.accesskey        "r">
+
+<!ENTITY readingMessagesHeader.label          "For incoming messages">
+<!ENTITY messageWrapping.label                "Message Wrapping">
+<!ENTITY wrapInMsg.label                      "Wrap plain text messages to fit window width">
+<!ENTITY wrapInMsg.accesskey                  "w">
+<!ENTITY convertStructs.label                 "Add html styles to structured phrases. For example, format text contained within asterisks as bold.">
+<!ENTITY convertStructs.accesskey             "s">
+
+<!ENTITY sendingMessagesHeader.label          "For outgoing messages">
+<!ENTITY spellCheck.label                     "Check spelling before sending">
+<!ENTITY spellCheck.accesskey                 "p">
+<!ENTITY wrapOutMsg.label                     "Wrap plain text messages at">
+<!ENTITY wrapOutMsg.accesskey                 "l">
+<!ENTITY char.label                           "characters">
+<!ENTITY use8Bits.label                       "Send messages that use 8-bit characters">
+<!ENTITY asIs.label                           "As is (does not work well with some mail servers)">
+<!ENTITY asIs.accesskey                       "t">
+<!ENTITY useMIME.label                        "Using the 'quoted printable' MIME encoding (does not work well with some mail or newsgroups readers)">
+<!ENTITY useMIME.accesskey                    "m">
diff --git a/mozilla/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd b/mozilla/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd
index 637d2e46fbe..9520a1922ee 100644
--- a/mozilla/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd
+++ b/mozilla/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd
@@ -18,15 +18,15 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 
 
-<!ENTITY pane.title "Formatting">
-<!ENTITY pane.description "Message formatting">
-<!ENTITY sendMail.label "When sending HTML mail messages to recipients who are not listed as being able to receive them:">
-<!ENTITY askMe.label "Ask me what to do if the message has HTML formatting,">
-<!ENTITY askMe2.label "otherwise send plain text">
-<!ENTITY convertPlain.label "Convert the message into plain text">
-<!ENTITY convertPlain2.label "(may lose some formatting)">
-<!ENTITY sendHTML.label "Send the message in HTML anyway">
-<!ENTITY sendHTML2.label "(some recipients may not be able to read it)">
-<!ENTITY sendBoth.label "Send the message in plain text and HTML">
-<!ENTITY sendBoth2.label "(uses more disk space)">
-<!ENTITY override.label "You can override these settings in any message through the options panel of the message composition window.">
+<!ENTITY pane.title                   "Formatting">
+<!ENTITY pane.description             "Message formatting">
+<!ENTITY sendMail.label               "When sending HTML mail messages to recipients who are not listed as being able to receive them:">
+<!ENTITY askMe.label                  "Ask me what to do if the message has HTML formatting, otherwise send plain text">
+<!ENTITY askMe.accesskey              "a">
+<!ENTITY convertPlain.label           "Convert the message into plain text (may lose some formatting)">
+<!ENTITY convertPlain.accesskey       "p">
+<!ENTITY sendHTML.label               "Send the message in HTML anyway (some recipients may not be able to read it)">
+<!ENTITY sendHTML.accesskey           "h">
+<!ENTITY sendBoth.label               "Send the message in plain text and HTML (uses more disk space)">
+<!ENTITY sendBoth.accesskey           "s">
+<!ENTITY override.label               "You can override these settings in any message through the options panel of the message composition window.">