From 34f001d22ce2c09f8c983bc7795d866067aacac8 Mon Sep 17 00:00:00 2001
From: Jorge Martin Espinosa <jorgem@element.io>
Date: Wed, 6 May 2026 14:35:08 +0200
Subject: [PATCH] Fix back button sometimes not working after exiting a thread
 (#6732)

When I reproduced the issue, it looked like the coroutine used to mark as read and then exit the room was canceled, leaving the `markingAsReadAndExiting` variable with `true` value and preventing the exit block from running again.
---
 .../element/android/features/messages/impl/MessagesPresenter.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
index b98bd764de..5271906fff 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesPresenter.kt
@@ -272,6 +272,8 @@ class MessagesPresenter(
                             }
                         }
                         navigator.close()
+                    }.invokeOnCompletion {
+                        markingAsReadAndExiting.set(false)
                     }
                 }
             }