diff --git a/src/com/android/email/activity/MailboxFragmentAdapter.java b/src/com/android/email/activity/MailboxFragmentAdapter.java
index e4b784ed2..0ffb66d67 100644
--- a/src/com/android/email/activity/MailboxFragmentAdapter.java
+++ b/src/com/android/email/activity/MailboxFragmentAdapter.java
@@ -26,6 +26,7 @@ import com.android.emailcommon.provider.EmailContent;
 import com.android.emailcommon.provider.EmailContent.Account;
 import com.android.emailcommon.provider.EmailContent.AccountColumns;
 import com.android.emailcommon.provider.EmailContent.Mailbox;
+import com.android.emailcommon.provider.EmailContent.MailboxColumns;
 import com.android.emailcommon.provider.EmailContent.Message;
 import com.android.emailcommon.utility.Utility;
 
@@ -45,6 +46,8 @@ import android.widget.TextView;
  * Cursor adapter for a fragment mailbox list.
  */
 /*package*/ class MailboxFragmentAdapter extends MailboxesAdapter {
+    private static final String MAILBOX_SELECTION = MailboxColumns.ACCOUNT_KEY + "=?" +
+            " AND " + MailboxColumns.ID + "=?";
     public MailboxFragmentAdapter(Context context, Callback callback) {
         super(context, callback);
     }
@@ -199,7 +202,7 @@ import android.widget.TextView;
 
         @Override
         public Cursor loadInBackground() {
-            final Cursor mailboxesCursor = super.loadInBackground();
+            final Cursor childMailboxCursor = super.loadInBackground();
 
             // Add "up" item if we are not viewing the top-level list
             if (mParentKey > 0) {
@@ -211,11 +214,15 @@ import android.widget.TextView;
                 Long superParentKey = MessageListXLFragmentManager.NO_MAILBOX;
 
                 if (superParentKey != null) {
+                    final Cursor parentCursor = getContext().getContentResolver().query(
+                            Mailbox.CONTENT_URI, getProjection(), MAILBOX_SELECTION,
+                            new String[] { Long.toString(mAccountId), Long.toString(mParentKey) },
+                            null);
                     final MatrixCursor extraCursor = new MatrixCursor(getProjection());
                     String label = mContext.getResources().getString(R.string.mailbox_name_go_back);
                     addMailboxRow(extraCursor, superParentKey, label, Mailbox.TYPE_MAIL, 0, 0);
-                    return Utility.CloseTraceCursorWrapper.get(
-                            new MergeCursor(new Cursor[] {extraCursor, mailboxesCursor}));
+                    return Utility.CloseTraceCursorWrapper.get(new MergeCursor(
+                            new Cursor[] { extraCursor, parentCursor, childMailboxCursor }));
                 }
             }
 
@@ -223,18 +230,16 @@ import android.widget.TextView;
             // TODO It's currently "combined starred", but the plan is to make it per-account
             // starred.
             final int accountStarredCount = Message.getFavoriteMessageCount(mContext, mAccountId);
-            if (accountStarredCount == 0) {
-                return Utility.CloseTraceCursorWrapper.get(mailboxesCursor); // no starred message
+            if (accountStarredCount > 0) {
+                final MatrixCursor starredCursor = new MatrixCursor(getProjection());
+                final int totalStarredCount = Message.getFavoriteMessageCount(mContext);
+                addSummaryMailboxRow(starredCursor, Mailbox.QUERY_ALL_FAVORITES, Mailbox.TYPE_MAIL,
+                        totalStarredCount, true);
+                return Utility.CloseTraceCursorWrapper.get(
+                        new MergeCursor(new Cursor[] { starredCursor, childMailboxCursor }));
             }
 
-            final MatrixCursor starredCursor = new MatrixCursor(getProjection());
-
-            final int totalStarredCount = Message.getFavoriteMessageCount(mContext);
-            addSummaryMailboxRow(starredCursor, Mailbox.QUERY_ALL_FAVORITES, Mailbox.TYPE_MAIL,
-                    totalStarredCount, true);
-
-            return Utility.CloseTraceCursorWrapper.get(
-                    new MergeCursor(new Cursor[] {starredCursor, mailboxesCursor}));
+            return Utility.CloseTraceCursorWrapper.get(childMailboxCursor); // no starred message
         }
     }
 
diff --git a/src/com/android/email/activity/MailboxMoveToAdapter.java b/src/com/android/email/activity/MailboxMoveToAdapter.java
index 25b2fdecb..446937466 100644
--- a/src/com/android/email/activity/MailboxMoveToAdapter.java
+++ b/src/com/android/email/activity/MailboxMoveToAdapter.java
@@ -36,7 +36,7 @@ import android.widget.TextView;
  */
 /*package*/ class MailboxMoveToAdapter extends MailboxesAdapter {
     private static final String MAILBOX_SELECTION_MOVE_TO_FOLDER =
-        MAILBOX_SELECTION + " AND " + Mailbox.MOVE_TO_TARGET_MAILBOX_SELECTION;
+        ALL_MAILBOX_SELECTION + " AND " + Mailbox.MOVE_TO_TARGET_MAILBOX_SELECTION;
 
     public MailboxMoveToAdapter(Context context, Callback callback) {
         super(context, callback);
diff --git a/src/com/android/email/activity/MailboxesAdapter.java b/src/com/android/email/activity/MailboxesAdapter.java
index cab2f4d66..55f3dd54e 100644
--- a/src/com/android/email/activity/MailboxesAdapter.java
+++ b/src/com/android/email/activity/MailboxesAdapter.java
@@ -82,14 +82,14 @@ import android.widget.CursorAdapter;
     static final int COLUMN_ROW_TYPE = 6;
 
     /** All mailboxes for the account */
-    static final String MAILBOX_SELECTION = MailboxColumns.ACCOUNT_KEY + "=?" +
+    static final String ALL_MAILBOX_SELECTION = MailboxColumns.ACCOUNT_KEY + "=?" +
             " AND " + Mailbox.USER_VISIBLE_MAILBOX_SELECTION;
     // STOPSHIP This can be removed when legacy protocols support folders
     /** All top-level mailboxes */
-    static final String MAILBOX_SELECTION_NO_PARENT = MAILBOX_SELECTION +
+    static final String MAILBOX_SELECTION_NO_PARENT = ALL_MAILBOX_SELECTION +
             " AND " + MailboxColumns.PARENT_KEY + "<=0";
     /** All mailboxes with the given parent */
-    static final String MAILBOX_SELECTION_WITH_PARENT = MAILBOX_SELECTION +
+    static final String MAILBOX_SELECTION_WITH_PARENT = ALL_MAILBOX_SELECTION +
             " AND " + MailboxColumns.PARENT_KEY + "=?";
 
     static final String MAILBOX_ORDER_BY = "CASE " + MailboxColumns.TYPE +