diff --git a/content/mail.js b/content/mail.js
index 1e37cd21..f04fe2d4 100644
--- a/content/mail.js
+++ b/content/mail.js
@@ -382,7 +382,9 @@ liberator.Mail = function ()
 
                     if (count == 0)
                     {
-                        gDBView.selectMsgByKey(key);
+                        // gDBView.selectMsgByKey(key);
+                        gDBView.selection.timedSelect(i, GetThreadTree()._selectDelay || 500);
+                        GetThreadTree().treeBoxObject.ensureRowIsVisible(i);
                         return;
                     }
                 }
diff --git a/content/muttator.js b/content/muttator.js
index c8f8126a..2ca2b317 100644
--- a/content/muttator.js
+++ b/content/muttator.js
@@ -87,6 +87,9 @@ liberator.config = {
         liberator.mappings.add([liberator.modes.NORMAL],
             ["o"], "Open a message",
             function () { liberator.commandline.open(":", "open ", liberator.modes.EX); });
+
+        // don't wait too long when selecting new messages
+        GetThreadTree()._selectDelay = 250; // TODO: make configurable
     }
 }