diff --git a/res/layout/chat.xml b/res/layout/chat.xml
index 092e640fb..9c2103ee9 100644
--- a/res/layout/chat.xml
+++ b/res/layout/chat.xml
@@ -155,7 +155,7 @@
 				android:inputType="textShortMessage|textMultiLine|textAutoComplete|textAutoCorrect|textCapSentences"
 				android:maxLines="6"
 				android:padding="5dp"
-				android:textColor="@color/colorH"
+				android:textColor="@color/colorB"
 				android:textCursorDrawable="@null"/>
 
 			<ImageView
diff --git a/res/layout/chat_bubble.xml b/res/layout/chat_bubble.xml
index 560534ef2..79440b77c 100644
--- a/res/layout/chat_bubble.xml
+++ b/res/layout/chat_bubble.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-				android:layout_width="wrap_content"
+				android:layout_width="match_parent"
 				android:layout_height="wrap_content">
 
 	<CheckBox
@@ -61,127 +61,129 @@
 		android:layout_height="wrap_content"
 		android:layout_toLeftOf="@id/delete_message">
 
-		<LinearLayout
-			android:id="@+id/background"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal">
+        <LinearLayout
+            android:id="@+id/background"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
-			<RelativeLayout
-				android:id="@+id/avatar_layout"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:visibility="gone">
+            <RelativeLayout
+                android:id="@+id/avatar_layout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone">
 
-				<ImageView
-					android:id="@+id/contact_picture"
-					android:layout_width="45dp"
-					android:layout_height="45dp"
-					android:adjustViewBounds="true"
-					android:contentDescription="@string/content_description_contact_picture"
-					android:paddingLeft="10dp"
-					android:paddingTop="10dp"
-					android:src="@drawable/avatar"/>
+                <ImageView
+                    android:id="@+id/contact_picture"
+                    android:layout_width="45dp"
+                    android:layout_height="45dp"
+                    android:adjustViewBounds="true"
+                    android:contentDescription="@string/content_description_contact_picture"
+                    android:paddingLeft="10dp"
+                    android:paddingTop="10dp"
+                    android:src="@drawable/avatar"/>
 
-				<ImageView
-					android:id="@+id/mask"
-					android:layout_width="45dp"
-					android:layout_height="45dp"
-					android:adjustViewBounds="true"
-					android:paddingLeft="10dp"
-					android:paddingTop="10dp"
-					android:src="@drawable/avatar_chat_mask"
-					android:visibility="gone"/>
+                <ImageView
+                    android:id="@+id/mask"
+                    android:layout_width="45dp"
+                    android:layout_height="45dp"
+                    android:adjustViewBounds="true"
+                    android:paddingLeft="10dp"
+                    android:paddingTop="10dp"
+                    android:src="@drawable/avatar_chat_mask"
+                    android:visibility="gone"/>
 
-			</RelativeLayout>
+            </RelativeLayout>
 
-			<LinearLayout
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="vertical"
-				android:paddingLeft="10dp"
-				android:paddingRight="10dp"
-				android:paddingTop="10dp">
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:paddingTop="10dp">
 
-				<TextView
-					android:id="@+id/contact_header"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:maxLines="1"
-					android:textColor="#595959"
-					android:textSize="13.3sp"
-					android:textStyle="bold"/>
+                <TextView
+                    android:id="@+id/contact_header"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:maxLines="1"
+                    android:textColor="#595959"
+                    android:textSize="13.3sp"
+                    android:textStyle="bold"/>
 
-				<RelativeLayout
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content">
+                <RelativeLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content">
 
-					<TextView
-						android:id="@+id/file_name"
-						style="@style/font26"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"/>
+                    <TextView
+                        android:id="@+id/file_name"
+                        style="@style/font26"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"/>
 
-					<ImageView
-						android:id="@+id/image"
-						android:layout_width="150dp"
-						android:layout_height="150dp"
-						android:layout_below="@id/file_name"
-						android:layout_centerHorizontal="true"
-						android:scaleType="centerInside"/>
+                    <ImageView
+                        android:id="@+id/image"
+                        android:layout_width="150dp"
+                        android:layout_height="150dp"
+                        android:layout_below="@id/file_name"
+                        android:layout_centerHorizontal="true"
+                        android:scaleType="centerInside"/>
 
