diff --git a/app/src/main/java/net/buzzert/kordophonedroid/ui/attachments/AttachmentViewer.kt b/app/src/main/java/net/buzzert/kordophonedroid/ui/attachments/AttachmentViewer.kt
index 698a380..24ff3f5 100644
--- a/app/src/main/java/net/buzzert/kordophonedroid/ui/attachments/AttachmentViewer.kt
+++ b/app/src/main/java/net/buzzert/kordophonedroid/ui/attachments/AttachmentViewer.kt
@@ -1,6 +1,5 @@
 package net.buzzert.kordophonedroid.ui.attachments
 
-import androidx.compose.foundation.Indication
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
@@ -8,16 +7,15 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material.CircularProgressIndicator
 import androidx.compose.material.Scaffold
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
-import androidx.hilt.navigation.compose.hiltViewModel
-import coil.compose.AsyncImage
+import coil.compose.SubcomposeAsyncImage
 import coil.request.ImageRequest
 import net.buzzert.kordophonedroid.ui.LocalNavController
 import net.buzzert.kordophonedroid.ui.theme.KordophoneTopAppBar
@@ -41,12 +39,19 @@ fun AttachmentViewer(attachmentGuid: String) {
         Column(modifier = Modifier.padding(padding)) {
             Spacer(modifier = Modifier.weight(1f))
 
-            AsyncImage(
+            SubcomposeAsyncImage(
                 model = ImageRequest.Builder(LocalContext.current)
                     .data(data)
                     .crossfade(true)
                     .build(),
                 contentDescription = "",
+                loading = {
+                    Box {
+                        CircularProgressIndicator(
+                            modifier = Modifier.align(Alignment.Center)
+                        )
+                    }
+                },
                 modifier = Modifier
                     .zoomable(zoomState)
                     .fillMaxWidth()