diff --git a/mozilla/calendar/resources/content/importExport.js b/mozilla/calendar/resources/content/importExport.js
index 89b2a46b135..f837f04c8a9 100644
--- a/mozilla/calendar/resources/content/importExport.js
+++ b/mozilla/calendar/resources/content/importExport.js
@@ -968,7 +968,7 @@ function parseIcalToDos( icalStr )
 function transformXCSData( xcsString )
 {
    var gParser = new DOMParser;
-   var xmlDocument = gParser.parseFromString(xcsString, 'text/xml');   
+   var xmlDocument = gParser.parseFromString(xcsString, 'application/xml');   
 
    return serializeDocument(xmlDocument, "xcs2ics.xsl");
 }
@@ -1660,8 +1660,8 @@ function xslt(xmlUri, xslUri)
    var xmlDoc = document.implementation.createDocument("", "", null);
    var xslDoc = document.implementation.createDocument("", "", null);
 
-   xmlDoc.load(xmlUri, "text/xml");
-   xslDoc.load(xslUri, "text/xml");
+   xmlDoc.load(xmlUri, "application/xml");
+   xslDoc.load(xslUri, "application/xml");
    xslProc.transformDocument(xmlDoc, xslDoc, result, null);
 
    return result;
@@ -1722,14 +1722,14 @@ function transformXML( xmlDocument, xslFilename )
    var gParser = new DOMParser;
    // .load isn't synchrone
    // var xslDoc = document.implementation.createDocument("", "", null);
-   // xslDoc.load(path, "text/xml");
+   // xslDoc.load(path, "application/xml");
 
    // if only passsed a filename, assume it is a file in the default directory
    if( xslFilename.indexOf( ":" ) == -1 )
      xslFilename = convertersDirectory + xslFilename;
 
    var xslContent = loadFile( xslFilename );
-   var xslDocument = gParser.parseFromString(xslContent, 'text/xml');
+   var xslDocument = gParser.parseFromString(xslContent, 'application/xml');
    var result = document.implementation.createDocument("", "", null);
 
    xslProc.transformDocument(xmlDocument, xslDocument, result, null);
@@ -1778,7 +1778,7 @@ function serializeDocument( xmlDocument, stylesheet )
 function deserializeDocument(text, stylesheet )
 {
    var gParser = new DOMParser;
-   var xmlDocument = gParser.parseFromString(text, 'text/xml');
+   var xmlDocument = gParser.parseFromString(text, 'application/xml');
 }
 
 /** PRIVATE
@@ -1986,7 +1986,7 @@ function getXmlDocument ( eventList )
     // use the domparser to create the XML 
     var domParser = new DOMParser;
     // start with one tag
-    var xmlDocument = domParser.parseFromString( "<libical/>", "text/xml" );
+    var xmlDocument = domParser.parseFromString( "<libical/>", "application/xml" );
     
     // get the top tag, there will only be one.
     var topNodeList = xmlDocument.getElementsByTagName( "libical" );
diff --git a/mozilla/extensions/p3p/src/nsPolicyReference.cpp b/mozilla/extensions/p3p/src/nsPolicyReference.cpp
index ce9c29d14b5..241c7dab940 100755
--- a/mozilla/extensions/p3p/src/nsPolicyReference.cpp
+++ b/mozilla/extensions/p3p/src/nsPolicyReference.cpp
@@ -245,7 +245,7 @@ nsPolicyReference::Load(const nsACString& aURI)
                                         aURI, PR_TRUE, empty, empty);
   NS_ENSURE_SUCCESS(result, result);
    
-  mXMLHttpRequest->OverrideMimeType(NS_LITERAL_CSTRING("text/xml"));
+  mXMLHttpRequest->OverrideMimeType(NS_LITERAL_CSTRING("application/xml"));
 
   return mXMLHttpRequest->Send(nsnull);
 
diff --git a/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp b/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp
index 406716f3b5b..c5d2647631a 100644
--- a/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp
+++ b/mozilla/extensions/webservices/wsdl/src/nsWSDLLoader.cpp
@@ -294,7 +294,7 @@ nsWSDLLoadRequest::LoadDefinition(const nsAString& aURI)
   }
 
   // Force the mimetype of the returned stream to be xml.
-  rv = mRequest->OverrideMimeType(NS_LITERAL_CSTRING("text/xml"));
+  rv = mRequest->OverrideMimeType(NS_LITERAL_CSTRING("application/xml"));
   if (NS_FAILED(rv)) {
     return rv;
   }
diff --git a/mozilla/mail/components/addrbook/content/addressbook.js b/mozilla/mail/components/addrbook/content/addressbook.js
index fcad5e7dcb0..874868479be 100644
--- a/mozilla/mail/components/addrbook/content/addressbook.js
+++ b/mozilla/mail/components/addrbook/content/addressbook.js
@@ -464,7 +464,7 @@ function AbPrintPreviewCard()
 
 function CreatePrintCardUrl(card)
 {
-  var url = "data:text/xml;base64," + card.convertToBase64EncodedXML();
+  var url = "data:application/xml;base64," + card.convertToBase64EncodedXML();
   return url;
 }
 
diff --git a/mozilla/mail/extensions/newsblog/content/feed-subscriptions.js b/mozilla/mail/extensions/newsblog/content/feed-subscriptions.js
index 5e2195f821a..7ef1f5a71b7 100644
--- a/mozilla/mail/extensions/newsblog/content/feed-subscriptions.js
+++ b/mozilla/mail/extensions/newsblog/content/feed-subscriptions.js
@@ -805,7 +805,7 @@ var gFeedSubscriptionsWindow = {
 
     var text = file.read();  
     var parser = new DOMParser();
-    var opmlDom = parser.parseFromString(text, 'text/xml');
+    var opmlDom = parser.parseFromString(text, 'application/xml');
 
     // return if the user didn't give us an OPML file
     if(!opmlDom || !(opmlDom.documentElement.tagName == "opml"))
diff --git a/mozilla/mailnews/addrbook/resources/content/addressbook.js b/mozilla/mailnews/addrbook/resources/content/addressbook.js
index 202b6eaa77d..9a21d3115de 100644
--- a/mozilla/mailnews/addrbook/resources/content/addressbook.js
+++ b/mozilla/mailnews/addrbook/resources/content/addressbook.js
@@ -454,7 +454,7 @@ function AbPrintPreviewCard()
 
 function CreatePrintCardUrl(card)
 {
-  var url = "data:text/xml;base64," + card.convertToBase64EncodedXML();
+  var url = "data:application/xml;base64," + card.convertToBase64EncodedXML();
   return url;
 }
 
diff --git a/mozilla/toolkit/mozapps/plugins/service/PluginFinderService.php b/mozilla/toolkit/mozapps/plugins/service/PluginFinderService.php
index 8627ca3c4c1..ca8d5e18292 100644
--- a/mozilla/toolkit/mozapps/plugins/service/PluginFinderService.php
+++ b/mozilla/toolkit/mozapps/plugins/service/PluginFinderService.php
@@ -160,7 +160,7 @@ if ($mimetype == "application/x-mtx") {
   $licenseURL = "";
 }
 
-header("Content-type: text/xml");
+header("Content-type: application/xml");
 print "<?xml version=\"1.0\"?>\n";
 print "<RDF:RDF xmlns:RDF=\"http://www.w3.org/1999/02/22-rdf-syntax-ns#\" xmlns:pfs=\"http://www.mozilla.org/2004/pfs-rdf#\">\n\n";