Fix for 18018, mail prefs messed up. r=davidm

1999-11-29 21:38:32 +00:00 · 1999-11-29 21:38:32 +00:00 · 1f11af9677
--- a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
@ -5,75 +5,115 @@

 <window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-		onload="StartUp('Mailnews-Main')" >
+		onload="StartUp('Mailnews-Main')"
+        class="dialog"
+		align="vertical">

-<html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>
+	<box class="header" align="horizontal">
+		<html:div class="left-header-text">&pane.title;</html:div>
+		<spring flex="100%"/>
+		<html:div class="right-header-text">&pane.description;</html:div>
+	</box>

-<html:div flex="100%">
-	<html:div id="top">
-		<html:span id="lefttext">&pane.title;</html:span>
-	</html:div>
-
-<html:form>
-<box align="vertical" style="width: 100%;">
-<html:fieldset style="width: 100%;">
-<html:legend align="left">
-<html:div>&pinpoint.label;</html:div>
-</html:legend>
-	<html:table>
-	<html:tr><html:td>&lookFor.label;</html:td></html:tr>
-		<html:tr><html:td>
-			<html:input type="checkbox"/>
-			<html:label>&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>
+	<html:fieldset>
+		<html:legend align="left">
+			<html:div>&pinpoint.label;</html:div>
+		</html:legend>
+			
+		<html:div>&lookFor.label;</html:div>
+		
+		<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:option>&nsbook.label;</html:option>
+				<html:option>&nsbook.label;</html:option>
 			</html:select>
-		</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:fieldset>
-</box>
-</html:form>
+		</html:div>
+		
+		<html:div class="vertical-gap">&mulFound.label;</html:div>

-<html:form>
-<box align="vertical" style="width: 100%;">
-<html:fieldset style="width: 100%;">
-<html:legend align="left">
-<html:div>&displayFullname.label;</html:div>
-</html:legend>
+		<html:div>
+			<html:input id="showList" name="multilist" type="radio" class="indent"/>
+			<html:label for="showList">&showList.label;</html:label>
+		</html:div>
+		
+		<html:div>
+			<html:input id="acceptList" name="multilist" type="radio" class="indent"/>
+			<html:label for="acceptList">&acceptList.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>
+				<html:select>
+				<html:option>&nsbook.label;</html:option>
+				</html:select>
+			</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:fieldset>

-	<html:table>
-		<html:tr><html:td>
-			<html:input name="displayname" type="radio" id="pref:0:int:mail.addr_book.lastnamefirst" checked="true"/>
-			<html:label>&useDisplayName.label;</html:label>
-		</html:td></html:tr>
-		<html:tr><html:td>
-			<html:input name="displayname" type="radio" id="pref:1:int:mail.addr_book.lastnamefirst"/>
-			<html:label>&useLastFirst.label;</html:label>
-		</html:td></html:tr>
-	</html:table>
-</html:fieldset>
-</box>
-</html:form>
+	<html:fieldset style="width: 100%;">
+		<html:legend align="left">
+			<html:div>&displayFullname.label;</html:div>
+		</html:legend>
+
+		<html:div>
+			<html:input id="pref:0:int:mail.addr_book.lastnamefirst" name="displayname" type="radio" checked="true"/>
+			<html:label for="pref:0:int:mail.addr_book.lastnamefirst">&useDisplayName.label;</html:label>
+		</html:div>
+		
+		<html:div>
+			<html:input id="pref:1:int:mail.addr_book.lastnamefirst" name="displayname" type="radio"/>
+			<html:label for="pref:1:int:mail.addr_book.lastnamefirst">&useLastFirst.label;</html:label>
+		</html:div>
+		
+		<!--html:table>
+			<html:tr><html:td>
+				<html:input name="displayname" type="radio" id="pref:0:int:mail.addr_book.lastnamefirst" checked="true"/>
+				<html:label>&useDisplayName.label;</html:label>
+			</html:td></html:tr>
+			<html:tr><html:td>
+				<html:input name="displayname" type="radio" id="pref:1:int:mail.addr_book.lastnamefirst"/>
+				<html:label>&useLastFirst.label;</html:label>
+			</html:td></html:tr>
+		</html:table-->
+		
+	</html:fieldset>

-</html:div>
 </window>
--- a/mailnews/addrbook/prefs/resources/locale/en-US/pref-addressing.dtd
+++ b/mailnews/addrbook/prefs/resources/locale/en-US/pref-addressing.dtd
@ -20,8 +20,9 @@ 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 lookFor.label "Look for addresses in the following:">
 <!ENTITY padCheck.label "Address Books">
 <!ENTITY dirCheck.label "Directory Server">
 <!ENTITY nsbook.label "Netscape Phonebook">
--- a/mailnews/base/prefs/resources/content/pref-diskspace.xul
+++ b/mailnews/base/prefs/resources/content/pref-diskspace.xul
@ -6,73 +6,74 @@
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        class="dialog"
-		onload="StartUp('Mailnews-Disk Space')" >
+		onload="StartUp('Mailnews-Disk Space')"
+		align="vertical">

 <html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>

