diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt
index 8267e62cea..d0091ba496 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/attachments/preview/AttachmentsPreviewView.kt
@@ -16,11 +16,12 @@
 
 package io.element.android.features.messages.impl.attachments.preview
 
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.defaultMinSize
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
@@ -28,6 +29,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -66,16 +68,11 @@ fun AttachmentsPreviewView(
     }
 
     Scaffold(modifier) {
-        Box(
-            modifier = Modifier.padding(it),
-            contentAlignment = Alignment.Center
-        ) {
-            AttachmentPreviewContent(
-                attachment = state.attachment,
-                onSendClicked = ::postSendAttachment,
-                onDismiss = onDismiss
-            )
-        }
+        AttachmentPreviewContent(
+            attachment = state.attachment,
+            onSendClicked = ::postSendAttachment,
+            onDismiss = onDismiss
+        )
     }
     AttachmentSendStateView(
         sendActionState = state.sendActionState,
@@ -119,19 +116,19 @@ private fun AttachmentPreviewContent(
     onSendClicked: () -> Unit,
     onDismiss: () -> Unit,
 ) {
-    Column(
+    Box(
         modifier = Modifier
             .fillMaxSize()
-            .padding(top = 24.dp)
+            .navigationBarsPadding(),
+        contentAlignment = Alignment.BottomCenter
     ) {
         Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .weight(1f),
-            contentAlignment = Alignment.Center,
+            modifier = Modifier.fillMaxSize(),
+            contentAlignment = Alignment.Center
         ) {
             when (attachment) {
                 is Attachment.Media -> LocalMediaView(
+                    modifier = Modifier.fillMaxSize(),
                     localMedia = attachment.localMedia,
                     onClick = {}
                 )
@@ -142,8 +139,9 @@ private fun AttachmentPreviewContent(
             onSendClicked = onSendClicked,
             modifier = Modifier
                 .fillMaxWidth()
-                .defaultMinSize(minHeight = 120.dp)
-                .padding(all = 24.dp)
+                .background(Color.Black.copy(alpha = 0.7f))
+                .padding(horizontal = 24.dp)
+                .defaultMinSize(minHeight = 80.dp)
         )
     }
 }
@@ -154,9 +152,7 @@ private fun AttachmentsPreviewBottomActions(
     onSendClicked: () -> Unit,
     modifier: Modifier = Modifier
 ) {
-    ButtonRowMolecule(
-        modifier = modifier,
-    ) {
+    ButtonRowMolecule(modifier = modifier) {
         TextButton(stringResource(id = CommonStrings.action_cancel), onClick = onCancelClicked)
         TextButton(stringResource(id = CommonStrings.action_send), onClick = onSendClicked)
     }