Update item_chat layout file.

app/src/main/res/layout/item_chat.xml

@@ -4,20 +4,34 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="16dp"
+    android:layout_marginBottom="12dp"
     android:layout_marginEnd="@dimen/screen_edge_left_and_right_margins"
     android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
-    android:layout_marginTop="16dp">
+    android:layout_marginTop="12dp">
 
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@+id/image_user_avatar"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+    <android.support.constraint.ConstraintLayout
+        android:id="@+id/avatar_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toLeftOf="@+id/middle_container"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundAsCircle="true" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.facebook.drawee.view.SimpleDraweeView
+            android:id="@+id/image_user_avatar"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:visibility="gone"
+            app:roundAsCircle="true" />
+
+        <ImageView
+            android:id="@+id/image_room_avatar"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:visibility="gone"
+            tools:ignore="contentDescription" />
+    </android.support.constraint.ConstraintLayout>
 
     <android.support.constraint.ConstraintLayout
         android:id="@+id/middle_container"
@@ -25,7 +39,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
-        app:layout_constraintLeft_toRightOf="@+id/image_user_avatar"
+        app:layout_constraintLeft_toRightOf="@+id/avatar_container"
         app:layout_constraintRight_toLeftOf="@+id/right_container">
 
         <TextView
@@ -36,17 +50,16 @@
             android:drawablePadding="5dp"
             android:ellipsize="end"
             android:maxLines="1"
-            tools:text="Ronald Perkins" />
+            tools:text="General" />
 
         <TextView
             android:id="@+id/text_last_message"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
             android:ellipsize="end"
-            android:maxLines="1"
+            android:maxLines="2"
             app:layout_constraintTop_toBottomOf="@+id/text_chat_name"
-            tools:text="Type something" />
+            tools:text="You: Type something" />
     </android.support.constraint.ConstraintLayout>
 
     <android.support.constraint.ConstraintLayout