--- a/.eslintignore
+++ b/.eslintignore
@@ -90,9 +90,9 @@ mail/extensions/openpgp/**
 # calendar/ exclusions
 
 # prefs files
 calendar/lightning/content/lightning.js
 calendar/providers/gdata/defaults/preferences.js
 calendar/timezones/preferences.js
 
 # third party library
-calendar/base/modules/ical.js
+calendar/base/modules/Ical.jsm

--- a/calendar/base/backend/icaljs/calDateTime.js
+++ b/calendar/base/backend/icaljs/calDateTime.js
@@ -1,15 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* import-globals-from calICALJSComponents.js */
 
-var { ICAL, unwrap, unwrapSetter } = ChromeUtils.import("resource://calendar/modules/ical.js");
+var { ICAL, unwrap, unwrapSetter } = ChromeUtils.import("resource://calendar/modules/Ical.jsm");
 
 var UNIX_TIME_TO_PRTIME = 1000000;
 
 function calDateTime(innerObject) {
   this.wrappedJSObject = this;
   this.innerObject = innerObject || ICAL.Time.epochTime.clone();
 }
 

--- a/calendar/base/backend/icaljs/calDuration.js
+++ b/calendar/base/backend/icaljs/calDuration.js
@@ -1,13 +1,13 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 { ICAL, unwrap } = ChromeUtils.import("resource://calendar/modules/ical.js");
+var { ICAL, unwrap } = ChromeUtils.import("resource://calendar/modules/Ical.jsm");
 
 function calDuration(innerObject) {
   this.innerObject = innerObject || new ICAL.Duration();
   this.wrappedJSObject = this;
 }
 
 calDuration.prototype = {
   QueryInterface: ChromeUtils.generateQI([Ci.calIDuration]),

--- a/calendar/base/backend/icaljs/calICSService-worker.js
+++ b/calendar/base/backend/icaljs/calICSService-worker.js
@@ -2,23 +2,23 @@
  * 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/. */
 
 /**
  * ChromeWorker for parseICSAsync method in calICSService.js
  */
 
 /* eslint-env worker */
-/* import-globals-from ../../modules/ical.js */
+/* import-globals-from ../../modules/Ical.jsm */
 
 var NS_OK = 0;
 var NS_ERROR_FAILURE = 2147500037;
 
 // eslint-disable-next-line no-unused-vars
-importScripts("resource://calendar/modules/ical.js");
+importScripts("resource://calendar/modules/Ical.jsm");
 
 onmessage = function(event) {
   try {
     let comp = ICAL.parse(event.data);
     postMessage({ rc: NS_OK, data: comp });
   } catch (e) {
     postMessage({ rc: NS_ERROR_FAILURE, data: "Exception occurred: " + e });
   }

--- a/calendar/base/backend/icaljs/calICSService.js
+++ b/calendar/base/backend/icaljs/calICSService.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* import-globals-from calICALJSComponents.js */
 
 var { ICAL, unwrapSetter, unwrapSingle, wrapGetter } = ChromeUtils.import(
-  "resource://calendar/modules/ical.js"
+  "resource://calendar/modules/Ical.jsm"
 );
 var { cal } = ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
 
 function calIcalProperty(innerObject) {
   this.innerObject = innerObject || new ICAL.Property();
   this.wrappedJSObject = this;
 }
 

--- a/calendar/base/backend/icaljs/calPeriod.js
+++ b/calendar/base/backend/icaljs/calPeriod.js
@@ -1,15 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* import-globals-from calICALJSComponents.js */
 
-var { ICAL, unwrapSetter, wrapGetter } = ChromeUtils.import("resource://calendar/modules/ical.js");
+var { ICAL, unwrapSetter, wrapGetter } = ChromeUtils.import("resource://calendar/modules/Ical.jsm");
 
 function calPeriod(innerObject) {
   this.innerObject = innerObject || new ICAL.Period({});
   this.wrappedJSObject = this;
 }
 
 calPeriod.prototype = {
   QueryInterface: ChromeUtils.generateQI([Ci.calIPeriod]),

--- a/calendar/base/backend/icaljs/calRecurrenceRule.js
+++ b/calendar/base/backend/icaljs/calRecurrenceRule.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* import-globals-from calICALJSComponents.js */
 
 var { ICAL, unwrapSetter, unwrapSingle, wrapGetter } = ChromeUtils.import(
-  "resource://calendar/modules/ical.js"
+  "resource://calendar/modules/Ical.jsm"
 );
 var { cal } = ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
 
 function calRecurrenceRule(innerObject) {
   this.innerObject = innerObject || new ICAL.Recur();
   this.wrappedJSObject = this;
 }
 

--- a/calendar/base/content/calendar-base-view.js
+++ b/calendar/base/content/calendar-base-view.js
@@ -4,17 +4,17 @@
 
 /* global cal, currentView, calendarNavigationBar, MozElements, MozXULElement, Services,
    toggleOrientation */
 
 "use strict";
 
 // Wrap in a block to prevent leaking to window scope.
 {
-  const { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+  const { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
 
   /**
    * Calendar observer for calendar view elements. Used in CalendarBaseView class.
    *
    * @implements {calIObserver}
    * @implements {calICompositeObserver}
    * @implements {calIAlarmServiceObserver}
    */

rename from calendar/base/modules/ical.js
rename to calendar/base/modules/Ical.jsm

--- a/calendar/base/modules/moz.build
+++ b/calendar/base/modules/moz.build
@@ -24,10 +24,10 @@ EXTRA_JS_MODULES.utils += [
     'utils/calXMLUtils.jsm',
 ]
 
 EXTRA_JS_MODULES += [
     'calExtract.jsm',
     'calHashedArray.jsm',
     'calRecurrenceUtils.jsm',
     'calUtils.jsm',
-    'ical.js',
+    'Ical.jsm',
 ]

--- a/calendar/base/src/calTimezone.js
+++ b/calendar/base/src/calTimezone.js
@@ -1,14 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 { cal } = ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
-var { ICAL } = ChromeUtils.import("resource://calendar/modules/ical.js");
+var { ICAL } = ChromeUtils.import("resource://calendar/modules/Ical.jsm");
 
 function calICALJSTimezone(innerObject) {
   this.innerObject = innerObject || new ICAL.Timezone();
   this.wrappedJSObject = this;
 }
 
 calICALJSTimezone.prototype = {
   QueryInterface: ChromeUtils.generateQI([Ci.calITimezone]),

--- a/calendar/base/src/calTimezoneService.js
+++ b/calendar/base/src/calTimezoneService.js
@@ -4,17 +4,17 @@
 
 /* import-globals-from calTimezone.js */
 
 var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { XPCOMUtils } = ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 
 var { cal } = ChromeUtils.import("resource://calendar/modules/calUtils.jsm");
-var { ICAL, unwrapSingle } = ChromeUtils.import("resource://calendar/modules/ical.js");
+var { ICAL, unwrapSingle } = ChromeUtils.import("resource://calendar/modules/Ical.jsm");
 
 function calStringEnumerator(stringArray) {
   this.mIndex = 0;
   this.mStringArray = stringArray;
 }
 calStringEnumerator.prototype = {
   // nsIUTF8StringEnumerator:
   [Symbol.iterator]: function() {

--- a/common/src/ExtensionSupport.jsm
+++ b/common/src/ExtensionSupport.jsm
@@ -14,17 +14,17 @@ const { AddonManager } = ChromeUtils.imp
 );
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 // ChromeUtils.import("resource://gre/modules/Deprecated.jsm") - needed for warning.
 const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 
 var { fixIterator } = ChromeUtils.import(
   "resource:///modules/iteratorUtils.jsm"
 );
-const { IOUtils } = ChromeUtils.import("resource:///modules/IOUtils.js");
+const { IOUtils } = ChromeUtils.import("resource:///modules/IOUtils.jsm");
 
 var extensionHooks = new Map();
 var legacyExtensions = new Map();
 var bootstrapExtensions = new Set();
 var openWindowList;
 
 var ExtensionSupport = {
   /**

--- a/mail/base/content/folderDisplay.js
+++ b/mail/base/content/folderDisplay.js
@@ -5,17 +5,17 @@
 /* import-globals-from commandglue.js */
 /* import-globals-from mailWindow.js */
 /* import-globals-from ../../extensions/mailviews/content/msgViewPickerOverlay.js */
 
 var { DBViewWrapper } = ChromeUtils.import(
   "resource:///modules/DBViewWrapper.jsm"
 );
 var { JSTreeSelection } = ChromeUtils.import(
-  "resource:///modules/jsTreeSelection.js"
+  "resource:///modules/JsTreeSelection.jsm"
 );
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { MailUtils } = ChromeUtils.import("resource:///modules/MailUtils.jsm");
 
 var gFolderDisplay = null;
 var gMessageDisplay = null;
 
 /**

--- a/mail/base/content/folderPane.js
+++ b/mail/base/content/folderPane.js
@@ -19,17 +19,17 @@ var {
 } = ChromeUtils.import("resource:///modules/folderUtils.jsm");
 var { fixIterator, toXPCOMArray } = ChromeUtils.import(
   "resource:///modules/iteratorUtils.jsm"
 );
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 var { MailUtils } = ChromeUtils.import("resource:///modules/MailUtils.jsm");
-var { IOUtils } = ChromeUtils.import("resource:///modules/IOUtils.js");
+var { IOUtils } = ChromeUtils.import("resource:///modules/IOUtils.jsm");
 var { FeedUtils } = ChromeUtils.import("resource:///modules/FeedUtils.jsm");
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 if (typeof FeedMessageHandler != "object") {
   Services.scriptloader.loadSubScript(
     "chrome://messenger-newsblog/content/newsblogOverlay.js"
   );
 }

--- a/mail/base/content/gloda-autocomplete-input.js
+++ b/mail/base/content/gloda-autocomplete-input.js
@@ -19,17 +19,17 @@ if (!customElements.get("autocomplete-in
 customElements.whenDefined("autocomplete-input").then(() => {
   const { Services } = ChromeUtils.import(
     "resource://gre/modules/Services.jsm"
   );
   const { AppConstants } = ChromeUtils.import(
     "resource://gre/modules/AppConstants.jsm"
   );
   const { GlodaMsgSearcher } = ChromeUtils.import(
-    "resource:///modules/gloda/msg_search.js"
+    "resource:///modules/gloda/GlodaMsgSearcher.jsm"
   );
   const { GlodaIMSearcher } = ChromeUtils.import(
     "resource:///modules/search_im.jsm"
   );
   const { XPCOMUtils } = ChromeUtils.import(
     "resource://gre/modules/XPCOMUtils.jsm"
   );
 

--- a/mail/base/content/glodaFacet.js
+++ b/mail/base/content/glodaFacet.js
@@ -1591,17 +1591,17 @@
       authorNode.textContent = message.from.contact.name;
       let toNode = this.to;
       toNode.textContent = glodaFacetStrings.get(
         "glodaFacetView.result.message.toLabel"
       );
 
       // this.author.textContent = ;
       let { makeFriendlyDateAgo } = ChromeUtils.import(
-        "resource:///modules/templateUtils.js"
+        "resource:///modules/TemplateUtils.jsm"
       );
       this.date.textContent = makeFriendlyDateAgo(message.date);
 
       // - Recipients
       try {
         let recipientsNode = this.recipients;
         if (message.recipients) {
           let recipientCount = 0;

--- a/mail/base/content/glodaFacetTab.js
+++ b/mail/base/content/glodaFacetTab.js
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 { StringBundle } = ChromeUtils.import(
-  "resource:///modules/StringBundle.js"
+  "resource:///modules/StringBundle.jsm"
 );
 
-var { FacetDriver } = ChromeUtils.import("resource:///modules/gloda/facet.js");
+var { FacetDriver } = ChromeUtils.import("resource:///modules/gloda/Facet.jsm");
 
 var glodaFacetTabType = {
   name: "glodaFacet",
   perTabPanel: "vbox",
   lastTabId: 0,
   strings: new StringBundle(
     "chrome://messenger/locale/glodaFacetView.properties"
   ),

--- a/mail/base/content/glodaFacetView.js
+++ b/mail/base/content/glodaFacetView.js
@@ -3,39 +3,39 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
  * This file provides the global context for the faceting environment.  In the
  *  Model View Controller (paradigm), we are the view and the XBL widgets are
  *  the the view and controller.
  *
  * Because much of the work related to faceting is not UI-specific, we try and
- *  push as much of it into mailnews/db/gloda/facet.js.  In some cases we may
+ *  push as much of it into mailnews/db/gloda/Facet.jsm.  In some cases we may
  *  get it wrong and it may eventually want to migrate.
  */
 
-var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
 var { StringBundle } = ChromeUtils.import(
-  "resource:///modules/StringBundle.js"
+  "resource:///modules/StringBundle.jsm"
 );
 var { PluralForm } = ChromeUtils.import(
   "resource://gre/modules/PluralForm.jsm"
 );
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 var { TagUtils } = ChromeUtils.import("resource:///modules/TagUtils.jsm");
 var { logObject, logException } = ChromeUtils.import(
-  "resource:///modules/errUtils.js"
+  "resource:///modules/ErrUtils.jsm"
 );
 
-var { Gloda } = ChromeUtils.import("resource:///modules/gloda/public.js");
+var { Gloda } = ChromeUtils.import("resource:///modules/gloda/GlodaPublic.jsm");
 var { FacetDriver, FacetUtils } = ChromeUtils.import(
-  "resource:///modules/gloda/facet.js"
+  "resource:///modules/gloda/Facet.jsm"
 );
 
 var glodaFacetStrings = new StringBundle(
   "chrome://messenger/locale/glodaFacetView.properties"
 );
 
 /**
  * Object containing query-explanantion binding methods.

--- a/mail/base/content/mailTabs.js
+++ b/mail/base/content/mailTabs.js
@@ -8,24 +8,24 @@
 /* import-globals-from mailWindow.js */
 /* import-globals-from mailWindowOverlay.js */
 /* import-globals-from messageDisplay.js */
 /* import-globals-from msgMail3PaneWindow.js */
 
 var { MsgHdrSyntheticView } = ChromeUtils.import(
   "resource:///modules/MsgHdrSyntheticView.jsm"
 );
-var { logException } = ChromeUtils.import("resource:///modules/errUtils.js");
+var { logException } = ChromeUtils.import("resource:///modules/ErrUtils.jsm");
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { MailUtils } = ChromeUtils.import("resource:///modules/MailUtils.jsm");
 var { getSpecialFolderString } = ChromeUtils.import(
   "resource:///modules/folderUtils.jsm"
 );
 var { MsgHdrToMimeMessage } = ChromeUtils.import(
-  "resource:///modules/gloda/mimemsg.js"
+  "resource:///modules/gloda/MimeMessage.jsm"
 );
 
 /**
  * Displays message "folder"s, mail "message"s, and "glodaList" results.  The
  *  commonality is that they all use the "mailContent" panel's folder tree,
  *  thread tree, and message pane objects.  This happens for historical reasons,
  *  likely involving the fact that prior to the introduction of this
  *  abstraction, everything was always stored in global objects.  For the 3.0

--- a/mail/base/content/mailWindow.js
+++ b/mail/base/content/mailWindow.js
@@ -16,25 +16,25 @@
 
 // From netError.js
 /* globals retryThis */
 
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 var { appIdleManager } = ChromeUtils.import(
-  "resource:///modules/appIdleManager.js"
+  "resource:///modules/AppIdleManager.jsm"
 );
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { MailUtils } = ChromeUtils.import("resource:///modules/MailUtils.jsm");
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
-var { Gloda } = ChromeUtils.import("resource:///modules/gloda/public.js");
+var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
+var { Gloda } = ChromeUtils.import("resource:///modules/gloda/GlodaPublic.jsm");
 
 // This file stores variables common to mail windows
 var messenger;
 var statusFeedback;
 var msgWindow;
 
 var accountManager;
 

--- a/mail/base/content/mailWindowOverlay.js
+++ b/mail/base/content/mailWindowOverlay.js
@@ -14,17 +14,17 @@
 /* import-globals-from mailCommands.js */
 /* import-globals-from mailContextMenus.js */
 /* import-globals-from mailWindow.js */
 /* import-globals-from phishingDetector.js */
 /* import-globals-from utilityOverlay.js */
 
 var { FeedUtils } = ChromeUtils.import("resource:///modules/FeedUtils.jsm");
 var { GlodaSyntheticView } = ChromeUtils.import(
-  "resource:///modules/gloda/dbview.js"
+  "resource:///modules/gloda/GlodaSyntheticView.jsm"
 );
 var { MailConsts } = ChromeUtils.import("resource:///modules/MailConsts.jsm");
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 var { MailUtils } = ChromeUtils.import("resource:///modules/MailUtils.jsm");
 var { PluralForm } = ChromeUtils.import(

--- a/mail/base/content/messageWindow.xhtml
+++ b/mail/base/content/messageWindow.xhtml
@@ -100,17 +100,17 @@
   <script src="chrome://global/content/nsDragAndDrop.js"/>
   <script src="chrome://messenger/content/msgViewNavigation.js"/>
   <script src="chrome://messenger/content/editContactPanel.js"/>
   <script src="chrome://messenger/content/toolbarIconColor.js"/>
   <script src="chrome://messenger/content/msgHdrView.js"/>
   <script src="chrome://messenger-smime/content/msgHdrViewSMIMEOverlay.js"/>
   <script src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
 #ifdef MOZ_OPENPGP
-  <script src="chrome://openpgp/content/bond.js"/>
+  <script src="chrome://openpgp/content/BondOpenPGP.jsm"/>
   <script src="chrome://openpgp/content/ui/enigmailMessengerOverlay.js"/>
   <script src="chrome://openpgp/content/ui/enigmailMsgHdrViewOverlay.js"/>
 #endif
   <script src="chrome://messenger/content/mailCommands.js"/>
   <script src="chrome://messenger/content/junkCommands.js"/>
   <script src="chrome://messenger/content/mailWindowOverlay.js"/>
   <script src="chrome://messenger/content/mailTabs.js"/>
   <script src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>

--- a/mail/base/content/messenger.xhtml
+++ b/mail/base/content/messenger.xhtml
@@ -129,17 +129,17 @@
 <script src="chrome://messenger/content/editContactPanel.js"/>
 <script src="chrome://messenger/content/toolbarIconColor.js"/>
 <script src="chrome://messenger/content/jsTreeView.js"/>
 <script src="chrome://messenger/content/msgHdrView.js"/>
 <script src="chrome://global/content/nsDragAndDrop.js"/>
 <script src="chrome://messenger-smime/content/msgHdrViewSMIMEOverlay.js"/>
 <script src="chrome://messenger-smime/content/msgReadSMIMEOverlay.js"/>
 #ifdef MOZ_OPENPGP
-<script src="chrome://openpgp/content/bond.js"/>
+<script src="chrome://openpgp/content/BondOpenPGP.jsm"/>
 <script src="chrome://openpgp/content/ui/enigmailMessengerOverlay.js"/>
 <script src="chrome://openpgp/content/ui/enigmailMsgHdrViewOverlay.js"/>
 #endif
 <script src="chrome://messenger/content/chat/chat-messenger.js"/>
 <script src="chrome://messenger/content/chat/imStatusSelector.js"/>
 <script src="chrome://messenger/content/chat/imContextMenu.js"/>
 <script src="chrome://messenger/content/chat/chat-conversation.js"/>
 <script src="chrome://messenger/content/preferences/preferencesTab.js"/>

--- a/mail/base/content/msgHdrView.js
+++ b/mail/base/content/msgHdrView.js
@@ -22,17 +22,19 @@ var { MailConstants } = ChromeUtils.impo
 );
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { DisplayNameUtils } = ChromeUtils.import(
   "resource:///modules/DisplayNameUtils.jsm"
 );
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
-var { GlodaUtils } = ChromeUtils.import("resource:///modules/gloda/utils.js");
+var { GlodaUtils } = ChromeUtils.import(
+  "resource:///modules/gloda/GlodaUtils.jsm"
+);
 var { Status: statusUtils } = ChromeUtils.import(
   "resource:///modules/imStatusUtils.jsm"
 );
 
 // Warning: It's critical that the code in here for displaying the message
 // headers for a selected message remain as fast as possible. In particular,
 // right now, we only introduce one reflow per message. i.e. if you click on
 // a message in the thread pane, we batch up all the changes for displaying

--- a/mail/base/content/msgMail3PaneWindow.js
+++ b/mail/base/content/msgMail3PaneWindow.js
@@ -1,16 +1,16 @@
 /**
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* import-globals-from ../../../../toolkit/modules/PageMenu.jsm */
 /* import-globals-from ../../../mailnews/base/prefs/content/accountUtils.js */
-/* import-globals-from ../../../mailnews/base/util/mailnewsMigrator.js */
+/* import-globals-from ../../../mailnews/base/util/MailnewsMigrator.jsm */
 /* import-globals-from ../../components/newmailaccount/content/accountProvisionerTab.js */
 /* import-globals-from ../../components/preferences/preferencesTab.js */
 /* import-globals-from messenger-customization.js */
 /* import-globals-from commandglue.js */
 /* import-globals-from folderDisplay.js */
 /* import-globals-from folderPane.js */
 /* import-globals-from glodaFacetTab.js */
 /* import-globals-from mailTabs.js */
@@ -18,33 +18,33 @@
 /* import-globals-from quickFilterBar.js */
 /* import-globals-from searchBar.js */
 /* import-globals-from searchBar.js */
 /* import-globals-from specialTabs.js */
 /* import-globals-from toolbarIconColor.js */
 /* globals PanelUI */
 
 ChromeUtils.import("resource:///modules/activity/activityModules.jsm");
-var { logException } = ChromeUtils.import("resource:///modules/errUtils.js");
-var { IOUtils } = ChromeUtils.import("resource:///modules/IOUtils.js");
+var { logException } = ChromeUtils.import("resource:///modules/ErrUtils.jsm");
+var { IOUtils } = ChromeUtils.import("resource:///modules/IOUtils.jsm");
 var { JSTreeSelection } = ChromeUtils.import(
-  "resource:///modules/jsTreeSelection.js"
+  "resource:///modules/JsTreeSelection.jsm"
 );
 var { MailConsts } = ChromeUtils.import("resource:///modules/MailConsts.jsm");
 var { MailInstrumentation } = ChromeUtils.import(
   "resource:///modules/MailInstrumentation.jsm"
 );
 var { migrateMailnews } = ChromeUtils.import(
-  "resource:///modules/mailnewsMigrator.js"
+  "resource:///modules/MailnewsMigrator.jsm"
 );
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 var { msgDBCacheManager } = ChromeUtils.import(
-  "resource:///modules/msgDBCacheManager.js"
+  "resource:///modules/MsgDBCacheManager.jsm"
 );
 var { SessionStoreManager } = ChromeUtils.import(
   "resource:///modules/SessionStoreManager.jsm"
 );
 var { SummaryFrameManager } = ChromeUtils.import(
   "resource:///modules/SummaryFrameManager.jsm"
 );
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");

--- a/mail/base/content/multimessageview.js
+++ b/mail/base/content/multimessageview.js
@@ -1,32 +1,32 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
-var { Gloda } = ChromeUtils.import("resource:///modules/gloda/gloda.js");
+var { Gloda } = ChromeUtils.import("resource:///modules/gloda/Gloda.jsm");
 var { mimeMsgToContentSnippetAndMeta } = ChromeUtils.import(
-  "resource:///modules/gloda/connotent.js"
+  "resource:///modules/gloda/GlodaContent.jsm"
 );
 var { MsgHdrToMimeMessage } = ChromeUtils.import(
-  "resource:///modules/gloda/mimemsg.js"
+  "resource:///modules/gloda/MimeMessage.jsm"
 );
 var { DisplayNameUtils } = ChromeUtils.import(
   "resource:///modules/DisplayNameUtils.jsm"
 );
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 var { TagUtils } = ChromeUtils.import("resource:///modules/TagUtils.jsm");
 
 var { PluralStringFormatter, makeFriendlyDateAgo } = ChromeUtils.import(
-  "resource:///modules/templateUtils.js"
+  "resource:///modules/TemplateUtils.jsm"
 );
 
 var gMessenger = Cc["@mozilla.org/messenger;1"].createInstance(Ci.nsIMessenger);
 
 // Set up our string formatter for localizing strings.
 XPCOMUtils.defineLazyGetter(this, "formatString", function() {
   let formatter = new PluralStringFormatter(
     "chrome://messenger/locale/multimessageview.properties"

--- a/mail/base/content/quickFilterBar.js
+++ b/mail/base/content/quickFilterBar.js
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* import-globals-from folderDisplay.js */
 /* import-globals-from mailWindow.js */
 
 var { logException, errorWithDebug } = ChromeUtils.import(
-  "resource:///modules/errUtils.js"
+  "resource:///modules/ErrUtils.jsm"
 );
 var {
   MessageTextFilter,
   QuickFilterManager,
   QuickFilterSearchListener,
   QuickFilterState,
 } = ChromeUtils.import("resource:///modules/QuickFilterManager.jsm");
 var { SearchSpec } = ChromeUtils.import("resource:///modules/SearchSpec.jsm");

--- a/mail/base/content/searchBar.js
+++ b/mail/base/content/searchBar.js
@@ -1,14 +1,14 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 { StringBundle } = ChromeUtils.import(
-  "resource:///modules/StringBundle.js"
+  "resource:///modules/StringBundle.jsm"
 );
 
 var gSearchBundle;
 
 var gStatusBar = document.getElementById("statusbar-icon");
 
 /**
  * The glodasearch widget is a UI widget (the #searchInput textbox) which is

--- a/mail/base/content/specialTabs.js
+++ b/mail/base/content/specialTabs.js
@@ -11,17 +11,17 @@
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { AddonManager } = ChromeUtils.import(
   "resource://gre/modules/AddonManager.jsm"
 );
 var { StringBundle } = ChromeUtils.import(
-  "resource:///modules/StringBundle.js"
+  "resource:///modules/StringBundle.jsm"
 );
 var { ExtensionParent } = ChromeUtils.import(
   "resource://gre/modules/ExtensionParent.jsm"
 );
 
 function tabProgressListener(aTab, aStartsBlank) {
   this.mTab = aTab;
   this.mBrowser = aTab.browser;

--- a/mail/base/content/tabmail.js
+++ b/mail/base/content/tabmail.js
@@ -10,17 +10,17 @@
 /* import-globals-from mailWindow.js */
 
 // Wrap in a block to prevent leaking to window scope.
 {
   const { Services } = ChromeUtils.import(
     "resource://gre/modules/Services.jsm"
   );
   const { GlodaMsgSearcher } = ChromeUtils.import(
-    "resource:///modules/gloda/msg_search.js"
+    "resource:///modules/gloda/GlodaMsgSearcher.jsm"
   );
 
   /**
    * The MozTabmailAlltabsMenuPopup widget is used as a menupopup to list all the
    * currently opened tabs.
    *
    * @extends {MozElements.MozMenuPopup}
    * @implements {EventListener}

--- a/mail/base/modules/AppUpdateUI.jsm
+++ b/mail/base/modules/AppUpdateUI.jsm
@@ -13,17 +13,17 @@ const { XPCOMUtils } = ChromeUtils.impor
 const { BrowserUtils } = ChromeUtils.import(
   "resource://gre/modules/BrowserUtils.jsm"
 );
 const { clearTimeout, setTimeout } = ChromeUtils.import(
   "resource://gre/modules/Timer.jsm"
 );
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { StringBundle } = ChromeUtils.import(
-  "resource:///modules/StringBundle.js"
+  "resource:///modules/StringBundle.jsm"
 );
 
 const PREF_APP_UPDATE_UNSUPPORTED_URL = "app.update.unsupported.url";
 
 const ANCHOR_ID = "app-update-notification-icon";
 const NOTIFICATION_ID = "app-update";
 
 XPCOMUtils.defineLazyGetter(this, "appUpdateBundle", function() {

--- a/mail/base/modules/DBViewWrapper.jsm
+++ b/mail/base/modules/DBViewWrapper.jsm
@@ -7,17 +7,17 @@ this.EXPORTED_SYMBOLS = ["DBViewWrapper"
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 const { MailViewConstants, MailViewManager } = ChromeUtils.import(
   "resource:///modules/MailViewManager.jsm"
 );
 const { SearchSpec } = ChromeUtils.import("resource:///modules/SearchSpec.jsm");
 const { VirtualFolderHelper } = ChromeUtils.import(
-  "resource:///modules/virtualFolderWrapper.js"
+  "resource:///modules/VirtualFolderWrapper.jsm"
 );
 
 var MSG_VIEW_FLAG_DUMMY = 0x20000000;
 
 var nsMsgViewIndex_None = 0xffffffff;
 
 /**
  * Helper singleton for DBViewWrapper that tells instances when something

--- a/mail/base/modules/DisplayNameUtils.jsm
+++ b/mail/base/modules/DisplayNameUtils.jsm
@@ -4,17 +4,17 @@
 
 const { fixIterator } = ChromeUtils.import(
   "resource:///modules/iteratorUtils.jsm"
 );
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 const { StringBundle } = ChromeUtils.import(
-  "resource:///modules/StringBundle.js"
+  "resource:///modules/StringBundle.jsm"
 );
 
 var EXPORTED_SYMBOLS = ["DisplayNameUtils"];
 
 var DisplayNameUtils = {
   formatDisplayName,
   formatDisplayNameList,
   getCardForEmail,

--- a/mail/base/modules/ExtensionsUI.jsm
+++ b/mail/base/modules/ExtensionsUI.jsm
@@ -19,17 +19,17 @@ const { BrowserUtils } = ChromeUtils.imp
 );
 XPCOMUtils.defineLazyModuleGetters(this, {
   AddonManager: "resource://gre/modules/AddonManager.jsm",
   AddonManagerPrivate: "resource://gre/modules/AddonManager.jsm",
   ExtensionData: "resource://gre/modules/Extension.jsm",
   PluralForm: "resource://gre/modules/PluralForm.jsm",
   Services: "resource://gre/modules/Services.jsm",
   setTimeout: "resource://gre/modules/Timer.jsm",
-  StringBundle: "resource:///modules/StringBundle.js",
+  StringBundle: "resource:///modules/StringBundle.jsm",
 });
 
 XPCOMUtils.defineLazyGetter(this, "addonsBundle", function() {
   return new StringBundle(ADDONS_PROPERTIES);
 });
 XPCOMUtils.defineLazyGetter(this, "brandBundle", function() {
   return new StringBundle(BRAND_PROPERTIES);
 });

--- a/mail/base/modules/MailInstrumentation.jsm
+++ b/mail/base/modules/MailInstrumentation.jsm
@@ -7,17 +7,17 @@
  */
 
 /* :::::::: Constants and Helpers ::::::::::::::: */
 
 this.EXPORTED_SYMBOLS = ["MailInstrumentation"];
 
 var nsIMFNService = Ci.nsIMsgFolderNotificationService;
 
-const { logException } = ChromeUtils.import("resource:///modules/errUtils.js");
+const { logException } = ChromeUtils.import("resource:///modules/ErrUtils.jsm");
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 
 /* :::::::: The Module ::::::::::::::: */
 
 var MailInstrumentation = {

--- a/mail/base/modules/MailMigrator.jsm
+++ b/mail/base/modules/MailMigrator.jsm
@@ -15,17 +15,17 @@ ChromeUtils.defineModuleGetter(
   this,
   "AddrBookDirectory",
   "resource:///modules/AddrBookDirectory.jsm"
 );
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const { IOUtils } = ChromeUtils.import("resource:///modules/IOUtils.js");
+const { IOUtils } = ChromeUtils.import("resource:///modules/IOUtils.jsm");
 
 var MailMigrator = {
   /**
    * Switch the given fonts to the given encodings, but only if the current fonts
    * are defaults.
    */
   _switchDefaultFonts(aFonts, aEncodings) {
     for (let encoding of aEncodings) {

--- a/mail/base/modules/QuickFilterManager.jsm
+++ b/mail/base/modules/QuickFilterManager.jsm
@@ -13,30 +13,30 @@ const { PluralForm } = ChromeUtils.impor
   "resource://gre/modules/PluralForm.jsm"
 );
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
 
 const { logException, logObject } = ChromeUtils.import(
-  "resource:///modules/errUtils.js"
+  "resource:///modules/ErrUtils.jsm"
 );
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 
 // XXX we need to know whether the gloda indexer is enabled for upsell reasons,
 // but this should really just be exposed on the main Gloda public interface.
 const { GlodaIndexer } = ChromeUtils.import(
-  "resource:///modules/gloda/indexer.js"
+  "resource:///modules/gloda/GlodaIndexer.jsm"
 );
 // we need to be able to create gloda message searcher instances for upsells:
 const { GlodaMsgSearcher } = ChromeUtils.import(
-  "resource:///modules/gloda/msg_search.js"
+  "resource:///modules/gloda/GlodaMsgSearcher.jsm"
 );
 
 /**
  * Shallow object copy.
  */
 function shallowObjCopy(obj) {
   let newObj = {};
   for (let key in obj) {
@@ -994,17 +994,17 @@ var MessageTextFilter = {
   name: "text",
   domId: "qfb-qs-textbox",
   /**
    * Parse the string into terms/phrases by finding matching double-quotes.  If
    * we find a quote that doesn't have a friend, we assume the user was going
    * to put a quote at the end of the string.  (This is important because we
    * update using a timer and this results in stable behavior.)
    *
-   * This code is cloned from gloda's msg_search.js and known good (enough :).
+   * This code is cloned from gloda's GlodaMsgSearcher.jsm and known good (enough :).
    * I did change the friendless quote situation, though.
    *
    * @param aSearchString The phrase to parse up.
    * @return A list of terms.
    */
   _parseSearchString(aSearchString) {
     aSearchString = aSearchString.trim();
     let terms = [];

--- a/mail/base/test/unit/head_mailbase.js
+++ b/mail/base/test/unit/head_mailbase.js
@@ -1,17 +1,17 @@
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 var { mailTestUtils } = ChromeUtils.import(
-  "resource://testing-common/mailnews/mailTestUtils.js"
+  "resource://testing-common/mailnews/MailTestUtils.jsm"
 );
 
 var CC = Components.Constructor;
 
 // Ensure the profile directory is set up
 do_get_profile();
 
 var gDEPTH = "../../../../";

--- a/mail/base/test/unit/resources/viewWrapperTestUtils.js
+++ b/mail/base/test/unit/resources/viewWrapperTestUtils.js
@@ -5,17 +5,17 @@
 var { DBViewWrapper, IDBViewWrapperListener } = ChromeUtils.import(
   "resource:///modules/DBViewWrapper.jsm"
 );
 var { MailViewManager, MailViewConstants } = ChromeUtils.import(
   "resource:///modules/MailViewManager.jsm"
 );
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { VirtualFolderHelper } = ChromeUtils.import(
-  "resource:///modules/virtualFolderWrapper.js"
+  "resource:///modules/VirtualFolderWrapper.jsm"
 );
 var { toXPCOMArray } = ChromeUtils.import(
   "resource:///modules/iteratorUtils.jsm"
 );
 
 // Only load these files if we're an XPCShell test. This file is also included by
 // MozMill tests (mail/test/mozmill/shared-modules/test-folder-display-helpers.js).
 if (
@@ -23,18 +23,18 @@ if (
     .getService(Ci.nsIEnvironment)
     .exists("XPCSHELL_TEST_PROFILE_DIR")
 ) {
   /* import-globals-from ../../../../../mailnews/test/resources/logHelper.js */
   load("../../../../mailnews/resources/logHelper.js");
   /* import-globals-from ../../../../../mailnews/test/resources/asyncTestUtils.js */
   load("../../../../mailnews/resources/asyncTestUtils.js");
 
-  /* import-globals-from ../../../../../mailnews/test/resources/messageGenerator.js */
-  load("../../../../mailnews/resources/messageGenerator.js");
+  /* import-globals-from ../../../../../mailnews/test/resources/MessageGenerator.jsm */
+  load("../../../../mailnews/resources/MessageGenerator.jsm");
   /* import-globals-from ../../../../../mailnews/test/resources/messageModifier.js */
   load("../../../../mailnews/resources/messageModifier.js");
   /* import-globals-from ../../../../../mailnews/test/resources/messageInjection.js */
   load("../../../../mailnews/resources/messageInjection.js");
 }
 
 var gInbox;
 

--- a/mail/base/test/unit/test_alertHook.js
+++ b/mail/base/test/unit/test_alertHook.js
@@ -7,17 +7,17 @@ var { XPCOMUtils } = ChromeUtils.import(
 );
 var { alertHook } = ChromeUtils.import(
   "resource:///modules/activity/alertHook.jsm"
 );
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 var { MockFactory } = ChromeUtils.import(
-  "resource://testing-common/mailnews/MockFactory.js"
+  "resource://testing-common/mailnews/MockFactory.jsm"
 );
 alertHook.init();
 
 // Replace the alerts service with our own. This will let us check if we're
 // prompting or not.
 var gAlertShown = false;
 
 var mockAlertsService = {

rename from mail/components/appIdleManager.js
rename to mail/components/AppIdleManager.jsm

--- a/mail/components/MailGlue.jsm
+++ b/mail/components/MailGlue.jsm
@@ -241,17 +241,17 @@ MailGlue.prototype = {
   _onMailStartupDone() {
     // On Windows 7 and above, initialize the jump list module.
     const WINTASKBAR_CONTRACTID = "@mozilla.org/windows-taskbar;1";
     if (
       WINTASKBAR_CONTRACTID in Cc &&
       Cc[WINTASKBAR_CONTRACTID].getService(Ci.nsIWinTaskbar).available
     ) {
       const { WinTaskbarJumpList } = ChromeUtils.import(
-        "resource:///modules/windowsJumpLists.js"
+        "resource:///modules/WindowsJumpLists.jsm"
       );
       WinTaskbarJumpList.startup();
     }
 
     const { ExtensionsUI } = ChromeUtils.import(
       "resource:///modules/ExtensionsUI.jsm"
     );
     ExtensionsUI.checkForSideloadedExtensions();

rename from mail/components/about-support/aboutSupportMac.js
rename to mail/components/about-support/AboutSupportMac.jsm

rename from mail/components/about-support/aboutSupportUnix.js
rename to mail/components/about-support/AboutSupportUnix.jsm

rename from mail/components/about-support/aboutSupportWin32.js
rename to mail/components/about-support/AboutSupportWin32.jsm

--- a/mail/components/about-support/content/accounts.js
+++ b/mail/components/about-support/content/accounts.js
@@ -12,23 +12,23 @@ var { MailServices } = ChromeUtils.impor
 var { fixIterator } = ChromeUtils.import(
   "resource:///modules/iteratorUtils.jsm"
 );
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 // Platform-specific includes
 var AboutSupportPlatform;
 if ("@mozilla.org/windows-registry-key;1" in Cc) {
-  let temp = ChromeUtils.import("resource:///modules/aboutSupportWin32.js");
+  let temp = ChromeUtils.import("resource:///modules/AboutSupportWin32.jsm");
   AboutSupportPlatform = temp.AboutSupportPlatform;
 } else if ("nsILocalFileMac" in Ci) {
-  let temp = ChromeUtils.import("resource:///modules/aboutSupportMac.js");
+  let temp = ChromeUtils.import("resource:///modules/AboutSupportMac.jsm");
   AboutSupportPlatform = temp.AboutSupportPlatform;
 } else {
-  let temp = ChromeUtils.import("resource:///modules/aboutSupportUnix.js");
+  let temp = ChromeUtils.import("resource:///modules/AboutSupportUnix.jsm");
   AboutSupportPlatform = temp.AboutSupportPlatform;
 }
 
 var gMessengerBundle = Services.strings.createBundle(
   "chrome://messenger/locale/messenger.properties"
 );
 
 var gSocketTypes = {};

--- a/mail/components/about-support/moz.build
+++ b/mail/components/about-support/moz.build
@@ -1,13 +1,13 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
-    EXTRA_JS_MODULES += ['aboutSupportWin32.js']
+    EXTRA_JS_MODULES += ['AboutSupportWin32.jsm']
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    EXTRA_JS_MODULES += ['aboutSupportMac.js']
+    EXTRA_JS_MODULES += ['AboutSupportMac.jsm']
 else:
-    EXTRA_JS_MODULES += ['aboutSupportUnix.js']
+    EXTRA_JS_MODULES += ['AboutSupportUnix.jsm']
 
 JAR_MANIFESTS += ['jar.mn']

--- a/mail/components/accountcreation/content/emailWizard.js
+++ b/mail/components/accountcreation/content/emailWizard.js
@@ -19,17 +19,17 @@
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 var { OAuth2Providers } = ChromeUtils.import(
   "resource:///modules/OAuth2Providers.jsm"
 );
 
-var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
 var {
   cleanUpHostName,
   isLegalHostNameOrIP,
   kMaxPort,
   kMinPort,
 } = ChromeUtils.import("resource:///modules/hostnameUtils.jsm");
 
 /**

--- a/mail/components/accountcreation/content/exchangeAutoDiscover.js
+++ b/mail/components/accountcreation/content/exchangeAutoDiscover.js
@@ -7,17 +7,17 @@
 /* import-globals-from guessConfig.js */
 
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 ChromeUtils.defineModuleGetter(
   this,
   "AddonManager",
   "resource://gre/modules/AddonManager.jsm"
 );
-var { logException } = ChromeUtils.import("resource:///modules/errUtils.js");
+var { logException } = ChromeUtils.import("resource:///modules/ErrUtils.jsm");
 
 /**
  * Tries to get a configuration from an MS Exchange server
  * using Microsoft AutoDiscover protocol.
  *
  * Disclaimers:
  * - To support domain hosters, we cannot use SSL. That means we
  *   rely on insecure DNS and http, which means the results may be

--- a/mail/components/accountcreation/content/fetchConfig.js
+++ b/mail/components/accountcreation/content/fetchConfig.js
@@ -4,17 +4,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* import-globals-from emailWizard.js */
 
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-var { JXON } = ChromeUtils.import("resource:///modules/JXON.js");
+var { JXON } = ChromeUtils.import("resource:///modules/JXON.jsm");
 var { DNS } = ChromeUtils.import("resource:///modules/DNS.jsm");
 
 /**
  * Tries to find a configuration for this ISP on the local harddisk, in the
  * application install directory's "isp" subdirectory.
  * Params @see fetchConfigFromISP()
  */
 function fetchConfigFromDisk(domain, successCallback, errorCallback) {

--- a/mail/components/accountcreation/content/fetchhttp.js
+++ b/mail/components/accountcreation/content/fetchhttp.js
@@ -12,18 +12,18 @@
  * fetched resource is so small (<1 10 KB) that the roundtrip and
  * response generation is far more significant than the
  * download time of the response. In other words, it's fine for RPC,
  * but not for bigger file downloads.
  */
 
 /* import-globals-from emailWizard.js */
 
-var { JXON } = ChromeUtils.import("resource:///modules/JXON.js");
-var { logException } = ChromeUtils.import("resource:///modules/errUtils.js");
+var { JXON } = ChromeUtils.import("resource:///modules/JXON.jsm");
+var { logException } = ChromeUtils.import("resource:///modules/ErrUtils.jsm");
 
 /**
  * Set up a fetch.
  *
  * @param {string} url - URL of the server function.
  *    ATTENTION: The caller needs to make sure that the URL is secure to call.
  * @param {Object} args - Additional parameters as properties, see below
  *

--- a/mail/components/accountcreation/content/guessConfig.js
+++ b/mail/components/accountcreation/content/guessConfig.js
@@ -1,16 +1,16 @@
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* import-globals-from emailWizard.js */
 
-var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 // This is a bit ugly - we set outgoingDone to false
 // when emailWizard.js cancels the outgoing probe because the user picked
 // an outoing server. It does this by poking the probeAbortable object,
 // so we need outgoingDone to have global scope.
 var outgoingDone = false;
 

--- a/mail/components/accountcreation/content/readFromXML.js
+++ b/mail/components/accountcreation/content/readFromXML.js
@@ -1,16 +1,16 @@
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* import-globals-from emailWizard.js */
 
-var { logException } = ChromeUtils.import("resource:///modules/errUtils.js");
+var { logException } = ChromeUtils.import("resource:///modules/ErrUtils.jsm");
 var {
   cleanUpHostName,
   isLegalHostNameOrIP,
   kMaxPort,
   kMinPort,
 } = ChromeUtils.import("resource:///modules/hostnameUtils.jsm");
 
 /* eslint-disable complexity */

--- a/mail/components/accountcreation/content/util.js
+++ b/mail/components/accountcreation/content/util.js
@@ -3,17 +3,17 @@
  * 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/. */
 /**
  * Some common, generic functions
  */
 
 /* import-globals-from emailWizard.js */
 
-var { logException } = ChromeUtils.import("resource:///modules/errUtils.js");
+var { logException } = ChromeUtils.import("resource:///modules/ErrUtils.jsm");
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 // --------------------------
 // Low level, basic functions
 
 function assert(test, errorMsg) {
   if (!test) {
     throw new NotReached(
@@ -659,17 +659,17 @@ function deepCopy(org) {
   }
   for (var prop in org) {
     result[prop] = deepCopy(org[prop]);
   }
   return result;
 }
 
 if (typeof gEmailWizardLogger == "undefined") {
-  var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+  var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
   var gEmailWizardLogger = Log4Moz.getConfiguredLogger("mail.setup");
   gEmailWizardLogger.level = Log4Moz.Level.Info;
   gEmailWizardLogger.addAppender(
     new Log4Moz.ConsoleAppender(new Log4Moz.BasicFormatter())
   ); // browser console
 }
 
 function ddump(text) {

--- a/mail/components/accountcreation/content/verifyConfig.js
+++ b/mail/components/accountcreation/content/verifyConfig.js
@@ -6,20 +6,20 @@
 /* import-globals-from emailWizard.js */
 
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 var { OAuth2Providers } = ChromeUtils.import(
   "resource:///modules/OAuth2Providers.jsm"
 );
-var { logException } = ChromeUtils.import("resource:///modules/errUtils.js");
+var { logException } = ChromeUtils.import("resource:///modules/ErrUtils.jsm");
 
 if (typeof gEmailWizardLogger == "undefined") {
-  var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+  var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
   var gEmailWizardLogger = Log4Moz.getConfiguredLogger("mail.wizard");
 }
 
 /**
  * This checks a given config, by trying a real connection and login,
  * with username and password.
  *
  * TODO

--- a/mail/components/activity/Activity.jsm
+++ b/mail/components/activity/Activity.jsm
@@ -1,15 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 EXPORTED_SYMBOLS = ["ActivityProcess", "ActivityEvent", "ActivityWarning"];
 
-var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
 
 // Base class for ActivityProcess and ActivityEvent objects
 
 function Activity() {
   this._initLogging();
   this._listeners = [];
   this._subjects = [];
 }

--- a/mail/components/activity/ActivityManager.jsm
+++ b/mail/components/activity/ActivityManager.jsm
@@ -1,16 +1,16 @@
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 EXPORTED_SYMBOLS = ["ActivityManager"];
 
-var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
 
 function ActivityManager() {}
 
 ActivityManager.prototype = {
   log: Log4Moz.getConfiguredLogger("ActivityManager"),
   _listeners: [],
   _processCount: 0,
   _db: null,

--- a/mail/components/activity/content/activity-widgets.js
+++ b/mail/components/activity/content/activity-widgets.js
@@ -7,20 +7,20 @@
 /* global MozXULElement, MozElements, activityManager */
 
 // Wrap in a block to prevent leaking to window scope.
 {
   const { Services } = ChromeUtils.import(
     "resource://gre/modules/Services.jsm"
   );
   const { Log4Moz } = ChromeUtils.import(
-    "resource:///modules/gloda/log4moz.js"
+    "resource:///modules/gloda/Log4moz.jsm"
   );
   const { makeFriendlyDateAgo } = ChromeUtils.import(
-    "resource:///modules/templateUtils.js"
+    "resource:///modules/TemplateUtils.jsm"
   );
   /**
    * The MozActivityBaseRichlistItem widget is the base class for all the
    * activity item. It initializes activity details: i.e. id, status,
    * icon, name, progress, date etc. for the activity widgets.
    *
    * @abstract
    * @extends {MozElements.MozRichlistitem}

--- a/mail/components/activity/content/activity.js
+++ b/mail/components/activity/content/activity.js
@@ -1,14 +1,14 @@
 /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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 { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
 const activityManager = Cc["@mozilla.org/activity-manager;1"].getService(
   Ci.nsIActivityManager
 );
 
 var ACTIVITY_LIMIT = 250;
 
 var activityObject = {
   _activityMgrListener: null,

--- a/mail/components/activity/modules/autosync.jsm
+++ b/mail/components/activity/modules/autosync.jsm
@@ -12,17 +12,17 @@ var nsActProcess = Components.Constructo
 );
 var nsActEvent = Components.Constructor(
   "@mozilla.org/activity-event;1",
   "nsIActivityEvent",
   "init"
 );
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+const { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
 
 var nsIAutoSyncMgrListener = Ci.nsIAutoSyncMgrListener;
 
 /**
  * This code aims to mediate between the auto-sync code and the activity mgr.
  *
  * Not every auto-sync activity is directly  mapped to a process or event.
  * To prevent a possible event overflow, Auto-Sync monitor generates one

--- a/mail/components/activity/modules/glodaIndexer.jsm
+++ b/mail/components/activity/modules/glodaIndexer.jsm
@@ -15,20 +15,22 @@ var nsActEvent = Components.Constructor(
   "nsIActivityEvent",
   "init"
 );
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { PluralForm } = ChromeUtils.import(
   "resource://gre/modules/PluralForm.jsm"
 );
-const { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
-const { Gloda } = ChromeUtils.import("resource:///modules/gloda/public.js");
+const { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
+const { Gloda } = ChromeUtils.import(
+  "resource:///modules/gloda/GlodaPublic.jsm"
+);
 const { GlodaIndexer } = ChromeUtils.import(
-  "resource:///modules/gloda/indexer.js"
+  "resource:///modules/gloda/GlodaIndexer.jsm"
 );
 
 /**
  * Gloda message indexer feedback.
  */
 var glodaIndexerActivity = {
   get log() {
     delete this.log;

--- a/mail/components/activity/modules/moveCopy.jsm
+++ b/mail/components/activity/modules/moveCopy.jsm
@@ -13,17 +13,17 @@ var nsActEvent = Components.Constructor(
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 const { PluralForm } = ChromeUtils.import(
   "resource://gre/modules/PluralForm.jsm"
 );
-const { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+const { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
 
 // This module provides a link between the move/copy code and the activity
 // manager.
 var moveCopyModule = {
   lastMessage: {},
   lastFolder: {},
 
   get log() {

--- a/mail/components/activity/modules/pop3Download.jsm
+++ b/mail/components/activity/modules/pop3Download.jsm
@@ -13,17 +13,17 @@ var nsActEvent = Components.Constructor(
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 const { PluralForm } = ChromeUtils.import(
   "resource://gre/modules/PluralForm.jsm"
 );
-const { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+const { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
 
 // This module provides a link between the pop3 service code and the activity
 // manager.
 var pop3DownloadModule = {
   // hash table of most recent download items per folder
   _mostRecentActivityForFolder: new Map(),
   // hash table of prev download items per folder, so we can
   // coalesce consecutive no new message events.

--- a/mail/components/activity/modules/sendLater.jsm
+++ b/mail/components/activity/modules/sendLater.jsm
@@ -17,17 +17,17 @@ var nsActEvent = Components.Constructor(
 );
 var nsActWarning = Components.Constructor(
   "@mozilla.org/activity-warning;1",
   "nsIActivityWarning",
   "init"
 );
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+const { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
 
 /**
  * This really, really, sucks. Due to mailnews widespread use of
  * nsIMsgStatusFeedback we're bound to the UI to get any sensible feedback of
  * mail sending operations. The current send later code can't hook into the
  * progress listener easily to get the state of messages being sent, so we'll
  * just have to do it here.
  */

--- a/mail/components/addrbook/content/abCommon.js
+++ b/mail/components/addrbook/content/abCommon.js
@@ -8,17 +8,17 @@
 /* import-globals-from ../../../../mailnews/addrbook/content/abResultsPane.js */
 /* import-globals-from ../../../base/content/utilityOverlay.js */
 /* import-globals-from abTrees.js */
 /* import-globals-from addressbook.js */
 
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
-var { IOUtils } = ChromeUtils.import("resource:///modules/IOUtils.js");
+var { IOUtils } = ChromeUtils.import("resource:///modules/IOUtils.jsm");
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { FileUtils } = ChromeUtils.import("resource://gre/modules/FileUtils.jsm");
 var { PrivateBrowsingUtils } = ChromeUtils.import(
   "resource://gre/modules/PrivateBrowsingUtils.jsm"
 );
 
 var gDirTree;
 var abList = null;

--- a/mail/components/addrbook/content/abTrees.js
+++ b/mail/components/addrbook/content/abTrees.js
@@ -9,17 +9,17 @@
  * This file contains our implementation for various addressbook trees.  It
  * depends on jsTreeView.js being loaded before this script is loaded.
  */
 
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
-var { IOUtils } = ChromeUtils.import("resource:///modules/IOUtils.js");
+var { IOUtils } = ChromeUtils.import("resource:///modules/IOUtils.jsm");
 
 const DIRTYPE_JS = 101;
 
 // Tree Sort helper methods.
 var AB_ORDER = ["aab", "pab", "js", "ldap", "mapi+other", "anyab", "cab"];
 
 function getDirectoryValue(aDir, aKey) {
   if (aKey == "ab_type") {

--- a/mail/components/addrbook/test/browser/browser_ldap_search.js
+++ b/mail/components/addrbook/test/browser/browser_ldap_search.js
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 { LDAPServer } = ChromeUtils.import(
   "resource://testing-common/LDAPServer.jsm"
 );
 const { mailTestUtils } = ChromeUtils.import(
-  "resource://testing-common/mailnews/mailTestUtils.js"
+  "resource://testing-common/mailnews/MailTestUtils.jsm"
 );
 
 const jsonFile =
   "http://mochi.test:8888/browser/comm/mail/components/addrbook/test/browser/ldap_contacts.json";
 
 add_task(async () => {
   LDAPServer.open();
   let response = await fetch(jsonFile);

--- a/mail/components/addrbook/test/browser/browser_mailing_lists.js
+++ b/mail/components/addrbook/test/browser/browser_mailing_lists.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 /* globals DisplayNameUtils, fixIterator, MailServices, MailUtils */
 
 const { mailTestUtils } = ChromeUtils.import(
-  "resource://testing-common/mailnews/mailTestUtils.js"
+  "resource://testing-common/mailnews/MailTestUtils.jsm"
 );
 
 const inputs = {
   abName: "Mochitest Address Book",
   mlName: "Mochitest Mailing List",
   nickName: "Nicky",
   description: "Just a test mailing list.",
   addresses: [

--- a/mail/components/extensions/parent/ext-messages.js
+++ b/mail/components/extensions/parent/ext-messages.js
@@ -1,31 +1,31 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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.defineModuleGetter(
   this,
   "Gloda",
-  "resource:///modules/gloda/public.js"
+  "resource:///modules/gloda/GlodaPublic.jsm"
 );
 ChromeUtils.defineModuleGetter(
   this,
   "MailServices",
   "resource:///modules/MailServices.jsm"
 );
 ChromeUtils.defineModuleGetter(
   this,
   "MessageArchiver",
   "resource:///modules/MessageArchiver.jsm"
 );
 ChromeUtils.defineModuleGetter(
   this,
   "MsgHdrToMimeMessage",
-  "resource:///modules/gloda/mimemsg.js"
+  "resource:///modules/gloda/MimeMessage.jsm"
 );
 ChromeUtils.defineModuleGetter(
   this,
   "toXPCOMArray",
   "resource:///modules/iteratorUtils.jsm"
 );
 ChromeUtils.defineModuleGetter(
   this,

--- a/mail/components/extensions/test/browser/browser_ext_menus.js
+++ b/mail/components/extensions/test/browser/browser_ext_menus.js
@@ -1,16 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 let gAccount, gFolders;
 
 const { mailTestUtils } = ChromeUtils.import(
-  "resource://testing-common/mailnews/mailTestUtils.js"
+  "resource://testing-common/mailnews/MailTestUtils.jsm"
 );
 
 const treeClick = mailTestUtils.treeClick.bind(null, EventUtils, window);
 
 async function checkShownEvent(extension, menuIds, contexts) {
   let [info, tab] = await extension.awaitMessage("onShown");
   is(info.menuIds.length, menuIds.length);
   for (let i = 0; i < menuIds.length; i++) {

--- a/mail/components/extensions/test/browser/head.js
+++ b/mail/components/extensions/test/browser/head.js
@@ -41,17 +41,17 @@ function addIdentity(account) {
   identity.email = "mochitest@localhost";
   account.addIdentity(identity);
   account.defaultIdentity = identity;
   info(`Created identity ${identity.toString()}`);
 }
 
 function createMessages(folder, count) {
   const { MessageGenerator } = ChromeUtils.import(
-    "resource://testing-common/mailnews/messageGenerator.js"
+    "resource://testing-common/mailnews/MessageGenerator.jsm"
   );
   let messages = new MessageGenerator().makeMessages({ count });
   let messageStrings = messages.map(message => message.toMboxString());
   folder.QueryInterface(Ci.nsIMsgLocalMailFolder);
   folder.addMessageBatch(messageStrings);
 }
 
 async function promiseAnimationFrame(win = window) {

--- a/mail/components/extensions/test/xpcshell/head.js
+++ b/mail/components/extensions/test/xpcshell/head.js
@@ -59,17 +59,17 @@ function addIdentity(account, email = "x
   if (!account.defaultIdentity) {
     account.defaultIdentity = identity;
   }
   info(`Created identity ${identity.toString()}`);
 }
 
 function createMessages(folder, count) {
   const { MessageGenerator } = ChromeUtils.import(
-    "resource://testing-common/mailnews/messageGenerator.js"
+    "resource://testing-common/mailnews/MessageGenerator.jsm"
   );
   let messages = new MessageGenerator().makeMessages({
     count,
     age_incr: { days: 2 },
   });
   let messageStrings = messages.map(message => message.toMboxString());
   folder.QueryInterface(Ci.nsIMsgLocalMailFolder);
   folder.addMessageBatch(messageStrings);

--- a/mail/components/extensions/test/xpcshell/test_ext_accounts.js
+++ b/mail/components/extensions/test/xpcshell/test_ext_accounts.js
@@ -4,19 +4,19 @@
 
 "use strict";
 
 var { ExtensionTestUtils } = ChromeUtils.import(
   "resource://testing-common/ExtensionXPCShellUtils.jsm"
 );
 ExtensionTestUtils.init(this);
 
-var imapd = ChromeUtils.import("resource://testing-common/mailnews/imapd.js");
+var imapd = ChromeUtils.import("resource://testing-common/mailnews/Imapd.jsm");
 var { nsMailServer } = ChromeUtils.import(
-  "resource://testing-common/mailnews/maild.js"
+  "resource://testing-common/mailnews/Maild.jsm"
 );
 var { PromiseTestUtils } = ChromeUtils.import(
   "resource://testing-common/mailnews/PromiseTestUtils.jsm"
 );
 
 add_task(async function test_accounts() {
   let extension = ExtensionTestUtils.loadExtension({
     async background() {

--- a/mail/components/extensions/test/xpcshell/test_ext_messages_get.js
+++ b/mail/components/extensions/test/xpcshell/test_ext_messages_get.js
@@ -4,25 +4,25 @@
 
 "use strict";
 
 var { ExtensionTestUtils } = ChromeUtils.import(
   "resource://testing-common/ExtensionXPCShellUtils.jsm"
 );
 ExtensionTestUtils.init(this);
 
-var imapd = ChromeUtils.import("resource://testing-common/mailnews/imapd.js");
+var imapd = ChromeUtils.import("resource://testing-common/mailnews/Imapd.jsm");
 var { mailTestUtils } = ChromeUtils.import(
-  "resource://testing-common/mailnews/mailTestUtils.js"
+  "resource://testing-common/mailnews/MailTestUtils.jsm"
 );
 var { MessageGenerator } = ChromeUtils.import(
-  "resource://testing-common/mailnews/messageGenerator.js"
+  "resource://testing-common/mailnews/MessageGenerator.jsm"
 );
 var { nsMailServer } = ChromeUtils.import(
-  "resource://testing-common/mailnews/maild.js"
+  "resource://testing-common/mailnews/Maild.jsm"
 );
 var { PromiseTestUtils } = ChromeUtils.import(
   "resource://testing-common/mailnews/PromiseTestUtils.jsm"
 );
 
 /**
  * Create a local mail account and add a message.
  */

--- a/mail/components/extensions/test/xpcshell/test_ext_messages_query.js
+++ b/mail/components/extensions/test/xpcshell/test_ext_messages_query.js
@@ -4,19 +4,19 @@
 
 "use strict";
 
 var { ExtensionTestUtils } = ChromeUtils.import(
   "resource://testing-common/ExtensionXPCShellUtils.jsm"
 );
 ExtensionTestUtils.init(this);
 
-var { Gloda } = ChromeUtils.import("resource:///modules/gloda/public.js");
+var { Gloda } = ChromeUtils.import("resource:///modules/gloda/GlodaPublic.jsm");
 var { GlodaIndexer } = ChromeUtils.import(
-  "resource:///modules/gloda/indexer.js"
+  "resource:///modules/gloda/GlodaIndexer.jsm"
 );
 
 // Create some folders and populate them.
 let account, rootFolder;
 let subFolders = {};
 add_task(async function setup() {
   GlodaIndexer._INDEX_INTERVAL = 0;
 

--- a/mail/components/im/modules/chatNotifications.jsm
+++ b/mail/components/im/modules/chatNotifications.jsm
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 this.EXPORTED_SYMBOLS = ["Notifications"];
 
 const { Services } = ChromeUtils.import("resource:///modules/imServices.jsm");
 const { StringBundle } = ChromeUtils.import(
-  "resource:///modules/StringBundle.js"
+  "resource:///modules/StringBundle.jsm"
 );
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
 const { PluralForm } = ChromeUtils.import(
   "resource://gre/modules/PluralForm.jsm"
 );
 const { clearTimeout, setTimeout } = ChromeUtils.import(

--- a/mail/components/im/modules/index_im.jsm
+++ b/mail/components/im/modules/index_im.jsm
@@ -1,22 +1,24 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 this.EXPORTED_SYMBOLS = [];
 
 var CC = Components.Constructor;
 
-const { Gloda } = ChromeUtils.import("resource:///modules/gloda/public.js");
+const { Gloda } = ChromeUtils.import(
+  "resource:///modules/gloda/GlodaPublic.jsm"
+);
 const { GlodaAccount } = ChromeUtils.import(
-  "resource:///modules/gloda/datamodel.js"
+  "resource:///modules/gloda/GlodaDataModel.jsm"
 );
 const { GlodaIndexer, IndexingJob } = ChromeUtils.import(
-  "resource:///modules/gloda/indexer.js"
+  "resource:///modules/gloda/GlodaIndexer.jsm"
 );
 const { fixIterator } = ChromeUtils.import(
   "resource:///modules/iteratorUtils.jsm"
 );
 const { Services } = ChromeUtils.import("resource:///modules/imServices.jsm");
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
@@ -34,17 +36,17 @@ ChromeUtils.defineModuleGetter(this, "OS
 ChromeUtils.defineModuleGetter(
   this,
   "AsyncShutdown",
   "resource://gre/modules/AsyncShutdown.jsm"
 );
 ChromeUtils.defineModuleGetter(
   this,
   "GlodaDatastore",
-  "resource:///modules/gloda/datastore.js"
+  "resource:///modules/gloda/GlodaDatastore.jsm"
 );
 
 var kCacheFileName = "indexedFiles.json";
 
 var FileInputStream = CC(
   "@mozilla.org/network/file-input-stream;1",
   "nsIFileInputStream",
   "init"
@@ -63,17 +65,17 @@ XPCOMUtils.defineLazyGetter(this, "MailF
   Cc["@mozilla.org/mail/folder-factory;1?name=mailbox"].createInstance(
     Ci.nsIMsgFolder
   )
 );
 
 var gIMAccounts = {};
 
 function GlodaIMConversation(aTitle, aTime, aPath, aContent) {
-  // grokNounItem from gloda.js puts automatically the values of all
+  // grokNounItem from Gloda.jsm puts automatically the values of all
   // JS properties in the jsonAttributes magic attribute, except if
   // they start with _, so we put the values in _-prefixed properties,
   // and have getters in the prototype.
   this._title = aTitle;
   this._time = aTime;
   this._path = aPath;
   this._content = aContent;
 }
@@ -193,17 +195,17 @@ var IMConversationNoun = {
       ["path", "STRING"],
     ],
     fulltextColumns: [["content", "STRING"]],
   },
 };
 Gloda.defineNoun(IMConversationNoun);
 
 // Needs to be set after calling defineNoun, otherwise it's replaced
-// by databind.js' implementation.
+// by GlodaDatabind.jsm' implementation.
 IMConversationNoun.objFromRow = function(aRow) {
   // Row columns are:
   // 0 id
   // 1 title
   // 2 time
   // 3 path
   // 4 jsonAttributes
   // 5 content
@@ -282,17 +284,17 @@ this._attrFulltext = Gloda.defineAttribu
   attributeType: Gloda.kAttrDerived,
   attributeName: "fulltextMatches",
   singular: true,
   special: Gloda.kSpecialFulltext,
   specialColumnName: "imConversationsText",
   subjectNouns: [IMConversationNoun.id],
   objectNoun: Gloda.NOUN_FULLTEXT,
 });
-// For facet.js DateFaceter
+// For Facet.jsm DateFaceter
 Gloda.defineAttribute({
   provider: WidgetProvider,
   extensionName: EXT_NAME,
   attributeType: Gloda.kAttrDerived,
   attributeName: "date",
   singular: true,
   special: Gloda.kSpecialColumn,
   subjectNouns: [IMConversationNoun.id],

--- a/mail/components/im/modules/search_im.jsm
+++ b/mail/components/im/modules/search_im.jsm
@@ -1,16 +1,18 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 this.EXPORTED_SYMBOLS = ["GlodaIMSearcher"];
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const { Gloda } = ChromeUtils.import("resource:///modules/gloda/public.js");
+const { Gloda } = ChromeUtils.import(
+  "resource:///modules/gloda/GlodaPublic.jsm"
+);
 
 /**
  * How much time boost should a 'score point' amount to?  The authoritative,
  *  incontrivertible answer, across all time and space, is a week.
  *  Note that gloda stores conversation timestamps in seconds.
  */
 // var FUZZSCORE_TIMESTAMP_FACTOR = 60 * 60 * 24 * 7;
 

--- a/mail/components/moz.build
+++ b/mail/components/moz.build
@@ -33,17 +33,17 @@ DIRS += ['build']
 XPIDL_SOURCES += [
     'nsIMailGlue.idl',
 ]
 
 XPIDL_MODULE = 'mailcompsbase'
 
 EXTRA_JS_MODULES += [
     'AboutRedirector.jsm',
-    'appIdleManager.js',
+    'AppIdleManager.jsm',
     'MailGlue.jsm',
     'MessengerContentHandler.jsm',
 ]
 
 XPCOM_MANIFESTS += [
     'components.conf',
 ]
 

--- a/mail/components/newmailaccount/content/accountProvisioner.js
+++ b/mail/components/newmailaccount/content/accountProvisioner.js
@@ -8,22 +8,22 @@ var { AppConstants } = ChromeUtils.impor
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 var { PluralForm } = ChromeUtils.import(
   "resource://gre/modules/PluralForm.jsm"
 );
 var { StringBundle } = ChromeUtils.import(
-  "resource:///modules/StringBundle.js"
+  "resource:///modules/StringBundle.jsm"
 );
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
-var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
 
 // Get a configured logger for this component.
 // To debug, set mail.provider.logging.dump (or .console)="All"
 var gLog = Log4Moz.getConfiguredLogger("mail.provider");
 var stringBundle = new StringBundle(
   "chrome://messenger/locale/newmailaccount/accountProvisioner.properties"
 );
 

--- a/mail/components/newmailaccount/content/accountProvisionerTab.js
+++ b/mail/components/newmailaccount/content/accountProvisionerTab.js
@@ -3,17 +3,17 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // mail/base/content/contentAreaClick.js
 /* globals hRefForClickEvent, openLinkExternally */
 // mail/base/content/specialTabs.js
 /* globals specialTabs */
 
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
 
 /**
  * A content tab for the account provisioner.  We use Javascript-y magic to
  * "subclass" specialTabs.contentTabType, and then override the appropriate
  * members.
  *
  * Also note that accountProvisionerTab is a singleton (hence the maxTabs: 1).
  */

--- a/mail/components/newmailaccount/content/uriListener.js
+++ b/mail/components/newmailaccount/content/uriListener.js
@@ -11,17 +11,17 @@
  * one of our account providers.
  */
 
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 var { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
-var { JXON } = ChromeUtils.import("resource:///modules/JXON.js");
+var { JXON } = ChromeUtils.import("resource:///modules/JXON.jsm");
 
 /**
  * This is an observer that watches all HTTP requests for one where the
  * response contentType contains text/xml.  Once that observation is
  * made, we ensure that the associated window for that request matches
  * the window belonging to the content tab for the account order form.
  * If so, we attach an nsITraceableListener to read the contents of the
  * request response, and react accordingly if the contents can be turned

--- a/mail/components/search/SearchIntegration.jsm
+++ b/mail/components/search/SearchIntegration.jsm
@@ -13,17 +13,17 @@
  * - gPrefBase: the base for preferences that are stored
  * - gStreamListener: an nsIStreamListener to read message text
  */
 
 /* exported SearchSupport */
 
 var EXPORTED_SYMBOLS = ["SearchIntegration"];
 
-var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/log4moz.js");
+var { Log4Moz } = ChromeUtils.import("resource:///modules/gloda/Log4moz.jsm");
 var { fixIterator } = ChromeUtils.import(
   "resource:///modules/iteratorUtils.jsm"
 );
 const { AppConstants } = ChromeUtils.import(
   "resource://gre/modules/AppConstants.jsm"
 );
 const { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"

--- a/mail/components/test/unit/head_mailcomponents.js
+++ b/mail/components/test/unit/head_mailcomponents.js
@@ -1,17 +1,17 @@
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 var { MailServices } = ChromeUtils.import(
   "resource:///modules/MailServices.jsm"
 );
 var { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 var { mailTestUtils } = ChromeUtils.import(
-  "resource://testing-common/mailnews/mailTestUtils.js"
+  "resource://testing-common/mailnews/MailTestUtils.jsm"
 );
 
 var CC = Components.Constructor;
 
 // Ensure the profile directory is set up
 do_get_profile();
 
 var gDEPTH = "../../../../";

--- a/mail/components/test/unit/test_about_support.js
+++ b/mail/components/test/unit/test_about_support.js
@@ -1,17 +1,17 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/. */
 
 // mail/components/about-support/content/accounts.js
 /* globals AboutSupport, AboutSupportPlatform */
 
 var { localAccountUtils } = ChromeUtils.import(
-  "resource://testing-common/mailnews/localAccountUtils.js"
+  "resource://testing-common/mailnews/LocalAccountUtils.jsm"
 );
 
 /*
  * Test the about:support module.
  */
 
 var gAccountList = [
   {

--- a/mail/components/test/unit/test_autoconfigXML.js
+++ b/mail/components/test/unit/test_autoconfigXML.js
@@ -12,17 +12,17 @@
  * reading and allow fallback mechanisms. This test checks whether that works,
  * and of course also whether we can read a normal config and get the proper
  * values.
  */
 
 // Globals
 
 var { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-var { JXON } = ChromeUtils.import("resource:///modules/JXON.js");
+var { JXON } = ChromeUtils.import("resource:///modules/JXON.jsm");
 
 var xmlReader = {};
 Services.scriptloader.loadSubScript(
   "chrome://messenger/content/accountcreation/util.js",
   xmlReader
 );
 Services.scriptloader.loadSubScript(
   "chrome://messenger/content/accountcreation/accountConfig.js",

rename from mail/components/wintaskbar/windowsJumpLists.js
rename to mail/components/wintaskbar/WindowsJumpLists.jsm

--- a/mail/components/wintaskbar/moz.build
+++ b/mail/components/wintaskbar/moz.build
@@ -1,9 +1,9 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 EXTRA_JS_MODULES += [
-    'windowsJumpLists.js',
+    'WindowsJumpLists.jsm',
 ]
 

rename from mail/extensions/openpgp/content/bond.js
rename to mail/extensions/openpgp/content/BondOpenPGP.jsm

--- a/mail/extensions/openpgp/content/modules/cryptoAPI.jsm
+++ b/mail/extensions/openpgp/content/modules/cryptoAPI.jsm
@@ -14,20 +14,20 @@ var Services = ChromeUtils.import("resou
 
 function EnigmailCryptoAPI() {
   if (!gCurrentApi) {
     const gOpenPGPEngine = Services.prefs.getIntPref("temp.openpgp.engine");
     
     if (gOpenPGPEngine == 1) {
       const {
         getRNPAPI
-      } = ChromeUtils.import("chrome://openpgp/content/modules/cryptoAPI/rnp-cryptoAPI.js");
+      } = ChromeUtils.import("chrome://openpgp/content/modules/cryptoAPI/RNPCryptoAPI.jsm");
       gCurrentApi = getRNPAPI();
     } else if (gOpenPGPEngine == 2) {
       const {
         getGnuPGAPI
-      } = ChromeUtils.import("chrome://openpgp/content/modules/cryptoAPI/gnupg.js");
+      } = ChromeUtils.import("chrome://openpgp/content/modules/cryptoAPI/GnuPGCryptoAPI.jsm");
       gCurrentApi = getGnuPGAPI();
     }
   }
 
   return gCurrentApi;
 }

rename from mail/extensions/openpgp/content/modules/cryptoAPI/gnupg.js
rename to mail/extensions/openpgp/content/modules/cryptoAPI/GnuPGCryptoAPI.jsm

rename from mail/extensions/openpgp/content/modules/cryptoAPI/rnp-cryptoAPI.js
rename to mail/extensions/openpgp/content/modules/cryptoAPI/RNPCryptoAPI.jsm
--- a/mail/extensions/openpgp/content/modules/cryptoAPI/rnp-cryptoAPI.js
+++ b/mail/extensions/openpgp/content/modules/cryptoAPI/RNPCryptoAPI.jsm
@@ -218,17 +218,17 @@ class RNPCryptoAPI extends CryptoAPI {
    * @return {Promise<Object>} - Return object with decryptedData and
    * status information
    *
    * Use Promise.catch to handle failed decryption.
    * retObj.errorMsg will be an error message in this case.
    */
 
   decryptMime(encrypted, options) {
-    console.log("rnp-cryptoAPI.js: decryptMime()");
+    console.log("RNPCryptoAPI.jsm: decryptMime()");
     EnigmailLog.DEBUG(`rnp-cryptoAPI.js: decryptMime()\n`);
 
     // write something to gpg such that the process doesn't get stuck
     if (encrypted.length === 0) {
       encrypted = "NO DATA\n";
     }
 
     options.noOutput = false;
@@ -246,17 +246,17 @@ class RNPCryptoAPI extends CryptoAPI {
    * @return {Promise<Object>} - Return object with decryptedData and
    * status information
    *
    * Use Promise.catch to handle failed decryption.
    * retObj.errorMsg will be an error message in this case.
    */
 
   async verifyMime(signed, options) {
-    console.log("rnp-cryptoAPI.js: verifyMime()");
+    console.log("RNPCryptoAPI.jsm: verifyMime()");
     EnigmailLog.DEBUG(`rnp-cryptoAPI.js: verifyMime()\n`);
 
     options.noOutput = true;
     options.verifyOnly = true;
     options.uiFlags = EnigmailConstants.UI_PGP_MIME;
 
     return this.decrypt(signed, options);
   }

--- a/mail/extensions/openpgp/content/modules/cryptoAPI/gnupg-key.jsm
+++ b/mail/extensions/openpgp/content/modules/cryptoAPI/gnupg-key.jsm
@@ -1,16 +1,16 @@
 /*
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 
 /****
-   Private sub-module to gnupg.js for handling key import/export
+   Private sub-module to GnuPGCryptoAPI.jsm for handling key import/export
  ****/
 
 "use strict";
 
 var EXPORTED_SYMBOLS = ["GnuPG_importKeyFromFile", "GnuPG_extractSecretKey"];
 
 const EnigmailExecution = ChromeUtils.import("chrome://openpgp/content/modules/execution.jsm").EnigmailExecution;
 const EnigmailLog = ChromeUtils.import("chrome://openpgp/content/modules/log.jsm").EnigmailLog;

--- a/mail/extensions/openpgp/content/modules/cryptoAPI/gnupg-keylist.jsm
+++ b/mail/extensions/openpgp/content/modules/cryptoAPI/gnupg-keylist.jsm
@@ -1,16 +1,16 @@
 /*
  * This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 
 /****
-   Private sub-module to gnupg.js for handling key lists from GnuPG
+   Private sub-module to GnuPGCryptoAPI.jsm for handling key lists from GnuPG
  ****/
 
 "use strict";
 
 var EXPORTED_SYMBOLS = ["obtainKeyList", "createKeyObj",
   "getPhotoFileFromGnuPG", "extractSignatures", "getGpgKeyData"
 ];
 
@@ -351,17 +351,17 @@ async function getPhotoFileFromGnuPG(key
  * @return {Array of Object}:
  *     - uid
  *     - uidLabel
  *     - creationDate
  *     - sigList: [uid, creationDate, signerKeyId, sigType ]
  */
 
 function extractSignatures(gpgKeyList, ignoreUnknownUid) {
-  EnigmailLog.DEBUG("gnupg.js: extractSignatures\n");
+  EnigmailLog.DEBUG("GnuPGCryptoAPI.jsm: extractSignatures\n");
 
   var listObj = {};
 
   let havePub = false;
   let currUid = "",
     keyId = "",
     fpr = "";
 
@@ -420,17 +420,17 @@ function extractSignatures(gpgKeyList, i
     }
   }
 
   return listObj;
 }
 
 
 async function getGpgKeyData(armorKeyString) {
-  EnigmailLog.DEBUG("gnupg.js: getGpgKeyData()\n");
+  EnigmailLog.DEBUG("GnuPGCryptoAPI.jsm: getGpgKeyData()\n");
 
   if (!EnigmailGpg.getGpgFeature("supports-show-only")) {
     throw "unsupported";
   }
 
   let args = EnigmailGpg.getStandardArgs(false).concat(["--no-tty", "--batch", "--no-verbose", "--with-fingerprint", "--with-colons", "--import-options", "import-show", "--dry-run", "--import"]);
 
   let res = await EnigmailExecution.execAsync(EnigmailGpg.agentPath, args, armorKeyString);

--- a/mail/extensions/openpgp/content/modules/glodaUtils.jsm
+++ b/mail/extensions/openpgp/content/modules/glodaUtils.jsm
@@ -12,17 +12,17 @@
 "use strict";
 
 var EXPORTED_SYMBOLS = ["GlodaUtils"];
 
 var GlodaUtils = null;
 
 try {
   // TB with omnijar
-  GlodaUtils = ChromeUtils.import("resource:///modules/gloda/utils.js").GlodaUtils;
+  GlodaUtils = ChromeUtils.import("resource:///modules/gloda/GlodaUtils.jsm").GlodaUtils;
 }
 catch (ex) {
   // "old style" TB
-  GlodaUtils = ChromeUtils.import("resource://app/modules/gloda/utils.js").GlodaUtils;
+  GlodaUtils = ChromeUtils.import("resource://app/modules/gloda/GlodaUtils.jsm").GlodaUtils;
 }
 
 // We don't define the exported symbol here - that is on purpose
 // The goal of this module is simply to simplify loading of the component

--- a/mail/extensions/openpgp/content/modules/stdlib/compose.jsm
+++ b/mail/extensions/openpgp/content/modules/stdlib/compose.jsm
@@ -21,17 +21,17 @@ const {
   results: Cr
 } = Components;
 
 const {
   MsgHdrToMimeMessage,
   MimeMessage, MimeContainer,
   MimeBody, MimeUnknown,
   MimeMessageAttachment
-} = ChromeUtils.import("resource:///modules/gloda/mimemsg.js");
+} = ChromeUtils.import("resource:///modules/gloda/MimeMessage.jsm");
 
 
 var MailServices;
 try {
   MailServices = ChromeUtils.import("resource:///modules/MailServices.jsm").MailServices;
 }
 catch (x){
   MailServices = ChromeUtils.import("resource:///modules/mailServices.js").MailServices;