diff --git a/Classes/ChatConversationTableView.m b/Classes/ChatConversationTableView.m
index 2ed350c75..f692d0e46 100644
--- a/Classes/ChatConversationTableView.m
+++ b/Classes/ChatConversationTableView.m
@@ -49,7 +49,10 @@
 	if (!_chatRoom)
 		return;
 	[self clearEventList];
-	eventList = linphone_chat_room_get_history_events(_chatRoom, 0);
+	LinphoneChatRoomCapabilitiesMask capabilities = linphone_chat_room_get_capabilities(_chatRoom);
+	eventList = (capabilities & LinphoneChatRoomCapabilitiesOneToOne)
+		? linphone_chat_room_get_history_message_events(_chatRoom, 0)
+		: linphone_chat_room_get_history_events(_chatRoom, 0);
 
 	for (FileTransferDelegate *ftd in [LinphoneManager.instance fileTransferDelegates]) {
 		const LinphoneAddress *ftd_peer =
diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index 4a6458120..abbb7a2de 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -133,7 +133,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 	[self callUpdateEvent:nil];
 	PhoneMainView.instance.currentRoom = _chatRoom;
 	LinphoneChatRoomCapabilitiesMask capabilities = linphone_chat_room_get_capabilities(_chatRoom);
-	if ((capabilities & LinphoneChatRoomCapabilitiesBasic) || (capabilities & LinphoneChatRoomCapabilitiesOneToOne)) {
+	if (capabilities & LinphoneChatRoomCapabilitiesOneToOne) {
 		bctbx_list_t *participants = linphone_chat_room_get_participants(_chatRoom);
 		LinphoneParticipant *firstParticipant = participants ? (LinphoneParticipant *)participants->data : NULL;
 		const LinphoneAddress *addr = firstParticipant ? linphone_participant_get_address(firstParticipant) : linphone_chat_room_get_peer_address(_chatRoom);
@@ -378,8 +378,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 - (void)updateSuperposedButtons {
 	[_backToCallButton update];
 	LinphoneChatRoomCapabilitiesMask capabilities = linphone_chat_room_get_capabilities(_chatRoom);
-	_infoButton.hidden = ((capabilities & LinphoneChatRoomCapabilitiesBasic)
-						|| (capabilities & LinphoneChatRoomCapabilitiesOneToOne)
+	_infoButton.hidden = ((capabilities & LinphoneChatRoomCapabilitiesOneToOne)
 						|| !_backToCallButton.hidden
 						|| _tableController.tableView.isEditing);
 	_callButton.hidden = !_backToCallButton.hidden || !_infoButton.hidden || _tableController.tableView.isEditing;
@@ -387,7 +386,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 
 - (void)updateParticipantLabel {
 	LinphoneChatRoomCapabilitiesMask capabilities = linphone_chat_room_get_capabilities(_chatRoom);
-	if ((capabilities & LinphoneChatRoomCapabilitiesBasic) || (capabilities & LinphoneChatRoomCapabilitiesOneToOne)) {
+	if (capabilities & LinphoneChatRoomCapabilitiesOneToOne) {
 		_particpantsLabel.hidden = TRUE;
 	} else {
 		_particpantsLabel.hidden = FALSE;
diff --git a/Classes/LinphoneUI/UIChatCell.m b/Classes/LinphoneUI/UIChatCell.m
index eea1cb148..bde4e234b 100644
--- a/Classes/LinphoneUI/UIChatCell.m
+++ b/Classes/LinphoneUI/UIChatCell.m
@@ -65,7 +65,7 @@
 	}
 
 	LinphoneChatRoomCapabilitiesMask capabilities = linphone_chat_room_get_capabilities(chatRoom);
-	if ((capabilities & LinphoneChatRoomCapabilitiesBasic) || (capabilities & LinphoneChatRoomCapabilitiesOneToOne)) {
+	if (capabilities & LinphoneChatRoomCapabilitiesOneToOne) {
 		bctbx_list_t *participants = linphone_chat_room_get_participants(chatRoom);
 		LinphoneParticipant *firstParticipant = participants ? (LinphoneParticipant *)participants->data : NULL;
 		const LinphoneAddress *addr = firstParticipant ? linphone_participant_get_address(firstParticipant) : linphone_chat_room_get_peer_address(chatRoom);