diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt
index 7f538a967..127e8652c 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationInfoFragment.kt
@@ -205,6 +205,31 @@ class ConversationInfoFragment : GenericFragment() {
             dialog.show()
         }
 
+        binding.setGoToContactClickListener {
+            val refKey = viewModel.oneToOneParticipantRefKey.value
+            Log.i("$TAG Trying to display participant [$refKey] contact page")
+            if (!refKey.isNullOrEmpty()) {
+                sharedViewModel.navigateToContactsEvent.value = Event(true)
+                sharedViewModel.showContactEvent.value = Event(refKey)
+            } else {
+                Log.e("$TAG Can't go to contact page, friend ref key is null or empty!")
+                // TODO: show toast
+            }
+        }
+
+        binding.setAddToContactsClickListener {
+            val sipUri = viewModel.sipUri.value
+            if (!sipUri.isNullOrEmpty()) {
+                Log.i("$TAG Trying to add participant [$sipUri] to contacts")
+                sharedViewModel.sipAddressToAddToNewContact = sipUri
+                sharedViewModel.navigateToContactsEvent.value = Event(true)
+                sharedViewModel.showNewContactEvent.value = Event(true)
+            } else {
+                Log.e("$TAG Can't add empty/null SIP URI to contacts!")
+                // TODO: show toast
+            }
+        }
+
         binding.setConfigureEphemeralMessagesClickListener {
             val currentValue = viewModel.ephemeralLifetime.value ?: 0L
             if (findNavController().currentDestination?.id == R.id.conversationInfoFragment) {
@@ -241,25 +266,25 @@ class ConversationInfoFragment : GenericFragment() {
         popupView.isParticipantContact = !friendRefKey.isNullOrEmpty()
 
         popupView.setRemoveParticipantClickListener {
-            Log.w("$TAG Trying to remove participant [$address]")
+            Log.i("$TAG Trying to remove participant [$address]")
             viewModel.removeParticipant(participantModel)
             popupWindow.dismiss()
         }
 
         popupView.setSetAdminClickListener {
-            Log.w("$TAG Trying to give admin rights to participant [$address]")
+            Log.i("$TAG Trying to give admin rights to participant [$address]")
             viewModel.giveAdminRightsTo(participantModel)
             popupWindow.dismiss()
         }
 
         popupView.setUnsetAdminClickListener {
-            Log.w("$TAG Trying to remove admin rights from participant [$address]")
+            Log.i("$TAG Trying to remove admin rights from participant [$address]")
             viewModel.removeAdminRightsFrom(participantModel)
             popupWindow.dismiss()
         }
 
         popupView.setSeeContactProfileClickListener {
-            Log.w("$TAG Trying to display participant [$address] contact page")
+            Log.i("$TAG Trying to display participant [$address] contact page")
             if (!friendRefKey.isNullOrEmpty()) {
                 sharedViewModel.navigateToContactsEvent.value = Event(true)
                 sharedViewModel.showContactEvent.value = Event(friendRefKey)
@@ -271,7 +296,7 @@ class ConversationInfoFragment : GenericFragment() {
         }
 
         popupView.setAddToContactsClickListener {
-            Log.w("$TAG Trying to add participant [${participantModel.sipUri}] to contacts")
+            Log.i("$TAG Trying to add participant [${participantModel.sipUri}] to contacts")
             sharedViewModel.sipAddressToAddToNewContact = participantModel.sipUri
             sharedViewModel.navigateToContactsEvent.value = Event(true)
             sharedViewModel.showNewContactEvent.value = Event(true)
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 ca275d4a4..ed7a6d89d 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
@@ -64,6 +64,8 @@ class ConversationInfoViewModel @UiThread constructor() : ViewModel() {
 
     val chatRoomFoundEvent = MutableLiveData<Event<Boolean>>()
 
+    val oneToOneParticipantRefKey = MutableLiveData<String>()
+
     val groupLeftEvent: MutableLiveData<Event<Boolean>> by lazy {
         MutableLiveData<Event<Boolean>>()
     }
@@ -379,7 +381,14 @@ class ConversationInfoViewModel @UiThread constructor() : ViewModel() {
         }
 
         subject.postValue(chatRoom.subject)
-        sipUri.postValue(chatRoom.participants.firstOrNull()?.address?.asStringUriOnly())
+
+        val firstParticipant = chatRoom.participants.firstOrNull()
+        if (firstParticipant != null) {
+            val address = firstParticipant.address
+            sipUri.postValue(address.asStringUriOnly())
+            val friend = coreContext.contactsManager.findContactByAddress(address)
+            oneToOneParticipantRefKey.postValue(friend?.refKey ?: "")
+        }
 
         ephemeralLifetime.postValue(
             if (!chatRoom.isEphemeralEnabled) 0L else chatRoom.ephemeralLifetime
diff --git a/app/src/main/res/layout/chat_info_fragment.xml b/app/src/main/res/layout/chat_info_fragment.xml
index 95e239165..9ceced9d9 100644
--- a/app/src/main/res/layout/chat_info_fragment.xml
+++ b/app/src/main/res/layout/chat_info_fragment.xml
@@ -18,6 +18,12 @@
         <variable
             name="addParticipantsClickListener"
             type="View.OnClickListener" />
+        <variable
+            name="goToContactClickListener"
+            type="View.OnClickListener" />
+        <variable
+            name="addToContactsClickListener"
+            type="View.OnClickListener" />
         <variable
             name="configureEphemeralMessagesClickListener"
             type="View.OnClickListener" />
@@ -60,25 +66,27 @@
             android:id="@+id/scrollView"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            android:fillViewport="true"
             android:background="@color/gray_100"
-            app:layout_constraintStart_toStartOf="parent"
+            android:fillViewport="true"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/invisible_title"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintVertical_bias="0.0">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
                 <com.google.android.material.imageview.ShapeableImageView
-                    style="@style/avatar_imageview"
                     android:id="@+id/avatar"
+                    style="@style/avatar_imageview"
+                    coilBigAvatar="@{viewModel.avatarModel}"
                     android:layout_width="@dimen/avatar_big_size"
                     android:layout_height="@dimen/avatar_big_size"
                     android:layout_marginTop="8dp"
                     android:src="@drawable/inset_meeting"
-                    coilBigAvatar="@{viewModel.avatarModel}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
@@ -90,62 +98,60 @@
                     android:layout_marginEnd="@dimen/avatar_presence_badge_big_end_margin"
                     android:background="@drawable/led_background"
                     android:padding="@dimen/avatar_presence_badge_big_padding"
-                    app:presenceIcon="@{viewModel.avatarModel.presenceStatus}"
                     android:visibility="@{viewModel.avatarModel.presenceStatus == ConsolidatedPresence.Offline ? View.GONE : View.VISIBLE, default=gone}"
+                    app:layout_constraintBottom_toBottomOf="@id/avatar"
                     app:layout_constraintEnd_toEndOf="@id/avatar"
-                    app:layout_constraintBottom_toBottomOf="@id/avatar"/>
+                    app:presenceIcon="@{viewModel.avatarModel.presenceStatus}" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/default_text_style"
                     android:id="@+id/title"
+                    style="@style/default_text_style"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="10dp"
                     android:layout_marginStart="16dp"
-                    android:text="@{viewModel.isGroup ? viewModel.subject : viewModel.avatarModel.name, default=`John Doe`}"
-                    android:textSize="14sp"
-                    android:textColor="@color/gray_main2_700"
-                    android:maxLines="1"
+                    android:layout_marginEnd="16dp"
                     android:ellipsize="end"
-                    app:layout_constraintHorizontal_chainStyle="packed"
-                    app:layout_constraintTop_toBottomOf="@id/avatar"
+                    android:maxLines="1"
+                    android:text="@{viewModel.isGroup ? viewModel.subject : viewModel.avatarModel.name, default=`John Doe`}"
+                    android:textColor="@color/gray_main2_700"
+                    android:textSize="14sp"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toStartOf="@id/edit_subject" />
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/avatar" />
 
                 <ImageView
                     android:id="@+id/edit_subject"
-                    android:onClick="@{editSubjectClickListener}"
                     android:layout_width="@dimen/icon_size"
                     android:layout_height="@dimen/icon_size"
                     android:layout_marginStart="8dp"
-                    android:layout_marginEnd="16dp"
+                    android:onClick="@{editSubjectClickListener}"
                     android:src="@drawable/pencil_simple"
                     android:visibility="@{!viewModel.isGroup || viewModel.isReadOnly || !viewModel.isMyselfAdmin ? View.GONE : View.VISIBLE}"
-                    app:layout_constraintTop_toTopOf="@id/title"
                     app:layout_constraintBottom_toBottomOf="@id/title"
                     app:layout_constraintStart_toEndOf="@id/title"
-                    app:layout_constraintEnd_toEndOf="parent"/>
+                    app:layout_constraintTop_toTopOf="@id/title" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/default_text_style"
                     android:id="@+id/address"
+                    style="@style/default_text_style"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
+                    android:ellipsize="end"
+                    android:maxLines="1"
                     android:text="@{viewModel.sipUri, default=`sip:john.doe@sip.example.org`}"
                     android:textColor="@color/gray_main2_700"
                     android:textSize="14sp"
-                    android:maxLines="1"
-                    android:ellipsize="end"
                     android:visibility="@{viewModel.isGroup ? View.GONE : View.VISIBLE, default=gone}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/title" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/default_text_style_300"
                     android:id="@+id/status"
+                    style="@style/default_text_style_300"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@{viewModel.avatarModel.lastPresenceInfo, default=@string/friend_presence_status_online}"
@@ -158,102 +164,102 @@
 
                 <ImageView
                     android:id="@+id/mute"
-                    android:onClick="@{() -> viewModel.toggleMute()}"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_marginTop="40dp"
                     android:background="@drawable/circle_light_blue_button_background"
+                    android:onClick="@{() -> viewModel.toggleMute()}"
                     android:padding="16dp"
                     android:src="@{viewModel.isMuted ? @drawable/bell_simple : @drawable/bell_simple_slash, default=@drawable/bell_simple_slash}"
-                    app:tint="@color/gray_main2_500"
                     app:layout_constraintEnd_toStartOf="@id/call"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/status" />
+                    app:layout_constraintTop_toBottomOf="@id/status"
+                    app:tint="@color/gray_main2_500" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/default_text_style"
                     android:id="@+id/mute_label"
-                    android:onClick="@{() -> viewModel.toggleMute()}"
+                    style="@style/default_text_style"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
+                    android:onClick="@{() -> viewModel.toggleMute()}"
                     android:text="@{viewModel.isMuted ? @string/conversation_action_unmute : @string/conversation_action_mute, default=@string/conversation_action_mute}"
                     android:textSize="14sp"
-                    app:layout_constraintTop_toBottomOf="@id/mute"
+                    app:layout_constraintEnd_toEndOf="@id/mute"
                     app:layout_constraintStart_toStartOf="@id/mute"
-                    app:layout_constraintEnd_toEndOf="@id/mute"/>
+                    app:layout_constraintTop_toBottomOf="@id/mute" />
 
                 <ImageView
                     android:id="@+id/call"
-                    android:onClick="@{() -> viewModel.call()}"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_marginTop="40dp"
                     android:background="@drawable/circle_light_blue_button_background"
+                    android:onClick="@{() -> viewModel.call()}"
                     android:padding="16dp"
                     android:src="@drawable/phone"
-                    app:tint="@color/gray_main2_500"
-                    app:layout_constraintStart_toEndOf="@id/mute"
                     app:layout_constraintEnd_toStartOf="@id/meeting"
-                    app:layout_constraintTop_toBottomOf="@id/status" />
+                    app:layout_constraintStart_toEndOf="@id/mute"
+                    app:layout_constraintTop_toBottomOf="@id/status"
+                    app:tint="@color/gray_main2_500" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/default_text_style"
                     android:id="@+id/call_label"
-                    android:onClick="@{() -> viewModel.call()}"
+                    style="@style/default_text_style"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
+                    android:onClick="@{() -> viewModel.call()}"
                     android:text="@string/conversation_action_call"
                     android:textSize="14sp"
-                    app:layout_constraintTop_toBottomOf="@id/call"
+                    app:layout_constraintEnd_toEndOf="@id/call"
                     app:layout_constraintStart_toStartOf="@id/call"
-                    app:layout_constraintEnd_toEndOf="@id/call"/>
+                    app:layout_constraintTop_toBottomOf="@id/call" />
 
                 <ImageView
                     android:id="@+id/meeting"
-                    android:onClick="@{scheduleMeetingClickListener}"
                     android:layout_width="56dp"
                     android:layout_height="56dp"
                     android:layout_marginTop="40dp"
                     android:background="@drawable/circle_light_blue_button_background"
+                    android:onClick="@{scheduleMeetingClickListener}"
                     android:padding="16dp"
                     android:src="@drawable/meeting"
-                    app:tint="@color/gray_main2_500"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toEndOf="@id/call"
-                    app:layout_constraintTop_toBottomOf="@id/status" />
+                    app:layout_constraintTop_toBottomOf="@id/status"
+                    app:tint="@color/gray_main2_500" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/default_text_style"
                     android:id="@+id/meeting_label"
-                    android:onClick="@{scheduleMeetingClickListener}"
+                    style="@style/default_text_style"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="8dp"
+                    android:onClick="@{scheduleMeetingClickListener}"
                     android:text="@string/meeting_schedule_meeting_label"
                     android:textSize="14sp"
-                    app:layout_constraintTop_toBottomOf="@id/meeting"
+                    app:layout_constraintEnd_toEndOf="@id/meeting"
                     app:layout_constraintStart_toStartOf="@id/meeting"
-                    app:layout_constraintEnd_toEndOf="@id/meeting"/>
+                    app:layout_constraintTop_toBottomOf="@id/meeting" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/section_header_style"
-                    android:onClick="@{() -> viewModel.toggleParticipantsExpand()}"
                     android:id="@+id/participants_label"
+                    style="@style/section_header_style"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:padding="5dp"
                     android:layout_marginStart="26dp"
-                    android:layout_marginEnd="26dp"
                     android:layout_marginTop="32dp"
-                    android:text="@string/conversation_info_participants_list_title"
+                    android:layout_marginEnd="26dp"
                     android:drawableEnd="@{viewModel.expandParticipants ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
                     android:drawableTint="@color/gray_main2_600"
+                    android:onClick="@{() -> viewModel.toggleParticipantsExpand()}"
+                    android:padding="5dp"
+                    android:text="@string/conversation_info_participants_list_title"
                     android:visibility="@{viewModel.isGroup ? View.VISIBLE : View.GONE}"
-                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/mute_label"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/mute_label" />
 
                 <View
                     android:id="@+id/participants_background"
@@ -264,68 +270,68 @@
                     android:layout_marginBottom="-16dp"
                     android:background="@drawable/shape_squircle_white_background"
                     android:visibility="@{!viewModel.expandParticipants || !viewModel.isMyselfAdmin || !viewModel.isGroup || viewModel.isReadOnly ? View.GONE : View.VISIBLE, default=gone}"
-                    app:layout_constraintTop_toTopOf="@id/participants"
-                    app:layout_constraintBottom_toBottomOf="@id/add_participants" />
+                    app:layout_constraintBottom_toBottomOf="@id/add_participants"
+                    app:layout_constraintTop_toTopOf="@id/participants" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/participants"
-                    android:visibility="@{viewModel.expandParticipants &amp;&amp; viewModel.isGroup ? View.VISIBLE : View.GONE}"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
                     android:layout_marginTop="8dp"
+                    android:layout_marginEnd="16dp"
                     android:layout_marginBottom="16dp"
                     android:background="@drawable/shape_squircle_white_background"
                     android:nestedScrollingEnabled="true"
-                    app:layout_constraintVertical_weight="1"
+                    android:visibility="@{viewModel.expandParticipants &amp;&amp; viewModel.isGroup ? View.VISIBLE : View.GONE}"
+                    app:layout_constraintBottom_toTopOf="@id/add_participants"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintHeight_max="@dimen/chat_room_participants_list_max_height"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/participants_label"
-                    app:layout_constraintBottom_toTopOf="@id/add_participants" />
+                    app:layout_constraintVertical_weight="1" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/tertiary_button_label_style"
                     android:id="@+id/add_participants"
-                    android:onClick="@{addParticipantsClickListener}"
+                    style="@style/tertiary_button_label_style"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
                     android:background="@drawable/tertiary_button_background"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="16dp"
-                    android:paddingTop="10dp"
-                    android:paddingBottom="10dp"
-                    android:gravity="center"
-                    android:text="@string/conversation_info_add_participants_label"
-                    android:maxLines="1"
-                    android:ellipsize="end"
                     android:drawableStart="@drawable/plus_circle"
                     android:drawablePadding="8dp"
+                    android:ellipsize="end"
+                    android:gravity="center"
+                    android:maxLines="1"
+                    android:onClick="@{addParticipantsClickListener}"
+                    android:paddingStart="16dp"
+                    android:paddingTop="10dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="10dp"
+                    android:text="@string/conversation_info_add_participants_label"
                     android:visibility="@{!viewModel.expandParticipants || !viewModel.isMyselfAdmin || !viewModel.isGroup || viewModel.isReadOnly ? View.GONE : View.VISIBLE, default=gone}"
                     app:drawableTint="@color/orange_main_500"
-                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintBottom_toTopOf="@id/actions"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/participants"
-                    app:layout_constraintBottom_toTopOf="@id/actions"/>
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/participants" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/section_header_style"
                     android:id="@+id/actions"
+                    style="@style/section_header_style"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:padding="5dp"
                     android:layout_marginStart="26dp"
-                    android:layout_marginEnd="26dp"
                     android:layout_marginTop="16dp"
+                    android:layout_marginEnd="26dp"
                     android:layout_marginBottom="8dp"
+                    android:padding="5dp"
                     android:text="@string/contact_details_actions_title"
-                    app:layout_constraintVertical_bias="0"
-                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintBottom_toTopOf="@id/actions_background"
                     app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/add_participants"
-                    app:layout_constraintBottom_toTopOf="@id/actions_background"/>
+                    app:layout_constraintVertical_bias="0" />
 
                 <ImageView
                     android:id="@+id/actions_background"
@@ -334,76 +340,124 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
                     android:src="@drawable/shape_squircle_white_background"
-                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintBottom_toBottomOf="@id/action_delete"
                     app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/actions"
-                    app:layout_constraintBottom_toBottomOf="@id/action_delete" />
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/actions" />
 
                 <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/action_see_contact"
                     style="@style/context_menu_action_label_style"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="@drawable/action_background"
+                    android:drawableStart="@drawable/address_book"
+                    android:onClick="@{goToContactClickListener}"
+                    android:text="@string/conversation_info_menu_go_to_contact"
+                    android:visibility="@{!viewModel.isGroup &amp;&amp; viewModel.oneToOneParticipantRefKey.length() != 0 ? View.VISIBLE : View.GONE, default=gone}"
+                    app:layout_constraintEnd_toEndOf="@id/actions_background"
+                    app:layout_constraintStart_toStartOf="@id/actions_background"
+                    app:layout_constraintTop_toTopOf="@id/actions_background" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:background="@color/gray_main2_200"
+                    app:layout_constraintEnd_toEndOf="@id/action_see_contact"
+                    app:layout_constraintStart_toStartOf="@id/action_see_contact"
+                    app:layout_constraintTop_toBottomOf="@+id/action_see_contact" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/action_add_to_contacts"
+                    style="@style/context_menu_action_label_style"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="@drawable/action_background"
+                    android:drawableStart="@drawable/user_plus"
+                    android:onClick="@{addToContactsClickListener}"
+                    android:text="@string/conversation_info_menu_add_to_contacts"
+                    android:visibility="@{!viewModel.isGroup &amp;&amp; viewModel.oneToOneParticipantRefKey.length() == 0 ? View.VISIBLE : View.GONE, default=gone}"
+                    app:layout_constraintEnd_toEndOf="@id/actions_background"
+                    app:layout_constraintStart_toStartOf="@id/actions_background"
+                    app:layout_constraintTop_toBottomOf="@id/action_see_contact" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:background="@color/gray_main2_200"
+                    app:layout_constraintEnd_toEndOf="@id/action_add_to_contacts"
+                    app:layout_constraintStart_toStartOf="@id/action_add_to_contacts"
+                    app:layout_constraintTop_toBottomOf="@+id/action_add_to_contacts" />
+
+                <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/action_ephemeral_messages"
-                    android:onClick="@{configureEphemeralMessagesClickListener}"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:text="@string/conversation_action_configure_ephemeral_messages"
-                    android:drawableStart="@drawable/clock_countdown"
-                    android:background="@drawable/action_background"
-                    android:visibility="@{!viewModel.isReadOnly ? View.VISIBLE : View.GONE}"
-                    app:layout_constraintTop_toTopOf="@id/actions_background"
-                    app:layout_constraintStart_toStartOf="@id/actions_background"
-                    app:layout_constraintEnd_toEndOf="@id/actions_background"/>
-
-                <View
-                    android:layout_width="0dp"
-                    android:layout_height="1dp"
-                    android:background="@color/gray_main2_200"
-                    app:layout_constraintStart_toStartOf="@id/action_ephemeral_messages"
-                    app:layout_constraintEnd_toEndOf="@id/action_ephemeral_messages"
-                    app:layout_constraintTop_toBottomOf="@+id/action_ephemeral_messages"/>
-
-                <androidx.appcompat.widget.AppCompatTextView
                     style="@style/context_menu_action_label_style"
-                    android:id="@+id/action_leave_group"
-                    android:onClick="@{() -> viewModel.leaveGroup()}"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
-                    android:text="@string/conversation_action_leave_group"
-                    android:drawableStart="@drawable/sign_out"
                     android:background="@drawable/action_background"
-                    android:visibility="@{viewModel.isGroup &amp;&amp; !viewModel.isReadOnly ? View.VISIBLE : View.GONE}"
-                    app:layout_constraintTop_toBottomOf="@id/action_ephemeral_messages"
+                    android:drawableStart="@drawable/clock_countdown"
+                    android:onClick="@{configureEphemeralMessagesClickListener}"
+                    android:text="@string/conversation_action_configure_ephemeral_messages"
+                    android:visibility="@{!viewModel.isReadOnly ? View.VISIBLE : View.GONE}"
+                    app:layout_constraintEnd_toEndOf="@id/actions_background"
                     app:layout_constraintStart_toStartOf="@id/actions_background"
-                    app:layout_constraintEnd_toEndOf="@id/actions_background"/>
+                    app:layout_constraintTop_toBottomOf="@id/action_add_to_contacts" />
 
                 <View
                     android:layout_width="0dp"
                     android:layout_height="1dp"
                     android:background="@color/gray_main2_200"
-                    app:layout_constraintStart_toStartOf="@id/action_leave_group"
-                    app:layout_constraintEnd_toEndOf="@id/action_leave_group"
-                    app:layout_constraintTop_toBottomOf="@+id/action_leave_group"/>
+                    app:layout_constraintEnd_toEndOf="@id/action_ephemeral_messages"
+                    app:layout_constraintStart_toStartOf="@id/action_ephemeral_messages"
+                    app:layout_constraintTop_toBottomOf="@+id/action_ephemeral_messages" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/action_leave_group"
+                    style="@style/context_menu_action_label_style"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="@drawable/action_background"
+                    android:drawableStart="@drawable/sign_out"
+                    android:onClick="@{() -> viewModel.leaveGroup()}"
+                    android:text="@string/conversation_action_leave_group"
+                    android:visibility="@{viewModel.isGroup &amp;&amp; !viewModel.isReadOnly ? View.VISIBLE : View.GONE}"
+                    app:layout_constraintEnd_toEndOf="@id/actions_background"
+                    app:layout_constraintStart_toStartOf="@id/actions_background"
+                    app:layout_constraintTop_toBottomOf="@id/action_ephemeral_messages" />
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:background="@color/gray_main2_200"
+                    app:layout_constraintEnd_toEndOf="@id/action_leave_group"
+                    app:layout_constraintStart_toStartOf="@id/action_leave_group"
+                    app:layout_constraintTop_toBottomOf="@+id/action_leave_group" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/context_menu_danger_action_label_style"
                     android:id="@+id/action_delete"
-                    android:onClick="@{() -> viewModel.deleteHistory()}"
+                    style="@style/context_menu_danger_action_label_style"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
                     android:layout_marginEnd="16dp"
                     android:layout_marginBottom="@dimen/screen_bottom_margin"
                     android:background="@drawable/action_background"
-                    android:text="@string/conversation_info_delete_history_action"
                     android:drawableStart="@drawable/trash_simple"
-                    app:layout_constraintVertical_bias="0"
-                    app:layout_constraintTop_toBottomOf="@id/action_leave_group"
+                    android:onClick="@{() -> viewModel.deleteHistory()}"
+                    android:text="@string/conversation_info_delete_history_action"
                     app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="@id/actions_background"
                     app:layout_constraintStart_toStartOf="@id/actions_background"
-                    app:layout_constraintEnd_toEndOf="@id/actions_background"/>
+                    app:layout_constraintTop_toBottomOf="@id/action_leave_group"
+                    app:layout_constraintVertical_bias="0" />
 
             </androidx.constraintlayout.widget.ConstraintLayout>