diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index 1314a7565..08d8a2349 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -1803,8 +1803,8 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
 
     public int getUnreadMessageCount() {
         int count = 0;
-        for (Integer unread : mUnreadChatsPerRoom.values()) {
-            count += unread;
+        for (ChatRoom room : mLc.getChatRooms()) {
+            count += room.getUnreadMessagesCount();
         }
         return count;
     }
@@ -1819,14 +1819,6 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
         updateUnreadCountForChatRoom(key, value);
     }
 
-    public int getUnreadCountForChatRoom(ChatRoom cr) {
-        String key = cr.getPeerAddress().asStringUriOnly();
-        if (mUnreadChatsPerRoom.containsKey(key)) {
-            return mUnreadChatsPerRoom.get(key);
-        }
-        return 0;
-    }
-
     private void increaseUnreadCountForChatRoom(ChatRoom cr) {
         String key = cr.getPeerAddress().asStringUriOnly();
         if (mUnreadChatsPerRoom.containsKey(key)) {
diff --git a/src/android/org/linphone/chat/ChatRoomViewHolder.java b/src/android/org/linphone/chat/ChatRoomViewHolder.java
index 1dc4ca8dc..fd021e260 100644
--- a/src/android/org/linphone/chat/ChatRoomViewHolder.java
+++ b/src/android/org/linphone/chat/ChatRoomViewHolder.java
@@ -101,7 +101,7 @@ public class ChatRoomViewHolder extends RecyclerView.ViewHolder implements View.
         }
 
         displayName.setText(getContact(mRoom));
-        unreadMessages.setText(String.valueOf(LinphoneManager.getInstance().getUnreadCountForChatRoom(mRoom)));
+        unreadMessages.setText(String.valueOf(mRoom.getUnreadMessagesCount()));
         getAvatar(mRoom);
     }