diff --git a/muttator/content/config.js b/muttator/content/config.js
index d45de75e..f2360ced 100644
--- a/muttator/content/config.js
+++ b/muttator/content/config.js
@@ -33,8 +33,14 @@ const config = { //{{{
 
     /*** optional options, there are checked for existance and a fallback provided  ***/
     features: ["hints", "mail", "marks", "addressbook", "tabs"],
-    defaults: { guioptions: "f" },
-    guioptions: { m: ["mail-toolbar-menubar2"], T: ["mail-bar2"], f: ["folderPaneBox", "folderpane_splitter"], F: ["folderPaneHeader"] },
+    defaults: { guioptions: "fr" },
+
+    guioptions: {
+        m: ["MenuBar",            ["mail-toolbar-menubar2"]],
+        T: ["Toolbar" ,           ["mail-bar2"]],
+        f: ["Folder list",        ["folderPaneBox", "folderpane_splitter"]],
+        F: ["Folder list header", ["folderPaneHeader"]]
+    },
 
     get isComposeWindow() window.wintype == "msgcompose",
     get browserModes() [modes.MESSAGE],
diff --git a/vimperator/content/config.js b/vimperator/content/config.js
index 83289fc0..f13a8b80 100644
--- a/vimperator/content/config.js
+++ b/vimperator/content/config.js
@@ -36,7 +36,7 @@ const config = { //{{{
     defaults: { guioptions: "r" },
 
     guioptions: {
-        m: ["MenuBar",      ["toolbar-menubar"]],
+        m: ["Menubar",      ["toolbar-menubar"]],
         T: ["Toolbar",      ["nav-bar"]],
         b: ["Bookmark bar", ["PersonalToolbar"]]
     },