From 9e168aaff77fc5d5ad0cb32a6a9b96b4f6319152 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 2 Mar 2021 19:26:14 +0100
Subject: [PATCH] Collapse on undo encryption

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 6 ++++--
 1 file changed, 4 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 b46cca8e7f..eab5a6711e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3035,9 +3035,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                                     !EntityMessage.PGP_SIGNENCRYPT.equals(message.encrypt)) ||
                                     (EntityMessage.SMIME_SIGNENCRYPT.equals(message.ui_encrypt) &&
                                             !EntityMessage.SMIME_SIGNENCRYPT.equals(message.encrypt));
-                    if (lock)
+                    if (lock) {
                         properties.lock(message.id);
-                    else
+                        properties.setExpanded(message, false, false);
+                        properties.setHeight(message.id, null);
+                    } else
                         onActionDecrypt(message, false);
                 } else if (id == R.id.ibVerify) {
                     onActionDecrypt(message, false);