-<html:div flex="100%">
-	<html:div id="top">
-		<html:span id="lefttext">&pane.title;</html:span>
-	</html:div>
+	<box class="header" align="horizontal">
+		<html:div class="left-header-text">&pane.title;</html:div>
+		<spring flex="100%"/>
+		<html:div class="right-header-text">&pane.description;</html:div>
+	</box>
+
+	<html:fieldset style="width: 100%;">
+		<html:legend align="left">
+			<html:div>&allMsg.label;</html:div>
+		</html:legend>
+		
+		<html:div>
+			<html:input id="pref:0:bool:mail.limit_message_size" type="checkbox"/>
+			<html:label for="pref:0:bool:mail.limit_message_size">&storeMsgLimit.label;</html:label>
+			<html:input name="maxsize" id="pref:string:mail.max_size" size="4" type="text"/>
+			<html:label>&kb.label;</html:label>
+		</html:div>
+		
+		<html:div>
+			<html:input id="pref:0:bool:mail.prompt_purge_threshhold" type="checkbox"/>
+			<html:label for="pref:0:bool:mail.prompt_purge_threshhold">&autoCompact.label;</html:label>
+			<html:input name="purgesize" id="pref:string:mail.purge_threshhold" size="4" type="text"/>
+			<html:label>&kb.label;</html:label>
+		</html:div>
+	</html:fieldset>
+
+	<html:fieldset style="width: 100%;">
+		<html:legend align="left">
+			<html:div>&newgroupMsgOnly.label;</html:div>
+		</html:legend>
+		
+		<html:div class="vertical-gap">&whenToClean.label;</html:div>
+
+		<html:div>
+			<html:input id="pref:1:int:news.keep.method" class="indent" name="keepmsg" type="radio"/>
+			<html:label for="pref:1:int:news.keep.method">&keepMsgs.label;</html:label>
+			<html:input name="keepdays" id="pref:string:news.keep.days" size="4" type="text"/>
+			<html:label>&days.label;</html:label>
+		</html:div>
+
+		<html:div>
+			<html:input id="pref:0:int:news.keep.method" class="indent" name="keepmsg" type="radio" checked="true"/>
+			<html:label for="pref:0:int:news.keep.method">&keepAllMsg.label;</html:label>
+		</html:div>
+
+		<html:div>
+			<html:input id="pref:2:int:news.keep.method" class="indent" name="keepmsg" type="radio"/>
+			<html:label for="pref:2:int:news.keep.method">&keepTheNewest.label;</html:label>
+			<html:input name="keepmsgcount" id="pref:string:news.keep.count" size="4" type="text"/>
+			<html:label>&messages.label;</html:label>
+		</html:div>
+
+		<html:div class="vertical-gap">
+			<html:input id="pref:0:bool:news.keep.only_unread" type="checkbox"/>
+			<html:label for="pref:0:bool:news.keep.only_unread">&keepUnread.label;</html:label>
+		</html:div>
+
+		<html:div>
+			<html:input id="pref:0:bool:news.remove_bodies.by_age" type="checkbox"/>
+			<html:label for="pref:0:bool:news.remove_bodies.by_age">&removeMsg.label;</html:label>
+			<html:input name="removedays" id="pref:string:news.remove_bodies.days" size="4" type="text"/>
+			<html:label>&days.label;</html:label>
+		</html:div>
+	</html:fieldset>

-<html:form>
-<box align="vertical" style="width: 100%;">
-<html:fieldset style="width: 100%;">
-<html:legend align="left">
-<html:div>&allMsg.label;</html:div>
-</html:legend>
-	<html:table>
-		<html:tr><html:td>
-			<html:input type="checkbox" id="pref:0:bool:mail.limit_message_size"/>
-			<html:label>&storeMsgLimit.label;</html:label>
-			<html:input name="maxsize" id="pref:string:mail.max_size" size="4"/>&kb.label;
-		</html:td></html:tr>
-		<html:tr><html:td>
-			<html:input type="checkbox" id="pref:0:bool:mail.prompt_purge_threshhold"/>
-			<html:label>&autoCompact.label;</html:label>
-			<html:input name="purgesize" id="pref:string:mail.purge_threshhold" size="4"/>&kb.label;
-		</html:td></html:tr>
-	</html:table>
-</html:fieldset>
-</box>
-</html:form>
- 
-<html:form>
-<box align="vertical" style="width: 100%;">
-<html:fieldset style="width: 100%;">
-<html:legend align="left">
-<html:div>&newgroupMsgOnly.label;</html:div>
-</html:legend>
-<html:table>
-		<html:tr><html:td><html:label>&whenToClean.label;</html:label></html:td></html:tr>
-		<html:tr><html:td>
-			<html:input name="keepmsg" type="radio" id="pref:1:int:news.keep.method"/>
-			<html:label>&keepMsgs.label;</html:label>
-			<html:input name="keepdays" id="pref:string:news.keep.days" size="4"/>&days.label;
-		</html:td></html:tr>
-		<html:tr><html:td>
-			<html:input name="keepmsg" type="radio" id="pref:0:int:news.keep.method" checked="true"/>
-			<html:label>&keepAllMsg.label;</html:label>
-		</html:td></html:tr>
-		<html:tr><html:td>
-			<html:input name="keepmsg" type="radio" id="pref:2:int:news.keep.method"/>
-			<html:label>&keepTheNewest.label;</html:label>
-			<html:input name="keepmsgcount" id="pref:string:news.keep.count" size="4"/>&messages.label;
-		</html:td></html:tr>
-		<html:tr><html:td> </html:td></html:tr>
-		<html:tr><html:td> </html:td></html:tr>
-		<html:tr><html:td>
-			<html:input type="checkbox" id="pref:0:bool:news.keep.only_unread"/>
-			<html:label>&keepUnread.label;</html:label>
-		</html:td></html:tr>
-		<html:tr><html:td>
-			<html:input type="checkbox" id="pref:0:bool:news.remove_bodies.by_age"/>
-			<html:label>&removeMsg.label;</html:label>
-			<html:input name="removedays" id="pref:string:news.remove_bodies.days" size="4"/>&days.label;
-		</html:td></html:tr>
-</html:table>
-</html:fieldset>
-</box>
-</html:form>
-</html:div>
 </window>
--- a/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mailnews/base/prefs/resources/content/pref-mailnews.xul
@ -6,90 +6,138 @@
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        class="dialog"
-		onload="StartUp('Mailnews-Main')" >
+		onload="StartUp('Mailnews-Main')"
+		align="vertical">

-<html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>
 <html:script language="javascript" src="chrome://messenger/content/pref-mailnews.js"/>

-<html:div flex="100%">
-	<html:div id="top">
-		<html:span id="lefttext">&pane.title;</html:span>
-	</html:div>
+	<box class="header" align="horizontal">
+		<html:div class="left-header-text">&pane.title;</html:div>
+		<spring flex="100%"/>
+		<html:div class="right-header-text">&pane.description;</html:div>
+	</box>

