From f11d0e47ecab204410017e1ff79f02213973d889 Mon Sep 17 00:00:00 2001
From: morckx <morckx@gmail.com>
Date: Sat, 24 Nov 2018 23:50:05 +0100
Subject: [PATCH] Fix account selection and folder list not beeing updated

---
 app/ui/src/main/java/com/fsck/k9/ui/K9Drawer.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/ui/src/main/java/com/fsck/k9/ui/K9Drawer.java b/app/ui/src/main/java/com/fsck/k9/ui/K9Drawer.java
index 3cf7d25b4..9dbe2107a 100644
--- a/app/ui/src/main/java/com/fsck/k9/ui/K9Drawer.java
+++ b/app/ui/src/main/java/com/fsck/k9/ui/K9Drawer.java
@@ -134,8 +134,8 @@ public class K9Drawer {
                             return false;
                         } else {
                             Account account = (Account) ((ProfileDrawerItem) profile).getTag();
-                            updateUserAccountsAndFolders(account);
                             Accounts.openRealAccount(account, parent);
+                            updateUserAccountsAndFolders(account);
                             return false;
                         }
                     }
@@ -194,6 +194,7 @@ public class K9Drawer {
         if (account == null) {
             selectUnifiedInbox();
         } else {
+            unifiedInboxSelected = false;
             accountHeader.setActiveProfile((account.getAccountNumber()+1) << DRAWER_ACCOUNT_SHIFT);
             ViewModelProvider viewModelProvider = ViewModelProviders.of(parent, new MessageListViewModelFactory());
             MessageListViewModel viewModel = viewModelProvider.get(MessageListViewModel.class);
@@ -250,8 +251,6 @@ public class K9Drawer {
 
         if (openedFolderDrawerId != -1) {
             drawer.setSelection(openedFolderDrawerId, false);
-        } else if (unifiedInboxSelected) {
-            selectUnifiedInbox();
         }
     }