diff --git a/art/message_bubble_received.svg b/art/message_bubble_received.svg
index b8563e195..0ec91b5f7 100644
--- a/art/message_bubble_received.svg
+++ b/art/message_bubble_received.svg
@@ -151,10 +151,10 @@
       <path
          inkscape:connector-curvature="0"
          id="path2989"
-         d="M 4,4 22,16 22,4 z"
+         d="M 4,24 22,10 22,24 z"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"
diff --git a/art/message_bubble_received_dark.svg b/art/message_bubble_received_dark.svg
index 726a16fb2..d03ff5fc3 100644
--- a/art/message_bubble_received_dark.svg
+++ b/art/message_bubble_received_dark.svg
@@ -151,10 +151,10 @@
       <path
          inkscape:connector-curvature="0"
          id="path2989"
-         d="M 4,4 22,16 22,4 z"
+          d="M 4,24 22,10 22,24 z"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"
diff --git a/art/message_bubble_received_dark_non_first.svg b/art/message_bubble_received_dark_non_last.svg
similarity index 99%
rename from art/message_bubble_received_dark_non_first.svg
rename to art/message_bubble_received_dark_non_last.svg
index 5f03ab285..5c54bb2e8 100644
--- a/art/message_bubble_received_dark_non_first.svg
+++ b/art/message_bubble_received_dark_non_last.svg
@@ -149,7 +149,7 @@
          transform="translate(0,2)"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"
diff --git a/art/message_bubble_received_grey.svg b/art/message_bubble_received_grey.svg
index eb053a429..8eb578e9e 100644
--- a/art/message_bubble_received_grey.svg
+++ b/art/message_bubble_received_grey.svg
@@ -151,11 +151,11 @@
       <path
          inkscape:connector-curvature="0"
          id="path2989"
-         d="M 4,4 22,16 22,4 z"
+          d="M 4,24 22,10 22,24 z"
          sodipodi:nodetypes="cccc"
          style="fill:#424242;fill-opacity:1" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"
diff --git a/art/message_bubble_received_grey_non_first.svg b/art/message_bubble_received_grey_non_last.svg
similarity index 99%
rename from art/message_bubble_received_grey_non_first.svg
rename to art/message_bubble_received_grey_non_last.svg
index 7cdeafa10..6a3852f9f 100644
--- a/art/message_bubble_received_grey_non_first.svg
+++ b/art/message_bubble_received_grey_non_last.svg
@@ -149,7 +149,7 @@
          transform="translate(0,2)"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"
diff --git a/art/message_bubble_received_non_first.svg b/art/message_bubble_received_non_last.svg
similarity index 99%
rename from art/message_bubble_received_non_first.svg
rename to art/message_bubble_received_non_last.svg
index 6f5bfdb15..da1e94889 100644
--- a/art/message_bubble_received_non_first.svg
+++ b/art/message_bubble_received_non_last.svg
@@ -149,7 +149,7 @@
           transform="translate(0,2)"
           sodipodi:nodetypes="cccc" />
       <rect
-          ry="16"
+          ry="2"
           y="4"
           x="12"
           height="20"
diff --git a/art/message_bubble_received_warning.svg b/art/message_bubble_received_warning.svg
index a2759b494..96a6994b0 100644
--- a/art/message_bubble_received_warning.svg
+++ b/art/message_bubble_received_warning.svg
@@ -151,10 +151,10 @@
       <path
          inkscape:connector-curvature="0"
          id="path2989"
-         d="M 4,4 22,16 22,4 z"
+          d="M 4,24 22,10 22,24 z"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"
diff --git a/art/message_bubble_received_warning_non_first.svg b/art/message_bubble_received_warning_non_last.svg
similarity index 99%
rename from art/message_bubble_received_warning_non_first.svg
rename to art/message_bubble_received_warning_non_last.svg
index 5c9f87f46..7859d755f 100644
--- a/art/message_bubble_received_warning_non_first.svg
+++ b/art/message_bubble_received_warning_non_last.svg
@@ -149,7 +149,7 @@
          transform="translate(0,2)"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"
