diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
index 44bba2e4cf..09f2a783e5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
@@ -339,8 +339,8 @@ public final class ConversationUpdateItem extends FrameLayout
         background.setBackground(null);
       }
     } else if (collapseBelow) {
-      ViewUtil.setTopMargin(background, paddingDefault);
-      ViewUtil.setBottomMargin(background, paddingCollapsed);
+      ViewUtil.setTopMargin(background, marginDefault);
+      ViewUtil.setBottomMargin(background, marginCollapsed);
 
       ViewUtil.setPaddingTop(background, paddingDefault);
       ViewUtil.setPaddingBottom(background, paddingCollapsed);
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 69e8627c33..c323d6c829 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -164,6 +164,6 @@
     <dimen name="review_card_icon_arc_radius">14.5dp</dimen>
 
     <dimen name="conversation_update_vertical_margin">2dp</dimen>
-    <dimen name="conversation_update_vertical_padding">8dp</dimen>
+    <dimen name="conversation_update_vertical_padding">5dp</dimen>
     <dimen name="conversation_update_vertical_padding_collapsed">2dp</dimen>
 </resources>