diff --git a/mail/base/content/commandglue.js b/mail/base/content/commandglue.js
index 55a2c5e980b3..25ea4935267d 100644
--- a/mail/base/content/commandglue.js
+++ b/mail/base/content/commandglue.js
@@ -147,7 +147,7 @@ function setTitleFromFolder(msgfolder, subject)
 #ifndef XP_MACOSX
     title += " - " + gBrandBundle.getString("brandShortName");
 #endif
-    window.title = title;
+    document.title = title;
 }
 
 function UpdateMailToolbar(caller)
diff --git a/mail/components/addrbook/content/abAddressBookNameDialog.js b/mail/components/addrbook/content/abAddressBookNameDialog.js
index 83b768c6b0c9..f168c087ecad 100644
--- a/mail/components/addrbook/content/abAddressBookNameDialog.js
+++ b/mail/components/addrbook/content/abAddressBookNameDialog.js
@@ -9,12 +9,9 @@ function abNameOnLoad()
 	// look in arguments[0] for parameters
 	if ("arguments" in window && window.arguments[0])
 	{
-		if ("title" in window.arguments[0])
-		{
-			var title = window.arguments[0].title;
-			top.window.title = title;
-		}
-		
+    if ("title" in window.arguments[0])
+      document.title = window.arguments[0].title;
+
 		if ("okCallback" in window.arguments[0])
 			top.okCallback = window.arguments[0].okCallback;
 
diff --git a/mail/components/addrbook/content/abCardOverlay.js b/mail/components/addrbook/content/abCardOverlay.js
index 89ba0543eeff..e924910d63ca 100644
--- a/mail/components/addrbook/content/abCardOverlay.js
+++ b/mail/components/addrbook/content/abCardOverlay.js
@@ -514,7 +514,6 @@ function CleanUpWebPage(webPage)
     return(webPage);
 }
 
-
 function NewCardCancelButton()
 {
   top.window.close();
@@ -561,12 +560,7 @@ function DisplayNameChanged()
   SetCardDialogTitle(displayName);
 }
 
-
 function SetCardDialogTitle(displayName)
-
 {
-
-   top.window.title = displayName ? gAddressBookBundle.getFormattedString(editCard.titleProperty + "WithDisplayName", [displayName]) : gAddressBookBundle.getString(editCard.titleProperty);
-
+  document.title = displayName ? gAddressBookBundle.getFormattedString(editCard.titleProperty + "WithDisplayName", [displayName]) : gAddressBookBundle.getString(editCard.titleProperty);
 }
-
diff --git a/mail/components/compose/content/MsgComposeCommands.js b/mail/components/compose/content/MsgComposeCommands.js
index 95dacdd29d94..8a5ba7353a29 100644
--- a/mail/components/compose/content/MsgComposeCommands.js
+++ b/mail/components/compose/content/MsgComposeCommands.js
@@ -2156,7 +2156,7 @@ function SetComposeWindowTitle()
     newTitle = sComposeMsgsBundle.getString("defaultSubject");
 
   newTitle += GetCharsetUIString();
-  window.title = sComposeMsgsBundle.getString("windowTitlePrefix") + " " + newTitle;
+  document.title = sComposeMsgsBundle.getString("windowTitlePrefix") + " " + newTitle;
 }
 
 // Check for changes to document and allow saving before closing