Bug 520899 - Switch application/x-javascript to application/javascript, MailNews Core part; (Av1) All .xul files.
authorSerge Gautherie <sgautherie.bz@free.fr>
Thu, 03 Dec 2009 15:01:32 +0100
changeset 4483 344cc299f519e23c338e446b9e684ae286fd8992
parent 4482 4d4c13a0ba25799a587ed0f5c141b17927cf302f
child 4484 fa23a691726d1ab301e00da3518c457a8f957f58
push id3501
push usersgautherie.bz@free.fr
push dateThu, 03 Dec 2009 14:16:56 +0000
treeherdercomm-central@344cc299f519 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs520899
Bug 520899 - Switch application/x-javascript to application/javascript, MailNews Core part; (Av1) All .xul files. r+sr=standard8.
mailnews/addrbook/content/abAddressBookNameDialog.xul
mailnews/addrbook/content/abCardOverlay.xul
mailnews/addrbook/content/abCardViewOverlay.xul
mailnews/addrbook/content/abDirTreeOverlay.xul
mailnews/addrbook/content/abListOverlay.xul
mailnews/addrbook/content/abResultsPaneOverlay.xul
mailnews/addrbook/content/abSelectAddressesDialog.xul
mailnews/addrbook/content/addressbook-panel.xul
mailnews/addrbook/prefs/content/pref-directory-add.xul
mailnews/addrbook/prefs/content/pref-editdirectories.xul
mailnews/base/content/folderProps.xul
mailnews/base/content/junkLog.xul
mailnews/base/content/markByDate.xul
mailnews/base/content/msgAccountCentral.xul
mailnews/base/content/msgSynchronize.xul
mailnews/base/content/newFolderDialog.xul
mailnews/base/content/renameFolderDialog.xul
mailnews/base/content/shutdownWindow.xul
mailnews/base/content/virtualFolderListDialog.xul
mailnews/base/content/virtualFolderProperties.xul
mailnews/base/prefs/content/AccountManager.xul
mailnews/base/prefs/content/AccountWizard.xul
mailnews/base/prefs/content/SmtpServerEdit.xul
mailnews/base/prefs/content/am-addressingOverlay.xul
mailnews/base/prefs/content/am-copies.xul
mailnews/base/prefs/content/am-copiesOverlay.xul
mailnews/base/prefs/content/am-identities-list.xul
mailnews/base/prefs/content/am-identity-edit.xul
mailnews/base/prefs/content/am-junk.xul
mailnews/base/prefs/content/am-main.xul
mailnews/base/prefs/content/am-offline.xul
mailnews/base/prefs/content/am-server-advanced.xul
mailnews/base/prefs/content/am-server.xul
mailnews/base/prefs/content/am-serverwithnoidentities.xul
mailnews/base/prefs/content/am-smtp.xul
mailnews/base/search/content/CustomHeaders.xul
mailnews/base/search/content/FilterEditor.xul
mailnews/base/search/content/viewLog.xul
mailnews/compose/content/MsgAttachPage.xul
mailnews/compose/content/mailComposeEditorOverlay.xul
mailnews/compose/content/sendProgress.xul
mailnews/extensions/dsn/content/am-dsn.xul
mailnews/extensions/mdn/content/am-mdn.xul
mailnews/extensions/newsblog/content/am-newsblog.xul
mailnews/extensions/newsblog/content/feed-properties.xul
mailnews/extensions/newsblog/content/feed-subscriptions.xul
mailnews/extensions/smime/content/am-smime.xul
mailnews/extensions/smime/content/am-smimeIdentityEditOverlay.xul
mailnews/extensions/smime/content/certFetchingStatus.xul
mailnews/extensions/smime/content/msgCompSecurityInfo.xul
mailnews/extensions/smime/content/msgReadSecurityInfo.xul
mailnews/import/content/fieldMapImport.xul
mailnews/import/content/importDialog.xul
mailnews/news/content/downloadheaders.xul
--- a/mailnews/addrbook/content/abAddressBookNameDialog.xul
+++ b/mailnews/addrbook/content/abAddressBookNameDialog.xul
@@ -45,15 +45,15 @@
         onload="abNameOnLoad();"
         ondialogaccept="return abNameOKButton();">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook"
                   src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   </stringbundleset>
 
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abAddressBookNameDialog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abAddressBookNameDialog.js"/>
 
   <hbox align="center">
     <label control="name" value="&name.label;" accesskey="&name.accesskey;"/>
     <textbox id="name" oninput="abNameDoOkEnabling();" flex="1"/>
   </hbox>
 </dialog>
--- a/mailnews/addrbook/content/abCardOverlay.xul
+++ b/mailnews/addrbook/content/abCardOverlay.xul
@@ -44,18 +44,18 @@
 <overlay id="editcardOverlay"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      xmlns:html="http://www.w3.org/1999/xhtml">
 
 <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 </stringbundleset>
 
-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCardOverlay.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abCardOverlay.js"/>
 
 <vbox id="editcard">
   <tabbox>
     <tabs id="abTabs">
       <tab id="contactTabButton" label="&Contact.tab;"
            accesskey="&Contact.accesskey;"/>
       <tab id="homeTabButton" label="&Home.tab;" accesskey="&Home.accesskey;"/>
       <tab id="workTabButton" label="&Work.tab;" accesskey="&Work.accesskey;"/>
--- a/mailnews/addrbook/content/abCardViewOverlay.xul
+++ b/mailnews/addrbook/content/abCardViewOverlay.xul
@@ -38,17 +38,17 @@
  ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/addressbook/abCardViewOverlay.dtd">
 
 <overlay xmlns:html="http://www.w3.org/1999/xhtml"
      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/addressbook/abCardViewOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCardViewOverlay.js"/>
 
   <vbox id="CardViewBox" flex="1">
   
   <vbox id="CardViewInnerBox" collapsed="true" flex="1">
     
     <description id="CardTitle"/>
 
     <hbox style="width:100%" flex="1">
