Bug 520892 - Switch application/x-javascript to application/javascript, SeaMonkey part; (Av1) All .xul files
authorSerge Gautherie <sgautherie.bz@free.fr>
Thu, 08 Oct 2009 23:29:19 +0200
changeset 4093 c235554b121d87ead968dc20c5e4d445ed8da0d2
parent 4092 603ab1222f78c1980f6256065aa4d8e695fc5034
child 4094 3a35f91ecc51cf9282394a1cf3453dfa4c3f195a
push idunknown
push userunknown
push dateunknown
bugs520892
Bug 520892 - Switch application/x-javascript to application/javascript, SeaMonkey part; (Av1) All .xul files r+sr=neil a-seamonkey2.0=kairo
suite/browser/hiddenWindow.xul
suite/browser/linkToolbarOverlay.xul
suite/browser/mailNavigatorOverlay.xul
suite/browser/metadata.xul
suite/browser/navigator.xul
suite/browser/viewPartialSource.xul
suite/common/askViewZoom.xul
suite/common/bookmarks/addBookmark.xul
suite/common/bookmarks/bm-panel.xul
suite/common/bookmarks/bm-props.xul
suite/common/bookmarks/bookmarksManager.xul
suite/common/bookmarks/findBookmark.xul
suite/common/bookmarks/sortFolder.xul
suite/common/defaultClientDialog.xul
suite/common/directory/directory.xul
suite/common/downloads/downloadmanager.xul
suite/common/downloads/progressDialog.xul
suite/common/helpEditorOverlay.xul
suite/common/helpMessengerOverlay.xul
suite/common/helpOverlay.xul
suite/common/helpSecurityOverlay.xul
suite/common/history/history-panel.xul
suite/common/history/placesOverlay.xul
suite/common/openLocation.xul
suite/common/permissions/imageContextOverlay.xul
suite/common/permissions/permissionsManager.xul
suite/common/permissions/permissionsNavigatorOverlay.xul
suite/common/pref/pref-offline.xul
suite/common/pref/pref-proxies-advanced.xul
suite/common/pref/preferences.xul
suite/common/profile/profileSelection.xul
suite/common/sanitize.xul
suite/common/search/internetresults.xul
suite/common/search/search-editor.xul
suite/common/search/search-panel.xul
suite/common/sidebar/customize-panel.xul
suite/common/sidebar/customize.xul
suite/common/sidebar/preview.xul
suite/common/sidebar/sidebarOverlay.xul
suite/common/tasksOverlay.xul
suite/common/utilityOverlay.xul
suite/common/viewZoomOverlay.xul
suite/debugQA/content/debugQAEditorOverlay.xul
suite/debugQA/content/debugQANavigatorOverlay.xul
suite/debugQA/content/debugQATextEditorShell.xul
suite/mailnews/addrbook/addressbook.xul
suite/mailnews/compose/addressingWidgetOverlay.xul
suite/mailnews/compose/messengercompose.xul
suite/mailnews/mailEditorOverlay.xul
suite/mailnews/mailOverlay.xul
suite/mailnews/mailTasksOverlay.xul
suite/mailnews/mailViewList.xul
suite/mailnews/mailViewSetup.xul
suite/mailnews/mailWindowOverlay.xul
suite/mailnews/messageWindow.xul
suite/mailnews/messenger.xul
suite/mailnews/msgFolderPickerOverlay.xul
suite/mailnews/msgSelectOffline.xul
suite/mailnews/search/FilterListDialog.xul
suite/mailnews/subscribe.xul
suite/profile/migration.xul
--- a/suite/browser/hiddenWindow.xul
+++ b/suite/browser/hiddenWindow.xul
@@ -63,22 +63,22 @@
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   title="hidden"
   titlemodifier="&mainWindow.titlemodifier;" 
   titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
   onload="hiddenWindowStartup();"
   onunload="Shutdown();">
 
   <!-- JS from navigator.xul, to handle the menu commands -->
-  <script type="application/x-javascript" src="chrome://navigator/content/browser.js"/>
-  <script type="application/x-javascript" src="chrome://navigator/content/navigator.js"/>
+  <script type="application/javascript" src="chrome://navigator/content/browser.js"/>
+  <script type="application/javascript" src="chrome://navigator/content/navigator.js"/>
 
   <!-- Shared Bookmarks Utility Library -->
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksMenu.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/bookmarks/bookmarksMenu.js"/>
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_navigator" src="chrome://navigator/locale/navigator.properties"/>
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_navigator_region" src="chrome://navigator-region/locale/region.properties"/>
   </stringbundleset>
 
   <!-- keys are appended from the overlay -->
--- a/suite/browser/linkToolbarOverlay.xul
+++ b/suite/browser/linkToolbarOverlay.xul
@@ -42,23 +42,23 @@
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <!DOCTYPE overlay SYSTEM "chrome://navigator/locale/linkToolbar.dtd">
 
 <overlay id="linkToolbarOverlay" 
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
          xmlns:rdf="http://www.mozilla.org/rdf">
 
   <!-- classes -->
-  <script type="application/x-javascript" src="chrome://navigator/content/linkToolbarHandler.js" />
-  <script type="application/x-javascript" src="chrome://navigator/content/linkToolbarItem.js" />
+  <script type="application/javascript" src="chrome://navigator/content/linkToolbarHandler.js" />
+  <script type="application/javascript" src="chrome://navigator/content/linkToolbarItem.js" />
 
   <!-- functions -->
-  <script type="application/x-javascript" src="chrome://navigator/content/linkToolbarOverlay.js" />
+  <script type="application/javascript" src="chrome://navigator/content/linkToolbarOverlay.js" />
 
-  <script type="application/x-javascript">
+  <script type="application/javascript">
     <![CDATA[
       document.addEventListener("pageshow", linkToolbarUI.initHandlers, true);
     ]]>
   </script>
 
   <stringbundleset>
     <stringbundle id="languageBundle"
                   src="chrome://global/locale/languageNames.properties"/>
--- a/suite/browser/mailNavigatorOverlay.xul
+++ b/suite/browser/mailNavigatorOverlay.xul
@@ -2,17 +2,17 @@
 
 <?xul-overlay href="chrome://navigator/content/platformMailOverlay.xul"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://navigator/locale/mailNavigatorOverlay.dtd" >
 
 <overlay id="mailNavigatorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript">
