diff --git a/content/mail.js b/content/mail.js
index 5e888363..f140bfbb 100644
--- a/content/mail.js
+++ b/content/mail.js
@@ -97,9 +97,23 @@ vimperator.Mail = function ()
 //    vimperator.options.add(["editor"],
 //        "Set the external text editor",
 //        "string", "gvim -f");
-//    vimperator.options.add(["insertmode", "im"],
-//        "Use Insert mode as the default for text areas",
-//        "boolean", true);
+
+    vimperator.options.add(["layout"],
+        "Set the layout of the mail window",
+        "string", "inherit",
+        {
+            validator: function (value) { return /^(classic|wide|vertical|inherit)$/.test(value); },
+            setter:    function (value)
+            {
+                switch (value)
+                {
+                    case "classic":  ChangeMailLayout(0); break;
+                    case "wide":     ChangeMailLayout(1); break;
+                    case "vertical": ChangeMailLayout(2); break;
+                    // case "inherit" just does nothing
+                }
+            }
+        });
 
     /////////////////////////////////////////////////////////////////////////////}}}
     ////////////////////// MAPPINGS ////////////////////////////////////////////////
diff --git a/content/muttator.xul b/content/muttator.xul
index b280be23..b8d5831f 100644
--- a/content/muttator.xul
+++ b/content/muttator.xul
@@ -132,46 +132,6 @@ the terms of any one of the MPL, the GPL or the LGPL.
                 oninput="vimperator.commandline.onMultilineInputEvent(event);"
                 onblur="vimperator.commandline.onMultilineInputEvent(event);"/>
         </vbox>
-
-
-    <menupopup id="viewSidebarMenu">
-        <menuitem observes="vimperator-viewAddonsSidebar" label="Add-ons" accesskey="A"/>
-        <menuitem observes="vimperator-viewConsoleSidebar" label="Console" accesskey="C"/>
-        <menuitem observes="vimperator-viewDownloadsSidebar" label="Downloads" accesskey="D"/>
-        <menuitem observes="vimperator-viewPreferencesSidebar" label="Preferences" accesskey="P"/>
-    </menupopup>
-
-    <broadcasterset id="mainBroadcasterSet">
-        <broadcaster id="vimperator-viewAddonsSidebar"
-            autoCheck="false"
-            type="checkbox"
-            group="sidebar"
-            sidebarurl="chrome://mozapps/content/extensions/extensions.xul"
-            sidebartitle="Add-ons"
-            oncommand="toggleSidebar('vimperator-viewAddonsSidebar');"/>
-        <broadcaster id="vimperator-viewConsoleSidebar"
-            autoCheck="false"
-            type="checkbox"
-            group="sidebar"
-            sidebarurl="chrome://global/content/console.xul"
-            sidebartitle="Console"
-            oncommand="toggleSidebar('vimperator-viewConsoleSidebar');"/>
-        <broadcaster id="vimperator-viewDownloadsSidebar"
-            autoCheck="false"
-            type="checkbox"
-            group="sidebar"
-            sidebarurl="chrome://mozapps/content/downloads/downloads.xul"
-            sidebartitle="Downloads"
-            oncommand="toggleSidebar('vimperator-viewDownloadsSidebar');"/>
-        <broadcaster id="vimperator-viewPreferencesSidebar"
-            autoCheck="false"
-            type="checkbox"
-            group="sidebar"
-            sidebarurl="about:config"
-            sidebartitle="Preferences"
-            oncommand="toggleSidebar('vimperator-viewPreferencesSidebar');"/>
-    </broadcasterset>
-
     </window>
 
 </overlay>