diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js
index ace0862ad2..3a20604326 100644
--- a/apps/comments/js/commentstabview.js
+++ b/apps/comments/js/commentstabview.js
@@ -239,8 +239,12 @@
 					username, 0, $el.find('.authorRow'));
 			}
 
-			var message = $el.find('.message');
-			message.find('.avatar').each(function() {
+			var $message = $el.find('.message');
+			this._postRenderMessage($message);
+		},
+
+		_postRenderMessage: function($el) {
+			$el.find('.avatar').each(function() {
 				var avatar = $(this);
 				var strong = $(this).next();
 				var appendTo = $(this).parent();
@@ -419,10 +423,13 @@
 						$textArea.val('').prop('disabled', false);
 					}
 
-					$target.find('.message')
+					var $message = $target.find('.message');
+					$message
 						.html(self._formatMessage(model.get('message'), model.get('mentions')))
 						.find('.avatar')
 						.each(function () { $(this).avatar(); });
+
+					self._postRenderMessage($message);
 				},
 				error: function () {
 					self._onSubmitError($form, commentId);
diff --git a/apps/comments/tests/js/commentstabviewSpec.js b/apps/comments/tests/js/commentstabviewSpec.js
index b991e0d680..63a27956f9 100644
--- a/apps/comments/tests/js/commentstabviewSpec.js
+++ b/apps/comments/tests/js/commentstabviewSpec.js
@@ -154,9 +154,11 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 			expect($comment.length).toEqual(1);
 			expect($comment.find('.avatar[data-user=macbeth]').length).toEqual(1);
 			expect($comment.find('strong:first').text()).toEqual('Thane of Cawdor');
+			expect($comment.find('.avatar[data-user=macbeth] ~ .contactsmenu-popover').length).toEqual(1);
 
 			expect($comment.find('.avatar[data-user=banquo]').length).toEqual(1);
 			expect($comment.find('.avatar-name-wrapper:last-child strong').text()).toEqual('Lord Banquo');
+			expect($comment.find('.avatar[data-user=banquo] ~ .contactsmenu-popover').length).toEqual(1);
 		});
 
 	});
@@ -292,6 +294,7 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 			expect($message.find('.avatar').length).toEqual(1);
 			expect($message.find('.avatar[data-user=anotheruser]').length).toEqual(1);
 			expect($message.find('.avatar[data-user=anotheruser] ~ strong').text()).toEqual('Another User');
+			expect($message.find('.avatar[data-user=anotheruser] ~ .contactsmenu-popover').length).toEqual(1);
 		});
 		it('does not create a comment if the field is empty', function() {
 			view.$el.find('.message').val('   ');
@@ -502,6 +505,7 @@ describe('OCA.Comments.CommentsTabView tests', function() {
 			expect($message.find('.avatar').length).toEqual(1);
 			expect($message.find('.avatar[data-user=anotheruser]').length).toEqual(1);
 			expect($message.find('.avatar[data-user=anotheruser] ~ strong').text()).toEqual('Another User');
+			expect($message.find('.avatar[data-user=anotheruser] ~ .contactsmenu-popover').length).toEqual(1);
 
 			// form row is gone
 			$formRow = view.$el.find('.newCommentRow.comment[data-id=3]');