-<html:form>
-<box align="vertical" style="width: 100%;">
-<html:fieldset style="width: 100%;">
-<html:legend align="left">
-<html:div>&textBegin.label;</html:div>
-</html:legend>
-	<html:table>
-		<html:tr><html:td>&style.label;
+	<html:fieldset>
+		<html:legend align="left">
+			<html:div>&textBegin.label;</html:div>
+		</html:legend>
+		
+		<html:div>
+			<html:label for="pref:int:mail.quoted_style">&style.label;</html:label>
 			<html:select id="pref:int: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:td></html:tr>
-		<html:tr><html:td>&size.label;
-			<html:select id="pref:int:mail.quoted_style">
+		</html:div>
+
+		<html:div>
+			<html:label for="pref:int:mail.quoted_size">&size.label;</html:label>
+
+			<html:select id="pref:int: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:td></html:tr>
-		<html:tr><html:td>
-<!-- heeding and setting the "mail.citation_color" pref still needs work... -->
+		</html:div>
+
+		<!-- heeding and setting the "mail.citation_color" pref still needs work... -->
 		<menu>
+			<titledbutton value="&color.label;" class="popup" align="right"/> 
+			<html:div style="width:30px; background-color:white"/>
+			<menupopup>
+				<colorpicker palettename="standard" onclick="setColorWell(this.parentNode.parentNode);"/>
+			</menupopup>
+        </menu>  
+		
+		<!--html:table>
+			<html:tr><html:td>&style.label;
+				<html:select id="pref:int: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:td></html:tr>
+			<html:tr><html:td>&size.label;
+				<html:select id="pref:int:mail.quoted_style">
+					<html:option value="0" label="&regular.label;"/>
+					<html:option value="1" label="&bigger.label;"/>
+					<html:option value="2" label="&smaller.label;"/>
+				</html:select>
+			</html:td></html:tr>
+			<html:tr><html:td>
+			<menu>
 				<titledbutton value="&color.label;" class="popup" align="right"/> 
-                                <html:div style="width:30px; background-color:white"/>
-                                <menupopup>
-                                        <colorpicker palettename="standard" onclick="setColorWell(this.parentNode.parentNode);"/>
-                                </menupopup>
-                </menu>  
-		</html:td></html:tr>
-	</html:table>
-</html:fieldset>
-</box>
-</html:form>
+				<html:div style="width:30px; background-color:white"/>
+				<menupopup>
+					<colorpicker palettename="standard" onclick="setColorWell(this.parentNode.parentNode);"/>
+				</menupopup>
+	        </menu>  
+			</html:td></html:tr>
+		</html:table-->
+	</html:fieldset>

-<html:form>
-<box align="vertical" style="width: 100%;"> 
-<html:fieldset style="width: 100%;">
-<html:legend align="left">
-<html:div>&displayWidth.label;</html:div>
-</html:legend>
+	<html:fieldset>
+		<html:legend align="left">
+			<html:div>&displayWidth.label;</html:div>
+		</html:legend>

-	<html:table>
-		<html:tr><html:td><html:input name="fontwidth" type="radio"
-			id="pref:1:bool:mail.fixed_width_messages" checked="true"/>
+		<html:div>
+			<html:input id="pref:1:bool:mail.fixed_width_messages" name="fontwidth" type="radio" checked="true"/>
 			<html:label for="pref:1:bool:mail.fixed_width_messages">&fixedWidth.label;</html:label>
-		</html:td></html:tr>
-		<html:tr><html:td><html:input name="fontwidth" type="radio"
-			id="pref:0:bool:mail.fixed_width_messages"/>
+		</html:div>
+			
+		<html:div>
+			<html:input id="pref:0:bool:mail.fixed_width_messages" name="fontwidth" type="radio"/>
 			<html:label for="pref:0:bool:mail.fixed_width_messages">&variableWidth.label;</html:label>
-		</html:td></html:tr>
-	</html:table>
-</html:fieldset>
-</box>
-</html:form>
- 
-<html:form>
-<box align="vertical" style="width: 100%;"> 
-<html:fieldset style="width: 100%;">
-	<html:table>
-		<html:tr><html:td><html:input type="checkbox" id="pref:1:bool:mail.play_sound"/>
-		<html:label>&playSound.label;</html:label></html:td></html:tr>
-		<html:tr><html:td><html:input type="checkbox" id="pref:1:bool:mailnews.remember_selected_message"/>
-		<html:label>&rememberLastMsg.label;</html:label></html:td></html:tr>
-		<html:tr><html:td><html:input type="checkbox" id="pref:1:bool:mailnews.confirm.moveFoldersToTrash"/>
-		<html:label>&confirmMove.label;</html:label></html:td></html:tr>
-		<html:tr><html:td><html:input type="checkbox" id="pref:0:bool:mail.use_mapi_server"/>
-		<html:label>&useMessenger.label;</html:label></html:td></html:tr>
-	</html:table>
-</html:fieldset>
-</box>
-</html:form>
+		</html:div>
+
+		<!--html:table>
+			<html:tr><html:td><html:input name="fontwidth" type="radio"
+				id="pref:1:bool:mail.fixed_width_messages" checked="true"/>
+				<html:label for="pref:1:bool:mail.fixed_width_messages">&fixedWidth.label;</html:label>
+			</html:td></html:tr>
+			<html:tr><html:td><html:input name="fontwidth" type="radio"
+				id="pref:0:bool:mail.fixed_width_messages"/>
+				<html:label for="pref:0:bool:mail.fixed_width_messages">&variableWidth.label;</html:label>
+			</html:td></html:tr>
+		</html:table-->
+	</html:fieldset>
+	 
+	<html:fieldset>
+
+		<html:div>
+			<html:input id="pref:1:bool:mail.play_sound" type="checkbox"/>
+			<html:label for="pref:1:bool:mail.play_sound">&playSound.label;</html:label>
+		</html:div>
+			
+		<html:div>
+			<html:input id="pref:1:bool:mailnews.remember_selected_message" type="checkbox"/>
+			<html:label for="pref:1:bool:mailnews.remember_selected_message">&rememberLastMsg.label;</html:label>
+		</html:div>
+			
+		<html:div>
+			<html:input id="pref:1:bool:mailnews.confirm.moveFoldersToTrash" type="checkbox"/>
+			<html:label for="pref:1:bool:mailnews.confirm.moveFoldersToTrash">&confirmMove.label;</html:label>
+		</html:div>
+			
+		<html:div>
+			<html:input id="pref:0:bool:mail.use_mapi_server" type="checkbox"/>
+			<html:label for="pref:0:bool:mail.use_mapi_server">&useMessenger.label;</html:label>
+		</html:div>
+
+		<!--html:table>
+			<html:tr><html:td><html:input type="checkbox" id="pref:1:bool:mail.play_sound"/>
+			<html:label>&playSound.label;</html:label></html:td></html:tr>
+			<html:tr><html:td><html:input type="checkbox" id="pref:1:bool:mailnews.remember_selected_message"/>
+			<html:label>&rememberLastMsg.label;</html:label></html:td></html:tr>
+			<html:tr><html:td><html:input type="checkbox" id="pref:1:bool:mailnews.confirm.moveFoldersToTrash"/>
+			<html:label>&confirmMove.label;</html:label></html:td></html:tr>
+			<html:tr><html:td><html:input type="checkbox" id="pref:0:bool:mail.use_mapi_server"/>
+			<html:label>&useMessenger.label;</html:label></html:td></html:tr>
+		</html:table-->
+	</html:fieldset>

