diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index da03d886..5dd499e4 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/im/vector/riotredesign/core/extensions/CharSequence.kt b/app/src/main/java/im/vector/riotredesign/core/extensions/CharSequence.kt
index f2e6f70b..cd173679 100644
--- a/app/src/main/java/im/vector/riotredesign/core/extensions/CharSequence.kt
+++ b/app/src/main/java/im/vector/riotredesign/core/extensions/CharSequence.kt
@@ -2,5 +2,5 @@ package im.vector.riotredesign.core.extensions
 
 
 fun CharSequence.firstCharAsString(): String {
-    return this[0].toString()
+    return if (isNotEmpty()) this[0].toString() else ""
 }
\ No newline at end of file
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt
new file mode 100644
index 00000000..dd9b6716
--- /dev/null
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt
@@ -0,0 +1,16 @@
+package im.vector.riotredesign.features.home.room.list
+
+import android.support.annotation.DrawableRes
+import im.vector.riotredesign.R
+import im.vector.riotredesign.core.epoxy.KotlinModel
+
+data class RoomCategoryItem(
+        val title: CharSequence,
+        @DrawableRes val expandDrawable: Int,
+        val listener: (() -> Unit)? = null
+) : KotlinModel(R.layout.item_room_category) {
+
+    override fun bind() {
+
+    }
+}
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt
index c601157f..b30191eb 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt
@@ -3,6 +3,7 @@ package im.vector.riotredesign.features.home.room.list
 import android.content.Context
 import com.airbnb.epoxy.Typed2EpoxyController
 import im.vector.matrix.android.api.session.room.model.RoomSummary
