diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
index 1e93c29673..4e1492aaba 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
@@ -73,12 +73,19 @@ class MessageActionsEpoxyController @Inject constructor(
                 text(stringProvider.getString(R.string.unable_to_send_message))
                 drawableStart(R.drawable.ic_warning_badge)
             }
-        } else if (sendState != SendState.SYNCED) {
+        } else if (sendState?.isSending().orFalse()) {
             bottomSheetSendStateItem {
                 id("send_state")
                 showProgress(true)
                 text(stringProvider.getString(R.string.event_status_sending_message))
             }
+        } else if (sendState == SendState.SENT) {
+            bottomSheetSendStateItem {
+                id("send_state")
+                showProgress(false)
+                drawableStart(R.drawable.ic_message_sent)
+                text(stringProvider.getString(R.string.event_status_sent_message))
+            }
         }
 
         when (state.informationData.e2eDecoration) {
@@ -124,9 +131,11 @@ class MessageActionsEpoxyController @Inject constructor(
             }
         }
 
-        // Separator
-        dividerItem {
-            id("actions_separator")
+        if (state.actions.isNotEmpty()) {
+            // Separator
+            dividerItem {
+                id("actions_separator")
+            }
         }
 
         // Action
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 36ee7898e5..634b91bf90 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -208,6 +208,8 @@
     <string name="initial_sync_start_importing_account_groups">Initial Sync:\nImporting Communities</string>
     <string name="initial_sync_start_importing_account_data">Initial Sync:\nImporting Account Data</string>
 
+
+    <string name="event_status_sent_message">Message sent</string>
     <string name="event_status_sending_message">Sending message…</string>
     <string name="clear_timeline_send_queue">Clear sending queue</string>