diff --git a/app/src/main/res/layout/v2_conversation_item_text_only_outgoing.xml b/app/src/main/res/layout/v2_conversation_item_text_only_outgoing.xml
index cbabbdf0add..68e7f613352 100644
--- a/app/src/main/res/layout/v2_conversation_item_text_only_outgoing.xml
+++ b/app/src/main/res/layout/v2_conversation_item_text_only_outgoing.xml
@@ -124,20 +124,22 @@
     <org.thoughtcrime.securesms.components.ExpirationTimerView
         android:id="@+id/conversation_item_expiration_timer"
         android:layout_width="12dp"
-        android:layout_height="12dp"
+        android:layout_height="0dp"
         android:layout_marginEnd="4dp"
-        android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
-        app:layout_constraintBottom_toBottomOf="@id/conversation_item_body_wrapper"
-        app:layout_constraintEnd_toStartOf="@id/conversation_item_delivery_status" />
+        android:paddingBottom="@dimen/message_bubble_bottom_padding"
+        app:layout_constraintBottom_toBottomOf="@id/conversation_item_footer_date"
+        app:layout_constraintEnd_toStartOf="@id/conversation_item_delivery_status"
+        app:layout_constraintTop_toTopOf="@id/conversation_item_footer_date" />
 
     <org.thoughtcrime.securesms.components.DeliveryStatusView
         android:id="@+id/conversation_item_delivery_status"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="0dp"
         android:layout_gravity="center_vertical"
         android:paddingBottom="@dimen/message_bubble_bottom_padding"
         app:layout_constraintBottom_toBottomOf="@id/conversation_item_body_wrapper"
-        app:layout_constraintEnd_toStartOf="@id/footer_end_pad" />
+        app:layout_constraintEnd_toStartOf="@id/footer_end_pad"
+        app:layout_constraintTop_toTopOf="@id/conversation_item_footer_date" />
 
     <Space
         android:id="@+id/footer_end_pad"