--- a/mailnews/addrbook/content/abDirTreeOverlay.xul
+++ b/mailnews/addrbook/content/abDirTreeOverlay.xul
@@ -39,18 +39,18 @@
 
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/addressPanes.css" type="text/css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/addressbook/abDirTreeOverlay.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://global/content/nsDragAndDrop.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
+<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
 
   <!-- FIX ME - remove document.commandDispatcher.updateCommands() when tree selection calls this automatically -->
   <tree id="dirTree" class="abDirectory plain" seltype="single"
       datasources="rdf:addressdirectory" ref="moz-abdirectory://"
       flags="dont-build-content"
       hidecolumnpicker="true"
       onselect="DirPaneSelectionChange(); document.commandDispatcher.updateCommands('addrbook-select');"
       ondblclick="DirPaneDoubleClick(event);"
--- a/mailnews/addrbook/content/abListOverlay.xul
+++ b/mailnews/addrbook/content/abListOverlay.xul
@@ -42,20 +42,20 @@
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">
 
 <overlay id="editListOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   </stringbundleset>
-  <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/messengercompose/addressingWidgetOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abMailListDialog.js"/>
+  <script type="application/javascript" src="chrome://global/content/dialogOverlay.js"/>
 
 <vbox id="editlist">
   <vbox>
     <hbox>
       <spacer flex="1"/>
       <label control="ListName" value="&ListName.label;"
              accesskey="&ListName.accesskey;" class="CardEditLabel"/>
       <hbox class="CardEditWidth">
--- a/mailnews/addrbook/content/abResultsPaneOverlay.xul
+++ b/mailnews/addrbook/content/abResultsPaneOverlay.xul
@@ -39,19 +39,19 @@
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/addressbook/abResultsPaneOverlay.dtd">
 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 
 <overlay
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abResultsPane.js"/>
-<script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abResultsPane.js"/>
+<script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+<script type="application/javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
 
 <tree id="abResultsTree" flex="1" enableColumnDrag="true" class="plain focusring"
     onclick="AbResultsPaneOnClick(event);"
     onselect="this.view.selectionChanged(); document.commandDispatcher.updateCommands('addrbook-select');"
     sortCol="GeneratedName"
     persist="sortCol height">
 
   <treecols id="abResultsTreeCols">
--- a/mailnews/addrbook/content/abSelectAddressesDialog.xul
+++ b/mailnews/addrbook/content/abSelectAddressesDialog.xul
@@ -58,21 +58,21 @@
         class="dialog"
         style="width: 50em; height: 35em;"
         persist="width height screenX screenY"
         onload="OnLoadSelectAddress()"
         onunload="OnUnloadSelectAddress()">
 
   <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   <stringbundle id="bundle_composeMsgs" src="chrome://messenger/locale/messengercompose/composeMsgs.properties"/>
-  <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/addressbook/abDragDrop.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abSelectAddressesDialog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abDragDrop.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/messengercompose/MsgComposeCommands.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 
 
   <keyset id="dialogKeys"/>
 
   <vbox flex="1">
   
     <hbox id="topBox" align="center">
       <label value="&lookIn.label;" accesskey="&lookIn.accesskey;" control="addressbookList"/>
--- a/mailnews/addrbook/content/addressbook-panel.xul
+++ b/mailnews/addrbook/content/addressbook-panel.xul
@@ -57,22 +57,22 @@
       onunload="AbPanelUnload();"
       title="&selectAddressWindow.title;"
       selectedaddresses="true">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   </stringbundleset>
 
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.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://messenger/content/addressbook/abResultsPane.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/abSelectAddressesDialog.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/addressbook-panel.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.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://messenger/content/addressbook/abResultsPane.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/abSelectAddressesDialog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/addressbook-panel.js"/>
 
   <commandset id="addressbook-panel-commandset">
     <command id="cmd_newlist" oncommand="AbNewList();"/>
   </commandset>
 
   <popup id="composeMail" onpopupshowing="CommandUpdate_AddressBook();">
     <menuitem label="&toButton.label;" accesskey="&toButton.accesskey;" oncommand="AbPanelAdd('addr_to');" default="true"/>
     <menuitem label="&ccButton.label;" accesskey="&ccButton.accesskey;" oncommand="AbPanelAdd('addr_cc');"/>
--- a/mailnews/addrbook/prefs/content/pref-directory-add.xul
+++ b/mailnews/addrbook/prefs/content/pref-directory-add.xul
@@ -48,17 +48,17 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&newDirectoryTitle.label;"
         onload="Startup();"
         onunload="onUnload();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
         ondialogcancel="return onCancel();">
 
-  <script type="application/x-javascript" src="chrome://messenger/content/addressbook/pref-directory-add.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/addressbook/pref-directory-add.js"/>
   <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
   <stringbundle id="bundle_replication" src="chrome://messenger/locale/addressbook/replicationProgress.properties"/>
 
   <keyset id="keyset"/>
   <vbox id="editDirectory">
 
     <tabbox style="margin:5px">
       <tabs id="directoryTabBox">
--- a/mailnews/addrbook/prefs/content/pref-editdirectories.xul
+++ b/mailnews/addrbook/prefs/content/pref-editdirectories.xul
@@ -44,19 +44,19 @@
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         id="editDirectories"
         title="&pref.ldap.window.title;"
         buttons="accept"
         onload="onInitEditDirectories();"
         onunload="onUninitEditDirectories();">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://messenger/content/addressbook/abCommon.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://messenger/content/addressbook/pref-editdirectories.js"/>
 
   <stringbundle id="bundle_addressBook"
                 src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 
   <label value="&directoriesText.label;"
          accesskey="&directoriesText.accesskey;" control="directoriesList"/>
   <hbox flex="1">
--- a/mailnews/base/content/folderProps.xul
+++ b/mailnews/base/content/folderProps.xul
@@ -49,20 +49,20 @@
   id="folderPropertiesDialog"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   title="&folderProps.windowtitle.label;"
   buttons="accept,cancel"
   onload="folderPropsOnLoad()" style="width: 36em;"
   ondialogaccept="return folderPropsOKButton();">
  
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/retention.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/folderProps.js"/>
-  <script type="application/x-javascript">
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/retention.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/folderProps.js"/>
+  <script type="application/javascript">
   <![CDATA[
     var observerService = Components.classes["@mozilla.org/observer-service;1"].getService(Components.interfaces.nsIObserverService);
     observerService.notifyObservers(null, "charsetmenu-selected", "other");
   ]]>
   </script>
 
 <tabbox id="folderPropTabBox">
   <tabs id="folderPropTabs">
