diff --git a/mozilla/mail/components/compose/content/MsgComposeCommands.js b/mozilla/mail/components/compose/content/MsgComposeCommands.js
index 6047bb3776c..4262eff0320 100644
--- a/mozilla/mail/components/compose/content/MsgComposeCommands.js
+++ b/mozilla/mail/components/compose/content/MsgComposeCommands.js
@@ -2937,6 +2937,9 @@ function LoadIdentity(startup)
         if (identityElement.selectedItem)
           identityElement.setAttribute('accountname', identityElement.selectedItem.getAttribute('accountname'));
 
+        for (var i = 1; i <= awGetMaxRecipients(); i++)
+          awGetInputElement(i).setAttribute("autocompletesearchparam", idKey);
+
         if (!startup && prevIdentity && idKey != prevIdentity.key)
         {
           var prefstring = "mail.identity." + prevIdentity.key;
diff --git a/mozilla/mail/components/compose/content/addressingWidgetOverlay.js b/mozilla/mail/components/compose/content/addressingWidgetOverlay.js
index b23ba75085a..f4a70c5a18c 100644
--- a/mozilla/mail/components/compose/content/addressingWidgetOverlay.js
+++ b/mozilla/mail/components/compose/content/addressingWidgetOverlay.js
@@ -36,7 +36,7 @@
 #
 # ***** END LICENSE BLOCK *****
 
-top.MAX_RECIPIENTS = 0;
+top.MAX_RECIPIENTS = 1; /* for the initial listitem created in the XUL */
 
 var inputElementType = "";
 var selectElementType = "";
diff --git a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
index fcdbb274e50..cd923bb17ec 100644
--- a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
+++ b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
@@ -2853,6 +2853,9 @@ function LoadIdentity(startup)
         var idKey = identityElement.value;
         gCurrentIdentity = gAccountManager.getIdentity(idKey);
 
+        for (var i = 1; i <= awGetMaxRecipients(); i++)
+          awGetInputElement(i).setAttribute("autocompletesearchparam", idKey);
+
         if (!startup && prevIdentity && idKey != prevIdentity.key)
         {
           var prefstring = "mail.identity." + prevIdentity.key;
diff --git a/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.js b/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.js
index d8a20d62288..f88be2f473c 100644
--- a/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.js
+++ b/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.js
@@ -35,7 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-top.MAX_RECIPIENTS = 0;
+top.MAX_RECIPIENTS = 1; /* for the initial listitem created in the XUL */
 
 var inputElementType = "";
 var selectElementType = "";