Show recent labels on phone.

Fix b/6824393

Change-Id: Id1f8440881a3989b5170a673af5ec529e48b3935
diff --git a/src/com/android/mail/ui/MailActionBarView.java b/src/com/android/mail/ui/MailActionBarView.java
index 3f8957f..e0e9020 100644
--- a/src/com/android/mail/ui/MailActionBarView.java
+++ b/src/com/android/mail/ui/MailActionBarView.java
@@ -324,14 +324,12 @@
         // Always update the options menu and redraw. This will read the new mode and redraw
         // the options menu.
         mActivity.invalidateOptionsMenu();
-        // If we are running on a tablet, we need to enable recent folders only in conversation
-        // view, and disable them everywhere else.
-        if (mIsOnTablet) {
-            if (mMode == ViewMode.CONVERSATION) {
-                mSpinner.enableRecentFolders();
-            } else {
-                mSpinner.disableRecentFolders();
-            }
+        // Check if we are either on a phone, or in Conversation mode on tablet. For these, the
+        // recent folders is enabled.
+        if (!mIsOnTablet || mMode == ViewMode.CONVERSATION) {
+            mSpinner.enableRecentFolders();
+        } else {
+            mSpinner.disableRecentFolders();
         }
     }