diff --git a/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.js b/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.js
index 1acfd36c12b..8bc08c3aaa1 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.js
+++ b/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.js
@@ -23,20 +23,27 @@
 
 // pull stuff out of window.arguments
 var server=window.arguments[0];
-var result=window.arguments[1]
 
 // initialize the controls with the "server" argument
+
+var gControls;
+function getControls() {
+    if (!gControls)
+        gControls = document.getElementsByAttribute("imap_persist", "true");
+    return gControls;
+}
+    
 function onLoad()
 {
-    var controls = document.controls;
+    var controls = getControls();
 
     for (var i=0; i<controls.length; i++) {
 
-        var slot = controls[i].name;
+        var slot = controls[i].id;
         var val = server[slot];
 
         if (val) {
-            if (controls[i].type.toLowerCase() == "checkbox") {
+            if (controls[i].tagName.toLowerCase() == "checkbox") {
                 controls[i].checked = val;
             }
             else
@@ -50,12 +57,12 @@ function onLoad()
 // save the controls back to the "server" array
 function onOk()
 {
-    var controls = document.controls;
+    var controls = getControls();
     
     for (var i=0; i<controls.length; i++) {
-        var slot = controls[i].name;
+        var slot = controls[i].id;
         if (slot) {
-            if (controls[i].type.toLowerCase() == "checkbox") {
+            if (controls[i].tagName.toLowerCase() == "checkbox") {
                  server[slot] = controls[i].checked;
             }
             else
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.xul b/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.xul
index 2d6f813c136..f79c932e9a1 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-imap-advanced.xul
@@ -18,18 +18,13 @@
 
 <box>
   <text value="&serverDirectory.label;"/>
-  <html:input type="text" id="serverDirectory" name="serverDirectory"/>
+  <textfield imap_persist="true" id="serverDirectory"/>
 </box>
 
-<box>
-  <html:input type="checkbox" id="usingSubscription" name="usingSubscription"/>
-  <html:label for="usingSubscription">&usingSubscription.label;</html:label>
-</box>
+  <checkbox imap_persist="true" id="usingSubscription" value="&usingSubscription.label;"/>
+
+  <checkbox imap_persist="true" id="dualUseFolders" value="&dualUseFolders.label;"/>
 
-<box>
-  <html:input type="checkbox" id="dualUseFolders" name="dualUseFolders"/>
-  <html:label for="dualUseFolders">&dualUseFolders.label;</html:label>
-</box>
 <html>&namespaceDesc.label;</html>
 <grid style="padding-left: 10px">
   <columns>
@@ -38,23 +33,22 @@
   </columns>
   <rows>
     <row>
-      <text value="&personalNamespace.label;"/>
-      <box><html:input type="text" id="personalNamespace" name="personalNamespace"/></box>
+      <text for="personalNamespace" class="label" value="&personalNamespace.label;"/>
+      <textfield imap_persist="true" id="personalNamespace" />
     </row>
     <row>
-      <text value="&publicNamespace.label;"/>
-      <box><html:input type="text" id="publicNamespace" name="publicNamespace"/></box>
+      <text for="publicNamespace" class="label" value="&publicNamespace.label;"/>
+      <textfield imap_persist="true" id="publicNamespace"/>
     </row>
     <row>
-      <text value="&otherUsersNamespace.label;"/>
-      <box><html:input type="text" id="otherUsersNamespace" name="otherUsersNamespace"/></box>
+      <text for="otherUsersNamespace" class="label" value="&otherUsersNamespace.label;"/>
+      <textfield imap_persist="true" id="otherUsersNamespace"/>
     </row>
   </rows>
 </grid>
-<box>
-  <html:input type="checkbox" id="overrideNamespaces" name="overrideNamespaces"/>
-  <html:label for="overrideNamespaces">&overrideNamespaces.label;</html:label>
-</box>
+
+<checkbox imap_persist="true" id="overrideNamespaces" value="&overrideNamespaces.label;"/>
+
 <separator class="groove"/>
 <box id="okCancelButtons"/>
 
