diff --git a/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt b/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
index 847045cc82..c2176ec798 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/HomeActivity.kt
@@ -12,9 +12,8 @@ import im.vector.riotredesign.R
 import im.vector.riotredesign.core.extensions.replaceFragment
 import im.vector.riotredesign.core.platform.RiotActivity
 import im.vector.riotredesign.core.platform.ToolbarConfigurable
-import im.vector.riotredesign.features.home.detail.LoadingRoomDetailFragment
-import im.vector.riotredesign.features.home.detail.RoomDetailFragment
-import im.vector.riotredesign.features.home.list.RoomListFragment
+import im.vector.riotredesign.features.home.room.detail.LoadingRoomDetailFragment
+import im.vector.riotredesign.features.home.room.detail.RoomDetailFragment
 import kotlinx.android.synthetic.main.activity_home.*
 import org.koin.standalone.StandAloneContext.loadKoinModules
 
@@ -27,10 +26,10 @@ class HomeActivity : RiotActivity(), HomeNavigator, ToolbarConfigurable {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_home)
         if (savedInstanceState == null) {
-            val roomListFragment = RoomListFragment.newInstance()
+            val homeDrawerFragment = HomeDrawerFragment.newInstance()
             val loadingDetail = LoadingRoomDetailFragment.newInstance()
             replaceFragment(loadingDetail, R.id.homeDetailFragmentContainer)
-            replaceFragment(roomListFragment, R.id.homeDrawerFragmentContainer)
+            replaceFragment(homeDrawerFragment, R.id.homeDrawerFragmentContainer)
         }
     }
 
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/HomeDrawerFragment.kt b/app/src/main/java/im/vector/riotredesign/features/home/HomeDrawerFragment.kt
new file mode 100644
index 0000000000..5d99088159
--- /dev/null
+++ b/app/src/main/java/im/vector/riotredesign/features/home/HomeDrawerFragment.kt
@@ -0,0 +1,34 @@
+package im.vector.riotredesign.features.home
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import im.vector.riotredesign.R
+import im.vector.riotredesign.core.extensions.replaceFragment
+import im.vector.riotredesign.core.platform.RiotFragment
+import im.vector.riotredesign.features.home.room.list.RoomListFragment
+
+class HomeDrawerFragment : RiotFragment() {
+
+    companion object {
+
+        fun newInstance(): HomeDrawerFragment {
+            return HomeDrawerFragment()
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_home_drawer, container, false)
+    }
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        if (savedInstanceState == null) {
+            val roomListFragment = RoomListFragment.newInstance()
+            replaceFragment(roomListFragment, R.id.roomListFragmentContainer)
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/detail/EventDiffUtilCallback.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/EventDiffUtilCallback.kt
similarity index 91%
rename from app/src/main/java/im/vector/riotredesign/features/home/detail/EventDiffUtilCallback.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/detail/EventDiffUtilCallback.kt
index e529dbbe0f..5990a23ef7 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/detail/EventDiffUtilCallback.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/EventDiffUtilCallback.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.detail
+package im.vector.riotredesign.features.home.room.detail
 
 import android.support.v7.util.DiffUtil
 import im.vector.matrix.android.api.session.events.model.EnrichedEvent
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/detail/LoadingRoomDetailFragment.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt
similarity index 91%
rename from app/src/main/java/im/vector/riotredesign/features/home/detail/LoadingRoomDetailFragment.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt
index 5d70ec54a5..016dc7098e 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/detail/LoadingRoomDetailFragment.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/LoadingRoomDetailFragment.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.detail
+package im.vector.riotredesign.features.home.room.detail
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/detail/RoomDetailFragment.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt
similarity index 98%
rename from app/src/main/java/im/vector/riotredesign/features/home/detail/RoomDetailFragment.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt
index a06a69b01d..ccb88653c8 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/detail/RoomDetailFragment.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.detail
+package im.vector.riotredesign.features.home.room.detail
 
 import android.arch.lifecycle.Observer
 import android.arch.paging.PagedList
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/detail/TimelineEventAdapter.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineEventAdapter.kt
similarity index 97%
rename from app/src/main/java/im/vector/riotredesign/features/home/detail/TimelineEventAdapter.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineEventAdapter.kt
index fc35116b2d..d0946b28de 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/detail/TimelineEventAdapter.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineEventAdapter.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.detail
+package im.vector.riotredesign.features.home.room.detail
 
 import android.arch.paging.PagedList
 import android.arch.paging.PagedListAdapter
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/detail/TimelineEventController.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineEventController.kt
similarity index 93%
rename from app/src/main/java/im/vector/riotredesign/features/home/detail/TimelineEventController.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineEventController.kt
index cab815e167..d2ea9fe0be 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/detail/TimelineEventController.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineEventController.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.detail
+package im.vector.riotredesign.features.home.room.detail
 
 import com.airbnb.epoxy.EpoxyAsyncUtil
 import com.airbnb.epoxy.EpoxyModel
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/detail/TimelineEventItem.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineEventItem.kt
similarity index 88%
rename from app/src/main/java/im/vector/riotredesign/features/home/detail/TimelineEventItem.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineEventItem.kt
index 31c2ebdeb9..c71fbf896d 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/detail/TimelineEventItem.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineEventItem.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.detail
+package im.vector.riotredesign.features.home.room.detail
 
 import android.widget.TextView
 import im.vector.riotredesign.R
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/list/RoomListActions.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListActions.kt
similarity index 76%
rename from app/src/main/java/im/vector/riotredesign/features/home/list/RoomListActions.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListActions.kt
index e00f8f172c..7f5e5301c6 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/list/RoomListActions.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListActions.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.list
+package im.vector.riotredesign.features.home.room.list
 
 import im.vector.matrix.android.api.session.room.model.RoomSummary
 
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/list/RoomListFragment.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt
similarity index 98%
rename from app/src/main/java/im/vector/riotredesign/features/home/list/RoomListFragment.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt
index 575db4e18f..91d528671d 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/list/RoomListFragment.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListFragment.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.list
+package im.vector.riotredesign.features.home.room.list
 
 import android.os.Bundle
 import android.view.LayoutInflater
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/list/RoomListViewModel.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewModel.kt
similarity index 96%
rename from app/src/main/java/im/vector/riotredesign/features/home/list/RoomListViewModel.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewModel.kt
index 860f274681..a8d9944fb3 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/list/RoomListViewModel.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewModel.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.list
+package im.vector.riotredesign.features.home.room.list
 
 import android.support.v4.app.FragmentActivity
 import com.airbnb.mvrx.BaseMvRxViewModel
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/list/RoomListViewState.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewState.kt
similarity index 90%
rename from app/src/main/java/im/vector/riotredesign/features/home/list/RoomListViewState.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewState.kt
index 30b16cff38..39b938ad05 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/list/RoomListViewState.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomListViewState.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.list
+package im.vector.riotredesign.features.home.room.list
 
 import com.airbnb.mvrx.Async
 import com.airbnb.mvrx.MvRxState
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/list/RoomSummaryController.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt
similarity index 94%
rename from app/src/main/java/im/vector/riotredesign/features/home/list/RoomSummaryController.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt
index 6b8d175ba5..54b0c628a7 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/list/RoomSummaryController.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryController.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.list
+package im.vector.riotredesign.features.home.room.list
 
 import android.content.Context
 import com.airbnb.epoxy.Typed2EpoxyController
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/list/RoomSummaryItem.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt
similarity index 94%
rename from app/src/main/java/im/vector/riotredesign/features/home/list/RoomSummaryItem.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt
index 99393f211b..e1b7db4782 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/list/RoomSummaryItem.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomSummaryItem.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.list
+package im.vector.riotredesign.features.home.room.list
 
 import android.graphics.drawable.Drawable
 import android.widget.ImageView
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index f7e6940b4e..013166fad6 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -16,7 +16,6 @@
         android:id="@+id/homeDrawerFragmentContainer"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:layout_marginRight="24dp" />
+        android:layout_gravity="start" />
 
 </android.support.v4.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home_drawer.xml b/app/src/main/res/layout/fragment_home_drawer.xml
new file mode 100644
index 0000000000..0f9895b7a3
--- /dev/null
+++ b/app/src/main/res/layout/fragment_home_drawer.xml
@@ -0,0 +1,23 @@
+<?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"
+    android:id="@+id/stateView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <FrameLayout
+        android:id="@+id/communitiesFragmentContainer"
+        android:layout_width="56dp"
+        android:layout_height="match_parent"
+        android:background="@color/dark" />
+
+    <FrameLayout
+        android:id="@+id/roomListFragmentContainer"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/communitiesFragmentContainer"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</android.support.constraint.ConstraintLayout>
\ No newline at end of file