From 6e1938b0893b47f0673bd773bdbfdbf6465ae018 Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Fri, 12 Apr 2019 17:43:47 +0200
Subject: Clean up ConversationTitlebar

---
 main/CMakeLists.txt                                |   7 +-
 .../data/conversation_selector/conversation_row.ui |   2 +-
 main/data/unified_main_content.ui                  |   2 +-
 .../ui/conversation_selector/conversation_row.vala | 277 ---------------------
 .../conversation_selector.vala                     | 167 +++++++++++++
 .../conversation_selector_row.vala                 | 277 +++++++++++++++++++++
 main/src/ui/conversation_selector/list.vala        | 167 -------------
 .../conversation_titlebar.vala                     |  93 +++++++
 main/src/ui/conversation_titlebar/view.vala        |  67 -----
 main/src/ui/conversation_titlebar/view_csd.vala    |  36 ---
 main/src/ui/unified_window.vala                    |  54 ++--
 main/src/ui/unified_window_controller.vala         |  14 +-
 12 files changed, 567 insertions(+), 596 deletions(-)
 delete mode 100644 main/src/ui/conversation_selector/conversation_row.vala
 create mode 100644 main/src/ui/conversation_selector/conversation_selector.vala
 create mode 100644 main/src/ui/conversation_selector/conversation_selector_row.vala
 delete mode 100644 main/src/ui/conversation_selector/list.vala
 create mode 100644 main/src/ui/conversation_titlebar/conversation_titlebar.vala
 delete mode 100644 main/src/ui/conversation_titlebar/view.vala
 delete mode 100644 main/src/ui/conversation_titlebar/view_csd.vala

diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index ea1a649c..dead5348 100644
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -102,8 +102,8 @@ SOURCES
     src/ui/conversation_list_titlebar.vala
     src/ui/conversation_list_titlebar_csd.vala
     src/ui/global_search.vala
-    src/ui/conversation_selector/conversation_row.vala
-    src/ui/conversation_selector/list.vala
+    src/ui/conversation_selector/conversation_selector_row.vala
+    src/ui/conversation_selector/conversation_selector.vala
     src/ui/conversation_summary/chat_state_populator.vala
     src/ui/conversation_summary/content_item_widget_factory.vala
     src/ui/conversation_summary/content_populator.vala
@@ -114,8 +114,7 @@ SOURCES
     src/ui/conversation_titlebar/menu_entry.vala
     src/ui/conversation_titlebar/occupants_entry.vala
     src/ui/conversation_titlebar/search_entry.vala
-    src/ui/conversation_titlebar/view.vala
-    src/ui/conversation_titlebar/view_csd.vala
+    src/ui/conversation_titlebar/conversation_titlebar.vala
     src/ui/manage_accounts/account_row.vala
     src/ui/manage_accounts/add_account_dialog.vala
     src/ui/manage_accounts/dialog.vala
diff --git a/main/data/conversation_selector/conversation_row.ui b/main/data/conversation_selector/conversation_row.ui
index 5b75b24e..99ae85e4 100644
--- a/main/data/conversation_selector/conversation_row.ui
+++ b/main/data/conversation_selector/conversation_row.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <template class="DinoUiConversationSelectorConversationRow">
+    <template class="DinoUiConversationSelectorRow">
         <property name="visible">True</property>
         <child>
             <object class="GtkRevealer" id="main_revealer">
diff --git a/main/data/unified_main_content.ui b/main/data/unified_main_content.ui
index 0fde37e8..9e660b50 100644
--- a/main/data/unified_main_content.ui
+++ b/main/data/unified_main_content.ui
@@ -10,7 +10,7 @@
                 <property name="hscrollbar_policy">never</property>
                 <property name="visible">True</property>
                 <child>
-                    <object class="DinoUiConversationSelectorList" id="conversation_list">
+                    <object class="DinoUiConversationSelector" id="conversation_list">
                         <property name="visible">True</property>
                     </object>
                 </child>
