diff --git a/src/common/connection.py b/src/common/connection.py
index c2aff3488..fadd59548 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -1084,7 +1084,8 @@ class Connection(ConnectionHandlers):
 				lang = os.getenv('LANG')
 				if lang is not None and lang != 'en': # we're not english
 					# one in locale and one en
-					msgtxt = _(msgtxt) + ' (' + msgtxt + ')'
+					msgtxt = _('[This message is *encrypted* (See :XEP:`27`]') + \
+						' (' + msgtxt + ')'
 			else:
 				# Encryption failed, do not send message
 				tim = localtime()
diff --git a/src/common/stanza_session.py b/src/common/stanza_session.py
index a9993017f..8861823f4 100644
--- a/src/common/stanza_session.py
+++ b/src/common/stanza_session.py
@@ -254,7 +254,9 @@ class EncryptedStanzaSession(StanzaSession):
 			'If you see this message, something went wrong.]'
 		lang = os.getenv('LANG')
 		if lang is not None and lang != 'en': # we're not english
-			msgtxt = _(msgtxt) + ' (' + msgtxt + ')'
+			msgtxt = _('[This message is part of an encrypted session. '
+				'If you see this message, something went wrong.]') + ' (' + \
+				msgtxt + ')'
 		stanza.setBody(msgtxt)
 
 		return stanza