diff --git a/plugins/gtkgui/gtkgui.py b/plugins/gtkgui/gtkgui.py
index 53a2acd78..72e2adb59 100644
--- a/plugins/gtkgui/gtkgui.py
+++ b/plugins/gtkgui/gtkgui.py
@@ -403,6 +403,9 @@ class tabbed_chat_Window:
 
 		if self.plugin.queues[self.account].has_key(user.jid):
 			self.read_queue(self.plugin.queues[self.account][user.jid])
+		if user.show != 'online':
+			self.print_conversation(_("%s is now %s (%s)") % (user.name, \
+				user.show, user.status), user.jid, 'status')
 
 	def on_msg_key_press_event(self, widget, event):
 		"""When a key is pressed :
@@ -432,7 +435,7 @@ class tabbed_chat_Window:
 		if event.keyval == gtk.keysyms.Escape:
 			jid = self.get_active_jid()
 			if len(self.xmls) == 1:
-				button.get_toplevel().destroy()
+				widget.get_toplevel().destroy()
 			else:
 				nb.remove_page(nb.get_current_page())
 				del self.plugin.windows[self.account]['chats'][jid]