diff --git a/imports/NeoChat/Component/Timeline/AudioDelegate.qml b/imports/NeoChat/Component/Timeline/AudioDelegate.qml
index b05aa2b90..95eda5be5 100644
--- a/imports/NeoChat/Component/Timeline/AudioDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/AudioDelegate.qml
@@ -34,7 +34,7 @@ Control {
         onTriggered: {
             let contextMenu = fileDelegateContextMenu.createObject(root)
             contextMenu.viewSource.connect(function() {
-                messageSourceDialog.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
+                messagerSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
             })
             contextMenu.downloadAndOpen.connect(downloadAndOpen)
             contextMenu.saveFileAs.connect(saveFileAs)
@@ -90,9 +90,9 @@ Control {
         onSecondaryClicked: saveFileAction.trigger()
 
         Component {
-            id: messageSourceDialog
+            id: messagerSourceSheet
 
-            MessageSourceDialog {}
+            MessageSourceSheet {}
         }
 
         Component {
diff --git a/imports/NeoChat/Component/Timeline/FileDelegate.qml b/imports/NeoChat/Component/Timeline/FileDelegate.qml
index 054b67cf8..849e909a0 100644
--- a/imports/NeoChat/Component/Timeline/FileDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/FileDelegate.qml
@@ -63,7 +63,7 @@ RowLayout {
                 onClicked: {
                     var contextMenu = fileDelegateContextMenu.createObject(root)
                     contextMenu.viewSource.connect(function() {
-                        messageSourceDialog.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
+                        messageSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
                     })
                     contextMenu.downloadAndOpen.connect(downloadAndOpen)
                     contextMenu.saveFileAs.connect(saveFileAs)
@@ -79,9 +79,9 @@ RowLayout {
                 }
 
                 Component {
-                    id: messageSourceDialog
+                    id: messageSourceSheet
 
-                    MessageSourceDialog {}
+                    MessageSourceSheet {}
                 }
 
                 Component {
diff --git a/imports/NeoChat/Component/Timeline/ImageDelegate.qml b/imports/NeoChat/Component/Timeline/ImageDelegate.qml
index 80a5de100..bfb8382af 100644
--- a/imports/NeoChat/Component/Timeline/ImageDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/ImageDelegate.qml
@@ -104,7 +104,7 @@ Image {
         onSecondaryClicked: {
             var contextMenu = imageDelegateContextMenu.createObject(root)
             contextMenu.viewSource.connect(function() {
-                messageSourceDialog.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
+                messageSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
             })
             contextMenu.downloadAndOpen.connect(downloadAndOpen)
             contextMenu.saveFileAs.connect(saveFileAs)
@@ -120,9 +120,9 @@ Image {
         }
 
         Component {
-            id: messageSourceDialog
+            id: messageSourceSheet
 
-            MessageSourceDialog {}
+            MessageSourceSheet {}
         }
 
         Component {
diff --git a/imports/NeoChat/Component/Timeline/VideoDelegate.qml b/imports/NeoChat/Component/Timeline/VideoDelegate.qml
index c53a6bfef..b314332ec 100644
--- a/imports/NeoChat/Component/Timeline/VideoDelegate.qml
+++ b/imports/NeoChat/Component/Timeline/VideoDelegate.qml
@@ -191,7 +191,7 @@ RowLayout {
             onSecondaryClicked: {
                 var contextMenu = imageDelegateContextMenu.createObject(root)
                 contextMenu.viewSource.connect(function() {
-                    messageSourceDialog.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
+                    messageSourceSheet.createObject(ApplicationWindow.overlay, {"sourceText": toolTip}).open()
                 })
                 contextMenu.downloadAndOpen.connect(downloadAndOpen)
                 contextMenu.saveFileAs.connect(saveFileAs)
@@ -207,9 +207,9 @@ RowLayout {
             }
 
             Component {
-                id: messageSourceDialog
+                id: messageSourceSheet
 
-                MessageSourceDialog {}
+                MessageSourceSheet {}
             }
 
             Component {
diff --git a/imports/NeoChat/Dialog/MessageSourceDialog.qml b/imports/NeoChat/Dialog/MessageSourceDialog.qml
deleted file mode 100644
index 88b0ab953..000000000
--- a/imports/NeoChat/Dialog/MessageSourceDialog.qml
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
- *
- * SPDX-License-Identifier: GPL-3.0-only
- */
-import QtQuick 2.12
-import QtQuick.Controls 2.12
-
-Popup {
-    property string sourceText
-
-    anchors.centerIn: parent
-    width: 480
-
-    id: root
-
-    modal: true
-    padding: 16
-
-    closePolicy: Dialog.CloseOnEscape | Dialog.CloseOnPressOutside
-
-    contentItem: ScrollView {
-        clip: true
-
-        Label {
-            text: sourceText
-        }
-    }
-
-    onClosed: destroy()
-}
-
diff --git a/imports/NeoChat/Dialog/qmldir b/imports/NeoChat/Dialog/qmldir
index 7e575ff7d..f673702bd 100644
--- a/imports/NeoChat/Dialog/qmldir
+++ b/imports/NeoChat/Dialog/qmldir
@@ -1,7 +1,6 @@
 module NeoChat.Dialog
 RoomSettingsDialog 1.0 RoomSettingsDialog.qml
 UserDetailDialog 1.0 UserDetailDialog.qml
-MessageSourceDialog 1.0 MessageSourceDialog.qml
 LoginDialog 1.0 LoginDialog.qml
 CreateRoomDialog 1.0 CreateRoomDialog.qml
 InviteUserDialog 1.0 InviteUserDialog.qml
diff --git a/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml b/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml
new file mode 100644
index 000000000..ff2554642
--- /dev/null
+++ b/imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml
@@ -0,0 +1,25 @@
+/**
+ * SPDX-FileCopyrightText: 2019 Black Hat <bhat@encom.eu.org>
+ * SPDX-FileCopyrightText: 2020 Tobias Fella <fella@posteo.de>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+
+import org.kde.kirigami 2.12 as Kirigami
+
+Kirigami.OverlaySheet {
+
+    property string sourceText
+
+    header: Kirigami.Heading {
+        text: i18n("Message Source")
+    }
+
+    Label {
+        text: sourceText
+        wrapMode: Text.WordWrap
+    }
+}
+
diff --git a/imports/NeoChat/Menu/Timeline/qmldir b/imports/NeoChat/Menu/Timeline/qmldir
index 7f4285091..3400daef4 100644
--- a/imports/NeoChat/Menu/Timeline/qmldir
+++ b/imports/NeoChat/Menu/Timeline/qmldir
@@ -1,3 +1,4 @@
 module NeoChat.Menu.Timeline
 MessageDelegateContextMenu 1.0 MessageDelegateContextMenu.qml
 FileDelegateContextMenu 1.0 FileDelegateContextMenu.qml
+MessageSourceSheet 1.0 MessageSourceSheet.qml
diff --git a/imports/NeoChat/Page/RoomPage.qml b/imports/NeoChat/Page/RoomPage.qml
index ad8b11bb2..f5feb5d00 100644
--- a/imports/NeoChat/Page/RoomPage.qml
+++ b/imports/NeoChat/Page/RoomPage.qml
@@ -397,7 +397,7 @@ Kirigami.ScrollablePage {
             'eventId': eventId,
         });
         contextMenu.viewSource.connect(function() {
-            messageSourceDialog.createObject(page, {
+            messageSourceSheet.createObject(page, {
                 'sourceText': toolTip,
             }).open();
             contextMenu.close();
@@ -424,8 +424,8 @@ Kirigami.ScrollablePage {
     }
 
     Component {
-        id: messageSourceDialog
+        id: messageSourceSheet
 
-        MessageSourceDialog {}
+        MessageSourceSheet {}
     }
 }
diff --git a/res.qrc b/res.qrc
index daabff9df..140cfb7c3 100644
--- a/res.qrc
+++ b/res.qrc
@@ -45,7 +45,7 @@
         <file>imports/NeoChat/Dialog/qmldir</file>
         <file>imports/NeoChat/Dialog/RoomSettingsDialog.qml</file>
         <file>imports/NeoChat/Dialog/UserDetailDialog.qml</file>
-        <file>imports/NeoChat/Dialog/MessageSourceDialog.qml</file>
+        <file>imports/NeoChat/Menu/Timeline/MessageSourceSheet.qml</file>
         <file>imports/NeoChat/Dialog/CreateRoomDialog.qml</file>
         <file>imports/NeoChat/Dialog/AcceptInvitationDialog.qml</file>
         <file>imports/NeoChat/Dialog/StartChatDialog.qml</file>