diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageContentViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageContentViewModel.kt
index 447b3da8b..1cb2b09b2 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageContentViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageContentViewModel.kt
@@ -29,6 +29,7 @@ import kotlinx.coroutines.withContext
 import org.linphone.core.ChatMessage
 import org.linphone.core.Content
 import org.linphone.core.tools.Log
+import org.linphone.utils.AppUtils
 import org.linphone.utils.FileUtils
 import org.linphone.utils.ImageUtils
 
@@ -39,8 +40,13 @@ class ChatMessageContentViewModel(
 ) : ViewModel() {
     val isImage = MutableLiveData<Boolean>()
     val isVideo = MutableLiveData<Boolean>()
+    val isAudio = MutableLiveData<Boolean>()
     val videoPreview = MutableLiveData<Bitmap>()
 
+    val fileName = MutableLiveData<String>()
+
+    val fileSize = MutableLiveData<String>()
+
     val downloadable = MutableLiveData<Boolean>()
 
     val downloadEnabled = MutableLiveData<Boolean>()
@@ -57,6 +63,13 @@ class ChatMessageContentViewModel(
         }
 
     init {
+        fileName.value = if (content.name.isNullOrEmpty() && !content.filePath.isNullOrEmpty()) {
+            FileUtils.getNameFromFilePath(content.filePath!!)
+        } else {
+            content.name
+        }
+        fileSize.value = AppUtils.bytesToDisplayableSize(content.fileSize.toLong())
+
         if (content.isFile || (content.isFileTransfer && chatMessage.isOutgoing)) {
             val filePath = content.filePath ?: ""
             downloadable.value = filePath.isEmpty()
@@ -65,6 +78,7 @@ class ChatMessageContentViewModel(
                 Log.i("[Content] Found displayable content: $filePath")
                 isImage.value = FileUtils.isExtensionImage(filePath)
                 isVideo.value = FileUtils.isExtensionVideo(filePath)
+                isAudio.value = FileUtils.isExtensionAudio(filePath)
 
                 if (isVideo.value == true) {
                     viewModelScope.launch {
@@ -77,6 +91,7 @@ class ChatMessageContentViewModel(
                 Log.w("[Content] Found content with empty path...")
                 isImage.value = false
                 isVideo.value = false
+                isAudio.value = false
             }
         } else {
             if (chatMessage.isFileTransferInProgress) {
@@ -89,6 +104,7 @@ class ChatMessageContentViewModel(
             downloadable.value = true
             isImage.value = false
             isVideo.value = false
+            isAudio.value = false
         }
     }
 
diff --git a/app/src/main/java/org/linphone/utils/AppUtils.kt b/app/src/main/java/org/linphone/utils/AppUtils.kt
index f646ab75a..89f072e28 100644
--- a/app/src/main/java/org/linphone/utils/AppUtils.kt
+++ b/app/src/main/java/org/linphone/utils/AppUtils.kt
@@ -21,6 +21,7 @@ package org.linphone.utils
 
 import android.app.Activity
 import android.content.*
+import android.text.format.Formatter.formatShortFileSize
 import android.util.TypedValue
 import androidx.emoji.text.EmojiCompat
 import java.util.*
@@ -79,6 +80,10 @@ class AppUtils {
             )
         }
 
+        fun bytesToDisplayableSize(bytes: Long): String {
+            return formatShortFileSize(coreContext.context, bytes)
+        }
+
         fun shareUploadedLogsUrl(activity: Activity, info: String) {
             val appName = activity.getString(R.string.app_name)
             val intent = Intent(Intent.ACTION_SEND)
diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index bdac98df0..ae80027f1 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -137,6 +137,13 @@ fun setLayoutToLeftOf(view: View, oldTargetId: Int, newTargetId: Int) {
     view.layoutParams = layoutParams
 }
 
+@BindingAdapter("android:layout_gravity")
+fun setLayoutGravity(view: View, gravity: Int) {
+    val layoutParams = view.layoutParams as LinearLayout.LayoutParams
+    layoutParams.gravity = gravity
+    view.layoutParams = layoutParams
+}
+
 @BindingAdapter("layout_constraintGuide_percent")
 fun setLayoutConstraintGuidePercent(guideline: Guideline, percent: Float) {
     val params = guideline.layoutParams as ConstraintLayout.LayoutParams
diff --git a/app/src/main/java/org/linphone/utils/FileUtils.kt b/app/src/main/java/org/linphone/utils/FileUtils.kt
index 590a0d841..20635f276 100644
--- a/app/src/main/java/org/linphone/utils/FileUtils.kt
+++ b/app/src/main/java/org/linphone/utils/FileUtils.kt
@@ -71,6 +71,12 @@ class FileUtils {
             return type?.startsWith("video/") ?: false
         }
 
+        fun isExtensionAudio(path: String): Boolean {
+            val extension = getExtensionFromFileName(path).toLowerCase(Locale.getDefault())
+            val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension)
+            return type?.startsWith("audio/") ?: false
+        }
+
         fun getFileStorageDir(isPicture: Boolean = false): File {
             var path: File? = null
             if (Environment.getExternalStorageState() == Environment.MEDIA_MOUNTED) {
diff --git a/app/src/main/res/drawable-xhdpi/audio.png b/app/src/main/res/drawable-xhdpi/audio.png
new file mode 100644
index 000000000..472ae2bff
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/audio.png differ
diff --git a/app/src/main/res/layout/chat_message_content_cell.xml b/app/src/main/res/layout/chat_message_content_cell.xml
index 86f5fcd20..1bb821108 100644
--- a/app/src/main/res/layout/chat_message_content_cell.xml
+++ b/app/src/main/res/layout/chat_message_content_cell.xml
@@ -47,43 +47,83 @@
             android:layout_centerInParent="true"/>
 
         <TextView
-            android:onClick="@{() -> data.openFile()}"
-            android:onLongClick="@{longClickListener}"
-            android:textColor="?attr/secondaryTextColor"
-            android:textSize="12sp"
-            android:fontFamily="sans-serif"
-            android:textStyle="normal"
-            android:drawableTop="@drawable/file"
-            android:drawableTint="?attr/drawableTintColor2"
-            android:drawablePadding="5dp"
-            android:padding="5dp"
-            android:text="@{data.content.name}"
-            android:visibility="@{data.downloadable || data.image || data.video ? View.GONE : View.VISIBLE, default=gone}"
-            android:layout_width="150dp"
-            android:layout_height="match_parent"
-            android:maxHeight="100dp"
-            android:layout_margin="5dp"
-            android:background="@color/chat_bubble_text_color"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:textAlignment="center" />
-
-        <TextView
-            style="@style/button_font"
-            android:onClick="@{() -> data.download()}"
-            android:onLongClick="@{longClickListener}"
-            android:enabled="@{data.downloadEnabled}"
-            android:text="@string/chat_message_download_file"
-            android:visibility="@{data.downloadable ? View.VISIBLE : View.GONE}"
+            style="@style/chat_file_attachment_font"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="5dp"
-            android:textColor="@drawable/assistant_button_text_color"
-            android:background="@drawable/resizable_assistant_button"
-            android:drawableLeft="@drawable/download"
-            android:drawablePadding="10dp"
+            android:singleLine="true"
             android:ellipsize="end"
-            android:padding="10dp" />
+            android:padding="10dp"
+            android:gravity="center_vertical"
+            android:text="@{data.fileName}"
+            android:onClick="@{() -> data.openFile()}"
+            android:onLongClick="@{longClickListener}"
+            android:visibility="@{data.downloadable || data.image || data.video || !data.alone ? View.GONE : View.VISIBLE, default=gone}"
+            android:drawablePadding="10dp"
+            app:drawableTint="@color/dark_grey_color"
+            android:drawableLeft="@{data.isAudio ? @drawable/audio : @drawable/file}"/>
+
+        <TextView
+            style="@style/chat_file_attachment_font"
+            android:layout_width="150dp"
+            android:layout_height="wrap_content"
+            android:maxHeight="100dp"
+            android:layout_margin="5dp"
+            android:ellipsize="end"
+            android:padding="10dp"
+            android:gravity="center"
+            android:textAlignment="center"
+            android:text="@{data.fileName}"
+            android:onClick="@{() -> data.openFile()}"
+            android:onLongClick="@{longClickListener}"
+            android:visibility="@{data.downloadable || data.image || data.video || data.alone ? View.GONE : View.VISIBLE, default=gone}"
+            android:drawablePadding="10dp"
+            app:drawableTint="@color/dark_grey_color"
+            android:drawableTop="@{data.isAudio ? @drawable/audio : @drawable/file}"/>
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:gravity="center"
+            android:background="@drawable/resizable_assistant_button"
+            android:visibility="@{data.downloadable ? View.VISIBLE : View.GONE}"
+            android:onClick="@{() -> data.download()}"
+            android:onLongClick="@{longClickListener}"
+            android:enabled="@{data.downloadEnabled}">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@drawable/download"
+                android:padding="10dp" />
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:gravity="center"
+                android:padding="10dp">
+
+                <TextView
+                    style="@style/button_small_font"
+                    android:text="@{data.fileName + ` (` + data.fileSize + `)`}"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAlignment="center"
+                    android:textColor="@drawable/assistant_button_text_color" />
+
+                <TextView
+                    style="@style/button_font"
+                    android:text="@string/chat_message_download_file"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@drawable/assistant_button_text_color"
+                    android:layout_marginTop="5dp"
+                    android:ellipsize="end" />
+
+            </LinearLayout>
+
+        </LinearLayout>
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/chat_message_list_cell.xml b/app/src/main/res/layout/chat_message_list_cell.xml
index 29ad6e347..74bbd7a82 100644
--- a/app/src/main/res/layout/chat_message_list_cell.xml
+++ b/app/src/main/res/layout/chat_message_list_cell.xml
@@ -6,6 +6,7 @@
     <data>
         <import type="android.view.View"/>
         <import type="android.view.Gravity"/>
+        <import type="com.google.android.flexbox.JustifyContent"/>
         <variable
             name="contextMenuClickListener"
             type="android.view.View.OnLongClickListener"/>
@@ -126,7 +127,7 @@
                 app:layout="@{@layout/chat_message_content_cell}"
                 app:onLongClick="@{contextMenuClickListener}"
                 app:flexWrap="wrap"
-                app:justifyContent="center"/>
+                app:justifyContent="@{viewModel.chatMessage.outgoing ? JustifyContent.FLEX_END : JustifyContent.FLEX_START}"/>
 
             <org.linphone.activities.main.chat.views.MultiLineWrapContentWidthTextView
                 android:onClick="@{clickListener}"
@@ -134,6 +135,7 @@
                 android:text="@{viewModel.text}"
                 android:visibility="@{viewModel.text.length > 0 ? View.VISIBLE : View.GONE}"
                 android:autoLink="web"
+                android:layout_gravity="@{viewModel.chatMessage.outgoing ? Gravity.RIGHT : Gravity.LEFT}"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 03ef672d7..7cf970b5e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -224,6 +224,12 @@
         <item name="android:textSize">18sp</item>
     </style>
 
+    <style name="chat_file_attachment_font" parent="@android:style/TextAppearance.Medium">
+        <item name="android:textColor">@color/dark_grey_color</item>
+        <item name="android:textSize">12sp</item>
+        <item name="android:fontFamily">sans-serif</item>
+    </style>
+
     <style name="standard_text_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">?attr/primaryTextColor</item>
         <item name="android:textSize">18sp</item>
@@ -235,6 +241,11 @@
         <item name="android:textSize">16sp</item>
     </style>
 
+    <style name="button_small_font" parent="@android:style/TextAppearance.Small">
+        <item name="android:textColor">?attr/primaryTextColor</item>
+        <item name="android:textSize">13sp</item>
+    </style>
+
     <style name="standard_small_text_font" parent="@android:style/TextAppearance.Medium">
         <item name="android:textColor">?attr/primarySubtextDarkColor</item>
         <item name="android:textSize">15sp</item>
@@ -244,4 +255,5 @@
         <item name="android:textColor">@color/white_color</item>
         <item name="android:textSize">10sp</item>
     </style>
+
 </resources>