diff --git a/main/src/ui/conversation_selector/conversation_row.vala b/main/src/ui/conversation_selector/conversation_row.vala
deleted file mode 100644
index 0d0db23a..00000000
--- a/main/src/ui/conversation_selector/conversation_row.vala
+++ /dev/null
@@ -1,277 +0,0 @@
-using Gee;
-using Gdk;
-using Gtk;
-using Pango;
-
-using Dino;
-using Dino.Entities;
-using Xmpp;
-
-namespace Dino.Ui.ConversationSelector {
-
-[GtkTemplate (ui = "/im/dino/Dino/conversation_selector/conversation_row.ui")]
-public class ConversationRow : ListBoxRow {
-
-    public signal void closed();
-
-    [GtkChild] protected AvatarImage image;
-    [GtkChild] protected Label name_label;
-    [GtkChild] protected Label time_label;
-    [GtkChild] protected Label nick_label;
-    [GtkChild] protected Label message_label;
-    [GtkChild] protected Button x_button;
-    [GtkChild] protected Revealer time_revealer;
-    [GtkChild] protected Revealer xbutton_revealer;
-    [GtkChild] public Revealer main_revealer;
-
-    public Conversation conversation { get; private set; }
-
-    protected const int AVATAR_SIZE = 40;
-
-    protected ContentItem? last_content_item;
-    protected bool read = true;
-
-
-    protected StreamInteractor stream_interactor;
-
-    construct {
-        name_label.attributes = new AttrList();
-    }
-
-    public ConversationRow(StreamInteractor stream_interactor, Conversation conversation) {
-        this.conversation = conversation;
-        this.stream_interactor = stream_interactor;
-
-        switch (conversation.type_) {
-            case Conversation.Type.CHAT:
-                stream_interactor.get_module(RosterManager.IDENTITY).updated_roster_item.connect((account, jid, roster_item) => {
-                    if (conversation.account.equals(account) && conversation.counterpart.equals(jid)) {
-                        update_name_label();
-                    }
-                });
-                break;
-            case Conversation.Type.GROUPCHAT:
-                closed.connect(() => {
-                    stream_interactor.get_module(MucManager.IDENTITY).part(conversation.account, conversation.counterpart);
-                });
-                stream_interactor.get_module(MucManager.IDENTITY).room_name_set.connect((account, jid, room_name) => {
-                    if (conversation != null && conversation.counterpart.equals_bare(jid) && conversation.account.equals(account)) {
-                        update_name_label();
-                    }
-                });
-                stream_interactor.get_module(MucManager.IDENTITY).private_room_occupant_updated.connect((account, room, occupant) => {
-                    if (conversation != null && conversation.counterpart.equals_bare(room.bare_jid) && conversation.account.equals(account)) {
-                        update_name_label();
-                    }
-                });
-                break;
-            case Conversation.Type.GROUPCHAT_PM:
-                break;
-        }
-
-        // Set tooltip
-        switch (conversation.type_) {
-            case Conversation.Type.CHAT:
-                has_tooltip = true;
-                query_tooltip.connect ((x, y, keyboard_tooltip, tooltip) => {
-                    tooltip.set_custom(generate_tooltip());
-                    return true;
-                });
-                break;
-            case Conversation.Type.GROUPCHAT:
-                has_tooltip = true;
-                set_tooltip_text(conversation.counterpart.bare_jid.to_string());
-                break;
-            case Conversation.Type.GROUPCHAT_PM:
-                break;
-        }
-
-        stream_interactor.get_module(ContentItemStore.IDENTITY).new_item.connect((item, c) => {
-            if (conversation.equals(c)) {
-                content_item_received(item);
-            }
-        });
-        last_content_item = stream_interactor.get_module(ContentItemStore.IDENTITY).get_latest(conversation);
-
-        x_button.clicked.connect(close_conversation);
-        image.set_jid(stream_interactor, conversation.counterpart, conversation.account);
-        conversation.notify["read-up-to"].connect(update_read);
-
-        update_name_label();
-        content_item_received();
-    }
-
-    public void update() {
-        update_time_label();
-    }
-
-    public void content_item_received(ContentItem? ci = null) {
-        last_content_item = stream_interactor.get_module(ContentItemStore.IDENTITY).get_latest(conversation) ?? ci;
-        update_message_label();
-        update_time_label();
-        update_read();
-    }
-
-    protected void update_name_label() {
-        name_label.label = Util.get_conversation_display_name(stream_interactor, conversation);
-    }
-
-    protected void update_time_label(DateTime? new_time = null) {
-        if (last_content_item != null) {
-            time_label.visible = true;
-            time_label.label = get_relative_time(last_content_item.display_time.to_local());
-        }
-    }
-
-    protected void update_message_label() {
-        if (last_content_item != null) {
-            switch (last_content_item.type_) {
-                case MessageItem.TYPE:
-                    MessageItem message_item = last_content_item as MessageItem;
-                    Message last_message = message_item.message;
-
-                    if (conversation.type_ == Conversation.Type.GROUPCHAT) {
-                        nick_label.label = Util.get_message_display_name(stream_interactor, last_message, conversation.account) + ": ";
-                    } else {
-                        nick_label.label = last_message.direction == Message.DIRECTION_SENT ? _("Me") + ": " : "";
-                    }
-
-                    message_label.label = Markup.escape_text((/\s+/).replace_literal(last_message.body, -1, 0, " "));
-                    break;
-                case FileItem.TYPE:
-                    FileItem file_item = last_content_item as FileItem;
-                    FileTransfer transfer = file_item.file_transfer;
-
-                    if (conversation.type_ == Conversation.Type.GROUPCHAT) {
-                        // TODO properly display nick for oneself
-                        string nick = transfer.direction == Message.DIRECTION_SENT ? _("Me") : Util.get_display_name(stream_interactor, file_item.file_transfer.counterpart, conversation.account);
-                        nick_label.label = nick + ": ";
-                    } else {
-                        nick_label.label = transfer.direction == Message.DIRECTION_SENT ? _("Me") + ": " : "";
-                    }
-
-                    bool file_is_image = transfer.mime_type != null && transfer.mime_type.has_prefix("image");
-                    if (transfer.direction == Message.DIRECTION_SENT) {
-                        message_label.label = "<i>" + (file_is_image ? _("Image sent") : _("File sent") ) + "</i>";
-                    } else {
-                        message_label.label = "<i>" + (file_is_image ? _("Image received") : _("File received") ) + "</i>";
-                    }
-                    break;
-            }
-            nick_label.visible = true;
-            message_label.visible = true;
-        }
-    }
-
-    protected void update_read() {
-        MessageItem? message_item = last_content_item as MessageItem;
-        if (message_item == null) return;
-        Message last_message = message_item.message;
-
-        bool read_was = read;
-        read = last_message == null || (conversation.read_up_to != null && last_message.equals(conversation.read_up_to));
-        if (read == read_was) return;
-        if (read) {
-            name_label.attributes.filter((attr) => attr.equal(attr_weight_new(Weight.BOLD)));
-            time_label.attributes.filter((attr) => attr.equal(attr_weight_new(Weight.BOLD)));
-            nick_label.attributes.filter((attr) => attr.equal(attr_weight_new(Weight.BOLD)));
-            message_label.attributes.filter((attr) => attr.equal(attr_weight_new(Weight.BOLD)));
-        } else {
-            name_label.attributes.insert(attr_weight_new(Weight.BOLD));
-            time_label.attributes.insert(attr_weight_new(Weight.BOLD));
-            nick_label.attributes.insert(attr_weight_new(Weight.BOLD));
-            message_label.attributes.insert(attr_weight_new(Weight.BOLD));
-        }
-        name_label.label = name_label.label; // TODO initializes redrawing, which would otherwise not happen. nicer?
-        time_label.label = time_label.label;
-        nick_label.label = nick_label.label;
-        message_label.label = message_label.label;
-    }
-
-    protected Box get_fulljid_box(Jid full_jid) {
-        Box box = new Box(Orientation.HORIZONTAL, 5) { visible=true };
-
-        Show show = stream_interactor.get_module(PresenceManager.IDENTITY).get_last_show(full_jid, conversation.account);
-        Image image = new Image() { visible=true };
-        if (show.as == Show.AWAY) {
-            image.set_from_icon_name("dino-status-away", IconSize.SMALL_TOOLBAR);
-        } else if (show.as == Show.XA || show.as == Show.DND) {
-            image.set_from_icon_name("dino-status-dnd", IconSize.SMALL_TOOLBAR);
-        } else if (show.as == Show.CHAT) {
-            image.set_from_icon_name("dino-status-chat", IconSize.SMALL_TOOLBAR);
-        } else {
-            image.set_from_icon_name("dino-status-online", IconSize.SMALL_TOOLBAR);
-        }
-        box.add(image);
-
-        Label resource = new Label(full_jid.resourcepart) { visible=true };
-        resource.xalign = 0;
-        box.add(resource);
-        box.show_all();
-        return box;
-    }
-
-    private void close_conversation() {
-        main_revealer.set_transition_type(RevealerTransitionType.SLIDE_UP);
-        main_revealer.set_reveal_child(false);
-        closed();
-        main_revealer.notify["child-revealed"].connect(() => {
-            stream_interactor.get_module(ConversationManager.IDENTITY).close_conversation(conversation);
-        });
-    }
-
-    public override void state_flags_changed(StateFlags flags) {
-        StateFlags curr_flags = get_state_flags();
-        if ((curr_flags & StateFlags.PRELIGHT) != 0) {
-            time_revealer.set_reveal_child(false);
-            xbutton_revealer.set_reveal_child(true);
-        } else {
-            time_revealer.set_reveal_child(true);
-            xbutton_revealer.set_reveal_child(false);
-        }
-    }
-
-    private Widget generate_tooltip() {
-        Builder builder = new Builder.from_resource("/im/dino/Dino/conversation_selector/chat_row_tooltip.ui");
-        Box main_box = builder.get_object("main_box") as Box;
-        Box inner_box = builder.get_object("inner_box") as Box;
-        Label jid_label = builder.get_object("jid_label") as Label;
-
-        jid_label.label = conversation.counterpart.to_string();
-
-        Gee.List<Jid>? full_jids = stream_interactor.get_module(PresenceManager.IDENTITY).get_full_jids(conversation.counterpart, conversation.account);
-        if (full_jids != null) {
-            for (int i = 0; i < full_jids.size; i++) {
-                inner_box.add(get_fulljid_box(full_jids[i]));
-            }
-        }
-        return main_box;
-    }
-
-    private static string get_relative_time(DateTime datetime) {
-         DateTime now = new DateTime.now_utc();
-         TimeSpan timespan = now.difference(datetime);
-         if (timespan > 365 * TimeSpan.DAY) {
-             return datetime.get_year().to_string();
-         } else if (timespan > 7 * TimeSpan.DAY) {
-             // Day and month
-             // xgettext:no-c-format
-             return datetime.format(_("%b %d"));
-         } else if (timespan > 2 * TimeSpan.DAY) {
-             return datetime.format("%a");
-         } else if (datetime.get_day_of_month() != now.get_day_of_month()) {
-             return _("Yesterday");
-         } else if (timespan > 9 * TimeSpan.MINUTE) {
-             return datetime.format(Util.is_24h_format() ?
-                /* xgettext:no-c-format */ /* Time in 24h format (w/o seconds) */ _("%H∶%M") :
-                /* xgettext:no-c-format */ /* Time in 12h format (w/o seconds) */ _("%l∶%M %p"));
-         } else if (timespan > 1 * TimeSpan.MINUTE) {
-             ulong mins = (ulong) (timespan.abs() / TimeSpan.MINUTE);
-             return n("%i min ago", "%i mins ago", mins).printf(mins);
-         } else {
-             return _("Just now");
-         }
-    }
-}
-
-}
diff --git a/main/src/ui/conversation_selector/conversation_selector.vala b/main/src/ui/conversation_selector/conversation_selector.vala
new file mode 100644
index 00000000..d795120b
--- /dev/null
+++ b/main/src/ui/conversation_selector/conversation_selector.vala
@@ -0,0 +1,167 @@
+using Gee;
+using Gtk;
+
+using Xmpp;
+using Dino.Entities;
+
+namespace Dino.Ui {
+
+public class ConversationSelector : ListBox {
+
+    public signal void conversation_selected(Conversation conversation);
+
+    private StreamInteractor stream_interactor;
+    private string[]? filter_values;
+    private HashMap<Conversation, ConversationSelectorRow> rows = new HashMap<Conversation, ConversationSelectorRow>(Conversation.hash_func, Conversation.equals_func);
+
+    public ConversationSelector init(StreamInteractor stream_interactor) {
+        this.stream_interactor = stream_interactor;
+
+        stream_interactor.get_module(ConversationManager.IDENTITY).conversation_activated.connect(add_conversation);
+        stream_interactor.get_module(ConversationManager.IDENTITY).conversation_deactivated.connect(remove_conversation);
+        stream_interactor.get_module(MessageProcessor.IDENTITY).message_received.connect(on_message_received);
+        stream_interactor.get_module(MessageProcessor.IDENTITY).message_sent.connect(on_message_received);
+        Timeout.add_seconds(60, () => {
+            foreach (ConversationSelectorRow row in rows.values) row.update();
+            return true;
+        });
+
+        foreach (Conversation conversation in stream_interactor.get_module(ConversationManager.IDENTITY).get_active_conversations()) {
+            add_conversation(conversation);
+        }
+        return this;
+    }
+
+    construct {
+        this.stream_interactor = stream_interactor;
+
+        get_style_context().add_class("sidebar");
+        set_filter_func(filter);
+        set_header_func(header);
+        set_sort_func(sort);
+
+        realize.connect(() => {
+            ListBoxRow? first_row = get_row_at_index(0);
+            if (first_row != null) {
+                select_row(first_row);
+                row_activated(first_row);
+            }
+        });
+    }
+
+    public override void row_activated(ListBoxRow r) {
+        ConversationSelectorRow? row = r as ConversationSelectorRow;
+        if (row != null) {
+            conversation_selected(row.conversation);
+        }
+    }
+
+    public void set_filter_values(string[]? values) {
+        if (filter_values == values) {
+            return;
+        }
+        filter_values = values;
+        invalidate_filter();
+    }
+
+    public void on_conversation_selected(Conversation conversation) {
+        if (!rows.has_key(conversation)) {
+            add_conversation(conversation);
+        }
+        this.select_row(rows[conversation]);
+    }
+
+    private void on_message_received(Entities.Message message, Conversation conversation) {
+        if (rows.has_key(conversation)) {
+            invalidate_sort();
+        }
+    }
+
+    private void add_conversation(Conversation conversation) {
+        ConversationSelectorRow row;
+        if (!rows.has_key(conversation)) {
+            row = new ConversationSelectorRow(stream_interactor, conversation);
+            rows[conversation] = row;
+            add(row);
+            row.closed.connect(() => { select_fallback_conversation(conversation); });
+            row.main_revealer.set_reveal_child(true);
+        }
+        invalidate_sort();
+    }
+
+    private void select_fallback_conversation(Conversation conversation) {
+        if (get_selected_row() == rows[conversation]) {
+            int index = rows[conversation].get_index();
+            ListBoxRow? next_select_row = get_row_at_index(index + 1);
+            if (next_select_row == null) {
+                next_select_row = get_row_at_index(index - 1);
+            }
+            if (next_select_row != null) {
+                select_row(next_select_row);
+                row_activated(next_select_row);
+            }
+        }
+    }
+
+    private void remove_conversation(Conversation conversation) {
+        select_fallback_conversation(conversation);
+        if (rows.has_key(conversation) && !conversation.active) {
+            remove(rows[conversation]);
+            rows.unset(conversation);
+        }
+    }
+
+    public void loop_conversations(bool backwards) {
+        int index = get_selected_row().get_index();
+        int new_index = ((index + (backwards ? -1 : 1)) + rows.size) % rows.size;
+        ListBoxRow? next_select_row = get_row_at_index(new_index);
+        if (next_select_row != null) {
+            select_row(next_select_row);
+            row_activated(next_select_row);
+        }
+    }
+
+    private void header(ListBoxRow row, ListBoxRow? before_row) {
+        if (row.get_header() == null && before_row != null) {
+            row.set_header(new Separator(Orientation.HORIZONTAL));
+        } else if (row.get_header() != null && before_row == null) {
+            row.set_header(null);
+        }
+    }
+
+    private bool filter(ListBoxRow r) {
+        ConversationSelectorRow? row = r as ConversationSelectorRow;
+        if (row != null) {
+            if (filter_values != null && filter_values.length != 0) {
+                foreach (string filter in filter_values) {
+                    if (!(Util.get_conversation_display_name(stream_interactor, row.conversation).down().contains(filter.down()) ||
+                            row.conversation.counterpart.to_string().down().contains(filter.down()))) {
+                        return false;
+                    }
+                }
+            }
+        }
+        return true;
+    }
+
+    private int sort(ListBoxRow row1, ListBoxRow row2) {
+        ConversationSelectorRow cr1 = row1 as ConversationSelectorRow;
+        ConversationSelectorRow cr2 = row2 as ConversationSelectorRow;
+        if (cr1 != null && cr2 != null) {
+            Conversation c1 = cr1.conversation;
+            Conversation c2 = cr2.conversation;
+            if (c1.last_active == null) return -1;
+            if (c2.last_active == null) return 1;
+            int comp = c2.last_active.compare(c1.last_active);
+            if (comp == 0) {
+                return Util.get_conversation_display_name(stream_interactor, c1)
+                    .collate(Util.get_conversation_display_name(stream_interactor, c2));
+            } else {
+                return comp;
+            }
+        }
+        return 0;
+    }
+}
+
+}
diff --git a/main/src/ui/conversation_selector/conversation_selector_row.vala b/main/src/ui/conversation_selector/conversation_selector_row.vala
new file mode 100644
index 00000000..a1f0e706
--- /dev/null
+++ b/main/src/ui/conversation_selector/conversation_selector_row.vala
@@ -0,0 +1,277 @@
+using Gee;
+using Gdk;
+using Gtk;
+using Pango;
+
+using Dino;
+using Dino.Entities;
+using Xmpp;
+
+namespace Dino.Ui {
+
+[GtkTemplate (ui = "/im/dino/Dino/conversation_selector/conversation_row.ui")]
+public class ConversationSelectorRow : ListBoxRow {
+
+    public signal void closed();
+
+    [GtkChild] protected AvatarImage image;
+    [GtkChild] protected Label name_label;
+    [GtkChild] protected Label time_label;
+    [GtkChild] protected Label nick_label;
+    [GtkChild] protected Label message_label;
+    [GtkChild] protected Button x_button;
+    [GtkChild] protected Revealer time_revealer;
+    [GtkChild] protected Revealer xbutton_revealer;
+    [GtkChild] public Revealer main_revealer;
+
+    public Conversation conversation { get; private set; }
+
+    protected const int AVATAR_SIZE = 40;
+
+    protected ContentItem? last_content_item;
+    protected bool read = true;
+
+
+    protected StreamInteractor stream_interactor;
+
+    construct {
+        name_label.attributes = new AttrList();
+    }
+
+    public ConversationSelectorRow(StreamInteractor stream_interactor, Conversation conversation) {
+        this.conversation = conversation;
+        this.stream_interactor = stream_interactor;
+
+        switch (conversation.type_) {
+            case Conversation.Type.CHAT:
+                stream_interactor.get_module(RosterManager.IDENTITY).updated_roster_item.connect((account, jid, roster_item) => {
+                    if (conversation.account.equals(account) && conversation.counterpart.equals(jid)) {
+                        update_name_label();
+                    }
+                });
+                break;
+            case Conversation.Type.GROUPCHAT:
+                closed.connect(() => {
+                    stream_interactor.get_module(MucManager.IDENTITY).part(conversation.account, conversation.counterpart);
+                });
+                stream_interactor.get_module(MucManager.IDENTITY).room_name_set.connect((account, jid, room_name) => {
+                    if (conversation != null && conversation.counterpart.equals_bare(jid) && conversation.account.equals(account)) {
+                        update_name_label();
+                    }
+                });
+                stream_interactor.get_module(MucManager.IDENTITY).private_room_occupant_updated.connect((account, room, occupant) => {
+                    if (conversation != null && conversation.counterpart.equals_bare(room.bare_jid) && conversation.account.equals(account)) {
+                        update_name_label();
+                    }
+                });
+                break;
+            case Conversation.Type.GROUPCHAT_PM:
+                break;
+        }
+
+        // Set tooltip
+        switch (conversation.type_) {
+            case Conversation.Type.CHAT:
+                has_tooltip = true;
+                query_tooltip.connect ((x, y, keyboard_tooltip, tooltip) => {
+                    tooltip.set_custom(generate_tooltip());
+                    return true;
+                });
+                break;
+            case Conversation.Type.GROUPCHAT:
+                has_tooltip = true;
+                set_tooltip_text(conversation.counterpart.bare_jid.to_string());
+                break;
+            case Conversation.Type.GROUPCHAT_PM:
+                break;
+        }
+
+        stream_interactor.get_module(ContentItemStore.IDENTITY).new_item.connect((item, c) => {
+            if (conversation.equals(c)) {
+                content_item_received(item);
+            }
+        });
+        last_content_item = stream_interactor.get_module(ContentItemStore.IDENTITY).get_latest(conversation);
+
+        x_button.clicked.connect(close_conversation);
+        image.set_jid(stream_interactor, conversation.counterpart, conversation.account);
+        conversation.notify["read-up-to"].connect(update_read);
+
+        update_name_label();
+        content_item_received();
+    }
+
+    public void update() {
+        update_time_label();
+    }
+
+    public void content_item_received(ContentItem? ci = null) {
+        last_content_item = stream_interactor.get_module(ContentItemStore.IDENTITY).get_latest(conversation) ?? ci;
+        update_message_label();
+        update_time_label();
+        update_read();
+    }
+
+    protected void update_name_label() {
+        name_label.label = Util.get_conversation_display_name(stream_interactor, conversation);
+    }
+
+    protected void update_time_label(DateTime? new_time = null) {
+        if (last_content_item != null) {
+            time_label.visible = true;
+            time_label.label = get_relative_time(last_content_item.display_time.to_local());
+        }
+    }
+
+    protected void update_message_label() {
+        if (last_content_item != null) {
+            switch (last_content_item.type_) {
+                case MessageItem.TYPE:
+                    MessageItem message_item = last_content_item as MessageItem;
+                    Message last_message = message_item.message;
+
+                    if (conversation.type_ == Conversation.Type.GROUPCHAT) {
+                        nick_label.label = Util.get_message_display_name(stream_interactor, last_message, conversation.account) + ": ";
+                    } else {
+                        nick_label.label = last_message.direction == Message.DIRECTION_SENT ? _("Me") + ": " : "";
+                    }
+
+                    message_label.label = Markup.escape_text((/\s+/).replace_literal(last_message.body, -1, 0, " "));
+                    break;
+                case FileItem.TYPE:
+                    FileItem file_item = last_content_item as FileItem;
+                    FileTransfer transfer = file_item.file_transfer;
+
+                    if (conversation.type_ == Conversation.Type.GROUPCHAT) {
+                        // TODO properly display nick for oneself
+                        string nick = transfer.direction == Message.DIRECTION_SENT ? _("Me") : Util.get_display_name(stream_interactor, file_item.file_transfer.counterpart, conversation.account);
+                        nick_label.label = nick + ": ";
+                    } else {
+                        nick_label.label = transfer.direction == Message.DIRECTION_SENT ? _("Me") + ": " : "";
+                    }
+
+                    bool file_is_image = transfer.mime_type != null && transfer.mime_type.has_prefix("image");
+                    if (transfer.direction == Message.DIRECTION_SENT) {
+                        message_label.label = "<i>" + (file_is_image ? _("Image sent") : _("File sent") ) + "</i>";
+                    } else {
+                        message_label.label = "<i>" + (file_is_image ? _("Image received") : _("File received") ) + "</i>";
+                    }
+                    break;
+            }
+            nick_label.visible = true;
+            message_label.visible = true;
+        }
+    }
+
+    protected void update_read() {
+        MessageItem? message_item = last_content_item as MessageItem;
+        if (message_item == null) return;
+        Message last_message = message_item.message;
+
+        bool read_was = read;
+        read = last_message == null || (conversation.read_up_to != null && last_message.equals(conversation.read_up_to));
+        if (read == read_was) return;
+        if (read) {
+            name_label.attributes.filter((attr) => attr.equal(attr_weight_new(Weight.BOLD)));
+            time_label.attributes.filter((attr) => attr.equal(attr_weight_new(Weight.BOLD)));
+            nick_label.attributes.filter((attr) => attr.equal(attr_weight_new(Weight.BOLD)));
+            message_label.attributes.filter((attr) => attr.equal(attr_weight_new(Weight.BOLD)));
+        } else {
+            name_label.attributes.insert(attr_weight_new(Weight.BOLD));
+            time_label.attributes.insert(attr_weight_new(Weight.BOLD));
+            nick_label.attributes.insert(attr_weight_new(Weight.BOLD));
+            message_label.attributes.insert(attr_weight_new(Weight.BOLD));
+        }
+        name_label.label = name_label.label; // TODO initializes redrawing, which would otherwise not happen. nicer?
+        time_label.label = time_label.label;
+        nick_label.label = nick_label.label;
+        message_label.label = message_label.label;
+    }
+
+    protected Box get_fulljid_box(Jid full_jid) {
+        Box box = new Box(Orientation.HORIZONTAL, 5) { visible=true };
+
+        Show show = stream_interactor.get_module(PresenceManager.IDENTITY).get_last_show(full_jid, conversation.account);
+        Image image = new Image() { visible=true };
+        if (show.as == Show.AWAY) {
+            image.set_from_icon_name("dino-status-away", IconSize.SMALL_TOOLBAR);
+        } else if (show.as == Show.XA || show.as == Show.DND) {
+            image.set_from_icon_name("dino-status-dnd", IconSize.SMALL_TOOLBAR);
+        } else if (show.as == Show.CHAT) {
+            image.set_from_icon_name("dino-status-chat", IconSize.SMALL_TOOLBAR);
+        } else {
+            image.set_from_icon_name("dino-status-online", IconSize.SMALL_TOOLBAR);
+        }
+        box.add(image);
+
+        Label resource = new Label(full_jid.resourcepart) { visible=true };
+        resource.xalign = 0;
+        box.add(resource);
+        box.show_all();
+        return box;
+    }
+
+    private void close_conversation() {
+        main_revealer.set_transition_type(RevealerTransitionType.SLIDE_UP);
+        main_revealer.set_reveal_child(false);
+        closed();
+        main_revealer.notify["child-revealed"].connect(() => {
+            stream_interactor.get_module(ConversationManager.IDENTITY).close_conversation(conversation);
+        });
+    }
+
+    public override void state_flags_changed(StateFlags flags) {
+        StateFlags curr_flags = get_state_flags();
+        if ((curr_flags & StateFlags.PRELIGHT) != 0) {
+            time_revealer.set_reveal_child(false);
+            xbutton_revealer.set_reveal_child(true);
+        } else {
+            time_revealer.set_reveal_child(true);
+            xbutton_revealer.set_reveal_child(false);
+        }
+    }
+
+    private Widget generate_tooltip() {
+        Builder builder = new Builder.from_resource("/im/dino/Dino/conversation_selector/chat_row_tooltip.ui");
+        Box main_box = builder.get_object("main_box") as Box;
+        Box inner_box = builder.get_object("inner_box") as Box;
+        Label jid_label = builder.get_object("jid_label") as Label;
+
+        jid_label.label = conversation.counterpart.to_string();
+
+        Gee.List<Jid>? full_jids = stream_interactor.get_module(PresenceManager.IDENTITY).get_full_jids(conversation.counterpart, conversation.account);
+        if (full_jids != null) {
+            for (int i = 0; i < full_jids.size; i++) {
+                inner_box.add(get_fulljid_box(full_jids[i]));
+            }
+        }
+        return main_box;
+    }
+
+    private static string get_relative_time(DateTime datetime) {
+         DateTime now = new DateTime.now_utc();
+         TimeSpan timespan = now.difference(datetime);
+         if (timespan > 365 * TimeSpan.DAY) {
+             return datetime.get_year().to_string();
+         } else if (timespan > 7 * TimeSpan.DAY) {
+             // Day and month
+             // xgettext:no-c-format
+             return datetime.format(_("%b %d"));
+         } else if (timespan > 2 * TimeSpan.DAY) {
+             return datetime.format("%a");
+         } else if (datetime.get_day_of_month() != now.get_day_of_month()) {
+             return _("Yesterday");
+         } else if (timespan > 9 * TimeSpan.MINUTE) {
+             return datetime.format(Util.is_24h_format() ?
+                /* xgettext:no-c-format */ /* Time in 24h format (w/o seconds) */ _("%H∶%M") :
+                /* xgettext:no-c-format */ /* Time in 12h format (w/o seconds) */ _("%l∶%M %p"));
+         } else if (timespan > 1 * TimeSpan.MINUTE) {
+             ulong mins = (ulong) (timespan.abs() / TimeSpan.MINUTE);
+             return n("%i min ago", "%i mins ago", mins).printf(mins);
+         } else {
+             return _("Just now");
+         }
+    }
+}
+
+}
diff --git a/main/src/ui/conversation_selector/list.vala b/main/src/ui/conversation_selector/list.vala
deleted file mode 100644
index 95e5aae7..00000000
--- a/main/src/ui/conversation_selector/list.vala
+++ /dev/null
@@ -1,167 +0,0 @@
-using Gee;
-using Gtk;
-
-using Xmpp;
-using Dino.Entities;
-
-namespace Dino.Ui.ConversationSelector {
-
-public class List : ListBox {
-
-    public signal void conversation_selected(Conversation conversation);
-
-    private StreamInteractor stream_interactor;
-    private string[]? filter_values;
-    private HashMap<Conversation, ConversationRow> rows = new HashMap<Conversation, ConversationRow>(Conversation.hash_func, Conversation.equals_func);
-
-    public List init(StreamInteractor stream_interactor) {
-        this.stream_interactor = stream_interactor;
-
-        stream_interactor.get_module(ConversationManager.IDENTITY).conversation_activated.connect(add_conversation);
-        stream_interactor.get_module(ConversationManager.IDENTITY).conversation_deactivated.connect(remove_conversation);
-        stream_interactor.get_module(MessageProcessor.IDENTITY).message_received.connect(on_message_received);
-        stream_interactor.get_module(MessageProcessor.IDENTITY).message_sent.connect(on_message_received);
-        Timeout.add_seconds(60, () => {
-            foreach (ConversationRow row in rows.values) row.update();
-            return true;
-        });
-
-        foreach (Conversation conversation in stream_interactor.get_module(ConversationManager.IDENTITY).get_active_conversations()) {
-            add_conversation(conversation);
-        }
-        return this;
-    }
-
-    construct {
-        this.stream_interactor = stream_interactor;
-
-        get_style_context().add_class("sidebar");
-        set_filter_func(filter);
-        set_header_func(header);
-        set_sort_func(sort);
-
-        realize.connect(() => {
-            ListBoxRow? first_row = get_row_at_index(0);
-            if (first_row != null) {
-                select_row(first_row);
-                row_activated(first_row);
-            }
-        });
-    }
-
-    public override void row_activated(ListBoxRow r) {
-        if (r.get_type().is_a(typeof(ConversationRow))) {
-            ConversationRow row = r as ConversationRow;
-            conversation_selected(row.conversation);
-        }
-    }
-
-    public void set_filter_values(string[]? values) {
-        if (filter_values == values) {
-            return;
-        }
-        filter_values = values;
-        invalidate_filter();
-    }
-
-    public void on_conversation_selected(Conversation conversation) {
-        if (!rows.has_key(conversation)) {
-            add_conversation(conversation);
-        }
-        this.select_row(rows[conversation]);
-    }
-
-    private void on_message_received(Entities.Message message, Conversation conversation) {
-        if (rows.has_key(conversation)) {
-            invalidate_sort();
-        }
-    }
-
-    private void add_conversation(Conversation conversation) {
-        ConversationRow row;
-        if (!rows.has_key(conversation)) {
-            row = new ConversationRow(stream_interactor, conversation);
-            rows[conversation] = row;
-            add(row);
-            row.closed.connect(() => { select_fallback_conversation(conversation); });
-            row.main_revealer.set_reveal_child(true);
-        }
-        invalidate_sort();
-    }
-
-    private void select_fallback_conversation(Conversation conversation) {
-        if (get_selected_row() == rows[conversation]) {
-            int index = rows[conversation].get_index();
-            ListBoxRow? next_select_row = get_row_at_index(index + 1);
-            if (next_select_row == null) {
-                next_select_row = get_row_at_index(index - 1);
-            }
-            if (next_select_row != null) {
-                select_row(next_select_row);
-                row_activated(next_select_row);
-            }
-        }
-    }
-
-    private void remove_conversation(Conversation conversation) {
-        select_fallback_conversation(conversation);
-        if (rows.has_key(conversation) && !conversation.active) {
-            remove(rows[conversation]);
-            rows.unset(conversation);
-        }
-    }
-
-    public void loop_conversations(bool backwards) {
-        int index = get_selected_row().get_index();
-        int new_index = ((index + (backwards ? -1 : 1)) + rows.size) % rows.size;
-        ListBoxRow? next_select_row = get_row_at_index(new_index);
-        if (next_select_row != null) {
-            select_row(next_select_row);
-            row_activated(next_select_row);
-        }
-    }
-
-    private void header(ListBoxRow row, ListBoxRow? before_row) {
-        if (row.get_header() == null && before_row != null) {
-            row.set_header(new Separator(Orientation.HORIZONTAL));
-        } else if (row.get_header() != null && before_row == null) {
-            row.set_header(null);
-        }
-    }
-
-    private bool filter(ListBoxRow r) {
-        if (r.get_type().is_a(typeof(ConversationRow))) {
-            ConversationRow row = r as ConversationRow;
-            if (filter_values != null && filter_values.length != 0) {
-                foreach (string filter in filter_values) {
-                    if (!(Util.get_conversation_display_name(stream_interactor, row.conversation).down().contains(filter.down()) ||
-                            row.conversation.counterpart.to_string().down().contains(filter.down()))) {
-                        return false;
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-    private int sort(ListBoxRow row1, ListBoxRow row2) {
-        ConversationRow cr1 = row1 as ConversationRow;
-        ConversationRow cr2 = row2 as ConversationRow;
-        if (cr1 != null && cr2 != null) {
-            Conversation c1 = cr1.conversation;
-            Conversation c2 = cr2.conversation;
-            if (c1.last_active == null) return -1;
-            if (c2.last_active == null) return 1;
-            int comp = c2.last_active.compare(c1.last_active);
-            if (comp == 0) {
-                return Util.get_conversation_display_name(stream_interactor, c1)
-                    .collate(Util.get_conversation_display_name(stream_interactor, c2));
-            } else {
-                return comp;
-            }
-        }
-        return 0;
-    }
-}
-
-}
diff --git a/main/src/ui/conversation_titlebar/conversation_titlebar.vala b/main/src/ui/conversation_titlebar/conversation_titlebar.vala
new file mode 100644
index 00000000..9836f208
--- /dev/null
+++ b/main/src/ui/conversation_titlebar/conversation_titlebar.vala
@@ -0,0 +1,93 @@
+using Gtk;
+using Gee;
+using Pango;
+
+using Dino.Entities;
+
+namespace Dino.Ui {
+
+public interface ConversationTitlebar: Widget {
+    public abstract string? subtitle { get; set; }
+    public abstract string? title { get; set; }
+}
+
+public class ConversationTitlebarNoCsd : ConversationTitlebar, Gtk.Box {
+
+    public string? title {
+        get { return title_label.label; }
+        set { this.title_label.label = value; }
+    }
+
+    public string? subtitle {
+        get { return subtitle_label.label; }
+        set {
+            this.subtitle_label.label = "<span size='small'>" + value + "</span>";
+            this.subtitle_label.visible = (value != null);
+        }
+    }
+
+    private Box content_box = new Box(Orientation.HORIZONTAL, 0) { margin=5, margin_start=15, margin_end=5, hexpand=true, visible=true };
+    private Label title_label = new Label("") { visible=true };
+    private Label subtitle_label = new Label("") { use_markup=true, ellipsize=EllipsizeMode.END, visible=false };
+    public GlobalSearchButton search_button = new GlobalSearchButton() { visible = true };
+
+    construct {
+        this.add(content_box);
+
+        Box titles_box = new Box(Orientation.VERTICAL, 0) { valign=Align.CENTER, hexpand=true, visible=true };
+        content_box.add(titles_box);
+
+        titles_box.add(title_label);
+        subtitle_label.attributes = new AttrList();
+        subtitle_label.get_style_context().add_class("dim-label");
+        titles_box.add(subtitle_label);
+
+        Box placeholder_box = new Box(Orientation.VERTICAL, 0) { visible=true };
+        placeholder_box.add(new Label("") { xalign=0, visible=true });
+        placeholder_box.add(new Label("<span size='small'> </span>") { use_markup=true, xalign=0, visible=true });
+        content_box.add(placeholder_box);
+    }
+
+    public ConversationTitlebarNoCsd() {
+        this.get_style_context().add_class("dino-header-right");
+        hexpand = true;
+        search_button.set_image(new Gtk.Image.from_icon_name("system-search-symbolic", Gtk.IconSize.MENU) { visible = true });
+
+        Application app = GLib.Application.get_default() as Application;
+        foreach(var e in app.plugin_registry.conversation_titlebar_entries) {
+            Plugins.ConversationTitlebarWidget widget = e.get_widget(Plugins.WidgetType.GTK);
+            if (widget != null) {
+                Button gtk_widget = (Gtk.Button)widget;
+                gtk_widget.relief = ReliefStyle.NONE;
+                content_box.add(gtk_widget);
+            }
+        }
+    }
+}
+
+public class ConversationTitlebarCsd : ConversationTitlebar, Gtk.HeaderBar {
+
+    public new string? title { get { return this.get_title(); } set { base.set_title(value); } }
+    public new string? subtitle { get { return this.get_subtitle(); } set { base.set_subtitle(value); } }
+
+    public ConversationTitlebarCsd() {
+        this.get_style_context().add_class("dino-right");
+        show_close_button = true;
+        hexpand = true;
+
+        Application app = GLib.Application.get_default() as Application;
+        ArrayList<Plugins.ConversationTitlebarWidget> widgets = new ArrayList<Plugins.ConversationTitlebarWidget>();
+        foreach(var e in app.plugin_registry.conversation_titlebar_entries) {
+            Plugins.ConversationTitlebarWidget widget = e.get_widget(Plugins.WidgetType.GTK);
+            if (widget != null) {
+                widgets.insert(0, widget);
+            }
+        }
+        foreach (var w in widgets) {
+            Button gtk_widget = (Gtk.Button)w;
+            this.pack_end(gtk_widget);
+        }
+    }
+}
+
+}
diff --git a/main/src/ui/conversation_titlebar/view.vala b/main/src/ui/conversation_titlebar/view.vala
deleted file mode 100644
index 9706b516..00000000
--- a/main/src/ui/conversation_titlebar/view.vala
+++ /dev/null
@@ -1,67 +0,0 @@
-using Gtk;
-using Gee;
-using Pango;
-
-using Dino.Entities;
-
-namespace Dino.Ui {
-
-public class ConversationTitlebar : Gtk.Box {
-
-    public string? title {
-        get { return title_label.label; }
-        set { this.title_label.label = value; }
-    }
-
-    public string? subtitle {
-        get { return subtitle_label.label; }
-        set {
-            this.subtitle_label.label = "<span size='small'>" + value + "</span>";
-            this.subtitle_label.visible = (value != null);
-        }
-    }
-
-    private StreamInteractor stream_interactor;
-
-    private Box content_box = new Box(Orientation.HORIZONTAL, 0) { margin=5, margin_start=15, margin_end=5, hexpand=true, visible=true };
-    private Label title_label = new Label("") { visible=true };
-    private Label subtitle_label = new Label("") { use_markup=true, ellipsize=EllipsizeMode.END, visible=false };
-    public GlobalSearchButton search_button = new GlobalSearchButton() { visible = true };
-
-    construct {
-        this.add(content_box);
-
-        Box titles_box = new Box(Orientation.VERTICAL, 0) { valign=Align.CENTER, hexpand=true, visible=true };
-        content_box.add(titles_box);
-
-        titles_box.add(title_label);
-        subtitle_label.attributes = new AttrList();
-        subtitle_label.get_style_context().add_class("dim-label");
-        titles_box.add(subtitle_label);
-
-        Box placeholder_box = new Box(Orientation.VERTICAL, 0) { visible=true };
-        placeholder_box.add(new Label("") { xalign=0, visible=true });
-        placeholder_box.add(new Label("<span size='small'> </span>") { use_markup=true, xalign=0, visible=true });
-        content_box.add(placeholder_box);
-    }
-
-    public ConversationTitlebar(StreamInteractor stream_interactor) {
-        this.stream_interactor = stream_interactor;
-
-        this.get_style_context().add_class("dino-header-right");
-        hexpand = true;
-        search_button.set_image(new Gtk.Image.from_icon_name("system-search-symbolic", Gtk.IconSize.MENU) { visible = true });
-
-        Application app = GLib.Application.get_default() as Application;
-        foreach(var e in app.plugin_registry.conversation_titlebar_entries) {
-            Plugins.ConversationTitlebarWidget widget = e.get_widget(Plugins.WidgetType.GTK);
-            if (widget != null) {
-                Button gtk_widget = (Gtk.Button)widget;
-                gtk_widget.relief = ReliefStyle.NONE;
-                content_box.add(gtk_widget);
-            }
-        }
-    }
-}
-
-}
diff --git a/main/src/ui/conversation_titlebar/view_csd.vala b/main/src/ui/conversation_titlebar/view_csd.vala
deleted file mode 100644
index 62360c42..00000000
--- a/main/src/ui/conversation_titlebar/view_csd.vala
+++ /dev/null
@@ -1,36 +0,0 @@
-using Gtk;
-using Gee;
-
-using Dino.Entities;
-
-namespace Dino.Ui {
-
-public class ConversationTitlebarCsd : Gtk.HeaderBar {
-
-    private StreamInteractor stream_interactor;
-    private Window window;
-
-    public ConversationTitlebarCsd(StreamInteractor stream_interactor, Window window) {
-        this.stream_interactor = stream_interactor;
-        this.window = window;
-
-        this.get_style_context().add_class("dino-right");
-        show_close_button = true;
-        hexpand = true;
-
-        Application app = GLib.Application.get_default() as Application;
-        ArrayList<Plugins.ConversationTitlebarWidget> widgets = new ArrayList<Plugins.ConversationTitlebarWidget>();
-        foreach(var e in app.plugin_registry.conversation_titlebar_entries) {
-            Plugins.ConversationTitlebarWidget widget = e.get_widget(Plugins.WidgetType.GTK);
-            if (widget != null) {
-                widgets.insert(0, widget);
-            }
-        }
-        foreach (var w in widgets) {
-            Button gtk_widget = (Gtk.Button)w;
-            this.pack_end(gtk_widget);
-        }
-    }
-}
-
-}
diff --git a/main/src/ui/unified_window.vala b/main/src/ui/unified_window.vala
index 38a95091..3e8c75e9 100644
--- a/main/src/ui/unified_window.vala
+++ b/main/src/ui/unified_window.vala
@@ -10,43 +10,16 @@ public class UnifiedWindow : Gtk.Window {
 
     public signal void conversation_selected(Conversation conversation);
 
-    public new string? title {
-        get {
-            return Util.use_csd() ? conversation_titlebar_csd.title : conversation_titlebar.title;
-        }
-        set {
-            if (Util.use_csd()) {
-                conversation_titlebar_csd.title = value;
-            } else {
-                conversation_titlebar.title = value;
-            }
-        }
-    }
-
-    public string? subtitle {
-        get {
-            return Util.use_csd() ? conversation_titlebar_csd.subtitle : conversation_titlebar.subtitle;
-        }
-        set {
-            string? new_subtitle = value == null ? null : (/\s+/).replace_literal(value, -1, 0, " ");
-            if (Util.use_csd()) {
-                conversation_titlebar_csd.subtitle = new_subtitle;
-            } else {
-                conversation_titlebar.subtitle = new_subtitle;
-            }
-        }
-    }
+    public new string? title { get; set; }
+    public string? subtitle { get; set; }
 
     public WelcomePlceholder welcome_placeholder = new WelcomePlceholder() { visible=true };
     public NoAccountsPlaceholder accounts_placeholder = new NoAccountsPlaceholder() { visible=true };
     public NoConversationsPlaceholder conversations_placeholder = new NoConversationsPlaceholder() { visible=true };
     public ChatInput.View chat_input;
-    public ConversationListTitlebar conversation_list_titlebar;
-    public ConversationListTitlebarCsd conversation_list_titlebar_csd;
-    public ConversationSelector.List filterable_conversation_list;
+    public ConversationSelector conversation_selector;
     public ConversationSummary.ConversationView conversation_frame;
     public ConversationTitlebar conversation_titlebar;
-    public ConversationTitlebarCsd conversation_titlebar_csd;
     public HeaderBar placeholder_headerbar = new HeaderBar() { title="Dino", show_close_button=true, visible=true };
     public Box box = new Box(Orientation.VERTICAL, 0) { orientation=Orientation.VERTICAL, visible=true };
     public Paned headerbar_paned = new Paned(Orientation.HORIZONTAL) { visible=true };
@@ -74,13 +47,15 @@ public class UnifiedWindow : Gtk.Window {
         setup_unified();
         setup_stack();
 
+        this.bind_property("title", conversation_titlebar, "title");
+        this.bind_property("subtitle", conversation_titlebar, "subtitle");
+        paned.bind_property("position", headerbar_paned, "position", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
+
         stream_interactor.account_added.connect((account) => { check_stack(true); });
         stream_interactor.account_removed.connect((account) => { check_stack(); });
         stream_interactor.get_module(ConversationManager.IDENTITY).conversation_activated.connect(() => check_stack());
         stream_interactor.get_module(ConversationManager.IDENTITY).conversation_deactivated.connect(() => check_stack());
 
-        paned.bind_property("position", headerbar_paned, "position", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
-
         check_stack();
     }
 
@@ -97,7 +72,7 @@ public class UnifiedWindow : Gtk.Window {
         box.add(paned);
         chat_input = ((ChatInput.View) builder.get_object("chat_input")).init(stream_interactor);
         conversation_frame = ((ConversationSummary.ConversationView) builder.get_object("conversation_frame")).init(stream_interactor);
-        filterable_conversation_list = ((ConversationSelector.List) builder.get_object("conversation_list")).init(stream_interactor);
+        conversation_selector = ((ConversationSelector) builder.get_object("conversation_list")).init(stream_interactor);
         goto_end_revealer = (Revealer) builder.get_object("goto_end_revealer");
         goto_end_button = (Button) builder.get_object("goto_end_button");
         search_box = ((GlobalSearch) builder.get_object("search_box")).init(stream_interactor);
@@ -107,9 +82,11 @@ public class UnifiedWindow : Gtk.Window {
 
     private void setup_headerbar() {
         if (Util.use_csd()) {
-            conversation_titlebar_csd = new ConversationTitlebarCsd(stream_interactor, this) { visible=true };
-            conversation_list_titlebar_csd = new ConversationListTitlebarCsd(stream_interactor, this) { visible=true };
+            ConversationListTitlebarCsd conversation_list_titlebar_csd = new ConversationListTitlebarCsd(stream_interactor, this) { visible=true };
             headerbar_paned.pack1(conversation_list_titlebar_csd, false, false);
+
+            ConversationTitlebarCsd conversation_titlebar_csd = new ConversationTitlebarCsd() { visible=true };
+            conversation_titlebar = conversation_titlebar_csd;
             headerbar_paned.pack2(conversation_titlebar_csd, true, false);
 
             // Distribute start/end decoration_layout buttons to left/right headerbar. Ensure app menu fallback.
@@ -125,9 +102,10 @@ public class UnifiedWindow : Gtk.Window {
                 }
             }
         } else {
-            conversation_list_titlebar = new ConversationListTitlebar(stream_interactor, this) { visible=true };
-            conversation_titlebar = new ConversationTitlebar(stream_interactor) { visible=true };
+            ConversationListTitlebar conversation_list_titlebar = new ConversationListTitlebar(stream_interactor, this) { visible=true };
             headerbar_paned.pack1(conversation_list_titlebar, false, false);
+
+            conversation_titlebar = new ConversationTitlebarNoCsd() { visible=true };
             headerbar_paned.pack2(conversation_titlebar, true, false);
 
             box.add(headerbar_paned);
@@ -167,7 +145,7 @@ public class UnifiedWindow : Gtk.Window {
     }
 
     public void loop_conversations(bool backwards) {
-        filterable_conversation_list.loop_conversations(backwards);
+        conversation_selector.loop_conversations(backwards);
     }
 }
 
diff --git a/main/src/ui/unified_window_controller.vala b/main/src/ui/unified_window_controller.vala
index 912b235c..fa087dcc 100644
--- a/main/src/ui/unified_window_controller.vala
+++ b/main/src/ui/unified_window_controller.vala
@@ -79,7 +79,7 @@ public class UnifiedWindowController : Object {
         window.accounts_placeholder.primary_button.clicked.connect(() => { app.activate_action("accounts", null); });
         window.conversations_placeholder.primary_button.clicked.connect(() => { app.activate_action("add_chat", null); });
         window.conversations_placeholder.secondary_button.clicked.connect(() => { app.activate_action("add_conference", null); });
-        window.filterable_conversation_list.conversation_selected.connect((conversation) => select_conversation(conversation));
+        window.conversation_selector.conversation_selected.connect((conversation) => select_conversation(conversation));
 
         var vadjustment = window.conversation_frame.scrolled.vadjustment;
         vadjustment.notify["value"].connect(() => {
@@ -131,7 +131,7 @@ public class UnifiedWindowController : Object {
 
         stream_interactor.get_module(ChatInteraction.IDENTITY).on_conversation_selected(conversation);
         conversation.active = true; // only for conversation_selected
-        window.filterable_conversation_list.on_conversation_selected(conversation); // only for conversation_opened
+        window.conversation_selector.on_conversation_selected(conversation); // only for conversation_opened
 
         if (do_reset_search) {
             reset_search_entry();
@@ -148,10 +148,14 @@ public class UnifiedWindowController : Object {
 
     private void update_conversation_topic(string? subtitle = null) {
         if (subtitle != null) {
-            conversation_topic = subtitle;
+            conversation_topic = (/\s+/).replace_literal(subtitle, -1, 0, " ");
         } else if (conversation.type_ == Conversation.Type.GROUPCHAT) {
-            string subject = stream_interactor.get_module(MucManager.IDENTITY).get_groupchat_subject(conversation.counterpart, conversation.account);
-            conversation_topic = subject != "" ? subject : null;
+            string? subject = stream_interactor.get_module(MucManager.IDENTITY).get_groupchat_subject(conversation.counterpart, conversation.account);
+            if (subject != null) {
+                conversation_topic =  (/\s+/).replace_literal(subject, -1, 0, " ");
+            } else {
+                conversation_topic = null;
+            }
         } else {
             conversation_topic = null;
         }
-- 
cgit v1.2.3-70-g09d2