From fb4bf8a1bab6d97a67842bf20be4b615db19a859 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 31 Dec 2019 18:36:01 +0100
Subject: [PATCH] Fixed seen/unseen expand/collapse

---
 .../main/java/eu/faircode/email/AdapterMessage.java  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 7ed26e1cf5..c957fb7091 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3296,10 +3296,18 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                 @Override
                 protected void onExecuted(Bundle args, Void ignored) {
+                    long id = args.getLong("id");
+                    TupleMessageEx amessage = getMessage();
+                    if (amessage == null || !amessage.id.equals(id))
+                        return;
+
                     boolean seen = args.getBoolean("seen");
-                    if (!seen)
+                    if (!seen) {
                         properties.setValue("expanded", message.id, false);
-                    notifyDataSetChanged();
+                        ibExpander.setTag(false);
+                        ibExpander.setImageLevel(1 /* more */);
+                        clearExpanded(amessage);
+                    }
                 }
 
                 @Override