1 files changed, 5 insertions, 1 deletions

diff --git a/webapp/components/post_view/components/post_list.jsx b/webapp/components/post_view/components/post_list.jsx
index 1142197c6..400f516cc 100644
--- a/webapp/components/post_view/components/post_list.jsx
+++ b/webapp/components/post_view/components/post_list.jsx
@@ -264,6 +264,7 @@ export default class PostList extends React.Component {
 
             let commentCount = 0;
             let isCommentMention = false;
+            let shouldHighlightThreads = false;
             let commentRootId;
             if (parentPost) {
                 commentRootId = post.root_id;
@@ -274,6 +275,9 @@ export default class PostList extends React.Component {
             for (const postId in posts) {
                 if (posts[postId].root_id === commentRootId) {
                     commentCount += 1;
+                    if (posts[postId].user_id === userId) {
+                        shouldHighlightThreads = true;
+                    }
                 }
             }
 
@@ -281,7 +285,7 @@ export default class PostList extends React.Component {
                 const commentsNotifyLevel = this.props.currentUser.notify_props.comments || 'never';
                 const notCurrentUser = post.user_id !== userId || (post.props && post.props.from_webhook);
                 if (notCurrentUser) {
-                    if (commentsNotifyLevel === 'any') {
+                    if (commentsNotifyLevel === 'any' && (posts[commentRootId].user_id === userId || shouldHighlightThreads)) {
                         isCommentMention = true;
                     } else if (commentsNotifyLevel === 'root' && posts[commentRootId].user_id === userId) {
                         isCommentMention = true;