diff --git a/ui/conversation-viewer.ui b/ui/conversation-viewer.ui
index 41ffa01c..75e3c008 100644
--- a/ui/conversation-viewer.ui
+++ b/ui/conversation-viewer.ui
@@ -3,11 +3,13 @@
 <interface>
   <requires lib="gtk+" version="3.10"/>
   <template class="ConversationViewer" parent="GtkStack">
+    <property name="name">conversation_viewer</property>
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="transition_type">crossfade</property>
     <child>
       <object class="GtkImage" id="splash_page">
+        <property name="name">splash_page</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="pixel_size">256</property>
@@ -64,16 +66,12 @@
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkLabel" id="user_message_label">
-            <property name="name">100</property>
+            <property name="name">user_message</property>
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xpad">18</property>
             <property name="ypad">18</property>
             <property name="label">🎔</property>
-            <style>
-              <class name="frame"/>
-              <class name="view"/>
-            </style>
           </object>
           <packing>
             <property name="expand">True</property>
diff --git a/ui/geary.css b/ui/geary.css
index 9766d00e..d7a5808c 100644
--- a/ui/geary.css
+++ b/ui/geary.css
@@ -97,3 +97,10 @@ row.geary-folder-popover-list-row > label {
 #composer_embed headerbar {
   border-radius: 0px;
 }
+
+#user_message {
+  border: 1px solid @borders;
+  border-left: 0;
+  border-right: 0;
+  background: @theme_base_color;
+}