diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
index d3426c7548..a9f2263a46 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/ControlMessageView.kt
@@ -29,6 +29,7 @@ class ControlMessageView : LinearLayout {
         binding.dateBreakTextView.showDateBreak(message, previous)
         binding.iconImageView.isGone = true
         binding.expirationTimerView.isGone = true
+        binding.followSetting.isGone = true
         var messageBody: CharSequence = message.getDisplayBody(context)
         binding.root.contentDescription= null
         when {
@@ -37,6 +38,8 @@ class ControlMessageView : LinearLayout {
                     isVisible = true
                     setExpirationTime(message.expireStarted, message.expiresIn)
                 }
+
+                binding.followSetting.isGone = message.isOutgoing
             }
             message.isMediaSavedNotification -> {
                 binding.iconImageView.apply {
diff --git a/app/src/main/res/layout/view_control_message.xml b/app/src/main/res/layout/view_control_message.xml
index 45c7f53f65..dd43439b04 100644
--- a/app/src/main/res/layout/view_control_message.xml
+++ b/app/src/main/res/layout/view_control_message.xml
@@ -50,4 +50,14 @@
         android:textStyle="bold"
         tools:text="@string/MessageRecord_you_disabled_disappearing_messages" />
 
+    <TextView
+        android:id="@+id/followSetting"
+        style="@style/Widget.Session.Button.Common.Borderless"
+        android:layout_marginTop="4dp"
+        android:textColor="@color/accent_green"
+        android:textSize="@dimen/very_small_font_size"
+        android:text="Follow Setting"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"/>
+
 </LinearLayout>
\ No newline at end of file