diff --git a/src/common/config.py b/src/common/config.py
index 5dd1e3f95..f7c4bf988 100644
--- a/src/common/config.py
+++ b/src/common/config.py
@@ -176,6 +176,7 @@ class Config:
 		'use_urgency_hint': [opt_bool, True, _('If True and installed GTK+ and PyGTK versions are at least 2.8, make the window flash (the default behaviour in most Window Managers) when holding pending events.')],
 		'notification_timeout': [opt_int, 5],
 		'send_sha_in_gc_presence': [opt_bool, True, _('Jabberd1.4 does not like sha info when one join a password protected room. Turn this option to False to stop sending sha info in groupchat presences')],
+		'show_avatar_in_chat': [opt_boot, True, _('If False, you will no longer see the avatar in the chat window')],
 	}
 
 	__options_per_key = {
diff --git a/src/tabbed_chat_window.py b/src/tabbed_chat_window.py
index 1e41d7266..da3b455e9 100644
--- a/src/tabbed_chat_window.py
+++ b/src/tabbed_chat_window.py
@@ -301,6 +301,8 @@ class TabbedChatWindow(chat.Chat):
 
 	def show_avatar(self, jid, resource):
 		# Get the XML instance
+		if not gajim.config.get('show_avatar_in_chat'):
+			return
 		jid_with_resource = jid
 		if resource:
 			jid_with_resource += '/' + resource