From c112b6521e3502f250f4e6398d1caf95a0ff915b Mon Sep 17 00:00:00 2001
From: "timeless%mac.com" <timeless%mac.com>
Date: Fri, 23 Mar 2001 23:44:31 +0000
Subject: [PATCH] fix Bugzilla Bug 65428 language="javascript" should be
 type="application/x-javascript" mailnews r=fabian, a=ben

---
 .../resources/content/pref-addressing.xul     |  2 +-
 .../resources/content/abListOverlay.xul       |  2 +-
 .../content/abSelectAddressesDialog.xul       |  8 ++---
 .../resources/content/AccountManager.xul      |  4 +--
 .../prefs/resources/content/AccountWizard.xul | 16 ++++-----
 .../prefs/resources/content/am-copies.xul     |  4 +--
 .../prefs/resources/content/am-server.xul     |  2 +-
 .../prefs/resources/content/pref-mailnews.xul |  8 ++---
 .../content/pref-viewing_messages.xul         |  6 ++--
 .../content/mail3PaneWindowVertLayout.xul     | 32 ++++++++---------
 .../base/resources/content/messageWindow.xul  | 30 ++++++++--------
 mailnews/base/resources/content/messenger.xul | 34 +++++++++----------
 .../resources/content/msgAccountCentral.xul   | 18 +++++-----
 .../content/msgFolderPickerOverlay.xul        |  4 +--
 .../resources/content/newFolderDialog.xul     |  4 +--
 .../resources/content/renameFolderDialog.xul  |  4 +--
 .../search/resources/content/FilterEditor.xul |  8 ++---
 .../search/resources/content/SearchDialog.xul | 12 +++----
 .../content/pref-composing_messages.xul       |  2 +-
 .../resources/content/messengercompose.xul    | 20 +++++------
 .../resources/content/fieldMapImport.xul      |  2 +-
 .../import/resources/content/importDialog.xul |  2 +-
 .../resources/content/importProgress.xul      |  2 +-
 .../resources/content/downloadheaders.xul     |  2 +-
 24 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
index 0c4b6d2d6b3..a83b7e6fa30 100644
--- a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
@@ -10,7 +10,7 @@
         class="color-dialog"
         orient="vertical">
 
-  <script type="text/javascript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["emailCollection", "emailCollectionIncoming",
                        "emailCollectionOutgoing", "emailCollectionNewsgroup",
diff --git a/mailnews/addrbook/resources/content/abListOverlay.xul b/mailnews/addrbook/resources/content/abListOverlay.xul
index 6cd09bca110..224a382583a 100644
--- a/mailnews/addrbook/resources/content/abListOverlay.xul
+++ b/mailnews/addrbook/resources/content/abListOverlay.xul
@@ -28,7 +28,7 @@ Rights Reserved.
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   </stringbundleset>
-  <script type="text/javascript" src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
 
 
 <box id="editlist" align="vertical">
diff --git a/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul b/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
index cd5038ca871..4d4510f8b07 100644
--- a/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
+++ b/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
@@ -40,10 +40,10 @@ Rights Reserved.
 
   <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   <stringbundle id="bundle_composeMsgs" src="chrome://messenger/locale/messengercompose/composeMsgs.properties"/>
-  <script type="text/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
-  <script type="text/javascript" src="chrome://messenger/content/addressbook/abSelectAddressesDialog.js"/>
-  <script type="text/javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
-  <script type="text/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abSelectAddressesDialog.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
 
 
   <keyset id="keyset"/>
diff --git a/mailnews/base/prefs/resources/content/AccountManager.xul b/mailnews/base/prefs/resources/content/AccountManager.xul
index 48f0f3ef27e..433fba60bb9 100644
--- a/mailnews/base/prefs/resources/content/AccountManager.xul
+++ b/mailnews/base/prefs/resources/content/AccountManager.xul
@@ -14,8 +14,8 @@
         onload="onLoad(event);">
 
 <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-<script type="text/javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="text/javascript" src="chrome://messenger/content/AccountManager.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
 
   <keyset id="keyset"/>
 
