diff --git a/frontends/primitivus/chat.py b/frontends/primitivus/chat.py
index 1772bf92..904e8358 100644
--- a/frontends/primitivus/chat.py
+++ b/frontends/primitivus/chat.py
@@ -66,7 +66,8 @@ class ChatText(urwid.FlowWidget):
         if self.parent.show_short_nick:
             render_txt.append(('my_nick' if my_mess else 'other_nick',"**" if my_mess else "*"))
         else:
-            render_txt.append(('my_nick' if my_mess else 'other_nick',"[%s] " % self.from_jid))
+            nick = self.from_jid.resource if self.parent.type == "group" else (self.parent.host.CM.getAttr(self.from_jid,'nick') or self.parent.host.CM.getAttr(self.from_jid,'name') or self.from_jid.node)
+            render_txt.append(('my_nick' if my_mess else 'other_nick',"[%s] " % nick))
         render_txt.append(self.message)
         return urwid.Text(render_txt, align=self.align)