diff --git a/briar-android/src/main/res/drawable-hdpi/msg_in.9.png b/briar-android/src/main/res/drawable-hdpi/msg_in.9.png
deleted file mode 100644
index 9a8176354..000000000
Binary files a/briar-android/src/main/res/drawable-hdpi/msg_in.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-hdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-hdpi/msg_in_top.9.png
deleted file mode 100644
index bcff2b787..000000000
Binary files a/briar-android/src/main/res/drawable-hdpi/msg_in_top.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-hdpi/msg_out.9.png b/briar-android/src/main/res/drawable-hdpi/msg_out.9.png
deleted file mode 100644
index bd6a809ec..000000000
Binary files a/briar-android/src/main/res/drawable-hdpi/msg_out.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-hdpi/msg_out_top.9.png b/briar-android/src/main/res/drawable-hdpi/msg_out_top.9.png
deleted file mode 100644
index b6898258a..000000000
Binary files a/briar-android/src/main/res/drawable-hdpi/msg_out_top.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notice_in.9.png b/briar-android/src/main/res/drawable-hdpi/notice_in.9.png
deleted file mode 100644
index 1bc46ba17..000000000
Binary files a/briar-android/src/main/res/drawable-hdpi/notice_in.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notice_in_bottom.9.png b/briar-android/src/main/res/drawable-hdpi/notice_in_bottom.9.png
deleted file mode 100644
index 9c5916e12..000000000
Binary files a/briar-android/src/main/res/drawable-hdpi/notice_in_bottom.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notice_out.9.png b/briar-android/src/main/res/drawable-hdpi/notice_out.9.png
deleted file mode 100644
index 0d08d9e3e..000000000
Binary files a/briar-android/src/main/res/drawable-hdpi/notice_out.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notice_out_bottom.9.png b/briar-android/src/main/res/drawable-hdpi/notice_out_bottom.9.png
deleted file mode 100644
index b94109764..000000000
Binary files a/briar-android/src/main/res/drawable-hdpi/notice_out_bottom.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-mdpi/msg_in.9.png b/briar-android/src/main/res/drawable-mdpi/msg_in.9.png
deleted file mode 100644
index 8dcac8ebf..000000000
Binary files a/briar-android/src/main/res/drawable-mdpi/msg_in.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-mdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-mdpi/msg_in_top.9.png
deleted file mode 100644
index 0307d2f68..000000000
Binary files a/briar-android/src/main/res/drawable-mdpi/msg_in_top.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-mdpi/msg_out.9.png b/briar-android/src/main/res/drawable-mdpi/msg_out.9.png
deleted file mode 100644
index a971fa9ee..000000000
Binary files a/briar-android/src/main/res/drawable-mdpi/msg_out.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-mdpi/msg_out_top.9.png b/briar-android/src/main/res/drawable-mdpi/msg_out_top.9.png
deleted file mode 100644
index 526edd212..000000000
Binary files a/briar-android/src/main/res/drawable-mdpi/msg_out_top.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notice_in.9.png b/briar-android/src/main/res/drawable-mdpi/notice_in.9.png
deleted file mode 100644
index 17344215d..000000000
Binary files a/briar-android/src/main/res/drawable-mdpi/notice_in.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notice_in_bottom.9.png b/briar-android/src/main/res/drawable-mdpi/notice_in_bottom.9.png
deleted file mode 100644
index f64d08347..000000000
Binary files a/briar-android/src/main/res/drawable-mdpi/notice_in_bottom.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notice_out.9.png b/briar-android/src/main/res/drawable-mdpi/notice_out.9.png
deleted file mode 100644
index 600e2bcfa..000000000
Binary files a/briar-android/src/main/res/drawable-mdpi/notice_out.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notice_out_bottom.9.png b/briar-android/src/main/res/drawable-mdpi/notice_out_bottom.9.png
deleted file mode 100644
index 674b59a31..000000000
Binary files a/briar-android/src/main/res/drawable-mdpi/notice_out_bottom.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-night-hdpi/msg_in.9.png b/briar-android/src/main/res/drawable-night-hdpi/msg_in.9.png
deleted file mode 100644
index 008d7833b..000000000
Binary files a/briar-android/src/main/res/drawable-night-hdpi/msg_in.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-night-hdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-night-hdpi/msg_in_top.9.png
deleted file mode 100644
index 4d34c5065..000000000
Binary files a/briar-android/src/main/res/drawable-night-hdpi/msg_in_top.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-night-mdpi/msg_in.9.png b/briar-android/src/main/res/drawable-night-mdpi/msg_in.9.png
deleted file mode 100644
index 4b8904541..000000000
Binary files a/briar-android/src/main/res/drawable-night-mdpi/msg_in.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-night-mdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-night-mdpi/msg_in_top.9.png
deleted file mode 100644
index ebad24e9f..000000000
Binary files a/briar-android/src/main/res/drawable-night-mdpi/msg_in_top.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-night-xhdpi/msg_in.9.png b/briar-android/src/main/res/drawable-night-xhdpi/msg_in.9.png
deleted file mode 100644
index 13597cfa4..000000000
Binary files a/briar-android/src/main/res/drawable-night-xhdpi/msg_in.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-night-xhdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-night-xhdpi/msg_in_top.9.png
deleted file mode 100644
index c3b950d4b..000000000
Binary files a/briar-android/src/main/res/drawable-night-xhdpi/msg_in_top.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-night-xxhdpi/msg_in.9.png b/briar-android/src/main/res/drawable-night-xxhdpi/msg_in.9.png
deleted file mode 100644
index cef3f185e..000000000
Binary files a/briar-android/src/main/res/drawable-night-xxhdpi/msg_in.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-night-xxhdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-night-xxhdpi/msg_in_top.9.png
deleted file mode 100644
index 60ea93838..000000000
Binary files a/briar-android/src/main/res/drawable-night-xxhdpi/msg_in_top.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/msg_in.9.png b/briar-android/src/main/res/drawable-xhdpi/msg_in.9.png
deleted file mode 100644
index 35e4f5309..000000000
Binary files a/briar-android/src/main/res/drawable-xhdpi/msg_in.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-xhdpi/msg_in_top.9.png
deleted file mode 100644
index eba9138bc..000000000
Binary files a/briar-android/src/main/res/drawable-xhdpi/msg_in_top.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/msg_out.9.png b/briar-android/src/main/res/drawable-xhdpi/msg_out.9.png
deleted file mode 100644
index 39ca327f4..000000000
Binary files a/briar-android/src/main/res/drawable-xhdpi/msg_out.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/msg_out_top.9.png b/briar-android/src/main/res/drawable-xhdpi/msg_out_top.9.png
deleted file mode 100644
index f06ff20ba..000000000
Binary files a/briar-android/src/main/res/drawable-xhdpi/msg_out_top.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notice_in.9.png b/briar-android/src/main/res/drawable-xhdpi/notice_in.9.png
deleted file mode 100644
index 3b3af4683..000000000
Binary files a/briar-android/src/main/res/drawable-xhdpi/notice_in.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notice_in_bottom.9.png b/briar-android/src/main/res/drawable-xhdpi/notice_in_bottom.9.png
deleted file mode 100644
index 5d7ba38cc..000000000
Binary files a/briar-android/src/main/res/drawable-xhdpi/notice_in_bottom.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notice_out.9.png b/briar-android/src/main/res/drawable-xhdpi/notice_out.9.png
deleted file mode 100644
index 2a4c85db1..000000000
Binary files a/briar-android/src/main/res/drawable-xhdpi/notice_out.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notice_out_bottom.9.png b/briar-android/src/main/res/drawable-xhdpi/notice_out_bottom.9.png
deleted file mode 100644
index a9a19763d..000000000
Binary files a/briar-android/src/main/res/drawable-xhdpi/notice_out_bottom.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/msg_in.9.png b/briar-android/src/main/res/drawable-xxhdpi/msg_in.9.png
deleted file mode 100644
index cee5a53b0..000000000
Binary files a/briar-android/src/main/res/drawable-xxhdpi/msg_in.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/msg_in_top.9.png b/briar-android/src/main/res/drawable-xxhdpi/msg_in_top.9.png
deleted file mode 100644
index e9829962e..000000000
Binary files a/briar-android/src/main/res/drawable-xxhdpi/msg_in_top.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/msg_out.9.png b/briar-android/src/main/res/drawable-xxhdpi/msg_out.9.png
deleted file mode 100644
index 3f4603ad4..000000000
Binary files a/briar-android/src/main/res/drawable-xxhdpi/msg_out.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/msg_out_top.9.png b/briar-android/src/main/res/drawable-xxhdpi/msg_out_top.9.png
deleted file mode 100644
index 054f45de3..000000000
Binary files a/briar-android/src/main/res/drawable-xxhdpi/msg_out_top.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notice_in.9.png b/briar-android/src/main/res/drawable-xxhdpi/notice_in.9.png
deleted file mode 100644
index 8d001ab0b..000000000
Binary files a/briar-android/src/main/res/drawable-xxhdpi/notice_in.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notice_in_bottom.9.png b/briar-android/src/main/res/drawable-xxhdpi/notice_in_bottom.9.png
deleted file mode 100644
index 1a9a07a5e..000000000
Binary files a/briar-android/src/main/res/drawable-xxhdpi/notice_in_bottom.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notice_out.9.png b/briar-android/src/main/res/drawable-xxhdpi/notice_out.9.png
deleted file mode 100644
index 0b1e403dd..000000000
Binary files a/briar-android/src/main/res/drawable-xxhdpi/notice_out.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notice_out_bottom.9.png b/briar-android/src/main/res/drawable-xxhdpi/notice_out_bottom.9.png
deleted file mode 100644
index c23063319..000000000
Binary files a/briar-android/src/main/res/drawable-xxhdpi/notice_out_bottom.9.png and /dev/null differ
diff --git a/briar-android/src/main/res/drawable/msg_in.xml b/briar-android/src/main/res/drawable/msg_in.xml
new file mode 100644
index 000000000..be0e510dc
--- /dev/null
+++ b/briar-android/src/main/res/drawable/msg_in.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<corners
+		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
+		android:bottomRightRadius="@dimen/message_bubble_radius_big"
+		android:topLeftRadius="@dimen/message_bubble_radius_small"
+		android:topRightRadius="@dimen/message_bubble_radius_big"/>
+	<padding
+		android:bottom="@dimen/message_bubble_padding_bottom"
+		android:left="@dimen/message_bubble_padding_sides"
+		android:right="@dimen/message_bubble_padding_sides"
+		android:top="@dimen/message_bubble_padding_top"/>
+	<solid
+		android:color="@color/msg_in"/>
+</shape>
diff --git a/briar-android/src/main/res/drawable/msg_in_top.xml b/briar-android/src/main/res/drawable/msg_in_top.xml
new file mode 100644
index 000000000..3f8c52e40
--- /dev/null
+++ b/briar-android/src/main/res/drawable/msg_in_top.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<corners
+		android:bottomLeftRadius="0dp"
+		android:bottomRightRadius="0dp"
+		android:topLeftRadius="@dimen/message_bubble_radius_small"
+		android:topRightRadius="@dimen/message_bubble_radius_big"/>
+	<padding
+		android:bottom="@dimen/message_bubble_padding_top"
+		android:left="@dimen/message_bubble_padding_sides"
+		android:right="@dimen/message_bubble_padding_sides"
+		android:top="@dimen/message_bubble_padding_top"/>
+	<solid
+		android:color="@color/msg_in"/>
+</shape>
diff --git a/briar-android/src/main/res/drawable/msg_out.xml b/briar-android/src/main/res/drawable/msg_out.xml
new file mode 100644
index 000000000..92db23ba4
--- /dev/null
+++ b/briar-android/src/main/res/drawable/msg_out.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<corners
+		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
+		android:bottomRightRadius="@dimen/message_bubble_radius_big"
+		android:topLeftRadius="@dimen/message_bubble_radius_big"
+		android:topRightRadius="@dimen/message_bubble_radius_small"/>
+	<padding
+		android:bottom="@dimen/message_bubble_padding_bottom"
+		android:left="@dimen/message_bubble_padding_sides"
+		android:right="@dimen/message_bubble_padding_sides"
+		android:top="@dimen/message_bubble_padding_top"/>
+	<solid
+		android:color="@color/msg_out"/>
+</shape>
diff --git a/briar-android/src/main/res/drawable/msg_out_top.xml b/briar-android/src/main/res/drawable/msg_out_top.xml
new file mode 100644
index 000000000..c56165226
--- /dev/null
+++ b/briar-android/src/main/res/drawable/msg_out_top.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<corners
+		android:bottomLeftRadius="0dp"
+		android:bottomRightRadius="0dp"
+		android:topLeftRadius="@dimen/message_bubble_radius_big"
+		android:topRightRadius="@dimen/message_bubble_radius_small"/>
+	<padding
+		android:bottom="@dimen/message_bubble_padding_top"
+		android:left="@dimen/message_bubble_padding_sides"
+		android:right="@dimen/message_bubble_padding_sides"
+		android:top="@dimen/message_bubble_padding_top"/>
+	<solid
+		android:color="@color/msg_out"/>
+</shape>
diff --git a/briar-android/src/main/res/drawable/notice_in.xml b/briar-android/src/main/res/drawable/notice_in.xml
new file mode 100644
index 000000000..4d031a626
--- /dev/null
+++ b/briar-android/src/main/res/drawable/notice_in.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<corners
+		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
+		android:bottomRightRadius="@dimen/message_bubble_radius_big"
+		android:topLeftRadius="@dimen/message_bubble_radius_small"
+		android:topRightRadius="@dimen/message_bubble_radius_big"/>
+	<padding
+		android:bottom="@dimen/message_bubble_padding_bottom"
+		android:left="@dimen/message_bubble_padding_sides"
+		android:right="@dimen/message_bubble_padding_sides"
+		android:top="@dimen/message_bubble_padding_top"/>
+	<solid
+		android:color="@color/notice_in"/>
+</shape>
diff --git a/briar-android/src/main/res/drawable/notice_in_bottom.xml b/briar-android/src/main/res/drawable/notice_in_bottom.xml
new file mode 100644
index 000000000..f4053190e
--- /dev/null
+++ b/briar-android/src/main/res/drawable/notice_in_bottom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<corners
+		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
+		android:bottomRightRadius="@dimen/message_bubble_radius_big"
+		android:topLeftRadius="0dp"
+		android:topRightRadius="0dp"/>
+	<padding
+		android:bottom="@dimen/message_bubble_padding_bottom"
+		android:left="@dimen/message_bubble_padding_sides"
+		android:right="@dimen/message_bubble_padding_sides"
+		android:top="@dimen/message_bubble_padding_bottom"/>
+	<solid
+		android:color="@color/notice_in"/>
+</shape>
diff --git a/briar-android/src/main/res/drawable/notice_out.xml b/briar-android/src/main/res/drawable/notice_out.xml
new file mode 100644
index 000000000..1c9084ba4
--- /dev/null
+++ b/briar-android/src/main/res/drawable/notice_out.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<corners
+		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
+		android:bottomRightRadius="@dimen/message_bubble_radius_big"
+		android:topLeftRadius="@dimen/message_bubble_radius_big"
+		android:topRightRadius="@dimen/message_bubble_radius_small"/>
+	<padding
+		android:bottom="@dimen/message_bubble_padding_bottom"
+		android:left="@dimen/message_bubble_padding_sides"
+		android:right="@dimen/message_bubble_padding_sides"
+		android:top="@dimen/message_bubble_padding_top"/>
+	<solid
+		android:color="@color/notice_out"/>
+</shape>
diff --git a/briar-android/src/main/res/drawable/notice_out_bottom.xml b/briar-android/src/main/res/drawable/notice_out_bottom.xml
new file mode 100644
index 000000000..b42740df4
--- /dev/null
+++ b/briar-android/src/main/res/drawable/notice_out_bottom.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:shape="rectangle">
+	<corners
+		android:bottomLeftRadius="@dimen/message_bubble_radius_big"
+		android:bottomRightRadius="@dimen/message_bubble_radius_big"
+		android:topLeftRadius="0dp"
+		android:topRightRadius="0dp"/>
+	<padding
+		android:bottom="@dimen/message_bubble_padding_bottom"
+		android:left="@dimen/message_bubble_padding_sides"
+		android:right="@dimen/message_bubble_padding_sides"
+		android:top="@dimen/message_bubble_padding_bottom"/>
+	<solid
+		android:color="@color/notice_out"/>
+</shape>
diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml
index 3ef6f3a07..d2c83738c 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_msg_in.xml
@@ -5,9 +5,12 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="wrap_content"
 	android:layout_height="wrap_content"