--- a/mailnews/base/content/junkLog.xul
+++ b/mailnews/base/content/junkLog.xul
@@ -51,17 +51,17 @@
         windowtype="mailnews:junklog"
         buttons="accept"
         buttonlabelaccept="&closeLog.label;"
         buttonaccesskeyaccept="&closeLog.accesskey;"
         ondialogaccept="window.close()"
         persist="screenX screenY width height"
         style="width: 40em; height: 25em;">
 
-  <script type="application/x-javascript" src="chrome://messenger/content/junkLog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/junkLog.js"/>
 
   <vbox flex="1">
     <hbox>
       <label value="&junkLogInfo.label;"/>
       <spacer flex="1"/>
       <button label="&clearLog.label;" accesskey="&clearLog.accesskey;" oncommand="clearLog()"/>
     </hbox>
     <vbox flex="1">
--- a/mailnews/base/content/markByDate.xul
+++ b/mailnews/base/content/markByDate.xul
@@ -43,18 +43,18 @@
 
 <dialog
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   title="&messageMarkByDate.label;"
   buttons="accept,cancel"
   onload="onLoad();"
   ondialogaccept="return onAccept();">
 
-  <script type="application/x-javascript" src="chrome://messenger/content/markByDate.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/dateFormat.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/markByDate.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/dateFormat.js"/>
 
   <hbox align="center" pack="end">
     <label control="lowerDate"
            value="&markByDateLower.label;"
            accesskey="&markByDateLower.accesskey;"/>
     <textbox size="11" id="lowerDate"/>
   </hbox>
   <hbox align="center" pack="end">
--- a/mailnews/base/content/msgAccountCentral.xul
+++ b/mailnews/base/content/msgAccountCentral.xul
@@ -50,24 +50,24 @@
 <page
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="OnInit();">
 
   <stringbundle id="bundle_brand" src="chrome://branding/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="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/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"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
+  <script type="application/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/mailWindow.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/msgMail3PaneWindow.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/msgAccountCentral.js"/>
 
   <grid id="acctCentralGrid" flex="1" style="overflow: auto;"> 
     <columns id="acctCentralColumns">
       <column flex="40" id="acctCentralActionsColumn"/>
       <column flex="60" id="acctCentralHelpDataColumn"/>
     </columns>
 
     <rows id="acctCentralRows">
--- a/mailnews/base/content/msgSynchronize.xul
+++ b/mailnews/base/content/msgSynchronize.xul
@@ -46,17 +46,17 @@
 <dialog	xmlns:NC="http://home.netscape.com/NC-rdf#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         id="msg-synchronizer" 
         title="&MsgSynchronize.label;"
         onload="OnLoad();"
         style="width: 35em;"
         ondialogaccept="return syncOkButton();">
 
-<script type="application/x-javascript" src="chrome://messenger/content/msgSynchronize.js"/>
+<script type="application/javascript" src="chrome://messenger/content/msgSynchronize.js"/>
 
     <keyset id="keyset"/>
     <label hidden="true" wsm_persist="true" id="server.type"/>
 
     <description class="desc">&MsgSyncDesc.label;</description>
     <separator class="thin"/>
     <label value="&MsgSyncDirections.label;"/>
 
--- a/mailnews/base/content/newFolderDialog.xul
+++ b/mailnews/base/content/newFolderDialog.xul
@@ -49,17 +49,17 @@
 
 <dialog xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&newFolderDialog.title;"
         onload="onLoad();"
         ondialogaccept="return onOK();">
 
   <stringbundleset id="stringbundleset"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/newFolderDialog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/newFolderDialog.js"/>
 
     <label value="&name.label;" accesskey="&name.accesskey;" control="name"/>
     <textbox id="name" oninput="doEnabling();"/>
 
     <separator/>
 
     <label value="&description.label;" accesskey="&description.accesskey;" control="msgNewFolderPicker"/>
 
--- a/mailnews/base/content/renameFolderDialog.xul
+++ b/mailnews/base/content/renameFolderDialog.xul
@@ -43,13 +43,13 @@
 
 <dialog xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&renameFolderDialog.title;"
         ondialogaccept="return onOK();"
         onload="onLoad();">
 
   <stringbundleset id="stringbundleset"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/renameFolderDialog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/renameFolderDialog.js"/>
 
   <label value="&rename.label;" accesskey="&rename.accesskey;" control="name"/>
   <textbox id="name" oninput="doEnabling();"/>
 </dialog>
--- a/mailnews/base/content/shutdownWindow.xul
+++ b/mailnews/base/content/shutdownWindow.xul
@@ -41,17 +41,17 @@
 <?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         style="padding: 20px; width: 350px"
         onload="onLoad()"
         buttons="cancel"
         ondialogcancel="return onCancel();">
 
-  <script type="application/x-javascript" src="chrome://messenger/content/shutdownWindow.js"></script>
+  <script type="application/javascript" src="chrome://messenger/content/shutdownWindow.js"></script>
   <stringbundle id="bundle_shutdown" src="chrome://messenger/locale/shutdownWindow.properties"/>
   
   <vbox align="center">
     <label id="shutdownStatus_label" value="" />
     <separator class="thin" />
   </vbox>
   
   <progressmeter id="shutdown_progressmeter" mode="determined" />
--- a/mailnews/base/content/virtualFolderListDialog.xul
+++ b/mailnews/base/content/virtualFolderListDialog.xul
@@ -50,18 +50,18 @@
         title="&virtualFolderListTitle.title;"
         style="width: 27em; height: 25em;"
         persist="width height screenX screenY"
         onload="onLoad();"
         onunload="onUnLoad();"
         ondialogaccept="return onOK();"
         ondialogcancel="return onCancel();">   
 
