diff --git a/Linphone/Core/CoreContext.swift b/Linphone/Core/CoreContext.swift
index 13e3e3252..231fae30e 100644
--- a/Linphone/Core/CoreContext.swift
+++ b/Linphone/Core/CoreContext.swift
@@ -127,7 +127,7 @@ final class CoreContext: ObservableObject {
 			self.mCore.friendListSubscriptionEnabled = true
 			self.mCore.maxSizeForAutoDownloadIncomingFiles = 0
 			self.mCore.config!.setBool(section: "sip", key: "auto_answer_replacing_calls", value: false)
-			
+			self.mCore.config!.setBool(section: "sip", key: "deliver_imdn", value: false)
 			
 			self.mCoreSuscriptions.insert(self.mCore.publisher?.onGlobalStateChanged?.postOnCoreQueue { (cbVal: (core: Core, state: GlobalState, message: String)) in
 				if cbVal.state == GlobalState.On {
diff --git a/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift b/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
index 33ae49c0a..f0600c597 100644
--- a/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
+++ b/Linphone/UI/Main/Conversations/ViewModel/ConversationViewModel.swift
@@ -590,11 +590,11 @@ class ConversationViewModel: ObservableObject {
 								let attachment =
 								Attachment(
 									id: UUID().uuidString,
-									name: content.name!,
+									name: content.name ?? "???",
 									url: path!,
 									type: .image
 								)
-								attachmentNameList += ", \(content.name!)"
+								attachmentNameList += ", \(content.name ?? "???")"
 								attachmentList.append(attachment)
 							}
 						} else if content.name != nil && !content.name!.isEmpty {