diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 3592953a36..a05cd41712 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -410,6 +410,8 @@ public class ServiceSend extends ServiceBase {
                 message.cc = helper.getCc();
                 message.bcc = helper.getBcc();
                 message.reply = helper.getReply();
+                message.encrypt = parts.getEncryption();
+                message.ui_encrypt = message.encrypt;
                 message.received = new Date().getTime();
                 message.seen = true;
                 message.ui_seen = true;