diff --git a/mailnews/base/prefs/resources/content/AccountWizard.xul b/mailnews/base/prefs/resources/content/AccountWizard.xul
index f93f585f31c..5c009a55e7e 100644
--- a/mailnews/base/prefs/resources/content/AccountWizard.xul
+++ b/mailnews/base/prefs/resources/content/AccountWizard.xul
@@ -34,15 +34,15 @@ Rights Reserved.
   <keyset id="keyset"/>
 
   <!-- XXX: strres.js is included so that WizardManager.js will work -->
-  <script type="text/javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-  <script src="chrome://global/content/wizardOverlay.js"/>
-  <script src="chrome://global/content/wizardHandlerSet.js"/>
-  <script src="chrome://global/content/wizardManager.js"/>
-  <script src="chrome://global/content/widgetStateManager.js"/>
-  <script language="JavaScript" src="chrome://messenger/content/accountUtils.js"/>
-  <script language="JavaScript" src="chrome://messenger/content/AccountWizard.js"/>
-  <script language="JavaScript" src="chrome://messenger/content/ispUtils.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/wizardOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/wizardHandlerSet.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/wizardManager.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/widgetStateManager.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/AccountWizard.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/ispUtils.js"/>
 
   <box orient="vertical" flex="1">
     <box id="contentarea" flex="1">
diff --git a/mailnews/base/prefs/resources/content/am-copies.xul b/mailnews/base/prefs/resources/content/am-copies.xul
index 85b8598dee3..dffaad42675 100644
--- a/mailnews/base/prefs/resources/content/am-copies.xul
+++ b/mailnews/base/prefs/resources/content/am-copies.xul
@@ -15,8 +15,8 @@
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   </stringbundleset>
-  <script type="text/javascript" src="chrome://messenger/content/widgetglue.js"/>
-  <script type="text/javascript" src="chrome://messenger/content/am-copies.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/am-copies.js"/>
   
   <text hidden="true" wsm_persist="true" id="identity.fccFolder"/>
   <text hidden="true" wsm_persist="true" id="identity.draftFolder"/>
diff --git a/mailnews/base/prefs/resources/content/am-server.xul b/mailnews/base/prefs/resources/content/am-server.xul
index af97e305494..8bdcef23ca9 100644
--- a/mailnews/base/prefs/resources/content/am-server.xul
+++ b/mailnews/base/prefs/resources/content/am-server.xul
@@ -36,7 +36,7 @@ Contributors:
         onload="parent.onPanelLoaded('am-server.xul');"
         orient="vertical">
 
-  <script type="text/javascript" src="chrome://messenger/content/am-server.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/am-server.js"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
   <broadcaster id="broadcaster_doBiff"/>
diff --git a/mailnews/base/prefs/resources/content/pref-mailnews.xul b/mailnews/base/prefs/resources/content/pref-mailnews.xul
index 6c9488350ef..d52d7724e40 100644
--- a/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mailnews/base/prefs/resources/content/pref-mailnews.xul
@@ -34,7 +34,7 @@ Contributor(s):
         onload="parent.initPanel('chrome://messenger/content/pref-mailnews.xul');"
         orient="vertical">
 
-  <script type="text/javascript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["mailPaneConfig", "mailnewsConfirmMoveFoldersToTrash", 
                        "mailnewsStartPageEnabled", "mailnewsStartPageUrl",
@@ -42,9 +42,9 @@ Contributor(s):
   ]]>
   </script>
   <!-- XXX: Replace strres.js when prefutilities is converted -->
-  <script type="text/javascript" src="chrome://global/content/strres.js"/>
-  <script type="text/javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
-  <script type="text/javascript" src="chrome://messenger/content/pref-mailnews.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/pref-mailnews.js"/>
   
   <box class="box-smallheader" title="&pane.title;"/>
 
diff --git a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
index 75b717e39ae..eb991afafb9 100644
--- a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
+++ b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
@@ -13,7 +13,7 @@
         orient="vertical">
   <popupset id="aTooltipSet"/>
 
