---- comm-release/mail/app/profile/all-thunderbird.js.old 2011-11-21 11:20:08.000000000 +0100
-+++ comm-release/mail/app/profile/all-thunderbird.js 2011-12-14 12:40:24.074179826 +0100
+--- comm/mail/app/profile/all-thunderbird.js.old 2011-11-21 11:20:08.000000000 +0100
++++ comm/mail/app/profile/all-thunderbird.js 2011-12-14 12:40:24.074179826 +0100
@@ -138,7 +138,7 @@ pref("extensions.update.autoUpdateDefaul
// Disable add-ons installed into the shared user and shared system areas by
// default. This does not include the application directory. See the SCOPE
// constants in AddonManager.jsm for values to use here
-pref("extensions.autoDisableScopes", 15);
-+pref("extensions.autoDisableScopes", 0);
++pref("extensions.autoDisableScopes", 3);
// Preferences for AMO integration
pref("extensions.getAddons.cache.enabled", true);
---- comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm.addons 2011-11-21 11:28:32.000000000 +0100
-+++ comm-release/mozilla/toolkit/mozapps/extensions/internal/XPIProvider.jsm 2011-12-14 12:43:42.461184351 +0100
-@@ -1591,8 +1591,8 @@ var XPIProvider = {
- this.showUpgradeUI();
- flushCaches = true;
- }
-- else if (aAppChanged === undefined) {
-- // For new profiles we will never need to show the add-on selection UI
-+ else {
-+ // For all profiles we will never need to show the add-on selection UI
- Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true);
- }
-
---- comm-release/suite/browser/browser-prefs.js~ 2013-11-06 19:54:38.789734061 +0100
-+++ comm-release/suite/browser/browser-prefs.js 2013-11-06 20:55:33.765611935 +0100
+--- comm/suite/browser/browser-prefs.js~ 2013-11-06 19:54:38.789734061 +0100
++++ comm/suite/browser/browser-prefs.js 2013-11-06 20:55:33.765611935 +0100
@@ -616,7 +616,7 @@
// Disable add-ons installed into the shared user and shared system areas by
// default. This does not include the application directory. See the SCOPE
- // constants in AddonManager.jsm for values to use here.
+ // constants in AddonManager.jsm for values to use here
-pref("extensions.autoDisableScopes", 15);
-+pref("extensions.autoDisableScopes", 0);
++pref("extensions.autoDisableScopes", 3);
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true); // also toggles personalized recommendations
---- comm-release/mozilla/browser/app/profile/firefox.js~ 2013-10-29 02:20:40.000000000 +0100
-+++ comm-release/mozilla/browser/app/profile/firefox.js 2013-11-06 20:56:58.633092070 +0100
+ // Enable add-ons installed and owned by the application, like the default theme.
+ pref("extensions.startupScanScopes", 4);
+--- browser/app/profile/firefox.js~ 2013-10-29 02:20:40.000000000 +0100
++++ browser/app/profile/firefox.js 2013-11-06 20:56:58.633092070 +0100
@@ -62,7 +62,7 @@
// Disable add-ons that are not installed by the user in all scopes by default.
// See the SCOPE constants in AddonManager.jsm for values to use here.
-pref("extensions.autoDisableScopes", 15);
-+pref("extensions.autoDisableScopes", 0);
-
- // Dictionary download preference
- pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
++pref("extensions.autoDisableScopes", 3);
+ // Scopes to scan for changes at startup.
+ pref("extensions.startupScanScopes", 0);
+