Revert r9682, it was a bad idea. The solution is not to send the

thread id, but to even remove the lock symbol when OTR was ended
and we don't have a thread id.

src/chat_control.py

@@ -2406,9 +2406,8 @@ class ChatControl(ChatControlBase):
 	def _on_end_otr_menuitem_activate(self, widget):
 		fjid = self.contact.get_full_jid()
 		gajim.otr_module.otrl_message_disconnect(
-			self.session.conn.otr_userstates,
-			(gajim.otr_ui_ops, {'account': self.account,
-			'urgent': True, 'session': self.session}),
+			self.session.conn.otr_userstates, (gajim.otr_ui_ops,
+			{'account': self.account, 'urgent': True}),
 			gajim.get_jid_from_account(self.account).encode(),
 			gajim.OTR_PROTO, fjid.encode())
 		gajim.otr_ui_ops.gajim_log(_('Private conversation with ' \

src/gajim.py

@@ -375,9 +375,6 @@ class OtrlMessageAppOps:
 			# disconnect from OTR sessions before quitting
 			stanza = XmppMessage(to = recipient,
 				body = message, typ='chat')
-			if 'session' in opdata:
-				stanza.setThread(opdata['session'].thread_id)
-
 			gajim.connections[opdata['account']].connection. \
 				send(stanza, now = True)
 			return