diff --git a/src/message_control.py b/src/message_control.py
index 8419e3f5e8b52ba6e3aa3e2b0a1a9fa77fb43c88..7c70a07871fd9847666a61a17c8a8eee1377325b 100644
--- a/src/message_control.py
+++ b/src/message_control.py
@@ -147,7 +147,8 @@ class MessageControl:
 		jid = self.contact.jid
 		original_message = message
 
-		if gajim.otr_module and self.session.append_otr_tag:
+		if gajim.otr_module and (self.session.append_otr_tag or \
+			message == '?OTR?'):
 			if type == 'chat' and isinstance(message, unicode):
 				d = {'kwargs': {'keyID': keyID, 'type': type,
 					'chatstate': chatstate,