diff --git a/ui/app/AppLayouts/Chat/ContactsColumn.qml b/ui/app/AppLayouts/Chat/ContactsColumn.qml
index c54437c26d..9ee460251f 100644
--- a/ui/app/AppLayouts/Chat/ContactsColumn.qml
+++ b/ui/app/AppLayouts/Chat/ContactsColumn.qml
@@ -10,7 +10,8 @@ import "./components"
 import "./ContactsColumn"
 
 Item {
-    property alias chatGroupsListViewCount: chatGroupsListView.count
+    // property alias chatGroupsListViewCount: chatGroupsListView.count
+    property alias chatGroupsListViewCount: channelList.channelListCount
     property alias searchStr: searchText.text
 
     id: contactsColumn
@@ -188,121 +189,12 @@ Item {
         anchors.top: searchBox.bottom
         anchors.topMargin: 16
 
+        currentIndex: channelList.channelListCount > 0 ? 1 : 0
 
-        currentIndex: chatGroupsListView.count > 0 ? 1 : 0
         EmptyView {}
 
-        Item {
-            id: chatGroupsContainer
-            Layout.fillHeight: true
-            Layout.fillWidth: true
-
-            Component {
-                id: chatViewDelegate
-
-                Rectangle {
-                    id: wrapper
-                    color: ListView.isCurrentItem ? Theme.lightBlue : Theme.transparent
-                    anchors.right: parent.right
-                    anchors.rightMargin: Theme.padding
-                    anchors.top: applicationWindow.top
-                    anchors.topMargin: 0
-                    anchors.left: parent.left
-                    anchors.leftMargin: Theme.padding
-                    radius: 8
-                    // Hide the box if it is filtered out
-                    property bool isVisible: searchStr == "" || name.includes(searchStr)
-                    visible: isVisible ? true : false
-                    height: isVisible ? 64 : 0
-
-                    MouseArea {
-                        cursorShape: Qt.PointingHandCursor
-                        anchors.fill: parent
-                        onClicked: {
-                            chatsModel.setActiveChannelByIndex(index)
-                            chatGroupsListView.currentIndex = index
-                        }
-                    }
-
-                    Rectangle {
-                        id: contactImage
-                        width: 40
-                        color: Theme.darkGrey
-                        anchors.left: parent.left
-                        anchors.leftMargin: Theme.padding
-                        anchors.top: parent.top
-                        anchors.topMargin: 12
-                        anchors.bottom: parent.bottom
-                        anchors.bottomMargin: 12
-                        radius: 50
-                    }
-
-                    Text {
-                        id: contactInfo
-                        text: name
-                        anchors.right: contactTime.left
-                        anchors.rightMargin: Theme.smallPadding
-                        elide: Text.ElideRight
-                        font.weight: Font.Medium
-                        font.pixelSize: 15
-                        anchors.left: contactImage.right
-                        anchors.leftMargin: Theme.padding
-                        anchors.top: parent.top
-                        anchors.topMargin: Theme.smallPadding
-                        color: "black"
-                    }
-                    Text {
-                        id: lastChatMessage
-                        text: lastMessage || qsTr("No messages")
-                        anchors.right: contactNumberChatsCircle.left
-                        anchors.rightMargin: Theme.smallPadding
-                        elide: Text.ElideRight
-                        anchors.bottom: parent.bottom
-                        anchors.bottomMargin: Theme.smallPadding
-                        font.pixelSize: 15
-                        anchors.left: contactImage.right
-                        anchors.leftMargin: Theme.padding
-                        color: Theme.darkGrey
-                    }
-                    Text {
-                        id: contactTime
-                        text: timestamp
-                        anchors.right: parent.right
-                        anchors.rightMargin: Theme.padding
-                        anchors.top: parent.top
-                        anchors.topMargin: Theme.smallPadding
-                        font.pixelSize: 11
-                        color: Theme.darkGrey
-                    }
-                    Rectangle {
-                        id: contactNumberChatsCircle
-                        width: 22
-                        height: 22
-                        radius: 50
-                        anchors.bottom: parent.bottom
-                        anchors.bottomMargin: Theme.smallPadding
-                        anchors.right: parent.right
-                        anchors.rightMargin: Theme.padding
-                        color: Theme.blue
-                        visible: unviewedMessagesCount > 0
-                        Text {
-                            id: contactNumberChats
-                            text: unviewedMessagesCount
-                            anchors.horizontalCenter: parent.horizontalCenter
-                            anchors.verticalCenter: parent.verticalCenter
-                            color: "white"
-                        }
-                    }
-                }
-            }
-
-            ListView {
-                id: chatGroupsListView
-                anchors.topMargin: 24
-                anchors.fill: parent
-                model: chatsModel.chats
-                delegate: chatViewDelegate
-            }
+        ChannelList {
+            id: channelList
         }
     }
 
diff --git a/ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml b/ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml
new file mode 100644
index 0000000000..db88ac3796
--- /dev/null
+++ b/ui/app/AppLayouts/Chat/ContactsColumn/ChannelList.qml
@@ -0,0 +1,120 @@
+import QtQuick 2.12
+import QtQuick.Controls 2.3
+import QtQuick.Layouts 1.3
+import "../../../../shared"
+import "../../../../imports"
+import "../components"
+
+Item {
+    property alias channelListCount: chatGroupsListView.count
+    id: chatGroupsContainer
+    Layout.fillHeight: true
+    Layout.fillWidth: true
+
+    Component {
+        id: chatViewDelegate
+
+        Rectangle {
+            id: wrapper
+            color: ListView.isCurrentItem ? Theme.lightBlue : Theme.transparent
+            anchors.right: parent.right
+            anchors.rightMargin: Theme.padding
+            anchors.top: applicationWindow.top
+            anchors.topMargin: 0
+            anchors.left: parent.left
+            anchors.leftMargin: Theme.padding
+            radius: 8
+            // Hide the box if it is filtered out
+            property bool isVisible: searchStr == "" || name.includes(searchStr)
+            visible: isVisible ? true : false
+            height: isVisible ? 64 : 0
+
+            MouseArea {
+                cursorShape: Qt.PointingHandCursor
+                anchors.fill: parent
+                onClicked: {
+                    chatsModel.setActiveChannelByIndex(index)
+                    chatGroupsListView.currentIndex = index
+                }
+            }
+
+            Rectangle {
+                id: contactImage
+                width: 40
+                color: Theme.darkGrey
+                anchors.left: parent.left
+                anchors.leftMargin: Theme.padding
+                anchors.top: parent.top
+                anchors.topMargin: 12
+                anchors.bottom: parent.bottom
+                anchors.bottomMargin: 12
+                radius: 50
+            }
+
+            Text {
+                id: contactInfo
+                text: name
+                anchors.right: contactTime.left
+                anchors.rightMargin: Theme.smallPadding
+                elide: Text.ElideRight
+                font.weight: Font.Medium
+                font.pixelSize: 15
+                anchors.left: contactImage.right
+                anchors.leftMargin: Theme.padding
+                anchors.top: parent.top
+                anchors.topMargin: Theme.smallPadding
+                color: "black"
+            }
+            Text {
+                id: lastChatMessage
+                text: lastMessage || qsTr("No messages")
+                anchors.right: contactNumberChatsCircle.left
+                anchors.rightMargin: Theme.smallPadding
+                elide: Text.ElideRight
+                anchors.bottom: parent.bottom
+                anchors.bottomMargin: Theme.smallPadding
+                font.pixelSize: 15
+                anchors.left: contactImage.right
+                anchors.leftMargin: Theme.padding
+                color: Theme.darkGrey
+            }
+            Text {
+                id: contactTime
+                text: timestamp
+                anchors.right: parent.right
+                anchors.rightMargin: Theme.padding
+                anchors.top: parent.top
+                anchors.topMargin: Theme.smallPadding
+                font.pixelSize: 11
+                color: Theme.darkGrey
+            }
+            Rectangle {
+                id: contactNumberChatsCircle
+                width: 22
+                height: 22
+                radius: 50
+                anchors.bottom: parent.bottom
+                anchors.bottomMargin: Theme.smallPadding
+                anchors.right: parent.right
+                anchors.rightMargin: Theme.padding
+                color: Theme.blue
+                visible: unviewedMessagesCount > 0
+                Text {
+                    id: contactNumberChats
+                    text: unviewedMessagesCount
+                    anchors.horizontalCenter: parent.horizontalCenter
+                    anchors.verticalCenter: parent.verticalCenter
+                    color: "white"
+                }
+            }
+        }
+    }
+
+    ListView {
+        id: chatGroupsListView
+        anchors.topMargin: 24
+        anchors.fill: parent
+        model: chatsModel.chats
+        delegate: chatViewDelegate
+    }
+}
\ No newline at end of file
diff --git a/ui/app/AppLayouts/Chat/ContactsColumn/qmldir b/ui/app/AppLayouts/Chat/ContactsColumn/qmldir
index af782d9822..55ade74ff8 100644
--- a/ui/app/AppLayouts/Chat/ContactsColumn/qmldir
+++ b/ui/app/AppLayouts/Chat/ContactsColumn/qmldir
@@ -1 +1,2 @@
-EmptyView 1.0 EmptyView.qml
\ No newline at end of file
+EmptyView 1.0 EmptyView.qml
+ChannelList 1.0 ChannelList.qml
\ No newline at end of file