From b0a43e69b67758fb6ac6ec2e4da144626374afa8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20H=C3=B6rist?= <philipp@hoerist.com>
Date: Thu, 25 Jan 2018 00:51:15 +0100
Subject: [PATCH] [omemo] Parse bare jid from MUC MAM Messages

---
 omemo/omemo_connection.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/omemo/omemo_connection.py b/omemo/omemo_connection.py
index e3995f1..25cc228 100644
--- a/omemo/omemo_connection.py
+++ b/omemo/omemo_connection.py
@@ -6,6 +6,7 @@ import sqlite3
 
 import nbxmpp
 from nbxmpp.simplexml import Node
+from nbxmpp import JID
 
 from gajim.common import app
 from gajim.common import ged
@@ -187,7 +188,7 @@ class OMEMOConnection:
         log.info('%s => Groupchat Message received', self.account)
 
         msg_dict = unpack_encrypted(omemo)
-        msg_dict['sender_jid'] = msg.real_jid
+        msg_dict['sender_jid'] = JID(msg.real_jid).getStripped()
 
         plaintext = self.omemo.decrypt_msg(msg_dict)