diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml
index d98ffe040..4269335e5 100644
--- a/app/src/main/res/layout/chat_bubble_incoming.xml
+++ b/app/src/main/res/layout/chat_bubble_incoming.xml
@@ -31,6 +31,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="32dp"
+        android:layout_marginBottom="@{model.groupedWithNextMessage ? @dimen/chat_bubble_grouped_bottom_margin : @dimen/chat_bubble_bottom_margin, default=@dimen/chat_bubble_bottom_margin}"
         android:layout_marginTop="@{model.groupedWithPreviousMessage ? @dimen/chat_bubble_grouped_top_margin : @dimen/chat_bubble_top_margin, default=@dimen/chat_bubble_top_margin}">
 
         <com.google.android.material.imageview.ShapeableImageView
diff --git a/app/src/main/res/layout/chat_bubble_outgoing.xml b/app/src/main/res/layout/chat_bubble_outgoing.xml
index 997d96743..9626e3bda 100644
--- a/app/src/main/res/layout/chat_bubble_outgoing.xml
+++ b/app/src/main/res/layout/chat_bubble_outgoing.xml
@@ -31,6 +31,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="32dp"
         android:layout_marginEnd="8dp"
+        android:layout_marginBottom="@{model.groupedWithNextMessage ? @dimen/chat_bubble_grouped_bottom_margin : @dimen/chat_bubble_bottom_margin, default=@dimen/chat_bubble_bottom_margin}"
         android:layout_marginTop="@{model.groupedWithPreviousMessage ? @dimen/chat_bubble_grouped_top_margin : @dimen/chat_bubble_top_margin, default=@dimen/chat_bubble_top_margin}">
 
         <androidx.constraintlayout.widget.Group
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 5d123a909..9a963a03d 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -64,8 +64,10 @@
 
     <dimen name="meeting_margin">8dp</dimen>
 
-    <dimen name="chat_bubble_grouped_top_margin">4dp</dimen>
-    <dimen name="chat_bubble_top_margin">16dp</dimen>
+    <dimen name="chat_bubble_grouped_top_margin">2dp</dimen>
+    <dimen name="chat_bubble_top_margin">8dp</dimen>
+    <dimen name="chat_bubble_grouped_bottom_margin">2dp</dimen>
+    <dimen name="chat_bubble_bottom_margin">8dp</dimen>
     <dimen name="chat_bubble_long_press_emoji_reaction_size">30sp</dimen>
     <dimen name="chat_bubble_grid_image_size">88dp</dimen>
     <dimen name="chat_bubble_big_image_max_size">150dp</dimen>