diff --git a/app/src/main/java/org/linphone/LinphoneManager.java b/app/src/main/java/org/linphone/LinphoneManager.java
index a62ac70f1..620f2805e 100644
--- a/app/src/main/java/org/linphone/LinphoneManager.java
+++ b/app/src/main/java/org/linphone/LinphoneManager.java
@@ -490,11 +490,8 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
             }
         }
         String[] devices = getLc().getVideoDevicesList();
-        if (devices.length != cameras.length) {
-            Log.w("Be careful, there are more cameras available than 2 !");
-        }
         if (camId >= devices.length) {
-            Log.e("Trying to use a camera that's not in the first two, will crash so use 0 one !");
+            Log.e("Trying to use a camera id that's higher than the linphone's devices list, using 0 to prevent crash...");
             camId = 0;
         }
         String newDevice = devices[camId];
diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
index 2b9c5b3a2..fbbc09429 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
@@ -1113,18 +1113,21 @@ public class ChatMessagesFragment extends Fragment implements ChatRoomListener,
         getContactsForParticipants();
         displayChatRoomHeader();
 
+        if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) return;
         ((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event);
         scrollToBottom();
     }
 
     @Override
     public void onConferenceLeft(ChatRoom cr, EventLog event) {
+        if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) return;
         ((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event);
         scrollToBottom();
     }
 
     @Override
     public void onParticipantAdminStatusChanged(ChatRoom cr, EventLog event) {
+        if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) return;
         ((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event);
         scrollToBottom();
     }
@@ -1136,6 +1139,7 @@ public class ChatMessagesFragment extends Fragment implements ChatRoomListener,
 
     @Override
     public void onParticipantRemoved(ChatRoom cr, EventLog event) {
+        if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) return;
         getContactsForParticipants();
         ((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event);
         scrollToBottom();
@@ -1172,6 +1176,7 @@ public class ChatMessagesFragment extends Fragment implements ChatRoomListener,
 
     @Override
     public void onParticipantAdded(ChatRoom cr, EventLog event) {
+        if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) return;
         getContactsForParticipants();
         ((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event);
         scrollToBottom();
@@ -1179,6 +1184,7 @@ public class ChatMessagesFragment extends Fragment implements ChatRoomListener,
 
     @Override
     public void onSubjectChanged(ChatRoom cr, EventLog event) {
+        if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) return;
         mRoomLabel.setText(event.getSubject());
         ((ChatMessagesGenericAdapter)mChatEventsList.getAdapter()).addToHistory(event);
         scrollToBottom();