-</html:div>
 </window>
--- a/mailnews/base/prefs/resources/content/pref-receipts.xul
+++ b/mailnews/base/prefs/resources/content/pref-receipts.xul
@ -7,7 +7,8 @@
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        class="dialog"
-		onload="StartUp('Mailnews-Return Receipts')" >
+		onload="StartUp('Mailnews-Return Receipts')"
+		align="vertical">

 <html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>

@ -23,74 +24,64 @@ function DoCustomize()
 </html:script>


-<html:div flex="100%">
-        <html:div id="top">
-                <html:span id="lefttext">&pane.title;</html:span>
-        </html:div>
+	<box class="header" align="horizontal">
+		<html:div class="left-header-text">&pane.title;</html:div>
+		<spring flex="100%"/>
+		<html:div class="right-header-text">&pane.description;</html:div>
+	</box>

-<html:form>
-<box align="vertical" style="width: 100%;">
-<html:fieldset style="width: 100%;">
-<html:legend align="left">
-<html:div>&requestReceipt.label;</html:div>
-</html:legend>
-	<html:table>
-		<html:tr><html:td>
-			<html:input name="msgreceipt" type="radio" id="pref:1:int:mail.request.return_receipt"/>
-			<html:label>&dsn.label;</html:label> 
-		</html:td></html:tr>
-		<html:tr><html:td>
-			<html:input name="msgreceipt" type="radio" id="pref:2:int:mail.request.return_receipt" checked="true"/>
-			<html:label>&mdn.label;</html:label>
-		</html:td></html:tr>
-		<html:tr><html:td>
-			<html:input name="msgreceipt" type="radio" id="pref:3:int:mail.request.return_receipt"/>
-			<html:label>&both.label;</html:label>
-		</html:td></html:tr>
-	</html:table>
-</html:fieldset>
-</box>
-</html:form>
-<html:form>
-<box align="vertical" style="width: 100%;">
-<html:fieldset style="width: 100%;">
-<html:legend align="left">
-<html:div>&receiptArrive.label;</html:div>
-</html:legend>
-	<html:table>
-		<html:tr><html:td>
-			<html:input name="getreceipt" type="radio" id="pref:0:int:mail.incorporate.return_receipt" checked="true"/>
-			<html:label>&leaveIt.label;</html:label>
-		</html:td></html:tr>
-		<html:tr><html:td>
-			<html:input name="getreceipt" type="radio" id="pref:1:int:mail.incorporate.return_receipt"/>
-			<html:label>&moveToSent.label;</html:label>
-		</html:td></html:tr>
-	</html:table>
-</html:fieldset>
-</box>
-</html:form>
+	<html:fieldset>
+		<html:legend align="left">
+			<html:div>&requestReceipt.label;</html:div>
+		</html:legend>
+		
+		<html:div>
+			<html:input id="pref:1:int:mail.request.return_receipt" name="msgreceipt" type="radio"/>
+			<html:label for="pref:1:int:mail.request.return_receipt">&dsn.label;</html:label> 
+		</html:div>
+		
+		<html:div>
+			<html:input id="pref:2:int:mail.request.return_receipt" name="msgreceipt" type="radio" checked="true"/>
+			<html:label for="pref:2:int:mail.request.return_receipt">&mdn.label;</html:label>
+		</html:div>

-<html:form>
-<box align="vertical" style="width: 100%;">
-<html:fieldset style="width: 100%;">
-<html:legend align="left">
-<html:div>&requestMDN.label;</html:div>
-</html:legend>
-	<html:table>
-		<html:tr><html:td>
-			<html:input name="returnreceipt" type="radio" id="pref:0:int:mail.mdn.report.enabled"/>
-			<html:label>&never.label;</html:label>
-		</html:td></html:tr>
-		<html:tr><html:td>
-			<html:input name="returnreceipt" type="radio" id="pref:1:int:mail.mdn.report.enabled" checked="true"/>
-			<html:label>&returnSome.label;</html:label>
-			<html:input name="custom" type="button" value="&custom.label;"/>
-		</html:td></html:tr>
-	</html:table>
-</html:fieldset>
-</box>
-</html:form>
+		<html:div>
+			<html:input id="pref:3:int:mail.request.return_receipt" name="msgreceipt" type="radio"/>
+			<html:label for="pref:3:int:mail.request.return_receipt">&both.label;</html:label>
+		</html:div>
+	</html:fieldset>
+
+	<html:fieldset>
+		<html:legend align="left">
+			<html:div>&receiptArrive.label;</html:div>
+		</html:legend>
+		
+		<html:div>
+			<html:input id="pref:0:int:mail.incorporate.return_receipt" name="getreceipt" type="radio" checked="true"/>
+			<html:label for="pref:0:int:mail.incorporate.return_receipt">&leaveIt.label;</html:label>
+		</html:div>
+		
+		<html:div>
+			<html:input id="pref:1:int:mail.incorporate.return_receipt" name="getreceipt" type="radio"/>
+			<html:label for="pref:1:int:mail.incorporate.return_receipt">&moveToSent.label;</html:label>
+		</html:div>
+	</html:fieldset>
+
+	<html:fieldset>
+		<html:legend align="left">
+			<html:div>&requestMDN.label;</html:div>
+		</html:legend>
+		
+		<html:div>
+			<html:input id="pref:0:int:mail.mdn.report.enabled" name="returnreceipt" type="radio"/>
+			<html:label for="pref:0:int:mail.mdn.report.enabled">&never.label;</html:label>
+		</html:div>
+		
+		<html:div>
+			<html:input id="pref:1:int:mail.mdn.report.enabled" name="returnreceipt" type="radio" checked="true"/>
+			<html:label for="pref:1:int:mail.mdn.report.enabled">&returnSome.label;</html:label>
+			<titledbutton class="push dialog" value="&custom.label;"/>
+		</html:div>
+	</html:fieldset>

