diff --git a/qml/pages/DebugPage.qml b/qml/pages/DebugPage.qml
index b3e1b24..dee92e4 100644
--- a/qml/pages/DebugPage.qml
+++ b/qml/pages/DebugPage.qml
@@ -18,6 +18,7 @@
 */
 import QtQuick 2.6
 import Sailfish.Silica 1.0
+import WerkWolf.Fernschreiber 1.0
 import "../components"
 import "../js/twemoji.js" as Emoji
 import "../js/functions.js" as Functions
@@ -41,6 +42,38 @@ Page {
                 description: "here be dragons"
 
             }
+
+            SectionHeader {
+                text: "Chats"
+            }
+
+            TextSwitch {
+                checked: chatListModel.showAllChats
+                text: "Show all chats"
+                description: "Including the ones referenced by the chats you have joined."
+                automaticCheck: false
+                onClicked: chatListModel.showAllChats = !chatListModel.showAllChats
+            }
+
+            Row {
+                TextField {
+                    id: chatId
+                    anchors.bottom: parent.bottom
+                    width: column.width - joinButton.width - Theme.horizontalPageMargin
+                    placeholderText: "Chat id"
+                    labelVisible: false
+                    EnterKey.iconSource: "image://theme/icon-m-enter-accept"
+                    EnterKey.enabled: text.length > 0
+                    EnterKey.onClicked: tdLibWrapper.joinChat(text)
+                }
+                Button {
+                    id: joinButton
+                    text: "Join by id"
+                    anchors.bottom: parent.bottom
+                    enabled: chatId.text.length > 0
+                    onClicked: tdLibWrapper.joinChat(chatId.text)
+                }
+            }
         }
 
         VerticalScrollDecorator {}
diff --git a/src/chatlistmodel.cpp b/src/chatlistmodel.cpp
index dff621d..b17ea1f 100644
--- a/src/chatlistmodel.cpp
+++ b/src/chatlistmodel.cpp
@@ -495,7 +495,7 @@ void ChatListModel::addVisibleChat(ChatData *chat)
 
 void ChatListModel::updateChatVisibility(const TDLibWrapper::Group *group)
 {
-    LOG("Updating chat visibility" << group->groupId);
+    LOG("Updating chat visibility" << (group ? qPrintable(QString::number(group->groupId)) : ""));
     // See if any group has been removed from from view
     for (int i = 0; i < chatList.size(); i++) {
         ChatData *chat = chatList.at(i);