diff --git a/mail/base/content/mailCore.js b/mail/base/content/mailCore.js
index e72886ffef8..a360ed0535d 100644
--- a/mail/base/content/mailCore.js
+++ b/mail/base/content/mailCore.js
@@ -1,129 +1,129 @@
-# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is Mozilla Communicator client code, released
-# March 31, 1998.
-# 
-#
-# Contributor(s):
-
-/*
- * Core mail routines used by all of the major mail windows (address book, 3-pane, compose and stand alone message window).
- * Routines to support custom toolbars in mail windows, opening up a new window of a particular type all live here. 
- * Before adding to this file, ask yourself, is this a JS routine that is going to be used by all of the main mail windows?
- */
-
-function CustomizeMailToolbar(id)
-{
-  // Disable the toolbar context menu items
-  var menubar = document.getElementById("mail-menubar");
-  for (var i = 0; i < menubar.childNodes.length; ++i)
-    menubar.childNodes[i].setAttribute("disabled", true);
-    
-  var customizePopup = document.getElementById("CustomizeMailToolbar"); 
-  customizePopup.setAttribute("disabled", "true");
-   
-  window.openDialog("chrome://global/content/customizeToolbar.xul", "CustomizeToolbar",
-                    "chrome,all,dependent", document.getElementById(id));
-}
-
-function MailToolboxCustomizeDone(aToolboxChanged)
-{
-  // Update global UI elements that may have been added or removed
-
-  // Re-enable parts of the UI we disabled during the dialog
-  var menubar = document.getElementById("mail-menubar");
-  for (var i = 0; i < menubar.childNodes.length; ++i)
-    menubar.childNodes[i].setAttribute("disabled", false);
-
-  var customizePopup = document.getElementById("CustomizeMailToolbar");
-  customizePopup.removeAttribute("disabled");
-
-  // make sure our toolbar buttons have the correct enabled state restored to them...
-  if (this.UpdateMailToolbar != undefined)
-    UpdateMailToolbar(focus); 
-}
-
-function onViewToolbarCommand(aToolbarId, aMenuItemId)
-{
-  var toolbar = document.getElementById(aToolbarId);
-  var menuItem = document.getElementById(aMenuItemId);
-
-  if (!toolbar || !menuItem) return;
-
-  var toolbarCollapsed = toolbar.collapsed;
-  
-  // toggle the checkbox
-  menuItem.setAttribute('checked', toolbarCollapsed);
-  
-  // toggle visibility of the toolbar
-  toolbar.collapsed = !toolbarCollapsed;   
-
-  document.persist(aToolbarId, 'collapsed');
-  document.persist(aMenuItemId, 'checked');
-}
-
-function toJavaScriptConsole()
-{
-    toOpenWindowByType("global:console", "chrome://global/content/console.xul");
-}
-
-const nsIWindowMediator = Components.interfaces.nsIWindowMediator;
-
-function toOpenWindowByType( inType, uri )
-{
-	var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
-
-	var	windowManagerInterface = windowManager.QueryInterface(nsIWindowMediator);
-
-	var topWindow = windowManagerInterface.getMostRecentWindow( inType );
-	
-	if ( topWindow )
-		topWindow.focus();
-	else
-		window.open(uri, "_blank", "chrome,extrachrome,menubar,resizable,scrollbars,status,toolbar");
-}
-
-function toMessengerWindow()
-{
-  toOpenWindowByType("mail:3pane", "chrome://messenger/content/messenger.xul");
-}
-    
-function toAddressBook() 
-{
-  toOpenWindowByType("mail:addressbook", "chrome://messenger/content/addressbook/addressbook.xul");
-}
-
-function toImport()
-{
-  window.openDialog("chrome://messenger/content/importDialog.xul","importDialog","chrome, modal, titlebar", {importType: "addressbook"});
-}
-
-// this method is overridden by mail-offline.js if we build with the offline extensions
-function CheckOnline()
-{
-  return true; 
-}
-
-function openOptionsDialog(containerID, paneURL, itemID)
-{
-  //check for an existing pref window and focus it; it's not application modal
-  const kWindowMediatorContractID = "@mozilla.org/appshell/window-mediator;1";
-  const kWindowMediatorIID = Components.interfaces.nsIWindowMediator;
-  const kWindowMediator = Components.classes[kWindowMediatorContractID].getService(kWindowMediatorIID);
-  var lastPrefWindow = kWindowMediator.getMostRecentWindow("mozilla:preferences");
-  
-  if (lastPrefWindow)
-    lastPrefWindow.focus();
-  else 
-    openDialog("chrome://communicator/content/pref/pref.xul","PrefWindow", 
-               "chrome,titlebar,resizable=yes", paneURL, containerID, itemID);
-}
+# -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is Mozilla Communicator client code, released
+# March 31, 1998.
+# 
+#
+# Contributor(s):
+
+/*
+ * Core mail routines used by all of the major mail windows (address book, 3-pane, compose and stand alone message window).
+ * Routines to support custom toolbars in mail windows, opening up a new window of a particular type all live here. 
+ * Before adding to this file, ask yourself, is this a JS routine that is going to be used by all of the main mail windows?
+ */
+
+function CustomizeMailToolbar(id)
+{
+  // Disable the toolbar context menu items
+  var menubar = document.getElementById("mail-menubar");
+  for (var i = 0; i < menubar.childNodes.length; ++i)
+    menubar.childNodes[i].setAttribute("disabled", true);
+    
+  var customizePopup = document.getElementById("CustomizeMailToolbar"); 
+  customizePopup.setAttribute("disabled", "true");
+   
+  window.openDialog("chrome://global/content/customizeToolbar.xul", "CustomizeToolbar",
+                    "chrome,all,dependent", document.getElementById(id));
+}
+
+function MailToolboxCustomizeDone(aToolboxChanged)
+{
+  // Update global UI elements that may have been added or removed
+
+  // Re-enable parts of the UI we disabled during the dialog
+  var menubar = document.getElementById("mail-menubar");
+  for (var i = 0; i < menubar.childNodes.length; ++i)
+    menubar.childNodes[i].setAttribute("disabled", false);
+
+  var customizePopup = document.getElementById("CustomizeMailToolbar");
+  customizePopup.removeAttribute("disabled");
+
+  // make sure our toolbar buttons have the correct enabled state restored to them...
+  if (this.UpdateMailToolbar != undefined)
+    UpdateMailToolbar(focus); 
+}
+
+function onViewToolbarCommand(aToolbarId, aMenuItemId)
+{
+  var toolbar = document.getElementById(aToolbarId);
+  var menuItem = document.getElementById(aMenuItemId);
+
+  if (!toolbar || !menuItem) return;
+
+  var toolbarCollapsed = toolbar.collapsed;
+  
+  // toggle the checkbox
+  menuItem.setAttribute('checked', toolbarCollapsed);
+  
+  // toggle visibility of the toolbar
+  toolbar.collapsed = !toolbarCollapsed;   
+
+  document.persist(aToolbarId, 'collapsed');
+  document.persist(aMenuItemId, 'checked');
+}
+
+function toJavaScriptConsole()
+{
+    toOpenWindowByType("global:console", "chrome://global/content/console.xul");
+}
+
+const nsIWindowMediator = Components.interfaces.nsIWindowMediator;
+
+function toOpenWindowByType( inType, uri )
+{
+	var windowManager = Components.classes['@mozilla.org/appshell/window-mediator;1'].getService();
+
+	var	windowManagerInterface = windowManager.QueryInterface(nsIWindowMediator);
+
+	var topWindow = windowManagerInterface.getMostRecentWindow( inType );
+	
+	if ( topWindow )
+		topWindow.focus();
+	else
+		window.open(uri, "_blank", "chrome,extrachrome,menubar,resizable,scrollbars,status,toolbar");
+}
+
+function toMessengerWindow()
+{
+  toOpenWindowByType("mail:3pane", "chrome://messenger/content/messenger.xul");
+}
+    
+function toAddressBook() 
+{
+  toOpenWindowByType("mail:addressbook", "chrome://messenger/content/addressbook/addressbook.xul");
+}
+
+function toImport()
+{
+  window.openDialog("chrome://messenger/content/importDialog.xul","importDialog","chrome, modal, titlebar", {importType: "addressbook"});
+}
+
+// this method is overridden by mail-offline.js if we build with the offline extensions
+function CheckOnline()
+{
+  return true; 
+}
+
+function openOptionsDialog(containerID, paneURL, itemID)
+{
+  //check for an existing pref window and focus it; it's not application modal
+  const kWindowMediatorContractID = "@mozilla.org/appshell/window-mediator;1";
+  const kWindowMediatorIID = Components.interfaces.nsIWindowMediator;
+  const kWindowMediator = Components.classes[kWindowMediatorContractID].getService(kWindowMediatorIID);
+  var lastPrefWindow = kWindowMediator.getMostRecentWindow("mozilla:preferences");
+  
+  if (lastPrefWindow)
+    lastPrefWindow.focus();
+  else 
+    openDialog("chrome://communicator/content/pref/pref.xul","PrefWindow", 
+               "chrome,titlebar,resizable=yes", paneURL, containerID, itemID);
+}