diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2389e5133..5284c66f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,15 +14,20 @@ Group changes to describe their impact on the project, as follows:
 
 ### Added
 - Added hover effect when using a mouse (useful for tablets or devices with desktop mode)
+- Support right click on some items to open bottom sheet/menu
 - Added toggle speaker action in active call notification
-- Added back increased text size for chat messages that only contains emoji(s)
+- Increased text size for chat messages that only contains emoji(s)
+- Dedicated top bar when file(s) or text is waiting to be shared
+- New settings:
+  - one for user to choose whether to sort contacts by first name or last name
+  - one to hide contacts that have neither a SIP address nor a phone number
+  - one to let app auto-answer call with video sending already enabled
 - Added a vu meter for recording & playback volumes (disabled by default, must be enabled in CorePreferences)
-- Added a setting for user to choose whether to sort contacts by first name or last name
-- Added a setting to hide contacts that have neither a SIP address nor a phone number
-- Added a setting to let app auto-answer call with video sending already enabled
 
 ### Changed
+- Hide SIP address/phone number picker dialog if contact has exactly one SIP address matching both the app default domain & the currently selected account domain
 - Improved UI on tablets with screen sw600dp and higher, will look more like our desktop app
+- Split alert top bar in two to be able to see both alerts and ongoing call(s)
 - Reworked some settings (moved calls related ones from advanced settings to advanced calls settings)
 
 ## [6.0.9] - 2025-06-06
diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index d7d4da0ba..88088fb11 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -222,6 +222,25 @@ fun View.setKeyboardInsetListener(lambda: (visible: Boolean) -> Unit) {
     }
 }
 
