diff --git a/src/message_window.py b/src/message_window.py
index 3a81efdb2..45b4834d5 100644
--- a/src/message_window.py
+++ b/src/message_window.py
@@ -452,6 +452,9 @@ class MessageWindow(object):
 			label = None
 		elif self.get_num_controls() == 1:
 			label = name
+			state = control.contact.chatstate
+			if state and bool(len(state)):
+				label = '%s (%s)' % (label, state.capitalize())
 		else:
 			label = _('Messages')
 
@@ -579,6 +582,8 @@ class MessageWindow(object):
 			else:
 				status_img.set_from_pixbuf(tab_img.get_pixbuf())
 
+		self.show_title()
+
 	def repaint_themed_widgets(self):
 		'''Repaint controls in the window with theme color'''
 		# iterate through controls and repaint