diff --git a/res/layout/view_fake_chat.xml b/res/layout/view_fake_chat.xml
index 5680186dc2..654cbd86bf 100644
--- a/res/layout/view_fake_chat.xml
+++ b/res/layout/view_fake_chat.xml
@@ -5,6 +5,7 @@
     android:layout_height="wrap_content"
     android:paddingLeft="@dimen/very_large_spacing"
     android:paddingRight="@dimen/very_large_spacing"
+    android:paddingBottom="@dimen/medium_spacing"
     android:orientation="vertical">
 
     <TextView
diff --git a/res/values-notnight-v21/styles.xml b/res/values-notnight-v21/styles.xml
index 6bcd395e17..2cb9066705 100644
--- a/res/values-notnight-v21/styles.xml
+++ b/res/values-notnight-v21/styles.xml
@@ -11,4 +11,14 @@
         <item name="android:textColor">@android:color/white</item>
     </style>
 
+    <style name="FakeChatViewMessageBubble.Incoming">
+        <item name="android:background">@drawable/fake_chat_view_incoming_message_background</item>
+        <item name="android:elevation">4dp</item>
+    </style>
+
+    <style name="FakeChatViewMessageBubble.Outgoing">
+        <item name="android:background">@drawable/fake_chat_view_outgoing_message_background</item>
+        <item name="android:elevation">4dp</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 1c0282a999..083cdd33b8 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -29,7 +29,7 @@
     <dimen name="text_view_corner_radius">8dp</dimen>
     <dimen name="fake_chat_view_bubble_width">224dp</dimen>
     <dimen name="fake_chat_view_bubble_corner_radius">10dp</dimen>
-    <dimen name="fake_chat_view_height">234dp</dimen>
+    <dimen name="fake_chat_view_height">250dp</dimen>
     <dimen name="setting_button_height">56dp</dimen>
     <dimen name="dialog_corner_radius">12dp</dimen>
     <dimen name="dialog_button_corner_radius">4dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 478bdc22b4..10c311d33a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -184,10 +184,12 @@
 
     <style name="FakeChatViewMessageBubble.Incoming">
         <item name="android:background">@drawable/fake_chat_view_incoming_message_background</item>
+        <item name="android:elevation">10dp</item>
     </style>
 
     <style name="FakeChatViewMessageBubble.Outgoing">
         <item name="android:background">@drawable/fake_chat_view_outgoing_message_background</item>
+        <item name="android:elevation">10dp</item>
     </style>
     <!-- Session -->
 
diff --git a/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt b/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
index 60b0585715..017f55d353 100644
--- a/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/FakeChatView.kt
@@ -1,14 +1,18 @@
 package org.thoughtcrime.securesms.loki.views
 
+import android.animation.FloatEvaluator
+import android.animation.ValueAnimator
 import android.content.Context
 import android.content.Context.LAYOUT_INFLATER_SERVICE
 import android.os.Handler
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
+import android.widget.LinearLayout
 import android.widget.ScrollView
 import kotlinx.android.synthetic.main.view_fake_chat.view.*
 import network.loki.messenger.R
+import org.thoughtcrime.securesms.loki.utilities.disableClipping
 
 class FakeChatView : ScrollView {
 
@@ -38,7 +42,8 @@ class FakeChatView : ScrollView {
 
     private fun setUpViewHierarchy() {
         val inflater = context.getSystemService(LAYOUT_INFLATER_SERVICE) as LayoutInflater
-        val contentView = inflater.inflate(R.layout.view_fake_chat, null)
+        val contentView = inflater.inflate(R.layout.view_fake_chat, null) as LinearLayout
+        contentView.disableClipping()
         addView(contentView)
         isVerticalScrollBarEnabled = false
     }
@@ -47,8 +52,13 @@ class FakeChatView : ScrollView {
     // region Animation
     fun startAnimating() {
         listOf( bubble1, bubble2, bubble3, bubble4, bubble5 ).forEach { it.alpha = 0.0f }
-        fun show(view: View) {
-            view.animate().alpha(1.0f).setDuration(animationDuration).start()
+        fun show(bubble: View) {
+            val animation = ValueAnimator.ofObject(FloatEvaluator(), 0.0f, 1.0f)
+            animation.duration = animationDuration
+            animation.addUpdateListener { animator ->
+                bubble.alpha = animator.animatedValue as Float
+            }
+            animation.start()
         }
         Handler().postDelayed({
             show(bubble1)