diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
index cac75f567f..22852cf194 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt
@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.conversation.v2.messages
 
 import android.content.Context
 import android.util.AttributeSet
+import android.util.Log
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
diff --git a/app/src/main/res/drawable/message_bubble_background_received_alone.xml b/app/src/main/res/drawable/message_bubble_background_received_alone.xml
index 9c4347ae6e..5e657c9793 100644
--- a/app/src/main/res/drawable/message_bubble_background_received_alone.xml
+++ b/app/src/main/res/drawable/message_bubble_background_received_alone.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="2px"
-        android:bottom="2px">
+    <item>
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/message_corner_radius"/>
             <solid android:color="@color/white" />
diff --git a/app/src/main/res/drawable/message_bubble_background_received_end.xml b/app/src/main/res/drawable/message_bubble_background_received_end.xml
index c31ca989d0..09f5d7d6df 100644
--- a/app/src/main/res/drawable/message_bubble_background_received_end.xml
+++ b/app/src/main/res/drawable/message_bubble_background_received_end.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="2px"
-        android:bottom="2px">
+    <item>
         <shape android:shape="rectangle">
             <corners
                 android:topLeftRadius="@dimen/message_corner_collapse_radius"
diff --git a/app/src/main/res/drawable/message_bubble_background_received_middle.xml b/app/src/main/res/drawable/message_bubble_background_received_middle.xml
index 7dbb3675ff..78da45378e 100644
--- a/app/src/main/res/drawable/message_bubble_background_received_middle.xml
+++ b/app/src/main/res/drawable/message_bubble_background_received_middle.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="2px"
-        android:bottom="2px">
+    <item>
         <shape android:shape="rectangle">
             <corners
                 android:topLeftRadius="@dimen/message_corner_collapse_radius"
diff --git a/app/src/main/res/drawable/message_bubble_background_received_start.xml b/app/src/main/res/drawable/message_bubble_background_received_start.xml
index aeef43fa16..6908d244e6 100644
--- a/app/src/main/res/drawable/message_bubble_background_received_start.xml
+++ b/app/src/main/res/drawable/message_bubble_background_received_start.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="2px"
-        android:bottom="2px">
+    <item>
         <shape android:shape="rectangle">
             <corners
                 android:topLeftRadius="@dimen/message_corner_radius"
diff --git a/app/src/main/res/drawable/message_bubble_background_sent_alone.xml b/app/src/main/res/drawable/message_bubble_background_sent_alone.xml
index 38ec7bc28e..7ae0cae493 100644
--- a/app/src/main/res/drawable/message_bubble_background_sent_alone.xml
+++ b/app/src/main/res/drawable/message_bubble_background_sent_alone.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="2px"
-        android:bottom="2px">
+    <item>
         <shape android:shape="rectangle">
             <corners android:radius="@dimen/message_corner_radius"/>
             <solid android:color="@color/white" />
diff --git a/app/src/main/res/drawable/message_bubble_background_sent_end.xml b/app/src/main/res/drawable/message_bubble_background_sent_end.xml
index 33fac83ec3..81325f1ad2 100644
--- a/app/src/main/res/drawable/message_bubble_background_sent_end.xml
+++ b/app/src/main/res/drawable/message_bubble_background_sent_end.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="2px"
-        android:bottom="2px">
+    <item>
         <shape android:shape="rectangle">
             <corners
                 android:topLeftRadius="@dimen/message_corner_radius"
diff --git a/app/src/main/res/drawable/message_bubble_background_sent_middle.xml b/app/src/main/res/drawable/message_bubble_background_sent_middle.xml
index c464446742..e8fa38aab8 100644
--- a/app/src/main/res/drawable/message_bubble_background_sent_middle.xml
+++ b/app/src/main/res/drawable/message_bubble_background_sent_middle.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="2px"
-        android:bottom="2px">
+    <item>
         <shape android:shape="rectangle">
             <corners
                 android:topLeftRadius="@dimen/message_corner_radius"
diff --git a/app/src/main/res/drawable/message_bubble_background_sent_start.xml b/app/src/main/res/drawable/message_bubble_background_sent_start.xml
index 7b65f54c5c..03f90a31f7 100644
--- a/app/src/main/res/drawable/message_bubble_background_sent_start.xml
+++ b/app/src/main/res/drawable/message_bubble_background_sent_start.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list
     xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:top="2px"
-        android:bottom="2px">
+    <item>
         <shape android:shape="rectangle">
             <corners
                 android:topLeftRadius="@dimen/message_corner_radius"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f614226d54..3d44675888 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -103,7 +103,7 @@
     <dimen name="conversation_individual_left_gutter">@dimen/large_spacing</dimen>
     <dimen name="conversation_group_left_gutter">60dp</dimen>
     <dimen name="conversation_vertical_message_spacing_default">8dp</dimen>
-    <dimen name="conversation_vertical_message_spacing_collapse">1px</dimen>
+    <dimen name="conversation_vertical_message_spacing_collapse">1dp</dimen>
 
     <dimen name="conversation_item_avatar_size">36dp</dimen>