--- mozilla/browser/base/content/browser.js.old	2006-02-08 16:17:53.000000000 +0100
+++ mozilla/browser/base/content/browser.js	2006-02-08 16:22:57.000000000 +0100
@@ -3141,10 +3141,37 @@
       } else {
         // use moz-collapsed so it doesn't persist hidden/collapsed,
         // so that new windows don't have missing toolbars
-        if (aShow)
-          els[i].removeAttribute("moz-collapsed");
-        else
-          els[i].setAttribute("moz-collapsed", "true");
+        if (aShow) {
+           els[i].removeAttribute("moz-collapsed");
+ 
+           if(els[i].getAttribute("id") == "toolbar-menubar") {
+             var menus = els[i].getElementsByTagNameNS(XULNS, "menu");
+             
+             var j;
+             for(j = 0; j < menus.length; j++) {
+              if(menus[j].hasAttribute("saved-accesskey")) {
+                 var savedAccesskey = menus[j].getAttribute("saved-accesskey");
+                 menus[j].setAttribute("accesskey", savedAccesskey);
+                 menus[j].removeAttribute("saved-accesskey");
+               }
+             }
+           }
+         } else {
+           els[i].setAttribute("moz-collapsed", "true");
+           
+           if(els[i].getAttribute("id") == "toolbar-menubar") {
+             var menus = els[i].getElementsByTagNameNS(XULNS, "menu");
+             
+             var j;
+             for(j = 0; j < menus.length; j++) {
+               if(menus[j].hasAttribute("accesskey")) {
+                 var savedAccesskey = menus[j].getAttribute("accesskey");
+                 menus[j].setAttribute("saved-accesskey", savedAccesskey);
+                 menus[j].removeAttribute("accesskey");
+               }
+             }
+           }
+         }
       }
     }
 #ifndef XP_MACOSX