+	android:layout_marginBottom="@dimen/message_bubble_margin"
 	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 	android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
+	android:layout_marginTop="@dimen/message_bubble_margin"
 	android:background="@drawable/msg_in"
+	android:elevation="@dimen/message_bubble_elevation"
 	android:orientation="vertical">
 
 	<org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -25,7 +28,6 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="right|end"
 		android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
-		android:textColor="?android:attr/textColorSecondary"
 		tools:text="Dec 24, 13:37"/>
 
 </LinearLayout>
diff --git a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
index ab0f325ed..58f9ad862 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_msg_out.xml
@@ -11,9 +11,12 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_gravity="right|end"
+		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginRight="@dimen/message_bubble_margin_tail"
-		android:background="@drawable/msg_out">
+		android:layout_marginTop="@dimen/message_bubble_margin"
+		android:background="@drawable/msg_out"
+		android:elevation="@dimen/message_bubble_elevation">
 
 		<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 			android:id="@+id/text"
diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
index afd04392d..c504e9704 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_notice_in.xml
@@ -4,6 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	android:layout_marginTop="@dimen/message_bubble_margin"
 	android:orientation="vertical">
 
 	<org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -15,16 +16,18 @@
 		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:background="@drawable/msg_in_top"
-		android:textColor="?android:attr/textColorPrimary"
+		android:elevation="@dimen/message_bubble_elevation"
 		tools:text="Short message"/>
 
 	<RelativeLayout
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
-		android:background="@drawable/notice_in_bottom">
+		android:background="@drawable/notice_in_bottom"
+		android:elevation="@dimen/message_bubble_elevation">
 
 		<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 			android:id="@+id/text"