-<script type="application/x-javascript" src="chrome://messenger/content/virtualFolderListDialog.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
+<script type="application/javascript" src="chrome://messenger/content/virtualFolderListDialog.js"/>
+<script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
 
   <label control="folderPickerTree">&virtualFolderDesc.label;</label>
 
     <tree id="folderPickerTree"
           treelines="true"
           flex="1"
           hidecolumnpicker="true"
           seltype="multiple"
--- a/mailnews/base/content/virtualFolderProperties.xul
+++ b/mailnews/base/content/virtualFolderProperties.xul
@@ -60,20 +60,20 @@
         windowtype="mailnews:virtualFolderProperties"
         ondialogaccept="return onOK();">
 
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_search"    src="chrome://messenger/locale/search.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   </stringbundleset>
 
-  <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/widgetglue.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/virtualFolderProperties.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/commandglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/virtualFolderProperties.js"/>
 
   <keyset id="dialogKeys"/>
    
   <grid>
     <columns>
       <column/>
       <column flex="1"/>
       <column flex="2"/>
--- a/mailnews/base/prefs/content/AccountManager.xul
+++ b/mailnews/base/prefs/content/AccountManager.xul
@@ -10,21 +10,21 @@
         style="&accountManager.size;"
         persist="screenX screenY"
         buttons="accept,cancel"
         onload="onLoad(event);"
         onunload="onUnload();"
         ondialogaccept="return onAccept();">
 <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
 <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-<script type="application/x-javascript" src="chrome://messenger/content/amUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/accountUtils.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/am-prefs.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
-<script type="application/x-javascript" src="chrome://messenger/content/am-help.js"/>
+<script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
+<script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>
+<script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+<script type="application/javascript" src="chrome://messenger/content/am-help.js"/>
 
   <hbox flex="1">
     <vbox style="&accountTree.width;">
       <tree flex="1" onselect="onAccountTreeSelect()" id="accounttree"
             seltype="single" hidecolumnpicker="true">
         <treecols>
           <treecol id="AccountCol" flex="1" primary="true" hideheader="true"/>
         </treecols>
--- a/mailnews/base/prefs/content/AccountWizard.xul
+++ b/mailnews/base/prefs/content/AccountWizard.xul
@@ -45,26 +45,26 @@
         onwizardfinish="return FinishAccount();"
         onload="onAccountWizardLoad();"
         style="&accountWizard.size;"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/amUtils.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"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/aw-accounttype.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/aw-identity.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/aw-server.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/aw-login.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/aw-accname.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/aw-done.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/accountUtils.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountWizard.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/ispUtils.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/aw-accounttype.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/aw-identity.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/aw-server.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/aw-login.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/aw-accname.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/aw-done.js"/>
 
   <!-- Account Type page : Displays choices of mail and news accounts that user can create -->
   <wizardpage id="accounttype" pageid="accounttype"
               label="&accountTypeTitle.label;"
               onpageshow="document.documentElement.canAdvance = true;"
               onpageadvanced="return acctTypePageUnload();">
     <vbox flex="1">
       <description>&accountSetupInfo.label;</description>
--- a/mailnews/base/prefs/content/SmtpServerEdit.xul
+++ b/mailnews/base/prefs/content/SmtpServerEdit.xul
@@ -47,12 +47,12 @@
 
 <dialog title="&smtpEditTitle.label;"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="onLoad();"
         ondialogaccept="return onAccept();">
 <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
 <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
-<script type="application/x-javascript" src="amUtils.js"/>
-<script type="application/x-javascript" src="SmtpServerEdit.js"/>
+<script type="application/javascript" src="amUtils.js"/>
+<script type="application/javascript" src="SmtpServerEdit.js"/>
 <vbox id="smtpServerEditor"/>
 </dialog>
--- a/mailnews/base/prefs/content/am-addressingOverlay.xul
+++ b/mailnews/base/prefs/content/am-addressingOverlay.xul
@@ -39,17 +39,17 @@
 <?xml-stylesheet href="chrome://messenger/content/messenger.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
 
 <!DOCTYPE overlay SYSTEM "chrome://messenger/locale/am-addressing.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/am-addressing.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-addressing.js"/>
 
   <vbox flex="1" id="compositionAndAddressing">
     <stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
 
     <groupbox>
       <caption label="&compositionGroupTitle.label;"/>
       <hbox align="center">
         <checkbox wsm_persist="true" id="identity.composeHtml" label="&useHtml.label;"
--- a/mailnews/base/prefs/content/am-copies.xul
+++ b/mailnews/base/prefs/content/am-copies.xul
@@ -3,13 +3,13 @@
 <?xul-overlay href="chrome://messenger/content/am-copiesOverlay.xul"?>
 
 <!DOCTYPE page SYSTEM "chrome://messenger/locale/am-copies.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       title="&copyAndFolderTitle.label;"
       onload="parent.onPanelLoaded('am-copies.xul');">
 
-  <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
   
   <dialogheader title="&copyAndFolderTitle.label;"/>
   <vbox id="copiesAndFolders"/>
 </page>
--- a/mailnews/base/prefs/content/am-copiesOverlay.xul
+++ b/mailnews/base/prefs/content/am-copiesOverlay.xul
@@ -44,18 +44,18 @@
 <!DOCTYPE overlay [
 <!ENTITY % copiesDTD SYSTEM "chrome://messenger/locale/am-copies.dtd">%copiesDTD;
 <!ENTITY % pickerDTD SYSTEM "chrome://messenger/locale/msgFolderPickerOverlay.dtd"> %pickerDTD;
 ]>
 
 <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/widgetglue.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-copies.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-copies.js"/>
 
   <vbox flex="1" id="copiesAndFolders">  
     <!-- stringbundle is used by msgFolderPickerOverlay.js-->     
     <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
     </stringbundleset>   
       
     <broadcaster id="broadcaster_doFcc"/>
--- a/mailnews/base/prefs/content/am-identities-list.xul
+++ b/mailnews/base/prefs/content/am-identities-list.xul
@@ -45,17 +45,17 @@
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="onLoad();"
   buttons="accept"
   ondialogaccept="return onOk();"
   style="width: 40em;">
 
 <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
