diff --git a/src/com/fsck/k9/activity/FolderList.java b/src/com/fsck/k9/activity/FolderList.java
index d314fc24e..4798b88c0 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/src/com/fsck/k9/activity/FolderList.java
@@ -364,6 +364,12 @@ public class FolderList extends K9ListActivity
         {
             onAccounts();
         }
+        else
+        {
+            // TODO - when we move to android 2.0, uncomment this instead.
+            // super.onBackPressed()
+            finish();
+        }
     }
 
     @Override public boolean onKeyDown(int keyCode, KeyEvent event)