diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index 64d9a29a5..f76e0e173 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -56,15 +56,17 @@
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:ellipsize="end"
+					android:textSize="11.7sp"
 					android:maxLines="1"
 					android:textColor="@color/colorC"/>
 
 				<TextView
 					android:id="@+id/remote_composing"
-					style="@style/font11"
-					android:layout_width="match_parent"
+					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_above="@id/footer"
+					android:textSize="11.7sp"
+					android:maxLines="1"
 					android:text="@string/remote_composing"/>
 
 			</LinearLayout>
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index 79984b25c..7e7b5d9a4 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -850,8 +850,10 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 		}
 
 		mRemoteComposing.setVisibility(View.VISIBLE);
+		mParticipantsLabel.setVisibility(View.GONE);
 		if (composing.size() == 0) {
-			mRemoteComposing.setVisibility(View.INVISIBLE);
+			mRemoteComposing.setVisibility(View.GONE);
+			mParticipantsLabel.setVisibility(View.VISIBLE);
 		} else if (composing.size() == 1) {
 			mRemoteComposing.setText(getString(R.string.remote_composing_single).replace("%s", composing.get(0)));
 		} else {