diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index 0b02e651..7bcf028c 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -2046,6 +2046,7 @@ public class ComposerWidget : Gtk.EventBox {
         }
 
         this.info_label.set_text(text);
+        this.info_label.set_tooltip_text(text);
     }
 
     // Updates from combobox contents and visibility, returns true if
diff --git a/ui/composer-widget.ui b/ui/composer-widget.ui
index 1d1d78bd..7ecd48d1 100644
--- a/ui/composer-widget.ui
+++ b/ui/composer-widget.ui
@@ -762,6 +762,8 @@
               <object class="GtkLabel" id="info_label">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="ellipsize">end</property>
+                <property name="width_chars">6</property>
                 <style>
                   <class name="dim-label"/>
                 </style>