diff --git a/css/comments.scss b/css/comments.scss
index 25eabafc6..2ff946b88 100644
--- a/css/comments.scss
+++ b/css/comments.scss
@@ -153,6 +153,12 @@
 	position: relative;
 }
 
+#commentsTabView .comment .authorRow .avatar:not(.currentUser),
+#commentsTabView .comment .authorRow .avatar:not(.currentUser) img,
+#commentsTabView .comment .authorRow .author:not(.currentUser) {
+	cursor: pointer;
+}
+
 .atwho-view-ul * .avatar-name-wrapper {
 	white-space: nowrap;
 }
diff --git a/js/views/chatview.js b/js/views/chatview.js
index a3d30ab4a..1ab51fbdf 100644
--- a/js/views/chatview.js
+++ b/js/views/chatview.js
@@ -54,8 +54,8 @@
 	var COMMENT_TEMPLATE =
 		'<li class="comment" data-id="{{id}}">' +
 		'    <div class="authorRow">' +
-		'        <div class="avatar" data-user-id="{{actorId}}" data-displayname="{{actorDisplayName}}"> </div>' +
-		'        <div class="author">{{actorDisplayName}}</div>' +
+		'        <div class="avatar{{#if isUserAuthor}} currentUser{{/if}}" data-user-id="{{actorId}}" data-displayname="{{actorDisplayName}}"> </div>' +
+		'        <div class="author{{#if isUserAuthor}} currentUser{{/if}}">{{actorDisplayName}}</div>' +
 		'        <div class="date has-tooltip{{#if relativeDate}} live-relative-timestamp{{/if}}" data-timestamp="{{timestamp}}" title="{{altDate}}">{{date}}</div>' +
 		'    </div>' +
 		'    <div class="message">{{{formattedMessage}}}</div>' +
@@ -120,6 +120,11 @@
 			if (!this._commentTemplate) {
 				this._commentTemplate = Handlebars.compile(COMMENT_TEMPLATE);
 			}
+
+			params = _.extend({
+				isUserAuthor: OC.getCurrentUser().uid === params.actorId,
+			}, params);
+
 			return this._commentTemplate(params);
 		},