diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dba8cebd..852976508 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ Group changes to describe their impact on the project, as follows:
 
 ### Changed
 - In-call views have been re-designed
+- "Media Encryption Mandatory" setting now allows for any media encryption (instead of only the one selected in the above setting previously)
 - Improved how call logs are handled to improve performances
 - Improved how contact avatars are generated
 - 3-dots menu even for basic chat rooms with more options
diff --git a/app/src/main/assets/linphonerc_factory b/app/src/main/assets/linphonerc_factory
index 8a31a5b83..b6409a042 100644
--- a/app/src/main/assets/linphonerc_factory
+++ b/app/src/main/assets/linphonerc_factory
@@ -8,6 +8,9 @@
 mtu=1300
 force_ice_disablement=0
 
+[rtp]
+accept_any_encryption=1
+
 [sip]
 guess_hostname=1
 register_only_when_network_is_up=1
@@ -26,7 +29,7 @@ ec_calibrator_cool_tones=1
 [video]
 displaytype=MSAndroidTextureDisplay
 auto_resize_preview_to_keep_ratio=1
-max_mosaic_size=vga
+max_conference_size=vga
 
 [misc]
 enable_basic_to_client_group_chat_room_migration=0
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 2b1624be2..5101b6b0d 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -728,6 +728,9 @@ class NotificationsManager(private val context: Context) {
 
         if (text.isEmpty()) {
             for (content in message.contents) {
+                if (text.isNotEmpty()) {
+                    text += ", "
+                }
                 text += content.name
             }
         }