diff --git a/apps/android/.idea/codeStyles/Project.xml b/apps/android/.idea/codeStyles/Project.xml
index 1901f77e30..9dd7fe45d6 100644
--- a/apps/android/.idea/codeStyles/Project.xml
+++ b/apps/android/.idea/codeStyles/Project.xml
@@ -3,6 +3,7 @@
     <JetCodeStyleSettings>
       <option name="SPACE_BEFORE_EXTEND_COLON" value="false" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="3" />
+      <option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="0" />
       <option name="WRAP_ELVIS_EXPRESSIONS" value="0" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
@@ -121,10 +122,15 @@
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-      <option name="RIGHT_MARGIN" value="120" />
+      <option name="RIGHT_MARGIN" value="140" />
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
       <option name="KEEP_BLANK_LINES_IN_CODE" value="0" />
       <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
+      <option name="CALL_PARAMETERS_WRAP" value="0" />
+      <option name="METHOD_PARAMETERS_WRAP" value="0" />
+      <option name="EXTENDS_LIST_WRAP" value="0" />
+      <option name="METHOD_CALL_CHAIN_WRAP" value="0" />
+      <option name="ASSIGNMENT_WRAP" value="0" />
       <option name="METHOD_ANNOTATION_WRAP" value="0" />
       <option name="CLASS_ANNOTATION_WRAP" value="0" />
       <option name="FIELD_ANNOTATION_WRAP" value="0" />
diff --git a/apps/android/.idea/codeStyles/codeStyleConfig.xml b/apps/android/.idea/codeStyles/codeStyleConfig.xml
index 6e6eec1148..79ee123c2b 100644
--- a/apps/android/.idea/codeStyles/codeStyleConfig.xml
+++ b/apps/android/.idea/codeStyles/codeStyleConfig.xml
@@ -1,6 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <state>
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
   </state>
 </component>
\ No newline at end of file
diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListView.kt
index ba35676549..73474a4c3e 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListView.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListView.kt
@@ -29,28 +29,42 @@ import com.google.accompanist.permissions.ExperimentalPermissionsApi
 import kotlinx.coroutines.*
 
 @ExperimentalMaterialApi
-class ScaffoldController(val state: BottomSheetScaffoldState, val scope: CoroutineScope) {
-  fun expand() = scope.launch { state.bottomSheetState.expand() }
-  fun collapse() = scope.launch { state.bottomSheetState.collapse() }
-  fun toggleSheet() = scope.launch {
-    val s = state.bottomSheetState
-    if (s.isExpanded) s.collapse() else s.expand()
+class ScaffoldController(val scope: CoroutineScope) {
+  lateinit var state: BottomSheetScaffoldState
+  val expanded = mutableStateOf(false)
+
+  fun expand() {
+    expanded.value = true
+    scope.launch { state.bottomSheetState.expand() }
+  }
+
+  fun collapse() {
+    expanded.value = false
+    scope.launch { state.bottomSheetState.collapse() }
+  }
+
+  fun toggleSheet() {
+    if (state.bottomSheetState.isExpanded ?: false) collapse() else expand()
   }
 
   fun toggleDrawer() = scope.launch {
-    state.drawerState.apply {
-      if (isClosed) open() else close()
-    }
+    state.drawerState.apply { if (isClosed) open() else close() }
   }
 }
 
 @ExperimentalMaterialApi
 @Composable
 fun scaffoldController(): ScaffoldController {
-  return ScaffoldController(
-    state = rememberBottomSheetScaffoldState(),
-    scope = rememberCoroutineScope()
+  val ctrl = ScaffoldController(scope = rememberCoroutineScope())
+  val bottomSheetState = rememberBottomSheetState(
+    BottomSheetValue.Collapsed,
+    confirmStateChange = {
+      ctrl.expanded.value = it == BottomSheetValue.Expanded
+      true
+    }
   )
+  ctrl.state = rememberBottomSheetScaffoldState(bottomSheetState = bottomSheetState)
+  return ctrl
 }
 
 @DelicateCoroutinesApi
@@ -61,39 +75,37 @@ fun ChatListView(chatModel: ChatModel, nav: NavController) {
   val scaffoldCtrl = scaffoldController()
   BottomSheetScaffold(
     scaffoldState = scaffoldCtrl.state,
-    topBar = {
-      ChatListToolbar(scaffoldCtrl)
-    },
-    drawerContent = {
-      SettingsView(chatModel, nav)
-    },
+    drawerContent = { SettingsView(chatModel, nav) },
     sheetPeekHeight = 0.dp,
     sheetContent = { NewChatSheet(chatModel, scaffoldCtrl, nav) },
     sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp),
   ) {
-    Column(
-      modifier = Modifier
-        .padding(vertical = 8.dp)
-        .fillMaxSize()
-        .background(MaterialTheme.colors.background)
-    ) {
-      when (chatModel.chatsLoaded.value) {
-        true -> if (chatModel.chats.isNotEmpty()) {
-          ChatList(chatModel, nav)
-        } else {
-          val user = chatModel.currentUser.value
-          Help(scaffoldCtrl, displayName = user?.profile?.displayName)
-        }
-        else -> ChatList(chatModel, nav)
-      }
-    }
-    if (scaffoldCtrl.state.bottomSheetState.isExpanded) {
-      Surface(
-        Modifier
+    Box {
+      Column(
+        modifier = Modifier
+          .padding(vertical = 8.dp)
           .fillMaxSize()
-          .clickable { scaffoldCtrl.collapse() },
-        color = Color.Black.copy(alpha = 0.12F)
-      ) {}
+          .background(MaterialTheme.colors.background)
+      ) {
+        ChatListToolbar(scaffoldCtrl)
+        when (chatModel.chatsLoaded.value) {
+          true -> if (chatModel.chats.isNotEmpty()) {
+            ChatList(chatModel, nav)
+          } else {
+            val user = chatModel.currentUser.value
+            Help(scaffoldCtrl, displayName = user?.profile?.displayName)
+          }
+          else -> ChatList(chatModel, nav)
+        }
+      }
+      if (scaffoldCtrl.expanded.value) {
+        Surface(
+          Modifier
+            .fillMaxSize()
+            .clickable { scaffoldCtrl.collapse() },
+          color = Color.Black.copy(alpha = 0.12F)
+        ) {}
+      }
     }
   }
 }