diff --git a/.gitmodules b/.gitmodules
index dc5e02e..145276a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "gomuks"]
 	path = gomuks
-	url = https://github.com/henry-hiles/gomuks
+	url = https://github.com/gomuks/gomuks
 	branch = main
diff --git a/gomuks b/gomuks
index 1f11743..0f8fb26 160000
--- a/gomuks
+++ b/gomuks
@@ -1 +1 @@
-Subproject commit 1f11743884a64765b1444b250377a09ebcaba93c
+Subproject commit 0f8fb261ab57977fa24a4f63b7aafbb9a4ff1b7b
diff --git a/lib/helpers/extensions/get_headers.dart b/lib/helpers/extensions/get_headers.dart
deleted file mode 100644
index 0fcec48..0000000
--- a/lib/helpers/extensions/get_headers.dart
+++ /dev/null
@@ -1,7 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/header.dart";
-
-extension GetHeaders on WidgetRef {
-  Map<String, String> get headers =>
-      watch(HeaderController.provider).requireValue;
-}
diff --git a/lib/widgets/players/audio.dart b/lib/widgets/players/audio.dart
index 0c96579..22a91f7 100644
--- a/lib/widgets/players/audio.dart
+++ b/lib/widgets/players/audio.dart
@@ -1,17 +1,17 @@
 import "dart:async";
-
 import "package:flutter/material.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
 import "package:media_kit/media_kit.dart";
-import "package:nexus/helpers/extensions/get_headers.dart";
+import "package:nexus/controllers/client.dart";
 import "package:nexus/models/info/audio.dart";
 
 class AudioPlayer extends HookConsumerWidget {
-  final Uri url;
+  final Uri uri;
   final AudioInfo? info;
+  final bool encrypted;
 
-  const AudioPlayer(this.url, this.info, {super.key});
+  const AudioPlayer(this.uri, this.info, {this.encrypted = false, super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -24,11 +24,12 @@ class AudioPlayer extends HookConsumerWidget {
     final duration = useState(Duration.zero);
 
     useEffect(() {
+      player.platform?.state = player.platform!.state.copyWith(buffering: true);
       scheduleMicrotask(() async {
-        await player.open(
-          Media(url.toString(), httpHeaders: ref.headers),
-          play: false,
-        );
+        final video = await ref
+            .watch(ClientController.provider.notifier)
+            .downloadMedia(.new(mxc: uri, encrypted: encrypted));
+        await player.open(Media(video.path), play: false);
 
         player.stream.playing.listen((value) {
           playing.value = value;
@@ -67,12 +68,18 @@ class AudioPlayer extends HookConsumerWidget {
           padding: .only(left: 8, right: 16),
           child: Row(
             children: [
-              IconButton(
-                onPressed: player.playOrPause,
-                icon: Icon(
-                  playing.value ? Icons.pause_circle : Icons.play_circle,
+              if (player.state.buffering)
+                SizedBox.square(
+                  dimension: 24,
+                  child: CircularProgressIndicator(padding: .all(4)),
+                )
+              else
+                IconButton(
+                  onPressed: player.playOrPause,
+                  icon: Icon(
+                    playing.value ? Icons.pause_circle : Icons.play_circle,
+                  ),
                 ),
-              ),
               SizedBox(width: 8),
               Text(
                 format(position.value),
diff --git a/lib/widgets/players/video.dart b/lib/widgets/players/video.dart
index 8083860..cd4e569 100644
--- a/lib/widgets/players/video.dart
+++ b/lib/widgets/players/video.dart
@@ -2,16 +2,17 @@ import "dart:async";
 
 import "package:flutter/material.dart";
 import "package:hooks_riverpod/hooks_riverpod.dart";
+import "package:nexus/controllers/client.dart";
 import "package:nexus/models/info/video.dart";
 import "package:flutter_hooks/flutter_hooks.dart";
 import "package:media_kit/media_kit.dart";
 import "package:media_kit_video/media_kit_video.dart";
-import "package:nexus/helpers/extensions/get_headers.dart";
 
 class VideoPlayer extends HookConsumerWidget {
   final VideoInfo? info;
-  final Uri url;
-  const VideoPlayer(this.url, this.info, {super.key});
+  final Uri uri;
+  final bool encrypted;
+  const VideoPlayer(this.uri, this.info, {this.encrypted = false, super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -21,12 +22,13 @@ class VideoPlayer extends HookConsumerWidget {
     final controller = useMemoized(() => VideoController(player));
 
     useEffect(() {
-      scheduleMicrotask(
-        () => player.open(
-          Media(url.toString(), httpHeaders: ref.headers),
-          play: false,
-        ),
-      );
+      player.platform?.state = player.platform!.state.copyWith(buffering: true);
+      scheduleMicrotask(() async {
+        final video = await ref
+            .watch(ClientController.provider.notifier)
+            .downloadMedia(.new(mxc: uri, encrypted: encrypted));
+        await player.open(Media(video.path), play: false);
+      });
 
       return player.dispose;
     }, []);
diff --git a/lib/widgets/renderers/message.dart b/lib/widgets/renderers/message.dart
index 6d660af..0e0f6fa 100644
--- a/lib/widgets/renderers/message.dart
+++ b/lib/widgets/renderers/message.dart
@@ -226,10 +226,25 @@ class MessageRenderer extends ConsumerWidget {
                                 ConstrainedBox(
                                   constraints: .loose(.square(500)),
                                   child: switch (event.content) {
-                                    VideoMessageContent(:final info) =>
-                                      VideoPlayer(url, info),
-                                    AudioMessageContent(:final info) =>
-                                      AudioPlayer(url, info),
+                                    VideoMessageContent(
+                                      :final info,
+                                      :final file,
+                                    ) =>
+                                      VideoPlayer(
+                                        url,
+                                        info,
+                                        encrypted: file != null,
+                                      ),
+                                    AudioMessageContent(
+                                      :final info,
+                                      :final file,
+                                    ) =>
+                                      AudioPlayer(
+                                        url,
+                                        info,
+
+                                        encrypted: file != null,
+                                      ),
                                     FileMessageContent(
                                       :final info,
                                       :final filename,