diff --git a/art/message_bubble_received_white.svg b/art/message_bubble_received_white.svg
index c7f95cae3..f3449e612 100644
--- a/art/message_bubble_received_white.svg
+++ b/art/message_bubble_received_white.svg
@@ -151,10 +151,10 @@
       <path
          inkscape:connector-curvature="0"
          id="path2989"
-         d="M 4,4 22,16 22,4 z"
+          d="M 4,24 22,10 22,24 z"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"
diff --git a/art/message_bubble_received_white_non_first.svg b/art/message_bubble_received_white_non_last.svg
similarity index 99%
rename from art/message_bubble_received_white_non_first.svg
rename to art/message_bubble_received_white_non_last.svg
index 73a1a8214..c1533c329 100644
--- a/art/message_bubble_received_white_non_first.svg
+++ b/art/message_bubble_received_white_non_last.svg
@@ -149,7 +149,7 @@
          transform="translate(0,2)"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="12"
          height="20"
diff --git a/art/message_bubble_sent.svg b/art/message_bubble_sent.svg
index 8d2634f68..979c7e591 100644
--- a/art/message_bubble_sent.svg
+++ b/art/message_bubble_sent.svg
@@ -151,10 +151,10 @@
       <path
          inkscape:connector-curvature="0"
          id="path2989"
-         d="M 32,4 14,16 14,4 z"
+         d="M 32,24 14,10 14,24 z"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="4"
          height="20"
diff --git a/art/message_bubble_sent_grey.svg b/art/message_bubble_sent_grey.svg
index ab5b67eb8..533ffa975 100644
--- a/art/message_bubble_sent_grey.svg
+++ b/art/message_bubble_sent_grey.svg
@@ -151,11 +151,11 @@
       <path
          inkscape:connector-curvature="0"
          id="path2989"
-          d="M 14,4 32,4 14,16 z"
+          d="M 32,24 14,10 14,24 z"
          sodipodi:nodetypes="cccc"
          style="fill:#424242;fill-opacity:1" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="4"
          height="20"
diff --git a/art/message_bubble_sent_grey_non_first.svg b/art/message_bubble_sent_grey_non_last.svg
similarity index 99%
rename from art/message_bubble_sent_grey_non_first.svg
rename to art/message_bubble_sent_grey_non_last.svg
index 9423091dd..4606ac1ca 100644
--- a/art/message_bubble_sent_grey_non_first.svg
+++ b/art/message_bubble_sent_grey_non_last.svg
@@ -149,7 +149,7 @@
          transform="translate(0,2)"
          sodipodi:nodetypes="cccc" />
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="4"
          height="20"
diff --git a/art/message_bubble_sent_non_first.svg b/art/message_bubble_sent_non_last.svg
similarity index 99%
rename from art/message_bubble_sent_non_first.svg
rename to art/message_bubble_sent_non_last.svg
index cd0ee534f..26f08f5ee 100644
--- a/art/message_bubble_sent_non_first.svg
+++ b/art/message_bubble_sent_non_last.svg
@@ -150,7 +150,7 @@
          sodipodi:nodetypes="cccc" />
   
       <rect
-         ry="16"
+         ry="2"
          y="4"
          x="4"
          height="20"
