diff --git a/res/layout/chat_infos.xml b/res/layout/chat_infos.xml
index 540ae9613..935318e48 100644
--- a/res/layout/chat_infos.xml
+++ b/res/layout/chat_infos.xml
@@ -1,131 +1,156 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:background="@color/colorH" >
+    android:layout_height="match_parent">
 
     <LinearLayout
-        android:id="@+id/top_bar"
-        android:orientation="horizontal"
-        android:background="@color/colorF"
-        android:layout_width="match_parent"
-        android:layout_height="60dp">
-
-        <ImageView
-            android:id="@+id/back"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_gravity="left"
-            android:layout_weight="0.2"
-            android:background="@drawable/toolbar_button"
-            android:contentDescription="@string/content_description_back"
-            android:padding="18dp"
-            android:src="@drawable/back"/>
-
-        <TextView
-            android:text="@string/chat_room_infos_title"
-            style="@style/font6"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.4"
-            android:gravity="center"/>
-
-        <ImageView
-            android:id="@+id/confirm"
-            android:src="@drawable/chat_room_creation_confirm"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="0.2"
-            android:background="@drawable/toolbar_button"
-            android:contentDescription="@string/content_description_valid"
-            android:padding="18dp"
-            android:layout_gravity="right"/>
-
-    </LinearLayout>
-
-    <RelativeLayout
-        android:id="@+id/layoutSubjectField"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="10dp">
-
-        <EditText
-            android:id="@+id/subjectField"
-            android:layout_width="match_parent"
-            android:layout_height="40dp"
-            android:background="@drawable/resizable_textfield"
-            android:contentDescription="@string/content_description_conversation_subject"
-            android:hint="@string/conversation_subject_hint"
-            android:gravity="center"
-            android:inputType="textEmailSubject"
-            android:paddingRight="5dp"
-            android:textColor="@android:color/black"
-            android:textCursorDrawable="@null"/>
-
-    </RelativeLayout>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/colorG"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textStyle="bold"
-            android:textSize="15sp"
-            android:textColor="@color/colorB"
-            android:text="@string/chat_room_participants" />
-
-        <ImageView
-            android:id="@+id/addParticipants"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:paddingRight="10dp"
-            android:src="@drawable/chat_group_add"/>
-
-    </RelativeLayout>
-
-    <ListView
-        android:id="@+id/chat_room_participants"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:divider="@color/colorE"
-        android:dividerHeight="1dp">
+        android:orientation="vertical"
+        android:background="@color/colorH" >
 
-    </ListView>
+        <LinearLayout
+            android:id="@+id/top_bar"
+            android:orientation="horizontal"
+            android:background="@color/colorF"
+            android:layout_width="match_parent"
+            android:layout_height="60dp">
 
-    <LinearLayout
-        android:id="@+id/leaveGroupLayout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="10dp"
-        android:paddingLeft="20dp"
-        android:paddingRight="20dp"
-        android:background="@color/colorA">
+            <ImageView
+                android:id="@+id/back"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_gravity="left"
+                android:layout_weight="0.2"
+                android:background="@drawable/toolbar_button"
+                android:contentDescription="@string/content_description_back"
+                android:padding="18dp"
+                android:src="@drawable/back"/>
 
-        <TextView
+            <TextView
+                android:text="@string/chat_room_infos_title"
+                style="@style/font6"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.4"
+                android:gravity="center"/>
+
+            <ImageView
+                android:id="@+id/confirm"
+                android:src="@drawable/chat_room_creation_confirm"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0.2"
+                android:background="@drawable/toolbar_button"
+                android:contentDescription="@string/content_description_valid"
+                android:padding="18dp"
+                android:layout_gravity="right"/>
+
+        </LinearLayout>
+
+        <RelativeLayout
+            android:id="@+id/layoutSubjectField"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="10dp">
+
+            <EditText
+                android:id="@+id/subjectField"
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:background="@drawable/resizable_textfield"
+                android:contentDescription="@string/content_description_conversation_subject"
+                android:hint="@string/conversation_subject_hint"
+                android:gravity="center"
+                android:inputType="textEmailSubject"
+                android:paddingRight="5dp"
+                android:textColor="@android:color/black"
+                android:textCursorDrawable="@null"/>
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@color/colorG"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:textStyle="bold"
+                android:textSize="15sp"
+                android:textColor="@color/colorB"
+                android:text="@string/chat_room_participants" />
+
+            <ImageView
+                android:id="@+id/addParticipants"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_centerVertical="true"
+                android:paddingRight="10dp"
+                android:src="@drawable/chat_group_add"/>
+
+        </RelativeLayout>
+
+        <ListView
+            android:id="@+id/chat_room_participants"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:divider="@color/colorE"
+            android:dividerHeight="1dp">
+
+        </ListView>
+
+        <LinearLayout
+            android:id="@+id/leaveGroupLayout"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textSize="15sp"
-            android:textAllCaps="true"
-            android:textColor="@color/colorG"
-            android:text="@string/chat_room_leave_group"/>
+            android:layout_gravity="center"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:paddingLeft="20dp"
+            android:paddingRight="20dp"
+            android:background="@color/colorA">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:textSize="15sp"
+                android:textAllCaps="true"
+                android:textColor="@color/colorG"
+                android:text="@string/chat_room_leave_group"/>
+
+        </LinearLayout>
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+    <RelativeLayout
+        android:id="@+id/waitScreen"
+        android:clickable="true"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#99c4c4c4">
+
+        <ProgressBar
+            android:indeterminate="true"
+            android:indeterminateTint="@color/colorA"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true">
+
+        </ProgressBar>
+
+    </RelativeLayout>
+
+</RelativeLayout>
+
diff --git a/res/layout/progress_dialog.xml b/res/layout/progress_dialog.xml
index cde6ce898..cc07c1565 100644
--- a/res/layout/progress_dialog.xml
+++ b/res/layout/progress_dialog.xml
@@ -8,6 +8,7 @@
 	<ProgressBar
 		android:layout_height="wrap_content"
 		android:layout_width="wrap_content"