-  <script type="text/javascript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["mailFixedWidthMessages", "mailQuotedStyle", "mailQuotedSize", "wrapLongLines", "displayGlyph", "mailCitationColor", "sendDefaultCharsetList", "forceCharsetOverride"];
 
@@ -40,8 +40,8 @@
   </script>
   
   <!-- XXX: Replace strres.js when prefutilities is converted -->
-  <script type="text/javascript" src="chrome://global/content/strres.js"/>
-  <script type="text/javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://communicator/content/pref/prefutilities.js"/>
 
   <box class="box-smallheader" title="&pane.title;"/>
 
diff --git a/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul b/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
index 03d9328aabb..0f7f46a5620 100644
--- a/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
+++ b/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
@@ -54,22 +54,22 @@ Rights Reserved.
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
 </stringbundleset>
-<script type="text/javascript" src="chrome://messenger/content/widgetglue.js"/>
-<script type="text/javascript" src="chrome://messenger/content/commandglue.js"/>
-<script type="text/javascript" src="chrome://messenger/content/shareglue.js"/>
-<script type="text/javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
-<script type="text/javascript" src="chrome://messenger/content/mailWindow.js"/>
-<script type="text/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-<script type="text/javascript" src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
-<script type="text/javascript" src="chrome://messenger/content/mailContextMenus.js"/>
-<script type="text/javascript" src="chrome://messenger/content/messengerdnd.js"/>
-<script type="text/javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="text/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-<script type="text/javascript" src="chrome://communicator/content/contentAreaDD.js"/>
-<script type="text/javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
-<script type="text/javascript" src="chrome://global/content/nsJSComponentManager.js"/>
-<script type="text/javascript" src="chrome://global/content/nsTransferable.js"/>
-<script type="text/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<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://communicator/content/contentAreaClick.js"/>
+<script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
+<script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
+<script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+<script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 
 <commands id="commands">
 
diff --git a/mailnews/base/resources/content/messageWindow.xul b/mailnews/base/resources/content/messageWindow.xul
index 6cd4c60dff8..6d9f0627811 100644
--- a/mailnews/base/resources/content/messageWindow.xul
+++ b/mailnews/base/resources/content/messageWindow.xul
@@ -51,21 +51,21 @@ Rights Reserved.
   </stringbundleset>
 
   <!-- XXX: Replace strres.js when nsContextMenu.js is converted -->
-  <script type="text/javascript" src="chrome://global/content/strres.js"/>
-        <script type="text/javascript" src="chrome://messenger/content/shareglue.js"/>
-        <script type="text/javascript" src="chrome://messenger/content/commandglue.js"/>
-        <script type="text/javascript" src="chrome://messenger/content/mailWindow.js"/>
-        <script type="text/javascript" src="chrome://messenger/content/messageWindow.js"/>
-        <script type="text/javascript" src="chrome://messenger/content/accountUtils.js"/>
-        <script type="text/javascript" src="chrome://communicator/content/nsContextMenu.js"/>
-        <script type="text/javascript" src="chrome://messenger/content/mailContextMenus.js"/>
-        <script type="text/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-        <script type="text/javascript" src="chrome://communicator/content/contentAreaDD.js"/>
-        <script type="text/javascript" src="chrome://communicator/content/contentAreaUtils.js"/>
-        <script type="text/javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
-        <script type="text/javascript" src="chrome://global/content/nsJSComponentManager.js"/>
-        <script type="text/javascript" src="chrome://global/content/nsTransferable.js"/>
-        <script type="text/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <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://communicator/content/nsContextMenu.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/mailContextMenus.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/contentAreaUtils.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 
   <commands id="commands">
     <commandset id="mailFileMenuItems"/>
diff --git a/mailnews/base/resources/content/messenger.xul b/mailnews/base/resources/content/messenger.xul
index 7654e2b8dc6..ce423ee54cd 100644
--- a/mailnews/base/resources/content/messenger.xul
+++ b/mailnews/base/resources/content/messenger.xul
@@ -54,23 +54,23 @@ Rights Reserved.
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
 </stringbundleset>
