diff --git a/mailnews/base/prefs/resources/content/AccountManager.js b/mailnews/base/prefs/resources/content/AccountManager.js
index 28a2e6017688..b98880215b58 100644
--- a/mailnews/base/prefs/resources/content/AccountManager.js
+++ b/mailnews/base/prefs/resources/content/AccountManager.js
@@ -420,8 +420,8 @@ function savePage(serverId) {
 
   // store the value in the account
   for (var i=0; i<pageElements.length; i++) {
-      if (pageElements[i].name) {
-        var vals = pageElements[i].name.split(".");
+      if (pageElements[i].id) {
+        var vals = pageElements[i].id.split(".");
         var type = vals[0];
         var slot = vals[1];
 
@@ -504,8 +504,8 @@ function restorePage(pageId, serverId) {
   
   // restore the value from the account
   for (var i=0; i<pageElements.length; i++) {
-      if (pageElements[i].name) {
-        var vals = pageElements[i].name.split(".");
+      if (pageElements[i].id) {
+        var vals = pageElements[i].id.split(".");
         var type = vals[0];
         var slot = vals[1];
 
@@ -529,14 +529,19 @@ function restorePage(pageId, serverId) {
 //
 function getFormElementValue(formElement) {
  try {
-  var type = formElement.type.toLowerCase();
-  if (type=="checkbox" || type=="radio") {
+  var type = formElement.tagName;
+  if (type=="checkbox") {
     if (formElement.getAttribute("reversed"))
       return !formElement.checked;
     else
       return formElement.checked;
   }
-  else if (type == "text" &&
+
+  else if (type == "radiogroup" || type=="menulist") {
+    return formElement.selectedItem.data;
+  }
+  
+  else if (type == "textfield" &&
            formElement.getAttribute("datatype") == "nsIFileSpec") {
     if (formElement.value) {
       var filespec = Components.classes["component://netscape/filespec"].createInstance(Components.interfaces.nsIFileSpec);
@@ -563,8 +568,8 @@ function setFormElementValue(formElement, value) {
   
   //formElement.value = formElement.defaultValue;
   //  formElement.checked = formElement.defaultChecked;
-  var type = formElement.type.toLowerCase();
-  if (type == "checkbox" || type=="radio") {
+  var type = formElement.tagName;
+  if (type == "checkbox") {
     if (value == undefined) {
       formElement.checked = formElement.defaultChecked;
     } else {
@@ -572,11 +577,25 @@ function setFormElementValue(formElement, value) {
         formElement.checked = !value;
       else
         formElement.checked = value;
-    }
+    }     
+  }
+
+  else if (type == "radiogroup" || type =="menulist") {
     
+    var selectedItem;
+    if (value == undefined) {
+      if (type == "radiogroup")
+        selectedItem = formElement.firstChild;
+      else
+        selectedItem = formElement.firstChild.firstChild;
+    }
+    else
+      selectedItem = formElement.getElementsByAttribute("data", value)[0];
+    
+    formElement.selectedItem = selectedItem;
   }
   // handle nsIFileSpec
-  else if (type == "text" &&
+  else if (type == "textfield" &&
            formElement.getAttribute("datatype") == "nsIFileSpec") {
     if (value) {
       var filespec = value.QueryInterface(Components.interfaces.nsIFileSpec);
diff --git a/mailnews/base/prefs/resources/content/am-copies.js b/mailnews/base/prefs/resources/content/am-copies.js
index 59ba9e1252ea..0851d9402b3d 100644
--- a/mailnews/base/prefs/resources/content/am-copies.js
+++ b/mailnews/base/prefs/resources/content/am-copies.js
@@ -38,7 +38,7 @@ function initFolderDisplay(fieldname, pickerID) {
 
 function initBccSelf() {
     var bccValue = document.getElementById("identity.email").value;
-    setDivText("bccemail",bccValue);
+    setDivText("identity.bccSelf",bccValue);
 }
 
 function setDivText(divid, str) {
diff --git a/mailnews/base/prefs/resources/content/am-copies.xul b/mailnews/base/prefs/resources/content/am-copies.xul
index 0546093a9538..d361ab8d4c1e 100644
--- a/mailnews/base/prefs/resources/content/am-copies.xul
+++ b/mailnews/base/prefs/resources/content/am-copies.xul
@@ -16,39 +16,35 @@
 <script language="JavaScript" src="chrome://messenger/content/widgetglue.js"/>
 <script src="chrome://messenger/content/am-copies.js"/>
 
-<html:input wsm_persist="true" type="hidden" name="identity.fccFolder" id="identity.fccFolder"/>
-<html:input wsm_persist="true" type="hidden" name="identity.draftFolder" id="identity.draftFolder"/>
-<html:input wsm_persist="true" type="hidden" name="identity.stationeryFolder" id="identity.stationeryFolder"/>
-<html:input wsm_persist="true" type="hidden" name="identity.email" id="identity.email"/>
+<text hidden="true" wsm_persist="true" id="identity.fccFolder"/>
+<text hidden="true" wsm_persist="true" id="identity.draftFolder"/>
+<text hidden="true" wsm_persist="true" id="identity.stationeryFolder"/>
+<text hidden="true" wsm_persist="true" id="identity.email"/>
 
   <box class="box-smallheader" title="&copyAndFolderTitle.label;"/>
   <text class="label" value="&sendingPrefix.label;"/>
 
   <box>
-    <box flex="1">
-      <html:input wsm_persist="true" name="identity.doFcc" id="identity.doFcc" type="checkbox"/>
-      <html:label for="identity.doFcc" flex="1">&fccMailFolder.label;</html:label>
-    </box>
+    <checkbox wsm_persist="true" id="identity.doFcc"
+      value="&fccMailFolder.label;"/>
 
 	<!-- name="identity.fccFolder" -->
 	<box align="horizontal" flex="2">
 		<menu id="msgFccFolderPicker" flex="1"/>
 	</box>
   </box>
+
+  <checkbox wsm_persist="true" id="identity.bccSelf" before="&bccAccount.label; &lt;" after="&gt;"/>
+
   <box>
-    <html:input wsm_persist="true" name="identity.bccSelf" id="identity.bccSelf" type="checkbox"/>
-    <html:label wsm_persist="true" for="identity.bccSelf"><text before="&bccAccount.label; &lt;" id="bccemail" after="&gt;"/>
-</html:label>
-  </box>
-  <box>
-    <html:input wsm_persist="true" name="identity.bccOthers" id="identity.bccOthers" type="checkbox"/>
-    <html:label for="identity.bccOthers">&bccAddress.label;</html:label>
-    <html:input wsm_persist="true" type="text" name="identity.bccList"/>
+    <checkbox wsm_persist="true" id="identity.bccOthers"
+        value="&bccAddress.label;"/>
+    <textfield wsm_persist="true" id="identity.bccList"/>
   </box>
 
 <spring class="spacer"/>
 <spring class="spacer"/>
-<text value="&specialFolderTitle.label;"/>
+<text class="label" value="&specialFolderTitle.label;"/>
 <grid>
   <columns>
     <column flex="1"/>
diff --git a/mailnews/base/prefs/resources/content/am-main.xul b/mailnews/base/prefs/resources/content/am-main.xul
index 8246f578be67..78e0e6d9c73b 100644
--- a/mailnews/base/prefs/resources/content/am-main.xul
+++ b/mailnews/base/prefs/resources/content/am-main.xul
@@ -26,7 +26,7 @@
           <rows>
             <row>
               <text class="label" value="&accountName.label;" for="server.prettyName"/>
-              <html:input wsm_persist="true" type="text" size="30" name="server.prettyName" id="server.prettyName" flex="100%"/>
+              <textfield wsm_persist="true" type="text" size="30" id="server.prettyName" flex="100%"/>
             </row>
           </rows>
         </grid>
@@ -42,35 +42,33 @@
     <rows>
       <row>
         <text class="label" value="&name.label;" for="identity.fullName"/>
-        <html:input wsm_persist="true" name="identity.fullName" id="identity.fullName" type="text" size="30"/>
+        <textfield wsm_persist="true" id="identity.fullName" size="30"/>
       </row>
       <row>
         <text class="label" value="&email.label;" for="identity.email"/>
-        <html:input wsm_persist="true" id="identity.email" name="identity.email" type="text" maxwidth="200" size="30"/>
+        <textfield wsm_persist="true" id="identity.email" />
       </row>
       <row>
         <text class="label" value="&replyTo.label;" for="identity.replyTo"/>
-        <html:input wsm_persist="true" id="identity.replyTo" name="identity.replyTo" type="text" maxwidth="200" size="30"/>
+        <textfield wsm_persist="true" id="identity.replyTo"/>
       </row>
       <row>
         <text class="label" value="&organization.label;" for="identity.organization"/>
-        <html:input wsm_persist="true" id="identity.organization" name="identity.organization" type="text" size="30"/>
+        <textfield wsm_persist="true" id="identity.organization"/>
       </row>
     </rows>
     </grid>
 <!-- no vcard in PR1
     <row class="checkboxrow">
       <html:td colspan="2">
-        <html:input wsm_persist="true" name="identity.attachVCard" type="checkbox"/>
-        &attachVCard.label;
+        <checkbox wsm_persist="true" id="identity.attachVCard" type="checkbox" value="&attachVCard.label;"/>
       <button value="&editVCard.label;"/>
       </html:td>
       </row>    
 -->
       <box orient="horizontal">
-        <html:input wsm_persist="true" name="identity.attachSignature" id="identity.attachSignature" type="checkbox"/>
-        <html:label for="identity.attachSignature">&signature.label;</html:label>
-        <html:input wsm_persist="true" type="text" id="identity.signature" datatype="nsIFileSpec" flex="100%" name="identity.signature"/>
+        <checkbox wsm_persist="true" id="identity.attachSignature" value="&signature.label;" flex="1"/>
+        <textfield wsm_persist="true" id="identity.signature" datatype="nsIFileSpec" flex="1" name="identity.signature"/>
         <button class="dialog push" name="browse" type="button" value="&choose.label;" onclick="prefNavSelectFile('identity.signature', 'choosefile', true)"/>
       </box>
 
@@ -84,14 +82,12 @@
 
 -->
 
-    <box>
-        <html:input wsm_persist="true" name="identity.composeHtml" id="identity.composeHtml" type="checkbox"/>
-        <html:label for="identity.composeHtml">&useHtml.label;</html:label>
-    </box>
+    <checkbox wsm_persist="true" id="identity.composeHtml"
+              value="&useHtml.label;"/>
 
     <box orient="horizontal">
       <spring flex="100%"/>
       <button onclick="onAdvanced" value="&advancedButton.label;"/>
-      <html:input wsm_persist="true" type="hidden" name="identity.smtpServerKey"/>
+      <text hidden="true" wsm_persist="true" type="hidden" id="identity.smtpServerKey"/>
     </box>
 </window>
diff --git a/mailnews/base/prefs/resources/content/am-server.js b/mailnews/base/prefs/resources/content/am-server.js
index e32e4675ba42..b01e273be81c 100644
--- a/mailnews/base/prefs/resources/content/am-server.js
+++ b/mailnews/base/prefs/resources/content/am-server.js
@@ -57,7 +57,7 @@ function hideShowControls(serverType)
     var len = controls.length;
     for (var i=0; i<len; i++) {
         var control = controls[i];
-        var controlName = control.name;
+        var controlName = control.id;
         if (!controlName) continue;
         var controlNameSplit = controlName.split(".");
         
@@ -65,20 +65,23 @@ function hideShowControls(serverType)
         var controlType = controlNameSplit[0];
 
         // skip generic server/identity things
-        if (controlType == "server" ||
-            controlType == "identity") continue;
+        var hideFor = control.getAttribute("hidefor");
+        if (!hideFor &&
+            (controlType == "server" ||
+             controlType == "identity")) continue;
 
-        // we only deal with controls in <html:div>s
-        var div = getEnclosingDiv(control);
-        
-        if (!div) continue;
+        var box = getEnclosingContainer(control);
+
+        if (!box) continue;
 
         // hide unsupported server type
-        if (control.type.toLowerCase() != "hidden") {
-            if (controlType == serverType)
-                div.removeAttribute("hidden")
-            else
-                div.setAttribute("hidden", "true");
+
+        if (controlType != serverType ||
+            hideFor == serverType) {
+            box.setAttribute("hidden", "true");
+        }
+        else {
+            box.removeAttribute("hidden");
         }
     }
 
@@ -97,7 +100,6 @@ function setDivText(divname, value) {
 
 function openImapAdvanced()
 {
-    dump("openImapAdvanced()\n");
     var imapServer = getImapServer();
     dump("Opening dialog..\n");
     window.openDialog("chrome://messenger/content/am-imap-advanced.xul",
@@ -131,10 +133,6 @@ function getImapServer() {
 
 function saveServerLocally(imapServer)
 {
-    dump("Saving values in " + imapServer + ":\n");
-    for (var i in imapServer) {
-        dump("imapServer." + i + " = " + imapServer[i] + "\n");
-    }
     // boolean prefs, JS does the conversion for us
     document.getElementById("imap.dualUseFolders").value = imapServer.dualUseFolders;
     document.getElementById("imap.usingSubscription").value = imapServer.usingSubscription;
@@ -150,31 +148,26 @@ function saveServerLocally(imapServer)
 
 }
 
-function getEnclosingDiv(startNode) {
+function getEnclosingContainer(startNode) {
 
-    var parent = startNode.parentNode;
-    var div;
+    var parent = startNode;
+    var box;
     
     while (parent && parent != document) {
 
-        if (parent.tagName.toLowerCase() == "div" ||
-            parent.tagName.toLowerCase() == "html" ||
-            parent.tagName.toLowerCase() == "box") {
-            var isContainer =
-                (parent.getAttribute("iscontrolcontainer") == "true");
-            
-            // remember the FIRST div we encounter, or the first
-            // controlcontainer
-            if (!div || isContainer)
-                div=parent;
-            
-            // break out with a controlcontainer
-            if (isContainer)
-                break;
-        }
+        var isContainer =
+            (parent.getAttribute("iscontrolcontainer") == "true");
+          
+        // remember the FIRST container we encounter, or the first
+        // controlcontainer
+        if (!box || isContainer)
+            box=parent;
         
+        // break out with a controlcontainer
+        if (isContainer)
+            break;
         parent = parent.parentNode;
     }
     
-    return div;
+    return box;
 }
diff --git a/mailnews/base/prefs/resources/content/am-server.xul b/mailnews/base/prefs/resources/content/am-server.xul
index 962f3187fdee..2951a0ba5b9f 100644
--- a/mailnews/base/prefs/resources/content/am-server.xul
+++ b/mailnews/base/prefs/resources/content/am-server.xul
@@ -14,11 +14,11 @@
   <script src="chrome://messenger/content/am-server.js"/>
   <script src="chrome://global/content/strres.js"/>
 
-  <html:input wsm_persist="true" type="hidden" name="server.type" id="server.type"/>
-  <html:input wsm_persist="true" type="hidden" name="server.hostName" id="server.hostName"/>
-  <html:input wsm_persist="true" type="hidden" name="server.username" id="server.username"/>
+  <text hidden="true" wsm_persist="true" id="server.type"/>
+  <text hidden="true" wsm_persist="true" id="server.hostName"/>
+  <text hidden="true" wsm_persist="true" id="server.username"/>
 
-  <box wsm_persist="true" class="box-smallheader" title="&serverSettings.label;"/>
+  <box class="box-smallheader" title="&serverSettings.label;"/>
 
   <grid>
     <columns>
@@ -41,56 +41,44 @@
     </rows>
   </grid>
   <spring class="spacer"/>
-  <box id="serverPrefContainer" hidden="true" orient="vertical">
-  <box orient="horizontal"><html:input wsm_persist="true" name="server.isSecure"
-                        id="server.isSecure"
-                        type="checkbox"/>
-            <html:label for="server.isSecure">&isSecure.label;</html:label>
-  </box>
-  <box orient="horizontal"><html:input wsm_persist="true" name="server.rememberPassword"
-                        id="server.rememberPassword"
-                        type="checkbox"/>
-            <html:label for="server.rememberPassword">&savePassword.label;</html:label>
-  </box>
-  <box orient="horizontal"><html:input wsm_persist="true" name="server.doBiff"
-                        id="server.doBiff"
-                        type="checkbox"/>
-            <html:label for="server.doBiff">&biffStart.label;</html:label>
-            <html:input wsm_persist="true" name="server.biffMinutes" type="text" size="3"/>
-            &biffEnd.label;
-  </box>
-  <box style="margin-left: 2em">
-    <html:input wsm_persist="true" name="server.downloadOnBiff"
-                id="server.downloadOnBiff"
-                type="checkbox"/>
-    <html:label for="server.downloadOnBiff">&downloadOnBiff.label;</html:label>
-  </box>
-  <box><html:input wsm_persist="true" name="pop3.leaveMessagesOnServer" id="pop3.leaveMessagesOnServer" type="checkbox"/>
-            <html:label for="pop3.leaveMessagesOnServer">&leaveOnServer.label;</html:label>
-  </box>
-  <box><html:input wsm_persist="true" name="pop3.deleteMailLeftOnServer" id="pop3.deleteMailLeftOnServer" type="checkbox"/>
-            <html:label wsm_persist="true" for="pop3.deleteMailLeftOnServer">&deleteOnServer.label;</html:label>
-  </box>
+  <box id="serverPrefContainer" orient="vertical">
 
+  <checkbox wsm_persist="true" id="server.isSecure" value="&isSecure.label;"/>
+
+  <checkbox wsm_persist="true" id="server.rememberPassword" hidefor="nntp"
+            value="&savePassword.label;"/>
+
+  <box orient="horizontal">
+    <checkbox wsm_persist="true" id="server.doBiff" value="&biffStart.label;"/>
+    <textfield wsm_persist="true" id="server.biffMinutes" size="3"/>
+    <text class="label" for="server.biffMinutes" value="&biffEnd.label;"/>
+  </box>
+  <checkbox style="margin-left: 2em" hidefor="nntp"
+            wsm_persist="true" id="server.downloadOnBiff"
+            value="&downloadOnBiff.label;"/>
+  <checkbox wsm_persist="true" id="pop3.leaveMessagesOnServer"
+            value="&leaveOnServer.label;"/>
+
+  <checkbox wsm_persist="true" id="pop3.deleteMailLeftOnServer"
+            value="&deleteOnServer.label;"/>
 
   <!-- IMAP -->
-  <box>
-    <text value="&deleteMessagePrefix.label;"/>
-    <html:select wsm_persist="true" name="imap.deleteModel">
-          <html:option value="1">&modelMoveToTrash.label;</html:option>
-          <html:option value="0">&modelMarkDeleted.label;</html:option>
-          <html:option value="2">&modelDeleteImmediately.label;</html:option>
-    </html:select>
+  <box iscontrolcontainer="true">
+    <text class="label" value="&deleteMessagePrefix.label;"/>
+    <menulist wsm_persist="true" id="imap.deleteModel">
+      <menupopup>
+        <menuitem data="1" value="&modelMoveToTrash.label;"/>
+        <menuitem data="0" value="&modelMarkDeleted.label;"/>
+        <menuitem data="2" value="&modelDeleteImmediately.label;"/>
+      </menupopup>
+    </menulist>
   </box>
 
-  <box>
-    <html:input wsm_persist="true" name="imap.cleanupInboxOnExit" id="imap.cleanupInboxOnExit" type="checkbox"/>
-    <html:label for="imap.cleanupInboxOnExit">&expungeOnExit.label;</html:label>
-  </box>
-  <box>
-    <html:input wsm_persist="true" name="imap.emptyTrashOnExit" id="imap.emptyTrashOnExit" type="checkbox"/>
-    <html:label for="imap.emptyTrashOnExit">&emptyTrashOnExit.label;</html:label>
-  </box>
+  <checkbox wsm_persist="true" id="imap.cleanupInboxOnExit"
+            value="&expungeOnExit.label;"/>
+  <checkbox wsm_persist="true" id="imap.emptyTrashOnExit" iscontrolcontainer="true"
+            value="&emptyTrashOnExit.label;"/>
+
   <box iscontrolcontainer="true">
     <box orient="horizontal">
       <spring flex="100%"/>
@@ -98,49 +86,45 @@
                     onclick="openImapAdvanced(event);"/>
     </box>
 
-    <html:input wsm_persist="true" type="hidden" id="imap.dualUseFolders" name="imap.dualUseFolders"/>
-    <html:input wsm_persist="true" type="hidden" id="imap.usingSubscription" name="imap.usingSubscription"/>
-    <html:input wsm_persist="true" type="hidden" id="imap.personalNamespace" name="imap.personalNamespace"/>
-    <html:input wsm_persist="true" type="hidden" id="imap.publicNamespace" name="imap.publicNamespace"/>
-    <html:input wsm_persist="true" type="hidden" id="imap.otherUsersNamespace" name="imap.otherUsersNamespace"/>
-    <html:input wsm_persist="true" type="hidden" id="imap.serverDirectory" name="imap.serverDirectory"/>
-    <html:input wsm_persist="true" type="hidden" id="imap.overrideNamespaces" name="imap.overrideNamespaces"/>
+    <text hidden="true" wsm_persist="true" id="imap.dualUseFolders"/>
+    <text hidden="true" wsm_persist="true" id="imap.usingSubscription"/>
+    <text hidden="true" wsm_persist="true" id="imap.personalNamespace"/>
+    <text hidden="true" wsm_persist="true" id="imap.publicNamespace"/>
+    <text hidden="true" wsm_persist="true" id="imap.otherUsersNamespace"/>
+    <text hidden="true" wsm_persist="true" id="imap.serverDirectory"/>
+    <text hidden="true" wsm_persist="true" id="imap.overrideNamespaces"/>
   </box>
 
   <!-- News -->
   <box orient="horizontal">
-    <box>
-      <html:input wsm_persist="true" name="nntp.notifyOn" id="nntp.notifyOn" type="checkbox"/>
-      <html:label for="nntp.notifyOn">&maxMessagesStart.label;</html:label>
-    </box>
-    <box>
-      <html:input wsm_persist="true" name="nntp.maxArticles" type="text" size="6"/>
- 		    &maxMessagesEnd.label;
+    <checkbox wsm_persist="true" id="nntp.notifyOn"
+                value="&maxMessagesStart.label;"/>
+    <box iscontrolcontainer="true">
+      <textfield wsm_persist="true" id="nntp.maxArticles" size="6"/>
+      <text class="label" for="nntp.maxArticles" value="&maxMessagesEnd.label;"/>
     </box>
   </box>
     <box iscontrolcontainer="true" flex="100%">
       <titledbox orient="vertical">
          <title><text value="&abbreviate.label;"/></title>
 
-         <box>
-           <html:input wsm_persist="true" reversed="true" id="nntp.abbreviate.on" name="nntp.abbreviate" type="radio"/>
-           <html:label for="nntp.abbreviate.on" >&abbreviateOn.label;</html:label>
-         </box>
-         <box>
-           <html:input wsm_persist="true" id="id.nntp.abbreviate.off" name="nntp.abbreviate" type="radio"/>
-           <html:label for="id.nntp.abbreviate.off" >&abbreviateOff.label;</html:label>
-         </box>
+         <radiogroup orient="vertical" wsm_persist="true" id="nntp.abbreviate">
+           <radio wsm_persist="true" data="true" value="&abbreviateOn.label;"/>
+           <radio wsm_persist="true" data="false" value="&abbreviateOff.label;"/>
+         </radiogroup>
       </titledbox>
   </box>
 
-  <box orient="vertical">
+  <box orient="vertical" iscontrolcontainer="true">
     <text value="&newsrcFilePath.label;" for="nntp.newsrcFilePath"/>
-    <html:input wsm_persist="true" type="text" size="60" id="nntp.newsrcFilePath" name="nntp.newsrcFilePath" datatype="nsIFileSpec"/>
+    <textfield wsm_persist="true" size="60" id="nntp.newsrcFilePath"
+               datatype="nsIFileSpec"/>
   </box>
   </box>
   <spring flex="100%"/>
   <box orient="vertical">
     <text value="&localPath.label;" for="server.localPath"/>
-    <html:input wsm_persist="true" type="text" size="60" id="server.localPath" name="server.localPath" datatype="nsIFileSpec"/>
+    <textfield wsm_persist="true" size="60" id="server.localPath"
+            datatype="nsIFileSpec"/>
   </box>
 </window>
diff --git a/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul b/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
index 2dcda6aa5b57..828b076f5137 100644
--- a/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
+++ b/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
@@ -24,13 +24,13 @@
     <rows>
       <row>
         <text class="label" value="&accountName.label;" for="server.prettyName"/>
-        <html:input wsm_persist="true" type="text" size="30" name="server.prettyName" id="server.prettyName"/>
+        <textfield wsm_persist="true" size="30" id="server.prettyName"/>
       </row>
     </rows>
   </grid>
   <spring flex="1"/>
   <box align="vertical">
     <text value="&localPath.label;"/>
-    <html:input wsm_persist="true" type="text" size="60" name="server.localPath" datatype="nsIFileSpec"/>
+    <textfield wsm_persist="true" size="60" id="server.localPath" datatype="nsIFileSpec"/>
   </box>
 </window>
diff --git a/mailnews/base/prefs/resources/content/am-smtp.js b/mailnews/base/prefs/resources/content/am-smtp.js
index 4170d8e527e5..d1a26b4e022e 100644
--- a/mailnews/base/prefs/resources/content/am-smtp.js
+++ b/mailnews/base/prefs/resources/content/am-smtp.js
@@ -21,6 +21,12 @@
  * Alec Flett <alecf@netscape.com>
  */
 
+function onLoad()
+{
+    parent.onPanelLoaded('am-smtp.xul');
+    initSmtpSettings(null);
+}
+
 function onAdvanced(event)
 {
     var args = {result: false};
diff --git a/mailnews/base/prefs/resources/content/am-smtp.xul b/mailnews/base/prefs/resources/content/am-smtp.xul
index 4cec34bed384..590a60d92ac4 100644
--- a/mailnews/base/prefs/resources/content/am-smtp.xul
+++ b/mailnews/base/prefs/resources/content/am-smtp.xul
@@ -2,6 +2,7 @@
 <?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/pref/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xul-overlay href="chrome://messenger/content/smtpEditOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-advanced.dtd" >
 
@@ -9,7 +10,7 @@
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	flex="100%"
 	class="dialog"
-    onload="parent.onPanelLoaded('am-smtp.xul');"
+    onload="onLoad();"
 	align="vertical">
 
   <script language="javascript" src="am-smtp.js"/>
@@ -18,41 +19,7 @@
 
 <html>&smtpDesc.label;</html>
 
-  <box>
-     <text class="label" value="&smtpHostname.label;"/>
-     <html:input wsm_persist="true" type="text" size="30" name="smtp.hostname"/>
-  </box>
-  <grid width="100%">
-    <columns>
-      <column/>
-      <column/>
-    </columns>
-  <rows>
-    <row>
-      <html:input wsm_persist="true" type="checkbox" id="smtp.useUsername" name="smtp.useUsername"/>
-      <html:label for="smtp.useUsername">&smtpAlwaysUseName.label;</html:label>
-    </row>
-
-    <row>
-      <text/>
-      <box>
-        <text class="label" value="&smtpUsername.label;"/>
-        <html:input wsm_persist="true" type="text" size="30" name="smtp.username" flex="100%"/>
-      </box>
-  </row>
-  <row>
-    <text/>
-    <box>
-      <html:input wsm_persist="true" type="checkbox" id="smtp.savePassword" name="smtp.savePassword"/>
-      <html:label for="smtp.savePassword">&smtpSavePassword.label;</html:label>
-    </box>
-  </row>
-  <row>
-      <html:input wsm_persist="true" id="smtp.isSecure" name="smtp.isSecure" type="checkbox"/>
-      <html:label for="smtp.isSecure">&smtpUseSecure.label;</html:label>
-  </row>
-  </rows>
-</grid>    
+  <box id="smtpServerEditor"/>
 
   <box align="horizontal">
     <spring flex="100%"/>
diff --git a/mailnews/base/prefs/resources/content/smtpEditOverlay.js b/mailnews/base/prefs/resources/content/smtpEditOverlay.js
index 8ee5a613ae3c..b3c522a20007 100644
--- a/mailnews/base/prefs/resources/content/smtpEditOverlay.js
+++ b/mailnews/base/prefs/resources/content/smtpEditOverlay.js
@@ -28,7 +28,7 @@ function initSmtpSettings(server) {
     
     if (server) {
         document.getElementById("smtp.hostname").value = server.hostname;
-        document.getElementById("smtp.alwaysUseUsername").checked =
+        document.getElementById("smtp.useUsername").checked =
             server.alwaysUseUsername;
         document.getElementById("smtp.username").value = server.username;
         document.getElementById("smtp.savePassword").checked = server.savePassword;
@@ -54,8 +54,8 @@ function updateControls() {
 
     dump("Update controls..\n");
     var alwaysUseUsername =
-        (document.getElementById("smtp.alwaysUseUsername").checked == "true")
-        
+        document.getElementById("smtp.useUsername").checked;
+
     if (alwaysUseUsername) {
         document.getElementById("smtp.username").removeAttribute("disabled");
         document.getElementById("smtp.savePassword").removeAttribute("disabled");
@@ -68,7 +68,7 @@ function updateControls() {
 
 
     var isSecure =
-        (document.getElementById("smtp.isSecure").checked == "true");
+        document.getElementById("smtp.isSecure").checked;
 
     if (isSecure) {
         document.getElementById("smtp.alwaysSecure").removeAttribute("disabled");
diff --git a/mailnews/base/prefs/resources/content/smtpEditOverlay.xul b/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
index bdbc037a2b31..fdc6712dd1c5 100644
--- a/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
+++ b/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
@@ -34,21 +34,21 @@
   <box id="smtpServerEditor" orient="vertical">
     <box orient="horizontal">
       <text value="&serverName.label;"/>
-      <textfield id="smtp.hostname"/>
+      <textfield wsm_persist="true" id="smtp.hostname"/>
     </box>
     <!-- use a grid here when it's implemented -->
     <box orient="vertical">
-      <checkbox id="smtp.alwaysUseUsername" value="&alwaysUseUsername.label;"
+      <checkbox wsm_persist="true" id="smtp.useUsername" value="&alwaysUseUsername.label;"
                 oncommand="updateControls();"/>
       <box orient="vertical" style="margin-left: 2em">
         <box orient="horizontal">
           <text value="&userName.label;"/>
-          <textfield id="smtp.username"/>
+          <textfield wsm_persist="true" id="smtp.username"/>
         </box>
-        <checkbox id="smtp.savePassword" value="&savePassword.label;"/>
+        <checkbox wsm_persist="true" id="smtp.savePassword" value="&savePassword.label;"/>
       </box>
      </box>
-     <checkbox id="smtp.isSecure" value="&isSecure.label;" oncommand="updateControls();"/>
+     <checkbox wsm_persist="true" id="smtp.isSecure" value="&isSecure.label;" oncommand="updateControls();"/>
      <radiogroup id="smtp.trySSL">
        <box orient="horizontal">
          <radio value="&alwaysSecure.label;" id="smtp.alwaysSecure"/>