diff --git a/plugins/omemo/src/trust_manager.vala b/plugins/omemo/src/trust_manager.vala
index ef984ef6..75c0d809 100644
--- a/plugins/omemo/src/trust_manager.vala
+++ b/plugins/omemo/src/trust_manager.vala
@@ -247,6 +247,7 @@ public class TrustManager {
             StanzaNode? _encrypted = stanza.stanza.get_subnode("encrypted", NS_URI);
             if (_encrypted == null || MessageFlag.get_flag(stanza) != null || stanza.from == null) return false;
             StanzaNode encrypted = (!)_encrypted;
+            if (message.body == null) message.body = "[This message is OMEMO encrypted]";
             if (!Plugin.ensure_context()) return false;
             MessageFlag flag = new MessageFlag();
             stanza.add_flag(flag);