diff --git a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
index 0edc04f324f..ef3413c302d 100644
--- a/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
+++ b/mozilla/mailnews/compose/resources/content/MsgComposeCommands.js
@@ -177,6 +177,12 @@ function enableEditableFields()
 
 var gComposeRecyclingListener = {
   onClose: function() {
+    //Reset focus to avoid undesirable visual effect when reopening the winodw
+    var identityElement = document.getElementById("msgIdentity");
+    if (identityElement)
+      identityElement.focus();
+
+    //Reset recipients and attachments
 	  awResetAllRows();
 	  RemoveAllAttachments();