@@ -32,7 +35,6 @@
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
 			android:minWidth="80dp"
-			android:textColor="?android:attr/textColorSecondary"
 			tools:text="@string/forum_invitation_received"/>
 
 		<TextView
@@ -44,7 +46,6 @@
 			android:layout_alignRight="@+id/text"
 			android:layout_below="@+id/text"
 			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
-			android:textColor="?android:attr/textColorTertiary"
 			tools:text="Dec 24, 13:37"/>
 
 	</RelativeLayout>
diff --git a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
index a1aadd1df..50e369a77 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_notice_out.xml
@@ -5,6 +5,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	android:layout_marginTop="@dimen/message_bubble_margin"
 	android:orientation="vertical">
 
 	<org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -15,6 +16,7 @@
 		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginRight="@dimen/message_bubble_margin_tail"
 		android:background="@drawable/msg_out_top"
+		android:elevation="@dimen/message_bubble_elevation"
 		android:textColor="@color/briar_text_primary_inverse"
 		tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/>
 
@@ -22,16 +24,18 @@
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
 		android:layout_marginRight="@dimen/message_bubble_margin_tail"
-		android:background="@drawable/notice_out_bottom">
+		android:background="@drawable/notice_out_bottom"
+		android:elevation="@dimen/message_bubble_elevation">
 
 		<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 			android:id="@+id/text"
 			style="@style/TextMessage.Notice"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:textColor="?android:attr/textColorSecondary"
