diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
index fbaddd1ef9faeddf1dc18947d08737d537bb8bf8..87bf041e63b224f5e1e7fefdb808825a619c2431 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
@@ -317,7 +317,7 @@ open class MessageList :
                 search!!, false, K9.isThreadedViewEnabled && !noThreading
             )
             fragmentTransaction.add(R.id.message_list_container, messageListFragment)
-            fragmentTransaction.commitNow()
+            fragmentTransaction.commitNowAllowingStateLoss()
 
             this.messageListFragment = messageListFragment
         }