+  <script type="application/javascript">
   <![CDATA[
     var gHasIntegratedMailClient = ("@mozilla.org/messengercompose/composeparams;1" in Components.classes);
 
     // attachment: 0 - link
     //             1 - page
     //             2 - image
     function openComposeWindow(url, title, attachment, charset)
     {
--- a/suite/browser/metadata.xul
+++ b/suite/browser/metadata.xul
@@ -52,17 +52,17 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&caption.label;"
         onload="onLoad()"
         class="dialog"
         minwidth="350"
         persist="screenX screenY"
         screenX="24" screenY="24">
 
-  <script type="application/x-javascript" src="chrome://navigator/content/metadata.js"/>
+  <script type="application/javascript" src="chrome://navigator/content/metadata.js"/>
 
   <keyset id="dialogKeys"/>
 
   <stringbundle src="chrome://navigator/locale/metadata.properties" id="bundle_metadata"/>
   <stringbundle src="chrome://global/locale/languageNames.properties" id="bundle_languages"/>
   <stringbundle src="chrome://global/locale/regionNames.properties" id="bundle_regions"/>
 
   <label id="no-properties" value="&no-properties.label;"/>
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -64,38 +64,38 @@
         contenttitlesetting="true"
         title="&mainWindow.title;" 
         titlemodifier="&mainWindow.titlemodifier;" 
         titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
         windowtype="navigator:browser"
         persist="screenX screenY width height sizemode"> 
 
   <!-- Generic Utility -->
-  <script type="application/x-javascript" src="chrome://global/content/nsUserSettings.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsClipboard.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsUserSettings.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsClipboard.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
   
   <!-- Content Area -->
-  <script type="application/x-javascript" src="chrome://navigator/content/nsBrowserStatusHandler.js"/>
-  <script type="application/x-javascript" src="chrome://navigator/content/nsBrowserContentListener.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
+  <script type="application/javascript" src="chrome://navigator/content/nsBrowserStatusHandler.js"/>
+  <script type="application/javascript" src="chrome://navigator/content/nsBrowserContentListener.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/contentAreaDD.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/findUtils.js"/>
+  <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
 
   <!-- Shared Bookmarks Utility Library -->
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksMenu.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/bookmarks/bookmarksMenu.js"/>
   
   <!-- Navigator -->
-  <script type="application/x-javascript" src="chrome://navigator/content/fullScreen.js"/>
-  <script type="application/x-javascript" src="chrome://navigator/content/browser.js"/>
-  <script type="application/x-javascript" src="chrome://navigator/content/navigator.js"/>
-  <script type="application/x-javascript" src="chrome://navigator/content/navigatorDD.js"/>
-  <script type="application/x-javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>
+  <script type="application/javascript" src="chrome://navigator/content/fullScreen.js"/>
+  <script type="application/javascript" src="chrome://navigator/content/browser.js"/>
+  <script type="application/javascript" src="chrome://navigator/content/navigator.js"/>
+  <script type="application/javascript" src="chrome://navigator/content/navigatorDD.js"/>
+  <script type="application/javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>
 
   <!-- hook for stringbundle overlays -->
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_navigator" src="chrome://navigator/locale/navigator.properties"/>
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_navigator_region" src="chrome://navigator-region/locale/region.properties"/>
     <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
   </stringbundleset>
--- a/suite/browser/viewPartialSource.xul
+++ b/suite/browser/viewPartialSource.xul
@@ -56,17 +56,17 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="onLoadViewPartialSource();"
         title="&viewPartialSourceWindow.title;"
         windowtype="navigator:view-source"
         width="500" height="300"
         screenX="10" screenY="10"
         persist="screenX screenY width height sizemode">
 
-  <script type="application/x-javascript" src="chrome://navigator/content/viewPartialSource.js"/>
+  <script type="application/javascript" src="chrome://navigator/content/viewPartialSource.js"/>
 
   <commandset id="commands"/>
   <keyset id="viewSourceKeys"/>
   <stringbundleset id="viewSource-stringbundleset"/>
   <popupset id="viewSourceContextSet" />
 
   <toolbox id="viewSource-toolbox">
     <menubar id="viewSource-main-menubar">
--- a/suite/common/askViewZoom.xul
+++ b/suite/common/askViewZoom.xul
@@ -42,17 +42,17 @@
 <!DOCTYPE dialog SYSTEM "chrome://communicator/locale/askViewZoom.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   id="askViewZoom"
   title="&askViewZoom.title;"
   ondialogaccept="return onAccept();"
   onload="onLoad();">
 
-  <script type="application/x-javascript" src="chrome://communicator/content/askViewZoom.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/askViewZoom.js"/>
 
   <hbox>
     <label value="&selectZoom.label;" control="zoomValue"/>
   </hbox>
 
   <hbox>
     <textbox id="zoomValue" oninput="doEnabling();"/>
   </hbox>
--- a/suite/common/bookmarks/addBookmark.xul
+++ b/suite/common/bookmarks/addBookmark.xul
@@ -57,18 +57,18 @@
         ondialogaccept="return onOK(event)"
         title="&newBookmark.title;" selectFolderTitle="&selectFolder.title;"
         onload="Startup();"
         onunload="persistTreeSize();"
         persist="screenX screenY"
         screenX="24" screenY="24">
    
   
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/addBookmark.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/bookmarks/addBookmark.js"/>
 
   <stringbundle id="bookmarksbundle"
                 src="chrome://communicator/locale/bookmarks/bookmarks.properties"/>
 
   <broadcaster id="showaddgroup"/>
 
   <separator id="nameseparator" class="thin"/>
   
--- a/suite/common/bookmarks/bm-panel.xul
+++ b/suite/common/bookmarks/bm-panel.xul
@@ -51,24 +51,24 @@
 
 <!DOCTYPE page SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
 
 <page id="bookmarksPanel"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="Startup();" elementtofocus="search-box">
 
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 
   <!-- Bookmarks Shell -->
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bm-panel.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/bookmarks/bm-panel.js"/>
 
   <!-- Bookmarks Panel Drag & Drop -->
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 
   <!-- context menu, tooltips, etc -->
   <popupset id="bookmarksPopupset"/>
   
   <!-- bookmarks string bundle -->
   <stringbundleset id="stringbundleset"/>
   
   <!-- bookmarks & edit commands -->
--- a/suite/common/bookmarks/bm-props.xul
+++ b/suite/common/bookmarks/bm-props.xul
@@ -51,19 +51,19 @@
         title="&bookmarks.windowtitle.label;"
         onload="Init()" style="width: 40em;"
         ondialogaccept="return Commit();">
  
   <stringbundleset>
     <stringbundle id="bundle_bookmarks" src="chrome://communicator/locale/bookmarks/bookmarks.properties"/>
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bm-props.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/bookmarks/bm-props.js"/>
  
   <keyset id="keyset"/>  
     
   <groupbox>
     <caption label="&generalInfo.label;" />
     <grid>
       <columns>
         <column />
--- a/suite/common/bookmarks/bookmarksManager.xul
+++ b/suite/common/bookmarks/bookmarksManager.xul
@@ -65,25 +65,25 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         width="630" height="400" screenX="20" screenY="20"
         persist="width height screenX screenY sizemode"
         onload="Startup();" onunload="Shutdown();">
 
   <!-- The order of loading of these script files is IMPORTANT -->
 
   <!-- XXX - This should SO become an XBL widget -->
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 
   <!-- Shared Bookmarks Utility Library -->
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
   <!-- Bookmarks Window -->
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarksManager.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/bookmarks/bookmarksManager.js"/>
 
   <!-- Bookmarks Window Drag & Drop -->
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 
   <popupset id="bookmarksPopupset"/>
 
   <commands id="commands">
     <commandset id="CommandUpdate_Bookmarks"
                 events="focus,tree-select"
                 oncommandupdate="document.getElementById('bookmarks-view').onCommandUpdate();">
     </commandset>
--- a/suite/common/bookmarks/findBookmark.xul
+++ b/suite/common/bookmarks/findBookmark.xul
@@ -52,18 +52,18 @@
         title="&findBookmark.title;" 
         onload="Startup();"
         ondialogaccept="return find();"
         buttonlabelaccept="&findButton.label;"
         buttonaccesskeyaccept="&findButton.accesskey;">
 
   <stringbundle id="bookmarksBundle" src="chrome://communicator/locale/bookmarks/bookmarks.properties"/>
   
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/findBookmark.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/bookmarks/findBookmark.js"/>
 
   <label value="&search.for.label;" control="matchList"/>
   <hbox align="center">
     <menulist id="matchList" class="menulist-toolbar">
       <menupopup>
         <menuitem value="http://home.netscape.com/NC-rdf#Name" label="&search.name.label;"/>
         <menuitem value="http://home.netscape.com/NC-rdf#URL" label="&search.url.label;"/>
         <menuitem value="http://home.netscape.com/NC-rdf#Description" label="&search.description.label;"/>
--- a/suite/common/bookmarks/sortFolder.xul
+++ b/suite/common/bookmarks/sortFolder.xul
@@ -48,17 +48,17 @@
 
 <dialog id="sortFolder"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&window.title;"
         style="width: 30em;"
         buttons="accept,cancel"
 	ondialogaccept="return onAccept();">
 
-  <script type="application/x-javascript" src="chrome://communicator/content/bookmarks/sortFolder.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/bookmarks/sortFolder.js"/>
 
   <tabbox>
     <tabs>
       <tab label="&sortOptions.label;"/>
     </tabs>
     <tabpanels>
       <vbox>
         <separator class="thin"/>
--- a/suite/common/defaultClientDialog.xul
+++ b/suite/common/defaultClientDialog.xul
@@ -51,17 +51,17 @@
 <dialog xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="defaultClientDialog"
         buttons="accept,cancel"
         onload="onLoad();"
         ondialogaccept="return onAccept();"
         title="&defaultClient.title;">
   
-  <script type="application/x-javascript" src="chrome://communicator/content/defaultClientDialog.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/defaultClientDialog.js"/>
   
   <description>&defaultClient.intro;</description>
   <listbox rows="4" id="defaultList">
     <listitem value="BROWSER" type="checkbox" label="&browser.label;"/>
     <listitem value="MAIL" type="checkbox" label="&email.label;"/>
     <listitem value="NEWS" type="checkbox" label="&newsgroups.label;"/>
     <listitem value="RSS" type="checkbox" label="&feeds.label;"/>
   </listbox>
--- a/suite/common/directory/directory.xul
+++ b/suite/common/directory/directory.xul
@@ -44,17 +44,17 @@
 <!DOCTYPE page SYSTEM "chrome://communicator/locale/directory/directory.dtd">
 
 <page
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:nc="http://home.netscape.com/NC-rdf#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onunload="DoUnload();">
 
-  <script type="application/x-javascript" src="chrome://communicator/content/directory/directory.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/directory/directory.js"/>
 
   <tree id="tree"
         treelines="true"
         flex="1"
         enableColumnDrag="true"
         datasources="rdf:files"
         flags="dont-test-empty"
         sortActive="true"
--- a/suite/common/downloads/downloadmanager.xul
+++ b/suite/common/downloads/downloadmanager.xul
@@ -56,21 +56,21 @@
 <window id="downloadManager"
         title="&downloadManager.title;" statictitle="&downloadManager.title;"
         onload="dmStartup();" onunload="dmShutdown();"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         width="500" height="400" screenX="10" screenY="10"
         persist="width height screenX screenY sizemode"
         windowtype="Download:Manager">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/downloads/downloadmanager.js"/>
   <script type="application/javascript"
           src="chrome://communicator/content/downloads/DownloadProgressListener.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/downloads/treeView.js"/>
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="dmBundle"
                   src="chrome://communicator/locale/downloads/downloadmanager.properties"/>
     <stringbundle id="progDlgBundle"
                   src="chrome://global/locale/nsProgressDialog.properties"/>
   </stringbundleset>
--- a/suite/common/downloads/progressDialog.xul
+++ b/suite/common/downloads/progressDialog.xul
@@ -47,19 +47,19 @@
 
 <window id="dlProgressWindow"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:html="http://www.w3.org/1999/xhtml"
         onload="progressStartup();" onunload="progressShutdown();"
         title="&progress.title;"
         style="width:40em;">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/downloads/downloadmanager.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/downloads/progressDialog.js"/>
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="dmBundle"
                   src="chrome://communicator/locale/downloads/downloadmanager.properties"/>
     <stringbundle id="tkdlBundle"
                   src="chrome://global/locale/mozapps/downloads/downloads.properties"/>
   </stringbundleset>
--- a/suite/common/helpEditorOverlay.xul
+++ b/suite/common/helpEditorOverlay.xul
@@ -34,18 +34,18 @@
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <overlay id="helpEditorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
-  <script type="application/x-javascript">
+  <script type="application/javascript" src="chrome://help/content/contextHelp.js"/>
+  <script type="application/javascript">
   <![CDATA[
     setHelpFileURI('chrome://communicator/locale/help/suitehelp.rdf');
 
     function doPublishDialogHelpButton()
     {
      var selTab = document.getElementById('tabBox').selectedTab;
      
      if (selTab.id == "PublishTab")
--- a/suite/common/helpMessengerOverlay.xul
+++ b/suite/common/helpMessengerOverlay.xul
@@ -34,19 +34,19 @@
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <overlay id="helpMessengerOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://help/content/contextHelp.js"/>
-  <script type="application/x-javascript">
+  <script type="application/javascript">
     setHelpFileURI('chrome://communicator/locale/help/suitehelp.rdf');
   </script>
 
   <dialog id="editDirectories"
           buttons="accept,help"
           ondialoghelp="return openHelp('mail-ldap-properties');"/>
 
   <dialog id="addDirectory"
--- a/suite/common/helpOverlay.xul
+++ b/suite/common/helpOverlay.xul
@@ -41,17 +41,17 @@
 
 <!DOCTYPE overlay>
 
 <overlay id="helpOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <window id="help" onload="init(); initOverlay();"/>
 
-  <script type="application/x-javascript" src="chrome://communicator/content/helpOverlay.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/helpOverlay.js"/>
 
   <browser id="help-content" onclick="return contentClick(event);" />
 
   <textbox id="findText" oncommand="showSidebar(); doFind();"/>
 
   <splitter id="help-sidebar-splitter">
     <grippy/>
   </splitter>
--- a/suite/common/helpSecurityOverlay.xul
+++ b/suite/common/helpSecurityOverlay.xul
@@ -33,18 +33,18 @@
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <overlay id="securityManagerOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
-  <script type="application/x-javascript">
+  <script type="application/javascript" src="chrome://help/content/contextHelp.js"/>
+  <script type="application/javascript">
   <![CDATA[
     setHelpFileURI('chrome://communicator/locale/help/suitehelp.rdf');
 
     function doCertManagerHelpButton()
     {
       var selTab = document.getElementById('certMgrTabbox').selectedItem;
       var selTabID = selTab.getAttribute('id');
       switch (selTabID) {
--- a/suite/common/history/history-panel.xul
+++ b/suite/common/history/history-panel.xul
@@ -51,17 +51,17 @@
      between versions of the browser -->
 
 <page id="history-panel" orient="vertical"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="HistoryCommonInit();"
       onunload="SidebarUtils.clearURLFromStatusBar();"
       elementtofocus="search-box">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/history/sidebarUtils.js"/>
 
   <commandset id="editMenuCommands"/>
   <commandset id="placesCommands"/>
 
   <keyset id="editMenuKeys">
     <key id="key_delete2"/>
   </keyset>
--- a/suite/common/history/placesOverlay.xul
+++ b/suite/common/history/placesOverlay.xul
@@ -46,31 +46,31 @@
 
 <?xml-stylesheet href="chrome://communicator/content/history/places.css"?>
 <?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css"?>
 
 <overlay id="placesOverlay"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/bookmarks/bookmarks.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/history/history.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/history/places.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/history/utils.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/history/controller.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/history/treeView.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://global/content/nsDragAndDrop.js"/>
 
   <commandset id="placesCommands"
               commandupdater="true"
               events="focus,sort"
               oncommandupdate="updateHistoryCommands(this.firstChild);">
     <command id="placesCmd_open"
              oncommand="goDoCommand('placesCmd_open');"/>
--- a/suite/common/openLocation.xul
+++ b/suite/common/openLocation.xul
@@ -53,20 +53,20 @@
         title="&caption.label;"
         onload="onLoad()"
         ondialogaccept="open()"
         buttonlabelaccept="&open.label;"
         style="width: 40em;"
         persist="screenX screenY"
         screenX="24" screenY="24">
               
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>  
-  <script type="application/x-javascript" src="chrome://communicator/content/openLocation.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/utilityOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>  
+  <script type="application/javascript" src="chrome://communicator/content/openLocation.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/utilityOverlay.js"/>
+  <script type="application/javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>
   
   <stringbundle id="openLocationBundle" src="chrome://communicator/locale/openLocation.properties"/>
 
   <hbox>
     <separator orient="vertical" class="thin"/>
     <vbox flex="1">
       <label value="&enter.label;" control="dialog.input" accesskey="&enter.accesskey;"/>
       <separator class="thin"/>
--- a/suite/common/permissions/imageContextOverlay.xul
+++ b/suite/common/permissions/imageContextOverlay.xul
@@ -35,19 +35,19 @@
  the provisions above, a recipient may use your version of this file under
  the terms of any one of the MPL, the GPL or the LGPL.
 
  ***** END LICENSE BLOCK ***** -->
 
 <overlay id="cookieContextOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>
 
-  <script type="application/x-javascript">
+  <script type="application/javascript">
   <![CDATA[
     // Code from nsContextMenu.js. Note that we extend the prototype here,
     // rather than making these methods on a new object, as some methods require
     // access to data maintained by nsContextMenu.
 
     var cookieContextMenu = {
       // Block/Unblock image from loading in the future.
       toggleImageBlocking: function CCM_toggleImageBlocking(aBlock) {
--- a/suite/common/permissions/permissionsManager.xul
+++ b/suite/common/permissions/permissionsManager.xul
@@ -48,19 +48,19 @@
         title="&windowtitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         style="width:32em; height:42em;"
         persist="width height screenX screenY"
         onload="Startup();"
         ondialogaccept="return onAccept();"
         ondialoghelp="return doHelpButton();">
 
-  <script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsManager.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/permissions/treeUtils.js"/>
-  <script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/permissions/permissionsManager.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/permissions/treeUtils.js"/>
+  <script type="application/javascript" src="chrome://help/content/contextHelp.js"/>
 
   <stringbundle id="permissionsBundle"
                 src="chrome://communicator/locale/permissions/permissionsManager.properties"/>
 
   <description id="permissionsText"/>
   <separator class="thin"/>
   <label value="&address.label;" accesskey="&address.accesskey;" control="url"/>
   <hbox align="start">
--- a/suite/common/permissions/permissionsNavigatorOverlay.xul
+++ b/suite/common/permissions/permissionsNavigatorOverlay.xul
@@ -38,18 +38,18 @@
 
  ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE overlay SYSTEM "chrome://communicator/locale/permissions/permissionsNavigatorOverlay.dtd">
 
 <overlay id="cookieNavigatorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>
-  <script type="application/x-javascript">
+  <script type="application/javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>
+  <script type="application/javascript">
   <![CDATA[
     /******* THE FOLLOWING IS FOR THE TASKMENU OVERLAY *******/
 
     // both are necessary. popupmanager is just a special case
     // of permissionmanager but does extra work on add/remove
     const nsIPermissionManager = Components.interfaces.nsIPermissionManager;
     const nsICookiePermission = Components.interfaces.nsICookiePermission;
     var permissionmanager;
--- a/suite/common/pref/pref-offline.xul
+++ b/suite/common/pref/pref-offline.xul
@@ -45,17 +45,17 @@
 <!ENTITY % offlineDTD SYSTEM "chrome://communicator/locale/pref/pref-offline.dtd" >
 %offlineDTD;
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://communicator/content/pref/pref-offline.xul');"
       headertitle="&boxHeader;">
 
-  <script type="application/x-javascript">
+  <script type="application/javascript">
   <![CDATA[
     var _elementIDs = ["offlineStartupstate"];
   ]]>
   </script>
 
 <groupbox>
   <caption label="&rHeader;"/>
 
--- a/suite/common/pref/pref-proxies-advanced.xul
+++ b/suite/common/pref/pref-proxies-advanced.xul
@@ -44,19 +44,19 @@
 <prefwindow xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             id="advancedProxyPreferences"
             type="child"
             onload="AdvancedInit();"
             title="&pref.proxies.advanced.title;"
             style="width: 54ch;"
             persist="screenX screenY">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/pref/pref-proxies.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/pref/preferences.js"/>
 
   <prefpane helpTopic="nav-prefs-advanced-proxy-advanced"
             helpURI="chrome://communicator/locale/help/suitehelp.rdf">
     <preferences>
       <preference id="network.proxy.http"
                   name="network.proxy.http"
                   type="string"
--- a/suite/common/pref/preferences.xul
+++ b/suite/common/pref/preferences.xul
@@ -50,19 +50,19 @@
 <prefwindow id="prefDialog" 
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             title="&prefWindow.title;" 
             style="&prefWindow.size;"
             windowtype="mozilla:preferences"
             buttons="accept,cancel,help"
             autopanes="true"> 
 
-  <script type="application/x-javascript" src="chrome://communicator/content/pref/preferences.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/pref/preferences.js"/>
   <!-- Used by pref-smartupdate, pref-cookies, pref-images and pref-popups -->
-  <script type="application/x-javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/permissions/permissionsOverlay.js"/>
 
   <stringbundle id="bundle_prefutilities"
                 src="chrome://communicator/locale/pref/prefutilities.properties"/>
 
   <tree id="prefsTree"
         style="width: 13em;"
         seltype="single"
         hidecolumnpicker="true"
--- a/suite/common/profile/profileSelection.xul
+++ b/suite/common/profile/profileSelection.xul
@@ -70,18 +70,18 @@
 
   <stringbundle id="bundle_mozapps"
                 src="chrome://mozapps/locale/profile/profileSelection.properties"/>
   <stringbundle id="bundle_profile"
                 src="chrome://communicator/locale/profile/profileSelection.properties"/>
   <stringbundle id="bundle_brand"
                 src="chrome://branding/locale/brand.properties"/>
 
-  <script type="application/x-javascript" src="chrome://communicator/content/profile/profileSelection.js"/>
-  <script type="application/x-javascript" src="chrome://mozapps/content/profile/createProfileWizard.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/profile/profileSelection.js"/>
+  <script type="application/javascript" src="chrome://mozapps/content/profile/createProfileWizard.js"/>
 
   <dialogheader class="header-large" id="header" title="&profileManager.title;" description="&windowTitle.label;"/>
 
   <hbox class="wizard-box" flex="1">
 
     <!-- instructions -->
     <deck id="prattle">
       <description id="intro" style="width: 17em;" start="&introStart.label;">&introSwitch.label;</description>
--- a/suite/common/sanitize.xul
+++ b/suite/common/sanitize.xul
@@ -52,17 +52,17 @@
 <prefwindow id="SanitizeDialog" type="child"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
             dlgbuttons="accept,cancel"
             title="&sanitizeDialog.title;"
             ondialogaccept="sanitize();"
             buttonlabelaccept="&sanitizeButton.label;">
 
   <prefpane id="SanitizeDialogPane" onpaneload="init();">
-    <script type="application/x-javascript">
+    <script type="application/javascript">
     <![CDATA[
       Components.utils.import("resource:///modules/Sanitizer.jsm");
 
       function init()
       {
         var sanitizePreferences = document.getElementById("sanitizePreferences");
         for (var i = 0; i < sanitizePreferences.childNodes.length; ++i) {
           var preference = sanitizePreferences.childNodes[i];
--- a/suite/common/search/internetresults.xul
+++ b/suite/common/search/internetresults.xul
@@ -10,19 +10,19 @@
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       title="&internetresults.title;"
       context="disallowcontext">
 
   <popupset>
     <popup id="disallowcontext" onpopupshowing="return false;"/>
   </popupset>
 
-  <script type="application/x-javascript" src="chrome://global/content/nsUserSettings.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/search/internetresults.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/search/shared.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsUserSettings.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/search/internetresults.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/search/shared.js"/>
 
   <hbox id="multi-results-header"> 
     <label value="&results.header.label;"/>
   </hbox>
 
   <hbox align="center" style="min-width: 1px;">
     <label value="&viewbyprovider.label;"/>
     <menulist id="engineTabs" ref="NC:SearchResultsSitesRoot"
--- a/suite/common/search/search-editor.xul
+++ b/suite/common/search/search-editor.xul
@@ -48,17 +48,17 @@
         xmlns:web="http://home.netscape.com/WEB-rdf#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         width="540" height="340" x="20" y="20" persist="width height x y"
         windowtype="internetsearch:editor"
         onload="doLoad()" onunload="doUnload()"
         buttons="accept"
         ondialogaccept="return Commit();">
 
-  <script type="application/x-javascript" src="chrome://communicator/content/search/search-editor.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/search/search-editor.js"/>
 
   <stringbundle id="searchBundle"
                 src="chrome://communicator/locale/search/search-editor.properties"/>
 
   <hbox flex="1">
   
     <vbox flex="1">
       <listbox id="allengines" seltype="multiple" flex="1"
--- a/suite/common/search/search-panel.xul
+++ b/suite/common/search/search-panel.xul
@@ -43,20 +43,20 @@
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/search/search-panel.dtd" >
 <window id="searchPanel"
       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       orient="vertical" onload="SearchPanelStartup();"
       onunload="SearchPanelShutdown();" elementtofocus="sidebar-search-text">
 
-  <script type="application/x-javascript" src="chrome://global/content/nsUserSettings.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/search/search-panel.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/search/shared.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsUserSettings.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/search/search-panel.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/search/shared.js"/>
 
   <stringbundle id="searchBundle" src="chrome://communicator/locale/search/search-panel.properties"/>
   <stringbundle id="regionalBundle" src="chrome://communicator-region/locale/region.properties"/>
   
   <popupset>
     <popup id="contextual" onpopupshowing="return fillContextMenu('contextual', 'resultList');" >
       <menu />
     </popup>
--- a/suite/common/sidebar/customize-panel.xul
+++ b/suite/common/sidebar/customize-panel.xul
@@ -40,12 +40,12 @@
 
 <!DOCTYPE window>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   windowtype="navigator:browser"
   onload="Init();"
   onunload="RefreshPanel();;">
 
-  <script type="application/x-javascript" src="chrome://communicator/content/sidebar/customize-panel.js" />
+  <script type="application/javascript" src="chrome://communicator/content/sidebar/customize-panel.js" />
   <browser id="customize_frame" type="content-primary" src="about:blank" flex="1"/>
 
 </window>
--- a/suite/common/sidebar/customize.xul
+++ b/suite/common/sidebar/customize.xul
@@ -58,17 +58,17 @@
   persist="screenX screenY width height"
   buttons="accept,cancel,extra2"
   spacerflex="1"
   buttonlabelextra2="&sidebar.more.label;"
   buttonaccesskeyextra2="&sidebar.more.accesskey;"
   ondialogextra2="BrowseMorePanels();"
   ondialogaccept="return Save();">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/sidebar/customize.js"/>
 
   <hbox flex="1">
     <vbox flex="1">
       <label accesskey="&sidebar.customize.additional.accesskey;"
              control="other-panels" value="&sidebar.customize.additional.label;"
              crop="right"/>
 
--- a/suite/common/sidebar/preview.xul
+++ b/suite/common/sidebar/preview.xul
@@ -44,17 +44,17 @@
   type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/sidebar/preview.dtd" >
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="Init();"
         title="&sidebar.preview.title.label;">
 
-  <script type="application/x-javascript" src="chrome://communicator/content/sidebar/preview.js" />
+  <script type="application/javascript" src="chrome://communicator/content/sidebar/preview.js" />
 
   <vbox id="panel-container" flex="1">
 
     <hbox id="paneltitle" class="box-texttab texttab-sidebar" selected="true"/>
     <!--  <iframe id="previewframe" type="content" src="about:blank" flex="1"/>-->
     <iframe class="box-panel" id="previewframe" type="content" src="about:blank" flex="1"/>
 
   </vbox>  
--- a/suite/common/sidebar/sidebarOverlay.xul
+++ b/suite/common/sidebar/sidebarOverlay.xul
@@ -225,13 +225,13 @@
           accesskey="&sidebarCmd.accesskey;"
           command="toggleSidebar"
           key="showHideSidebar"/>
       </menupopup>
     </menu>
   </menupopup>
 
   <!-- Scripts go last, because they peek at state to tweak menus -->
-  <script type="application/x-javascript"
+  <script type="application/javascript"
     src="chrome://communicator/content/sidebar/sidebarOverlay.js"/>
 
 </overlay>
 
--- a/suite/common/tasksOverlay.xul
+++ b/suite/common/tasksOverlay.xul
@@ -4,17 +4,17 @@
 <!DOCTYPE overlay [
 <!ENTITY % tasksDTD SYSTEM "chrome://communicator/locale/tasksOverlay.dtd" >
 %tasksDTD;
 ]>
 
 <overlay id="tasksOverlay"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script type="application/x-javascript" src="chrome://communicator/content/tasksOverlay.js"/>
+<script type="application/javascript" src="chrome://communicator/content/tasksOverlay.js"/>
 
 
 
 <keyset id="tasksKeys">
   <key id="key_navigator"    key="&navigatorCmd.commandkey;"   command="Tasks:Navigator" modifiers="accel"/>
   <key id="key_downloadManager" key="&downloadManagerCmd.commandkey;"
        command="downloadmgr" modifiers="accel"/>
   <key id="key_errorConsole" key="&errorConsoleCmd.commandkey;"
--- a/suite/common/utilityOverlay.xul
+++ b/suite/common/utilityOverlay.xul
@@ -13,19 +13,19 @@
 <!ENTITY % customizeToolbarDTD SYSTEM "chrome://global/locale/customizeToolbar.dtd">
 %customizeToolbarDTD;
 
 ]>
 
 <overlay id="utilityOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/utilityOverlay.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://help/content/contextHelp.js"/>
 
   <stringbundleset>
     <stringbundle id="bundle_utilityOverlay"
                   src="chrome://communicator/locale/utilityOverlay.properties"/>
   </stringbundleset>
 
   <!-- online/offline status indicators -->   
--- a/suite/common/viewZoomOverlay.xul
+++ b/suite/common/viewZoomOverlay.xul
@@ -38,17 +38,17 @@
    - ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE overlay SYSTEM "chrome://communicator/locale/viewZoomOverlay.dtd">
 
 <overlay id="viewZoomOverlay"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript" src="chrome://communicator/content/viewZoomOverlay.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/viewZoomOverlay.js"/>
 
   <stringbundle id="bundle_viewZoom" src="chrome://communicator/locale/viewZoomOverlay.properties"/>
 
   <keyset id="viewZoomKeys">
     <key id="key_zoomReduce"  key="&zoomReduceCmd.commandkey;"   command="cmd_zoomReduce"  modifiers="accel"/>
     <key id="key_zoomEnlarge" key="&zoomEnlargeCmd.commandkey;"  command="cmd_zoomEnlarge" modifiers="accel"/>
     <key                      key="&zoomEnlargeCmd.commandkey;"  command="cmd_zoomEnlarge" modifiers="accel,shift"/>
     <key                      key="&zoomEnlargeCmd.commandkey2;" command="cmd_zoomEnlarge" modifiers="accel"/>
--- a/suite/debugQA/content/debugQAEditorOverlay.xul
+++ b/suite/debugQA/content/debugQAEditorOverlay.xul
@@ -44,17 +44,17 @@
 <!ENTITY % debugQAEditorOverlayDTD SYSTEM "chrome://debugqa/locale/debugQAEditorOverlay.dtd">
 %debugQAEditorOverlayDTD;
 ]>
 
 <overlay id="debugQAEditorOverlay"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://debugQA/content/debugQAEditorOverlay.js"/>
 
   <menubar id="main-menubar">
     <menu id="debugMenu" label="&debugMenu.label;" insertbefore="menu_Help">
       <menupopup>
         <menuitem label="&newEditorTestPage.label;"
                   oncommand="window.openDialog('chrome://editor/content','_blank','chrome,all,dialog=no','chrome://debugqa/content/EditorInitPage.html')"/>
         <menuitem label="&textEditorCmd.label;"
--- a/suite/debugQA/content/debugQANavigatorOverlay.xul
+++ b/suite/debugQA/content/debugQANavigatorOverlay.xul
@@ -34,17 +34,17 @@
    - the provisions above, a recipient may use your version of this file under
    - the terms of any one of the MPL, the GPL or the LGPL.
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <overlay id="debugQANavigatorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript">
+  <script type="application/javascript">
   <![CDATA[
     window.addEventListener("load", debugQABuildIDOnLoad, true);
 
     // Set the title modifer to include the build id.
     function debugQABuildIDOnLoad() {
       window.removeEventListener("load", debugQABuildIDOnLoad, true);
 
       var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
--- a/suite/debugQA/content/debugQATextEditorShell.xul
+++ b/suite/debugQA/content/debugQATextEditorShell.xul
@@ -67,20 +67,20 @@
         title=""
         titlemodifier="&textEditorWindow.titlemodifier;"
         titlemenuseparator="&editorWindow.titlemodifiermenuseparator;"
         windowtype="composer:text"
         width="640" height="480"
         screenX="10" screenY="10"
         persist="screenX screenY width height sizemode">
 
-  <script type="application/x-javascript" src="chrome://editor/content/editor.js"/>
-  <script type="application/x-javascript" src="chrome://editor/content/ComposerCommands.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
+  <script type="application/javascript" src="chrome://editor/content/editor.js"/>
+  <script type="application/javascript" src="chrome://editor/content/ComposerCommands.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/contentAreaDD.js"/>
 
   <commands id="commands">
     <commandset id="globalEditMenuItems"/>
     <commandset id="selectEditMenuItems"/>
     <commandset id="undoEditMenuItems"/>
     <commandset id="clipboardEditMenuItems"/>
     <commandset id="commonEditorMenuItems"/>
     <commandset id="composerEditMenuItems"/>
--- a/suite/mailnews/addrbook/addressbook.xul
+++ b/suite/mailnews/addrbook/addressbook.xul
@@ -69,23 +69,23 @@
     onunload="OnUnloadAddressBook()">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   </stringbundleset>
 
-<script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/addressbook.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
-<script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-<script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/msgPrintEngine.js"/>
+<script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/addressbook.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
+<script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
+<script type="application/javascript" src="chrome://global/content/printUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/msgPrintEngine.js"/>
 
   <commandset id="addressBook">
   <commandset id="CommandUpdate_AddressBook"
         commandupdater="true"
         events="focus,addrbook-select"
         oncommandupdate="CommandUpdate_AddressBook()"/>
   <commandset id="selectEditMenuItems"/> 
   <commandset id="undoEditMenuItems"/>
--- a/suite/mailnews/compose/addressingWidgetOverlay.xul
+++ b/suite/mailnews/compose/addressingWidgetOverlay.xul
@@ -37,18 +37,18 @@
  ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/messengercompose/addressingWidgetOverlay.dtd">
 
 
 <overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script type="application/x-javascript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
+<script type="application/javascript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
 
   <!-- Addressing Widget -->
   <listbox id="addressingWidget" seltype="multiple" rows="4"
     onkeydown="awKeyDown(event, this)"
     onclick="awClickEmptySpace(event.originalTarget, true)"
     ondragover="DragAddressOverTargetControl(event);"
     ondragdrop="DropAddressOverTargetControl(event);">
     
--- a/suite/mailnews/compose/messengercompose.xul
+++ b/suite/mailnews/compose/messengercompose.xul
@@ -83,27 +83,27 @@
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_composeMsgs" src="chrome://messenger/locale/messengercompose/composeMsgs.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
   <stringbundle id="languageBundle" src="chrome://global/locale/languageNames.properties"/>
   <stringbundle id="brandBundle" src="chrome://branding/locale/brand.properties"/>
 </stringbundleset>
 
-<script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
-<script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-<script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mail-offline.js"/>
-<script type="application/x-javascript" src="chrome://editor/content/editor.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
+<script type="application/javascript" src="chrome://communicator/content/contentAreaDD.js"/>
+<script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
+<script type="application/javascript" src="chrome://global/content/printUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mail-offline.js"/>
+<script type="application/javascript" src="chrome://editor/content/editor.js"/>
+<script type="application/javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
 
 <!-- drag and drop -->
-<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 
 <commandset id="composeCommands">
   <commandset id="msgComposeCommandUpdate"
     commandupdater="true"
     events="focus"
     oncommandupdate="CommandUpdate_MsgCompose()"/>
 
   <commandset id="globalEditMenuItems"/>
--- a/suite/mailnews/mailEditorOverlay.xul
+++ b/suite/mailnews/mailEditorOverlay.xul
@@ -3,17 +3,17 @@
 <!-- retrieve generic commands -->
 <?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/mailEditorOverlay.dtd" >
 
 <overlay id="mailEditorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript">
+  <script type="application/javascript">
   <![CDATA[
 
     function openComposeWindow(pageUrl, pageTitle)
     {
       var params = Components.classes["@mozilla.org/messengercompose/composeparams;1"].createInstance(Components.interfaces.nsIMsgComposeParams);
       if (params)
       {
         params.composeFields = Components.classes['@mozilla.org/messengercompose/composefields;1'].createInstance(Components.interfaces.nsIMsgCompFields);
--- a/suite/mailnews/mailOverlay.xul
+++ b/suite/mailnews/mailOverlay.xul
@@ -2,17 +2,17 @@
 
 <!-- platform specific commands -->
 <?xul-overlay href="chrome://navigator/content/platformMailOverlay.xul"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/mailOverlay.dtd">
 <overlay id="mailOverlay.xul"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript">
+  <script type="application/javascript">
   <![CDATA[
     function openNewCardDialog()
       {
         window.openDialog("chrome://messenger/content/addressbook/abNewCardDialog.xul",
                           "", "chrome,modal,resizable=no,centerscreen");
       }
 
     function goOpenNewMessage()
--- a/suite/mailnews/mailTasksOverlay.xul
+++ b/suite/mailnews/mailTasksOverlay.xul
@@ -59,17 +59,17 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/mailTasksOverlay.dtd">
 
 <overlay id="mailTasksOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://messenger/content/mailTasksOverlay.js"/>
 
   <keyset id="tasksKeys">
     <key id="key_mail"
          command="Tasks:Mail"
          key="&messengerCmd.commandkey;"
          modifiers="accel"/>
     <key id="key_addressbook"
--- a/suite/mailnews/mailViewList.xul
+++ b/suite/mailnews/mailViewList.xul
@@ -65,18 +65,18 @@
         onunload="MailViewListOnUnload();"
         ondialogaccept="return false;"
         windowtype="mailnews:mailviewlist"
         title="&mailViewListTitle.label;"
         width="400" height="340"
         buttons=","
         persist="screenX screenY width height">
 
-  <script type="application/x-javascript" src="chrome://messenger/content/mailViewList.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/mailViewList.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 
   <commandset id="mailViewCommands">
     <command id="cmd_new"    oncommand="goDoCommand('cmd_new');"/>
     <command id="cmd_edit"   oncommand="goDoCommand('cmd_edit');"   disabled="true"/>
     <command id="cmd_delete" oncommand="goDoCommand('cmd_delete');" disabled="true"/>
   </commandset>
 
   <keyset id="mailViewListKeys">
--- a/suite/mailnews/mailViewSetup.xul
+++ b/suite/mailnews/mailViewSetup.xul
@@ -55,18 +55,18 @@
         title="&mailViewSetupTitle.label;"
         style="width: 52em; height: 22em;"
         persist="screenX screenY width height">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
   </stringbundleset>
 
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/mailViewSetup.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/mailViewSetup.js"/>
 
   <dummy class="usesMailWidgets"/>
     
   <vbox flex="1">
     <separator class="thin"/>
     <vbox>
        <hbox align="center">
          <label value="&mailViewHeading.label;" accesskey="&mailViewHeading.accesskey;" control="name"/>
--- a/suite/mailnews/mailWindowOverlay.xul
+++ b/suite/mailnews/mailWindowOverlay.xul
@@ -62,24 +62,24 @@
   <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
   %brandDTD;
 ]>
 
 <overlay
   xmlns:nc="http://home.netscape.com/NC-rdf#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/junkCommands.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
-<script type="application/x-javascript" src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mail-offline.js"/>
-<script type="application/x-javascript" src="chrome://communicator/content/findUtils.js"/>
-<script type="application/x-javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
-<script type="application/x-javascript" src="chrome://global/content/printUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
+<script type="application/javascript" src="chrome://messenger/content/junkCommands.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
+<script type="application/javascript" src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mail-offline.js"/>
+<script type="application/javascript" src="chrome://communicator/content/findUtils.js"/>
+<script type="application/javascript" src="chrome://communicator/content/bookmarks/bookmarks.js"/>
+<script type="application/javascript" src="chrome://global/content/printUtils.js"/>
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
   <stringbundle id="bundle_viewZoom"/>
   <stringbundle id="findBundle" src="chrome://global/locale/finddialog.properties"/>
 </stringbundleset>
 
--- a/suite/mailnews/messageWindow.xul
+++ b/suite/mailnews/messageWindow.xul
@@ -64,28 +64,28 @@
         windowtype="mail:messageWindow">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
     <stringbundle id="bundle_offlinePrompts" src="chrome://messenger/locale/offline.properties"/>
   </stringbundleset>
 
-  <script type="application/x-javascript" src="chrome://messenger/content/shareglue.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/messageWindow.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/mailContextMenus.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/phishingDetector.js"/>
-  <script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/tabmail.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/shareglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/messageWindow.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/mailContextMenus.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/phishingDetector.js"/>
+  <script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/tabmail.js"/>
 
   <commandset id="mailCommands">
     <commandset id="mailFileMenuItems"/>
     <commandset id="mailDownloadCommands"/>
     <commandset id="mailViewMenuItems"/>
     <commandset id="mailEditMenuItems"/>
     <commandset id="mailSearchMenuItems"/>
     <commandset id="mailGoMenuItems"/>
--- a/suite/mailnews/messenger.xul
+++ b/suite/mailnews/messenger.xul
@@ -67,33 +67,33 @@
         windowtype="mail:3pane">
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
   <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
 </stringbundleset>
 
-<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/shareglue.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mailContextMenus.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/messengerdnd.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mail-offline.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/phishingDetector.js"/>
-<script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/searchBar.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/tabmail.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/folderDisplay.js"/>
+<script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/shareglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
+<script type="application/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailContextMenus.js"/>
+<script type="application/javascript" src="chrome://messenger/content/messengerdnd.js"/>
+<script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mail-offline.js"/>
+<script type="application/javascript" src="chrome://messenger/content/phishingDetector.js"/>
+<script type="application/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
+<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/javascript" src="chrome://messenger/content/searchBar.js"/>
+<script type="application/javascript" src="chrome://messenger/content/tabmail.js"/>
+<script type="application/javascript" src="chrome://messenger/content/folderDisplay.js"/>
 
 <commandset id="mailCommands">
   <commandset id="mailFileMenuItems"/>
   <commandset id="mailDownloadCommands"/>
   <commandset id="mailViewMenuItems"/>
   <commandset id="mailEditMenuItems"/>
   <commandset id="mailEditContextMenuItems"/>
   <commandset id="mailSearchMenuItems"/>
--- a/suite/mailnews/msgFolderPickerOverlay.xul
+++ b/suite/mailnews/msgFolderPickerOverlay.xul
@@ -42,18 +42,18 @@
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/msgFolderPickerOverlay.dtd">
 
 <overlay id="msgFolderPicker"
          xmlns:nc="http://home.netscape.com/NC-rdf#"
                  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   </stringbundleset>
-  <script type="application/x-javascript" src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
 
     <menulist id="runFiltersFolder"
               containment="http://home.netscape.com/NC-rdf#child"
               sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
               sortDirection="ascending"
               datasources="rdf:msgaccountmanager rdf:mailnewsfolders">
       <template>
         <rule nc:NoSelect="false" iscontainer="true" isempty="false">
--- a/suite/mailnews/msgSelectOffline.xul
+++ b/suite/mailnews/msgSelectOffline.xul
@@ -51,23 +51,23 @@
         title="&MsgSelect.label;"
         width="450" height="400"
         persist="width height"
         buttons="accept,cancel"
         onload="selectOnLoad();"
         ondialogaccept="return selectOkButton();"
         ondialogcancel="return selectCancelButton();">
 
-<script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
+<script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
 <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/msgSynchronize.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
+<script type="application/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+<script type="application/javascript" src="chrome://messenger/content/msgSynchronize.js"/>
 
     <keyset id="keyset"/>
     <label class="desc" control="synchronizeTree">&MsgSelectDesc.label;</label>
 
     <tree id="synchronizeTree"
           treelines="true"
           flex="1"
           hidecolumnpicker="true"
--- a/suite/mailnews/search/FilterListDialog.xul
+++ b/suite/mailnews/search/FilterListDialog.xul
@@ -54,17 +54,17 @@
         style="width: 45em; height: 31em;"
         persist="width height screenX screenY"
         buttons="help"
         ondialoghelp="return openHelp('mail-filters');"
         onload="onLoad();"
         onunload="onFilterUnload();"
         onclose="return onFilterClose();">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://messenger/content/FilterListDialog.js"/>
   <stringbundle id="bundle_filter"
                 src="chrome://messenger/locale/filter.properties"/>
 
   <commandset id="filterListCommands">
     <command id="cmd_close" oncommand="if (onFilterClose()) window.close();"/>
   </commandset>
 
--- a/suite/mailnews/subscribe.xul
+++ b/suite/mailnews/subscribe.xul
@@ -49,19 +49,19 @@
         buttons="accept,cancel"
         onload="SubscribeOnLoad()"
         onunload="SubscribeOnUnload()"
         ondialogaccept="return subscribeOK();"
         ondialogcancel="return subscribeCancel();">
 
 <stringbundle id="bundle_subscribe" src="chrome://messenger/locale/subscribe.properties"/>
 <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-<script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/subscribe.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/mailWindow.js"/>
+<script type="application/javascript" src="chrome://messenger/content/subscribe.js"/>
+<script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
 
   <grid flex="1" style="width: 40em; height: 25em;">
     <columns>
       <column flex="1"/>
       <column/>
     </columns>
   
     <rows>
--- a/suite/profile/migration.xul
+++ b/suite/profile/migration.xul
@@ -44,17 +44,17 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&migrationWizard.title;"
         onload="MigrationWizard.init()"
         onunload="MigrationWizard.uninit()"
         style="width: 40em; height: 32em;"
         buttons="accept,cancel"
         xmlns:xhtml="http://www.w3.org/1999/xhtml">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://communicator/content/migration/migration.js"/>
 
   <stringbundle id="bundle"
                 src="chrome://communicator/locale/migration/migration.properties"/>
 
   <wizardpage id="importSource" pageid="importSource" next="selectProfile"
               label="&importSource.title;"
               onpageadvanced="return MigrationWizard.onImportSourcePageAdvanced();">