-</html:div>
 </window>
--- a/mailnews/base/prefs/resources/content/pref-winsetting.xul
+++ b/mailnews/base/prefs/resources/content/pref-winsetting.xul
@ -6,70 +6,61 @@
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        class="dialog"
-		onload="StartUp('Mailnews-Window Setting')" >
+		onload="StartUp('Mailnews-Window Setting')"
+		align="vertical">

 <html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>

-<html:div flex="100%">
-	<html:div id="top">
-		<html:span id="lefttext">&pane.title;</html:span>
-	</html:div>
-
-<html:form>
-<box align="vertical" style="width: 100%;">
-<html:fieldset style="width: 100%;">
-	<html:table>
-		<html:tr><html:td><html:label>&chooseLayout.label;</html:label></html:td></html:tr>
-		<html:tr><html:td>
-			<html:input name="winlayout" type="radio" id="pref:0:int:mail.pane_arrangement" checked="true"/> 
-			<html:img src="chrome://messenger/skin/winclassic.gif"/>
-			<html:input name="winlayout" type="radio" id="pref:1:int:mail.pane_arrangement"/>
-			<html:img src="chrome://messenger/skin/winwide.gif"/>
-		</html:td></html:tr>
-	</html:table>
-	&chooseExp.label;
-</html:fieldset>
-</box>
-</html:form>
+	<box class="header" align="horizontal">
+		<html:div class="left-header-text">&pane.title;</html:div>
+		<spring flex="100%"/>
+		<html:div class="right-header-text">&pane.description;</html:div>
+	</box>


-<html:form>
-<box align="vertical" style="width: 100%;">
-<html:fieldset style="width: 100%;">
-	<html:table>
-		<html:tr><html:td>
-			<html:input type="checkbox" id="pref:1:int:mailnews.reuse_thread_window2"/>
-			<html:label>&reuseThread.label;</html:label>
-		</html:td></html:tr>
-		<html:tr><html:td>
-			<html:input type="checkbox" id="pref:1:int:mailnews.reuse_message_window"/>
-			<html:label>&reuseMessage.label;</html:label>
-		</html:td></html:tr>
-	</html:table>
-	&reuseExp.label;
-</html:fieldset>
-</box>
-</html:form>
+	<html:fieldset>
+		<html:legend align="left">
+			<html:div>&chooseLayout.label;</html:div>
+		</html:legend>
+
+		<html:div>
+			<html:input id="pref:0:int:mail.pane_arrangement" name="winlayout" type="radio" checked="true"/> 
+			<html:img style="height:32px width:26px" src="chrome://messenger/skin/winclassic.gif"/>
+			<html:input id="pref:1:int:mail.pane_arrangement" name="winlayout" type="radio"/>
+			<html:img style="height:32px width:26px" src="chrome://messenger/skin/winwide.gif"/>
+		</html:div>
+			
+		&chooseExp.label;
+	</html:fieldset>
+
+	<html:fieldset>
+		<html:div>
+			<html:input id="pref:1:int:mailnews.reuse_thread_window2" type="checkbox"/>
+			<html:label for="pref:1:int:mailnews.reuse_thread_window2">&reuseThread.label;</html:label>
+		</html:div>
+			
+		<html:div>
+			<html:input id="pref:1:int:mailnews.reuse_message_window" type="checkbox"/>
+			<html:label for="pref:1:int:mailnews.reuse_message_window">&reuseMessage.label;</html:label>
+		</html:div>
+		
+		&reuseExp.label;
+	</html:fieldset>
+
+	<html:fieldset>
+		<html:legend align="left">
+			<html:div>&newsOpt.label;</html:div>
+		</html:legend>
+		
+		<html:div>
+			<html:input id="pref:0:int:news.use_message_center" name="opennews" type="radio" checked="true"/>
+			<html:label for="pref:0:int:news.use_message_center">&openMessenger.label;</html:label>
+		</html:div>
+
+		<html:div>
+			<html:input id="pref:1:int:news.use_message_center" name="opennews" type="radio"/>
+			<html:label for="pref:1:int:news.use_message_center">&openCenter.label;</html:label>
+		</html:div>
+	</html:fieldset>

-<html:form>
-<box align="vertical" style="width: 100%;">
-<html:fieldset style="width: 100%;">
-<html:legend align="left">
-<html:div>&newsOpt.label;</html:div>
-</html:legend>
-	<html:table>
-		<html:tr><html:td>
-			<html:input name="opennews" type="radio" id="pref:0:int:news.use_message_center" checked="true"/>
-			<html:label>&openMessenger.label;</html:label>
-		</html:td></html:tr>
-		<html:tr><html:td>
-			<html:input name="opennews" type="radio" id="pref:1:int:news.use_message_center"/>
-			<html:label>&openCenter.label;</html:label>
-		</html:td></html:tr>
-	</html:table>
-</html:fieldset>
-</box>
-</html:form>
- 
-</html:div>
 </window>
