diff --git a/src/qml/ActiveChat.qml b/src/qml/ActiveChat.qml
--- a/src/qml/ActiveChat.qml
+++ b/src/qml/ActiveChat.qml
@@ -39,11 +39,15 @@
     property string roomId: ""
 
     spacing: Kirigami.Units.smallSpacing
+    highlightRangeMode: ListView.ApplyRange
+    preferredHighlightBegin: parent.height - currentItem.height
+    preferredHighlightEnd: parent.height
+
     onCountChanged: {
-        positionViewAtIndex(count - 1, ListView.Beginning)
+        currentIndex = count - 1
     }
 
-    Component.onCompleted: positionViewAtIndex(count - 1, ListView.End)
+    Component.onCompleted: positionViewAtEnd()
     visible: count > 0
     onDragEnded : {
         if (roomId !== "") {
diff --git a/src/qml/MainComponent.qml b/src/qml/MainComponent.qml
--- a/src/qml/MainComponent.qml
+++ b/src/qml/MainComponent.qml
@@ -93,7 +93,7 @@
                     QQC2.Menu {
                         id: menu
                         y: parent.height
-                        
+
                         QQC2.MenuItem {
                             text: i18n("Create New Channel")
                             onTriggered: {
@@ -226,95 +226,95 @@
             id: clipboard
         }
 
-        QQC2.ScrollView {
+        ActiveChat {
+            id: activeChat
+            model: appid.model
+            rcAccount: appid.rocketChatAccount
+            roomId: appid.selectedRoomID
             anchors.fill: parent
-            ActiveChat {
-                id: activeChat
-                model: appid.model
-                rcAccount: appid.rocketChatAccount
-                roomId: appid.selectedRoomID
+            clip: true
 
-                onOpenDirectChannel: {
-                    openDirectChannelDialog.username = userName;
-                    openDirectChannelDialog.open()
-                }
-                onJitsiCallConfActivated: {
-                    appid.rocketChatAccount.joinJitsiConfCall(roomId)
-                }
-                onDeleteMessage: {
-                    deleteMessageDialog.msgId = messageId
-                    deleteMessageDialog.open()
-                }
-                onDownloadAttachment: {
-                    downloadFileDialog.fileToSaveUrl = url
-                    downloadFileDialog.open()
-                }
+            QQC2.ScrollBar.vertical: QQC2.ScrollBar { }
 
-                onEditMessage: {
-                    userInputMessage.messageId = messageId;
-                    userInputMessage.setOriginalMessage(messageStr)
-                    //console.log(RuqolaDebugCategorySingleton.category, "edit! messageId : " + messageId + " messageStr " + messageStr)
-                }
-                onCopyMessage: {
-                    clipboard.text = messageStr
-                    //console.log(RuqolaDebugCategorySingleton.category, "copy! messageId : " + messageId + " messageStr " + messageStr)
-                }
-                onReplyMessage: {
-                    console.log(RuqolaDebugCategorySingleton.category, "Not implemented reply message : " + messageId)
-                }
-                onSetFavoriteMessage: {
-                    appid.rocketChatAccount.starMessage(messageId, roomId, starred)
-                }
+            onEditMessage: {
+                userInputMessage.messageId = messageId;
+                userInputMessage.setOriginalMessage(messageStr)
+                //console.log(RuqolaDebugCategorySingleton.category, "edit! messageId : " + messageId + " messageStr " + messageStr)
+            }
+            onCopyMessage: {
+                clipboard.text = messageStr
+                //console.log(RuqolaDebugCategorySingleton.category, "copy! messageId : " + messageId + " messageStr " + messageStr)
+            }
+            onReplyMessage: {
+                console.log(RuqolaDebugCategorySingleton.category, "Not implemented reply message : " + messageId)
+            }
+            onSetFavoriteMessage: {
+                appid.rocketChatAccount.starMessage(messageId, roomId, starred)
+            }
 
-                onDisplayImage: {
-                    displayImageDialog.iUrl = imageUrl
-                    displayImageDialog.title = title
-                    displayImageDialog.clearScaleAndOpen();
-                }
+            onOpenDirectChannel: {
+                openDirectChannelDialog.username = userName;
+                openDirectChannelDialog.open()
+            }
+            onJitsiCallConfActivated: {
+                appid.rocketChatAccount.joinJitsiConfCall(roomId)
+            }
+            onDeleteMessage: {
+                deleteMessageDialog.msgId = messageId
+                deleteMessageDialog.open()
+            }
+            onDownloadAttachment: {
+                downloadFileDialog.fileToSaveUrl = url
+                downloadFileDialog.open()
+            }
 
-                OpenDirectChannelDialog {
-                    id: openDirectChannelDialog
-                    onOpenDirectChannel: {
-                        appid.rocketChatAccount.openDirectChannel(userName);
-                    }
+            onDisplayImage: {
+                displayImageDialog.iUrl = imageUrl
+                displayImageDialog.title = title
+                displayImageDialog.clearScaleAndOpen();
+            }
+
+            OpenDirectChannelDialog {
+                id: openDirectChannelDialog
+                onOpenDirectChannel: {
+                    appid.rocketChatAccount.openDirectChannel(userName);
                 }
+            }
 
-                DeleteMessageDialog {
-                    id: deleteMessageDialog
-                    onDeleteMessage: {
-                        appid.rocketChatAccount.deleteMessage(messageId)
-                    }
+            DeleteMessageDialog {
+                id: deleteMessageDialog
+                onDeleteMessage: {
+                    appid.rocketChatAccount.deleteMessage(messageId)
                 }
+            }
 
-                DownloadFileDialog {
-                    id: downloadFileDialog
-                    onAccepted: {
-                        if (fileUrl != "") {
-                            console.log(RuqolaDebugCategorySingleton.category, "You chose: " + fileUrl)
-                            appid.rocketChatAccount.downloadFile(fileToSaveUrl, fileUrl)
-                        } else {
-                            console.log(RuqolaDebugCategorySingleton.category, "No file selected");
-                        }
+            DownloadFileDialog {
+                id: downloadFileDialog
+                onAccepted: {
+                    if (fileUrl != "") {
+                        console.log(RuqolaDebugCategorySingleton.category, "You chose: " + fileUrl)
+                        appid.rocketChatAccount.downloadFile(fileToSaveUrl, fileUrl)
+                    } else {
+                        console.log(RuqolaDebugCategorySingleton.category, "No file selected");
                     }
                 }
-                DisplayImageDialog {
-                    id: displayImageDialog
-                }
-                UploadFileDialog {
-                    id: uploadFileDialog
-                    onUploadFile: {
-                        appid.rocketChatAccount.uploadFile(description, filename)
-                    }
+            }
+            DisplayImageDialog {
+                id: displayImageDialog
+            }
+            UploadFileDialog {
+                id: uploadFileDialog
+                onUploadFile: {
+                    appid.rocketChatAccount.uploadFile(description, filename)
                 }
+            }
 
-                ShowFilesInRoomDialog {
-                    id: showFilesInRoomDialog
-                    filesModel: appid.filesModel
-                    onDownloadFile: {
-                        downloadFileDialog.fileToSaveUrl = file
-                        downloadFileDialog.open()
-
-                    }
+            ShowFilesInRoomDialog {
+                id: showFilesInRoomDialog
+                filesModel: appid.filesModel
+                onDownloadFile: {
+                    downloadFileDialog.fileToSaveUrl = file
+                    downloadFileDialog.open()
                 }
             }
         }