diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml
index 4269335e5..74a76814d 100644
--- a/app/src/main/res/layout/chat_bubble_incoming.xml
+++ b/app/src/main/res/layout/chat_bubble_incoming.xml
@@ -238,8 +238,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@{model.time, default=`13:40`}"
-                    android:textSize="12sp"
-                    android:visibility="@{!model.groupedWithNextMessage ? View.VISIBLE : View.GONE}"/>
+                    android:textSize="12sp" />
 
                 <ImageView
                     style="@style/default_text_style_300"
@@ -250,7 +249,7 @@
                     android:layout_marginStart="5dp"
                     android:layout_marginTop="2dp"
                     android:src="@{model.statusIcon, default=@drawable/checks}"
-                    android:visibility="@{!model.groupedWithNextMessage ? View.VISIBLE : View.GONE}"
+                    android:visibility="@{model.isFromGroup ? View.VISIBLE : View.GONE}"
                     app:tint="?attr/color_main1_500" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/chat_bubble_outgoing.xml b/app/src/main/res/layout/chat_bubble_outgoing.xml
index 9626e3bda..c733b3057 100644
--- a/app/src/main/res/layout/chat_bubble_outgoing.xml
+++ b/app/src/main/res/layout/chat_bubble_outgoing.xml
@@ -201,8 +201,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@{model.time, default=`13:40`}"
-                    android:textSize="12sp"
-                    android:visibility="@{!model.groupedWithNextMessage ? View.VISIBLE : View.GONE}"/>
+                    android:textSize="12sp" />
 
                 <ImageView
                     style="@style/default_text_style_300"
@@ -213,7 +212,6 @@
                     android:layout_marginStart="5dp"
                     android:layout_marginTop="2dp"
                     android:src="@{model.statusIcon, default=@drawable/checks}"
-                    android:visibility="@{!model.groupedWithNextMessage ? View.VISIBLE : View.GONE}"
                     app:tint="?attr/color_main1_500" />
 
             </LinearLayout>