diff --git a/features/messages/build.gradle.kts b/features/messages/build.gradle.kts
index 70e3455d1f..9e98fee479 100644
--- a/features/messages/build.gradle.kts
+++ b/features/messages/build.gradle.kts
@@ -9,6 +9,7 @@ android {
 dependencies {
     implementation(project(":libraries:core"))
     implementation(project(":libraries:matrix"))
+    implementation(project(":libraries:blurhash"))
     implementation(project(":libraries:designsystem"))
     implementation(project(":libraries:textcomposer"))
     implementation(libs.mavericks.compose)
diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/MessageTimelineItemStateMapper.kt b/features/messages/src/main/java/io/element/android/x/features/messages/MessageTimelineItemStateMapper.kt
index 65b2333497..11a31eb3a6 100644
--- a/features/messages/src/main/java/io/element/android/x/features/messages/MessageTimelineItemStateMapper.kt
+++ b/features/messages/src/main/java/io/element/android/x/features/messages/MessageTimelineItemStateMapper.kt
@@ -88,13 +88,21 @@ class MessageTimelineItemStateMapper(
                 formattedBody = messageType.content.formatted
             )
             is MessageType.Image -> {
+                val height = messageType.content.info?.height?.toFloat()
+                val width = messageType.content.info?.width?.toFloat()
+                val aspectRatio = if (height != null && width != null) {
+                    width / height
+                } else {
+                    0.7f
+                }
                 MessagesTimelineItemImageContent(
                     body = messageType.content.body,
                     imageMeta = MediaResolver.Meta(
                         source = messageType.content.source,
                         kind = MediaResolver.Kind.Content
                     ),
-                    blurhash = messageType.content.info?.blurhash
+                    blurhash = messageType.content.info?.blurhash,
+                    aspectRatio = aspectRatio
                 )
             }
             is MessageType.Notice -> MessagesTimelineItemNoticeContent(
diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemImageView.kt b/features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemImageView.kt
index 1829a6a06b..ad1b02d7e0 100644
--- a/features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemImageView.kt
+++ b/features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemImageView.kt
@@ -4,11 +4,21 @@ package io.element.android.x.features.messages.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.painter.ColorPainter
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.unit.dp
 import coil.compose.AsyncImage
+import coil.request.ImageRequest
 import io.element.android.x.features.messages.model.content.MessagesTimelineItemImageContent
 
 @Composable
@@ -16,13 +26,30 @@ fun MessagesTimelineItemImageView(
     content: MessagesTimelineItemImageContent,
     modifier: Modifier = Modifier
 ) {
+    val widthPercent = if(content.aspectRatio > 1f){
+        1f
+    }else {
+        0.7f
+    }
     Box(
-        modifier = Modifier.fillMaxSize()
+        modifier = Modifier
+            .fillMaxWidth(widthPercent)
+            .aspectRatio(content.aspectRatio),
+        contentAlignment = Alignment.Center,
     ) {
+
+        var isLoading = rememberSaveable(content.imageMeta) { mutableStateOf(true) }
+        val context = LocalContext.current
+        val model = ImageRequest.Builder(context)
+            .data(content.imageMeta)
+            .build()
+
         AsyncImage(
-            model = content.imageMeta,
+            model = model,
             contentDescription = null,
-            contentScale = ContentScale.Crop
+            placeholder = ColorPainter(MaterialTheme.colorScheme.surfaceVariant),
+            contentScale = ContentScale.Crop,
+            onSuccess = { isLoading.value = false },
         )
     }
 }
\ No newline at end of file
diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/model/content/MessagesTimelineItemImageContent.kt b/features/messages/src/main/java/io/element/android/x/features/messages/model/content/MessagesTimelineItemImageContent.kt
index 26e9fe50ea..334cbe42c1 100644
--- a/features/messages/src/main/java/io/element/android/x/features/messages/model/content/MessagesTimelineItemImageContent.kt
+++ b/features/messages/src/main/java/io/element/android/x/features/messages/model/content/MessagesTimelineItemImageContent.kt
@@ -5,5 +5,6 @@ import io.element.android.x.matrix.media.MediaResolver
 data class MessagesTimelineItemImageContent(
     val body: String,
     val imageMeta: MediaResolver.Meta,
-    val blurhash: String?
+    val blurhash: String?,
+    val aspectRatio: Float
 ) : MessagesTimelineItemContent
\ No newline at end of file