diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge.kt
index 63564942cf..3a25cdddc3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTextOnlyBindingBridge.kt
@@ -62,7 +62,7 @@ fun V2ConversationItemTextOnlyIncomingBinding.bridge(): V2ConversationItemTextOn
     conversationItemFooterExpiry = conversationItemExpirationTimer,
     conversationItemFooterBackground = conversationItemFooterBackground,
     conversationItemAlert = null,
-    conversationItemFooterSpace = null,
+    conversationItemFooterSpace = footerEndPad,
     isIncoming = true
   )
 }
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 ccff05cca1..89077cf96a 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
@@ -463,8 +463,8 @@ open class V2ConversationItemTextOnlyViewHolder<Model : MappingModel<Model>>(
     val timer = binding.conversationItemFooterExpiry
     val record = conversationMessage.messageRecord
     if (record.expiresIn > 0 && !record.isPending) {
-      binding.conversationItemFooterExpiry.visible = true
-      binding.conversationItemFooterExpiry.setPercentComplete(0f)
+      timer.visible = true
+      timer.setPercentComplete(0f)
 
       if (record.expireStarted > 0) {
         timer.setExpirationTime(record.expireStarted, record.expiresIn)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme.kt
index 9dba495148..032df94def 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/items/V2ConversationItemTheme.kt
@@ -13,7 +13,6 @@ import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.conversation.ConversationMessage
 import org.thoughtcrime.securesms.conversation.v2.items.V2ConversationItemUtils.isThumbnailAtBottomOfBubble
 import org.thoughtcrime.securesms.util.hasNoBubble
-import org.thoughtcrime.securesms.util.isBorderless
 
 /**
  * Color information for conversation items.
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 ad27c4bf11..cd3b78a87a 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
@@ -139,18 +139,26 @@
         android:textColor="@color/signal_text_secondary"
         app:layout_constraintBottom_toBottomOf="@id/conversation_item_body_wrapper"
         app:layout_constraintEnd_toStartOf="@id/conversation_item_expiration_timer"
-        app:layout_goneMarginEnd="@dimen/message_bubble_horizontal_padding"
+        app:layout_goneMarginEnd="0dp"
         tools:text="13:14pm" />
 
     <org.thoughtcrime.securesms.components.ExpirationTimerView
         android:id="@+id/conversation_item_expiration_timer"
         android:layout_width="12dp"
         android:layout_height="12dp"
-        android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
         android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
         app:layout_constraintBottom_toBottomOf="@id/conversation_item_footer_date"
-        app:layout_constraintEnd_toEndOf="@id/conversation_item_body_wrapper"
+        app:layout_constraintEnd_toStartOf="@id/footer_end_pad"
         app:layout_constraintTop_toTopOf="@id/conversation_item_footer_date" />
+
+    <Space
+        android:id="@+id/footer_end_pad"
+        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_constraintEnd_toEndOf="@id/conversation_item_body_wrapper" />
+
     <!-- End Footer -->
 
     <!-- Replies Icon -->