diff --git a/mail/locales/en-US/chrome/messenger-mapi/pref-mailnewsOverlay.dtd b/mail/locales/en-US/chrome/messenger-mapi/pref-mailnewsOverlay.dtd
deleted file mode 100755
index 1ad97295b507..000000000000
--- a/mail/locales/en-US/chrome/messenger-mapi/pref-mailnewsOverlay.dtd
+++ /dev/null
@@ -1,5 +0,0 @@
-<!ENTITY enableMapiTitle.label "When sending mail from other applications">
-<!ENTITY enableMapi.label "Use &brandShortName; as the default mail application">
-<!ENTITY enableMapi.accesskey "u">
-<!ENTITY enableNews.label "Use &brandShortName; as the default news application">
-<!ENTITY enableNews.accesskey "n">
diff --git a/mail/locales/generic/chrome/messenger-mapi/contents.rdf b/mail/locales/generic/chrome/messenger-mapi/contents.rdf
new file mode 100644
index 000000000000..7373de8b6bf1
--- /dev/null
+++ b/mail/locales/generic/chrome/messenger-mapi/contents.rdf
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
+
+ <!-- list all the skins being supplied by this package -->
+ <RDF:Seq about="urn:mozilla:locale:root">
+ <RDF:li resource="urn:mozilla:locale:en-US"/>
+ </RDF:Seq>
+
+ <!-- locale information -->
+ <RDF:Description about="urn:mozilla:locale:en-US">
+ <chrome:packages>
+ <RDF:Seq about="urn:mozilla:locale:en-US:packages">
+ <RDF:li resource="urn:mozilla:locale:en-US:messenger-mapi"/>
+ </RDF:Seq>
+ </chrome:packages>
+ </RDF:Description>
+
+ <!-- Version Information. State that we work only with major version of this
+ package. -->
+ <RDF:Description about="urn:mozilla:locale:en-US:messenger-mapi"
+#expand chrome:localeVersion="__MOZILLA_LOCALE_VERSION__"/>
+</RDF:RDF>
diff --git a/mail/locales/jar.mn b/mail/locales/jar.mn
index cedb5ac029b2..aad12f247353 100644
--- a/mail/locales/jar.mn
+++ b/mail/locales/jar.mn
@@ -128,34 +128,34 @@
locale/@AB_CD@/messenger/preferences/preferences.properties (@AB_CD@/chrome/messenger/preferences/preferences.properties)
locale/@AB_CD@/messenger/migration/migration.dtd (@AB_CD@/chrome/messenger/migration/migration.dtd)
locale/@AB_CD@/messenger/migration/migration.properties (@AB_CD@/chrome/messenger/migration/migration.properties)
-+ locale/@AB_CD@/messenger-mapi/mapi.properties (@AB_CD@/chrome/messenger-mapi/mapi.properties)
-+ locale/@AB_CD@/messenger-mapi/pref-mailnewsOverlay.dtd (@AB_CD@/chrome/messenger-mapi/pref-mailnewsOverlay.dtd)
-* locale/@AB_CD@/messenger-newsblog/contents.rdf (generic/chrome/messenger-newsblog/contents.rdf)
- locale/@AB_CD@/messenger-newsblog/newsblog.dtd (@AB_CD@/chrome/messenger-newsblog/newsblog.dtd)
- locale/@AB_CD@/messenger-newsblog/newsblog.properties (@AB_CD@/chrome/messenger-newsblog/newsblog.properties)
- locale/@AB_CD@/messenger-newsblog/feed-subscriptions.dtd (@AB_CD@/chrome/messenger-newsblog/feed-subscriptions.dtd)
- locale/@AB_CD@/messenger-newsblog/feed-properties.dtd (@AB_CD@/chrome/messenger-newsblog/feed-properties.dtd)
- locale/@AB_CD@/messenger-newsblog/am-newsblog.properties (@AB_CD@/chrome/messenger-newsblog/am-newsblog.properties)
- locale/@AB_CD@/messenger-newsblog/am-newsblog.dtd (@AB_CD@/chrome/messenger-newsblog/am-newsblog.dtd)
- locale/@AB_CD@/messenger-smime/msgCompSMIMEOverlay.dtd (@AB_CD@/chrome/messenger-smime/msgCompSMIMEOverlay.dtd)
- locale/@AB_CD@/messenger-smime/msgCompSMIMEOverlay.properties (@AB_CD@/chrome/messenger-smime/msgCompSMIMEOverlay.properties)
- locale/@AB_CD@/messenger-smime/msgReadSMIMEOverlay.dtd (@AB_CD@/chrome/messenger-smime/msgReadSMIMEOverlay.dtd)
- locale/@AB_CD@/messenger-smime/msgReadSMIMEOverlay.properties (@AB_CD@/chrome/messenger-smime/msgReadSMIMEOverlay.properties)
- locale/@AB_CD@/messenger-smime/msgCompSecurityInfo.dtd (@AB_CD@/chrome/messenger-smime/msgCompSecurityInfo.dtd)
- locale/@AB_CD@/messenger-smime/msgCompSecurityInfo.properties (@AB_CD@/chrome/messenger-smime/msgCompSecurityInfo.properties)
- locale/@AB_CD@/messenger-smime/msgReadSecurityInfo.dtd (@AB_CD@/chrome/messenger-smime/msgReadSecurityInfo.dtd)
- locale/@AB_CD@/messenger-smime/certFetchingStatus.dtd (@AB_CD@/chrome/messenger-smime/certFetchingStatus.dtd)
- locale/@AB_CD@/messenger-smime/msgSecurityInfo.properties (@AB_CD@/chrome/messenger-smime/msgSecurityInfo.properties)
-* locale/@AB_CD@/messenger-smime/contents.rdf (generic/chrome/messenger-smime/contents.rdf)
-* locale/@AB_CD@/messenger-offline/contents.rdf (generic/chrome/messenger-offline/contents.rdf)
- locale/@AB_CD@/messenger-offline/offline.properties (@AB_CD@/chrome/messenger-offline/offline.properties)
- locale/@AB_CD@/messenger-offline/offline.dtd (@AB_CD@/chrome/messenger-offline/offline.dtd)
- locale/@AB_CD@/messenger-offline/pref-offline.dtd (@AB_CD@/chrome/messenger-offline/pref-offline.dtd)
-* locale/@AB_CD@/messenger-region/contents.rdf (generic/chrome/messenger-region/contents.rdf)
- locale/@AB_CD@/messenger-region/region.properties (@AB_CD@/chrome/messenger-region/region.properties)
-* locale/@AB_CD@/mozldap/contents.rdf (generic/chrome/mozldap/contents.rdf)
- locale/@AB_CD@/mozldap/ldap.properties (@AB_CD@/chrome/mozldap/ldap.properties)
-+ locale/@AB_CD@/mozapps/downloads/pref-downloads.dtd (@AB_CD@/chrome/mozapps/downloads/pref-downloads.dtd)
+ locale/@AB_CD@/messenger-mapi/mapi.properties (@AB_CD@/chrome/messenger-mapi/mapi.properties)
+* locale/@AB_CD@/messenger-mapi/contents.rdf (generic/chrome/messenger-mapi/contents.rdf)
+* locale/@AB_CD@/messenger-newsblog/contents.rdf (generic/chrome/messenger-newsblog/contents.rdf)
+ locale/@AB_CD@/messenger-newsblog/newsblog.dtd (@AB_CD@/chrome/messenger-newsblog/newsblog.dtd)
+ locale/@AB_CD@/messenger-newsblog/newsblog.properties (@AB_CD@/chrome/messenger-newsblog/newsblog.properties)
+ locale/@AB_CD@/messenger-newsblog/feed-subscriptions.dtd (@AB_CD@/chrome/messenger-newsblog/feed-subscriptions.dtd)
+ locale/@AB_CD@/messenger-newsblog/feed-properties.dtd (@AB_CD@/chrome/messenger-newsblog/feed-properties.dtd)
+ locale/@AB_CD@/messenger-newsblog/am-newsblog.properties (@AB_CD@/chrome/messenger-newsblog/am-newsblog.properties)
+ locale/@AB_CD@/messenger-newsblog/am-newsblog.dtd (@AB_CD@/chrome/messenger-newsblog/am-newsblog.dtd)
+ locale/@AB_CD@/messenger-smime/msgCompSMIMEOverlay.dtd (@AB_CD@/chrome/messenger-smime/msgCompSMIMEOverlay.dtd)
+ locale/@AB_CD@/messenger-smime/msgCompSMIMEOverlay.properties (@AB_CD@/chrome/messenger-smime/msgCompSMIMEOverlay.properties)
+ locale/@AB_CD@/messenger-smime/msgReadSMIMEOverlay.dtd (@AB_CD@/chrome/messenger-smime/msgReadSMIMEOverlay.dtd)
+ locale/@AB_CD@/messenger-smime/msgReadSMIMEOverlay.properties (@AB_CD@/chrome/messenger-smime/msgReadSMIMEOverlay.properties)
+ locale/@AB_CD@/messenger-smime/msgCompSecurityInfo.dtd (@AB_CD@/chrome/messenger-smime/msgCompSecurityInfo.dtd)
+ locale/@AB_CD@/messenger-smime/msgCompSecurityInfo.properties (@AB_CD@/chrome/messenger-smime/msgCompSecurityInfo.properties)
+ locale/@AB_CD@/messenger-smime/msgReadSecurityInfo.dtd (@AB_CD@/chrome/messenger-smime/msgReadSecurityInfo.dtd)
+ locale/@AB_CD@/messenger-smime/certFetchingStatus.dtd (@AB_CD@/chrome/messenger-smime/certFetchingStatus.dtd)
+ locale/@AB_CD@/messenger-smime/msgSecurityInfo.properties (@AB_CD@/chrome/messenger-smime/msgSecurityInfo.properties)
+* locale/@AB_CD@/messenger-smime/contents.rdf (generic/chrome/messenger-smime/contents.rdf)
+* locale/@AB_CD@/messenger-offline/contents.rdf (generic/chrome/messenger-offline/contents.rdf)
+ locale/@AB_CD@/messenger-offline/offline.properties (@AB_CD@/chrome/messenger-offline/offline.properties)
+ locale/@AB_CD@/messenger-offline/offline.dtd (@AB_CD@/chrome/messenger-offline/offline.dtd)
+ locale/@AB_CD@/messenger-offline/pref-offline.dtd (@AB_CD@/chrome/messenger-offline/pref-offline.dtd)
+* locale/@AB_CD@/messenger-region/contents.rdf (generic/chrome/messenger-region/contents.rdf)
+ locale/@AB_CD@/messenger-region/region.properties (@AB_CD@/chrome/messenger-region/region.properties)
+* locale/@AB_CD@/mozldap/contents.rdf (generic/chrome/mozldap/contents.rdf)
+ locale/@AB_CD@/mozldap/ldap.properties (@AB_CD@/chrome/mozldap/ldap.properties)
++ locale/@AB_CD@/mozapps/downloads/pref-downloads.dtd (@AB_CD@/chrome/mozapps/downloads/pref-downloads.dtd)
* locale/@AB_CD@/editor/contents.rdf (generic/chrome/editor/contents.rdf)
locale/@AB_CD@/editor/editorSmileyOverlay.dtd (@AB_CD@/chrome/editor/editorSmileyOverlay.dtd)
locale/@AB_CD@/editor/editorOverlay.dtd (@AB_CD@/chrome/editor/editorOverlay.dtd)
diff --git a/mailnews/jar.mn b/mailnews/jar.mn
index 3ba78278f5c9..2669a41b0976 100644
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -289,12 +289,10 @@ en-US.jar:
locale/en-US/messenger/vcard.properties (mime/cthandlers/resources/vcard.properties)
locale/en-US/messenger/smime.properties (mime/cthandlers/resources/smime.properties)
locale/en-US/messenger/markByDate.dtd (base/resources/locale/en-US/markByDate.dtd)
-#endif
locale/en-US/messenger-mapi/pref-mailnewsOverlay.dtd (mapi/resources/locale/en-US/pref-mailnewsOverlay.dtd)
locale/en-US/messenger-mapi/mapi.properties (mapi/resources/locale/en-US/mapi.properties)
* locale/en-US/messenger-mapi/contents.rdf (mapi/resources/locale/en-US/contents.rdf)
-#ifndef MOZ_XUL_APP
US.jar:
* locale/US/messenger-region/contents.rdf (base/resources/locale/en-US/contents-region.rdf)
locale/US/messenger-region/region.properties (base/resources/locale/en-US/region.properties)