diff --git a/ui/conversation-message.ui b/ui/conversation-message.ui
index 8ac9c147..8ced5e0f 100644
--- a/ui/conversation-message.ui
+++ b/ui/conversation-message.ui
@@ -57,12 +57,11 @@
                               <object class="GtkLabel" id="preview_from">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="halign">start</property>
                                 <property name="label" translatable="yes">From &lt;email&gt;</property>
                                 <property name="ellipsize">end</property>
                                 <property name="xalign">0</property>
                                 <style>
-                                  <class name="header-value"/>
+                                  <class name="geary-header-label"/>
                                 </style>
                               </object>
                               <packing>
@@ -75,13 +74,12 @@
                               <object class="GtkLabel" id="preview_date">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="valign">baseline</property>
-                                <property name="margin_top">3</property>
                                 <property name="label" translatable="yes">1/1/1970	</property>
                                 <property name="selectable">True</property>
                                 <property name="ellipsize">end</property>
-                                <property name="xalign">1</property>
+                                <style>
+                                  <class name="geary-header-label"/>
+                                </style>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -104,9 +102,6 @@
                             <property name="label" translatable="yes">Preview body text.</property>
                             <property name="ellipsize">end</property>
                             <property name="xalign">0</property>
-                            <style>
-                              <class name="preview-value"/>
-                            </style>
                           </object>
                           <packing>
                             <property name="expand">True</property>
@@ -186,12 +181,9 @@
                               <object class="GtkLabel" id="date">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="halign">start</property>
-                                <property name="valign">baseline</property>
                                 <property name="label" translatable="yes">1/1/1970	</property>
                                 <property name="selectable">True</property>
                                 <property name="ellipsize">end</property>
-                                <property name="xalign">1</property>
                                 <style>
                                   <class name="geary-header-label"/>
                                 </style>
@@ -214,7 +206,6 @@
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="halign">start</property>
-                            <property name="valign">baseline</property>
                             <property name="label" translatable="yes">Subject</property>
                             <property name="wrap">True</property>
                             <property name="selectable">True</property>