From 7acf42fae46fbf98f0737285f9d24d6bad4d3c13 Mon Sep 17 00:00:00 2001
From: Rafael Tonholo <rafael@tonholo.dev>
Date: Fri, 18 Jul 2025 14:27:08 -0300
Subject: [PATCH] fix(message-list): app crash when threaded view is enabled

---
 .../legacy/src/main/java/com/fsck/k9/activity/MessageList.kt  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
index 88144b0ed7a..766fbc9e791 100644
--- a/legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
+++ b/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()