diff --git a/src/com/fsck/k9/activity/FolderMessageList.java b/src/com/fsck/k9/activity/FolderMessageList.java
index e511932efc..5642bedce3 100644
--- a/src/com/fsck/k9/activity/FolderMessageList.java
+++ b/src/com/fsck/k9/activity/FolderMessageList.java
@@ -455,19 +455,22 @@ public class FolderMessageList extends ExpandableListActivity {
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         int group = mListView.getPackedPositionGroup(mListView.getSelectedId());
         int item =(mListView.getSelectedItemPosition() -1 );
-        if (item >= 0) { // Guard against hitting delete on group names
+                // Guard against hitting delete on group names
+                //
+        try {
+        MessageInfoHolder message = (MessageInfoHolder) mAdapter.getChild(group, item);
         switch (keyCode) {
-            case KeyEvent.KEYCODE_DEL: {
-                if (true) {
-                    MessageInfoHolder message = (MessageInfoHolder) mAdapter.getChild(group, item);
-
-                    onDelete(message);
-                }
-                return true;
+            case KeyEvent.KEYCODE_DEL: { onDelete(message); return true;}
+            case KeyEvent.KEYCODE_C: { onCompose(); return true;}
+            case KeyEvent.KEYCODE_Q: { onAccounts(); return true; }
+            case KeyEvent.KEYCODE_F: { onForward(message); return true;}
+            case KeyEvent.KEYCODE_A: { onReplyAll(message); return true; } 
+            case KeyEvent.KEYCODE_R: { onReply(message); return true; }
             }
-        } 
         }
+        finally {
         return super.onKeyDown(keyCode, event);
+        }
     }