Merge pull request #9521 from rafaeltonholo/uplift/9472/fix-navigating-back-not-working

Uplift: fix(message-list): app crash when threaded view is enabled

Author: coreycb

legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt

@@ -1453,11 +1453,11 @@ open class MessageList :
         this.search = search
         singleFolderMode = false
 
+        val folderIds = search.folderIds
         if (search.searchAllAccounts()) {
             val accountUuids = search.accountUuids
             if (accountUuids.size == 1) {
                 account = accountManager.getAccount(accountUuids.elementAt(0))
-                val folderIds = search.folderIds
                 singleFolderMode = folderIds.size == 1
             } else {
                 account = null
@@ -1466,7 +1466,7 @@ open class MessageList :
             if (account == null && search.accountUuids.size == 1) {
                 account = accountManager.getAccount(search.accountUuids.elementAt(0))
             }
-            singleFolderMode = true
+            singleFolderMode = folderIds.size == 1
         }
 
         configureDrawer()