diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index c25e6543..4d8c22b8 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -112,8 +112,8 @@ Rectangle {
 					case MtxEvent.TextMessage: return "delegates/TextMessage.qml"
 					case MtxEvent.ImageMessage: return "delegates/ImageMessage.qml"
 					case MtxEvent.FileMessage: return "delegates/FileMessage.qml"
-					//case MtxEvent.VideoMessage: return "delegates/VideoMessage.qml"
-					case MtxEvent.AudioMessage: return "delegates/AudioMessage.qml"
+					case MtxEvent.VideoMessage: return "delegates/PlayableMediaMessage.qml"
+					case MtxEvent.AudioMessage: return "delegates/PlayableMediaMessage.qml"
 					case MtxEvent.Redacted: return "delegates/Redacted.qml"
 					default: return "delegates/placeholder.qml"
 				}
diff --git a/resources/qml/delegates/AudioMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml
similarity index 91%
rename from resources/qml/delegates/AudioMessage.qml
rename to resources/qml/delegates/PlayableMediaMessage.qml
index f4fa8f54..7498d5b2 100644
--- a/resources/qml/delegates/AudioMessage.qml
+++ b/resources/qml/delegates/PlayableMediaMessage.qml
@@ -3,6 +3,8 @@ import QtQuick.Layouts 1.6
 import QtQuick.Controls 2.5
 import QtMultimedia 5.6
 
+import com.github.nheko 1.0
+
 Rectangle {
 	radius: 10
 	color: colors.dark
@@ -14,6 +16,15 @@ Rectangle {
 		width: parent.width - 24
 		anchors.centerIn: parent
 
+		VideoOutput {
+			visible: eventData.type == MtxEvent.VideoMessage
+			Layout.maximumHeight: 300
+			Layout.minimumHeight: 300
+			Layout.maximumWidth: 500
+			fillMode: VideoOutput.PreserveAspectFit
+			source: media
+		}
+
 		RowLayout {
 			Text {
 				id: positionText
@@ -91,6 +102,7 @@ Rectangle {
 					id: media
 					onError: console.log(errorString)
 					onStatusChanged: if(status == MediaPlayer.Loaded) progress.updatePositionTexts()
+					autoPlay: true
 				}
 
 				Connections {
diff --git a/resources/res.qrc b/resources/res.qrc
index 1caf378e..16bab4e4 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -122,7 +122,7 @@
         <file>qml/delegates/TextMessage.qml</file>
         <file>qml/delegates/NoticeMessage.qml</file>
         <file>qml/delegates/ImageMessage.qml</file>
-        <file>qml/delegates/AudioMessage.qml</file>
+        <file>qml/delegates/PlayableMediaMessage.qml</file>
         <file>qml/delegates/FileMessage.qml</file>
         <file>qml/delegates/Redacted.qml</file>
         <file>qml/delegates/placeholder.qml</file>