Bug 1487572 - Rename mailServices.js to MailServices.jsm. r=mkmelin

--HG--
rename : mailnews/base/util/mailServices.js => mailnews/base/util/MailServices.jsm
extra : rebase_source : 7ecd648075015c893ae9c8e4860541744261557c

calendar/base/modules/utils/calEmailUtils.jsm

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { MailServices } = ChromeUtils.import("resource:///modules/mailServices.js", null);
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");

calendar/base/modules/utils/calItipUtils.jsm

@@ -5,7 +5,7 @@
 ChromeUtils.import("resource://gre/modules/Preferences.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
-const { MailServices } = ChromeUtils.import("resource:///modules/mailServices.js", null);
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 XPCOMUtils.defineLazyModuleGetter(this, "cal", "resource://calendar/modules/calUtils.jsm", "cal");
 

calendar/base/modules/utils/calProviderUtils.jsm

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-const { MailServices } = ChromeUtils.import("resource:///modules/mailServices.js", null);
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Preferences.jsm");

calendar/itip/calItipEmailTransport.js

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-var { MailServices } = ChromeUtils.import("resource:///modules/mailServices.js", null);
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 var { cal } = ChromeUtils.import("resource://calendar/modules/calUtils.jsm", null);
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");

calendar/lightning/content/lightning-item-panel.js

@@ -15,7 +15,7 @@
 // XXX Need to determine which of these we really need here.
 var { cal } = ChromeUtils.import("resource://calendar/modules/calUtils.jsm", null);
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-var { MailServices } = ChromeUtils.import("resource:///modules/mailServices.js", null);
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 // gTabmail is null if we are in a dialog window and not in a tab.
 var gTabmail = document.getElementById("tabmail") || null;

calendar/lightning/content/lightning-utils.js

@@ -7,7 +7,7 @@
  */
 
 var { fixIterator } = ChromeUtils.import("resource:///modules/iteratorUtils.jsm", null);
-var { MailServices } = ChromeUtils.import("resource:///modules/mailServices.js", null);
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 var { cal } = ChromeUtils.import("resource://calendar/modules/calUtils.jsm", null);
 
 /**

calendar/lightning/modules/ltnInvitationUtils.jsm

@@ -5,7 +5,7 @@
 const { cal } = ChromeUtils.import("resource://calendar/modules/calUtils.jsm", null);
 const { recurrenceRule2String } = ChromeUtils.import("resource://calendar/modules/calRecurrenceUtils.jsm", null);
 ChromeUtils.import("resource://gre/modules/Preferences.jsm");
-const { MailServices } = ChromeUtils.import("resource:///modules/mailServices.js", null);
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 this.EXPORTED_SYMBOLS = ["ltn"]; /* exported ltn */
 var ltn = {};

calendar/test/unit/test_ltninvitationutils.js

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 const { ltn } = ChromeUtils.import("resource://calendar/modules/ltnInvitationUtils.jsm", null);
-var { MailServices } = ChromeUtils.import("resource:///modules/mailServices.js", null);
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Preferences.jsm");
 
 function run_test() {

mail/base/content/ABSearchDialog.js

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ChromeUtils.import("resource:///modules/ABQueryUtils.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/PluralForm.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 

mail/base/content/FilterListDialog.js

@@ -5,7 +5,7 @@
 
 ChromeUtils.import("resource://gre/modules/PluralForm.jsm");
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var gFilterListMsgWindow = null;

mail/base/content/editContactPanel.js

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var editContactInlineUI = {

mail/base/content/folderPane.js

@@ -9,7 +9,7 @@
 
 ChromeUtils.import("resource:///modules/folderUtils.jsm");
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/MailUtils.js");
 ChromeUtils.import("resource:///modules/IOUtils.js");
 ChromeUtils.import("resource:///modules/FeedUtils.jsm");

mail/base/content/glodaFacetBindings.xml

@@ -18,7 +18,7 @@
   </content>
   <implementation>
     <constructor><![CDATA[
-      ChromeUtils.import("resource:///modules/mailServices.js");
+      ChromeUtils.import("resource:///modules/MailServices.jsm");
     ]]></constructor>
     <!-- Indicate that we are based on a fulltext search-->
     <method name="setFulltext">
@@ -1507,7 +1507,7 @@
   </content>
   <implementation>
     <constructor><![CDATA[
-      ChromeUtils.import("resource:///modules/mailServices.js");
+      ChromeUtils.import("resource:///modules/MailServices.jsm");
       this.build();
     ]]></constructor>
     <method name="build">

mail/base/content/macMessengerMenu.js

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 // Load and add the menu item to the OS X Dock icon menu.
 addEventListener("load", function() {

mail/base/content/mail3PaneWindowCommands.js

@@ -7,7 +7,7 @@
  * consisting of folder pane, thread pane and message pane.
  */
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/MailUtils.js");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/PluralForm.jsm");

mail/base/content/mailCommands.js

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/MailUtils.js");
 
 /**

mail/base/content/mailContextMenus.js

@@ -4,7 +4,7 @@
 
 ChromeUtils.import("resource://gre/modules/PluralForm.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var mailtolength = 7;
 

mail/base/content/mailCore.js

@@ -17,7 +17,7 @@ ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/CharsetMenu.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "gViewSourceUtils", function() {
   let scope = {};

mail/base/content/mailWidgets.xml

@@ -1301,7 +1301,7 @@
       </method>
       <constructor>
         <![CDATA[
-          ChromeUtils.import("resource:///modules/mailServices.js");
+          ChromeUtils.import("resource:///modules/MailServices.jsm");
         ]]>
       </constructor>
     </implementation>
@@ -1629,7 +1629,7 @@
       </property>
       <constructor>
       <![CDATA[
-        ChromeUtils.import("resource:///modules/mailServices.js");
+        ChromeUtils.import("resource:///modules/MailServices.jsm");
         ChromeUtils.import("resource://gre/modules/Services.jsm", this);
         initializeTermFromId(this.id);
       ]]>
@@ -1703,7 +1703,7 @@
       </property>
       <constructor>
         <![CDATA[
-          ChromeUtils.import("resource:///modules/mailServices.js");
+          ChromeUtils.import("resource:///modules/MailServices.jsm");
           ChromeUtils.import("resource://gre/modules/Services.jsm", this);
         ]]>
       </constructor>
@@ -2118,7 +2118,7 @@
       </method>
       <constructor>
       <![CDATA[
-        ChromeUtils.import("resource:///modules/mailServices.js");
+        ChromeUtils.import("resource:///modules/MailServices.jsm");
         ChromeUtils.import("resource://gre/modules/Services.jsm", this);
 
         // initialize strings
@@ -2610,7 +2610,7 @@
       </method>
       <constructor>
         <![CDATA[
-          ChromeUtils.import("resource:///modules/mailServices.js");
+          ChromeUtils.import("resource:///modules/MailServices.jsm");
           ChromeUtils.import("resource://gre/modules/Services.jsm", this);
         ]]>
       </constructor>

mail/base/content/mailWindow.js

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/appIdleManager.js");
 ChromeUtils.import("resource:///modules/MailUtils.js");
 ChromeUtils.import("resource://gre/modules/Services.jsm");

mail/base/content/mailWindowOverlay.js

@@ -6,7 +6,7 @@
 ChromeUtils.import("resource:///modules/FeedUtils.jsm");
 ChromeUtils.import("resource:///modules/gloda/dbview.js");
 ChromeUtils.import("resource:///modules/MailConsts.js");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/MailUtils.js");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/PluralForm.jsm");

mail/base/content/msgHdrView.js

@@ -10,7 +10,7 @@
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource:///modules/displayNameUtils.js");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/gloda/utils.js");
 var {Status: statusUtils} =
   ChromeUtils.import("resource:///modules/imStatusUtils.jsm");

mail/base/content/msgMail3PaneWindow.js

@@ -11,7 +11,7 @@ ChromeUtils.import("resource:///modules/jsTreeSelection.js");
 ChromeUtils.import("resource:///modules/MailConsts.js");
 ChromeUtils.import("resource:///modules/mailInstrumentation.js");
 ChromeUtils.import("resource:///modules/mailnewsMigrator.js");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/msgDBCacheManager.js");
 ChromeUtils.import("resource:///modules/sessionStoreManager.js");
 ChromeUtils.import("resource:///modules/summaryFrameManager.js");

mail/base/content/multimessageview.js

@@ -7,7 +7,7 @@ ChromeUtils.import("resource:///modules/gloda/gloda.js");
 ChromeUtils.import("resource:///modules/gloda/connotent.js");
 ChromeUtils.import("resource:///modules/gloda/mimemsg.js");
 ChromeUtils.import("resource:///modules/displayNameUtils.js");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/templateUtils.js");
 
 var gMessenger = Cc["@mozilla.org/messenger;1"]

mail/base/content/newTagDialog.js

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var dialog;

mail/base/modules/MailUtils.js

@@ -6,7 +6,7 @@ var EXPORTED_SYMBOLS = ["MailUtils"];
 
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
 ChromeUtils.import("resource:///modules/MailConsts.js");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/PluralForm.jsm");
 

mail/base/modules/dbViewWrapper.js

@@ -4,7 +4,7 @@
 
 this.EXPORTED_SYMBOLS = ['DBViewWrapper', 'IDBViewWrapperListener'];
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/mailViewManager.js");
 ChromeUtils.import("resource:///modules/searchSpec.js");
 ChromeUtils.import("resource:///modules/virtualFolderWrapper.js");

mail/base/modules/displayNameUtils.js

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/StringBundle.js");
 
 var EXPORTED_SYMBOLS = [

mail/base/modules/mailInstrumentation.js

@@ -14,7 +14,7 @@ var nsIMFNService = Ci.nsIMsgFolderNotificationService;
 
 ChromeUtils.import("resource:///modules/errUtils.js");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 Cu.importGlobalProperties(["XMLHttpRequest"]);
 

mail/base/modules/mailMigrator.js

@@ -12,7 +12,7 @@
 var EXPORTED_SYMBOLS = ["MailMigrator"];
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/IOUtils.js");
 
 ChromeUtils.defineModuleGetter(this, "LoginHelper",

mail/base/modules/quickFilterManager.js

@@ -11,7 +11,7 @@ ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
 ChromeUtils.import("resource:///modules/errUtils.js");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/searchSpec.js");
 
 var nsMsgSearchAttrib = Ci.nsMsgSearchAttrib;

mail/base/modules/searchSpec.js

@@ -5,7 +5,7 @@
 this.EXPORTED_SYMBOLS = ['SearchSpec'];
 
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var nsMsgSearchScope = Ci.nsMsgSearchScope;

mail/base/test/unit/head_mailbase.js

@@ -1,5 +1,5 @@
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://testing-common/mailnews/mailTestUtils.js");
 

mail/base/test/unit/test_alertHook.js

@@ -4,7 +4,7 @@
 
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource:///modules/activity/alertHook.js");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://testing-common/mailnews/MockFactory.js");
 alertHook.init();
 

mail/base/test/unit/test_viewWrapper_virtualFolderCustomTerm.js

@@ -16,7 +16,7 @@ load("../../../../mailnews/resources/messageInjection.js");
 
 load("resources/viewWrapperTestUtils.js");
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 initViewWrapperTestUtils({mode: "imap", offline: false});
 

mail/components/about-support/content/aboutSupport.js

@@ -14,7 +14,7 @@ ChromeUtils.import("resource://gre/modules/Troubleshoot.jsm");
 ChromeUtils.import("resource://gre/modules/ResetProfile.jsm");
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
 // added for TB
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 // end of TB addition
 
 ChromeUtils.defineModuleGetter(this, "PluralForm",

mail/components/about-support/content/accounts.js

@@ -6,7 +6,7 @@
 
 "use strict";
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 

mail/components/accountcreation/content/createInBackend.js

@@ -12,7 +12,7 @@
  * @return - the account created.
  */
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 /* eslint-disable complexity */

mail/components/accountcreation/content/emailWizard.js

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource:///modules/hostnameUtils.jsm");
 ChromeUtils.import("resource:///modules/OAuth2Providers.jsm");

mail/components/accountcreation/content/fetchConfig.js

@@ -9,7 +9,7 @@
  * Params @see fetchConfigFromISP()
  */
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource:///modules/JXON.js");
 

mail/components/accountcreation/content/verifyConfig.js

@@ -29,7 +29,7 @@
  *   The ex.message will contain a user-presentable message.
  */
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/OAuth2Providers.jsm");
 
 if (typeof gEmailWizardLogger == "undefined") {

mail/components/activity/modules/alertHook.js

@@ -9,7 +9,7 @@ var nsActWarning = Components.Constructor("@mozilla.org/activity-warning;1",
                                             "nsIActivityWarning", "init");
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 // This module provides a link between the send later service and the activity

mail/components/activity/modules/moveCopy.js

@@ -14,7 +14,7 @@ var nsActWarning = Components.Constructor("@mozilla.org/activity-warning;1",
 var nsMsgFolderFlags = Ci.nsMsgFolderFlags;
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/PluralForm.jsm");
 ChromeUtils.import("resource:///modules/gloda/log4moz.js");

mail/components/activity/modules/pop3Download.js

@@ -13,7 +13,7 @@ var nsActWarning = Components.Constructor("@mozilla.org/activity-warning;1",
                                             "nsIActivityWarning", "init");
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/PluralForm.jsm");
 ChromeUtils.import("resource:///modules/gloda/log4moz.js");

mail/components/addrbook/content/abCard.js

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-var { MailServices } = ChromeUtils.import("resource:///modules/mailServices.js", null);
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var kNonVcardFields =
         ["NickNameContainer", "SecondaryEmailContainer", "ScreenNameContainer",

mail/components/addrbook/content/abCommon.js

@@ -18,7 +18,7 @@
 // toolkit/content/globalOverlay.js
 /* globals goUpdateCommand */
 
-var { MailServices } = ChromeUtils.import("resource:///modules/mailServices.js", null);
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/IOUtils.js");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/FileUtils.jsm");

mail/components/addrbook/content/abTrees.js

@@ -13,7 +13,7 @@
  */
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-var { MailServices } = ChromeUtils.import("resource:///modules/mailServices.js", null);
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/IOUtils.js");
 
 // Tree Sort helper methods.

mail/components/addrbook/content/addressbook.js

@@ -27,7 +27,7 @@
 // Ensure the activity modules are loaded for this window.
 ChromeUtils.import("resource:///modules/activity/activityModules.js");
 ChromeUtils.import("resource:///modules/ABQueryUtils.jsm");
-var { MailServices } = ChromeUtils.import("resource:///modules/mailServices.js", null);
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/PluralForm.jsm");
 ChromeUtils.import("resource://gre/modules/Preferences.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");

mail/components/compose/content/MsgComposeCommands.js

@@ -14,7 +14,7 @@ ChromeUtils.import("resource:///modules/mimeParser.jsm");
 ChromeUtils.import("resource:///modules/errUtils.js");
 ChromeUtils.import("resource:///modules/folderUtils.jsm");
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/MailUtils.js");
 ChromeUtils.import("resource://gre/modules/InlineSpellChecker.jsm");
 ChromeUtils.import("resource://gre/modules/PluralForm.jsm");

mail/components/compose/content/addressingWidgetOverlay.js

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 top.MAX_RECIPIENTS = 1; /* for the initial listitem created in the XUL */
 

mail/components/im/content/imAccountWizard.js

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ChromeUtils.import("resource:///modules/imServices.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var PREF_EXTENSIONS_GETMOREPROTOCOLSURL = "extensions.getMoreProtocolsURL";
 

mail/components/im/content/imAccounts.js

@@ -4,7 +4,7 @@
 
 ChromeUtils.import("resource:///modules/imServices.jsm");
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/DownloadUtils.jsm");
 
 // This is the list of notifications that the account manager window observes

mail/components/im/modules/chatHandler.jsm

@@ -6,7 +6,7 @@ this.EXPORTED_SYMBOLS = ["allContacts", "onlineContacts", "ChatCore"];
 
 ChromeUtils.import("resource:///modules/imServices.jsm");
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var allContacts = {};
 var onlineContacts = {};

mail/components/im/modules/index_im.js

@@ -12,7 +12,7 @@ ChromeUtils.import("resource:///modules/gloda/indexer.js");
 ChromeUtils.import("resource:///modules/imServices.jsm");
 ChromeUtils.import("resource:///modules/imXPCOMUtils.jsm");
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
 ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");

mail/components/newmailaccount/content/accountProvisioner.js

@@ -7,7 +7,7 @@ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 ChromeUtils.import("resource://gre/modules/PluralForm.jsm");
 ChromeUtils.import("resource:///modules/StringBundle.js");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/gloda/log4moz.js");
 
 // Get a configured logger for this component.

mail/components/nsMailDefaultHandler.js

@@ -6,7 +6,7 @@
 ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var nsISupports              = Ci.nsISupports;
 

mail/components/preferences/preferences.js

@@ -4,7 +4,7 @@
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 window.addEventListener("load", function () {
   let prefWindow = document.getElementById("MailPreferences");

mail/components/search/searchCommon.js

@@ -18,7 +18,7 @@
 
 ChromeUtils.import("resource:///modules/gloda/log4moz.js");
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/MailUtils.js");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 

mail/components/test/unit/head_mailcomponents.js

@@ -1,5 +1,5 @@
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://testing-common/mailnews/mailTestUtils.js");
 

mail/extensions/mailviews/content/msgViewPickerOverlay.js

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/mailViewManager.js");
 
 // these constants are now authoritatively defined in mailViewManager.js (above)

mail/extensions/smime/content/msgCompSMIMEOverlay.js

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 // Account encryption policy values:
 // const kEncryptionPolicy_Never = 0;

mail/test/mozmill/account/test-mail-account-setup-wizard.js

@@ -9,7 +9,7 @@ var MODULE_REQUIRES = ["folder-display-helpers", "window-helpers",
                        "account-manager-helpers", "keyboard-helpers"];
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var elib = {};
 ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elib);

mail/test/mozmill/addrbook/test-address-book.js

@@ -15,7 +15,7 @@ var MODULE_REQUIRES = ['address-book-helpers', 'folder-display-helpers',
 
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var abController = null;
 var addrBook1, addrBook2, addrBook3, addrBook4;

mail/test/mozmill/addrbook/test-update-mailing-list.js

@@ -13,7 +13,7 @@ var RELATIVE_ROOT = '../shared-modules';
 var MODULE_REQUIRES = ['address-book-helpers',
                        'folder-display-helpers',];
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 function setupModule(module) {
   collector.getModule('folder-display-helpers').installInto(module);

mail/test/mozmill/cloudfile/test-cloudfile-attachment-urls.js

@@ -17,7 +17,7 @@ var MODULE_REQUIRES = ['folder-display-helpers',
                        'window-helpers'];
 
 ChromeUtils.import('resource://gre/modules/Services.jsm');
-ChromeUtils.import('resource:///modules/mailServices.js');
+ChromeUtils.import('resource:///modules/MailServices.jsm');
 
 var kUploadedFile = "attachment-uploaded";
 var kHtmlPrefKey = "mail.identity.default.compose_html";

mail/test/mozmill/composition/test-attachment-reminder.js

@@ -18,7 +18,7 @@ var MODULE_REQUIRES = ["folder-display-helpers",
                          "keyboard-helpers"];
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var kBoxId = "attachmentNotificationBox";
 var kNotificationId = "attachmentReminder";

mail/test/mozmill/composition/test-blocked-content.js

@@ -21,7 +21,7 @@ var MODULE_REQUIRES = [
 var os = {};
 ChromeUtils.import("chrome://mozmill/content/stdlib/os.js", os);
 ChromeUtils.import('resource://gre/modules/Services.jsm');
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/osfile.jsm");
 
 var gOutboxFolder;

mail/test/mozmill/composition/test-charset-edit.js

@@ -18,7 +18,7 @@ var MODULE_REQUIRES = ["folder-display-helpers", "compose-helpers",
 var os = {};
 ChromeUtils.import("chrome://mozmill/content/stdlib/os.js", os);
 ChromeUtils.import('resource://gre/modules/Services.jsm');
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/mimeParser.jsm");
 var elib = {};
 ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elib);

mail/test/mozmill/composition/test-charset-upgrade.js

@@ -15,7 +15,7 @@ var RELATIVE_ROOT = "../shared-modules";
 var MODULE_REQUIRES = ["folder-display-helpers", "window-helpers", "compose-helpers"];
 
 ChromeUtils.import('resource://gre/modules/Services.jsm');
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var gDrafts;
 var gOutbox;

mail/test/mozmill/composition/test-draft-identity.js

@@ -15,7 +15,7 @@ var RELATIVE_ROOT = "../shared-modules";
 var MODULE_REQUIRES = ["folder-display-helpers", "window-helpers",
                        "compose-helpers", "notificationbox-helpers"];
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
 
 var gDrafts;

mail/test/mozmill/composition/test-drafts.js

@@ -16,7 +16,7 @@ var MODULE_REQUIRES = ["folder-display-helpers", "compose-helpers",
                        "window-helpers", "notificationbox-helpers"];
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var kBoxId = "msgNotificationBar";
 var draftsFolder;

mail/test/mozmill/composition/test-eml-actions.js

@@ -15,7 +15,7 @@ var MODULE_REQUIRES = ["folder-display-helpers", "window-helpers", "compose-help
 
 var os = {};
 ChromeUtils.import("chrome://mozmill/content/stdlib/os.js", os);
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 var elib = {};
 ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elib);
 

mail/test/mozmill/composition/test-forward-rfc822-attach.js

@@ -15,7 +15,7 @@ var RELATIVE_ROOT = "../shared-modules";
 var MODULE_REQUIRES = ["folder-display-helpers", "compose-helpers", "window-helpers"];
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 var os = {};
 ChromeUtils.import("chrome://mozmill/content/stdlib/os.js", os);
 

mail/test/mozmill/composition/test-forward-utf8.js

@@ -14,7 +14,7 @@ var RELATIVE_ROOT = "../shared-modules";
 var MODULE_REQUIRES = ["folder-display-helpers", "compose-helpers", "window-helpers"];
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 var elib = {};
 ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elib);
 var os = {};

mail/test/mozmill/composition/test-forwarded-eml-actions.js

@@ -15,7 +15,7 @@ var RELATIVE_ROOT = "../shared-modules";
 var MODULE_REQUIRES = ["folder-display-helpers", "window-helpers",
                          "compose-helpers"];
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 var elib = {};
 ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elib);
 

mail/test/mozmill/composition/test-multipart-related.js

@@ -16,7 +16,7 @@ var MODULE_REQUIRES = ["folder-display-helpers", "window-helpers", "compose-help
 var os = {};
 ChromeUtils.import("chrome://mozmill/content/stdlib/os.js", os);
 ChromeUtils.import('resource://gre/modules/Services.jsm');
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/mimeParser.jsm");
 var elib = {};
 ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elib);

mail/test/mozmill/composition/test-newmsg-compose-identity.js

@@ -13,7 +13,7 @@ var RELATIVE_ROOT = "../shared-modules";
 var MODULE_REQUIRES = ["folder-display-helpers",
                        "window-helpers", "compose-helpers"];
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var gInbox;
 var gDrafts;

mail/test/mozmill/composition/test-reply-addresses.js

@@ -25,7 +25,7 @@ var myEmail2 = "otherme@example.com";
 var identity;
 var identity2;
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 function setupModule(module) {
   collector.getModule("folder-display-helpers").installInto(module);

mail/test/mozmill/composition/test-reply-format-flowed.js

@@ -14,7 +14,7 @@ var RELATIVE_ROOT = "../shared-modules";
 var MODULE_REQUIRES = ["folder-display-helpers", "compose-helpers", "window-helpers"];
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var os = {};
 ChromeUtils.import("chrome://mozmill/content/stdlib/os.js", os);

mail/test/mozmill/content-policy/test-general-content-policy.js

@@ -33,7 +33,7 @@ var os = {};
 ChromeUtils.import("chrome://mozmill/content/stdlib/os.js", os);
 
 ChromeUtils.import('resource://gre/modules/Services.jsm');
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var folder = null;
 var gMsgNo = 0;

mail/test/mozmill/folder-display/test-message-commands-on-msgstore.js

@@ -16,7 +16,7 @@ var MODULE_REQUIRES = ["folder-display-helpers",
                          "window-helpers"];
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/IOUtils.js");
 
 var statusHeader = "X-Mozilla-Status: ";

mail/test/mozmill/folder-display/test-recent-menu.js

@@ -8,7 +8,7 @@
  * don't get updated when we archive.
  */
 ChromeUtils.import("resource:///modules/MailUtils.js");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var MODULE_NAME = 'test-recent-menu';
 

mail/test/mozmill/folder-pane/test-folder-pane-consumers.js

@@ -12,7 +12,7 @@ var RELATIVE_ROOT = '../shared-modules';
 var MODULE_REQUIRES = ["folder-display-helpers", "window-helpers",
                        "nntp-helpers"];
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var nntpAccount;
 

mail/test/mozmill/folder-pane/test-folder-pane.js

@@ -13,7 +13,7 @@ var MODULE_NAME = 'test-folder-pane';
 var RELATIVE_ROOT = '../shared-modules';
 var MODULE_REQUIRES = ['folder-display-helpers'];
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 function setupModule(module) {
   collector.getModule('folder-display-helpers').installInto(module);

mail/test/mozmill/folder-tree-modes/test-extension/bootstrap.js

@@ -28,7 +28,7 @@ function setupFolderMode(aWindow) {
   let testFolderTreeMode = {
     __proto__: aWindow.IFolderTreeMode,
     generateMap: function(aFTV) {
-      ChromeUtils.import("resource:///modules/mailServices.js");
+      ChromeUtils.import("resource:///modules/MailServices.jsm");
       // Pick the tinderbox@foo.invalid inbox and use it as the only folder
       let server = MailServices.accounts.FindServer("tinderbox", "tinderbox123", "pop3");
       let item = new aWindow.ftvItem(server.rootFolder.getChildNamed("Inbox"));

mail/test/mozmill/message-header/test-message-header.js

@@ -17,7 +17,7 @@ var MODULE_REQUIRES = ['folder-display-helpers', 'window-helpers',
 
 var elib = {};
 ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elib);
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var folder, folderMore;

mail/test/mozmill/message-window/test-commands.js

@@ -7,7 +7,7 @@ var MODULE_NAME = "test-commands";
 var RELATIVE_ROOT = "../shared-modules";
 var MODULE_REQUIRES = ["folder-display-helpers", "window-helpers"];
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 var elib = {};
 ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elib);
 var os = {};

mail/test/mozmill/multiple-identities/test-display-names.js

@@ -11,7 +11,7 @@ var MODULE_NAME = "test-display-names";
 var RELATIVE_ROOT = "../shared-modules";
 var MODULE_REQUIRES = ["folder-display-helpers", "address-book-helpers"];
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var folder;

mail/test/mozmill/newmailaccount/test-newmailaccount.js

@@ -20,7 +20,7 @@ var elib = {};
 ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elib);
 ChromeUtils.import('resource://gre/modules/Services.jsm');
 ChromeUtils.import('resource:///modules/iteratorUtils.jsm');
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("chrome://mozmill/content/stdlib/httpd.js");
 
 // RELATIVE_ROOT messes with the collector, so we have to bring the path back

mail/test/mozmill/notification/test-notification.js

@@ -8,7 +8,7 @@ var RELATIVE_ROOT = '../shared-modules';
 var MODULE_REQUIRES = ['folder-display-helpers', 'window-helpers'];
 
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 // Our global folder variables...

mail/test/mozmill/shared-modules/test-address-book-helpers.js

@@ -7,7 +7,7 @@ var MODULE_NAME = "address-book-helpers";
 var RELATIVE_ROOT = "../shared-modules";
 var MODULE_REQUIRES = ["folder-display-helpers", "window-helpers"];
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 var ABMDB_PREFIX = "moz-abmdbdirectory://";

mail/test/mozmill/shared-modules/test-folder-display-helpers.js

@@ -23,7 +23,7 @@ ChromeUtils.import("resource:///modules/gloda/log4moz.js");
 
 var nsMsgViewIndex_None = 0xffffffff;
 ChromeUtils.import('resource:///modules/MailConsts.js');
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import('resource:///modules/MailUtils.js');
 ChromeUtils.import('resource:///modules/mailViewManager.js');
 ChromeUtils.import("resource://gre/modules/Services.jsm");

mail/test/mozmill/shared-modules/test-newmailaccount-helpers.js

@@ -12,7 +12,7 @@ var elib = {};
 ChromeUtils.import("chrome://mozmill/content/modules/elementslib.js", elib);
 ChromeUtils.import('resource://gre/modules/Services.jsm');
 ChromeUtils.import('resource:///modules/iteratorUtils.jsm');
-ChromeUtils.import('resource:///modules/mailServices.js');
+ChromeUtils.import('resource:///modules/MailServices.jsm');
 ChromeUtils.import('resource://gre/modules/XPCOMUtils.jsm');
 
 var mc, fdh, kbh, dh;

mail/test/mozmill/shared-modules/test-nntp-helpers.js

@@ -8,7 +8,7 @@ var RELATIVE_ROOT = "../shared-modules";
 var MODULES_REQUIRES = ["folder-display-helpers", "window-helpers"];
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 var kSimpleNewsArticle =
   "From: John Doe <john.doe@example.com>\n"+

mailnews/addrbook/content/abAddressBookNameDialog.js

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Services.jsm");
 

mailnews/addrbook/content/addrbookWidgets.xml

@@ -22,7 +22,7 @@
 
       <constructor>
         <![CDATA[
-          ChromeUtils.import("resource:///modules/mailServices.js", this);
+          ChromeUtils.import("resource:///modules/MailServices.jsm", this);
           ChromeUtils.import("resource:///modules/iteratorUtils.jsm", this);
           ChromeUtils.import("resource:///modules/StringBundle.js", this);
           this._stringBundle = new this

mailnews/addrbook/prefs/content/pref-directory-add.js

@@ -5,7 +5,7 @@
 
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/hostnameUtils.jsm");
 ChromeUtils.import("resource:///modules/iteratorUtils.jsm");
 

mailnews/addrbook/prefs/content/pref-editdirectories.js

@@ -4,7 +4,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 
 // Listener to refresh the list items if something changes. In all these
 // cases we just rebuild the list as it is easier than searching/adding in the

mailnews/addrbook/src/nsAbAutoCompleteMyDomain.js

@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 function nsAbAutoCompleteMyDomain() {}

mailnews/addrbook/src/nsAbAutoCompleteSearch.js

@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 ChromeUtils.import("resource://gre/modules/Services.jsm");
-ChromeUtils.import("resource:///modules/mailServices.js");
+ChromeUtils.import("resource:///modules/MailServices.jsm");
 ChromeUtils.import("resource:///modules/ABQueryUtils.jsm");
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");