diff --git a/src/common/connection.py b/src/common/connection.py
index 55a978f3642500375871aaeafc05ee029378f6ab..2182cd86d5aad647479094ea09f885449b68a700 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -2060,7 +2060,7 @@ class Connection:
 					cached_sha = vcard['PHOTO']['SHA']
 					if self.vcard_shas.has_key(jid) and self.vcard_shas[jid] != \
 						cached_sha:
-						# we had an old cached vcard
+						# user change his vcard so don't use the cached one
 						return {}
 			vcard['jid'] = jid
 			vcard['resource'] = gajim.get_resource_from_jid(fjid)
diff --git a/src/gajim.py b/src/gajim.py
index 83d841e836fa8db2b6ddaab1764adec5d423ce6a..c72dfcb5724124230d2059ea89cbaa79d02dc9ce 100755
--- a/src/gajim.py
+++ b/src/gajim.py
@@ -673,7 +673,6 @@ class Interface:
 			jid + '/' + resource):
 			win = self.instances[account]['chats'][jid + '/' + resource]
 		if win:
-			# FIXME: this will be removed when we have the thread working
 			win.show_avatar(jid, resource)
 		# Show avatar in roster
 		self.roster.draw_avatar(jid, account)
diff --git a/src/gtkgui_helpers.py b/src/gtkgui_helpers.py
index e456f987bd823170ca92cbbf2391cb5ad0748dfb..e3cd6648ecfc5de358661eb082dd73b6c459ff33 100644
--- a/src/gtkgui_helpers.py
+++ b/src/gtkgui_helpers.py
@@ -425,7 +425,8 @@ def get_avatar_pixbuf_from_cache(jid):
 	'''checks if jid has cached avatar and if that avatar is valid image
 	(can be shown)
 	returns None if there is no image in vcard
-	returns 'ask' if vcard is old (we have new sha) or if we don't have the vcard'''
+	returns 'ask' if cached vcard should not be used (user changed his vcard,
+	so we have new sha) or if we don't have the vcard'''
 	if jid not in os.listdir(gajim.VCARDPATH):
 		return 'ask'