From f377f6ba89176b72b14c623aea23ab446b66bb1c Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 25 Apr 2021 11:43:26 +0200
Subject: [PATCH] Delete S/MIME signature data on lock

---
 app/src/main/java/eu/faircode/email/FragmentMessages.java | 7 ++++---
 1 file changed, 4 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 76a690df10..82d2c1324b 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -5592,12 +5592,13 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
 
             boolean inline = true;
             List<EntityAttachment> attachments = db.attachment().getAttachments(message.id);
-            for (EntityAttachment attachment : attachments) {
+            for (EntityAttachment attachment : attachments)
                 if (attachment.encryption != null) {
                     inline = false;
-                    break;
+                    if (EntityMessage.SMIME_SIGNENCRYPT.equals(message.ui_encrypt) &&
+                            !EntityAttachment.SMIME_MESSAGE.equals(attachment.encryption))
+                        db.attachment().deleteAttachment(attachment.id);
                 }
-            }
 
             if (inline) {
                 if (message.uid == null)