diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt
index 39c6f6563..d005b8623 100644
--- a/app/src/main/java/org/linphone/core/CorePreferences.kt
+++ b/app/src/main/java/org/linphone/core/CorePreferences.kt
@@ -140,8 +140,8 @@ class CorePreferences @UiThread constructor(private val context: Context) {
         get() = config.getBool("ui", "dark_mode_allowed", true)
 
     @get:WorkerThread
-    val onlyDisplaySipUriUsername: Boolean // TODO FIXME: use it
-        get() = config.getBool("ui", "only_display_sip_uri_username", true)
+    val onlyDisplaySipUriUsername: Boolean
+        get() = config.getBool("ui", "only_display_sip_uri_username", false)
 
     @get:WorkerThread
     val disableChat: Boolean
diff --git a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
index e46a2be12..e85e58243 100644
--- a/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/call/viewmodel/CurrentCallViewModel.kt
@@ -1002,7 +1002,12 @@ class CurrentCallViewModel @UiThread constructor() : ViewModel() {
         canBePaused.postValue(canCallBePaused())
 
         val address = call.remoteAddress
-        displayedAddress.postValue(LinphoneUtils.getAddressAsCleanStringUriOnly(address))
+        val uri = if (corePreferences.onlyDisplaySipUriUsername) {
+            address.username ?: ""
+        } else {
+            LinphoneUtils.getAddressAsCleanStringUriOnly(address)
+        }
+        displayedAddress.postValue(uri)
 
         val model = if (conferenceInfo != null) {
             coreContext.contactsManager.getContactAvatarModelForConferenceInfo(conferenceInfo)
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt
index c8d74746f..21e72ddd0 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationInfoViewModel.kt
@@ -24,6 +24,7 @@ import androidx.annotation.UiThread
 import androidx.annotation.WorkerThread
 import androidx.lifecycle.MutableLiveData
 import org.linphone.LinphoneApplication.Companion.coreContext
+import org.linphone.LinphoneApplication.Companion.corePreferences
 import org.linphone.R
 import org.linphone.core.Address
 import org.linphone.core.ChatRoom
@@ -453,7 +454,13 @@ class ConversationInfoViewModel @UiThread constructor() : AbstractConversationVi
         val firstParticipant = chatRoom.participants.firstOrNull()
         if (firstParticipant != null) {
             val address = firstParticipant.address
-            sipUri.postValue(LinphoneUtils.getAddressAsCleanStringUriOnly(address))
+            val uri = if (corePreferences.onlyDisplaySipUriUsername) {
+                address.username ?: ""
+            } else {
+                LinphoneUtils.getAddressAsCleanStringUriOnly(address)
+            }
+            sipUri.postValue(uri)
+
             val friend = coreContext.contactsManager.findContactByAddress(address)
             oneToOneParticipantRefKey.postValue(friend?.refKey ?: "")
         }
diff --git a/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryContactFragment.kt b/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryContactFragment.kt
index d89118638..6f734f107 100644
--- a/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryContactFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/fragment/HistoryContactFragment.kt
@@ -142,7 +142,7 @@ class HistoryContactFragment : SlidingPaneChildFragment() {
                     getString(R.string.toast_call_history_deleted),
                     R.drawable.check
                 )
-                goBack() // TODO FIXME : issue with tablet when pane can't be closed
+                goBack()
             }
         }
 
diff --git a/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt b/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt
index 107b5d479..e25eafa1c 100644
--- a/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/history/model/CallLogModel.kt
@@ -4,6 +4,7 @@ import androidx.annotation.IntegerRes
 import androidx.annotation.UiThread
 import androidx.annotation.WorkerThread
 import org.linphone.LinphoneApplication.Companion.coreContext
+import org.linphone.LinphoneApplication.Companion.corePreferences
 import org.linphone.R
 import org.linphone.core.Call.Dir
 import org.linphone.core.CallLog
@@ -76,7 +77,11 @@ class CallLogModel @WorkerThread constructor(private val callLog: CallLog) {
             friendRefKey = friend.refKey
             friendExists = !friendRefKey.isNullOrEmpty()
         }
-        displayedAddress = avatarModel.friend.address?.asStringUriOnly() ?: address.asStringUriOnly()
+        displayedAddress = if (corePreferences.onlyDisplaySipUriUsername) {
+            avatarModel.friend.address?.username ?: address.username ?: ""
+        } else {
+            avatarModel.friend.address?.asStringUriOnly() ?: address.asStringUriOnly()
+        }
 
         iconResId = LinphoneUtils.getCallIconResId(callLog.status, callLog.dir)
     }