-					<Button
-						android:id="@+id/open_file"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_below="@id/file_name"
-						android:layout_centerVertical="true"
-						android:background="@drawable/resizable_assistant_button"
-						android:text="@string/open"
-						android:textAppearance="@style/font8"
-						android:visibility="gone"/>
+                    <Button
+                        android:id="@+id/open_file"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/file_name"
+                        android:layout_centerVertical="true"
+                        android:background="@drawable/resizable_assistant_button"
+                        android:text="@string/open"
+                        android:textAppearance="@style/font8"
+                        android:visibility="gone"/>
 
-				</RelativeLayout>
+                </RelativeLayout>
 
-				<TextView
-					android:id="@+id/message"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:autoLink="web"
-					android:linksClickable="true"
-					android:textColor="#595959"
-					android:textSize="13.3sp"/>
+                <TextView
+                    android:id="@+id/message"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:autoLink="web"
+                    android:linksClickable="true"
+                    android:textColor="#595959"
+                    android:textSize="13.3sp"/>
 
-				<RelativeLayout
-					android:id="@+id/file_transfer_layout"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:visibility="gone">
+                <RelativeLayout
+                    android:id="@+id/file_transfer_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone">
 
-					<ProgressBar
-						android:id="@+id/progress_bar"
-						style="@android:style/Widget.ProgressBar.Horizontal"
-						android:layout_width="150dp"
-						android:layout_height="5dp"
-						android:layout_marginBottom="10dp"
-						android:layout_marginTop="10dp"
-						android:paddingRight="5dp"/>
+                    <ProgressBar
+                        android:id="@+id/progress_bar"
+                        style="@android:style/Widget.ProgressBar.Horizontal"
+                        android:layout_width="150dp"
+                        android:layout_height="5dp"
+                        android:layout_marginBottom="10dp"
+                        android:layout_marginTop="10dp"
+                        android:paddingRight="5dp"/>
 
-					<Button
-						android:id="@+id/file_transfer_action"
-						android:layout_width="wrap_content"
-						android:layout_height="wrap_content"
-						android:layout_below="@id/progress_bar"
-						android:background="@drawable/resizable_assistant_button"
-						android:textAppearance="@style/font8"/>
+                    <Button
+                        android:id="@+id/file_transfer_action"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/progress_bar"
+                        android:background="@drawable/resizable_assistant_button"
+                        android:textAppearance="@style/font8"/>
 
-				</RelativeLayout>
+                </RelativeLayout>
 
 				<LinearLayout
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
 					android:layout_alignParentRight="true"
-					android:layout_gravity="right">
+					android:layout_gravity="right"
+					android:layout_marginBottom="2dp"
+					android:layout_marginTop="2dp">
 
 					<TextView
 						android:id="@+id/message_date"
@@ -200,8 +202,6 @@
 						android:layout_width="wrap_content"
 						android:layout_height="wrap_content"
 						android:layout_gravity="right"
-						android:layout_marginBottom="2dp"
-						android:layout_marginTop="2dp"
 						android:gravity="right"
 						android:orientation="horizontal"
 						android:paddingLeft="5dp"
@@ -226,9 +226,9 @@
 					</LinearLayout>
 				</LinearLayout>
 
-			</LinearLayout>
+            </LinearLayout>
 
-		</LinearLayout>
+        </LinearLayout>
 
 		<RelativeLayout
 			android:layout_width="15dp"
diff --git a/src/android/org/linphone/chat/GroupChatFragment.java b/src/android/org/linphone/chat/GroupChatFragment.java
index 046d09e5d..62c598eaf 100644
--- a/src/android/org/linphone/chat/GroupChatFragment.java
+++ b/src/android/org/linphone/chat/GroupChatFragment.java
@@ -826,7 +826,7 @@ public class GroupChatFragment extends Fragment implements ChatRoomListener, Con
 
 		mRemoteComposing.setVisibility(View.VISIBLE);
 		if (composing.size() == 0) {
-			mRemoteComposing.setVisibility(View.GONE);
+			mRemoteComposing.setVisibility(View.INVISIBLE);
 		} else if (composing.size() == 1) {
 			mRemoteComposing.setText(getString(R.string.remote_composing_single).replace("%s", composing.get(0)));
 		} else {