Merge lp:~elementary-apps/pantheon-mail/message-header into lp:~elementary-apps/pantheon-mail/trunk

[Danielle Foré]

ConversationWidget.vala:
* Remove subject line because it can never change per message in a thread
* Add margin to vertically align avatars in collapsed messages

Because of the way threads work, you literally cannot have different subjects in a single thread. It doesn't make sense to show the subject in every message because it will never change. iOS mail, Gmail, and Nylas all seem to agree here.

[David Hewitt (davidmhewitt)]

Am I correct in thinking that the only place you can see the subject at all is in the main message list now?

This is OK for short subject lines, but for longer ones that don't fit in the width of the message list, I can't rely on the reading view to show me the full subject anymore. Can we not keep the subject on at least the first message in the thread?

[Danielle Foré (danrabbit)]

Yeah that's a fair objection. Marking as "needs fixing" for this reason

review: Needs Fixing

Unmerged revisions

2231. By Danielle Foré on 2017-02-02

get rid of subject field, vertically center avatar on collapsed messages

=== modified file 'src/client/conversation-viewer/ConversationWidget.vala'
--- src/client/conversation-viewer/ConversationWidget.vala	2016-12-28 21:06:20 +0000
+++ src/client/conversation-viewer/ConversationWidget.vala	2017-02-02 21:45:16 +0000
@@ -174,19 +174,6 @@
             row_id++;
         }
 
-        if (email.subject != null) {
-            var title_label = new Gtk.Label (_("Subject:"));
-            title_label.halign = Gtk.Align.END;
-            title_label.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
-            var value_label = new Gtk.Label (email.subject.value);
-            value_label.hexpand = true;
-            ((Gtk.Misc) value_label).xalign = 0;
-            value_label.wrap = true;
-            header_expanded_fields.attach (title_label, 0, row_id, 1, 1);
-            header_expanded_fields.attach (value_label, 1, row_id, 2, 1);
-            row_id++;
-        }
-
         if (email.date != null) {
             var value_label = new Gtk.Label (Date.pretty_print_verbose (email.date.value, clock_format));
             value_label.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
@@ -346,6 +333,7 @@
         header.add (header_grid);
 
         avatar = new Granite.Widgets.Avatar.with_default_icon (48);
+        avatar.margin_top = 4;
         avatar.valign = Gtk.Align.START;
 
         user_name = new Gtk.Label (null);