diff --git a/app/src/main/java/org/linphone/ui/call/fragment/AbstractNewTransferCallFragment.kt b/app/src/main/java/org/linphone/ui/call/fragment/AbstractNewTransferCallFragment.kt
index 93d2fef78..14d67cfa2 100644
--- a/app/src/main/java/org/linphone/ui/call/fragment/AbstractNewTransferCallFragment.kt
+++ b/app/src/main/java/org/linphone/ui/call/fragment/AbstractNewTransferCallFragment.kt
@@ -37,7 +37,7 @@ import org.linphone.contacts.getListOfSipAddressesAndPhoneNumbers
 import org.linphone.core.Address
 import org.linphone.core.tools.Log
 import org.linphone.databinding.StartCallFragmentBinding
-import org.linphone.ui.adapter.ConversationsContactsAndSuggestionsListAdapter
+import org.linphone.ui.main.adapter.ConversationsContactsAndSuggestionsListAdapter
 import org.linphone.ui.main.contacts.model.ContactNumberOrAddressClickListener
 import org.linphone.ui.main.contacts.model.ContactNumberOrAddressModel
 import org.linphone.ui.main.contacts.model.NumberOrAddressPickerDialogModel
diff --git a/app/src/main/java/org/linphone/ui/adapter/ConversationsContactsAndSuggestionsListAdapter.kt b/app/src/main/java/org/linphone/ui/main/adapter/ConversationsContactsAndSuggestionsListAdapter.kt
similarity index 99%
rename from app/src/main/java/org/linphone/ui/adapter/ConversationsContactsAndSuggestionsListAdapter.kt
rename to app/src/main/java/org/linphone/ui/main/adapter/ConversationsContactsAndSuggestionsListAdapter.kt
index 97cde1bb0..e66ffc6f3 100644
--- a/app/src/main/java/org/linphone/ui/adapter/ConversationsContactsAndSuggestionsListAdapter.kt
+++ b/app/src/main/java/org/linphone/ui/main/adapter/ConversationsContactsAndSuggestionsListAdapter.kt
@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.linphone.ui.adapter
+package org.linphone.ui.main.adapter
 
 import android.content.Context
 import android.view.LayoutInflater
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDialogFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDialogFragment.kt
index ec506ed17..1daf8b3fd 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDialogFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationDialogFragment.kt
@@ -36,6 +36,7 @@ class ConversationDialogFragment(
     private val isMuted: Boolean,
     private val isGroup: Boolean,
     private val isReadOnly: Boolean,
+    private val hasUnreadMessages: Boolean,
     private val onDismiss: (() -> Unit)? = null,
     private val onMarkConversationAsRead: (() -> Unit)? = null,
     private val onToggleMute: (() -> Unit)? = null,
@@ -74,6 +75,7 @@ class ConversationDialogFragment(
         view.isMuted = isMuted
         view.isGroup = isGroup
         view.isReadOnly = isReadOnly
+        view.hasUnreadMessages = hasUnreadMessages
 
         view.setMarkAsReadClickListener {
             onMarkConversationAsRead?.invoke()
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationForwardMessageFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationForwardMessageFragment.kt
index 4c9310b18..0b289d372 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationForwardMessageFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationForwardMessageFragment.kt
@@ -32,7 +32,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import org.linphone.R
 import org.linphone.core.tools.Log
 import org.linphone.databinding.ChatMessageForwardFragmentBinding
-import org.linphone.ui.adapter.ConversationsContactsAndSuggestionsListAdapter
+import org.linphone.ui.main.adapter.ConversationsContactsAndSuggestionsListAdapter
 import org.linphone.ui.main.chat.viewmodel.ConversationForwardMessageViewModel
 import org.linphone.ui.main.contacts.model.ContactNumberOrAddressModel
 import org.linphone.ui.main.contacts.model.NumberOrAddressPickerDialogModel
diff --git a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt
index 534d0e843..e22b23c7e 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationsListFragment.kt
@@ -130,6 +130,7 @@ class ConversationsListFragment : AbstractMainFragment() {
                     model.isMuted.value == true,
                     model.isGroup,
                     model.isReadOnly,
+                    (model.unreadMessageCount.value ?: 0) > 0,
                     { // onDismiss
                         adapter.resetSelection()
                     },
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 c3e88f410..36ba4859f 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
@@ -31,7 +31,7 @@ import org.linphone.contacts.getListOfSipAddressesAndPhoneNumbers
 import org.linphone.core.Address
 import org.linphone.core.Friend
 import org.linphone.core.tools.Log
-import org.linphone.ui.adapter.ConversationsContactsAndSuggestionsListAdapter
+import org.linphone.ui.main.adapter.ConversationsContactsAndSuggestionsListAdapter
 import org.linphone.ui.main.contacts.model.ContactNumberOrAddressClickListener
 import org.linphone.ui.main.contacts.model.ContactNumberOrAddressModel
 import org.linphone.ui.main.contacts.model.NumberOrAddressPickerDialogModel
diff --git a/app/src/main/res/layout/chat_long_press_menu.xml b/app/src/main/res/layout/chat_long_press_menu.xml
index 65f117d5c..80ea14df5 100644
--- a/app/src/main/res/layout/chat_long_press_menu.xml
+++ b/app/src/main/res/layout/chat_long_press_menu.xml
@@ -28,6 +28,9 @@
         <variable
             name="isReadOnly"
             type="Boolean" />
+        <variable
+            name="hasUnreadMessages"
+            type="Boolean" />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -41,9 +44,10 @@
             android:id="@+id/mark_as_read"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="1dp"
+            android:visibility="@{hasUnreadMessages ? View.VISIBLE : View.GONE}"
             android:text="@string/conversation_action_mark_as_read"
             android:background="@drawable/menu_item_background"
-            android:layout_marginBottom="1dp"
             android:drawableStart="@drawable/envelope_simple_open"
             app:layout_constraintBottom_toTopOf="@id/mute"
             app:layout_constraintStart_toStartOf="parent"