diff --git a/src/com/android/email/activity/FolderList.java b/src/com/android/email/activity/FolderList.java
index de91a7bff..b0fd28a6a 100644
--- a/src/com/android/email/activity/FolderList.java
+++ b/src/com/android/email/activity/FolderList.java
@@ -364,6 +364,9 @@ public class FolderList extends K9ListActivity {
         if (initialFolder != null) {
             intent.putExtra(EXTRA_INITIAL_FOLDER, initialFolder);
         }
+        else {
+            intent.putExtra(EXTRA_STARTUP, true);
+        }
         return intent;
     }