diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py
index f41b19a52..3d7a48284 100644
--- a/src/tabbed_chat_window.py
+++ b/src/tabbed_chat_window.py
@@ -634,6 +634,7 @@ class TabbedChatWindow(chat.Chat):
 				elif contact.chatstate is not False:
 					#send active chatstate on every message (as JEP says)
 					chatstate_to_send = 'active'
+					contact.chatstate = 'active'
 			
 			gajim.connections[self.account].send_message(jid, message, keyID,
 				chatstate = chatstate_to_send)