+        android:indeterminateTint="@color/colorA"
 		android:layout_marginBottom="20dp"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/android/org/linphone/chat/ChatListFragment.java b/src/android/org/linphone/chat/ChatListFragment.java
index a5d8a4267..59679b2a5 100644
--- a/src/android/org/linphone/chat/ChatListFragment.java
+++ b/src/android/org/linphone/chat/ChatListFragment.java
@@ -449,7 +449,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 
 			holder.displayName.setSelected(true); // For animation
 
-			if (chatRoom.getNbParticipants() > 1) {
+			if (chatRoom.canHandleParticipants()) {
 				holder.displayName.setText(chatRoom.getSubject());
 				holder.contactPicture.setImageResource(R.drawable.chat_group_avatar);
 			} else {
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index 2b5cb8225..9e538810e 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -68,6 +68,7 @@ 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;
@@ -373,7 +374,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 
 	private void getContactsForParticipants() {
 		mParticipants = new ArrayList<>();
-		if (mChatRoom.getNbParticipants() > 1) {
+		if (mChatRoom.canHandleParticipants()) {
 			int index = 0;
 			StringBuilder participantsLabel = new StringBuilder();
 			for (Participant p : mChatRoom.getParticipants()) {
@@ -429,7 +430,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 			mBackToCallButton.setVisibility(View.VISIBLE);
 		} else {
 			mBackToCallButton.setVisibility(View.GONE);
-			if (mChatRoom.getNbParticipants() > 1) {
+			if (mChatRoom.canHandleParticipants()) {
 				mCallButton.setVisibility(View.GONE);
 				mGroupInfosButton.setVisibility(View.VISIBLE);
 				mRoomLabel.setText(mChatRoom.getSubject());
@@ -637,7 +638,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 
 	@Override
 	public void onIsComposingReceived(ChatRoom cr, Address remoteAddr, boolean isComposing) {
-		if (cr.getNbParticipants() > 1) {
+		if (cr.canHandleParticipants()) {
 			ArrayList<String> composing = new ArrayList<>();
 			for (Address a : cr.getComposingAddresses()) {
 				boolean found = false;
diff --git a/src/android/org/linphone/chat/GroupInfoFragment.java b/src/android/org/linphone/chat/GroupInfoFragment.java
index 6f6dda09b..cfa3e15ad 100644
--- a/src/android/org/linphone/chat/GroupInfoFragment.java
+++ b/src/android/org/linphone/chat/GroupInfoFragment.java
@@ -30,6 +30,7 @@ import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
+import android.widget.RelativeLayout;
 
 import org.linphone.LinphoneManager;
 import org.linphone.R;
@@ -48,6 +49,7 @@ public class GroupInfoFragment extends Fragment {
 	private LayoutInflater mInflater;
 	private ListView mParticipantsList;
 	private LinearLayout mLeaveGroupButton;
+	private RelativeLayout mWaitLayout;
 	private GroupInfoAdapter mAdapter;
 	private boolean mIsAlreadyCreatedGroup;
 	private boolean mIsEditionEnabled;
@@ -130,10 +132,12 @@ public class GroupInfoFragment extends Fragment {
 			@Override
 			public void onClick(View view) {
 				if (!mIsAlreadyCreatedGroup) {
+					mWaitLayout.setVisibility(View.VISIBLE);
 					ChatRoom chatRoom = LinphoneManager.getLc().createClientGroupChatRoom(mSubjectField.getText().toString());
 					chatRoom.setListener(new ChatRoomListenerStub() {
 						@Override
 						public void onStateChanged(ChatRoom cr, ChatRoom.State newState) {
+							mWaitLayout.setVisibility(View.GONE);
 							if (newState == ChatRoom.State.Created) {
 								LinphoneActivity.instance().goToChat(cr.getConferenceAddress().asStringUriOnly());
 							} else if (newState == ChatRoom.State.CreationFailed) {
@@ -163,6 +167,9 @@ public class GroupInfoFragment extends Fragment {
 			mAddParticipantsButton.setVisibility(View.GONE);
 		}
 
+		mWaitLayout = view.findViewById(R.id.waitScreen);
+		mWaitLayout.setVisibility(View.GONE);
+
 		return view;
 	}
 }