diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
index bd8622910..e5cebb6c7 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
@@ -668,11 +668,12 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
             }
 
             if (viewModel.ephemeralChatRoom) {
-                if (chatRoom.currentParams.ephemeralMode == ChatRoomEphemeralMode.AdminManaged &&
-                    viewModel.meAdmin.value == false
-                ) {
-                    popupView.ephemeralHidden = true
-                    totalSize -= itemSize
+                if (chatRoom.currentParams.ephemeralMode == ChatRoomEphemeralMode.AdminManaged) {
+                    if (chatRoom.me?.isAdmin == false) {
+                        Log.w("[Chat Room] Hiding ephemeral menu as mode is admin managed and we aren't admin")
+                        popupView.ephemeralHidden = true
+                        totalSize -= itemSize
+                    }
                 }
             }
         }
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt
index 06f2bfd88..17cefca50 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatRoomCreationViewModel.kt
@@ -169,6 +169,7 @@ class ChatRoomCreationViewModel : ErrorReportingViewModel() {
             else
                 ChatRoomEphemeralMode.AdminManaged
             params.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
+            Log.i("[Chat Room Creation] Ephemeral mode is ${params.ephemeralMode}, lifetime is ${params.ephemeralLifetime}")
             params.subject = AppUtils.getString(R.string.chat_room_dummy_subject)
         }
 
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/EphemeralViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/EphemeralViewModel.kt
index 072e8db76..34e39a478 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/EphemeralViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/EphemeralViewModel.kt
@@ -50,7 +50,7 @@ class EphemeralViewModel(private val chatRoom: ChatRoom) : ViewModel() {
     }
 
     init {
-        Log.i("[Ephemeral Messages] Current duration is ${chatRoom.ephemeralLifetime}, ephemeral enabled? ${chatRoom.ephemeralEnabled()}")
+        Log.i("[Ephemeral Messages] Current lifetime is ${chatRoom.ephemeralLifetime}, ephemeral enabled? ${chatRoom.ephemeralEnabled()}")
         currentSelectedDuration = if (chatRoom.ephemeralEnabled()) chatRoom.ephemeralLifetime else 0
         computeEphemeralDurationValues()
     }
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt
index f2526a05d..d59448f61 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/GroupInfoViewModel.kt
@@ -125,6 +125,7 @@ class GroupInfoViewModel(val chatRoom: ChatRoom?) : ErrorReportingViewModel() {
                 ChatRoomEphemeralMode.AdminManaged
         }
         params.ephemeralLifetime = 0 // Make sure ephemeral is disabled by default
+        Log.i("[Chat Room Group Info] Ephemeral mode is ${params.ephemeralMode}, lifetime is ${params.ephemeralLifetime}")
         params.subject = subject.value
 
         val addresses = arrayOfNulls<Address>(participants.value.orEmpty().size)
diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt
index 72d2669eb..0cd6e8627 100644
--- a/app/src/main/java/org/linphone/core/CorePreferences.kt
+++ b/app/src/main/java/org/linphone/core/CorePreferences.kt
@@ -424,9 +424,8 @@ class CorePreferences constructor(private val context: Context) {
     val voiceMessagesFormatMkv: Boolean
         get() = config.getBool("app", "record_voice_messages_in_mkv_format", true)
 
-    // TODO FIXME: Keeping it device based until we have the API to know if all participants support the new mode
     val useEphemeralPerDeviceMode: Boolean
-        get() = config.getBool("app", "ephemeral_chat_messages_settings_per_device", true)
+        get() = config.getBool("app", "ephemeral_chat_messages_settings_per_device", false)
 
     /* Default values related */
 
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 d723906ca..72fa6c4be 100644
--- a/app/src/main/res/layout/chat_message_content_cell.xml
+++ b/app/src/main/res/layout/chat_message_content_cell.xml
@@ -61,7 +61,8 @@
 
         <LinearLayout
             android:layout_width="@dimen/chat_message_bubble_file_size"
-            android:layout_height="@dimen/chat_message_bubble_file_size"
+            android:layout_height="wrap_content"
+            android:minHeight="@dimen/chat_message_bubble_file_size"
             android:orientation="vertical"
             android:gravity="center"
             android:background="?attr/backgroundColor"
@@ -74,7 +75,6 @@
                 android:layout_margin="5dp"
                 android:ellipsize="middle"
                 android:singleLine="true"
-                android:padding="10dp"
                 android:gravity="center"
                 android:textAlignment="center"
                 android:drawablePadding="5dp"
@@ -87,6 +87,8 @@
                 style="@style/chat_file_attachment_font"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:gravity="center"
+                android:layout_marginBottom="5dp"
                 android:text="@{data.downloadLabel}"
                 android:onClick="@{() -> data.download()}"
                 android:visibility="@{data.downloadable ? View.VISIBLE : View.GONE}"/>