diff --git a/content/editor.js b/content/editor.js
index 12e9e7ad..4db491bf 100644
--- a/content/editor.js
+++ b/content/editor.js
@@ -268,6 +268,11 @@ vimperator.Editor = function () //{{{
         ["<C-i>"], "Edit text field with an external editor",
         function () { vimperator.editor.editWithExternalEditor(); });
 
+    // FIXME: <esc> does not work correctly
+    vimperator.mappings.add([vimperator.modes.INSERT],
+        ["<C-t>"], "Edit text field in vi mode",
+        function () { vimperator.mode = vimperator.modes.TEXTAREA; });
+
     vimperator.mappings.add([vimperator.modes.INSERT],
         ["<Space>", "<Return>"], "Expand insert mode abbreviation",
         function () { return vimperator.editor.expandAbbreviation("i"); },
diff --git a/content/mail.js b/content/mail.js
index e539d27e..8d58ce0b 100644
--- a/content/mail.js
+++ b/content/mail.js
@@ -378,7 +378,7 @@ vimperator.Mail = function ()
             {
                 selectMessageReverse = reverse;
 
-                var folders = this.getFolders();
+                var folders = this.getFolders("", true, true);
                 var ci = GetFolderTree().currentIndex;
                 for (var i = 1; i <= folders.length; i++)
                 {