diff --git a/ui/composer.glade b/ui/composer.glade
index b5992fd0..3874edac 100644
--- a/ui/composer.glade
+++ b/ui/composer.glade
@@ -258,11 +258,13 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="xpad">6</property>
-                    <property name="label" translatable="yes" comments="Address(es) e-mail is to be sent to">_To:</property>
+                    <property name="label" translatable="yes" comments="Address(es) e-mail is to be sent to">_To</property>
                     <property name="use_underline">True</property>
                     <property name="justify">right</property>
                     <property name="mnemonic_widget">to</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -276,11 +278,13 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="xpad">6</property>
-                    <property name="label" translatable="yes">_Cc:</property>
+                    <property name="label" translatable="yes">_Cc</property>
                     <property name="use_underline">True</property>
                     <property name="justify">right</property>
                     <property name="mnemonic_widget">to</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -335,11 +339,13 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="xpad">6</property>
-                    <property name="label" translatable="yes">_Subject:</property>
+                    <property name="label" translatable="yes">_Subject</property>
                     <property name="use_underline">True</property>
                     <property name="justify">right</property>
                     <property name="mnemonic_widget">subject</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -353,11 +359,13 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="xpad">6</property>
-                    <property name="label" translatable="yes">_Bcc:</property>
+                    <property name="label" translatable="yes">_Bcc</property>
                     <property name="use_underline">True</property>
                     <property name="justify">right</property>
                     <property name="mnemonic_widget">to</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -384,10 +392,12 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="xalign">1</property>
-                    <property name="xpad">6</property>
-                    <property name="label" translatable="yes" comments="Geary account mail will be sent from">From:</property>
+                    <property name="label" translatable="yes" comments="Geary account mail will be sent from">From</property>
                     <property name="justify">right</property>
                     <property name="mnemonic_widget">to</property>
+                    <style>
+                      <class name="dim-label"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>