diff --git a/src/client/conversation-viewer/conversation-email.vala b/src/client/conversation-viewer/conversation-email.vala
index 998ba663..4143717f 100644
--- a/src/client/conversation-viewer/conversation-email.vala
+++ b/src/client/conversation-viewer/conversation-email.vala
@@ -56,6 +56,9 @@ public class ConversationEmail : Gtk.Box {
[GtkChild]
private Gtk.MenuButton email_menubutton;
+ [GtkChild]
+ private Gtk.InfoBar draft_infobar;
+
[GtkChild]
private Gtk.Box sub_messages_box;
@@ -102,17 +105,19 @@ public class ConversationEmail : Gtk.Box {
primary_message.web_view.link_selected.connect((link) => {
link_activated(link);
});
- primary_message.draft_infobar.response.connect((infobar, response_id) => {
- if (response_id == 1) { edit_draft(email); }
- });
primary_message.summary_box.pack_start(action_box, false, false, 0);
- if (is_draft) {
- primary_message.draft_infobar.show();
- }
email_menubutton.set_menu_model(build_message_menu(email));
email_menubutton.set_sensitive(false);
+ primary_message.infobar_box.pack_start(draft_infobar, false, false, 0);
+ if (is_draft) {
+ draft_infobar.show();
+ draft_infobar.response.connect((infobar, response_id) => {
+ if (response_id == 1) { edit_draft(email); }
+ });
+ }
+
// if (email.from != null && email.from.contains_normalized(current_account_information.email)) {
// // XXX set a RO property?
// get_style_context().add_class("sent");
diff --git a/src/client/conversation-viewer/conversation-message.vala b/src/client/conversation-viewer/conversation-message.vala
index b87a0eaf..9ab6bcef 100644
--- a/src/client/conversation-viewer/conversation-message.vala
+++ b/src/client/conversation-viewer/conversation-message.vala
@@ -64,7 +64,7 @@ public class ConversationMessage : Gtk.Box {
public Gtk.Box summary_box; // not yet supported: { get; private set; }
[GtkChild]
- public Gtk.InfoBar draft_infobar; // not yet supported: { get; private set; }
+ public Gtk.Box infobar_box; // not yet supported: { get; private set; }
[GtkChild]
private Gtk.Image avatar_image;
diff --git a/ui/conversation-email.ui b/ui/conversation-email.ui
index 50e80d6d..e15e7122 100644
--- a/ui/conversation-email.ui
+++ b/ui/conversation-email.ui
@@ -163,6 +163,80 @@
+