diff --git a/src/common/config.py b/src/common/config.py
index c14b6921a..8f899776f 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -158,6 +158,7 @@ class Config:
 		'show_unread_tab_icon': [opt_bool, False, _('If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated.')],
 		'show_status_msgs_in_roster': [opt_bool, True, _('If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window')],
 		'show_avatars_in_roster': [opt_bool, True],
+		'print_status_in_chats': [opt_bool, True, _('If False, you will no longer see status line in chats when a contact changes his status and/or his status message.')],
 	}
 
 	__options_per_key = {
diff --git a/src/conversation_textview.py b/src/conversation_textview.py
index 299bde67f..266927e62 100644
--- a/src/conversation_textview.py
+++ b/src/conversation_textview.py
@@ -527,13 +527,15 @@ class ConversationTextview(gtk.TextView):
 			other_tags_for_name = [], other_tags_for_time = [], 
 			other_tags_for_text = [], subject = None):
 		'''prints 'chat' type messages'''
+		if kind == 'status' and not gajim.config.get('print_status_in_chats'):
+				return
 		buffer = self.get_buffer()
 		buffer.begin_user_action()
 		end_iter = buffer.get_end_iter()
 		at_the_end = False
 		if self.at_the_end():
 			at_the_end = True
-
+			
 		if buffer.get_char_count() > 0:
 			buffer.insert(end_iter, '\n')
 		if kind == 'incoming_queue':