--- a/mailnews/base/prefs/resources/locale/en-US/pref-diskspace.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-diskspace.dtd
@ -19,8 +19,8 @@ Rights Reserved.
 --> 

 <!-- LOCALIZATION NOTE pref-diskspace.dtd: UI for Mail/News Disk Space prefs -->
-<!ENTITY window.title "Disk Space">
 <!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">
--- a/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
@ -19,8 +19,8 @@ Rights Reserved.
 --> 

 <!-- LOCALIZATION NOTE pref-mailnews.dtd: UI for Mail/News prefs -->
-<!ENTITY window.title "Mail &amp; Newsgroups">
-<!ENTITY pane.title "Mail &amp; Newsgroups">
+<!ENTITY pane.title "Mail and Newsgroups">
+<!ENTITY pane.description "Settings for Mail and Newsgroups">
 <!ENTITY textBegin.label "Plain quoted text beginning with '>' is displayed with">
 <!ENTITY style.label "Style:">
 <!ENTITY regular.label "Regular">
--- a/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
@ -19,8 +19,8 @@ Rights Reserved.
 --> 

 <!-- LOCALIZATION NOTE pref-receipts.dtd: UI for Mail/News Return Receipts prefs -->
-<!ENTITY window.title "Return Receipts">
 <!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)">
--- a/mailnews/base/prefs/resources/locale/en-US/pref-winsetting.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-winsetting.dtd
@ -19,16 +19,16 @@ Rights Reserved.
 --> 

 <!-- LOCALIZATION NOTE pref-winsetting.dtd: UI for Mail & News Window Settings prefs -->
-<!ENTITY window.title "Window Setting">
-<!ENTITY pane.title "Window Setting">
+<!ENTITY pane.title "Window Settings">
+<!ENTITY pane.description "Configure your window layout">
 <!-- LOCALIZATION NOTE chooseLayout.label: Never translate the product name "Messenger" -->
-<!ENTITY chooseLayout.label "Choose which layout you prefer for the Messenger window:">
+<!ENTITY chooseLayout.label "Preferred layout for the Mail window:">
 <!-- LOCALIZATION NOTE chooseExp.label Never translate the product name "Messenger" -->
-<!ENTITY chooseExp.label "Note:  a change to this setting will only take effect the next time you open a Messenger window.">
-<!ENTITY reuseThread.label "Double-clicking a folder or a newsgroup opens it in a new window">
+<!ENTITY chooseExp.label "Note:  changes to this setting will only take effect the next time you open a Mail window.">
+<!ENTITY reuseThread.label "Double-clicking a folder opens it in a new window">
 <!ENTITY reuseMessage.label "Double-clicking a message opens it in a new window">
-<!ENTITY reuseExp.label "If you prefer fewer windows, unselect these options, and Messenger will open items into existing windows.">
+<!ENTITY reuseExp.label "If you prefer fewer windows, unselect these options, and Mail will open items into existing windows.">
 <!ENTITY newsOpt.label "The Newsgroups menu item or button:">
 <!-- LOCALIZATION NOTE openMessenger.label Never translate the product name "Messenger" -->
-<!ENTITY openMessenger.label "Opens newsgroups in a Messenger window">
+<!ENTITY openMessenger.label "Opens newsgroups in a Mail window">
 <!ENTITY openCenter.label "Opens the Message Center">
--- a/mailnews/compose/prefs/resources/content/pref-formatting.xul
+++ b/mailnews/compose/prefs/resources/content/pref-formatting.xul
@ -5,44 +5,48 @@

 <window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-		onload="StartUp('Mailnews-Formatting')" >
+		onload="StartUp('Mailnews-Formatting')"
+		align="vertical"
+		class="dialog">

 <html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>


-<html:div flex="100%">
-	<html:div id="top">
-		<html:span id="lefttext">&pane.title;</html:span>
-	</html:div>
-<html:form>
-<box align="vertical" style="width: 100%;">
-<html:fieldset style="width: 100%;">
-<html:legend align="left">
-<html:div>&sendMail.label;</html:div>
-</html:legend>
+	<box class="header" align="horizontal">
+		<html:div class="left-header-text">&pane.title;</html:div>
+		<spring flex="100%"/>
+		<html:div class="right-header-text">&pane.description;</html:div>
+	</box>

-	<html:table>
-		<html:tr><html:td>
-			<html:input name="recipients" type="radio" id="pref:0:int:mail.default_html_action" checked="true"/>
-			<html:label>&askMe.label;</html:label>
-		</html:td></html:tr>
-		<html:tr><html:td>
-			<html:input name="recipients" type="radio" id="pref:1:int:mail.default_html_action"/>
-			<html:label>&convertPlain.label;</html:label>
-		</html:td></html:tr>
-		<html:tr><html:td>
-			<html:input name="recipients" type="radio" id="pref:2:int:mail.default_html_action"/>
-			<html:label>&sendHTML.label;</html:label>
-		</html:td></html:tr>
-		<html:tr><html:td>
-			<html:input name="recipients" type="radio" id="pref:3:int:mail.default_html_action"/>
-			<html:label>&sendBoth.label;</html:label>
-		</html:td></html:tr>
-	</html:table>
-	&override.label;
-</html:fieldset>
-</box>
-</html:form>
+	<!-- FIX ME - add fieldset tags back in when bug 20070 is fixed -->
+	<!--html:fieldset-->
+		<html:div class="vertical-gap">&sendMail.label;</html:div>
+		
+		<html:div>
+			<html:input id="pref:0:int:mail.default_html_action" class="indent" name="recipients" type="radio" checked="true"/>
+			<html:label for="pref:0:int:mail.default_html_action">&askMe.label;</html:label>
+			<html:label for="pref:0:int:mail.default_html_action" class="indent-second-label">&askMe2.label;</html:label>
+		</html:div>
+
+		<html:div>
+			<html:input id="pref:1:int:mail.default_html_action" class="indent" name="recipients" type="radio"/>
+			<html:label for="pref:1:int:mail.default_html_action">&convertPlain.label;</html:label>
+			<html:label for="pref:1:int:mail.default_html_action" class="indent-second-label">&convertPlain2.label;</html:label>
+		</html:div>
+
+		<html:div>
+			<html:input id="pref:2:int:mail.default_html_action" class="indent" name="recipients" type="radio"/>
+			<html:label for="pref:2:int:mail.default_html_action">&sendHTML.label;</html:label>
+			<html:label for="pref:2:int:mail.default_html_action" class="indent-second-label">&sendHTML2.label;</html:label>
+		</html:div>
+
+		<html:div>
+			<html:input id="pref:3:int:mail.default_html_action" class="indent" name="recipients" type="radio"/>
+			<html:label for="pref:3:int:mail.default_html_action">&sendBoth.label;</html:label>
+			<html:label for="pref:3:int:mail.default_html_action" class="indent-second-label">&sendBoth2.label;</html:label>
+		</html:div>
+
+		<html:div class="vertical-gap">&override.label;</html:div>
+	<!--/html:fieldset-->

