diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py
index 0cf337db2..debdeda24 100644
--- a/src/common/stanza_session.py
+++ b/src/common/stanza_session.py
@@ -249,6 +249,9 @@ class EncryptedStanzaSession(StanzaSession):
 		c.NT.mac = base64.b64encode(self.hmac(self.km_s, m_content + \
 			crypto.encode_mpi(old_en_counter)))
 
+		stanza.setBody(_('[This message is part of an encrypted session. '
+		'If you see this message, something went wrong.]'))
+
 		return stanza
 
 	def is_xep_200_encrypted(self, msg):
@@ -950,4 +953,4 @@ otherwise, list the fields we haven't implemented'''
 
 		self.km_o = ''
 
-# vim: se ts=3:
\ No newline at end of file
+# vim: se ts=3: