diff --git a/src/config/configfile.cpp b/src/config/configfile.cpp
index 1bfdd345..1f7e83b2 100644
--- a/src/config/configfile.cpp
+++ b/src/config/configfile.cpp
@@ -48,7 +48,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
 	myQtToolsInterface = CreateQtToolsWrapper();
 
 	// !!!! Revisionsnummer der Configdefaults !!!!!
-        configRev = 71;
+        configRev = 72;
 
 	//standard defaults
 	logOnOffDefault = "1";
@@ -209,12 +209,7 @@ ConfigFile::ConfigFile(char *argv0, bool readonly) : noWriteAccess(readonly)
 	configList.push_back(ConfigInfo("AvatarServerAddress", CONFIG_TYPE_STRING, ""));
 	configList.push_back(ConfigInfo("UseInternetGamePassword", CONFIG_TYPE_INT, "0"));
 	configList.push_back(ConfigInfo("InternetGamePassword", CONFIG_TYPE_STRING, ""));
-	configList.push_back(ConfigInfo("UseIRCLobbyChat", CONFIG_TYPE_INT, "1"));
-	configList.push_back(ConfigInfo("IRCServerAddress", CONFIG_TYPE_STRING, "chat.freenode.net"));
-	configList.push_back(ConfigInfo("IRCServerPort", CONFIG_TYPE_INT, "6667"));
-	configList.push_back(ConfigInfo("IRCChannel", CONFIG_TYPE_STRING, "#pokerth-lobby"));
-	configList.push_back(ConfigInfo("IRCChannelPassword", CONFIG_TYPE_STRING, ""));
-	configList.push_back(ConfigInfo("IRCServerUseIpv6", CONFIG_TYPE_INT, "0"));
+	configList.push_back(ConfigInfo("UseLobbyChat", CONFIG_TYPE_INT, "1"));
 	configList.push_back(ConfigInfo("UseAdminIRC", CONFIG_TYPE_INT, "0"));
 	configList.push_back(ConfigInfo("AdminIRCServerAddress", CONFIG_TYPE_STRING, "chat.freenode.net"));
 	configList.push_back(ConfigInfo("AdminIRCServerPort", CONFIG_TYPE_INT, "6667"));
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
index ad6b3956..9069de34 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -102,7 +102,7 @@ gameLobbyDialogImpl::gameLobbyDialogImpl(startWindowImpl *parent, ConfigFile *c)
 
 void gameLobbyDialogImpl::exec()
 {
-	if(myConfig->readConfigInt("UseIRCLobbyChat"))  { 
+	if(myConfig->readConfigInt("UseLobbyChat"))  { 
 		groupBox_lobbyChat->show(); 
 	}
 	else { 
diff --git a/src/gui/qt/settingsdialog.ui b/src/gui/qt/settingsdialog.ui
index 91569ef6..7c243fb0 100644
--- a/src/gui/qt/settingsdialog.ui
+++ b/src/gui/qt/settingsdialog.ui
@@ -1494,24 +1494,18 @@ p, li { white-space: pre-wrap; }
            </property>
           </widget>
          </item>
-         <item row="3" column="0" rowspan="2">
+         <item row="3" column="0" rowspan="2" colspan="3">
           <widget class="QGroupBox" name="groupBox_4">
-           <property name="minimumSize">
-            <size>
-             <width>300</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>300</width>
-             <height>16777215</height>
-            </size>
-           </property>
            <property name="title">
             <string>Internet Server</string>
            </property>
            <layout class="QGridLayout" name="gridLayout_5">
+            <property name="topMargin">
+             <number>5</number>
+            </property>
+            <property name="bottomMargin">
+             <number>5</number>
+            </property>
             <item row="0" column="0" colspan="2">
              <widget class="QGroupBox" name="groupBox_automaticServerConfig">
               <property name="title">
@@ -1521,6 +1515,12 @@ p, li { white-space: pre-wrap; }
                <bool>true</bool>
               </property>
               <layout class="QGridLayout" name="gridLayout_3">
+               <property name="topMargin">
+                <number>4</number>
+               </property>
+               <property name="bottomMargin">
+                <number>6</number>
+               </property>
                <item row="0" column="0">
                 <widget class="QLabel" name="label_18">
                  <property name="text">
@@ -1552,6 +1552,12 @@ p, li { white-space: pre-wrap; }
                <bool>false</bool>
               </property>
               <layout class="QGridLayout" name="gridLayout_4">
+               <property name="topMargin">
+                <number>4</number>
+               </property>
+               <property name="bottomMargin">
+                <number>5</number>
+               </property>
                <item row="0" column="0">
                 <widget class="QLabel" name="label_41">
                  <property name="text">
@@ -1659,132 +1665,7 @@ p, li { white-space: pre-wrap; }
            </layout>
           </widget>
          </item>
-         <item row="3" column="1" colspan="2">
-          <widget class="QGroupBox" name="groupBox_lobbyChat">
-           <property name="title">
-            <string>Lobby Chat (IRC)</string>
-           </property>
-           <property name="checkable">
-            <bool>true</bool>
-           </property>
-           <layout class="QGridLayout" name="gridLayout_2">
-            <item row="0" column="0">
-             <widget class="QLabel" name="label_48">
-              <property name="text">
-               <string>Server Address:</string>
-              </property>
-              <property name="buddy">
-               <cstring>lineEdit_IRCServerAddress</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QLineEdit" name="lineEdit_IRCServerAddress">
-              <property name="text">
-               <string>chat.freenode.net</string>
-              </property>
-              <property name="maxLength">
-               <number>60</number>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="label_46">
-              <property name="text">
-               <string>Server Port:</string>
-              </property>
-              <property name="buddy">
-               <cstring>spinBox_IRCServerPort</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QSpinBox" name="spinBox_IRCServerPort">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="minimum">
-               <number>80</number>
-              </property>
-              <property name="maximum">
-               <number>65535</number>
-              </property>
-              <property name="value">
-               <number>6667</number>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="label_49">
-              <property name="text">
-               <string>Channel:</string>
-              </property>
-              <property name="buddy">
-               <cstring>lineEdit_IRCChannel</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="0">
-             <widget class="QLabel" name="label_17">
-              <property name="text">
-               <string>Password:</string>
-              </property>
-              <property name="buddy">
-               <cstring>lineEdit_IRCChannelPassword</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="3" column="1">
-             <widget class="QLineEdit" name="lineEdit_IRCChannelPassword">
-              <property name="echoMode">
-               <enum>QLineEdit::Password</enum>
-              </property>
-             </widget>
-            </item>
-            <item row="4" column="0">
-             <widget class="QCheckBox" name="checkBox_IRCServerUseIpv6">
-              <property name="text">
-               <string>Use IPv6</string>
-              </property>
-             </widget>
-            </item>
-            <item row="4" column="1">
-             <widget class="QLabel" name="label_45">
-              <property name="text">
-               <string>&lt;a href=&quot;http://en.wikipedia.org/wiki/Ipv6&quot;&gt;What is this?&lt;/a&gt;</string>
-              </property>
-              <property name="openExternalLinks">
-               <bool>true</bool>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <widget class="QLineEdit" name="lineEdit_IRCChannel">
-              <property name="text">
-               <string>#pokerth</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item row="4" column="2">
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>98</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item row="5" column="0" colspan="3">
+         <item row="6" column="0" colspan="3">
           <layout class="QHBoxLayout" name="horizontalLayout_2">
            <property name="spacing">
             <number>0</number>
@@ -1808,7 +1689,7 @@ p, li { white-space: pre-wrap; }
            </item>
           </layout>
          </item>
-         <item row="6" column="0" colspan="3">
+         <item row="7" column="0" colspan="3">
           <spacer>
            <property name="orientation">
             <enum>Qt::Vertical</enum>
@@ -1821,6 +1702,13 @@ p, li { white-space: pre-wrap; }
            </property>
           </spacer>
          </item>
+         <item row="5" column="0">
+          <widget class="QCheckBox" name="checkBox_UseLobbyChat">
+           <property name="text">
+            <string>Enable/Disable Lobby Chat</string>
+           </property>
+          </widget>
+         </item>
         </layout>
        </widget>
        <widget class="QWidget" name="page_3">
@@ -3501,12 +3389,6 @@ p, li { white-space: pre-wrap; }
   <tabstop>checkBox_InternetServerUseSctp</tabstop>
   <tabstop>checkBox_UseInternetGamePassword</tabstop>
   <tabstop>lineEdit_InternetGamePassword</tabstop>
-  <tabstop>groupBox_lobbyChat</tabstop>
-  <tabstop>lineEdit_IRCServerAddress</tabstop>
-  <tabstop>spinBox_IRCServerPort</tabstop>
-  <tabstop>lineEdit_IRCChannel</tabstop>
-  <tabstop>lineEdit_IRCChannelPassword</tabstop>
-  <tabstop>checkBox_IRCServerUseIpv6</tabstop>
   <tabstop>pushButton_HumanPlayerAvatar</tabstop>
   <tabstop>lineEdit_HumanPlayerName</tabstop>
   <tabstop>pushButton_Opponent1Avatar</tabstop>
diff --git a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
index 486b68d1..05cae0bb 100644
--- a/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+++ b/src/gui/qt/settingsdialog/settingsdialogimpl.cpp
@@ -209,12 +209,7 @@ void settingsDialogImpl::exec() {
 	if(myConfig->readConfigInt("UseInternetGamePassword")) {
 		lineEdit_InternetGamePassword->setText(QString::fromUtf8(myConfig->readConfigString("InternetGamePassword").c_str()));
 	}
-	groupBox_lobbyChat->setChecked(myConfig->readConfigInt("UseIRCLobbyChat"));
-	lineEdit_IRCServerAddress->setText(QString::fromUtf8(myConfig->readConfigString("IRCServerAddress").c_str()));
-	spinBox_IRCServerPort->setValue(myConfig->readConfigInt("IRCServerPort"));
-	lineEdit_IRCChannel->setText(QString::fromUtf8(myConfig->readConfigString("IRCChannel").c_str()));
-	lineEdit_IRCChannelPassword->setText(QString::fromUtf8(myConfig->readConfigString("IRCChannelPassword").c_str()));
-	checkBox_IRCServerUseIpv6->setChecked(myConfig->readConfigInt("IRCServerUseIpv6"));
+	checkBox_UseLobbyChat->setChecked(myConfig->readConfigInt("UseLobbyChat"));
 
 	//Interface
 	comboBox_switchLanguage->setCurrentIndex(comboBox_switchLanguage->findData(QString::fromUtf8(myConfig->readConfigString("Language").c_str()).section('_', 0, 0)));
@@ -405,7 +400,6 @@ void settingsDialogImpl::exec() {
 	checkBox_useSctp->setEnabled(tmpHasSctp);
 	checkBox_InternetServerUseIpv6->setEnabled(tmpHasIpv6);
 	checkBox_InternetServerUseSctp->setEnabled(tmpHasSctp);
-	checkBox_IRCServerUseIpv6->setEnabled(tmpHasIpv6);
 
 	//Manual Blinds Order Dialog (local)
 	myManualBlindsList = myConfig->readConfigIntList("ManualBlindsList");
@@ -536,12 +530,7 @@ void settingsDialogImpl::isAccepted() {
 	myConfig->writeConfigInt("InternetServerUseSctp", checkBox_InternetServerUseSctp->isChecked());
 	myConfig->writeConfigInt("UseInternetGamePassword", checkBox_UseInternetGamePassword->isChecked());
 	myConfig->writeConfigString("InternetGamePassword", lineEdit_InternetGamePassword->text().toUtf8().constData());
-	myConfig->writeConfigInt("UseIRCLobbyChat", groupBox_lobbyChat->isChecked());
-	myConfig->writeConfigString("IRCServerAddress", lineEdit_IRCServerAddress->text().toUtf8().constData());
-	myConfig->writeConfigInt("IRCServerPort", spinBox_IRCServerPort->value());
-	myConfig->writeConfigString("IRCChannel", lineEdit_IRCChannel->text().toUtf8().constData());
-	myConfig->writeConfigString("IRCChannelPassword", lineEdit_IRCChannelPassword->text().toUtf8().constData());
-	myConfig->writeConfigInt("IRCServerUseIpv6", checkBox_IRCServerUseIpv6->isChecked());
+	myConfig->writeConfigInt("UseLobbyChat", checkBox_UseLobbyChat->isChecked());
 	
 // 	Interface
 	myConfig->writeConfigString("Language", comboBox_switchLanguage->itemData(comboBox_switchLanguage->currentIndex()).toString().toUtf8().constData());