diff --git a/gajim/chat_control_base.py b/gajim/chat_control_base.py
index 95fdd13da..8fc76313b 100644
--- a/gajim/chat_control_base.py
+++ b/gajim/chat_control_base.py
@@ -313,8 +313,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
         self.was_at_the_end = True
         self.correcting = False
         self.last_sent_msg = None
-        self.last_received_txt = {} # one per name
-        self.last_received_id = {} # one per name
 
         # add MessageTextView to UI and connect signals
         self.msg_textview = MessageTextView()
@@ -970,10 +968,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
 
         if not count_as_new:
             return
-        if kind in ('incoming', 'incoming_queue', 'outgoing'):
-            self.last_received_txt[name] = text
-            if correct_id:
-                self.last_received_id[name] = correct_id[0]
         if kind == 'incoming':
             if not self.type_id == message_control.TYPE_GC or \
             app.config.get('notify_on_all_muc_messages') or \
diff --git a/gajim/groupchat_control.py b/gajim/groupchat_control.py
index a613d71cc..928a07cf3 100644
--- a/gajim/groupchat_control.py
+++ b/gajim/groupchat_control.py
@@ -1743,13 +1743,6 @@ class GroupchatControl(ChatControlBase):
                         tv.last_received_message_id[obj.new_nick] = \
                             tv.last_received_message_id[obj.nick]
                         del tv.last_received_message_id[obj.nick]
-                    if obj.nick in self.last_received_txt:
-                        self.last_received_txt[obj.new_nick] = \
-                            self.last_received_txt[obj.nick]
-                        del self.last_received_txt[obj.nick]
-                        self.last_received_id[obj.new_nick] = \
-                            self.last_received_id[obj.nick]
-                        del self.last_received_id[obj.nick]
                     # We add new nick to muc roster here, so we don't see
                     # that "new_nick has joined the room" when he just changed
                     # nick.