diff --git a/src/com/android/email/Controller.java b/src/com/android/email/Controller.java
index be163cb7f..d281688b9 100644
--- a/src/com/android/email/Controller.java
+++ b/src/com/android/email/Controller.java
@@ -268,7 +268,7 @@ public class Controller {
             m = new Mailbox();
             m.mAccountKey = accountId;
             m.mServerId = SEARCH_MAILBOX_SERVER_ID;
-            m.mFlagVisible = true;
+            m.mFlagVisible = false;
             m.mDisplayName = SEARCH_MAILBOX_SERVER_ID;
             m.mSyncInterval = Mailbox.CHECK_INTERVAL_NEVER;
             m.mType = Mailbox.TYPE_SEARCH;
@@ -898,14 +898,14 @@ public class Controller {
 
     private static final HashMap<Long, SearchParams> sSearchParamsMap =
         new HashMap<Long, SearchParams>();
-    
+
     public void searchMore(long accountId) throws MessagingException {
         SearchParams params = sSearchParamsMap.get(accountId);
         if (params == null) return;
         params.mOffset += params.mLimit;
         searchMessages(accountId, params);
     }
-    
+
     /**
      * Search for messages on the (IMAP) server; do not call this on the UI thread!
      * @param accountId the id of the account to be searched
diff --git a/src/com/android/email/activity/MailboxFragmentAdapter.java b/src/com/android/email/activity/MailboxFragmentAdapter.java
index 687871f7a..2762caf2b 100644
--- a/src/com/android/email/activity/MailboxFragmentAdapter.java
+++ b/src/com/android/email/activity/MailboxFragmentAdapter.java
@@ -141,8 +141,7 @@ class MailboxFragmentAdapter extends CursorAdapter {
             " AND " + Mailbox.USER_VISIBLE_MAILBOX_SELECTION;
     /** All system mailboxes for an account */
     private static final String SYSTEM_MAILBOX_SELECTION = ALL_MAILBOX_SELECTION
-            + " AND " + MailboxColumns.TYPE + "!=" + Mailbox.TYPE_MAIL
-            + " AND " + MailboxColumns.TYPE + "!=" + Mailbox.TYPE_SEARCH;
+            + " AND " + MailboxColumns.TYPE + "!=" + Mailbox.TYPE_MAIL;
     /** All mailboxes with the given parent */
     private static final String USER_MAILBOX_SELECTION_WITH_PARENT = ALL_MAILBOX_SELECTION
             + " AND " + MailboxColumns.PARENT_KEY + "=?"