+@UiThread
+@BindingAdapter("android:onContextClick")
+fun View.setContextListener(longClickListener: View.OnLongClickListener?) {
+    longClickListener ?: return
+
+    this.setOnContextClickListener {
+        longClickListener.onLongClick(this)
+    }
+}
+
+@UiThread
+@BindingAdapter("android:onContextClick")
+fun View.setContextListener(lambda: () -> Unit) {
+    this.setOnContextClickListener {
+        lambda.invoke()
+        true
+    }
+}
+
 @UiThread
 @BindingAdapter("android:src")
 fun ImageView.setSourceImageResource(resource: Int) {
diff --git a/app/src/main/res/layout/call_conference_participant_list_cell.xml b/app/src/main/res/layout/call_conference_participant_list_cell.xml
index 76cb28823..691f50afa 100644
--- a/app/src/main/res/layout/call_conference_participant_list_cell.xml
+++ b/app/src/main/res/layout/call_conference_participant_list_cell.xml
@@ -19,6 +19,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:onClick="@{onClickListener}"
         android:onLongClick="@{onLongClickListener}"
+        android:onContextClick="@{onLongClickListener}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/app/src/main/res/layout/call_list_cell.xml b/app/src/main/res/layout/call_list_cell.xml
index 944de127e..6e692a636 100644
--- a/app/src/main/res/layout/call_list_cell.xml
+++ b/app/src/main/res/layout/call_list_cell.xml
@@ -19,6 +19,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:onClick="@{onClickListener}"
         android:onLongClick="@{onLongClickListener}"
+        android:onContextClick="@{onLongClickListener}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml
index 221818d09..bb2304e26 100644
--- a/app/src/main/res/layout/chat_bubble_incoming.xml
+++ b/app/src/main/res/layout/chat_bubble_incoming.xml
@@ -157,6 +157,7 @@
         <LinearLayout
             android:id="@+id/bubble"
             android:onLongClick="@{onLongClickListener}"
+            android:onContextClick="@{onLongClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@{model.isFromGroup ? @dimen/chat_bubble_start_margin_when_avatar_displayed : @dimen/zero, default=@dimen/chat_bubble_start_margin_when_avatar_displayed}"
diff --git a/app/src/main/res/layout/chat_bubble_outgoing.xml b/app/src/main/res/layout/chat_bubble_outgoing.xml
index 0b93d3e54..8fc3a3430 100644
--- a/app/src/main/res/layout/chat_bubble_outgoing.xml
+++ b/app/src/main/res/layout/chat_bubble_outgoing.xml
@@ -129,6 +129,7 @@
         <LinearLayout
             android:id="@+id/bubble"
             android:onLongClick="@{onLongClickListener}"
+            android:onContextClick="@{onLongClickListener}"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:padding="10dp"
diff --git a/app/src/main/res/layout/chat_list_cell.xml b/app/src/main/res/layout/chat_list_cell.xml
index 43375ce96..d3d51de76 100644
--- a/app/src/main/res/layout/chat_list_cell.xml
+++ b/app/src/main/res/layout/chat_list_cell.xml
@@ -20,6 +20,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:onClick="@{onClickListener}"
         android:onLongClickListener="@{onLongClickListener}"
+        android:onContextClick="@{onLongClickListener}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
diff --git a/app/src/main/res/layout/contact_favourite_list_cell.xml b/app/src/main/res/layout/contact_favourite_list_cell.xml
index 8b6b582de..761efb40f 100644
--- a/app/src/main/res/layout/contact_favourite_list_cell.xml
+++ b/app/src/main/res/layout/contact_favourite_list_cell.xml
@@ -19,6 +19,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:onClick="@{onClickListener}"
         android:onLongClick="@{onLongClickListener}"
+        android:onContextClick="@{onLongClickListener}"
         android:layout_width="75dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="5dp"
diff --git a/app/src/main/res/layout/contact_list_cell.xml b/app/src/main/res/layout/contact_list_cell.xml
index 5bb804ee5..af90a206f 100644
--- a/app/src/main/res/layout/contact_list_cell.xml
+++ b/app/src/main/res/layout/contact_list_cell.xml
@@ -22,6 +22,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:onClick="@{onClickListener}"
         android:onLongClick="@{onLongClickListener}"
+        android:onContextClick="@{onLongClickListener}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
diff --git a/app/src/main/res/layout/contact_number_address_list_cell.xml b/app/src/main/res/layout/contact_number_address_list_cell.xml
index 0ed2f201b..e94a351d3 100644
--- a/app/src/main/res/layout/contact_number_address_list_cell.xml
+++ b/app/src/main/res/layout/contact_number_address_list_cell.xml
@@ -13,6 +13,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:onClick="@{() -> model.onClicked()}"
         android:onLongClick="@{() -> model.onLongPress()}"
+        android:onContextClick="@{() -> model.onLongPress()}"
         android:selected="@{model.selected}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/history_list_cell.xml b/app/src/main/res/layout/history_list_cell.xml
index 529ce524a..f3a29ac7b 100644
--- a/app/src/main/res/layout/history_list_cell.xml
+++ b/app/src/main/res/layout/history_list_cell.xml
@@ -22,6 +22,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:onClick="@{onClickListener}"
         android:onLongClickListener="@{onLongClickListener}"
+        android:onContextClick="@{onLongClickListener}"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="8dp"
diff --git a/app/src/main/res/layout/meeting_list_cell.xml b/app/src/main/res/layout/meeting_list_cell.xml
index aeea03096..0b3f2547d 100644
--- a/app/src/main/res/layout/meeting_list_cell.xml
+++ b/app/src/main/res/layout/meeting_list_cell.xml
@@ -85,6 +85,7 @@
             android:id="@+id/cardview"
             android:onClick="@{onClickListener}"
             android:onLongClick="@{onLongClickListener}"
+            android:onContextClick="@{onLongClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
diff --git a/app/src/main/res/layout/recording_list_cell.xml b/app/src/main/res/layout/recording_list_cell.xml
index 2601f8325..481999a51 100644
--- a/app/src/main/res/layout/recording_list_cell.xml
+++ b/app/src/main/res/layout/recording_list_cell.xml
@@ -26,6 +26,7 @@
             android:id="@+id/cardview"
             android:onClick="@{onClickListener}"
             android:onLongClick="@{onLongClickListener}"
+            android:onContextClick="@{onLongClickListener}"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"