diff --git a/src/android/org/linphone/activities/LinphoneActivity.java b/src/android/org/linphone/activities/LinphoneActivity.java
index 461bc9916..0f84d569b 100644
--- a/src/android/org/linphone/activities/LinphoneActivity.java
+++ b/src/android/org/linphone/activities/LinphoneActivity.java
@@ -734,7 +734,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 		changeCurrentFragment(FragmentsAvailable.GROUP_CHAT, extras);
 	}
 
-	public void displayChatGroupInfos(ArrayList<ContactAddress> contacts, String subject, boolean isAlreadyCreatedGroup, boolean isEditionEnabled) {
+	public void goToChatGroupInfos(ArrayList<ContactAddress> contacts, String subject, boolean isAlreadyCreatedGroup, boolean isEditionEnabled) {
 		Bundle extras = new Bundle();
 		extras.putBoolean("isAlreadyCreatedGroup", isAlreadyCreatedGroup);
 		extras.putBoolean("isEditionEnabled", isEditionEnabled);
@@ -743,6 +743,10 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
 		changeCurrentFragment(FragmentsAvailable.INFO_GROUP_CHAT, extras);
 	}
 
+	public void goToChatList() {
+		changeCurrentFragment(FragmentsAvailable.CHAT_LIST, null);
+	}
+
 	public void displayChat(String sipUri, String message, String fileUri) {
 		if (getResources().getBoolean(R.bool.disable_chat)) {
 			return;
diff --git a/src/android/org/linphone/chat/ChatCreationFragment.java b/src/android/org/linphone/chat/ChatCreationFragment.java
index b77afe403..f91612eb4 100644
--- a/src/android/org/linphone/chat/ChatCreationFragment.java
+++ b/src/android/org/linphone/chat/ChatCreationFragment.java
@@ -280,7 +280,7 @@ public class ChatCreationFragment extends Fragment implements View.OnClickListen
 				LinphoneActivity.instance().displayChat(contactsSelected.get(0).getAddress(), "", "");
 			} else {
 				contactsSelectedLayout.removeAllViews();
-				LinphoneActivity.instance().displayChatGroupInfos(contactsSelected, null, false, true);
+				LinphoneActivity.instance().goToChatGroupInfos(contactsSelected, null, false, true);
 			}
 		} else if (id == R.id.clearSearchField) {
 			searchField.setText("");
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index fc19c9f56..596d860c7 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -58,7 +58,6 @@ import org.linphone.contacts.ContactsManager;
 import org.linphone.contacts.LinphoneContact;
 import org.linphone.core.Address;
 import org.linphone.core.Buffer;
-import org.linphone.core.Call;
 import org.linphone.core.ChatMessage;
 import org.linphone.core.ChatMessageListener;
 import org.linphone.core.ChatRoom;
@@ -69,7 +68,6 @@ import org.linphone.core.EventLog;
 import org.linphone.core.Friend;
 import org.linphone.core.FriendList;
 import org.linphone.core.Participant;
-import org.linphone.mediastream.Log;
 import org.linphone.receivers.ContactsUpdatedListener;
 
 import java.io.File;
@@ -116,7 +114,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 		mBackButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View view) {
-				LinphoneActivity.instance().popBackStack();
+				LinphoneActivity.instance().goToChatList();
 			}
 		});
 
@@ -157,7 +155,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 					ContactAddress ca = new ContactAddress(c, a.asString(), c.isFriend());
 					participants.add(ca);
 				}
-				LinphoneActivity.instance().displayChatGroupInfos(participants, mChatRoom.getSubject(), true, /*TODO*/ false);
+				LinphoneActivity.instance().goToChatGroupInfos(participants, mChatRoom.getSubject(), true, /*TODO*/ false);
 			}
 		});
 
@@ -714,25 +712,21 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 	@Override
 	public void onParticipantAdminStatusChanged(ChatRoom cr, EventLog event) {
 		mMessagesAdapter.addToHistory(event);
-
 	}
 
 	@Override
 	public void onParticipantDeviceRemoved(ChatRoom cr, EventLog event) {
 		mMessagesAdapter.addToHistory(event);
-
 	}
 
 	@Override
 	public void onParticipantRemoved(ChatRoom cr, EventLog event) {
 		mMessagesAdapter.addToHistory(event);
-
 	}
 
 	@Override
 	public void onParticipantDeviceAdded(ChatRoom cr, EventLog event) {
 		mMessagesAdapter.addToHistory(event);
-
 	}
 
 	@Override
@@ -743,13 +737,12 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 	@Override
 	public void onParticipantAdded(ChatRoom cr, EventLog event) {
 		mMessagesAdapter.addToHistory(event);
-
 	}
 
 	@Override
 	public void onSubjectChanged(ChatRoom cr, EventLog event) {
 		mMessagesAdapter.addToHistory(event);
-
+		mRoomLabel.setText(event.getSubject());
 	}
 
 	@Override