+			android:textColor="@color/private_message_date_inverse"
 			tools:text="@string/introduction_request_received"/>
 
 		<TextView
@@ -43,7 +47,7 @@
 			android:layout_alignParentStart="true"
 			android:layout_below="@+id/text"
 			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
-			android:textColor="?android:attr/textColorTertiary"
+			android:textColor="@color/private_message_date_inverse"
 			tools:text="Dec 24, 13:37"/>
 
 		<android.support.v7.widget.AppCompatImageView
@@ -54,7 +58,7 @@
 			android:layout_marginLeft="@dimen/margin_medium"
 			android:layout_toEndOf="@+id/time"
 			android:layout_toRightOf="@+id/time"
-			app:tint="?attr/colorControlNormal"
+			app:tint="@color/private_message_date_inverse"
 			tools:ignore="ContentDescription"
 			tools:src="@drawable/message_delivered"/>
 
diff --git a/briar-android/src/main/res/layout/list_item_conversation_request.xml b/briar-android/src/main/res/layout/list_item_conversation_request.xml
index d84e1f16f..16c1f8649 100644
--- a/briar-android/src/main/res/layout/list_item_conversation_request.xml
+++ b/briar-android/src/main/res/layout/list_item_conversation_request.xml
@@ -4,6 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
+	android:layout_marginTop="@dimen/message_bubble_margin"
 	android:orientation="vertical">
 
 	<org.thoughtcrime.securesms.components.emoji.EmojiTextView
