diff --git a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
index 97356396b0..c7d1623b06 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
@@ -48,7 +48,7 @@ public class LongMessageActivity extends PassphraseRequiredActivity {
   private static final int MAX_DISPLAY_LENGTH = 64 * 1024;
 
   private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
-  private final DynamicTheme    dynamicTheme    = new DynamicDarkActionBarTheme();
+  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
 
   private Stub<ViewGroup> sentBubble;
   private Stub<ViewGroup> receivedBubble;
@@ -80,10 +80,6 @@ public class LongMessageActivity extends PassphraseRequiredActivity {
 
     initViewModel(getIntent().getLongExtra(KEY_MESSAGE_ID, -1), getIntent().getBooleanExtra(KEY_IS_MMS, false));
 
-    LiveRecipient conversationRecipient = Recipient.live(getIntent().getParcelableExtra(KEY_CONVERSATION_RECIPIENT));
-    conversationRecipient.observe(this, recipient -> updateActionBarColor(recipient.getColor()));
-    updateActionBarColor(conversationRecipient.get().getColor());
-
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
   }
 
@@ -107,11 +103,6 @@ public class LongMessageActivity extends PassphraseRequiredActivity {
     return false;
   }
 
-  private void updateActionBarColor(@NonNull MaterialColor color) {
-    getSupportActionBar().setBackgroundDrawable(new ColorDrawable(color.toActionBarColor(this)));
-    WindowUtil.setStatusBarColor(getWindow(), color.toStatusBarColor(this));
-  }
-
   private void initViewModel(long messageId, boolean isMms) {
     viewModel = ViewModelProviders.of(this, new LongMessageViewModel.Factory(getApplication(), new LongMessageRepository(this), messageId, isMms))
                                   .get(LongMessageViewModel.class);
diff --git a/app/src/main/res/layout/longmessage_activity.xml b/app/src/main/res/layout/longmessage_activity.xml
index 49f0641ab5..a507a603fa 100644
--- a/app/src/main/res/layout/longmessage_activity.xml
+++ b/app/src/main/res/layout/longmessage_activity.xml
@@ -1,26 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView
+<FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <FrameLayout
+    <View
+        android:layout_height="5dp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="16dp">
+        android:background="@drawable/toolbar_shadow" />
 
-        <ViewStub
-            android:id="@+id/longmessage_sent_stub"
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout="@layout/longmessage_bubble_sent"/>
+            android:padding="16dp">
 
-        <ViewStub
-            android:id="@+id/longmessage_received_stub"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout="@layout/longmessage_bubble_received"/>
+            <ViewStub
+                android:id="@+id/longmessage_sent_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout="@layout/longmessage_bubble_sent"/>
 
-    </FrameLayout>
+            <ViewStub
+                android:id="@+id/longmessage_received_stub"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout="@layout/longmessage_bubble_received"/>
 
-</ScrollView>
\ No newline at end of file
+        </FrameLayout>
+
+    </ScrollView>
+
+</FrameLayout>
\ No newline at end of file