3 files changed, 8 insertions, 1 deletions
diff --git a/main/src/ui/conversation_summary/merged_message_item.vala b/main/src/ui/conversation_summary/merged_message_item.vala
index fa87ec59..6c1166d1 100644
--- a/main/src/ui/conversation_summary/merged_message_item.vala
+++ b/main/src/ui/conversation_summary/merged_message_item.vala
@@ -9,7 +9,7 @@ namespace Dino.Ui.ConversationSummary {
 
 public class MergedMessageItem : MessageItem {
 
-    private Label name_label = new Label("") { xalign=0, visible=true };
+    private Label name_label = new Label("") { xalign=0, visible=true, hexpand=true };
     private MessageTextView textview = new MessageTextView() { visible=true };
 
     public MergedMessageItem(StreamInteractor stream_interactor, Conversation conversation, Message message) {
diff --git a/main/src/ui/conversation_summary/message_textview.vala b/main/src/ui/conversation_summary/message_textview.vala
index 28df9a53..80759207 100644
--- a/main/src/ui/conversation_summary/message_textview.vala
+++ b/main/src/ui/conversation_summary/message_textview.vala
@@ -21,6 +21,12 @@ public class MessageTextView : TextView {
         style_updated.connect(update_display_style);
     }
 
+    // Workaround GTK TextView issues
+    public override void get_preferred_width (out int minimum_width, out int natural_width) {
+        base.get_preferred_width(out minimum_width, out natural_width);
+        minimum_width = 0;
+    }
+
     public void add_text(string text) {
         TextIter end;
         buffer.get_end_iter(out end);
diff --git a/main/src/ui/conversation_summary/view.vala b/main/src/ui/conversation_summary/view.vala
index fdd6029c..c0cf772d 100644
--- a/main/src/ui/conversation_summary/view.vala
+++ b/main/src/ui/conversation_summary/view.vala
@@ -199,6 +199,7 @@ public class View : Box {
         }
     }
 
+    // Workaround GTK TextView issues
     private void force_alloc_width(Widget widget, int width) {
         Allocation alloc = Allocation();
         widget.get_preferred_width(out alloc.width, null);