+import im.vector.riotredesign.R
 import im.vector.riotredesign.features.home.RoomSummaryViewHelper
 
 class RoomSummaryController(private val context: Context,
@@ -10,6 +11,13 @@ class RoomSummaryController(private val context: Context,
 ) : Typed2EpoxyController<List<RoomSummary>, RoomSummary>() {
 
     override fun buildModels(summaries: List<RoomSummary>?, selected: RoomSummary?) {
+        RoomCategoryItem(
+                title = "DIRECT MESSAGES",
+                expandDrawable = R.drawable.ic_expand_more_white
+        )
+                .id("direct_messages")
+                .addTo(this)
+
         summaries?.forEach {
             val roomSummaryViewHelper = RoomSummaryViewHelper(it)
             RoomSummaryItem(
@@ -27,4 +35,4 @@ class RoomSummaryController(private val context: Context,
         fun onRoomSelected(room: RoomSummary)
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt
index e1b7db47..c4b10606 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt
@@ -16,7 +16,7 @@ data class RoomSummaryItem(
 ) : KotlinModel(R.layout.item_room) {
 
     private val titleView by bind<TextView>(R.id.titleView)
-    private val avatarImageView by bind<ImageView>(R.id.toolbarAvatarImageView)
+    private val avatarImageView by bind<ImageView>(R.id.avatarImageView)
     private val rootView by bind<CheckableConstraintLayout>(R.id.itemRoomLayout)
 
     override fun bind() {
diff --git a/app/src/main/res/color/color_room_title.xml b/app/src/main/res/color/color_room_title.xml
new file mode 100644
index 00000000..1cda9bf6
--- /dev/null
+++ b/app/src/main/res/color/color_room_title.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@color/black" android:state_checked="true" />
+    <item android:color="@color/bluey_grey_two" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/ic_add_circle_white.png b/app/src/main/res/drawable-hdpi/ic_add_circle_white.png
new file mode 100644
index 00000000..97e105bc
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_add_circle_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_expand_less_white.png b/app/src/main/res/drawable-hdpi/ic_expand_less_white.png
new file mode 100644
index 00000000..a0861f59
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_expand_less_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_expand_more_white.png b/app/src/main/res/drawable-hdpi/ic_expand_more_white.png
new file mode 100644
index 00000000..74cffcf2
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_expand_more_white.png differ
diff --git a/app/src/main/res/drawable-hdpi/ic_search_white.png b/app/src/main/res/drawable-hdpi/ic_search_white.png
new file mode 100644
index 00000000..a3210742
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_search_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_add_circle_white.png b/app/src/main/res/drawable-mdpi/ic_add_circle_white.png
new file mode 100644
index 00000000..e7959eb5
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_add_circle_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_expand_less_white.png b/app/src/main/res/drawable-mdpi/ic_expand_less_white.png
new file mode 100644
index 00000000..c735c8ca
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_expand_less_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_expand_more_white.png b/app/src/main/res/drawable-mdpi/ic_expand_more_white.png
new file mode 100644
index 00000000..e72148d7
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_expand_more_white.png differ
diff --git a/app/src/main/res/drawable-mdpi/ic_search_white.png b/app/src/main/res/drawable-mdpi/ic_search_white.png
new file mode 100644
index 00000000..97351f02
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_search_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_add_circle_white.png b/app/src/main/res/drawable-xhdpi/ic_add_circle_white.png
new file mode 100644
index 00000000..08f5e128
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_add_circle_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_less_white.png b/app/src/main/res/drawable-xhdpi/ic_expand_less_white.png
new file mode 100644
index 00000000..0008f33b
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_expand_less_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_expand_more_white.png b/app/src/main/res/drawable-xhdpi/ic_expand_more_white.png
new file mode 100644
index 00000000..a0f9e645
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_expand_more_white.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_search_white.png b/app/src/main/res/drawable-xhdpi/ic_search_white.png
new file mode 100644
index 00000000..f9d04518
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_search_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_circle_white.png b/app/src/main/res/drawable-xxhdpi/ic_add_circle_white.png
new file mode 100644
index 00000000..0fdbc572
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_add_circle_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_less_white.png b/app/src/main/res/drawable-xxhdpi/ic_expand_less_white.png
new file mode 100644
index 00000000..0e077276
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_expand_less_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_expand_more_white.png b/app/src/main/res/drawable-xxhdpi/ic_expand_more_white.png
new file mode 100644
index 00000000..9173968c
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_expand_more_white.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_search_white.png b/app/src/main/res/drawable-xxhdpi/ic_search_white.png
new file mode 100644
index 00000000..722ff819
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_search_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_circle_white.png b/app/src/main/res/drawable-xxxhdpi/ic_add_circle_white.png
new file mode 100644
index 00000000..91967dbf
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_add_circle_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_less_white.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_less_white.png
new file mode 100644
index 00000000..27403f79
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_expand_less_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_expand_more_white.png b/app/src/main/res/drawable-xxxhdpi/ic_expand_more_white.png
new file mode 100644
index 00000000..dde85bb7
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_expand_more_white.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_search_white.png b/app/src/main/res/drawable-xxxhdpi/ic_search_white.png
new file mode 100644
index 00000000..47cc04fb
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_search_white.png differ
diff --git a/app/src/main/res/layout/item_room.xml b/app/src/main/res/layout/item_room.xml
index e822c5d9..c19e5a54 100644
--- a/app/src/main/res/layout/item_room.xml
+++ b/app/src/main/res/layout/item_room.xml
@@ -10,7 +10,7 @@
     android:minHeight="48dp">
 
     <ImageView
-        android:id="@+id/toolbarAvatarImageView"
+        android:id="@+id/avatarImageView"
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:layout_marginStart="16dp"
@@ -19,16 +19,17 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@tools:sample/avatars" />
 
-    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
+    <TextView
         android:id="@+id/titleView"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
+        android:duplicateParentState="true"
+        android:textColor="@color/color_room_title"
         android:textSize="14sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/toolbarAvatarImageView"
+        app:layout_constraintStart_toEndOf="@id/avatarImageView"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/full_names" />
 
diff --git a/app/src/main/res/layout/item_room_category.xml b/app/src/main/res/layout/item_room_category.xml
new file mode 100644
index 00000000..c0115b5a
--- /dev/null
+++ b/app/src/main/res/layout/item_room_category.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_vertical"
+    android:minHeight="24dp"
+    android:padding="16dp"
+    tools:background="@color/pale_grey">
+
+    <TextView
+        android:id="@+id/roomCategoryTitleView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:gravity="center_vertical"
+        android:drawableLeft="@drawable/ic_expand_more_white"
+        android:drawableTint="@color/bluey_grey_two"
+        android:foregroundTint="@color/bluey_grey_two"
+        android:text="DIRECT MESSAGES"
+        android:textColor="@color/bluey_grey_two"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/roomCategoryAddButton"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/roomCategoryAddButton"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginEnd="8dp"
+        android:scaleType="centerInside"
+        android:src="@drawable/ic_add_circle_white"
+        android:tint="@color/bluey_grey_two"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8f3ff78e..5dd52be5 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,5 +9,10 @@
     <color name="bluey_grey">#a5a5a6</color>
     <color name="slate_grey">#5f6268</color>
     <color name="sky_blue">#7bb2ea</color>
-
+    <color name="bluey_grey_two">#929eb4</color>
+    <color name="light_blue_grey">#c1c9d6</color>
+    <color name="dark_grey">#2e2f32</color>
+    <color name="light_grey_blue">#9fa9ba</color>
+    <color name="cool_grey">#a5aab2</color>
+    <color name="pale_grey_two">#ebedf8</color>
 </resources>