diff --git a/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
index 867b2a4d48..f8d6025e19 100644
--- a/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -126,11 +126,6 @@ private void inflateStub() {
       removableMediaView.setRemoveClickListener(new RemoveButtonListener());
       removableMediaView.setEditClickListener(new EditButtonListener());
       thumbnail.setOnClickListener(new ThumbnailClickListener());
-      int incomingBubbleColor = ThemeUtil.getThemedColor(context, R.attr.conversation_item_incoming_bubble_color);
-      audioView.getBackground().setColorFilter(incomingBubbleColor, PorterDuff.Mode.MULTIPLY);
-      documentView.getBackground().setColorFilter(incomingBubbleColor, PorterDuff.Mode.MULTIPLY);
-      webxdcView.getBackground().setColorFilter(incomingBubbleColor, PorterDuff.Mode.MULTIPLY);
-      vcardView.getBackground().setColorFilter(incomingBubbleColor, PorterDuff.Mode.MULTIPLY);
     }
 
   }
diff --git a/src/main/res/drawable-ldrtl/message_bubble_background_sent_alone_with_border.xml b/src/main/res/drawable-ldrtl/message_bubble_background_sent_alone_with_border.xml
new file mode 100644
index 0000000000..315f63174f
--- /dev/null
+++ b/src/main/res/drawable-ldrtl/message_bubble_background_sent_alone_with_border.xml
@@ -0,0 +1,16 @@
+<?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">
+        <shape android:shape="rectangle">
+            <stroke android:width="1dp" android:color="#55888888" />
+            <corners
+                android:topLeftRadius="@dimen/message_corner_radius"
+                android:topRightRadius="@dimen/message_corner_radius"
+                android:bottomRightRadius="@dimen/message_corner_radius" />
+            <solid android:color="?attr/conversation_item_incoming_bubble_color" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/src/main/res/drawable/message_bubble_background_sent_alone_with_border.xml b/src/main/res/drawable/message_bubble_background_sent_alone_with_border.xml
new file mode 100644
index 0000000000..e8ac29c9aa
--- /dev/null
+++ b/src/main/res/drawable/message_bubble_background_sent_alone_with_border.xml
@@ -0,0 +1,16 @@
+<?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">
+        <shape android:shape="rectangle">
+            <stroke android:width="1dp" android:color="#55888888" />
+            <corners
+                android:topLeftRadius="@dimen/message_corner_radius"
+                android:topRightRadius="@dimen/message_corner_radius"
+                android:bottomLeftRadius="@dimen/message_corner_radius" />
+            <solid android:color="?attr/conversation_item_incoming_bubble_color" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/src/main/res/layout/conversation_activity_attachment_editor_stub.xml b/src/main/res/layout/conversation_activity_attachment_editor_stub.xml
index 81c2b18c59..9e752fd30e 100644
--- a/src/main/res/layout/conversation_activity_attachment_editor_stub.xml
+++ b/src/main/res/layout/conversation_activity_attachment_editor_stub.xml
@@ -4,6 +4,7 @@
              android:id="@+id/attachment_editor"
              android:layout_width="match_parent"
              android:layout_height="wrap_content"
+             android:background="?attr/input_panel_bg_color"
              android:gravity="center_horizontal"
              android:visibility="gone">
 
@@ -45,7 +46,7 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
                 android:padding="8dp"
-                android:background="@drawable/message_bubble_background_sent_alone"/>
+                android:background="@drawable/message_bubble_background_sent_alone_with_border"/>
 
         <org.thoughtcrime.securesms.components.DocumentView
                 android:id="@+id/attachment_document"
@@ -56,7 +57,7 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
                 android:padding="8dp"
-                android:background="@drawable/message_bubble_background_sent_alone"/>
+                android:background="@drawable/message_bubble_background_sent_alone_with_border"/>
 
         <org.thoughtcrime.securesms.components.WebxdcView
                 android:id="@+id/attachment_webxdc"
@@ -67,7 +68,7 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
                 android:padding="8dp"
-                android:background="@drawable/message_bubble_background_sent_alone"/>
+                android:background="@drawable/message_bubble_background_sent_alone_with_border"/>
 
         <org.thoughtcrime.securesms.components.VcardView
                 android:id="@+id/attachment_vcard"
@@ -78,7 +79,7 @@
                 android:layout_marginLeft="10dp"
                 android:layout_marginRight="10dp"
                 android:padding="8dp"
-                android:background="@drawable/message_bubble_background_sent_alone"/>
+                android:background="@drawable/message_bubble_background_sent_alone_with_border"/>
 
     </org.thoughtcrime.securesms.components.RemovableEditableMediaView>