diff --git a/mozilla/browser/components/history/content/history-panel.xul b/mozilla/browser/components/history/content/history-panel.xul
index 55a014065bb..2feec7aeb35 100644
--- a/mozilla/browser/components/history/content/history-panel.xul
+++ b/mozilla/browser/components/history/content/history-panel.xul
@@ -40,14 +40,16 @@
   <script type="application/x-javascript" src="chrome://browser/content/contentAreaUtils.js"/>
   <script type="application/x-javascript" src="chrome://browser/content/utilityOverlay.js"/>
 
-  <stringbundle id="historyBundle" src="chrome://browser/locale/history/history.properties"/>
+  <stringbundle id="historyBundle" src="chrome://global/locale/history/history.properties"/>
 
   <commandset id="editMenuCommands"/>
   <keyset id="editMenuKeys"/>
   
   <popup id="historyContextMenu" onpopupshowing="buildContextMenu();">
-    <menuitem id="miCollapseExpand" accesskey="&collapseExpand.accesskey;" default="true"
-              oncommand="collapseExpand();"/>
+    <menuitem id="miExpand" label="&expand.label;" accesskey="&expand.accesskey;"
+              default="true" oncommand="collapseExpand();"/>
+    <menuitem id="miCollapse" label="&collapse.label;" accesskey="&collapse.accesskey;"
+              default="true" oncommand="collapseExpand();"/>
     <menuitem id="miOpen" label="&openLinkInWindow.label;" accesskey="&openLinkInWindow.accesskey;" default="true"
               oncommand="OpenURL(0);"/>
     <menuitem id="miOpenInNewWindow" label="&openInNewWindow.label;" accesskey="&openInNewWindow.accesskey;"
diff --git a/mozilla/browser/components/history/content/history.js b/mozilla/browser/components/history/content/history.js
index 75d6055896a..7a699d25f4a 100644
--- a/mozilla/browser/components/history/content/history.js
+++ b/mozilla/browser/components/history/content/history.js
@@ -222,7 +222,8 @@ function buildContextMenu()
   var copyLocationItem = document.getElementById("miCopyLink");
   var sep1 = document.getElementById("pre-bookmarks-separator");
   var sep2 = document.getElementById("post-bookmarks-separator");
-  var collapseExpandItem = document.getElementById("miCollapseExpand");
+  var expandItem = document.getElementById("miExpand");
+  var collapseItem = document.getElementById("miCollapse");
   if (count > 1) {
     openItem.hidden = true;
     openItemInNewWindow.hidden = true;
@@ -231,13 +232,13 @@ function buildContextMenu()
     copyLocationItem.hidden = true;
     sep1.hidden = true;
     sep2.hidden = true;
-    collapseExpandItem.hidden = true;    
+    expandItem.hidden = true;    
+    collapseItem.hidden = true;    
   }
   else {
     var currentIndex = gHistoryTree.currentIndex;
     if ((gHistoryGrouping == "day" || gHistoryGrouping == "dayandsite")
         && isContainer(gHistoryTree, currentIndex)) {
-      var bundle = document.getElementById("historyBundle");    
       openItem.hidden = true;
       openItemInNewWindow.hidden = true;
       openItemInNewTab.hidden = true;
@@ -245,11 +246,13 @@ function buildContextMenu()
       copyLocationItem.hidden = true;
       sep1.hidden = true;
       sep2.hidden = false;
-      collapseExpandItem.hidden = false;
-      if (isContainerOpen(gHistoryTree, currentIndex))
-        collapseExpandItem.setAttribute("label", bundle.getString("collapseLabel"));
-      else
-        collapseExpandItem.setAttribute("label", bundle.getString("expandLabel"));
+      if (isContainerOpen(gHistoryTree, currentIndex)) {
+        expandItem.hidden = true;
+        collapseItem.hidden = false;
+      } else {
+        expandItem.hidden = false;
+        collapseItem.hidden = true;
+      }
     }
     else {
       openItem.hidden = false;
@@ -259,7 +262,8 @@ function buildContextMenu()
       copyLocationItem.hidden = false;
       sep1.hidden = false;
       sep2.hidden = false;
-      collapseExpandItem.hidden = true;
+      expandItem.hidden = true;
+      collapseItem.hidden = true;
     }
   }
 }
diff --git a/mozilla/browser/components/history/locale/history.dtd b/mozilla/browser/components/history/locale/history.dtd
index 941f7af8a30..80bbad6e6be 100644
--- a/mozilla/browser/components/history/locale/history.dtd
+++ b/mozilla/browser/components/history/locale/history.dtd
@@ -1,6 +1,9 @@
 <!ENTITY find.label                "Search:">
 <!ENTITY find.accesskey            "S">
-<!ENTITY collapseExpand.accesskey            "e">
+<!ENTITY expand.label              "Expand">
+<!ENTITY expand.accesskey          "E">
+<!ENTITY collapse.label            "Collapse">
+<!ENTITY collapse.accesskey        "C">
 <!ENTITY byDate.label "By Date">
 <!ENTITY byDate.accesskey "D">
 <!ENTITY bySite.label "By Site">
diff --git a/mozilla/browser/components/history/locale/history.properties b/mozilla/browser/components/history/locale/history.properties
index 3d12b0447c6..ecb246f3243 100644
--- a/mozilla/browser/components/history/locale/history.properties
+++ b/mozilla/browser/components/history/locale/history.properties
@@ -12,7 +12,3 @@ finduri-Hostname-is-=(no host)
 
 search_button_label=Find
 search_results_title=Search Results
-
-collapseLabel=Collapse
-expandLabel=Expand
-collapseExpandAccesskey=e
\ No newline at end of file