-<script type="text/javascript" src="chrome://messenger/content/widgetglue.js"/>
-<script type="text/javascript" src="chrome://messenger/content/commandglue.js"/>
-<script type="text/javascript" src="chrome://messenger/content/shareglue.js"/>
-<script type="text/javascript" src="chrome://messenger/content/msgViewNavigation.js"/>
-<script type="text/javascript" src="chrome://messenger/content/mailWindow.js"/>
-<script type="text/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-<script type="text/javascript" src="chrome://messenger/content/mail3PaneWindowCommands.js"/>
-<script type="text/javascript" src="chrome://messenger/content/mailContextMenus.js"/>
-<script type="text/javascript" src="chrome://messenger/content/messengerdnd.js"/>
-<script type="text/javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="text/javascript" src="chrome://messenger/content/msgAccountCentral.js"/>
-<script type="text/javascript" src="chrome://communicator/content/contentAreaClick.js"/>
-<script type="text/javascript" src="chrome://communicator/content/contentAreaDD.js"/>
-<script type="text/javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
-<script type="text/javascript" src="chrome://global/content/nsJSComponentManager.js"/>
-<script type="text/javascript" src="chrome://global/content/nsTransferable.js"/>
-<script type="text/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<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/msgAccountCentral.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://global/content/nsJSSupportsUtils.js"/>
+<script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+<script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
+<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 
 
 <commands id="commands">
diff --git a/mailnews/base/resources/content/msgAccountCentral.xul b/mailnews/base/resources/content/msgAccountCentral.xul
index 8678de75b8c..427fb7958fe 100644
--- a/mailnews/base/resources/content/msgAccountCentral.xul
+++ b/mailnews/base/resources/content/msgAccountCentral.xul
@@ -39,15 +39,15 @@ Rights Reserved.
   <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-  <script type="text/javascript" src="chrome://messenger/content/AccountManager.js"/>
-  <script type="text/javascript" src="chrome://messenger/content/accountUtils.js"/>
-  <script type="text/javascript" src="chrome://messenger/content/mailCommands.js"/>
-  <script type="text/javascript" src="chrome://messenger/content/commandglue.js"/>
-  <script type="text/javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
-  <script type="text/javascript" src="chrome://messenger/content/mailWindow.js"/>
-  <script type="text/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-  <script type="text/javascript" src="chrome://messenger/content/widgetglue.js"/>
-  <script type="text/javascript" src="chrome://messenger/content/msgAccountCentral.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/commandglue.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.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/widgetglue.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/msgAccountCentral.js"/>
 
   <grid flex="1" id="acctCentralGrid"> 
     <columns>
diff --git a/mailnews/base/resources/content/msgFolderPickerOverlay.xul b/mailnews/base/resources/content/msgFolderPickerOverlay.xul
index d648f3d1989..5d152676165 100644
--- a/mailnews/base/resources/content/msgFolderPickerOverlay.xul
+++ b/mailnews/base/resources/content/msgFolderPickerOverlay.xul
@@ -27,8 +27,8 @@ Rights Reserved.
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   </stringbundleset>
-  <script type="text/javascript" src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
-  <script type="text/javascript" src="chrome://messenger/content/mailCommands.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
 
   <menu class="push" label="&newfolderclickhere.label;" uri="" id="msgNewFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" ignore="http://home.netscape.com/NC-rdf#MessageChild"
     ref="msgaccounts:/">
diff --git a/mailnews/base/resources/content/newFolderDialog.xul b/mailnews/base/resources/content/newFolderDialog.xul
index f630973f65d..a5f45c1782b 100644
--- a/mailnews/base/resources/content/newFolderDialog.xul
+++ b/mailnews/base/resources/content/newFolderDialog.xul
@@ -38,8 +38,8 @@
         onload="onLoad();">
 
   <stringbundleset id="stringbundleset"/>
