From 84d5e7216d92a2486ab46083af08bda35fdc6d61 Mon Sep 17 00:00:00 2001
From: cketti <cketti@googlemail.com>
Date: Sun, 6 Jun 2010 14:47:24 +0000
Subject: [PATCH] Fix a crash when using the back button in a search results
 list with "Manage Back button" preference enabled.

Fixes issue 1716
---
 src/com/fsck/k9/activity/MessageList.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/com/fsck/k9/activity/MessageList.java b/src/com/fsck/k9/activity/MessageList.java
index 02316b163..5ea44ebd2 100644
--- a/src/com/fsck/k9/activity/MessageList.java
+++ b/src/com/fsck/k9/activity/MessageList.java
@@ -582,7 +582,14 @@ public class MessageList
         // platform.
         if (K9.manageBack())
         {
-            onShowFolderList();
+            if (mQueryString == null)
+            {
+                onShowFolderList();
+            }
+            else
+            {
+                onAccounts();
+            }
         }
         else
         {