diff --git a/res/layout/conversation_activity_attachment_editor_stub.xml b/res/layout/conversation_activity_attachment_editor_stub.xml
index 7060329b5..057748f65 100644
--- a/res/layout/conversation_activity_attachment_editor_stub.xml
+++ b/res/layout/conversation_activity_attachment_editor_stub.xml
@@ -28,6 +28,7 @@
                 android:layout_gravity="center_horizontal"
                 android:visibility="gone"
                 android:contentDescription="@string/menu_add_attachment"
+                app:thumbnail_radius="@dimen/message_corner_radius"
                 app:minWidth="100dp"
                 app:maxWidth="300dp"
                 app:minHeight="100dp"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 64eb5638f..759c9c1ce 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -33,6 +33,8 @@
     <dimen name="media_bubble_max_height">320dp</dimen>
     <dimen name="below_bubble">3dp</dimen>
 
+    <dimen name="gallery_thumbnail_radius">1dp</dimen>
+
     <dimen name="conversation_individual_right_gutter">12dp</dimen>
     <dimen name="conversation_individual_left_gutter">12dp</dimen>
     <dimen name="conversation_group_left_gutter">52dp</dimen>
diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
index c7241d25e..cafbcebf4 100644
--- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -83,10 +83,10 @@ public class ThumbnailView extends FrameLayout {
       bounds[MAX_WIDTH]  = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_maxWidth, 0);
       bounds[MIN_HEIGHT] = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_minHeight, 0);
       bounds[MAX_HEIGHT] = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_maxHeight, 0);
-      radius             = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_thumbnail_radius, getResources().getDimensionPixelSize(R.dimen.message_corner_radius));
+      radius             = typedArray.getDimensionPixelSize(R.styleable.ThumbnailView_thumbnail_radius, getResources().getDimensionPixelSize(R.dimen.gallery_thumbnail_radius));
       typedArray.recycle();
     } else {
-      radius = getResources().getDimensionPixelSize(R.dimen.message_corner_radius);
+      radius = getResources().getDimensionPixelSize(R.dimen.gallery_thumbnail_radius);
     }
 
   }