diff --git a/src/roster_window.py b/src/roster_window.py
index 3daf7ee90..3bf805364 100644
--- a/src/roster_window.py
+++ b/src/roster_window.py
@@ -639,8 +639,7 @@ class RosterWindow:
 			
 			if contact == gajim.get_contact_instance_with_highest_priority(\
 				account, contact.jid):
-				self.plugin.windows[account]['chats'][jid].draw_name_banner(
-					contact, chatstate = None)
+				self.plugin.windows[account]['chats'][jid].draw_name_banner(contact)
 
 	def on_info(self, widget, user, account):
 		'''Call vcard_information_window class to display user's information'''
diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py
index 1afd211d0..68c505df5 100644
--- a/src/tabbed_chat_window.py
+++ b/src/tabbed_chat_window.py
@@ -184,7 +184,7 @@ class TabbedChatWindow(chat.Chat):
 		# add the fat line at the top
 		self.draw_name_banner(contact)
 
-	def draw_name_banner(self, contact, chatstate = None):
+	def draw_name_banner(self, contact):
 		'''Draw the fat line at the top of the window that 
 		houses the status icon, name, jid, and avatar'''
 		# this is the text for the big brown bar
@@ -212,6 +212,7 @@ class TabbedChatWindow(chat.Chat):
 		
 		
 		st = gajim.config.get('chat_state_notifications')
+		chatstate = contact.chatstate
 		if chatstate and st in ('composing_only', 'all'):
 			if st == 'all':
 				chatstate = helpers.get_uf_chatstate(chatstate)
@@ -444,7 +445,7 @@ class TabbedChatWindow(chat.Chat):
 	def handle_incoming_chatstate(self, account, jid, chatstate):
 		''' handle incoming chatstate that jid SENT TO us '''
 		contact = gajim.get_first_contact_instance_from_jid(account, jid)
-		self.draw_name_banner(contact, chatstate)
+		self.draw_name_banner(contact)
 		# update chatstate in tab for this chat
 		self.redraw_tab(contact.jid, chatstate)