diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index 0a8297be1..52a332243 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -751,19 +751,6 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 		}
 	}
 
-	/*@Override
-	public void onAllInformationReceived(ChatRoom cr) {
-		// Currently flexisip doesn't send the participants list in the INVITE
-		// So we have to refresh the display when information is available
-		// In the meantime header will be chatroom-xxxxxxx
-		if (mChatRoom == null) mChatRoom = cr;
-		if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt()) && mChatRoom.getParticipants().length > 0) {
-			mRemoteParticipantAddress = mChatRoom.getParticipants()[0].getAddress();
-		}
-		getContactsForParticipants();
-		displayChatRoomHeader();
-	}*/
-
 	@Override
 	public void onChatMessageReceived(ChatRoom cr, EventLog event) {
 		cr.markAsRead();
@@ -842,6 +829,26 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 
 	}
 
+	@Override
+	public void onConferenceJoined(ChatRoom cr, EventLog event) {
+		// Currently flexisip doesn't send the participants list in the INVITE
+		// So we have to refresh the display when information is available
+		// In the meantime header will be chatroom-xxxxxxx
+		if (mChatRoom == null) mChatRoom = cr;
+		if (mChatRoom.hasCapability(ChatRoomCapabilities.OneToOne.toInt()) && mChatRoom.getParticipants().length > 0) {
+			mRemoteParticipantAddress = mChatRoom.getParticipants()[0].getAddress();
+		}
+		getContactsForParticipants();
+		displayChatRoomHeader();
+
+		mEventsAdapter.addToHistory(event);
+	}
+
+	@Override
+	public void onConferenceLeft(ChatRoom cr, EventLog event) {
+		mEventsAdapter.addToHistory(event);
+	}
+
 	@Override
 	public void onParticipantAdminStatusChanged(ChatRoom cr, EventLog event) {
 		mEventsAdapter.addToHistory(event);
@@ -852,16 +859,6 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 
 	}
 
-	@Override
-	public void onConferenceJoined(ChatRoom cr, EventLog eventLog) {
-
-	}
-
-	@Override
-	public void onConferenceLeft(ChatRoom cr, EventLog eventLog) {
-
-	}
-
 	@Override
 	public void onParticipantRemoved(ChatRoom cr, EventLog event) {
 		getContactsForParticipants();
diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java
index 1b58b4dee..6828c823e 100644
--- a/src/android/org/linphone/chat/GroupInfoFragment.java
+++ b/src/android/org/linphone/chat/GroupInfoFragment.java
@@ -382,6 +382,14 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
 	    mAdminStateChangedDialog.show();
     }
 
+	@Override
+	public void onConferenceJoined(ChatRoom cr, EventLog event_log) {
+	}
+
+	@Override
+	public void onConferenceLeft(ChatRoom cr, EventLog event_log) {
+	}
+
 	@Override
 	public void onParticipantAdded(ChatRoom cr, EventLog event_log) {
 		refreshParticipantsList();
@@ -448,16 +456,6 @@ public class GroupInfoFragment extends Fragment implements ChatRoomListener {
 
 	}
 
-	@Override
-	public void onConferenceJoined(ChatRoom cr, EventLog eventLog) {
-
-	}
-
-	@Override
-	public void onConferenceLeft(ChatRoom cr, EventLog eventLog) {
-
-	}
-
 	@Override
 	public void onParticipantDeviceAdded(ChatRoom cr, EventLog event_log) {