@@ -14,6 +15,7 @@
 		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
 		android:background="@drawable/msg_in_top"
+		android:elevation="@dimen/message_bubble_elevation"
 		android:textColor="?android:attr/textColorPrimary"
 		tools:text="Short message"/>
 
@@ -21,16 +23,17 @@
 		android:id="@+id/layout"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
+		android:layout_marginBottom="@dimen/message_bubble_margin"
 		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
 		android:layout_marginRight="@dimen/message_bubble_margin_non_tail"
-		android:background="@drawable/notice_in_bottom">
+		android:background="@drawable/notice_in_bottom"
+		android:elevation="@dimen/message_bubble_elevation">
 
 		<org.thoughtcrime.securesms.components.emoji.EmojiTextView
 			android:id="@+id/text"
 			style="@style/TextMessage.Notice"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:textColor="?android:attr/textColorSecondary"
 			tools:text="@string/introduction_request_received"/>
 
 		<TextView
@@ -42,7 +45,6 @@
 			android:layout_alignRight="@+id/text"
 			android:layout_below="@+id/acceptButton"
 			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
-			android:textColor="?android:attr/textColorTertiary"
 			tools:text="Dec 24, 13:37"/>
 
 		<Button
diff --git a/briar-android/src/main/res/values-night/color.xml b/briar-android/src/main/res/values-night/color.xml
index 52da2643f..420a5fdf5 100644
--- a/briar-android/src/main/res/values-night/color.xml
+++ b/briar-android/src/main/res/values-night/color.xml
@@ -8,6 +8,11 @@
 
 	<color name="color_primary">@color/briar_white</color>
 
