diff --git a/mozilla/mailnews/base/prefs/resources/content/AccountManager.js b/mozilla/mailnews/base/prefs/resources/content/AccountManager.js
index d70ab389a0d..914767b16ba 100644
--- a/mozilla/mailnews/base/prefs/resources/content/AccountManager.js
+++ b/mozilla/mailnews/base/prefs/resources/content/AccountManager.js
@@ -630,16 +630,15 @@ function restorePage(pageId, serverId) {
         var vals = pageElements[i].id.split(".");
         var type = vals[0];
         var slot = vals[1];
-      // buttons are lockable, but don't have any data so we skip that part.
-      // elements that do have data, we get the values at poke them in.
-      if (pageElements[i].localName != "button") {
-        var value = getAccountValue(account, accountValues, type, slot);
-        setFormElementValue(pageElements[i], value);
-      }
+        // buttons are lockable, but don't have any data so we skip that part.
+        // elements that do have data, we get the values at poke them in.
+        if (pageElements[i].localName != "button") {
+          var value = getAccountValue(account, accountValues, type, slot);
+          setFormElementValue(pageElements[i], value);
+        }
         updateElementWithKeys(account,pageElements[i],type);
         var isLocked = getAccountValueIsLocked(pageElements[i]);
-        if (isLocked)
-          setEnabled(pageElements[i],false);
+        setEnabled(pageElements[i],!isLocked);
       }
   }
 
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-addressing.js b/mozilla/mailnews/base/prefs/resources/content/am-addressing.js
index 798232ae244..d1c510fbd3b 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-addressing.js
+++ b/mozilla/mailnews/base/prefs/resources/content/am-addressing.js
@@ -28,14 +28,20 @@ function enabling()
       editButton.setAttribute("disabled", true);
       break;
     case "1":
-      // if the pref is locked, we'll need to avoid enabling the elements
-      if (overrideGlobalPref.getAttribute("disabled") != "true") {
         directoriesList.removeAttribute("disabled");
         directoriesListPopup.removeAttribute("disabled");
         editButton.removeAttribute("disabled");
-      }
       break;      
   }
+  var attrVal=overrideGlobalPref.getAttribute("disabled");
+  document.getElementById("ldapAutocomplete").disabled=attrVal;
+
+  // if the pref is locked, we'll need to disable the elements
+  if (overrideGlobalPref.getAttribute("disabled") == "true") {
+    directoriesList.setAttribute("disabled", true);
+    directoriesListPopup.setAttribute("disabled", true);
+    editButton.setAttribute("disabled", true);
+  }
   gFromGlobalPref = false;
   LoadDirectories(directoriesListPopup);
 }
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-copies.js b/mozilla/mailnews/base/prefs/resources/content/am-copies.js
index bca9abe0ce5..4c8c1b5f8c6 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-copies.js
+++ b/mozilla/mailnews/base/prefs/resources/content/am-copies.js
@@ -59,7 +59,6 @@ function onInit() {
                      tmplAccountPickerId, 
                      "identity.stationeryFolder", 
                      tmplFolderPickerId);
-
     initBccSelf();
     setupFccItems();
     gMessengerBundle = document.getElementById("bundle_messenger");
@@ -107,12 +106,24 @@ function SetFolderDisplay(pickerMode, disableMode,
 {
     if (!pickerMode)
         pickerMode = gDefaultPickerMode;
+
+    var selectAccountRadioId = radioElemPrefix + "_selectAccount";
+    var selectAccountRadioElem = document.getElementById(selectAccountRadioId);
+    var selectFolderRadioId = radioElemPrefix + "_selectFolder";
+    var selectFolderRadioElem = document.getElementById(selectFolderRadioId);
+
     switch (pickerMode) 
     {
         case "0" :
-            var radioElemId = radioElemPrefix + "_selectAccount";
-            var radioGroupElement = document.getElementById(radioElemId);
-            radioGroupElement.setAttribute("checked", "true");
+            selectAccountRadioElem.setAttribute("checked", "true");
+            selectFolderRadioElem.setAttribute("checked", "false");
+            if (disableMode) {
+              selectAccountRadioElem.setAttribute("disabled","true");
+              selectFolderRadioElem.setAttribute("disabled","true");
+            } else {
+              selectAccountRadioElem.removeAttribute("disabled");
+              selectFolderRadioElem.removeAttribute("disabled");
+            }
 
             var folderPickedElement = document.getElementById(folderPickedField);
             var uri = folderPickedElement.getAttribute("value");
@@ -122,9 +133,16 @@ function SetFolderDisplay(pickerMode, disableMode,
             break;
 
         case "1"  :
-            var radioElemId = radioElemPrefix + "_selectFolder";
-            var radioGroupElement = document.getElementById(radioElemId);
-            radioGroupElement.setAttribute("checked", "true");
+            selectFolderRadioElem.setAttribute("checked", "true");
+            selectAccountRadioElem.setAttribute("checked", "false");
+
+            if (disableMode) {
+              selectAccountRadioElem.setAttribute("disabled","true");
+              selectFolderRadioElem.setAttribute("disabled","true");
+            } else {
+              selectAccountRadioElem.removeAttribute("disabled");
+              selectFolderRadioElem.removeAttribute("disabled");
+            }
 		    	
             InitFolderDisplay(folderPickedField, folderPickerId);
             SetPickerEnabling(folderPickerId, accountPickerId);
@@ -133,19 +151,6 @@ function SetFolderDisplay(pickerMode, disableMode,
             dump("Error in setting initial folder display on pickers\n");
             break;
     }
-    if (disableMode) {
-        var radioId = radioElemPrefix + "_selectAccount";
-        var radioElement = document.getElementById(radioId);
-        radioElement.setAttribute("disabled", "true");
-        radioId = radioElemPrefix + "_selectFolder";
-        radioElement = document.getElementById(radioId);
-        radioElement.setAttribute("disabled", "true");
-
-        var picker = document.getElementById(folderPickerId);
-        picker.setAttribute("disabled", "true");
-        picker = document.getElementById(accountPickerId);
-        picker.setAttribute("disabled", "true");
-    }
 }
 
 // Initialize the folder display based on prefs values