diff --git a/art/render.rb b/art/render.rb
index 5f3588b64..ea245d790 100755
--- a/art/render.rb
+++ b/art/render.rb
@@ -71,19 +71,19 @@ images = {
   'ic_verified_fingerprint.svg' => ['ic_verified_fingerprint', 36],
   'qrcode-scan.svg' => ['ic_qr_code_scan_white_24dp', 24],
   'message_bubble_received.svg' => ['message_bubble_received.9', 0],
-  'message_bubble_received_non_first.svg' => ['message_bubble_received_non_first.9', 0],
+  'message_bubble_received_non_last.svg' => ['message_bubble_received_non_last.9', 0],
   'message_bubble_received_grey.svg' => ['message_bubble_received_grey.9', 0],
-  'message_bubble_received_grey_non_first.svg' => ['message_bubble_received_grey_non_first.9', 0],
+  'message_bubble_received_grey_non_last.svg' => ['message_bubble_received_grey_non_last.9', 0],
   'message_bubble_received_dark.svg' => ['message_bubble_received_dark.9', 0],
-  'message_bubble_received_dark_non_first.svg' => ['message_bubble_received_dark_non_first.9', 0],
+  'message_bubble_received_dark_non_last.svg' => ['message_bubble_received_dark_non_last.9', 0],
   'message_bubble_received_warning.svg' => ['message_bubble_received_warning.9', 0],
-  'message_bubble_received_warning_non_first.svg' => ['message_bubble_received_warning_non_first.9', 0],
+  'message_bubble_received_warning_non_last.svg' => ['message_bubble_received_warning_non_last.9', 0],
   'message_bubble_received_white.svg' => ['message_bubble_received_white.9', 0],
-  'message_bubble_received_white_non_first.svg' => ['message_bubble_received_white_non_first.9', 0],
+  'message_bubble_received_white_non_last.svg' => ['message_bubble_received_white_non_last.9', 0],
   'message_bubble_sent.svg' => ['message_bubble_sent.9', 0],
-  'message_bubble_sent_non_first.svg' => ['message_bubble_sent_non_first.9', 0],
+  'message_bubble_sent_non_last.svg' => ['message_bubble_sent_non_last.9', 0],
   'message_bubble_sent_grey.svg' => ['message_bubble_sent_grey.9', 0],
-  'message_bubble_sent_grey_non_first.svg' => ['message_bubble_send_grey_non_first.9', 0],
+  'message_bubble_sent_grey_non_last.svg' => ['message_bubble_send_grey_non_last.9', 0],
   'date_bubble_white.svg' => ['date_bubble_white.9', 0],
   'date_bubble_grey.svg' => ['date_bubble_grey.9', 0],
   'marker.svg' => ['marker', 0]
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 61ab538ac..b8b74ac6f 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -911,14 +911,14 @@ public class MessageAdapter extends ArrayAdapter<Message> {
             if (isInValidSession) {
                 int bubble;
                 if (!mUseGreenBackground) {
-                    if (mergeableWithPrev) {
-                        bubble = activity.getThemeResource(R.attr.message_bubble_received_monochrome_non_first, R.drawable.message_bubble_received_white_non_first);
+                    if (mergeableWithNext) {
+                        bubble = activity.getThemeResource(R.attr.message_bubble_received_monochrome_non_last, R.drawable.message_bubble_received_white_non_last);
                     } else {
                         bubble = activity.getThemeResource(R.attr.message_bubble_received_monochrome, R.drawable.message_bubble_received_white);
                     }
                 } else {
-                    if (mergeableWithPrev) {
-                        bubble = activity.getThemeResource(R.attr.message_bubble_received_green_non_first, R.drawable.message_bubble_received_white_non_first);
+                    if (mergeableWithNext) {
+                        bubble = activity.getThemeResource(R.attr.message_bubble_received_green_non_last, R.drawable.message_bubble_received_non_last);
                     } else {
                         bubble = activity.getThemeResource(R.attr.message_bubble_received_green, R.drawable.message_bubble_received);
                     }
@@ -926,8 +926,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
                 viewHolder.message_box.setBackgroundResource(bubble);
                 viewHolder.encryption.setVisibility(View.GONE);
             } else {
-                if (mergeableWithPrev) {
-                    viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning_non_first);
+                if (mergeableWithNext) {
+                    viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning_non_last);
                 } else {
                     viewHolder.message_box.setBackgroundResource(R.drawable.message_bubble_received_warning);
                 }
@@ -942,8 +942,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
         if (type == SENT) {
             int bubble;
-            if (mergeableWithPrev) {
-                bubble = activity.getThemeResource(R.attr.message_bubble_sent_non_first, R.drawable.message_bubble_sent_non_first);
+            if (mergeableWithNext) {
+                bubble = activity.getThemeResource(R.attr.message_bubble_sent_non_last, R.drawable.message_bubble_sent_non_last);
             } else {
                 bubble = activity.getThemeResource(R.attr.message_bubble_sent, R.drawable.message_bubble_sent);
             }
@@ -954,7 +954,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
         displayStatus(viewHolder, message, type, darkBackground);
 
         if (viewHolder.contact_picture != null)
-            viewHolder.contact_picture.setVisibility(mergeableWithPrev ? View.INVISIBLE : View.VISIBLE);
+            viewHolder.contact_picture.setVisibility(mergeableWithNext ? View.INVISIBLE : View.VISIBLE);
         if (viewHolder.edit_indicator != null)
             viewHolder.edit_indicator.setVisibility(mergeableWithNext ? View.GONE : viewHolder.edit_indicator.getVisibility());
         if (viewHolder.encryption != null)
diff --git a/src/main/res/drawable-hdpi/message_bubble_received.9.png b/src/main/res/drawable-hdpi/message_bubble_received.9.png
index e4d9dc629..e6d92fb88 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_received.9.png and b/src/main/res/drawable-hdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png
index 16c67fe49..44d7f9bc0 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png and b/src/main/res/drawable-hdpi/message_bubble_received_dark.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_dark_non_first.9.png b/src/main/res/drawable-hdpi/message_bubble_received_dark_non_first.9.png
deleted file mode 100644
index 63ee4c7c9..000000000
Binary files a/src/main/res/drawable-hdpi/message_bubble_received_dark_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_dark_non_last.9.png b/src/main/res/drawable-hdpi/message_bubble_received_dark_non_last.9.png
new file mode 100644
index 000000000..adb431f21
Binary files /dev/null and b/src/main/res/drawable-hdpi/message_bubble_received_dark_non_last.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png
index 8d20a91e4..ac4363d3e 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png and b/src/main/res/drawable-hdpi/message_bubble_received_grey.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_grey_non_first.9.png b/src/main/res/drawable-hdpi/message_bubble_received_grey_non_first.9.png
deleted file mode 100644
index a09f88a24..000000000
Binary files a/src/main/res/drawable-hdpi/message_bubble_received_grey_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_grey_non_last.9.png b/src/main/res/drawable-hdpi/message_bubble_received_grey_non_last.9.png
new file mode 100644
index 000000000..b3dcea71e
Binary files /dev/null and b/src/main/res/drawable-hdpi/message_bubble_received_grey_non_last.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_non_first.9.png b/src/main/res/drawable-hdpi/message_bubble_received_non_first.9.png
deleted file mode 100644
index 8d6c7051a..000000000
Binary files a/src/main/res/drawable-hdpi/message_bubble_received_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_non_last.9.png b/src/main/res/drawable-hdpi/message_bubble_received_non_last.9.png
new file mode 100644
index 000000000..eeb2e07be
Binary files /dev/null and b/src/main/res/drawable-hdpi/message_bubble_received_non_last.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png
index 702fef775..3b27137c2 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-hdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_warning_non_first.9.png b/src/main/res/drawable-hdpi/message_bubble_received_warning_non_first.9.png
deleted file mode 100644
index daa7fa638..000000000
Binary files a/src/main/res/drawable-hdpi/message_bubble_received_warning_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_warning_non_last.9.png b/src/main/res/drawable-hdpi/message_bubble_received_warning_non_last.9.png
new file mode 100644
index 000000000..b6248d8d4
Binary files /dev/null and b/src/main/res/drawable-hdpi/message_bubble_received_warning_non_last.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png
index fbf1b049b..9fe7599f9 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-hdpi/message_bubble_received_white.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_white_non_first.9.png b/src/main/res/drawable-hdpi/message_bubble_received_white_non_first.9.png
deleted file mode 100644
index b7284c37d..000000000
Binary files a/src/main/res/drawable-hdpi/message_bubble_received_white_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_received_white_non_last.9.png b/src/main/res/drawable-hdpi/message_bubble_received_white_non_last.9.png
new file mode 100644
index 000000000..8da05c4ad
Binary files /dev/null and b/src/main/res/drawable-hdpi/message_bubble_received_white_non_last.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_send_grey_non_first.9.png b/src/main/res/drawable-hdpi/message_bubble_send_grey_non_first.9.png
deleted file mode 100644
index e10907473..000000000
Binary files a/src/main/res/drawable-hdpi/message_bubble_send_grey_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_send_grey_non_last.9.png b/src/main/res/drawable-hdpi/message_bubble_send_grey_non_last.9.png
new file mode 100644
index 000000000..8ee5d6756
Binary files /dev/null and b/src/main/res/drawable-hdpi/message_bubble_send_grey_non_last.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent.9.png b/src/main/res/drawable-hdpi/message_bubble_sent.9.png
index 6af5da758..7db6c812c 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_sent.9.png and b/src/main/res/drawable-hdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png
index 73911092f..9c2acc0cd 100644
Binary files a/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png and b/src/main/res/drawable-hdpi/message_bubble_sent_grey.9.png differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent_non_first.9.png b/src/main/res/drawable-hdpi/message_bubble_sent_non_first.9.png
deleted file mode 100644
index ef5ed8673..000000000
Binary files a/src/main/res/drawable-hdpi/message_bubble_sent_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-hdpi/message_bubble_sent_non_last.9.png b/src/main/res/drawable-hdpi/message_bubble_sent_non_last.9.png
new file mode 100644
index 000000000..b97e6996c
Binary files /dev/null and b/src/main/res/drawable-hdpi/message_bubble_sent_non_last.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received.9.png b/src/main/res/drawable-mdpi/message_bubble_received.9.png
index 21d4e5c96..14e38df62 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_received.9.png and b/src/main/res/drawable-mdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png
index 582bc86da..55b714fa0 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png and b/src/main/res/drawable-mdpi/message_bubble_received_dark.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_dark_non_first.9.png b/src/main/res/drawable-mdpi/message_bubble_received_dark_non_first.9.png
deleted file mode 100644
index 51c17547d..000000000
Binary files a/src/main/res/drawable-mdpi/message_bubble_received_dark_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_dark_non_last.9.png b/src/main/res/drawable-mdpi/message_bubble_received_dark_non_last.9.png
new file mode 100644
index 000000000..a2ef79a02
Binary files /dev/null and b/src/main/res/drawable-mdpi/message_bubble_received_dark_non_last.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png
index 57f239ae2..3199a6267 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png and b/src/main/res/drawable-mdpi/message_bubble_received_grey.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_grey_non_first.9.png b/src/main/res/drawable-mdpi/message_bubble_received_grey_non_first.9.png
deleted file mode 100644
index 52b4f4854..000000000
Binary files a/src/main/res/drawable-mdpi/message_bubble_received_grey_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_grey_non_last.9.png b/src/main/res/drawable-mdpi/message_bubble_received_grey_non_last.9.png
new file mode 100644
index 000000000..a4d84f4f1
Binary files /dev/null and b/src/main/res/drawable-mdpi/message_bubble_received_grey_non_last.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_non_first.9.png b/src/main/res/drawable-mdpi/message_bubble_received_non_first.9.png
deleted file mode 100644
index 4a37b5278..000000000
Binary files a/src/main/res/drawable-mdpi/message_bubble_received_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_non_last.9.png b/src/main/res/drawable-mdpi/message_bubble_received_non_last.9.png
new file mode 100644
index 000000000..3df6395ec
Binary files /dev/null and b/src/main/res/drawable-mdpi/message_bubble_received_non_last.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png
index a8bcd0681..0352b6321 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-mdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_warning_non_first.9.png b/src/main/res/drawable-mdpi/message_bubble_received_warning_non_first.9.png
deleted file mode 100644
index 70063843c..000000000
Binary files a/src/main/res/drawable-mdpi/message_bubble_received_warning_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_warning_non_last.9.png b/src/main/res/drawable-mdpi/message_bubble_received_warning_non_last.9.png
new file mode 100644
index 000000000..6760f26d5
Binary files /dev/null and b/src/main/res/drawable-mdpi/message_bubble_received_warning_non_last.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png
index a3e56adf2..7e75d63c6 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-mdpi/message_bubble_received_white.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_white_non_first.9.png b/src/main/res/drawable-mdpi/message_bubble_received_white_non_first.9.png
deleted file mode 100644
index b9225d95c..000000000
Binary files a/src/main/res/drawable-mdpi/message_bubble_received_white_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_received_white_non_last.9.png b/src/main/res/drawable-mdpi/message_bubble_received_white_non_last.9.png
new file mode 100644
index 000000000..a0204ee17
Binary files /dev/null and b/src/main/res/drawable-mdpi/message_bubble_received_white_non_last.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_send_grey_non_first.9.png b/src/main/res/drawable-mdpi/message_bubble_send_grey_non_first.9.png
deleted file mode 100644
index 4ef721ee4..000000000
Binary files a/src/main/res/drawable-mdpi/message_bubble_send_grey_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_send_grey_non_last.9.png b/src/main/res/drawable-mdpi/message_bubble_send_grey_non_last.9.png
new file mode 100644
index 000000000..583bef6ed
Binary files /dev/null and b/src/main/res/drawable-mdpi/message_bubble_send_grey_non_last.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent.9.png b/src/main/res/drawable-mdpi/message_bubble_sent.9.png
index f41638f48..f27ff389b 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_sent.9.png and b/src/main/res/drawable-mdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png
index eb9349cf2..2c7de2d60 100644
Binary files a/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png and b/src/main/res/drawable-mdpi/message_bubble_sent_grey.9.png differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent_non_first.9.png b/src/main/res/drawable-mdpi/message_bubble_sent_non_first.9.png
deleted file mode 100644
index f759eb60c..000000000
Binary files a/src/main/res/drawable-mdpi/message_bubble_sent_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-mdpi/message_bubble_sent_non_last.9.png b/src/main/res/drawable-mdpi/message_bubble_sent_non_last.9.png
new file mode 100644
index 000000000..c8e8e1b50
Binary files /dev/null and b/src/main/res/drawable-mdpi/message_bubble_sent_non_last.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received.9.png b/src/main/res/drawable-xhdpi/message_bubble_received.9.png
index cfb1f00fd..01f0962af 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png
index 4bdb3401d..cb24d2656 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received_dark.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_dark_non_first.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_dark_non_first.9.png
deleted file mode 100644
index 5272062d8..000000000
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_dark_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_dark_non_last.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_dark_non_last.9.png
new file mode 100644
index 000000000..1eafcb17f
Binary files /dev/null and b/src/main/res/drawable-xhdpi/message_bubble_received_dark_non_last.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png
index ee515aeda..d40f146c9 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received_grey.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_grey_non_first.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_grey_non_first.9.png
deleted file mode 100644
index 71c431e49..000000000
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_grey_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_grey_non_last.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_grey_non_last.9.png
new file mode 100644
index 000000000..9d7f5a12b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/message_bubble_received_grey_non_last.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_non_first.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_non_first.9.png
deleted file mode 100644
index e32724b1c..000000000
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_non_last.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_non_last.9.png
new file mode 100644
index 000000000..90d620e0a
Binary files /dev/null and b/src/main/res/drawable-xhdpi/message_bubble_received_non_last.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png
index aa5aac296..ade377cbf 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_warning_non_first.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_warning_non_first.9.png
deleted file mode 100644
index 43a5a189c..000000000
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_warning_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_warning_non_last.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_warning_non_last.9.png
new file mode 100644
index 000000000..ea980cd9b
Binary files /dev/null and b/src/main/res/drawable-xhdpi/message_bubble_received_warning_non_last.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png
index 2dd5662fd..2732cc9d2 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-xhdpi/message_bubble_received_white.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_white_non_first.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_white_non_first.9.png
deleted file mode 100644
index 495cbdfc0..000000000
Binary files a/src/main/res/drawable-xhdpi/message_bubble_received_white_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_received_white_non_last.9.png b/src/main/res/drawable-xhdpi/message_bubble_received_white_non_last.9.png
new file mode 100644
index 000000000..dd3e2fac6
Binary files /dev/null and b/src/main/res/drawable-xhdpi/message_bubble_received_white_non_last.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_send_grey_non_first.9.png b/src/main/res/drawable-xhdpi/message_bubble_send_grey_non_first.9.png
deleted file mode 100644
index e1ae44ae3..000000000
Binary files a/src/main/res/drawable-xhdpi/message_bubble_send_grey_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_send_grey_non_last.9.png b/src/main/res/drawable-xhdpi/message_bubble_send_grey_non_last.9.png
new file mode 100644
index 000000000..55d29d672
Binary files /dev/null and b/src/main/res/drawable-xhdpi/message_bubble_send_grey_non_last.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png
index 19ed9f000..28f44b2eb 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xhdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png
index b9ed6b161..72dd7dbdd 100644
Binary files a/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png and b/src/main/res/drawable-xhdpi/message_bubble_sent_grey.9.png differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent_non_first.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent_non_first.9.png
deleted file mode 100644
index f9c95b674..000000000
Binary files a/src/main/res/drawable-xhdpi/message_bubble_sent_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xhdpi/message_bubble_sent_non_last.9.png b/src/main/res/drawable-xhdpi/message_bubble_sent_non_last.9.png
new file mode 100644
index 000000000..d0db51a20
Binary files /dev/null and b/src/main/res/drawable-xhdpi/message_bubble_sent_non_last.9.png differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received.9.png
deleted file mode 100644
index f38f6621e..000000000
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png
deleted file mode 100644
index 5bfc1bdb7..000000000
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_dark.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_dark_non_first.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_dark_non_first.9.png
deleted file mode 100644
index 4a50e557b..000000000
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_dark_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png
deleted file mode 100644
index 757186c80..000000000
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_grey.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_grey_non_first.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_grey_non_first.9.png
deleted file mode 100644
index f0c41823d..000000000
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_grey_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_non_first.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_non_first.9.png
deleted file mode 100644
index cdfbf9b8e..000000000
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png
deleted file mode 100644
index 22401dafc..000000000
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_warning.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_warning_non_first.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_warning_non_first.9.png
deleted file mode 100644
index 3e345be71..000000000
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_warning_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png
deleted file mode 100644
index 857d63392..000000000
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_white.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_received_white_non_first.9.png b/src/main/res/drawable-xxhdpi/message_bubble_received_white_non_first.9.png
deleted file mode 100644
index 46a110e4a..000000000
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_received_white_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_send_grey_non_first.9.png b/src/main/res/drawable-xxhdpi/message_bubble_send_grey_non_first.9.png
deleted file mode 100644
index cacc45bb9..000000000
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_send_grey_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png
deleted file mode 100644
index a06338049..000000000
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_sent.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png
deleted file mode 100644
index 186075512..000000000
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_sent_grey.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxhdpi/message_bubble_sent_non_first.9.png b/src/main/res/drawable-xxhdpi/message_bubble_sent_non_first.9.png
deleted file mode 100644
index 841f902d7..000000000
Binary files a/src/main/res/drawable-xxhdpi/message_bubble_sent_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png
index 868f8ca27..dec891203 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png
index 1c1392a77..6ed9c033d 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received_dark.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_dark_non_first.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_dark_non_first.9.png
deleted file mode 100644
index dc482a9ab..000000000
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_dark_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_dark_non_last.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_dark_non_last.9.png
new file mode 100644
index 000000000..27f93e7d9
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/message_bubble_received_dark_non_last.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png
index 90d862f3a..290eab39a 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey_non_first.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey_non_first.9.png
deleted file mode 100644
index f40766388..000000000
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_grey_non_last.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey_non_last.9.png
new file mode 100644
index 000000000..99e20cc43
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/message_bubble_received_grey_non_last.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_non_first.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_non_first.9.png
deleted file mode 100644
index 81e47afb5..000000000
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_non_last.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_non_last.9.png
new file mode 100644
index 000000000..9964cf78d
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/message_bubble_received_non_last.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png
index ed555201a..6c0ee86db 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning_non_first.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning_non_first.9.png
deleted file mode 100644
index bda42abc5..000000000
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_warning_non_last.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning_non_last.9.png
new file mode 100644
index 000000000..ced8b7a60
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/message_bubble_received_warning_non_last.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png
index d67d66a96..83aae671e 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_received_white.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_white_non_first.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_white_non_first.9.png
deleted file mode 100644
index 05a592bd0..000000000
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_received_white_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_received_white_non_last.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_received_white_non_last.9.png
new file mode 100644
index 000000000..43f31d12b
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/message_bubble_received_white_non_last.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_send_grey_non_first.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_send_grey_non_first.9.png
deleted file mode 100644
index ee76a8fcb..000000000
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_send_grey_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_send_grey_non_last.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_send_grey_non_last.9.png
new file mode 100644
index 000000000..8f8158fc1
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/message_bubble_send_grey_non_last.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png
index e80ff5402..c1f75953a 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_sent.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png
index 26f746381..3a02ca899 100644
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png and b/src/main/res/drawable-xxxhdpi/message_bubble_sent_grey.9.png differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent_non_first.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent_non_first.9.png
deleted file mode 100644
index 802d3965c..000000000
Binary files a/src/main/res/drawable-xxxhdpi/message_bubble_sent_non_first.9.png and /dev/null differ
diff --git a/src/main/res/drawable-xxxhdpi/message_bubble_sent_non_last.9.png b/src/main/res/drawable-xxxhdpi/message_bubble_sent_non_last.9.png
new file mode 100644
index 000000000..03495ff9f
Binary files /dev/null and b/src/main/res/drawable-xxxhdpi/message_bubble_sent_non_last.9.png differ
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index b49c8d1f9..67e28f143 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -14,7 +14,8 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        android:translationY="-2dp"
         android:scaleType="fitXY"
         app:riv_corner_radius="6dp" />
 
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 306e1dab8..c4564a923 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -13,8 +13,9 @@
         android:id="@+id/message_photo"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
         android:layout_alignParentRight="true"
+        android:translationY="-2dp"
         android:scaleType="fitXY"
         app:riv_corner_radius="6dp" />
 
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 3b4f7ea85..ff3e6fd93 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -55,9 +55,9 @@
     <attr name="message_bubble_received_monochrome" format="reference" />
     <attr name="message_bubble_sent" format="reference" />
     <attr name="message_bubble_received_green" format="reference" />
-    <attr name="message_bubble_received_monochrome_non_first" format="reference" />
-    <attr name="message_bubble_sent_non_first" format="reference" />
-    <attr name="message_bubble_received_green_non_first" format="reference" />
+    <attr name="message_bubble_received_monochrome_non_last" format="reference" />
+    <attr name="message_bubble_sent_non_last" format="reference" />
+    <attr name="message_bubble_received_green_non_last" format="reference" />
 
     <attr name="unread_count" format="reference|color" />
 
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index bbd780fee..11a671c54 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -73,12 +73,12 @@
             @drawable/message_bubble_received
         </item>
 
-        <item name="message_bubble_received_monochrome_non_first" type="reference">
-            @drawable/message_bubble_received_white_non_first
+        <item name="message_bubble_received_monochrome_non_last" type="reference">
+            @drawable/message_bubble_received_white_non_last
         </item>
-        <item name="message_bubble_sent_non_first" type="reference">@drawable/message_bubble_sent_non_first</item>
-        <item name="message_bubble_received_green_non_first" type="reference">
-            @drawable/message_bubble_received_non_first
+        <item name="message_bubble_sent_non_last" type="reference">@drawable/message_bubble_sent_non_last</item>
+        <item name="message_bubble_received_green_non_last" type="reference">
+            @drawable/message_bubble_received_non_last
         </item>
 
         <item name="unread_count">@color/green700_desaturated</item>
@@ -239,12 +239,12 @@
             @drawable/message_bubble_received_dark
         </item>
 
-        <item name="message_bubble_received_monochrome_non_first" type="reference">
-            @drawable/message_bubble_received_grey_non_first
+        <item name="message_bubble_received_monochrome_non_last" type="reference">
+            @drawable/message_bubble_received_grey_non_last
         </item>
-        <item name="message_bubble_sent_non_first" type="reference">@drawable/message_bubble_send_grey_non_first</item>
-        <item name="message_bubble_received_green_non_first" type="reference">
-            @drawable/message_bubble_received_dark_non_first
+        <item name="message_bubble_sent_non_last" type="reference">@drawable/message_bubble_send_grey_non_last</item>
+        <item name="message_bubble_received_green_non_last" type="reference">
+            @drawable/message_bubble_received_dark_non_last
         </item>
 
         <item name="unread_count">@color/green900_desaturated</item>