-<script type="application/x-javascript" src="am-identities-list.js"/>
+<script type="application/javascript" src="am-identities-list.js"/>
 
 <label control="identitiesList" flex="1">&identitiesListDesc.label;</label>
 
 <separator class="thin"/>
 
 <hbox>
   <listbox id="identitiesList" ondblclick="onEdit(event);" onselect="updateButtons();" flex="1" style="height: 0px;"/>
 
--- a/mailnews/base/prefs/content/am-identity-edit.xul
+++ b/mailnews/base/prefs/content/am-identity-edit.xul
@@ -54,19 +54,19 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="onLoadIdentityProperties();"
         ondialogaccept="return onOk();"
         style="&identityDialog.style;">
 
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
-  <script type="application/x-javascript" src="chrome://messenger/content/am-prefs.js"/>
-  <script type="application/x-javascript" src="am-identity-edit.js"/>
-  <script type="application/x-javascript">
+  <script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>
+  <script type="application/javascript" src="am-identity-edit.js"/>
+  <script type="application/javascript">
   <![CDATA[
     function getServerIdAndPageIdFromTree(tree)
     {
       return {"serverId": gAccount.incomingServer.key, "pageId": "" }
     }
   ]]>
   </script>
 
--- a/mailnews/base/prefs/content/am-junk.xul
+++ b/mailnews/base/prefs/content/am-junk.xul
@@ -50,21 +50,21 @@
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       xmlns:nc="http://home.netscape.com/NC-rdf#"
       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
       title="&junkSettings.label;"
       onload="parent.onPanelLoaded('am-junk.xul');">
 
-  <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-junk.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-prefs.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/amUtils.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-junk.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   
   <dialogheader title="&junkSettings.label;"/>
   <description width="1">&trainingWarning.label;</description>
   <separator class="thin"/>
   
   <broadcaster id="broadcaster_moveMode"/>
   
--- a/mailnews/base/prefs/content/am-main.xul
+++ b/mailnews/base/prefs/content/am-main.xul
@@ -5,19 +5,19 @@
 <!DOCTYPE page SYSTEM "chrome://messenger/locale/am-main.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.onPanelLoaded('am-main.xul');">
 
     <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
-    <script type="application/x-javascript" src="chrome://messenger/content/am-identity-edit.js"/>
-    <script type="application/x-javascript" src="chrome://messenger/content/am-main.js"/>
-    <script type="application/x-javascript" src="chrome://messenger/content/am-prefs.js"/>
+    <script type="application/javascript" src="chrome://messenger/content/am-identity-edit.js"/>
+    <script type="application/javascript" src="chrome://messenger/content/am-main.js"/>
+    <script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>
 
     <broadcaster id="broadcaster_attachSignature"/>
 
     <dialogheader id="am-main-title" defaultTitle="&accountTitle.label;"/>
 
     <hbox align="center">
       <label value="&accountName.label;" control="server.prettyName"
              accesskey="&accountName.accesskey;"/>
--- a/mailnews/base/prefs/content/am-offline.xul
+++ b/mailnews/base/prefs/content/am-offline.xul
@@ -44,19 +44,19 @@
 
 <!DOCTYPE page SYSTEM "chrome://messenger/locale/am-offline.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.onPanelLoaded('am-offline.xul');">
 
     <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/> 
 
-    <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
-    <script type="application/x-javascript" src="chrome://messenger/content/retention.js"/>
-    <script type="application/x-javascript" src="chrome://messenger/content/am-offline.js"/>
+    <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+    <script type="application/javascript" src="chrome://messenger/content/retention.js"/>
+    <script type="application/javascript" src="chrome://messenger/content/am-offline.js"/>
 
     <label hidden="true" wsm_persist="true" id="server.type"/>  
     <label id="imap.autoSyncMaxAgeDays" hidden="true"
            wsm_persist="true" preftype="int"
            prefstring="mail.server.%serverkey%.autosync_max_age_days"/>
 
     <dialogheader id="headertitle"/>
 
--- a/mailnews/base/prefs/content/am-server-advanced.xul
+++ b/mailnews/base/prefs/content/am-server-advanced.xul
@@ -45,17 +45,17 @@
 
 <dialog
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&serverAdvanced.label;"
         buttons="accept,cancel"
         onload="onLoad();"
         ondialogaccept="return onOk();">
 
-  <script type="application/x-javascript" src="am-server-advanced.js"/>
+  <script type="application/javascript" src="am-server-advanced.js"/>
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
 
     <!-- IMAP Panel -->
     <vbox id="imapPanel">
       <hbox>
         <label value="&serverDirectory.label;"
                accesskey="&serverDirectory.accesskey;"
                control="serverDirectory"/>
--- a/mailnews/base/prefs/content/am-server.xul
+++ b/mailnews/base/prefs/content/am-server.xul
@@ -50,21 +50,21 @@
 <!ENTITY % trashDTD SYSTEM "chrome://messenger/locale/am-server-top.dtd">%trashDTD;
 <!ENTITY % pickerDTD SYSTEM "chrome://messenger/locale/msgFolderPickerOverlay.dtd"> %pickerDTD;
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       title="&serverSettings.label;"
       onload="parent.onPanelLoaded('am-server.xul');">
 
-  <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-server.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-prefs.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/amUtils.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-server.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-prefs.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
   <label hidden="true" wsm_persist="true" id="server.type"/>
 
   <dialogheader title="&serverSettings.label;"/>
 
   <grid>
     <columns>
--- a/mailnews/base/prefs/content/am-serverwithnoidentities.xul
+++ b/mailnews/base/prefs/content/am-serverwithnoidentities.xul
@@ -3,18 +3,18 @@
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
 
 <!DOCTYPE page SYSTEM "chrome://messenger/locale/am-serverwithnoidentities.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       title="&accountTitle.label;"
       onload="parent.onPanelLoaded('am-serverwithnoidentities.xul');">
 
-  <script type="application/x-javascript" src="chrome://messenger/content/am-serverwithnoidentities.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/amUtils.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-serverwithnoidentities.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/amUtils.js"/>
 
   <dialogheader title="&accountTitle.label;"/>
 
   <description class="secDesc">&accountSettingsDesc.label;</description>
   <hbox align="center">
     <label value="&accountName.label;" control="server.prettyName"
            accesskey="&accountName.accesskey;"/>
     <textbox wsm_persist="true" size="30" id="server.prettyName"
