Index: mail/components/preferences/advanced.js
===================================================================
RCS file: /cvsroot/mozilla/mail/components/preferences/advanced.js,v
retrieving revision 1.13.2.3
diff -u -p -r1.13.2.3 advanced.js
--- mail/components/preferences/advanced.js	14 Sep 2005 21:27:50 -0000	1.13.2.3
+++ mail/components/preferences/advanced.js	25 Oct 2005 04:26:36 -0000
@@ -121,7 +121,8 @@ var gAdvancedPane = {
     var enabledPref = document.getElementById("app.update.enabled");
     var enableAppUpdate = document.getElementById("enableAppUpdate");
 
-    enableAppUpdate.disabled = !aus.canUpdate || enabledPref.locked;
+    enableAppUpdate.disabled = true;
+    enableAppUpdate.hidden = true;
   },
   
   updateAutoItems: function () 
Index: mail/base/content/mailWindowOverlay.xul
===================================================================
RCS file: /cvsroot/mozilla/mail/base/content/mailWindowOverlay.xul,v
retrieving revision 1.116.2.8
diff -u -p -r1.116.2.8 mailWindowOverlay.xul
--- mail/base/content/mailWindowOverlay.xul	24 Oct 2005 04:01:20 -0000	1.116.2.8
+++ mail/base/content/mailWindowOverlay.xul	25 Oct 2005 04:29:18 -0000
@@ -1760,10 +1760,8 @@
 #endif
           <menuseparator id="menu_HelpAboutSeparator"/>
           <menuitem id="checkForUpdates" accesskey="&updateCmd.accesskey;" class="menuitem-iconic"
-                    label="&updateCmd.label;" oncommand="checkForUpdates();"/>
-#ifndef XP_MACOSX
-          <menuseparator/>
-#endif
+                    label="&updateCmd.label;" oncommand="checkForUpdates();"
+		    hidden="true"/>
           <menuitem id="aboutName" accesskey="&aboutCmd.accesskey;"
                     label="&aboutCmd.label;"
 #ifdef XP_MACOSX
Index: mail/app/profile/all-thunderbird.js
===================================================================
RCS file: /cvsroot/mozilla/mail/app/profile/all-thunderbird.js,v
retrieving revision 1.44.2.10
diff -u -p -r1.44.2.10 all-thunderbird.js
--- mail/app/profile/all-thunderbird.js	4 Nov 2005 18:44:59 -0000	1.44.2.10
+++ mail/app/profile/all-thunderbird.js	11 Nov 2005 05:59:54 -0000
@@ -45,66 +45,6 @@ pref("browser.chromeURL", "chrome://mess
 pref("mail.biff.animate_dock_icon", false);
 #endif
 
-pref("update.app.enabled", true); // Whether or not app updates are enabled 
-pref("update.app.url", "chrome://mozapps/locale/update/update.properties");	
-pref("update.extensions.enabled", true);
-
-// App-specific update preferences
-
-// Whether or not app updates are enabled
-pref("app.update.enabled", true);               
-
-// This preference turns on app.update.mode and allows automatic download and
-// install to take place. We use a separate boolean toggle for this to make     
-// the UI easier to construct.
-pref("app.update.auto", true);
-
-// Defines how the Application Update Service notifies the user about updates:
-//
-// AUM Set to:        Minor Releases:     Major Releases:
-// 0                  download no prompt  download no prompt
-// 1                  download no prompt  download no prompt if no incompatibilities
-// 2                  download no prompt  prompt
-//
-// See chart in nsUpdateService.js.in for more details
-//
-pref("app.update.mode", 1);
-// If set to true, the Update Service will present no UI for any event.
-pref("app.update.silent", false);
-
-// Update service URL:
-pref("app.update.url", "https://aus2.mozilla.org/update/1/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/update.xml");
-pref("app.update.vendorName.override", "Mozilla");
-
-// URL user can browse to manually if for some reason all update installation
-// attempts fail.  TODO: Change this URL
-pref("app.update.url.manual", "http://www.mozilla.org/products/thunderbird/");
-// A default value for the "More information about this update" link
-// supplied in the "An update is available" page of the update wizard. 
-pref("app.update.url.details", "chrome://messenger-region/locale/region.properties");
-// User-settable override to app.update.url for testing purposes.
-//pref("app.update.url.override", "");
-
-// Interval: Time between checks for a new version (in seconds)
-//           default=1 day
-pref("app.update.interval", 86400);
-// Interval: Time before prompting the user to download a new version that 
-//           is available (in seconds) default=1 day
-pref("app.update.nagTimer.download", 86400);
-// Interval: Time before prompting the user to restart to install the latest
-//           download (in seconds) default=30 minutes
-pref("app.update.nagTimer.restart", 1800);
-// Interval: When all registered timers should be checked (in milliseconds)
-//           default=5 seconds
-pref("app.update.timer", 600000);
-
-// Whether or not we show a dialog box informing the user that the update was
-// successfully applied. This is off in Firefox by default since we show a 
-// upgrade start page instead! Other apps may wish to show this UI, and supply
-// a whatsNewURL field in their brand.properties that contains a link to a page
-// which tells users what's new in this new update.
-pref("app.update.showInstalledUI", false);
-
 // Developers can set this to |true| if they are constantly changing files in their
 // extensions directory so that the extension system does not constantly think that
 // their extensions are being updated and thus reregistered every time the app is started