--- a/mail/components/preferences/jar.mn
+++ b/mail/components/preferences/jar.mn
@@ -49,17 +49,17 @@ messenger.jar:
     content/messenger/am-addressing.js                              (/mailnews/base/prefs/resources/content/am-addressing.js)
     content/messenger/am-server-advanced.xul                        (/mailnews/base/prefs/resources/content/am-server-advanced.xul)
     content/messenger/am-server-advanced.js                         (/mailnews/base/prefs/resources/content/am-server-advanced.js)
     content/messenger/am-smtp.xul                                   (/mailnews/base/prefs/resources/content/am-smtp.xul)
     content/messenger/am-smtp.js                                    (/mailnews/base/prefs/resources/content/am-smtp.js)
     content/messenger/am-prefs.js                                   (/mailnews/base/prefs/resources/content/am-prefs.js)
     content/messenger/am-identities-list.js                         (/mailnews/base/prefs/resources/content/am-identities-list.js)
     content/messenger/am-identities-list.xul                        (/mailnews/base/prefs/resources/content/am-identities-list.xul)
-    content/messenger/am-identity-edit.js                           (/mailnews/base/prefs/resources/content/am-identity-edit.js)
+*   content/messenger/am-identity-edit.js                           (/mailnews/base/prefs/resources/content/am-identity-edit.js)
     content/messenger/am-identity-edit.xul                          (/mailnews/base/prefs/resources/content/am-identity-edit.xul)
     content/messenger/am-copiesOverlay.xul                          (/mailnews/base/prefs/resources/content/am-copiesOverlay.xul)
 *   content/messenger/am-junk.xul                                   (/mailnews/base/prefs/resources/content/am-junk.xul)
 *   content/messenger/am-junk.js                                    (/mailnews/base/prefs/resources/content/am-junk.js)
 *   content/messenger/AccountWizard.xul                             (/mailnews/base/prefs/resources/content/AccountWizard.xul)
     content/messenger/AccountWizard.js                              (/mailnews/base/prefs/resources/content/AccountWizard.js)
     content/messenger/aw-accounttype.js                             (/mailnews/base/prefs/resources/content/aw-accounttype.js)
     content/messenger/aw-identity.js                                (/mailnews/base/prefs/resources/content/aw-identity.js)

--- a/mailnews/base/prefs/resources/content/am-identity-edit.js
+++ b/mailnews/base/prefs/resources/content/am-identity-edit.js
@@ -96,23 +96,24 @@ function initCopiesAndFolder(identity)
   document.getElementById('identity.doFcc').checked = copiesAndFoldersIdentity.doFcc;
   document.getElementById('identity.fccReplyFollowsParent').checked = copiesAndFoldersIdentity.fccReplyFollowsParent;
   document.getElementById('identity.showSaveMsgDlg').checked = copiesAndFoldersIdentity.showSaveMsgDlg;
   onInitCopiesAndFolders(); // am-copies.js method
 }
 
 function initCompositionAndAddressing(identity)
 {
-  createDirectoriesList();
-
   // if we are editing an existing identity, use it...otherwise copy our values from the default identity
   var addressingIdentity = identity ? identity : gAccount.defaultIdentity;
 
   document.getElementById('identity.directoryServer').value = addressingIdentity.directoryServer;
-  document.getElementById('identity.overrideGlobalPref').value = addressingIdentity.overrideGlobalPref;
+  document.getElementById('identity.overrideGlobal_Pref').value = addressingIdentity.overrideGlobalPref;
+#ifndef MOZ_THUNDERBIRD
+  document.getElementById('identity.autocompleteToMyDomain').checked = addressingIdentity.autocompleteToMyDomain;
+#endif
   document.getElementById('identity.composeHtml').checked = addressingIdentity.composeHtml;
   document.getElementById('identity.autoQuote').checked = addressingIdentity.autoQuote;
   document.getElementById('identity.replyOnTop').value = addressingIdentity.replyOnTop;
   document.getElementById('identity.sig_bottom').value = addressingIdentity.sigBottom;
 
   onInitCompositionAndAddressing(); // am-addressing.js method
 }
 
@@ -219,20 +220,21 @@ function saveCopiesAndFolderSettings(ide
   identity.doBccList = document.getElementById('identity.doBccList').value;
   identity.doFcc = document.getElementById('identity.doFcc').checked;
   identity.fccReplyFollowsParent = document.getElementById('identity.fccReplyFollowsParent').checked;
   identity.showSaveMsgDlg = document.getElementById('identity.showSaveMsgDlg').checked;
 }
 
 function saveAddressingAndCompositionSettings(identity)
 {
-  onSaveCompositionAndAddressing(); // am-addressing.js routine
-
   identity.directoryServer = document.getElementById('identity.directoryServer').value;
-  identity.overrideGlobalPref = document.getElementById('identity.overrideGlobalPref').value;
+  identity.overrideGlobalPref = document.getElementById('identity.overrideGlobal_Pref').value == "true";
+#ifndef MOZ_THUNDERBIRD
+  identity.autocompleteToMyDomain = document.getElementById('identity.autocompleteToMyDomain').checked;
+#endif
   identity.composeHtml = document.getElementById('identity.composeHtml').checked;
   identity.autoQuote = document.getElementById('identity.autoQuote').checked;
   identity.replyOnTop = document.getElementById('identity.replyOnTop').value;
   identity.sigBottom = document.getElementById('identity.sig_bottom').value == 'true';  
 }
 
 function selectFile()
 {

--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -70,17 +70,17 @@ messenger.jar:
     content/messenger/am-addressing.js                                         (base/prefs/resources/content/am-addressing.js)
     content/messenger/am-server-advanced.xul                                   (base/prefs/resources/content/am-server-advanced.xul)
     content/messenger/am-server-advanced.js                                    (base/prefs/resources/content/am-server-advanced.js)
     content/messenger/am-smtp.xul                                              (base/prefs/resources/content/am-smtp.xul)
     content/messenger/am-smtp.js                                               (base/prefs/resources/content/am-smtp.js)
     content/messenger/am-prefs.js                                              (base/prefs/resources/content/am-prefs.js)
     content/messenger/am-identities-list.js                                    (base/prefs/resources/content/am-identities-list.js)
     content/messenger/am-identities-list.xul                                   (base/prefs/resources/content/am-identities-list.xul)
-    content/messenger/am-identity-edit.js                                      (base/prefs/resources/content/am-identity-edit.js)
+*   content/messenger/am-identity-edit.js                                      (base/prefs/resources/content/am-identity-edit.js)
     content/messenger/am-identity-edit.xul                                     (base/prefs/resources/content/am-identity-edit.xul)
     content/messenger/am-copiesOverlay.xul                                     (base/prefs/resources/content/am-copiesOverlay.xul)
     content/messenger/pref-mailnews.xul                                        (base/prefs/resources/content/pref-mailnews.xul)
     content/messenger/pref-mailnews.js                                         (base/prefs/resources/content/pref-mailnews.js)
     content/messenger/pref-notifications.xul                                   (base/prefs/resources/content/pref-notifications.xul)
     content/messenger/pref-notifications.js                                    (base/prefs/resources/content/pref-notifications.js)
     content/messenger/pref-junk.xul                                            (base/prefs/resources/content/pref-junk.xul)
     content/messenger/pref-junk.js                                             (base/prefs/resources/content/pref-junk.js)