--- a/frontends/src/primitivus/chat.py	Sat Jul 02 20:55:31 2016 +0200
+++ b/frontends/src/primitivus/chat.py	Sun Jul 10 12:26:13 2016 +0200
@@ -65,20 +65,7 @@
     @property
     def message(self):
         """Return currently displayed message"""
-        message = self.mess_data.message
-        if self.parent.lang in message:
-            self.selected_lang = self.parent.lang
-            return message[self.parent.lang]
-        try:
-            self.selected_lang = ''
-            return message['']
-        except KeyError:
-            try:
-                lang, mess = message.iteritems().next()
-                self.selected_lang = lang
-                return mess
-            except StopIteration:
-                log.error(u"Can't find message for uid {}".format(self.mess_data.uid))
+        return self.mess_data.main_message
 
     @message.setter
     def message(self, value):
@@ -139,8 +126,8 @@
 
         msg = self.message  # needed to generate self.selected_lang
 
-        if self.selected_lang:
-            markup.append(("msg_lang", u"[{}] ".format(self.selected_lang)))
+        if d.selected_lang:
+            markup.append(("msg_lang", u"[{}] ".format(d.selected_lang)))
 
         # message body
         markup.append(msg)