From 3b82b659994d7787ab4ffe73af2b927c0e74c735 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 17 Dec 2018 09:14:36 +0100
Subject: [PATCH] Collapse multiple messages on back

---
 .../java/eu/faircode/email/FragmentMessages.java    | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 944fa5afdd..1d20b48086 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -1698,8 +1698,8 @@ public class FragmentMessages extends FragmentEx {
                         }
 
                         // Auto expand when:
-                        // - single, non archived/trashed/outgoing message
-                        // - one unread, non archived/trashed/outgoing message in conversation
+                        // - single, non archived/trashed/sent message
+                        // - one unread, non archived/trashed/sent message in conversation
                         // - sole message
 
                         TupleMessageEx expand = null;
@@ -1729,7 +1729,7 @@ public class FragmentMessages extends FragmentEx {
                             Log.i(Helper.TAG, "Auto close=" + count);
 
                             // Auto close when:
-                            // - no more non archived/trashed/outgoing messages
+                            // - no more non archived/trashed/sent messages
 
                             if (count == 0) {
                                 finish();
@@ -1932,6 +1932,13 @@ public class FragmentMessages extends FragmentEx {
                 selectionTracker.clearSelection();
                 return true;
             }
+
+            if (expanded.size() > 1) {
+                expanded.clear();
+                adapter.notifyDataSetChanged();
+                return true;
+            }
+
             return false;
         }
     };