diff --git a/mozilla/browser/components/preferences/advanced.js b/mozilla/browser/components/preferences/advanced.js
index 4daea5c845f..9b9fbd258aa 100644
--- a/mozilla/browser/components/preferences/advanced.js
+++ b/mozilla/browser/components/preferences/advanced.js
@@ -224,12 +224,6 @@ var gAdvancedPane = {
     prompter.checkForUpdates();
   },
   
-  showAutoInstallOptions: function () 
-  {
-    document.documentElement.openSubDialog("chrome://mozapps/content/preferences/update.xul",
-                                           "", null);  
-  },
-  
   showUpdates: function ()
   {
     var prompter = Components.classes["@mozilla.org/updates/update-prompt;1"]
diff --git a/mozilla/browser/components/preferences/advanced.xul b/mozilla/browser/components/preferences/advanced.xul
index 90f4f57305e..bd7b443251f 100644
--- a/mozilla/browser/components/preferences/advanced.xul
+++ b/mozilla/browser/components/preferences/advanced.xul
@@ -73,6 +73,9 @@
                   onchange="gAdvancedPane.updateModeItems();"/>
       <preference id="extensions.update.enabled"       name="extensions.update.enabled"       type="bool"
                   onchange="gAdvancedPane.updateAddonUpdateUI();"/>
+      <preference id="app.update.disable_button.showUpdateHistory"
+                  name="app.update.disable_button.showUpdateHistory"
+                  type="bool"/>
 
       <preference id="security.enable_ssl2"            name="security.enable_ssl2"            type="bool"/>
       <preference id="security.enable_ssl3"            name="security.enable_ssl3"            type="bool"/>
@@ -174,6 +177,13 @@
                         onsynctopreference="return gAdvancedPane.addonWarnSyncTo();"/>
             </hbox>
           </radiogroup>
+          <separator/>
+          <hbox>
+            <button id="showUpdateHistory" 
+                    label="&showUpdates.label;" accesskey="&showUpdates.accesskey;"
+                    preference="app.update.disable_button.showUpdateHistory"
+                    oncommand="gAdvancedPane.showUpdates();"/>
+          </hbox>
         </tabpanel>
         <tabpanel orient="vertical">
           <groupbox>
diff --git a/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd b/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
index 544c3c9a0e3..ac37525d0ba 100644
--- a/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
+++ b/mozilla/browser/locales/en-US/chrome/browser/preferences/advanced.dtd
@@ -55,8 +55,8 @@
 <!ENTITY viewSecurityDevices.label      "Security Devices">
 <!ENTITY viewSecurityDevices.accesskey  "y">
 
-<!ENTITY languages.caption                  "Languages">
-<!ENTITY languagesInfo.label                "Choose Languages web pages are displayed in.">
-<!ENTITY showLanguages.label                "Edit Languages...">
-<!ENTITY showLanguages.accesskey            "L">
+<!ENTITY languages.caption              "Languages">
+<!ENTITY languagesInfo.label            "Choose Languages web pages are displayed in.">
+<!ENTITY showLanguages.label            "Edit Languages...">
+<!ENTITY showLanguages.accesskey        "L">
 
diff --git a/mozilla/toolkit/mozapps/update/content/history.js b/mozilla/toolkit/mozapps/update/content/history.js
index 838b46ee3ad..ab63bb59a8a 100644
--- a/mozilla/toolkit/mozapps/update/content/history.js
+++ b/mozilla/toolkit/mozapps/update/content/history.js
@@ -75,6 +75,7 @@ var gUpdateHistory = {
     var closebuttonlabel = document.documentElement.getAttribute("closebuttonlabel");
     var cancelbutton = document.documentElement.getButton("cancel");
     cancelbutton.label = closebuttonlabel;
+    cancelbutton.setAttribute("default", "true");
     cancelbutton.focus();
   },
   
diff --git a/mozilla/toolkit/mozapps/update/src/nsUpdateService.js.in b/mozilla/toolkit/mozapps/update/src/nsUpdateService.js.in
index 755893640f6..b9367c67772 100644
--- a/mozilla/toolkit/mozapps/update/src/nsUpdateService.js.in
+++ b/mozilla/toolkit/mozapps/update/src/nsUpdateService.js.in
@@ -2325,7 +2325,7 @@ UpdatePrompt.prototype = {
    * See nsIUpdateService.idl
    */
   showUpdateHistory: function(parent) {
-    this._showUI(parent, URI_UPDATE_HISTORY_DIALOG, "modal", "Update:History", 
+    this._showUI(parent, URI_UPDATE_HISTORY_DIALOG, "modal,dialog=yes", "Update:History", 
                  null, null);
   },