diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt
index 1ef593232..1e65b9081 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationForwardMessageViewModel.kt
@@ -149,7 +149,7 @@ class ConversationForwardMessageViewModel
 
             val friend = model.friend
             if (friend == null) {
-                Log.i("$TAG Friend is null, using address [${model.address}]")
+                Log.i("$TAG Friend is null, using address [${model.address.asStringUriOnly()}]")
                 onAddressSelected(model.address)
                 return@postOnCoreThread
             }
diff --git a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt
index 9ef149325..d80d28cba 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/viewmodel/StartConversationViewModel.kt
@@ -240,7 +240,8 @@ class StartConversationViewModel
             val chatRoom = core.createChatRoom(params, localAddress, participants)
             if (chatRoom != null) {
                 if (chatParams.backend == ChatRoom.Backend.FlexisipChat) {
-                    if (chatRoom.state == ChatRoom.State.Created) {
+                    val state = chatRoom.state
+                    if (state == ChatRoom.State.Created) {
                         val id = LinphoneUtils.getChatRoomId(chatRoom)
                         Log.i("$TAG 1-1 conversation [$id] has been created")
                         operationInProgress.postValue(false)
@@ -253,7 +254,7 @@ class StartConversationViewModel
                             )
                         )
                     } else {
-                        Log.i("$TAG Conversation isn't in Created state yet, wait for it")
+                        Log.i("$TAG Conversation isn't in Created state yet (state is [$state]), wait for it")
                         chatRoom.addListener(chatRoomListener)
                     }
                 } else {
diff --git a/app/src/main/java/org/linphone/ui/main/fragment/GenericAddressPickerFragment.kt b/app/src/main/java/org/linphone/ui/main/fragment/GenericAddressPickerFragment.kt
index 65bebfd45..23c599f57 100644
--- a/app/src/main/java/org/linphone/ui/main/fragment/GenericAddressPickerFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/fragment/GenericAddressPickerFragment.kt
@@ -167,7 +167,7 @@ abstract class GenericAddressPickerFragment : GenericMainFragment() {
         coreContext.postOnCoreThread { core ->
             val friend = model.friend
             if (friend == null) {
-                Log.i("$TAG Friend is null, using address [${model.address}]")
+                Log.i("$TAG Friend is null, using address [${model.address.asStringUriOnly()}]")
                 val fakeFriend = core.createFriend()
                 fakeFriend.addAddress(model.address)
                 onAddressSelected(model.address, fakeFriend)