diff --git a/app/src/main/java/eu/faircode/email/ServiceSend.java b/app/src/main/java/eu/faircode/email/ServiceSend.java
index 88c6c4069a..bfcdaf4fc1 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSend.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSend.java
@@ -318,6 +318,9 @@ public class ServiceSend extends ServiceBase {
         if (ident == null)
             throw new IllegalArgumentException("Identity not found");
 
+        if (!message.content)
+            throw new IllegalArgumentException("Message body missing");
+
         // Create message
         Properties props = MessageHelper.getSessionProperties();
         Session isession = Session.getInstance(props, null);