Merge "Revert empty folder check because it doesn't work for search" into ub-mail-master
diff --git a/src/com/android/mail/ui/FolderListFragment.java b/src/com/android/mail/ui/FolderListFragment.java
index 26f43db..ac052be 100644
--- a/src/com/android/mail/ui/FolderListFragment.java
+++ b/src/com/android/mail/ui/FolderListFragment.java
@@ -870,8 +870,7 @@
private void rebuildFolderList() {
final boolean oldInboxPresent = mInboxPresent;
mItemList = recalculateListFolders();
- if (mAccountController != null && ((mInboxPresent && !oldInboxPresent) ||
- FolderUri.EMPTY.equals(mSelectedFolderUri))) {
+ if (mAccountController != null && mInboxPresent && !oldInboxPresent) {
// We didn't have an inbox folder before, but now we do. This can occur when
// setting up a new account. We automatically create the "starred" virtual
// virtual folder, but we won't create the inbox until it gets synced.