-  <script type="text/javascript" src="chrome://messenger/content/mailCommands.js"/>
-  <script type="text/javascript" src="chrome://messenger/content/newFolderDialog.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/newFolderDialog.js"/>
 
   <keyset id="keyset"/>
 
diff --git a/mailnews/base/resources/content/renameFolderDialog.xul b/mailnews/base/resources/content/renameFolderDialog.xul
index 68fae19f0db..55623c0ddd5 100644
--- a/mailnews/base/resources/content/renameFolderDialog.xul
+++ b/mailnews/base/resources/content/renameFolderDialog.xul
@@ -37,8 +37,8 @@
         onload="onLoad();">
 
   <stringbundleset id="stringbundleset"/>
-  <script type="text/javascript" src="chrome://messenger/content/mailCommands.js"/>
-  <script type="text/javascript" src="chrome://messenger/content/renameFolderDialog.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/renameFolderDialog.js"/>
 
   <keyset id="keyset"/>
 
diff --git a/mailnews/base/search/resources/content/FilterEditor.xul b/mailnews/base/search/resources/content/FilterEditor.xul
index 36da383e7ff..b21777f8927 100644
--- a/mailnews/base/search/resources/content/FilterEditor.xul
+++ b/mailnews/base/search/resources/content/FilterEditor.xul
@@ -40,10 +40,10 @@ Rights Reserved.
     <stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
   </stringbundleset>
   <!-- XXX: only mailWidgets.xml requires strres.js (<script> isn't valid in XBL yet - see hyatt)-->
-  <script type="text/javascript" src="chrome://global/content/strres.js"/>
-  <script language="JavaScript" src="chrome://messenger/content/mailWindowOverlay.js"/>
-  <script language="JavaScript" src="chrome://messenger/content/mailCommands.js"/>
-  <script language="JavaScript" src="chrome://messenger/content/FilterEditor.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/mailCommands.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/FilterEditor.js"/>
 
   <keyset id="keyset"/>
   
diff --git a/mailnews/base/search/resources/content/SearchDialog.xul b/mailnews/base/search/resources/content/SearchDialog.xul
index b369d4efe67..f242ac89895 100644
--- a/mailnews/base/search/resources/content/SearchDialog.xul
+++ b/mailnews/base/search/resources/content/SearchDialog.xul
@@ -47,12 +47,12 @@ Rights Reserved.
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <stringbundle id="bundle_brand" src="chrome://global/locale/brand.properties"/>
   <!-- XXX: only mailWidgets.xml requires strres.js (<script> isn't valid in XBL yet - see hyatt)-->
-  <script type="text/javascript" src="chrome://global/content/strres.js"/>
-  <script src="chrome://messenger/content/mailWindow.js"/>
-  <script src="chrome://messenger/content/threadPane.js"/>
-  <script src="chrome://messenger/content/msgMail3PaneWindow.js"/>
-  <script src="chrome://global/content/globalOverlay.js"/>
-  <script src="chrome://messenger/content/SearchDialog.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/mailWindow.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/threadPane.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/SearchDialog.js"/>
 
   <commands id="commands">
     <commandset id="mailSearchItems"
diff --git a/mailnews/compose/prefs/resources/content/pref-composing_messages.xul b/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
index ab3bfd2638e..33a31405253 100644
--- a/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
+++ b/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
@@ -14,7 +14,7 @@
 
   <popupset id="aTooltipSet"/>
     
-  <script type="text/javascript">
+  <script type="application/x-javascript">
   <![CDATA[
     var _elementIDs = ["forwardMessageMode", "autoQuote", "replyOnTop", "spellCheckBeforeSend", "strictlyMime", "wrapLength", "sendDefaultCharsetList"];
 
diff --git a/mailnews/compose/resources/content/messengercompose.xul b/mailnews/compose/resources/content/messengercompose.xul
index f6cd762e651..59314162c09 100644
--- a/mailnews/compose/resources/content/messengercompose.xul
+++ b/mailnews/compose/resources/content/messengercompose.xul
@@ -53,18 +53,18 @@
   <stringbundle id="bundle_composeMsgs" src="chrome://messenger/locale/messengercompose/composeMsgs.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 </stringbundleset>
-<script type="text/javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="text/javascript" src="chrome://messenger/content/widgetglue.js"/>
-<script type="text/javascript" src="chrome://editor/content/editor.js"/>
-<script type="text/javascript" src="chrome://editor/content/ComposerCommands.js"/>
-<script type="text/javascript" src="chrome://editor/content/EditorCommandsDebug.js"/>
-<script type="text/javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.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://editor/content/editor.js"/>
+<script type="application/x-javascript" src="chrome://editor/content/ComposerCommands.js"/>
+<script type="application/x-javascript" src="chrome://editor/content/EditorCommandsDebug.js"/>
+<script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
 
 <!-- drag and drop -->
-<script type="text/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-<script type="text/javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
-<script type="text/javascript" src="chrome://global/content/nsJSComponentManager.js"/>
-<script type="text/javascript" src="chrome://global/content/nsTransferable.js"/>
+<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/x-javascript" src="chrome://global/content/nsJSSupportsUtils.js"/>
+<script type="application/x-javascript" src="chrome://global/content/nsJSComponentManager.js"/>
+<script type="application/x-javascript" src="chrome://global/content/nsTransferable.js"/>
 
 <commands id="commands">
   <commandset id="msgComposeCommandUpdate"
diff --git a/mailnews/import/resources/content/fieldMapImport.xul b/mailnews/import/resources/content/fieldMapImport.xul
index afc2cbc08d1..15a0815e441 100644
--- a/mailnews/import/resources/content/fieldMapImport.xul
+++ b/mailnews/import/resources/content/fieldMapImport.xul
@@ -34,7 +34,7 @@ Rights Reserved.
         onload="OnLoadFieldMapImport()"
         align="vertical">
 
-  <script type="text/javascript" src="chrome://messenger/content/fieldMapImport.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/fieldMapImport.js"/>
 
   <keyset id="keyset"/>
 
diff --git a/mailnews/import/resources/content/importDialog.xul b/mailnews/import/resources/content/importDialog.xul
index 93d68ffd7d5..d6808ab2ddb 100644
--- a/mailnews/import/resources/content/importDialog.xul
+++ b/mailnews/import/resources/content/importDialog.xul
@@ -37,7 +37,7 @@ Rights Reserved.
         title="&importDialog.windowTitle;">
 
   <stringbundle id="bundle_importMsgs" src="chrome://messenger/locale/importMsgs.properties"/>
-  <script type="text/javascript" src="chrome://messenger/content/importDialog.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/importDialog.js"/>
 
   <keyset id="keyset"/>
   
diff --git a/mailnews/import/resources/content/importProgress.xul b/mailnews/import/resources/content/importProgress.xul
index 16ac4e2e294..c4d11543534 100644
--- a/mailnews/import/resources/content/importProgress.xul
+++ b/mailnews/import/resources/content/importProgress.xul
@@ -32,7 +32,7 @@ Rights Reserved.
         onload="OnLoadProgressDialog()"
         orient="vertical">
 
-  <script type="text/javascript" src="chrome://messenger/content/importProgress.js"/>
+  <script type="application/x-javascript" src="chrome://messenger/content/importProgress.js"/>
 
 	<keyset id="keyset"/>
 
diff --git a/mailnews/news/resources/content/downloadheaders.xul b/mailnews/news/resources/content/downloadheaders.xul
index 29e020b30e5..167acddac14 100644
--- a/mailnews/news/resources/content/downloadheaders.xul
+++ b/mailnews/news/resources/content/downloadheaders.xul
@@ -35,7 +35,7 @@ Contributor(s):
         onload="OnLoad()">
 
   <stringbundle id="bundle_news" src="chrome://messenger/locale/news.properties"/>
-  <script type="text/javascript" src="chrome://messenger/content/downloadheaders.js" />
+  <script type="application/x-javascript" src="chrome://messenger/content/downloadheaders.js" />
 
   <keyset id="keyset"/>