+	<color name="msg_in">@color/briar_blue</color>
+	<color name="msg_out">@color/briar_blue_elio_light</color>
+	<color name="notice_in">@color/briar_blue_dark</color>
+	<color name="notice_out">@color/briar_blue_elio</color>
+
 	<color name="window_background">@color/briar_blue_very_dark</color>
 	<color name="card_background">@color/briar_blue_dark</color>
 	<color name="item_background_highlight">@color/briar_blue</color>
diff --git a/briar-android/src/main/res/values/color.xml b/briar-android/src/main/res/values/color.xml
index 725ab397a..86f734559 100644
--- a/briar-android/src/main/res/values/color.xml
+++ b/briar-android/src/main/res/values/color.xml
@@ -4,7 +4,10 @@
 	<color name="briar_blue_dark">#222E3C</color>
 	<color name="briar_blue_very_dark">#0F1720</color>
 	<color name="briar_blue_medium">#4F6C8C</color>
+	<color name="briar_blue_elio">#236087</color>
+	<color name="briar_blue_elio_light">#3C80A9</color>
 	<color name="briar_blue_light">#2A93C6</color>
+	<color name="briar_blue_grey">#EBEFF2</color>
 	<color name="briar_green">#5C940D</color>
 	<color name="briar_green_light">#95D220</color>
 	<color name="briar_red">#ff0000</color>
@@ -30,6 +33,11 @@
 
 	<color name="color_primary">#dd000000</color>
 
+	<color name="msg_in">@color/briar_white</color>
+	<color name="msg_out">@color/briar_blue_elio_light</color>
+	<color name="notice_in">@color/briar_blue_grey</color>
+	<color name="notice_out">@color/briar_blue_elio</color>
+
 	<!-- text colors -->
 	<color name="briar_text_link">@color/briar_blue_light</color>
 	<color name="briar_text_primary">#df000000</color>
diff --git a/briar-android/src/main/res/values/dimens.xml b/briar-android/src/main/res/values/dimens.xml
index c92f335db..4d925f9e6 100644
--- a/briar-android/src/main/res/values/dimens.xml
+++ b/briar-android/src/main/res/values/dimens.xml
@@ -38,9 +38,16 @@
 	<dimen name="unread_bubble_padding_horizontal">6dp</dimen>
 	<dimen name="unread_bubble_size">19dp</dimen>
 
-	<dimen name="message_bubble_margin_tail">3dp</dimen>
+	<dimen name="message_bubble_radius_big">16dp</dimen>
+	<dimen name="message_bubble_radius_small">4dp</dimen>
+	<dimen name="message_bubble_margin">6dp</dimen>
+	<dimen name="message_bubble_padding_sides">12dp</dimen>
+	<dimen name="message_bubble_padding_top">6dp</dimen>
+	<dimen name="message_bubble_padding_bottom">4dp</dimen>
+	<dimen name="message_bubble_timestamp_margin">4dp</dimen>
+	<dimen name="message_bubble_elevation">2dp</dimen>
+	<dimen name="message_bubble_margin_tail">8dp</dimen>
 	<dimen name="message_bubble_margin_non_tail">30dp</dimen>
-	<dimen name="message_bubble_timestamp_margin">7dp</dimen>
 
 	<dimen name="forum_nested_line_width">2dp</dimen>
 	<dimen name="forum_nested_indicator">24dp</dimen>