--- a/src/plugins/plugin_xep_0085.py	Fri Jul 15 22:13:09 2016 +0200
+++ b/src/plugins/plugin_xep_0085.py	Sun Jul 17 16:47:33 2016 +0200
@@ -96,7 +96,7 @@
     def __init__(self, host):
         log.info(_("Chat State Notifications plugin initialization"))
         self.host = host
-        self.map = {}
+        self.map = {}  # FIXME: would be better to use client instead of mapping profile to data
 
         # parameter value is retrieved before each use
         host.memory.updateParams(self.params)
@@ -141,7 +141,7 @@
             self.host.memory.updateEntityData(entity_jid, ENTITY_KEY, value, profile_key=profile)
         if not value or value == DELETE_VALUE:
             # reinit chat state UI for this or these contact(s)
-            self.host.bridge.chatStateReceived(unicode(entity_jid), "", profile)
+            self.host.bridge.chatStateReceived(entity_jid.full(), "", profile)
 
     def paramUpdateTrigger(self, name, value, category, type_, profile):
         """Reset all the existing chat state entity data associated with this profile after a parameter modification.