diff --git a/src/cheogram/res/values/styles.xml b/src/cheogram/res/values/styles.xml
index 5ea938aa2ff1fe1e361e5bc61d8808d4484bde2c..e3d57d75892217486f5d9abe0b9a5324e091a846 100644
--- a/src/cheogram/res/values/styles.xml
+++ b/src/cheogram/res/values/styles.xml
@@ -5,6 +5,22 @@
 	<item name="cornerSize">@dimen/avatar_radius</item>
 </style>
 
+<style name="ShapeAppearanceOverlay.MessageImageIn" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+	<item name="cornerFamily">rounded</item>
+	<item name="cornerSizeTopLeft">0dp</item>
+	<item name="cornerSizeTopRight">16dp</item>
+	<item name="cornerSizeBottomLeft">0dp</item>
+	<item name="cornerSizeBottomRight">0dp</item>
+</style>
+
+<style name="ShapeAppearanceOverlay.MessageImageOut" parent="ShapeAppearance.MaterialComponents.SmallComponent">
+	<item name="cornerFamily">rounded</item>
+	<item name="cornerSizeTopLeft">16dp</item>
+	<item name="cornerSizeTopRight">16dp</item>
+	<item name="cornerSizeBottomLeft">0dp</item>
+	<item name="cornerSizeBottomRight">0dp</item>
+</style>
+
 <style name="ShapeAppearanceOverlay.IncomingCall" parent="ShapeAppearance.MaterialComponents.SmallComponent">
 	<item name="cornerFamily">rounded</item>
 	<item name="cornerSize">@dimen/incoming_call_radius</item>
diff --git a/src/main/res/layout/message_content.xml b/src/main/res/layout/message_content.xml
index bcceee0220aec9a1116d1352a38926486c8433c4..33ecec5c83036e52a1eef9fb69fc4fa816dc4192 100644
--- a/src/main/res/layout/message_content.xml
+++ b/src/main/res/layout/message_content.xml
@@ -1,25 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <TextView
-        android:id="@+id/message_body"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autoLink="web"
-        android:longClickable="false"
-        android:textIsSelectable="true"
-        android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
-
-    <ImageView
-        android:id="@+id/message_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:layout_marginTop="8dp"
-        android:adjustViewBounds="true"
-        android:background="@color/black87"
-        android:longClickable="true"
-        android:scaleType="centerCrop"/>
+<merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <Button
         android:id="@+id/download_button"
@@ -72,4 +52,13 @@
             android:progress="100"/>
     </RelativeLayout>
 
+    <TextView
+        android:id="@+id/message_body"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:autoLink="web"
+        android:longClickable="false"
+        android:textIsSelectable="true"
+        android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
+
 </merge>
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index d75d83d935f0bce88584573cfa528bb42de2b9cf..c9c86217f69898abd361cc667a353dbb1c0206e6 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -26,12 +26,13 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_marginLeft="5dp"
-        android:paddingLeft="20dp"
         android:paddingTop="5dp"
+        android:paddingLeft="20dp"
         android:paddingBottom="5dp"
         android:layout_toRightOf="@+id/message_photo"
         android:background="?attr/message_bubble_received"
         android:longClickable="true"
+        android:clipToPadding="false"
         android:minHeight="53dp">
 
         <LinearLayout
@@ -40,8 +41,22 @@
             android:layout_height="fill_parent"
             android:gravity="center_vertical"
             android:orientation="vertical"
+            android:clipToPadding="false"
             android:padding="2dp">
 
+            <com.google.android.material.imageview.ShapeableImageView
+                android:id="@+id/message_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:translationY="-5dp"
+                android:layout_marginBottom="4dp"
+                android:adjustViewBounds="true"
+                android:background="@color/black87"
+                android:longClickable="true"
+                android:scaleType="centerCrop"
+                app:strokeColor="@color/custom_theme_accent"
+                app:shapeAppearance="@style/ShapeAppearanceOverlay.MessageImageIn" />
+
             <include
                 android:id="@+id/message_content"
                 layout="@layout/message_content" />
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 0abf419dc1c714441f0e4f127c8c41e2e2289070..8d1a7acb7ee409b319be96debf5fbe3cdd777e23 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -27,12 +27,13 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_marginRight="0dp"
-        android:paddingRight="20dp"
         android:paddingTop="5dp"
+        android:paddingRight="20dp"
         android:paddingBottom="5dp"
         android:layout_toLeftOf="@+id/message_photo"
         android:background="@drawable/message_bubble_sent"
         android:longClickable="true"
+        android:clipToPadding="false"
         android:minHeight="53dp">
 
         <LinearLayout
@@ -41,8 +42,22 @@
             android:layout_height="fill_parent"
             android:gravity="center_vertical"
             android:orientation="vertical"
+            android:clipToPadding="false"
             android:padding="2dp">
 
+            <com.google.android.material.imageview.ShapeableImageView
+                android:id="@+id/message_image"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:translationY="-5dp"
+                android:layout_marginBottom="4dp"
+                android:adjustViewBounds="true"
+                android:background="@color/black87"
+                android:longClickable="true"
+                android:scaleType="centerCrop"
+                app:strokeColor="@color/custom_theme_accent"
+                app:shapeAppearance="@style/ShapeAppearanceOverlay.MessageImageOut" />
+
             <include
                 android:id="@+id/message_content"
                 layout="@layout/message_content" />