diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5eccd72b2d..d5d4e9a742 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -5,6 +5,7 @@
 Version 5.16, unreleased
 Default Qt Client
 - Option to show server's message of the day in a welcome dialog box
+- Option to show channel topic in channel list
 - Fixed "Gender" property not being saved in .tt files
 Android Client
 -
diff --git a/Client/qtTeamTalk/channelstree.cpp b/Client/qtTeamTalk/channelstree.cpp
index eb1343eef1..7cdd88d044 100644
--- a/Client/qtTeamTalk/channelstree.cpp
+++ b/Client/qtTeamTalk/channelstree.cpp
@@ -1123,6 +1123,8 @@ void ChannelsTree::updateChannelItem(QTreeWidgetItem* item)
         channame += " - 👻";
     if (emoji && chan.bPassword)
         channame += " - 🔒";
+    if (ttSettings->value(SETTINGS_DISPLAY_CHANNEL_TOPIC, SETTINGS_DISPLAY_CHANNEL_TOPIC_DEFAULT).toBool() == true && _Q(chan.szTopic).size())
+        channame += ": " + _Q(chan.szTopic);
     item->setData(COLUMN_ITEM, Qt::DisplayRole, channame);
     if (anim)
         item->setData(COLUMN_ITEM, Qt::DecorationRole, getChannelIcon(chan, item));
diff --git a/Client/qtTeamTalk/preferences.ui b/Client/qtTeamTalk/preferences.ui
index 5b9c9d6550..5903c8d54d 100644
--- a/Client/qtTeamTalk/preferences.ui
+++ b/Client/qtTeamTalk/preferences.ui
@@ -583,6 +583,13 @@
                 </property>
                </widget>
               </item>
+              <item>
+               <widget class="QCheckBox" name="chanTopicChkBox">
+                <property name="text">
+                 <string>Show channel topic in channel list</string>
+                </property>
+               </widget>
+              </item>
               <item>
                <widget class="QCheckBox" name="startServerListChkBox">
                 <property name="text">
@@ -2380,6 +2387,13 @@
               </property>
              </widget>
             </item>
+            <item row="10" column="1">
+             <widget class="QCheckBox" name="ttsLogServernameChkBox">
+              <property name="text">
+               <string>Announce server name for user logs in/out events</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </item>
           <item>
diff --git a/Client/qtTeamTalk/preferencesdlg.cpp b/Client/qtTeamTalk/preferencesdlg.cpp
index 501020e1b9..6f14d9b85f 100644
--- a/Client/qtTeamTalk/preferencesdlg.cpp
+++ b/Client/qtTeamTalk/preferencesdlg.cpp
@@ -580,6 +580,7 @@ void PreferencesDlg::slotTabChange(int index)
         ui.closeFileDlgChkBox->setChecked(ttSettings->value(SETTINGS_DISPLAY_CLOSE_FILEDIALOG, SETTINGS_DISPLAY_CLOSE_FILEDIALOG_DEFAULT).toBool());
         ui.dlgExcludeChkBox->setChecked(ttSettings->value(SETTINGS_DISPLAY_CHANEXCLUDE_DLG, SETTINGS_DISPLAY_CHANEXCLUDE_DLG_DEFAULT).toBool());
         ui.dlgMOTDChkBox->setChecked(ttSettings->value(SETTINGS_DISPLAY_MOTD_DLG, SETTINGS_DISPLAY_MOTD_DLG_DEFAULT).toBool());
+        ui.chanTopicChkBox->setChecked(ttSettings->value(SETTINGS_DISPLAY_CHANNEL_TOPIC, SETTINGS_DISPLAY_CHANNEL_TOPIC_DEFAULT).toBool());
         ui.startServerListChkBox->setVisible(!ttSettings->value(SETTINGS_CONNECTION_AUTOCONNECT, SETTINGS_CONNECTION_AUTOCONNECT_DEFAULT).toBool());
         ui.startServerListChkBox->setChecked(ttSettings->value(SETTINGS_DISPLAY_START_SERVERLIST, SETTINGS_DISPLAY_START_SERVERLIST_DEFAULT).toBool());
     }
@@ -878,6 +879,7 @@ void PreferencesDlg::slotSaveChanges()
         ttSettings->setValue(SETTINGS_DISPLAY_CLOSE_FILEDIALOG, ui.closeFileDlgChkBox->isChecked());
         ttSettings->setValue(SETTINGS_DISPLAY_CHANEXCLUDE_DLG, ui.dlgExcludeChkBox->isChecked());
         ttSettings->setValue(SETTINGS_DISPLAY_MOTD_DLG, ui.dlgMOTDChkBox->isChecked());
+        ttSettings->setValue(SETTINGS_DISPLAY_CHANNEL_TOPIC, ui.chanTopicChkBox->isChecked());
         ttSettings->setValue(SETTINGS_DISPLAY_START_SERVERLIST, ui.startServerListChkBox->isChecked());
     }
     if(m_modtab.find(CONNECTION_TAB) != m_modtab.end())
diff --git a/Client/qtTeamTalk/settings.h b/Client/qtTeamTalk/settings.h
index f2d480df71..963d8660fb 100644
--- a/Client/qtTeamTalk/settings.h
+++ b/Client/qtTeamTalk/settings.h
@@ -143,6 +143,8 @@
 #define SETTINGS_DISPLAY_CHANEXCLUDE_DLG_DEFAULT             false
 #define SETTINGS_DISPLAY_MOTD_DLG             "display/MOTD-dlg"
 #define SETTINGS_DISPLAY_MOTD_DLG_DEFAULT             false
+#define SETTINGS_DISPLAY_CHANNEL_TOPIC             "display/channel-topic"
+#define SETTINGS_DISPLAY_CHANNEL_TOPIC_DEFAULT             false
 #define SETTINGS_DISPLAY_START_SERVERLIST             "display/serverlist-on-start"
 #define SETTINGS_DISPLAY_START_SERVERLIST_DEFAULT             false
 #define SETTINGS_DISPLAY_CHANNELSORT                 "display/sort-channels"