diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
index 89b309e70c..d88baf1daf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
@@ -363,8 +363,10 @@ public class ConversationAdapter
 
     if (hasWallpaper) {
       viewHolder.setBackgroundRes(R.drawable.wallpaper_bubble_background_8);
+      viewHolder.setDividerColor(viewHolder.itemView.getResources().getColor(R.color.transparent_black_80));
     } else {
       viewHolder.clearBackground();
+      viewHolder.setDividerColor(viewHolder.itemView.getResources().getColor(R.color.core_grey_45));
     }
   }
 
@@ -605,10 +607,12 @@ public class ConversationAdapter
 
   static class StickyHeaderViewHolder extends RecyclerView.ViewHolder {
     TextView textView;
+    View     divider;
 
     StickyHeaderViewHolder(View itemView) {
       super(itemView);
       textView = itemView.findViewById(R.id.text);
+      divider  = itemView.findViewById(R.id.last_seen_divider);
     }
 
     StickyHeaderViewHolder(TextView textView) {
@@ -628,6 +632,12 @@ public class ConversationAdapter
       textView.setBackgroundResource(resId);
     }
 
+    public void setDividerColor(@ColorInt int color) {
+      if (divider != null) {
+        divider.setBackgroundColor(color);
+      }
+    }
+
     public void clearBackground() {
       textView.setBackground(null);
     }
diff --git a/app/src/main/res/layout/conversation_item_last_seen.xml b/app/src/main/res/layout/conversation_item_last_seen.xml
index 3a04ecae01..a92daa4db0 100644
--- a/app/src/main/res/layout/conversation_item_last_seen.xml
+++ b/app/src/main/res/layout/conversation_item_last_seen.xml
@@ -9,8 +9,9 @@
     android:paddingBottom="20dp">
 
     <View
+        android:id="@+id/last_seen_divider"
         android:layout_width="match_parent"
-        android:layout_height="1px"
+        android:layout_height="1dp"
         android:layout_marginBottom="3dp"
         android:background="@color/core_grey_45" />