diff --git a/src/chat.py b/src/chat.py
index 823c02e98..1d4526cf2 100644
--- a/src/chat.py
+++ b/src/chat.py
@@ -121,6 +121,10 @@ class Chat:
 		elif self.widget_name == 'groupchat_window':
 			nickname = self.notebook.get_tab_label(child).get_children()[0]
 
+		#FIXME: when gtk2.4 is OOOOLD do it via glade2.10+
+		if gtk.pygtk_version > (2, 6, 0) and gtk.gtk_version > (2, 6, 0):
+			nickname.set_max_width_chars(15)
+
 		nickname.set_text(start + self.names[jid])
 
 	def on_window_destroy(self, widget, kind): #kind is 'chats' or 'gc'
diff --git a/src/dialogs.py b/src/dialogs.py
index 220746ac6..5e7325865 100644
--- a/src/dialogs.py
+++ b/src/dialogs.py
@@ -366,6 +366,7 @@ class About_dialog:
 	'''Class for about dialog'''
 	def __init__(self):
 		if gtk.pygtk_version < (2, 6, 0):
+			#FIXME: when 0.7.1 is out fix this [add version in _]
 			Information_dialog(_('Gajim - a GTK+ Jabber client') + '\nVersion %s' \
 			% gajim.version)
 			return
diff --git a/src/gtkgui.glade b/src/gtkgui.glade
index c0579d2af..606ae9284 100644
--- a/src/gtkgui.glade
+++ b/src/gtkgui.glade
@@ -9354,7 +9354,7 @@ Custom</property>
 	<widget class="GtkHBox" id="chat_tab_hbox">
 	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
-	  <property name="spacing">5</property>
+	  <property name="spacing">4</property>
 
 	  <child>
 	    <widget class="GtkImage" id="status_image">
@@ -9368,8 +9368,8 @@ Custom</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
-	      <property name="expand">True</property>
-	      <property name="fill">True</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
 	    </packing>
 	  </child>