-</html:div>
 </window>
--- a/mailnews/compose/prefs/resources/content/pref-messages.xul
+++ b/mailnews/compose/prefs/resources/content/pref-messages.xul
@ -5,101 +5,85 @@

 <window xmlns:html="http://www.w3.org/TR/REC-html40"
 		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-		onload="StartUp('Mailnews-Messages')" >
+		onload="StartUp('Mailnews-Messages')"
+		align="vertical"
+		class="dialog">

 <html:script language="javascript" src="chrome://pref/content/PrefsWindow.js"/>

-<html:div flex="100%">
-	<html:div id="top">
-		<html:span id="lefttext">&pane.title;</html:span>
-	</html:div>
-
-<html:form>
-	<box align="vertical" style="width: 100%;">
-		<html:fieldset style="width: 100%;">
-			<html:legend align="left">
-				<html:div>&forwardReply.label;</html:div>
-			</html:legend>
-			<html:table>
-				<html:tr><html:td>&forwardMsg.label;
-					<html:select id="pref:int:mail.forward_message_mode">
-						<html:option valye="2" label="&inline.label;"/>
-<!-- forward as quoted is obsolete
-						<html:option valye="1" label="&quoted.label;"/>
-->
-						<html:option valye="0" label="&asAttachment.label;"/>
-					</html:select>
-				</html:td></html:tr>
-				<html:tr><html:td>
-					<html:input type="checkbox" id="pref:0:bool:mail.auto_quote" checked="true"/>
-					<html:label>&autoQuote.label;</html:label>
-				</html:td></html:tr>
-				<html:tr><html:td>&then.label;
-					<html:select id="pref:int: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:td></html:tr>
-			</html:table>
-		</html:fieldset>
+	<box class="header" align="horizontal">
+		<html:div class="left-header-text">&pane.title;</html:div>
+		<spring flex="100%"/>
+		<html:div class="right-header-text">&pane.description;</html:div>
 	</box>
-</html:form>

-<html:form>
-	<box align="vertical" style="width: 100%;">
-		<html:fieldset style="width: 100%;">
-			<html:table>
-				<html:tr><html:td>
-					<html:input type="checkbox" id="pref:0:bool:mail.SpellCheckBeforeSend"/>
-					<html:label>&spellCheck.label;</html:label>
-				</html:td></html:tr>
-			</html:table>
-		</html:fieldset>
-	</box>
-</html:form>
+	<html:fieldset>
+		<html:legend align="left">
+			<html:div>&forwardReply.label;</html:div>
+		</html:legend>
+		
+		<html:div>
+			<html:label for="pref:int:mail.forward_message_mode">&forwardMsg.label;</html:label>
+			<html:select id="pref:int:mail.forward_message_mode">
+				<html:option value="2" label="&inline.label;"/>
+				<html:option value="0" label="&asAttachment.label;"/>
+			</html:select>
+		</html:div>
+		
+		<html:div>
+			<html:input id="pref:0:bool:mail.auto_quote" type="checkbox" checked="true"/>
+			<html:label for="pref:0:bool:mail.auto_quote">&autoQuote.label;</html:label>
+		</html:div>

-<html:form>
-	<box align="vertical" style="width: 100%;">
-		<html:fieldset style="width: 100%;">
-			<html:legend align="left">
-				<html:div>&msgWrapping.label;</html:div>
-			</html:legend>
-			<html:table>
-				<html:tr><html:td>
-					<html:input type="checkbox" id="pref:0:bool:mail.wrap_long_lines"/>
-					<html:label>&wrapInMsg.label;</html:label>
-				</html:td></html:tr>
-				<html:tr><html:td>&wrapOutMsg.label;
-					<html:input name="wraplength" type="text" value=""
-					 id="pref:string:mailnews.wraplength" size="10"/>&char.label;
-				</html:td></html:tr>
-			</html:table>
-		</html:fieldset>
-	</box>
-</html:form>
+		<html:div>
+			<html:label for="pref:int:mailnews.reply_on_top">&then.label;</html:label>
+			<html:select id="pref:int: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>
+	</html:fieldset>

