From f77042470b96ad56c69fab5077e232a35078eb04 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 7 Jun 2020 20:03:21 +0200 Subject: [PATCH] Skip changing encryption method when no encryption is used --- app/src/main/java/eu/faircode/email/FragmentCompose.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 5b40868be8..4f3ffd4895 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -5170,7 +5170,8 @@ public class FragmentCompose extends FragmentBase { db.message().setMessageUiEncrypt(message.id, encrypt); - if (message.identity != null) { + if (encrypt != EntityMessage.ENCRYPT_NONE && + message.identity != null) { int iencrypt = (encrypt == EntityMessage.SMIME_SIGNONLY || encrypt == EntityMessage.SMIME_SIGNENCRYPT