diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 7504dde16e..2a4e8e1629 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -671,7 +671,8 @@ public class ServiceSend extends ServiceBase implements SharedPreferences.OnShar
                 this, ident.getProtocol(), ident.realm, ident.encryption, ident.insecure, ident.unicode, debug);
         try {
             iservice.setUseIp(ident.use_ip, ident.ehlo);
-            iservice.set8BitMime(ident.octetmime);
+            if (!message.isSigned() && !message.isEncrypted())
+                iservice.set8BitMime(ident.octetmime);
 
             // 0=Read receipt
             // 1=Delivery receipt