diff --git a/mozilla/mail/app/profile/all-thunderbird.js b/mozilla/mail/app/profile/all-thunderbird.js
index 44181f1a700..b38982db16e 100644
--- a/mozilla/mail/app/profile/all-thunderbird.js
+++ b/mozilla/mail/app/profile/all-thunderbird.js
@@ -205,12 +205,6 @@ pref("mailnews.headers.minNumHeaders", 0); // 0 means we ignore this pref
pref("mail.compose.dontWarnMail2Newsgroup", false);
-pref("messenger.throbber.url","chrome://messenger-region/locale/region.properties");
-pref("mailnews.release_notes.url","chrome://messenger-region/locale/region.properties");
-pref("mailnews.hints_and_tips.url","chrome://messenger-region/locale/region.properties");
-pref("compose.throbber.url","chrome://messenger-region/locale/region.properties");
-pref("addressbook.throbber.url","chrome://messenger-region/locale/region.properties");
-
pref("network.image.imageBehavior", 2);
pref("network.cookie.cookieBehavior", 3); // 0-Accept, 1-dontAcceptForeign, 2-dontUse, 3-p3p
diff --git a/mozilla/mail/base/content/mailCore.js b/mozilla/mail/base/content/mailCore.js
index 2efa9f9b1cc..8af0bbf955d 100644
--- a/mozilla/mail/base/content/mailCore.js
+++ b/mozilla/mail/base/content/mailCore.js
@@ -265,3 +265,31 @@ function openAboutDialog()
window.openDialog("chrome://messenger/content/aboutDialog.xul", "About", "modal,centerscreen,chrome,resizable=no");
#endif
}
+
+/**
+ * Opens region specific web pages for the application like the release notes, the help site, etc.
+ * aResourceName --> the string resource ID in region.properties to load.
+ */
+function openRegionURL(aResourceName)
+{
+ var appInfo = Components.classes["@mozilla.org/xre/app-info;1"]
+ .getService(Components.interfaces.nsIXULAppInfo);
+ try {
+ var strBundleService = Components.classes["@mozilla.org/intl/stringbundle;1"].getService(Components.interfaces.nsIStringBundleService);
+ var regionBundle = strBundleService.createBundle("chrome://messenger-region/locale/region.properties");
+ // the release notes are special and need to be formatted with the app version
+ var urlToOpen;
+ if (aResourceName == "releaseNotesURL")
+ urlToOpen = regionBundle.formatStringFromName(aResourceName, [appInfo.version], 1);
+ else
+ urlToOpen = regionBundle.GetStringFromName(aResourceName);
+
+ var uri = Components.classes["@mozilla.org/network/io-service;1"]
+ .getService(Components.interfaces.nsIIOService)
+ .newURI(urlToOpen, null, null);
+
+ var protocolSvc = Components.classes["@mozilla.org/uriloader/external-protocol-service;1"]
+ .getService(Components.interfaces.nsIExternalProtocolService);
+ protocolSvc.loadUrl(uri);
+ } catch (ex) {}
+}
diff --git a/mozilla/mail/base/content/mailWindowOverlay.js b/mozilla/mail/base/content/mailWindowOverlay.js
index 03df1f6adef..563d8ac8e99 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.js
+++ b/mozilla/mail/base/content/mailWindowOverlay.js
@@ -2511,16 +2511,6 @@ function OpenOrFocusWindow(args, windowType, chromeURL)
window.openDialog(chromeURL, "", "chrome,resizable,status,centerscreen,dialog=no", args);
}
-
-function loadThrobberUrl(urlPref)
-{
- var url;
- try {
- url = gPrefBranch.getComplexValue(urlPref, Components.interfaces.nsIPrefLocalizedString).data;
- messenger.launchExternalURL(url);
- } catch (ex) {}
-}
-
/**
* Opens the update manager and checks for updates to the application.
*/
diff --git a/mozilla/mail/base/content/mailWindowOverlay.xul b/mozilla/mail/base/content/mailWindowOverlay.xul
index c7af5959939..42e3f326b1a 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.xul
+++ b/mozilla/mail/base/content/mailWindowOverlay.xul
@@ -415,7 +415,7 @@
#ifdef XP_MACOSX
-
+
#endif
@@ -1712,11 +1712,11 @@