diff --git a/mozilla/xpfe/components/history/resources/history.js b/mozilla/xpfe/components/history/resources/history.js
index 677495aa6c7..b832a1da48b 100644
--- a/mozilla/xpfe/components/history/resources/history.js
+++ b/mozilla/xpfe/components/history/resources/history.js
@@ -417,10 +417,14 @@ function updateItems()
         bookmarkItem.setAttribute("hidden", "true");
         copyLocationItem.setAttribute("hidden", "true");
         sep1.setAttribute("hidden", "true");
-        if (isContainerOpen(gHistoryTree, currentIndex))
+        if (isContainerOpen(gHistoryTree, currentIndex)) {
           collapseExpandItem.setAttribute("label", gHistoryBundle.getString("collapseLabel"));
-        else
+          collapseExpandItem.setAttribute("accesskey", gHistoryBundle.getString("collapseAccesskey"));
+        }
+        else {
           collapseExpandItem.setAttribute("label", gHistoryBundle.getString("expandLabel"));
+          collapseExpandItem.setAttribute("accesskey", gHistoryBundle.getString("expandAccesskey"));          
+        }
         return true;
     }
     collapseExpandItem.setAttribute("hidden", "true");
diff --git a/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul b/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul
index f30c48a04c9..5870103a4b5 100644
--- a/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul
+++ b/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul
@@ -54,7 +54,7 @@
     <command id="cmd_delete"/>
     <command id="cmd_selectAll"/>
     <popup id="historyMenu" onpopupshowing="return updateItems();">
-      <menuitem id="miCollapseExpand" accesskey="&collapseExpand.accesskey;" oncommand="collapseExpand();"/>
+      <menuitem id="miCollapseExpand" oncommand="collapseExpand();"/>
       <menuitem id="miOpen" label="&openLinkInWindowCmd.label;" accesskey="&openLinkInWindowCmd.accesskey;" default="true"
                 oncommand="OpenURL(false);"/>
       <menuitem id="miOpenInNewWindow" label="&openLinkCmd.label;" accesskey="&openLinkCmd.accesskey;"
diff --git a/mozilla/xpfe/components/history/resources/locale/en-US/history.properties b/mozilla/xpfe/components/history/resources/locale/en-US/history.properties
index 3d12b0447c6..13c7104a1b7 100644
--- a/mozilla/xpfe/components/history/resources/locale/en-US/history.properties
+++ b/mozilla/xpfe/components/history/resources/locale/en-US/history.properties
@@ -15,4 +15,5 @@ search_results_title=Search Results
 
 collapseLabel=Collapse
 expandLabel=Expand
-collapseExpandAccesskey=e
\ No newline at end of file
+collapseAccesskey=C
+expandAccesskey=x
diff --git a/mozilla/xpfe/components/history/resources/locale/en-US/historyTreeOverlay.dtd b/mozilla/xpfe/components/history/resources/locale/en-US/historyTreeOverlay.dtd
index 8fc56fe070f..534951d011c 100644
--- a/mozilla/xpfe/components/history/resources/locale/en-US/historyTreeOverlay.dtd
+++ b/mozilla/xpfe/components/history/resources/locale/en-US/historyTreeOverlay.dtd
@@ -12,4 +12,3 @@
 <!ENTITY tree.header.hostname.akey           "H">
 <!ENTITY tree.header.visitcount.label        "Visit Count">
 <!ENTITY tree.header.visitcount.akey         "V">
-<!ENTITY collapseExpand.accesskey            "e">