diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/EventDiffUtilCallback.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/EventDiffUtilCallback.kt
deleted file mode 100644
index 4727ddf5..00000000
--- a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/EventDiffUtilCallback.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package im.vector.riotredesign.features.home.room.detail
-
-import android.support.v7.util.DiffUtil
-import im.vector.matrix.android.api.session.events.model.EnrichedEvent
-
-class EventDiffUtilCallback : DiffUtil.ItemCallback<EnrichedEvent>() {
-
-    override fun areItemsTheSame(p0: EnrichedEvent, p1: EnrichedEvent): Boolean {
-        return p0.root.eventId == p1.root.eventId
-    }
-
-    override fun areContentsTheSame(p0: EnrichedEvent, p1: EnrichedEvent): Boolean {
-        return p0.root == p1.root
-                && p0.metadata == p1.metadata
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt
index ae77d50f..8598fcea 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/RoomDetailFragment.kt
@@ -16,6 +16,7 @@ import im.vector.riotredesign.core.platform.RiotFragment
 import im.vector.riotredesign.core.platform.ToolbarConfigurable
 import im.vector.riotredesign.core.utils.FragmentArgumentDelegate
 import im.vector.riotredesign.features.home.AvatarRenderer
+import im.vector.riotredesign.features.home.room.detail.timeline.TimelineEventController
 import kotlinx.android.synthetic.main.fragment_room_detail.*
 import org.koin.android.ext.android.inject
 
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/BlankItem.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/BlankItem.kt
similarity index 77%
rename from app/src/main/java/im/vector/riotredesign/features/home/room/detail/BlankItem.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/BlankItem.kt
index e6fe356f..2c58e289 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/BlankItem.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/BlankItem.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.room.detail
+package im.vector.riotredesign.features.home.room.detail.timeline
 
 import android.content.Context
 import android.widget.FrameLayout
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineDaySeparatorItem.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineDaySeparatorItem.kt
similarity index 85%
rename from app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineDaySeparatorItem.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineDaySeparatorItem.kt
index 83d8e035..6a533590 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineDaySeparatorItem.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineDaySeparatorItem.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.room.detail
+package im.vector.riotredesign.features.home.room.detail.timeline
 
 import android.widget.TextView
 import im.vector.riotredesign.R
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineEventController.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt
similarity index 98%
rename from app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineEventController.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt
index e62de70e..424133ed 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineEventController.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventController.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.room.detail
+package im.vector.riotredesign.features.home.room.detail.timeline
 
 import android.arch.paging.PagedList
 import android.content.Context
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineEventItem.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventItem.kt
similarity index 83%
rename from app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineEventItem.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventItem.kt
index a280a6bc..570bfcc5 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineEventItem.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineEventItem.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.room.detail
+package im.vector.riotredesign.features.home.room.detail.timeline
 
 import android.widget.TextView
 import im.vector.riotredesign.R
diff --git a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineMessageItem.kt b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineMessageItem.kt
similarity index 95%
rename from app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineMessageItem.kt
rename to app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineMessageItem.kt
index ceeab76f..f8a8ead3 100644
--- a/app/src/main/java/im/vector/riotredesign/features/home/room/detail/TimelineMessageItem.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/home/room/detail/timeline/TimelineMessageItem.kt
@@ -1,4 +1,4 @@
-package im.vector.riotredesign.features.home.room.detail
+package im.vector.riotredesign.features.home.room.detail.timeline
 
 import android.view.View
 import android.widget.ImageView
diff --git a/app/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt b/app/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt
index 6b2a1290..2314be29 100644
--- a/app/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt
+++ b/app/src/main/java/im/vector/riotredesign/features/login/LoginActivity.kt
@@ -39,6 +39,7 @@ class LoginActivity : RiotActivity() {
         authenticator.authenticate(homeServerConnectionConfig, login, password, object : MatrixCallback<Session> {
             override fun onSuccess(data: Session) {
                 matrix.currentSession = data
+                matrix.currentSession.open()
                 goToHome()
             }
 
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
index af9bf57f..f4cc538a 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/DefaultSession.kt
@@ -60,26 +60,32 @@ class DefaultSession(override val sessionParams: SessionParams) : Session, KoinC
     // ROOM SERVICE
 
     override fun getRoom(roomId: String): Room? {
+        assert(isOpen)
         return roomService.getRoom(roomId)
     }
 
     override fun getAllRooms(): List<Room> {
+        assert(isOpen)
         return roomService.getAllRooms()
     }
 
     override fun liveRooms(): LiveData<List<Room>> {
+        assert(isOpen)
         return roomService.liveRooms()
     }
 
     override fun liveRoomSummaries(): LiveData<List<RoomSummary>> {
+        assert(isOpen)
         return roomService.liveRoomSummaries()
     }
 
     override fun lastSelectedRoom(): RoomSummary? {
+        assert(isOpen)
         return roomService.lastSelectedRoom()
     }
 
     override fun saveLastSelectedRoom(roomSummary: RoomSummary) {
+        assert(isOpen)
         roomService.saveLastSelectedRoom(roomSummary)
     }