diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 782ec6ac8a..56f153c445 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -788,6 +788,11 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
 
             // Show in sent folder
             if (sid != null) {
+                if (EntityMessage.PGP_SIGNENCRYPT.equals(message.ui_encrypt) ||
+                        EntityMessage.SMIME_SIGNENCRYPT.equals(message.ui_encrypt))
+                    db.attachment().deleteAttachments(sid,
+                            new int[]{EntityAttachment.PGP_MESSAGE, EntityAttachment.SMIME_MESSAGE});
+
                 db.message().setMessageReceived(sid, start);
                 db.message().setMessageSent(sid, end);
                 db.message().setMessageUiHide(sid, false);