diff --git a/lib/components/list_items/message.dart b/lib/components/list_items/message.dart
index 82acc023..bb81d02a 100644
--- a/lib/components/list_items/message.dart
+++ b/lib/components/list_items/message.dart
@@ -29,7 +29,7 @@ class Message extends StatelessWidget {
     Client client = Matrix.of(context).client;
     final bool ownMessage = event.senderId == client.userID;
     Alignment alignment = ownMessage ? Alignment.topRight : Alignment.topLeft;
-    Color color = Colors.white;
+    Color color = Theme.of(context).secondaryHeaderColor;
     final bool sameSender = nextEvent != null &&
             [EventTypes.Message, EventTypes.Sticker].contains(nextEvent.type)
         ? nextEvent.sender.id == event.sender.id
@@ -135,7 +135,8 @@ class Message extends StatelessWidget {
             duration: Duration(milliseconds: 500),
             opacity: event.status == 0 ? 0.5 : 1,
             child: Bubble(
-              //elevation: 0,
+              elevation: 0,
+              radius: Radius.circular(8),
               alignment: alignment,
               margin: BubbleEdges.symmetric(horizontal: 4),
               color: color,
diff --git a/lib/components/list_items/state_message.dart b/lib/components/list_items/state_message.dart
index 0f751c69..f50753aa 100644
--- a/lib/components/list_items/state_message.dart
+++ b/lib/components/list_items/state_message.dart
@@ -20,6 +20,7 @@ class StateMessage extends StatelessWidget {
       child: Opacity(
         opacity: 0.5,
         child: Bubble(
+          elevation: 0,
           color: Colors.black,
           alignment: Alignment.center,
           child: LinkText(
diff --git a/lib/main.dart b/lib/main.dart
index 6d24ac7c..dfb2ea13 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -29,7 +29,7 @@ class App extends StatelessWidget {
             brightness: Brightness.light,
             primaryColor: Color(0xFF5625BA),
             backgroundColor: Colors.white,
-            secondaryHeaderColor: Color(0xFFF6F0F6),
+            secondaryHeaderColor: Color(0xFFECECF2),
             scaffoldBackgroundColor: Colors.white,
             dialogTheme: DialogTheme(
               shape: RoundedRectangleBorder(
diff --git a/lib/views/chat.dart b/lib/views/chat.dart
index a941d68f..159cb2d3 100644
--- a/lib/views/chat.dart
+++ b/lib/views/chat.dart
@@ -253,7 +253,6 @@ class _ChatState extends State<_Chat> {
         ),
         actions: <Widget>[ChatSettingsPopupMenu(room, !room.isDirectChat)],
       ),
-      backgroundColor: Theme.of(context).secondaryHeaderColor,
       body: SafeArea(
         child: Column(
           children: <Widget>[