From 28eb1da1930df2bdc236998c10789086db587719 Mon Sep 17 00:00:00 2001
From: Philippe Weidmann <philippe.weidmann@infomaniak.com>
Date: Wed, 19 Apr 2023 08:29:59 +0200
Subject: [PATCH] fix: Select primary mailbox on switch

---
 MailCore/Cache/AccountManager.swift | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/MailCore/Cache/AccountManager.swift b/MailCore/Cache/AccountManager.swift
index 267790310..6991161bb 100644
--- a/MailCore/Cache/AccountManager.swift
+++ b/MailCore/Cache/AccountManager.swift
@@ -365,7 +365,9 @@ public class AccountManager: RefreshTokenDelegate {
 
     public func switchAccount(newAccount: Account) {
         setCurrentAccount(account: newAccount)
-        setCurrentMailboxForCurrentAccount(mailbox: mailboxes.first!)
+        if let defaultMailbox = (mailboxes.first(where: { $0.isPrimary }) ?? mailboxes.first) {
+            setCurrentMailboxForCurrentAccount(mailbox: defaultMailbox)
+        }
         saveAccounts()
     }