From 736d330e38bb9887d2e63997709f3fdf4e3e7220 Mon Sep 17 00:00:00 2001
From: Bao-Long Nguyen-Trong <baolongnt@gmail.com>
Date: Thu, 10 Sep 2009 17:31:11 +0000
Subject: [PATCH] Fixed issue 560: This was happening only when the user has
 only one account

---
 src/com/android/email/activity/FolderList.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/com/android/email/activity/FolderList.java b/src/com/android/email/activity/FolderList.java
index 514314527..1880c67cf 100644
--- a/src/com/android/email/activity/FolderList.java
+++ b/src/com/android/email/activity/FolderList.java
@@ -391,9 +391,6 @@ public class FolderList extends K9ListActivity {
             if (mInitialFolder == null
                 && mStartup) {
                 mInitialFolder = mAccount.getAutoExpandFolderName();
-                if (Email.FOLDER_NONE.equals(mInitialFolder)) {
-                    mInitialFolder = null;
-                }
             }
         }
         else {
@@ -401,7 +398,8 @@ public class FolderList extends K9ListActivity {
         }
 
         Log.v(Email.LOG_TAG, "mInitialFolder: " + mInitialFolder);
-        if (mInitialFolder != null) {
+        if (mInitialFolder != null
+            && !Email.FOLDER_NONE.equals(mInitialFolder)) {
             onOpenFolder(mInitialFolder, true);
             finish();
         }