diff --git a/NEWS b/NEWS
index b728b370..ec7bd951 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 <pre>
 2008-06-xx:
     * version 1.2
+    * IMPORTANT: removed old :buffers! buffer window, as it was ugly and slightly broken
+      use "B" or :buffers instead
     * :bdelete accepts an optional argument now
     * renamed some :autocmd, mainly BrowserStartup -> Startup and BrowserExit -> Quit
     * don't pass any ctrl- or alt- prefixed keys to firefox in insert mode
diff --git a/content/buffer.js b/content/buffer.js
index 28b972aa..82e63df0 100644
--- a/content/buffer.js
+++ b/content/buffer.js
@@ -180,8 +180,22 @@ liberator.Buffer = function () //{{{
         "Show current website with a minimal style sheet to make it easily accessible",
         "boolean", false,
         {
-            setter: function (value) { getMarkupDocumentViewer().authorStyleDisabled = value; },
-            getter: function () { return getMarkupDocumentViewer().authorStyleDisabled; },
+            setter: function (value)
+            {
+                try
+                {
+                    getMarkupDocumentViewer().authorStyleDisabled = value;
+                }
+                catch (e) { }
+            },
+            getter: function ()
+            {
+                try
+                {
+                    return getMarkupDocumentViewer().authorStyleDisabled;
+                }
+                catch (e) { }
+            }
         });
 
     /////////////////////////////////////////////////////////////////////////////}}}
diff --git a/content/events.js b/content/events.js
index 54015bed..13af7075 100644
--- a/content/events.js
+++ b/content/events.js
@@ -1338,7 +1338,9 @@ liberator.Events = function () //{{{
                             liberator.commandline.onEvent(event); // reroute event in command line mode
                     }
                     else if (liberator.mode != liberator.modes.INSERT && liberator.mode != liberator.modes.TEXTAREA)
+                    {
                         liberator.beep();
+                    }
                 }
             }
 
diff --git a/content/muttator.js b/content/muttator.js
index f123429f..7242aaa6 100644
--- a/content/muttator.js
+++ b/content/muttator.js
@@ -94,11 +94,11 @@ liberator.config = {
 
     init: function ()
     {
-        liberator.mappings.add([liberator.modes.NORMAL],
+        /*liberator.mappings.add([liberator.modes.NORMAL],
             ["o"], "Open a message",
-            function () { liberator.commandline.open(":", "open ", liberator.modes.EX); });
+            function () { liberator.commandline.open(":", "open ", liberator.modes.EX); });*/
 
-        // TODO: move elsewhere
+        // TODO: move elsewhere, probably compose.js
         liberator.mappings.add([liberator.modes.COMPOSE],
             ["e"], "Edit message",
             function () { liberator.editor.editWithExternalEditor(); });
@@ -111,6 +111,19 @@ liberator.config = {
             ["Y"], "Send message later",
             function () { goDoCommand("cmd_sendLater"); });
 
+        // FIXME: does not really work reliably
+        liberator.mappings.add([liberator.modes.COMPOSE],
+            ["t"], "Select To: field",
+            function () { awSetFocus(0, awGetInputElement(1)); });
+
+        liberator.mappings.add([liberator.modes.COMPOSE],
+            ["s"], "Select Subject: field",
+            function () { GetMsgSubjectElement().focus(); });
+
+        liberator.mappings.add([liberator.modes.COMPOSE],
+            ["i"], "Select message body",
+            function () { SetMsgBodyFrameFocus(); });
+
         // don't wait too long when selecting new messages
         // GetThreadTree()._selectDelay = 300; // TODO: make configurable
         this.isComposeWindow = window.wintype == "msgcompose";