--- a/mailnews/base/prefs/content/am-smtp.xul
+++ b/mailnews/base/prefs/content/am-smtp.xul
@@ -4,18 +4,18 @@
 
 <?xul-overlay href="chrome://messenger/content/smtpEditOverlay.xul"?>
 
 <!DOCTYPE page SYSTEM "chrome://messenger/locale/am-advanced.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       title="&smtpServer.label;"
       onload="gSmtpServerListWindow.onLoad();">
-  <script type="application/x-javascript" src="amUtils.js"/>
-  <script type="application/x-javascript" src="am-smtp.js"/>
+  <script type="application/javascript" src="amUtils.js"/>
+  <script type="application/javascript" src="am-smtp.js"/>
   
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
 
   <dialogheader title="&smtpServer.label;"/>
 
   <label control="smtpList">&smtpDesc.label;</label>
   <separator class="thin"/>
 
--- a/mailnews/base/search/content/CustomHeaders.xul
+++ b/mailnews/base/search/content/CustomHeaders.xul
@@ -48,17 +48,17 @@
   persist="width height screenX screenY"
   title="&window.title;">
 
   <stringbundleset id="stringbundleset">
   <stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
   <stringbundle id="bundle_custom" src="chrome://messenger/locale/custom.properties"/>
   </stringbundleset>
 
-  <script type="application/x-javascript" src="chrome://messenger/content/CustomHeaders.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/CustomHeaders.js"/>
 
   <!-- we need to override the dialogs default key behavior so we can re-route enter/return
        to the add button if the add button is suddenly the default action
   -->
   <keyset id="customHeaderDialogKeys">
     <key keycode="VK_ENTER" oncommand="enterKeyPressed();"/>
     <key keycode="VK_RETURN" oncommand="enterKeyPressed();"/>
     <key keycode="VK_ESCAPE" oncommand="doCancelButton();"/>
--- a/mailnews/base/search/content/FilterEditor.xul
+++ b/mailnews/base/search/content/FilterEditor.xul
@@ -59,21 +59,21 @@
 
   <dummy class="usesMailWidgets"/>
   <stringbundleset id="stringbundleset">
     <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
     <stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
     <stringbundle id="bundle_search" src="chrome://messenger/locale/search.properties"/>
   </stringbundleset>
 
-  <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"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/mailWindowOverlay.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/mailCommands.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/FilterEditor.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/msgFolderPickerOverlay.js"/>
 
   <hbox align="center">
     <label value="&filterName.label;" accesskey="&filterName.accesskey;" control="filterName"/>
     <textbox flex="50%" id="filterName"/>
     <spacer flex="50%"/>
   </hbox>
 
   <separator/>
--- a/mailnews/base/search/content/viewLog.xul
+++ b/mailnews/base/search/content/viewLog.xul
@@ -48,17 +48,17 @@
         windowtype="mailnews:filterlog"
         buttons="accept"
         buttonlabelaccept="&closeLog.label;"
         buttonaccesskeyaccept="&closeLog.accesskey;"
         ondialogaccept="window.close()"
         persist="screenX screenY width height"
         style="width: 40em; height: 25em;">
 
-  <script type="application/x-javascript" src="chrome://messenger/content/viewLog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/viewLog.js"/>
 
   <vbox flex="1">
     <description>&viewLogInfo.text;</description>
     <hbox>
       <checkbox id="logFilters" oncommand="toggleLogFilters()" label="&enableLog.label;" accesskey="&enableLog.accesskey;"/>
       <spacer flex="1"/>
       <button label="&clearLog.label;" accesskey="&clearLog.accesskey;" oncommand="clearLog()"/>
     </hbox>
--- a/mailnews/compose/content/MsgAttachPage.xul
+++ b/mailnews/compose/content/MsgAttachPage.xul
@@ -48,18 +48,18 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&caption.label;"
         onload="onLoad();"
         ondialogaccept="return attach();"
         style="width: 40em;"
         persist="screenX screenY"
         screenX="24" screenY="24">
 
-  <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/MsgAttachPage.js"/>
-  <script type="application/x-javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/messengercompose/MsgAttachPage.js"/>
+  <script type="application/javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>
 
   <stringbundle id="attachWebPageBundle" src="chrome://messenger/locale/messengercompose/composeMsgs.properties"/>
 
   <label value="&enter.label;" control="dialog.input" accesskey="&enter.accesskey;"/>
   <separator class="thin"/>
 
   <hbox align="center">
     <textbox id="dialog.input" flex="1" type="autocomplete"
--- a/mailnews/compose/content/mailComposeEditorOverlay.xul
+++ b/mailnews/compose/content/mailComposeEditorOverlay.xul
@@ -36,17 +36,17 @@
    -
    - ***** END LICENSE BLOCK ***** -->
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/mailComposeEditorOverlay.dtd" >
 
 <overlay id="mailComposeEditorOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript">
