diff --git a/src/client/conversation-viewer/conversation-message.vala b/src/client/conversation-viewer/conversation-message.vala
index c39addcc..ca43686f 100644
--- a/src/client/conversation-viewer/conversation-message.vala
+++ b/src/client/conversation-viewer/conversation-message.vala
@@ -28,9 +28,8 @@ public class ConversationMessage : Gtk.Box {
             this.address = address;
 
             Gtk.Label label = new Gtk.Label(null);
-            //label.set_halign(Gtk.Align.START);
-            //label.set_valign(Gtk.Align.BASELINE);
-            //label.set_xalign(0.0f);
+            label.ellipsize = Pango.EllipsizeMode.END;
+            label.set_xalign(0.0f);
 
             string name = Geary.HTML.escape_markup(address.name);
             string addr = Geary.HTML.escape_markup(address.address);
@@ -47,7 +46,6 @@ public class ConversationMessage : Gtk.Box {
 
             add(label);
             set_halign(Gtk.Align.START);
-            //child.set_valign(Gtk.Align.START);
             show_all();
         }
 
diff --git a/ui/conversation-message.ui b/ui/conversation-message.ui
index 74f8f406..85e07a02 100644
--- a/ui/conversation-message.ui
+++ b/ui/conversation-message.ui
@@ -198,6 +198,7 @@
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Subject</property>
                             <property name="wrap">True</property>
+                            <property name="wrap_mode">word-char</property>
                             <property name="selectable">True</property>
                             <property name="xalign">0</property>
                             <style>
@@ -238,7 +239,7 @@
                                 <property name="valign">start</property>
                                 <property name="hexpand">False</property>
                                 <property name="column_spacing">2</property>
-                                <property name="min_children_per_line">1</property>
+                                <property name="min_children_per_line">2</property>
                                 <property name="max_children_per_line">4</property>
                                 <property name="selection_mode">none</property>
                                 <style>
@@ -286,7 +287,7 @@
                                 <property name="valign">start</property>
                                 <property name="hexpand">False</property>
                                 <property name="column_spacing">2</property>
-                                <property name="min_children_per_line">1</property>
+                                <property name="min_children_per_line">2</property>
                                 <property name="max_children_per_line">4</property>
                                 <property name="selection_mode">none</property>
                                 <style>