diff --git a/app/src/main/java/eu/faircode/email/MessageHelper.java b/app/src/main/java/eu/faircode/email/MessageHelper.java
index 3850403da8..1dc39720cd 100644
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@@ -556,8 +556,10 @@ public class MessageHelper {
 
         if (EntityMessage.PGP_SIGNENCRYPT.equals(message.ui_encrypt) ||
                 EntityMessage.SMIME_SIGNENCRYPT.equals(message.ui_encrypt)) {
-            Log.e("Storing unencrypted message");
-            throw new IllegalArgumentException("Storing unencrypted message");
+            String msg = "Storing unencrypted message" +
+                    " encrypt=" + message.encrypt + "/" + message.ui_encrypt;
+            Log.e(msg);
+            throw new IllegalArgumentException(msg);
         }
 
         build(context, message, attachments, identity, send, imessage);