diff --git a/include/conversation.php b/include/conversation.php
index 1d374c5ca..9af80e168 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -741,13 +741,15 @@ function conversation_fetch_comments($thread_items, $pinned) {
 			$direction = ['direction' => 5, 'title' => DI::l10n()->t('%s commented on this.', $row['author-name'])];
 		}
 
-		if (($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && ($row['author-id'] == $row['owner-id'])
-			&& !Contact::isSharing($row['author-id'], $row['uid'])) {
-			if ($row['post-type'] == Item::PT_TAG) {
-				$row['direction'] = ['direction' => 4, 'title' => DI::l10n()->t('Tagged')];
+		if (($row['gravity'] == GRAVITY_PARENT) && !$row['origin'] && ($row['author-id'] == $row['owner-id'])) {
+			if (!Contact::isSharing($row['author-id'], $row['uid'])) {
+				if ($row['post-type'] == Item::PT_TAG) {
+					$row['direction'] = ['direction' => 4, 'title' => DI::l10n()->t('Tagged')];
+				}
+				$parentlines[] = $lineno;
+			} else {
+				$row['direction'] = ['direction' => 6, 'title' => DI::l10n()->t('You are following %s.', $row['author-name'])];
 			}
-		
-			$parentlines[] = $lineno;
 		}
 
 		if ($row['gravity'] == GRAVITY_PARENT) {
diff --git a/view/theme/frio/templates/sub/direction.tpl b/view/theme/frio/templates/sub/direction.tpl
index 671272cd0..abcd51797 100644
--- a/view/theme/frio/templates/sub/direction.tpl
+++ b/view/theme/frio/templates/sub/direction.tpl
@@ -11,6 +11,10 @@
 		<i class="fa fa-hashtag" aria-hidden="true" title="{{$direction.title}}"></i>
 	{{elseif $direction.direction == 5}}
 		<i class="fa fa-comment-o" aria-hidden="true" title="{{$direction.title}}"></i>
+	{{elseif $direction.direction == 6}}
+		<i class="fa fa-check" aria-hidden="true" title="{{$direction.title}}"></i>
+	{{elseif $direction.direction == 7}}
+		<i class="fa fa-at" aria-hidden="true" title="{{$direction.title}}"></i>
 	{{/if}}
 </span>
 {{/if}}
diff --git a/view/theme/vier/templates/sub/direction.tpl b/view/theme/vier/templates/sub/direction.tpl
index 08f40c3a3..939623c1e 100644
--- a/view/theme/vier/templates/sub/direction.tpl
+++ b/view/theme/vier/templates/sub/direction.tpl
@@ -11,6 +11,10 @@
 		<i class="icon-tag" aria-hidden="true" title="{{$direction.title}}"></i>
 	{{elseif $direction.direction == 5}}
 		<i class="icon-commenting" aria-hidden="true" title="{{$direction.title}}"></i>
+	{{elseif $direction.direction == 6}}
+		<i class="icon-ok-sign" aria-hidden="true" title="{{$direction.title}}"></i>
+	{{elseif $direction.direction == 7}}
+		<i class="icon-forward" aria-hidden="true" title="{{$direction.title}}"></i>
 	{{/if}}
 </span>
 {{/if}}