diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt
index d971af4ea2..c103c72151 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyViewHolder.kt
@@ -600,7 +600,7 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
   }
 
   private fun presentDate() {
-    if (!shape.isEndingShape && !conversationMessage.messageRecord.isEditMessage) {
+    if (!shape.isEndingShape && !isForcedFooter()) {
       binding.footerDate.visible = false
       return
     }
diff --git a/app/src/main/res/layout/v2_conversation_item_text_only_incoming.xml b/app/src/main/res/layout/v2_conversation_item_text_only_incoming.xml
index cd3b78a87a..431e8e9d79 100644
--- a/app/src/main/res/layout/v2_conversation_item_text_only_incoming.xml
+++ b/app/src/main/res/layout/v2_conversation_item_text_only_incoming.xml
@@ -156,7 +156,7 @@
         android:layout_width="@dimen/message_bubble_horizontal_padding"
         android:layout_height="@dimen/message_bubble_horizontal_padding"
         app:layout_constraintTop_toTopOf="@id/conversation_item_footer_date"
-    app:layout_constraintBottom_toBottomOf="@id/conversation_item_body_wrapper"
+        app:layout_constraintBottom_toBottomOf="@id/conversation_item_body_wrapper"
         app:layout_constraintEnd_toEndOf="@id/conversation_item_body_wrapper" />
 
     <!-- End Footer -->