you can uncheck the other tabbed inboxes under "Configure Inbox" and everything will remain in the primary email. Seems to work for now...