-<html:form>
-	<box align="vertical" style="width: 100%;">
-		<html:fieldset style="width: 100%;">
-			<html:legend align="left">
-				<html:div>&use8Bits.label;</html:div>
-			</html:legend>
-			<html:table>
-				<html:tr><html:td>
-					<html:input name="strictly_mime" type="radio" id="pref:0:int:mail.strictly_mime" />
-					<html:label>&asIs.label;</html:label>
-				</html:td></html:tr>
-				<html:tr><html:td>
-					<html:input name="strictly_mime" type="radio" id="pref:1:int:mail.strictly_mime"/>
-					<html:label>&useMIMEpart1.label;</html:label><html:br/>
-					<html:label>&useMIMEpart2.label;</html:label>
-				</html:td></html:tr>
-			</html:table>
-		</html:fieldset>
-	</box>
-</html:form>
+	<html:fieldset>
+		<html:input id="pref:0:bool:mail.SpellCheckBeforeSend" type="checkbox"/>
+		<html:label for="pref:0:bool:mail.SpellCheckBeforeSend">&spellCheck.label;</html:label>
+	</html:fieldset>
+
+	<html:fieldset>
+		<html:legend align="left">
+			<html:div>&msgWrapping.label;</html:div>
+		</html:legend>
+		
+		<html:div>
+			<html:input id="pref:0:bool:mail.wrap_long_lines" type="checkbox"/>
+			<html:label for="pref:0:bool:mail.wrap_long_lines">&wrapInMsg.label;</html:label>
+		</html:div>
+		
+		<html:div>
+			&wrapOutMsg.label;
+			<html:input id="pref:string:mailnews.wraplength" name="wraplength" type="text" size="10"/>
+			&char.label;
+		</html:div>
+	</html:fieldset>
+
+	<html:fieldset>
+		<html:legend align="left">
+			<html:div>&use8Bits.label;</html:div>
+		</html:legend>
+
+		<html:div>
+			<html:input id="pref:0:int:mail.strictly_mime" name="strictly_mime" type="radio"/>
+			<html:label for="pref:0:int:mail.strictly_mime">&asIs.label;</html:label>
+		</html:div>
+
+		<html:div>
+			<html:input id="pref:1:int:mail.strictly_mime" name="strictly_mime" type="radio"/>
+			<html:label for="pref:1:int:mail.strictly_mime">&useMIMEpart1.label;</html:label>
+		</html:div>
+		<html:div class="indent">&useMIMEpart2.label;</html:div>
+
+	</html:fieldset>

-</html:div>
 </window>
--- a/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd
+++ b/mailnews/compose/prefs/resources/locale/en-US/pref-formatting.dtd
@ -18,11 +18,15 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 

-<!ENTITY window.title "Formatting">
 <!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 convertPlain.label "Convert the message into plain text (may lose some formatting).">
-<!ENTITY sendHTML.label "Send the message in HTML anyway (some recipients may not be able to read it).">
-<!ENTITY sendBoth.label "Send the message in plain text and HTML (uses more disk space).">
+<!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.">
--- a/mailnews/compose/prefs/resources/locale/en-US/pref-messages.dtd
+++ b/mailnews/compose/prefs/resources/locale/en-US/pref-messages.dtd
@ -18,8 +18,8 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 

-<!ENTITY window.title "Messages">
 <!ENTITY pane.title "Messages">
+<!ENTITY pane.description "Settings for messages">
 <!ENTITY forwardReply.label "Forwarding and Replying to Messages">
 <!ENTITY forwardMsg.label "By default, forward messages:">
 <!ENTITY inline.label "Inline">
--- a/suite/locales/en-US/chrome/mailnews/pref/pref-addressing.dtd
+++ b/suite/locales/en-US/chrome/mailnews/pref/pref-addressing.dtd
@ -20,8 +20,9 @@ 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 lookFor.label "Look for addresses in the following:">
 <!ENTITY padCheck.label "Address Books">
 <!ENTITY dirCheck.label "Directory Server">
 <!ENTITY nsbook.label "Netscape Phonebook">
--- a/suite/locales/en-US/chrome/mailnews/pref/pref-formatting.dtd
+++ b/suite/locales/en-US/chrome/mailnews/pref/pref-formatting.dtd
@ -18,11 +18,15 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 

-<!ENTITY window.title "Formatting">
 <!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 convertPlain.label "Convert the message into plain text (may lose some formatting).">
-<!ENTITY sendHTML.label "Send the message in HTML anyway (some recipients may not be able to read it).">
-<!ENTITY sendBoth.label "Send the message in plain text and HTML (uses more disk space).">
+<!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.">
--- a/suite/locales/en-US/chrome/mailnews/pref/pref-mailnews.dtd
+++ b/suite/locales/en-US/chrome/mailnews/pref/pref-mailnews.dtd
@ -19,8 +19,8 @@ Rights Reserved.
 --> 

 <!-- LOCALIZATION NOTE pref-mailnews.dtd: UI for Mail/News prefs -->
-<!ENTITY window.title "Mail &amp; Newsgroups">
-<!ENTITY pane.title "Mail &amp; Newsgroups">
+<!ENTITY pane.title "Mail and Newsgroups">
+<!ENTITY pane.description "Settings for Mail and Newsgroups">
 <!ENTITY textBegin.label "Plain quoted text beginning with '>' is displayed with">
 <!ENTITY style.label "Style:">
 <!ENTITY regular.label "Regular">
--- a/suite/locales/en-US/chrome/mailnews/pref/pref-receipts.dtd
+++ b/suite/locales/en-US/chrome/mailnews/pref/pref-receipts.dtd
@ -19,8 +19,8 @@ Rights Reserved.
 --> 

 <!-- LOCALIZATION NOTE pref-receipts.dtd: UI for Mail/News Return Receipts prefs -->
-<!ENTITY window.title "Return Receipts">
 <!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)">
--- a/xpfe/components/prefwindow/resources/skin/pref.css
+++ b/xpfe/components/prefwindow/resources/skin/pref.css
@ -1,3 +1,44 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to HTML */
+@namespace html url("http://www.w3.org/TR/REC-html40"); /* namespace for XUL elements */
+
+/* Header */
+
+.header {
+   background-color: #336699;
+   padding-left: 5px;
+   padding-right: 5px;
+   padding-top: 3px;
+   padding-bottom: 3px;
+}
+
+.left-header-text {
+   color: white;
+   font-weight: bold;
+}
+
+.right-header-text {
+   color: white;
+}
+
+/* spacing around widgets */
+
+.indent {
+	margin-left: 12px;   
+}
+
+.indent-second-label {
+	margin-left: 29px;   
+}
+
+.vertical-gap {
+	padding-top: 12px;   
+}
+
+
+
+
+/* obsolete styles - will be removed soon */
+
 #top  {
 background-color: grey
 }
@ -12,16 +53,3 @@ background-color: grey
  height : 326;
 }

-box.header {
-   background-color: #336699;
-   padding: 5px;
-}
-
-titledbutton.left-header-text {
-   color: white;
-   font-weight: bold;
-}
-
-titledbutton.right-header-text {
-   color: white;
-}