diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
index 025e03485..b5e1ffe69 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
@@ -824,26 +824,14 @@ public class ChatMessagesFragment extends Fragment
 
     private void displayChatRoomHistory() {
         if (mChatRoom == null) return;
-        ChatMessagesAdapter mEventsAdapter;
-        if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
-            mEventsAdapter =
-                    new ChatMessagesAdapter(
-                            this,
-                            mSelectionHelper,
-                            R.layout.chat_bubble,
-                            mChatRoom.getHistoryMessageEvents(MESSAGES_PER_PAGE),
-                            mParticipants,
-                            this);
-        } else {
-            mEventsAdapter =
-                    new ChatMessagesAdapter(
-                            this,
-                            mSelectionHelper,
-                            R.layout.chat_bubble,
-                            mChatRoom.getHistoryEvents(MESSAGES_PER_PAGE),
-                            mParticipants,
-                            this);
-        }
+        ChatMessagesAdapter mEventsAdapter =
+                new ChatMessagesAdapter(
+                        this,
+                        mSelectionHelper,
+                        R.layout.chat_bubble,
+                        mChatRoom.getHistoryEvents(MESSAGES_PER_PAGE),
+                        mParticipants,
+                        this);
         mSelectionHelper.setAdapter(mEventsAdapter);
         mChatEventsList.setAdapter(mEventsAdapter);
         scrollToBottom();
@@ -1388,6 +1376,7 @@ public class ChatMessagesFragment extends Fragment
     @Override
     public void onEphemeralEvent(ChatRoom chatRoom, EventLog eventLog) {
         ((ChatMessagesGenericAdapter) mChatEventsList.getAdapter()).addToHistory(eventLog);
+        scrollToBottom();
     }
 
     @Override