diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index e811a1874..4fc61f746 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -283,7 +283,11 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 			EventLog eventLog = (EventLog)obj;
 			eventLog.deleteFromDatabase();
 		}
-		mEventsAdapter.refresh(mChatRoom.getHistoryEvents(0));
+		if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
+			mEventsAdapter.refresh(mChatRoom.getHistoryMessageEvents(0));
+		} else {
+			mEventsAdapter.refresh(mChatRoom.getHistoryEvents(0));
+		}
 	}
 
 	/**
@@ -422,7 +426,11 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 
 	private void displayChatRoomHistory() {
 		if (mChatRoom == null) return;
-		mEventsAdapter = new ChatEventsAdapter(this, mSelectionHelper, mInflater, mChatRoom.getHistoryEvents(0), mParticipants);
+		if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt())) {
+			mEventsAdapter = new ChatEventsAdapter(this, mSelectionHelper, mInflater, mChatRoom.getHistoryMessageEvents(0), mParticipants);
+		} else {
+			mEventsAdapter = new ChatEventsAdapter(this, mSelectionHelper, mInflater, mChatRoom.getHistoryEvents(0), mParticipants);
+		}
 		mSelectionHelper.setAdapter(mEventsAdapter);
 		mChatEventsList.setAdapter(mEventsAdapter);
 	}
diff --git a/submodules/linphone b/submodules/linphone
index 66a6499f5..107aa11e1 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 66a6499f56f4d87d03b70ffc5890643542540eac
+Subproject commit 107aa11e139df6b3ab76f18930e75b9129bcbad7