diff --git a/src/gajim.py b/src/gajim.py
index 5d8a0d463..036e8fefe 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -1034,6 +1034,7 @@ class Interface:
 			win.set_values(vcard)
 
 		# show avatar in chat
+		ctrl = None
 		if resource and self.msg_win_mgr.has_window(fjid, account):
 			win = self.msg_win_mgr.get_window(fjid, account)
 			ctrl = win.get_control(fjid, account)
diff --git a/src/message_window.py b/src/message_window.py
index 013e51942..7abb12abb 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -445,11 +445,11 @@ class MessageWindow(object):
 		fjid = ctrl.get_full_jid()
 		jid = gajim.get_jid_without_resource(fjid)
 
-		fctrls = self.get_controls(fjid, ctrl.account)
-		bctrls = self.get_controls(jid, ctrl.account)
+		fctrl = self.get_control(fjid, ctrl.account)
+		bctrl = self.get_control(jid, ctrl.account)
 		# keep last_message_time around unless this was our last control with
 		# that jid
-		if not fctrls and not bctrls:
+		if not fctrl and not bctrl:
 			del gajim.last_message_time[ctrl.account][fjid]
 
 		# Disconnect tab DnD only if GTK version < 2.10