diff --git a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
index 39c1737ad1..cee0ff2734 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
@@ -106,6 +106,7 @@ class RoomListQuickActionsEpoxyController @Inject constructor(
 
     @StringRes
     private fun titleForNotificationState(notificationState: RoomNotificationState): Int? = when (notificationState) {
+        RoomNotificationState.ALL_MESSAGES       -> R.string.room_settings_default // SC addition to allow this again
         RoomNotificationState.ALL_MESSAGES_NOISY -> R.string.room_settings_all_messages
         RoomNotificationState.MENTIONS_ONLY      -> R.string.room_settings_mention_and_keyword_only
         RoomNotificationState.MUTE               -> R.string.room_settings_none
@@ -114,8 +115,12 @@ class RoomListQuickActionsEpoxyController @Inject constructor(
 
     @DrawableRes
     private fun iconForNotificationState(notificationState: RoomNotificationState): Int? = when (notificationState) {
-        RoomNotificationState.ALL_MESSAGES_NOISY -> R.drawable.ic_room_actions_notifications_all_noisy
-        RoomNotificationState.ALL_MESSAGES       -> R.drawable.ic_room_actions_notifications_all
+        // Yeah, ALL_MESSAGES and ALL_MESSAGES_NOISY is confusing, blame upstream.
+        // RoomNotificationState.ALL_MESSAGES_NOISY = explicit push rule to notify for all
+        // RoomNotificationState.ALL_MESSAGES = no explicit push rule, follow default
+        // To follow desktops icons, we also need to exchange both icons...
+        RoomNotificationState.ALL_MESSAGES       -> R.drawable.ic_room_actions_notifications_all_noisy // default
+        RoomNotificationState.ALL_MESSAGES_NOISY -> R.drawable.ic_room_actions_notifications_all // actually all
         RoomNotificationState.MENTIONS_ONLY      -> R.drawable.ic_room_actions_notifications_mentions
         RoomNotificationState.MUTE               -> R.drawable.ic_room_actions_notifications_mutes
         else -> null
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt
index 8f6e8f54c1..4775fcbbc7 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsController.kt
@@ -64,6 +64,7 @@ class RoomNotificationSettingsController @Inject constructor() : TypedEpoxyContr
 
     @StringRes
     private fun titleForNotificationState(notificationState: RoomNotificationState): Int? = when (notificationState) {
+        RoomNotificationState.ALL_MESSAGES       -> R.string.room_settings_default // SC addition to add this back
         RoomNotificationState.ALL_MESSAGES_NOISY -> R.string.room_settings_all_messages
         RoomNotificationState.MENTIONS_ONLY      -> R.string.room_settings_mention_and_keyword_only
         RoomNotificationState.MUTE               -> R.string.room_settings_none
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
index 832bb5036e..6197f23105 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/notifications/RoomNotificationSettingsViewState.kt
@@ -40,8 +40,8 @@ data class RoomNotificationSettingsViewState(
  */
 val RoomNotificationSettingsViewState.notificationStateMapped: Async<RoomNotificationState>
     get() {
-        if ((roomSummary()?.isEncrypted == true && notificationState() == RoomNotificationState.MENTIONS_ONLY) ||
-                notificationState() == RoomNotificationState.ALL_MESSAGES) {
+        if ((roomSummary()?.isEncrypted == true && notificationState() == RoomNotificationState.MENTIONS_ONLY) /*||
+                notificationState() == RoomNotificationState.ALL_MESSAGES*/) {
             /** if in an encrypted room, mentions notifications are not supported so show "All Messages" as selected.
              * Also in the new settings there is no notion of notifications without sound so it maps to noisy also
              */
@@ -56,8 +56,10 @@ val RoomNotificationSettingsViewState.notificationStateMapped: Async<RoomNotific
 val RoomNotificationSettingsViewState.notificationOptions: List<RoomNotificationState>
     get() {
         return if (roomSummary()?.isEncrypted == true) {
-            listOf(RoomNotificationState.ALL_MESSAGES_NOISY, RoomNotificationState.MUTE)
+            // SC note: ALL_MESSAGES = default
+            listOf(RoomNotificationState.ALL_MESSAGES, RoomNotificationState.ALL_MESSAGES_NOISY, RoomNotificationState.MUTE)
         } else {
-            listOf(RoomNotificationState.ALL_MESSAGES_NOISY, RoomNotificationState.MENTIONS_ONLY, RoomNotificationState.MUTE)
+            // SC note: ALL_MESSAGES = default
+            listOf(RoomNotificationState.ALL_MESSAGES, RoomNotificationState.ALL_MESSAGES_NOISY, RoomNotificationState.MENTIONS_ONLY, RoomNotificationState.MUTE)
         }
     }
diff --git a/vector/src/main/res/values/strings_sc.xml b/vector/src/main/res/values/strings_sc.xml
index 89e2a7d798..255ea75789 100644
--- a/vector/src/main/res/values/strings_sc.xml
+++ b/vector/src/main/res/values/strings_sc.xml
@@ -154,4 +154,6 @@
     <string name="settings_enable_space_pager">Swipe chat list to switch space</string>
     <string name="settings_enable_space_pager_summary">Allow to switch between root spaces by swiping horizontally in the chat list</string>
 
+    <!-- Default notification rule -->
+    <string name="room_settings_default">Default</string>
 </resources>