+  <script type="application/javascript">
   <![CDATA[
 
     var gMsgCompProcessLink = false;
     var gMsgCompInputElement = null;
     var gMsgCompPrevInputValue = null;
     var gMsgCompPrevMozDoNotSendAttribute;
     var gMsgCompAttachSourceElement = null;
     var gMOZDONOTSEND = "moz-do-not-send";
--- a/mailnews/compose/content/sendProgress.xul
+++ b/mailnews/compose/content/sendProgress.xul
@@ -48,17 +48,17 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&sendWindow.title;"
         style="width: 36em;"
         onload="onLoad()"
         onunload="onUnload()"
         buttons="cancel"
         ondialogcancel="return onCancel();">
 
-  <script type="application/x-javascript" src="chrome://messenger/content/messengercompose/sendProgress.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/messengercompose/sendProgress.js"/>
   <stringbundle id="sendProgressStringBundle" src="chrome://messenger/locale/messengercompose/sendProgress.properties"/>
 
     <grid flex="1">
       <columns>
         <column/>
         <column flex="1"/>
       </columns>
       
--- a/mailnews/extensions/dsn/content/am-dsn.xul
+++ b/mailnews/extensions/dsn/content/am-dsn.xul
@@ -42,18 +42,18 @@
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
 
 <!DOCTYPE page SYSTEM "chrome://messenger/locale/am-dsn.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
       onload="parent.onPanelLoaded('am-dsn.xul');">
 
   <stringbundle id="bundle_smime" src="chrome://messenger/locale/am-dsn.properties"/> 
-  <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-dsn.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-dsn.js"/>
   
   <dialogheader title="&pane.title;"/>
 
   <groupbox>
 
     <caption label="&pane.title;"/>
 
     <hbox id="prefChoices" align="center">
--- a/mailnews/extensions/mdn/content/am-mdn.xul
+++ b/mailnews/extensions/mdn/content/am-mdn.xul
@@ -41,18 +41,18 @@
 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
 
 <!DOCTYPE page SYSTEM "chrome://messenger/locale/am-mdn.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload="parent.onPanelLoaded('am-mdn.xul');">
 
   <stringbundle id="bundle_smime" src="chrome://messenger/locale/am-mdn.properties"/> 
-  <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-mdn.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-mdn.js"/>
   
   <dialogheader title="&pane.title;"/>
 
   <groupbox>
 
     <caption label="&pane.title;"/>
 
     <hbox id="prefChoices" align="center">
--- a/mailnews/extensions/newsblog/content/am-newsblog.xul
+++ b/mailnews/extensions/newsblog/content/am-newsblog.xul
@@ -43,21 +43,21 @@
 %accountNoIdentDTD;
 ]>
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       class="color-dialog"
       title="&accountTitle.label;"
       onload="parent.onPanelLoaded('am-newsblog.xul');">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://messenger-newsblog/content/am-newsblog.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://messenger-newsblog/content/newsblogOverlay.js"/>
 
   <dialogheader id="am-newsblog-title" defaultTitle="&accountTitle.label;"/>
 
     <hbox align="center">
       <label value="&accountName.label;"
              accesskey="&accountName.accesskey;"
              control="server.prettyName"/>
--- a/mailnews/extensions/newsblog/content/feed-properties.xul
+++ b/mailnews/extensions/newsblog/content/feed-properties.xul
@@ -50,19 +50,19 @@
   style="width: 40em;"
 #else
   style="width: 33em;"
 #endif
   buttons="accept,cancel"
   onload="onLoad();"
   ondialogaccept="return onOk();">
 
-  <script type="application/x-javascript" src="feed-properties.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/widgetglue.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/globalOverlay.js"/>
+  <script type="application/javascript" src="feed-properties.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/widgetglue.js"/>
+  <script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
 
   <popup id="copyUrlPopup" popupanchor="bottomleft">
     <menuitem label="&copyLinkCmd.label;" accesskey="&copyLinkCmd.accesskey;"
               oncommand="CopyWebsiteAddress(document.popupNode)"/>
   </popup>
 
   <popup id="pasteUrlPopup" popupanchor="bottomleft">
     <menuitem label="&pasteLinkCmd.label;" accesskey="&pasteLinkCmd.accesskey;"
--- a/mailnews/extensions/newsblog/content/feed-subscriptions.xul
+++ b/mailnews/extensions/newsblog/content/feed-subscriptions.xul
@@ -51,24 +51,24 @@
         style="width: 30em; height: 25em;"
 #endif
         persist="width height"
         onload="gFeedSubscriptionsWindow.init();"
         onunload="return gFeedSubscriptionsWindow.uninit();"
         windowtype="Mail:News-BlogSubscriptions"
         flex="1">
 
-  <script type="application/x-javascript" src="utils.js"/>
-  <script type="application/x-javascript" src="file-utils.js"/>
-  <script type="application/x-javascript" src="debug-utils.js"/>
-  <script type="application/x-javascript" src="feed-subscriptions.js"/>
-  <script type="application/x-javascript" src="Feed.js"/>
-  <script type="application/x-javascript" src="FeedItem.js"/>
-  <script type="application/x-javascript" src="feed-parser.js"/>
-  <script type="application/x-javascript" src="chrome://global/content/nsDragAndDrop.js"/>
+  <script type="application/javascript" src="utils.js"/>
+  <script type="application/javascript" src="file-utils.js"/>
+  <script type="application/javascript" src="debug-utils.js"/>
+  <script type="application/javascript" src="feed-subscriptions.js"/>
+  <script type="application/javascript" src="Feed.js"/>
+  <script type="application/javascript" src="FeedItem.js"/>
+  <script type="application/javascript" src="feed-parser.js"/>
+  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>
 
   <keyset id="extensionsKeys">
     <key id="key_close"   key="&cmd.close.commandKey;" modifiers="accel" oncommand="window.close();"/>
     <key id="key_close2"  keycode="VK_ESCAPE" oncommand="window.close();"/>
   </keyset>
 
   <stringbundle id="bundle_newsblog" src="chrome://messenger-newsblog/locale/newsblog.properties"/>
   <stringbundle id="bundle_brand" src="chrome://branding/locale/brand.properties"/>
--- a/mailnews/extensions/smime/content/am-smime.xul
+++ b/mailnews/extensions/smime/content/am-smime.xul
@@ -44,16 +44,16 @@
 
 <!DOCTYPE page SYSTEM "chrome://messenger/locale/am-smime.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="color-dialog"
         onload="parent.onPanelLoaded('am-smime.xul');"
         ondialogaccept="smimeOnAcceptEditor();">
 
-  <script type="application/x-javascript" src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/am-smime.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/AccountManager.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/am-smime.js"/>
 
   <dialogheader title="&securityTitle.label;"/>
 
   <vbox flex="1" id="smimeEditing"/>
 
 </page>
--- a/mailnews/extensions/smime/content/am-smimeIdentityEditOverlay.xul
+++ b/mailnews/extensions/smime/content/am-smimeIdentityEditOverlay.xul
@@ -49,27 +49,27 @@
 <!--
   This is the overlay that adds the SMIME configurator
   to the identity editor of the account manager
 -->
 <overlay id="smimeAmIdEditOverlay"
     xmlns:html="http://www.w3.org/1999/xhtml"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://messenger/content/AccountManager.js"/>
-  <script type="application/x-javascript"
+  <script type="application/javascript"
           src="chrome://messenger/content/am-smime.js"/>
 
   <tabs id="identitySettings">
     <tab label="&securityTab.label;"/>
   </tabs>
 
   <tabpanels id="identityTabsPanels">
     <vbox flex="1" name="smimeEditingContent" id="smimeEditing"/>
   </tabpanels>
 
-  <script type="application/x-javascript">
+  <script type="application/javascript">
   <![CDATA[
     window.addEventListener("load", smimeOnLoadEditor, false);
   ]]>
   </script>
 </overlay>
--- a/mailnews/extensions/smime/content/certFetchingStatus.xul
+++ b/mailnews/extensions/smime/content/certFetchingStatus.xul
@@ -44,13 +44,13 @@
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
   style="width: 50em;"
   buttons="cancel"
   buttonlabelcancel="&stop.label;"
   ondialogcancel="return stopFetching();"
   onload="onLoad();">
 
   <stringbundle id="bundle_ldap" src="chrome://mozldap/locale/ldap.properties"/>
-<script type="application/x-javascript" src="chrome://messenger-smime/content/certFetchingStatus.js"/>
+<script type="application/javascript" src="chrome://messenger-smime/content/certFetchingStatus.js"/>
 
   <description>&info.message;</description>
 
 </dialog>
--- a/mailnews/extensions/smime/content/msgCompSecurityInfo.xul
+++ b/mailnews/extensions/smime/content/msgCompSecurityInfo.xul
@@ -42,17 +42,17 @@
 
 <dialog id="msgCompSecurityInfo" title="&title.label;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
   style="width: 50em;"
   persist="width height"
   buttons="accept"
   onload="onLoad();">
 
-  <script type="application/x-javascript" src="chrome://messenger-smime/content/msgCompSecurityInfo.js"/>
+  <script type="application/javascript" src="chrome://messenger-smime/content/msgCompSecurityInfo.js"/>
 
   <stringbundle id="bundle_smime_comp_info" src="chrome://messenger-smime/locale/msgCompSecurityInfo.properties"/> 
 
   <description>&subject.plaintextWarning;</description>
   <separator class="thin"/>
   <description>&status.heading;</description>
   <grid>
     <columns>
--- a/mailnews/extensions/smime/content/msgReadSecurityInfo.xul
+++ b/mailnews/extensions/smime/content/msgReadSecurityInfo.xul
@@ -41,17 +41,17 @@
 <!DOCTYPE dialog SYSTEM "chrome://messenger-smime/locale/msgReadSecurityInfo.dtd">
 
 <dialog id="msgReadSecurityInfo" title="&status.label;"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"      
   style="width: 40em;"
   buttons="accept"
   onload="onLoad();">
 
-  <script type="application/x-javascript" src="chrome://messenger-smime/content/msgReadSecurityInfo.js"/>
+  <script type="application/javascript" src="chrome://messenger-smime/content/msgReadSecurityInfo.js"/>
 
   <stringbundle id="bundle_smime_read_info" src="chrome://messenger-smime/locale/msgSecurityInfo.properties"/> 
 
   <vbox flex="1">
     <label id="signatureLabel"/>
     <label id="signatureHeader" collapsed="true"/>
     <description id="signatureExplanation"/>
     <vbox id="signatureCert" collapsed="true">
--- a/mailnews/import/content/fieldMapImport.xul
+++ b/mailnews/import/content/fieldMapImport.xul
@@ -42,17 +42,17 @@
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         buttons="accept,cancel"
         title="&fieldMapImport.title;"
         style="&fieldMapImport.size;"
         ondialogaccept="FieldImportOKButton();"
         onload="OnLoadFieldMapImport();">
 
-  <script type="application/x-javascript" src="chrome://messenger/content/fieldMapImport.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/fieldMapImport.js"/>
 
   <hbox align="center">
     <label value="&fieldMapImport.recordNumber;"/>
     <label id="recordNumber"/>
     <spacer flex="1"/>
     <button id="previous" oncommand="Browse(-1);"
             label="&fieldMapImport.previous.label;"
             accesskey="&fieldMapImport.previous.accesskey;"/>
--- a/mailnews/import/content/importDialog.xul
+++ b/mailnews/import/content/importDialog.xul
@@ -55,17 +55,17 @@
         style="width: &window.macWidth; !important;"
 #else
         style="width: &window.width; !important;"
 #endif
         title="&importDialog.windowTitle;">
 
   <stringbundle id="bundle_importMsgs" src="chrome://messenger/locale/importMsgs.properties"/>
   <stringbundle id="bundle_addressbook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/importDialog.js"/>
+  <script type="application/javascript" src="chrome://messenger/content/importDialog.js"/>
 
   <keyset id="dialogKeys"/>
   
   <hbox class="box-header" id="header"
        title="&importTitle.label;"
        description="&importShortDesc.label;"/>
 
   <deck id="stateDeck" selectedIndex="0">
--- a/mailnews/news/content/downloadheaders.xul
+++ b/mailnews/news/content/downloadheaders.xul
@@ -44,17 +44,17 @@
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         style="max-width: 27em;"
         buttonpack="center"
         ondialogaccept="return OkButtonCallback();"
         ondialogcancel="return CancelButtonCallback();"
         onload="OnLoad();">
 
   <stringbundle id="bundle_news" src="chrome://messenger/locale/news.properties"/>
-  <script type="application/x-javascript" src="chrome://messenger/content/downloadheaders.js" />
+  <script type="application/javascript" src="chrome://messenger/content/downloadheaders.js" />
 
   <label class="header" style="width: 25em; max-width: 25em;" id="newsgroupLabel" control="downloadGroup"/> 
   <description style="width: 25em; max-width: 25em;" id="info" control="downloadGroup"/>
   <separator class="thin"/>
   <vbox class="indent">
     <radiogroup id="downloadGroup">
       <radio id="all" label="&all.label;" accesskey="&all.accesskey;"
              oncommand="setupDownloadUI(false);"/>