diff --git a/src/android/org/linphone/chat/ChatListFragment.java b/src/android/org/linphone/chat/ChatListFragment.java
index 5ac846dad..c99b3b863 100644
--- a/src/android/org/linphone/chat/ChatListFragment.java
+++ b/src/android/org/linphone/chat/ChatListFragment.java
@@ -438,7 +438,7 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
 
 			holder.displayName.setSelected(true); // For animation
 
-			if (chatRoom.canHandleParticipants()) {
+			if (chatRoom.getNbParticipants() > 1) {
 				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 9efd463ba..3d5c92c66 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -239,7 +239,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 
 	private void getContactsForParticipants() {
 		mParticipants = new ArrayList<>();
-		if (mChatRoom.canHandleParticipants()) {
+		if (mChatRoom.getNbParticipants() > 1) {
 			int index = 0;
 			StringBuilder participantsLabel = new StringBuilder();
 			for (Participant p : mChatRoom.getParticipants()) {
@@ -287,16 +287,15 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 
 		mRemoteComposing.setVisibility(View.INVISIBLE);
 
-		if (core.getCallByRemoteAddress(mRemoteSipUri) != null) {
+		if (core.getCallsNb() > 0) {
 			mBackToCallButton.setVisibility(View.VISIBLE);
 		} else {
 			mBackToCallButton.setVisibility(View.GONE);
-			if (mChatRoom.canHandleParticipants()) {
+			if (mChatRoom.getNbParticipants() > 1) {
 				mCallButton.setVisibility(View.GONE);
 				mGroupInfosButton.setVisibility(View.VISIBLE);
 				mRoomLabel.setText(mChatRoom.getSubject());
 				mParticipantsLabel.setVisibility(View.VISIBLE);
-
 			} else {
 				mCallButton.setVisibility(View.VISIBLE);
 				mGroupInfosButton.setVisibility(View.GONE);
@@ -428,7 +427,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 
 	@Override
 	public void onIsComposingReceived(ChatRoom cr, Address remoteAddr, boolean isComposing) {
-		if (cr.canHandleParticipants() && cr.getNbParticipants() > 2) {
+		if (cr.getNbParticipants() > 1) {
 			ArrayList<String> composing = new ArrayList<>();
 			for (Address a : cr.getComposingAddresses()) {
 				boolean found = false;