--- a/frontends/src/primitivus/chat.py	Tue Mar 24 07:38:40 2015 +0100
+++ b/frontends/src/primitivus/chat.py	Mon Mar 23 15:38:32 2015 +0100
@@ -37,10 +37,9 @@
 class ChatText(urwid.FlowWidget):
     """Manage the printing of chat message"""
 
-    def __init__(self, parent, timestamp, nick, my_mess, message, align='left', is_info=False):
+    def __init__(self, parent, timestamp, my_mess, message, align='left', is_info=False):
         self.parent = parent
         self.timestamp = time.localtime(timestamp)
-        self.nick = nick
         self.my_mess = my_mess
         self.message = unicode(message)
         self.align = align
@@ -73,7 +72,7 @@
             if self.parent.show_short_nick:
                 render_txt.append(('my_nick' if self.my_mess else 'other_nick', "**" if self.my_mess else "*"))
             else:
-                render_txt.append(('my_nick' if self.my_mess else 'other_nick', "[%s] " % self.nick))
+                render_txt.append(('my_nick' if self.my_mess else 'other_nick', "[%s] " % self.parent.nick))
         render_txt.append(self.message)
         txt_widget = urwid.Text(render_txt, align=self.align)
         if self.is_info:
@@ -170,7 +169,7 @@
     def _occupantsClicked(self, list_wid, clicked_wid):
         assert self.type == C.CHAT_GROUP
         nick = clicked_wid.getValue().value
-        if nick == self.getUserNick():
+        if nick == self.nick:
             # We ignore clicks on our own nick
             return
         contact_list = self.host.contact_lists[self.profile]
@@ -263,7 +262,7 @@
         except TypeError:
             # None is returned, the message is managed
             return
-        new_text = ChatText(self, timestamp, nick, mymess, msg)
+        new_text = ChatText(self, timestamp, mymess, msg)
 
         if timestamp and self.content:
             for idx in range(len(self.content) - 1, -1, -1):
@@ -303,7 +302,7 @@
             timestamp = float(extra['timestamp'])
         except KeyError:
             timestamp = None
-        _widget = ChatText(self, timestamp, None, False, msg, is_info=True)
+        _widget = ChatText(self, timestamp, False, msg, is_info=True)
         self.content.append(_widget)
         self._notify(msg=msg)
 
@@ -322,7 +321,7 @@
         if not self.host.x_notify.hasFocus():
             if self.type == C.CHAT_ONE2ONE:
                 self.host.x_notify.sendNotification(_("Primitivus: %s is talking to you") % from_jid)
-            elif self.getUserNick().lower() in msg.lower():
+            elif self.nick.lower() in msg.lower():
                 self.host.x_notify.sendNotification(_("Primitivus: %(user)s mentioned you in room '%(room)s'") % {'user': from_jid, 'room': self.target})
 
     # MENU EVENTS #