Merge pull request #4504 from deltachat/adb/issue-4501

cancel search mode when back is pressed

CHANGELOG.md

@@ -6,6 +6,7 @@
 * Add notifications for missed calls
 * Video call preview now accurately shows what is sent to remote
 * Fix: properly hide draft attachment during in-chat search
+* Fix: cancel in-chat search when back is pressed, instead of directly returning to chatlist
 
 ## v2.53.0
 2026-06

src/main/java/org/thoughtcrime/securesms/ConversationActivity.java

@@ -262,6 +262,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
               public void handleOnBackPressed() {
                 if (container.isInputOpen()) {
                   container.hideCurrentInput(composeText);
+                } else if (searchMenu != null) {
+                  searchCollapse();
                 } else {
                   handleReturnToConversationList();
                 }