diff --git a/content/events.js b/content/events.js
index a48cf4bf..c15b317a 100644
--- a/content/events.js
+++ b/content/events.js
@@ -786,11 +786,6 @@ vimperator.Events = function () //{{{
                     vimperator.beep();
                     return;
                 }
-                else
-                {
-                    evt.preventDefault();
-                    evt.stopPropagation();
-                }
             }
         },
 
diff --git a/content/mail.js b/content/mail.js
index 8d58ce0b..7aee4030 100644
--- a/content/mail.js
+++ b/content/mail.js
@@ -151,13 +151,13 @@ vimperator.Mail = function ()
         ["c"], "Change folders",
         function () { vimperator.commandline.open(":", "goto ", vimperator.modes.EX); });
 
-    vimperator.mappings.add(modes, ["]f"],
-        "Select next flagged message",
+    vimperator.mappings.add(modes, ["]s"],
+        "Select next starred message",
         function (count) { vimperator.mail.selectMessage(function(msg) { return msg.isFlagged; }, true, false, count); },
         { flags: vimperator.Mappings.flags.COUNT });
 
-    vimperator.mappings.add(modes, ["[f"],
-        "Select previous flagged message",
+    vimperator.mappings.add(modes, ["[s"],
+        "Select previous starred message",
         function (count) { vimperator.mail.selectMessage(function(msg) { return msg.isFlagged; }, true, true, count); },
         { flags: vimperator.Mappings.flags.COUNT });