Index: /home/wwwchrisde/svn/konversation/src/tabbar_preferences.ui
===================================================================
--- /home/wwwchrisde/svn/konversation/src/tabbar_preferences.ui	(revision 505169)
+++ /home/wwwchrisde/svn/konversation/src/tabbar_preferences.ui	(revision 505170)
@@ -1,4 +1,4 @@
-<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>TabBar_Config</class>
 <comment>This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -16,6 +16,9 @@
             <height>336</height>
         </rect>
     </property>
+    <property name="caption">
+        <string>TabBar_Config</string>
+    </property>
     <grid>
         <property name="name">
             <cstring>unnamed</cstring>
@@ -50,7 +53,7 @@
                         <cstring>kcfg_BringToFront</cstring>
                     </property>
                     <property name="text">
-                        <string>Bring new tabs to &amp;front</string>
+                        <string>&amp;Bring new tabs to front</string>
                     </property>
                 </widget>
                 <widget class="QCheckBox">
@@ -60,7 +63,21 @@
                     <property name="text">
                         <string>When someone queries you, focus new &amp;query</string>
                     </property>
+                    <property name="accel">
+                        <string>Alt+Q</string>
+                    </property>
                 </widget>
+                <widget class="QCheckBox">
+                    <property name="name">
+                        <cstring>kcfg_UseMaxSizedTabs</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Limit the si&amp;ze of the tab labels to fit all on screen</string>
+                    </property>
+                    <property name="accel">
+                        <string>Alt+Z</string>
+                    </property>
+                </widget>
             </vbox>
         </widget>
         <widget class="QGroupBox" row="1" column="0">
@@ -87,10 +104,10 @@
                         <cstring>kcfg_ShowTabBarCloseButton</cstring>
                     </property>
                     <property name="text">
-                        <string>Show a close button on the right side of the tab bar</string>
+                        <string>Show a close button on the right si&amp;de of the tab bar</string>
                     </property>
                     <property name="accel">
-                        <string></string>
+                        <string>Alt+D</string>
                     </property>
                 </widget>
             </vbox>
Index: /home/wwwchrisde/svn/konversation/src/konversationmainwindow.cpp
===================================================================
--- /home/wwwchrisde/svn/konversation/src/konversationmainwindow.cpp	(revision 505169)
+++ /home/wwwchrisde/svn/konversation/src/konversationmainwindow.cpp	(revision 505170)
@@ -108,7 +108,7 @@
     viewContainer->setTabReorderingEnabled(true);
     viewContainer->setTabCloseActivatePrevious(true);
     #if KDE_IS_VERSION(3,4,0)
-    viewContainer->setAutomaticResizeTabs(true);
+    viewContainer->setAutomaticResizeTabs(Preferences::useMaxSizedTabs());
     #endif
     //  viewContainer->setHoverCloseButtonDelayed(false);
     setCentralWidget(viewContainer);
@@ -474,7 +474,9 @@
 {
     updateTabPlacement();
     setShowTabBarCloseButton(Preferences::showTabBarCloseButton());
-
+    #if KDE_IS_VERSION(3,4,0)
+    viewContainer->setAutomaticResizeTabs(Preferences::useMaxSizedTabs());
+    #endif
     int statH = fontMetrics().height()+2;
     m_generalInfoLabel->setFixedHeight( statH );
 
Index: /home/wwwchrisde/svn/konversation/src/config/konversation.kcfg
===================================================================
--- /home/wwwchrisde/svn/konversation/src/config/konversation.kcfg	(revision 505169)
+++ /home/wwwchrisde/svn/konversation/src/config/konversation.kcfg	(revision 505170)
@@ -11,6 +11,10 @@
   <kcfgfile name="konversationrc" />
 
   <group name="Appearance">
+    <entry key="UseMaxSizedTabs" type="Bool">
+    <default>true</default>
+    <label>Limit the size of the tab labels to fit all on screen</label>
+    </entry>
     <entry key="TopicSplitterSizes" type="IntList">
       <default></default>
       <label></label>
Index: /home/wwwchrisde/svn/konversation/src/query.h
===================================================================
--- /home/wwwchrisde/svn/konversation/src/query.h	(revision 505169)
+++ /home/wwwchrisde/svn/konversation/src/query.h	(revision 505170)
@@ -29,7 +29,6 @@
 class QLineEdit;
 class QCheckBox;
 class QLabel;
-class QStrList;
 
 class IRCInput;