diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js
index c3903674e8..db38d055af 100644
--- a/apps/comments/js/commentstabview.js
+++ b/apps/comments/js/commentstabview.js
@@ -386,7 +386,11 @@
 
 		_postRenderItem: function($el, editionMode) {
 			$el.find('.has-tooltip').tooltip();
-			$el.find('.avatar').each(function () {
+			var inlineAvatars = $el.find('.message .avatar');
+			if ($($el.context).hasClass('message')) {
+				inlineAvatars = $el.find('.avatar');
+			}
+			inlineAvatars.each(function () {
 				var $this = $(this);
 				$this.avatar($this.attr('data-username'), 16);
 			});