3.2.0 (#957 )

core: catch error when toggling notifications (#954 )
* core: catch error when toggling notifications * filter current members * filter active members
2024-12-17 17:20:21 +01:00 · 2022-08-20 19:52:25 +01:00 · 2022-08-20 14:47:24 +01:00 · 2022-08-20 12:47:48 +01:00 · 2022-08-20 13:12:20 +04:00 · 2022-08-19 22:44:00 +01:00
382 changed files with 27086 additions and 6965 deletions
@@ -42,3 +42,4 @@ stack.yaml.lock

 # Temporary test files
 tests/tmp
+logs/
@@ -24,7 +24,26 @@
 - 🚀 [TestFlight preview for iOS](https://testflight.apple.com/join/DWuT2LQu) with the new features 1-2 weeks earlier - **limited to 10,000 users**!
 - 🖥 Available as a terminal (console) app / CLI on Linux, MacOS, Windows.

-## Why privacy of communications matter
+## Contents
+
+- [Why privacy matters](#why-privacy-matters)
+- [SimpleX approach to privacy and security](#simplex-approach-to-privacy-and-security)
+  - [Complete privacy](#complete-privacy-of-your-identity-profile-contacts-and-metadata)
+  - [Protection against spam and abuse](#the-best-protection-against-spam-and-abuse)
+  - [Ownership and security of your data](#complete-ownership-control-and-security-of-your-data)
+  - [Users own SimpleX network](#users-own-simplex-network)
+- [Frequently asked questions](#frequently-asked-questions)
+- [News and updates](#news-and-updates)
+- [Make a private connection](#make-a-private-connection)
+- [Quick installation of a terminal app](#zap-quick-installation-of-a-terminal-app)
+- [SimpleX Platform design](#simplex-platform-design)
+- [Privacy: technical details and limitations](#privacy-technical-details-and-limitations)
+- [For developers](#for-developers)
+- [Roadmap](#roadmap)
+- [Help us pay for 3rd party security audit](#help-us-pay-for-3rd-party-security-audit)
+- [Disclaimer, License](#disclaimer)
+
+## Why privacy matters

 Everyone should care about privacy and security of their communications - innocuous conversations can put you in danger even if there is nothing to hide.

@@ -32,9 +51,9 @@ One of the most shocking stories is the experience of [Mohamedou Ould Salahi](ht

 It is not enough to use an end-to-end encrypted messenger, we all should use the messengers that protect the privacy of our personal networks - who we are connected with.

-## SimpleX unique approach to privacy and security
+## SimpleX approach to privacy and security

-### Full privacy of your identity, profile, contacts and metadata
+### Complete privacy of your identity, profile, contacts and metadata

 **Unlike any other existing messaging platform, SimpleX has no identifiers assigned to the users** - not even random numbers. This protects the privacy of who are you communicating with, hiding it from SimpleX platform servers and from any observers. [Read more](./docs/SIMPLEX.md#full-privacy-of-your-identity-profile-contacts-and-metadata).

@@ -50,25 +69,28 @@ SimpleX stores all user data on client devices, the messages are only held tempo

 You can use SimpleX with your own servers and still communicate with people using the servers that are pre-configured in the apps or any other SimpleX servers. [Read more](./docs/SIMPLEX.md#users-own-simplex-network).

-## For developers
+## Frequently asked questions

-We plan that the SimpleX platform will grow into the platform supporting any distributed Internet application. This will allow you to build any service that people can access via chat, with custom web-based UI widgets that anybody with basic HTML/CSS/JavaScript knowledge can create in a few hours.
+1. _How SimpleX can deliver messages without any user identifiers?_ See [v2 release annoucement](./blog/20220511-simplex-chat-v2-images-files.md#the-first-messaging-platform-without-user-identifiers) explaining how SimpleX works.

-You already can:
+2. _Why should I not just use Signal?_ Signal is a centralised platform that uses phone numbers to identify its users and their contacts. It means that while the content of your messages on Signal is protected with robust end-to-end encryption, there is a large amount of meta-data visible to Signal - who you talk with and when.

- use SimpleX Chat library to integrate chat functionality into your apps.
- use SimpleX Chat bot templates in Haskell to build your own chat bot services (TypeScript SDK is coming soon).
-
-If you are considering developing with SimpleX platform please get in touch for any advice and support.
+3. _How is it different from Matrix, Session, Ricochet, Cwtch, etc., that also don't require user identites?_ Although these platforms do not require a _real identity_, they do rely on anonymous user identities to deliver messages – it can be, for example, an identity key or a random number. Using a persistent user identity, even anonymous, creates a risk that user's connection graph becomes known to the observers and/or service providers, and it can lead to de-anonymizing some users. If the same user profile is used to connect to two different people via any messenger other than SimpleX, these two people can confirm if they are connected to the same person - they would use the same user identifier in the messages. With SimpleX there is no meta-data in common between your conversations with different contacts - the quality that no other messaging platform has.

 ## News and updates

+Selected updates:
+
+[Aug 8, 2022. v3.1: secret chat groups, access via Tor, reduced battery and traffic usage, advanced netwrok settings, etc.](./blog/20220808-simplex-chat-v3.1-chat-groups.md)
+
+[Jul 11, 2022. v3.0: instant push notifications for iOS, e2e encrypted WebRTC audio/video calls, chat database export/import, privacy and performance improvements](./blog/20220711-simplex-chat-v3-released-ios-notifications-audio-video-calls-database-export-import-protocol-improvements.md)
+
 [May 11, 2022. v2.0 released - sending images and files in mobile apps](./blog/20220511-simplex-chat-v2-images-files.md)

-[Apr 04, 2022. Instant notifications for SimpleX Chat mobile apps](./blog/20220404-simplex-chat-instant-notifications.md)
-
 [Mar 08, 2022 Mobile apps for iOS and Android released](./blog/20220308-simplex-chat-mobile-apps.md)

+[Jan 12, 2022. SimpleX v1 released: the only messaging and application platform without user identities](./20220112-simplex-chat-v1-released.md)
+
 [All updates](./blog)

 ## Make a private connection
@@ -101,7 +123,43 @@ Unlike federated networks, the server nodes **do not have records of the users**

 Only the client devices have information about users, their contacts and groups.

-See [SimpleX whitepaper](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) for more information on platform objectives and technical design.
+See [SimpleX whitepaper](https://github.com/simplex-chat/simplexmq/blob/stable/protocol/overview-tjr.md) for more information on platform objectives and technical design.
+
+See [SimpleX Chat Protocol](./docs/protocol/simplex-chat.md) for the format of messages sent between chat clients over [SimpleX Messaging Protocol](https://github.com/simplex-chat/simplexmq/blob/stable/protocol/simplex-messaging.md).
+
+## Privacy: technical details and limitations
+
+SimpleX Chat is a work in progress – we are releasing improvements as they are ready. You have to decide if the current state is good enough for your usage scenario.
+
+What is already implemented:
+
+1. Instead of user profile identifiers used by all other platforms, even the most private ones, SimpleX uses pairwise per-queue identifiers (2 addresses for each unidirectional message queue, with an optional 3rd address for push notificaitons on iOS, 2 queues in each connection between the users). It makes observing the network graph on the application level more difficult, as for `n` users there can be up to `n * (n-1)` message queues.
+2. End-to-end encryption in each message queue using [NaCl cryptobox](https://nacl.cr.yp.to/box.html). This is added to allow redundancy in the future (passing each message via several servers), to avoid having the same ciphertext in different queues (that would only be visible to the attacker if TLS is compromised). The encryption keys used for this encryption are not rotated, instead we are planning to rotate the queues. Curve25519 keys are used for key negotiation.
+3. [Double ratchet](https://signal.org/docs/specifications/doubleratchet/) end-to-end encryption in each conversation between two users (or group members). This is the same algorithm that is used in Signal and many other messaging apps; it provides OTR messaging with forward secrecy (each message is encrypted by its own ephemeral key), break-in recovery (the keys are frequently re-negotiated as part of the message exchange). Two pairs of Curve448 keys are used for the initial key agreement, initiating party passes these keys via the connection link, accepting side - in the header of the confirmation message.
+4. Additional layer of encryption using NaCL cryptobox for the messages delivered from the server to the recipient. This layer avoids having any ciphertext in common between sent and received traffic of the server inside TLS (and there are no identifiers in common as well).
+5. Several levels of content padding to frustrate message size attacks.
+6. Starting from v2 of SMP protocol (the current version is v4) all message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
+7. Only TLS 1.2/1.3 are allowed for client-server connections, limited to cryptographic algorithms: CHACHA20POLY1305_SHA256, Ed25519/Ed448, Curve25519/Curve448.
+8. To protect against replay attacks SimpleX servers require [tlsunique channel binding](https://www.rfc-editor.org/rfc/rfc5929.html) as session ID in each client command signed with per-queue ephemeral key.
+9. To protect your IP address all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details.
+
+We plan to add soon:
+
+1. Message queue rotation. Currently the queues created between two users are used until the contact is deleted, providing a long-term pairwise identifiers of the conversation. We are planning to add queue rotation to make these identifiers termporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
+2. Local database encryption. Currently the local chat database stored on your device is not encrypted.
+3. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
+4. Independent implementation audit.
+
+## For developers
+
+We plan that the SimpleX platform will grow into the platform supporting any distributed Internet application. This will allow you to build any service that people can access via chat, with custom web-based UI widgets that anybody with basic HTML/CSS/JavaScript knowledge can create in a few hours.
+
+You already can:
+
+- use SimpleX Chat library to integrate chat functionality into your apps.
+- use SimpleX Chat bot templates in Haskell to build your own chat bot services (TypeScript SDK is coming soon).
+
+If you are considering developing with SimpleX platform please get in touch for any advice and support.

 ## Roadmap

@@ -113,12 +171,16 @@ See [SimpleX whitepaper](https://github.com/simplex-chat/simplexmq/blob/master/p
 - ✅ Private instant notifications for Android using background service.
 - ✅ Haskell chat bot templates.
 - ✅ v2.0 - supporting images and files in mobile apps.
- 🏗 End-to-end encrypted audio and video calls via the mobile apps.
- 🏗 Automatic chat history deletion.
- 🏗 Privacy preserving instant notifications for iOS using Apple Push Notification service (in progress).
+- ✅ Manual chat history deletion.
+- ✅ End-to-end encrypted WebRTC audio and video calls via the mobile apps.
+- ✅ Privacy preserving instant notifications for iOS using Apple Push Notification service.
+- ✅ Chat database export and import
+- ✅ Chat groups in mobile apps.
+- ✅ Connecting to messaging servers via Tor.
+- 🏗 Dual server addresses to access messaging servers as v3 hidden services (in progress).
 - 🏗 Chat server and TypeScript client SDK to develop chat interfaces, integrations and chat bots (in progress).
- Groups support for mobile apps.
- Chat database portability and encryption.
+- Chat database encryption.
+- Disappearing messages, with mutual agreement.
 - Web widgets for custom interactivity in the chats.
 - SMP protocol improvements:
  - SMP queue redundancy and rotation.
@@ -127,8 +189,32 @@ See [SimpleX whitepaper](https://github.com/simplex-chat/simplexmq/blob/master/p
 - Privacy-preserving identity server for optional DNS-based contact/group addresses to simplify connection and discovery, but not used to deliver messages:
  - keep all your contacts and groups even if you lose the domain.
  - the server doesn't have information about your contacts and groups.
- Media server to optimize sending large files to groups.
 - Channels server for large groups and broadcast channels.
+- Media server to optimize sending large files to groups.
+
+## Help us pay for 3rd party security audit
+
+I will get straight to the point: I ask you to support SimpleX Chat with donations.
+
+We are prioritizing users privacy and security - it would be impossible without your support we were lucky to have so far.
+
+We are planning a 3rd party security audit for the app, and it would hugely help us if some part of this $20,000+ expense could be covered with donations.
+
+Our pledge to our users is that SimpleX protocols are and will remain open, and in public domain, - so anybody can build the future implementations of the clients and the servers. We are building SimpleX platform based on the same principles as email and web, but much more private and secure.
+
+If you are already using SimpleX Chat, or plan to use it in the future when it has more features, please consider making a donation - it will help us to raise more funds. Donating any amount, even the price of the cup of coffee, would make a huge difference for us.
+
+It is possible to donate via:
+
+- [GitHub](https://github.com/sponsors/simplex-chat) - it is commission-free for us.
+- [OpenCollective](https://opencollective.com/simplex-chat) - it charges a commission, and also accepts donations in crypto-currencies.
+- Monero wallet: 8568eeVjaJ1RQ65ZUn9PRQ8ENtqeX9VVhcCYYhnVLxhV4JtBqw42so2VEUDQZNkFfsH5sXCuV7FN8VhRQ21DkNibTZP57Qt
+
+Thank you,
+
+Evgeny
+
+SimpleX Chat founder

 ## Disclaimer

@@ -139,3 +225,13 @@ You are likely to discover some bugs - we would really appreciate if you use it
 ## License

 [AGPL v3](./LICENSE)
+
+[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apple_store.svg" alt="iOS app" height="42">](https://apps.apple.com/us/app/simplex-chat/id1605771084)
+&nbsp;
+[![Android app](https://github.com/simplex-chat/.github/blob/master/profile/images/google_play.svg)](https://play.google.com/store/apps/details?id=chat.simplex.app)
+&nbsp;
+[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/f_droid.svg" alt="F-Droid" height="41">](https://app.simplex.chat)
+&nbsp;
+[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/testflight.png" alt="iOS TestFlight" height="41">](https://testflight.apple.com/join/DWuT2LQu)
+&nbsp;
+[<img src="https://github.com/simplex-chat/.github/blob/master/profile/images/apk_icon.png" alt="APK" height="41">](https://github.com/simplex-chat/website/raw/master/simplex.apk)
@@ -9,6 +9,7 @@
 /.idea/assetWizardSettings.xml
 /.idea/deploymentTargetDropDown.xml
 /.idea/misc.xml
+/.idea/uiDesigner.xml
 .DS_Store
 /build
 /captures
@@ -11,8 +11,8 @@ android {
        applicationId "chat.simplex.app"
        minSdk 29
        targetSdk 32
-        versionCode 36
-        versionName "2.2"
+        versionCode 49
+        versionName "3.2"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
        ndk {
@@ -26,9 +26,19 @@ android {
                cppFlags ''
            }
        }
+        manifestPlaceholders.app_name = "@string/app_name"
+        manifestPlaceholders.provider_authorities = "chat.simplex.app.provider"
+        manifestPlaceholders.extract_native_libs = compression_level != "0"
    }

    buildTypes {
+        debug {
+            applicationIdSuffix "$application_id_suffix"
+            debuggable new Boolean("$enable_debuggable")
+            manifestPlaceholders.app_name = "$app_name"
+            // Provider can't be the same for different apps on the same device
+            manifestPlaceholders.provider_authorities = "chat.simplex.app${application_id_suffix}.provider"
+        }
        release {
            minifyEnabled false
            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
@@ -52,7 +62,6 @@ android {
    externalNativeBuild {
        cmake {
            path file('src/main/cpp/CMakeLists.txt')
-            version '3.10.2'
        }
    }
    buildFeatures {
@@ -65,6 +74,7 @@ android {
        resources {
            excludes += '/META-INF/{AL2.0,LGPL2.1}'
        }
+        jniLibs.useLegacyPackaging = compression_level != "0"
    }
 }

@@ -80,6 +90,7 @@ dependencies {
    implementation 'org.jetbrains.kotlinx:kotlinx-datetime:0.3.2'
    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.3.2'
    implementation "androidx.compose.material:material-icons-extended:$compose_version"
+    implementation "androidx.compose.ui:ui-util:$compose_version"
    implementation "androidx.navigation:navigation-compose:2.4.1"
    implementation "com.google.accompanist:accompanist-insets:0.23.0"
    implementation 'androidx.webkit:webkit:1.4.0'
@@ -113,3 +124,70 @@ dependencies {
    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$compose_version"
    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
 }
+
+def buildType = "unknown"
+// Don't do anything if no compression is needed
+if (compression_level != "0") {
+    tasks.whenTaskAdded { task ->
+        if (task.name == 'packageDebug') {
+            task.doLast {
+                buildType = "debug"
+            }
+            task.finalizedBy compressApk
+        } else if (task.name == 'packageRelease') {
+            task.doLast {
+                buildType = "release"
+            }
+            task.finalizedBy compressApk
+        }
+    }
+}
+
+tasks.register("compressApk") {
+    doLast {
+        def javaHome = System.properties['java.home'] ?: org.gradle.internal.jvm.Jvm.current().getJavaHome()
+        def sdkDir = android.getSdkDirectory().getAbsolutePath()
+        def keyAlias = ""
+        def keyPassword = ""
+        def storeFile = ""
+        def storePassword = ""
+        if (project.properties['android.injected.signing.key.alias'] != null) {
+            keyAlias = project.properties['android.injected.signing.key.alias']
+            keyPassword = project.properties['android.injected.signing.key.password']
+            storeFile = project.properties['android.injected.signing.store.file']
+            storePassword = project.properties['android.injected.signing.store.password']
+        } else if (android.signingConfigs.hasProperty(buildType)) {
+            def gradleConfig = android.signingConfigs[buildType]
+            keyAlias = gradleConfig.keyAlias
+            keyPassword = gradleConfig.keyPassword
+            storeFile = gradleConfig.storeFile
+            storePassword = gradleConfig.storePassword
+        } else {
+            // There is no signing config for current build type, can't sign the apk
+            println("No signing configs for this build type: $buildType")
+            return
+        }
+
+        def outputDir = tasks["package${buildType.capitalize()}"].outputs.files.last()
+
+        exec {
+            workingDir '../../../scripts/android'
+            setEnvironment(['JAVA_HOME': "$javaHome"])
+            commandLine './compress-and-sign-apk.sh',  \
+                     "$compression_level",  \
+                     "$outputDir",  \
+                     "$sdkDir",  \
+                     "$storeFile",  \
+                     "$storePassword",  \
+                     "$keyAlias",  \
+                     "$keyPassword"
+        }
+
+        if (project.properties['android.injected.signing.key.alias'] != null && buildType == 'release') {
+            new File(outputDir, "app-release.apk").renameTo(new File(outputDir, "simplex.apk"))
+        }
+
+        // View all gradle properties set
+        // project.properties.each { k, v -> println "$k -> $v" }
+    }
+}
@@ -25,7 +25,8 @@
      android:name="SimplexApp"
      android:allowBackup="true"
      android:icon="@mipmap/icon"
-      android:label="@string/app_name"
+      android:label="${app_name}"
+      android:extractNativeLibs="${extract_native_libs}"
      android:supportsRtl="true"
      android:theme="@style/Theme.SimpleX">

@@ -34,11 +35,10 @@
        android:name=".MainActivity"
        android:launchMode="singleTask"
        android:exported="true"
-        android:label="@string/app_name"
+        android:label="${app_name}"
        android:windowSoftInputMode="adjustResize"
        android:theme="@style/Theme.SimpleX">
      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
        <category android:name="android.intent.category.LAUNCHER" />
      </intent-filter>

@@ -65,12 +65,37 @@
      </intent-filter>
    </activity>

+    <activity-alias
+        android:name=".MainActivity_default"
+        android:exported="true"
+        android:icon="@mipmap/icon"
+        android:enabled="true"
+        android:targetActivity=".MainActivity">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity-alias>
+
+    <activity-alias
+        android:name=".MainActivity_dark_blue"
+        android:exported="true"
+        android:icon="@mipmap/icon_dark_blue"
+        android:enabled="false"
+        android:targetActivity=".MainActivity">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity-alias>
+
+
    <activity android:name=".views.call.IncomingCallActivity"
        android:showOnLockScreen="true"/>

    <provider
        android:name="androidx.core.content.FileProvider"
-        android:authorities="chat.simplex.app.provider"
+        android:authorities="${provider_authorities}"
        android:exported="false"
        android:grantUriPermissions="true">
      <meta-data
@@ -24,8 +24,8 @@ var TransformOperation;
 let activeCall;
 const processCommand = (function () {
    const defaultIceServers = [
-        { urls: ["stun:stun.simplex.chat:5349"] },
-        { urls: ["turn:turn.simplex.chat:5349"], username: "private", credential: "yleob6AVkiNI87hpR94Z" },
+        { urls: ["stun:stun.simplex.im:5349"] },
+        { urls: ["turn:turn.simplex.im:5349"], username: "private", credential: "yleob6AVkiNI87hpR94Z" },
    ];
    function getCallConfig(encodedInsertableStreams, iceServers, relay) {
        return {
@@ -24,9 +24,11 @@ Java_chat_simplex_app_SimplexAppKt_initHS(__unused JNIEnv *env, __unused jclass
 // from simplex-chat
 typedef void* chat_ctrl;

-extern chat_ctrl chat_init(const char * path);
+extern chat_ctrl chat_init(const char *path);
 extern char *chat_send_cmd(chat_ctrl ctrl, const char *cmd);
 extern char *chat_recv_msg(chat_ctrl ctrl);
+extern char *chat_recv_msg_wait(chat_ctrl ctrl, const int wait);
+extern char *chat_parse_markdown(const char *str);

 JNIEXPORT jlong JNICALL
 Java_chat_simplex_app_SimplexAppKt_chatInit(JNIEnv *env, __unused jclass clazz, jstring datadir) {
@@ -48,3 +50,16 @@ JNIEXPORT jstring JNICALL
 Java_chat_simplex_app_SimplexAppKt_chatRecvMsg(JNIEnv *env, __unused jclass clazz, jlong controller) {
    return (*env)->NewStringUTF(env, chat_recv_msg((void*)controller));
 }
+
+JNIEXPORT jstring JNICALL
+Java_chat_simplex_app_SimplexAppKt_chatRecvMsgWait(JNIEnv *env, __unused jclass clazz, jlong controller, jint wait) {
+    return (*env)->NewStringUTF(env, chat_recv_msg_wait((void*)controller, wait));
+}
+
+JNIEXPORT jstring JNICALL
+Java_chat_simplex_app_SimplexAppKt_chatParseMarkdown(JNIEnv *env, __unused jclass clazz, jstring str) {
+    const char *_str = (*env)->GetStringUTFChars(env, str, JNI_FALSE);
+    jstring res = (*env)->NewStringUTF(env, chat_parse_markdown(_str));
+    (*env)->ReleaseStringUTFChars(env, str, _str);
+    return res;
+}
@@ -70,7 +70,7 @@ class MainActivity: FragmentActivity(), LifecycleEventObserver {
        }
      }
    }
-    schedulePeriodicServiceRestartWorker()
+    SimplexApp.context.schedulePeriodicServiceRestartWorker()
  }

  override fun onNewIntent(intent: Intent?) {
@@ -90,6 +90,7 @@ class MainActivity: FragmentActivity(), LifecycleEventObserver {
            runAuthenticate()
          }
        }
+        else -> {}
      }
    }
  }
@@ -130,24 +131,6 @@ class MainActivity: FragmentActivity(), LifecycleEventObserver {
    }
  }

-  private fun schedulePeriodicServiceRestartWorker() {
-    val workerVersion = chatController.appPrefs.autoRestartWorkerVersion.get()
-    val workPolicy = if (workerVersion == SimplexService.SERVICE_START_WORKER_VERSION) {
-      Log.d(TAG, "ServiceStartWorker version matches: choosing KEEP as existing work policy")
-      ExistingPeriodicWorkPolicy.KEEP
-    } else {
-      Log.d(TAG, "ServiceStartWorker version DOES NOT MATCH: choosing REPLACE as existing work policy")
-      chatController.appPrefs.autoRestartWorkerVersion.set(SimplexService.SERVICE_START_WORKER_VERSION)
-      ExistingPeriodicWorkPolicy.REPLACE
-    }
-    val work = PeriodicWorkRequestBuilder<SimplexService.ServiceStartWorker>(SimplexService.SERVICE_START_WORKER_INTERVAL_MINUTES, TimeUnit.MINUTES)
-      .addTag(SimplexService.TAG)
-      .addTag(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC)
-      .build()
-    Log.d(TAG, "ServiceStartWorker: Scheduling period work every ${SimplexService.SERVICE_START_WORKER_INTERVAL_MINUTES} minutes")
-    WorkManager.getInstance(this)?.enqueueUniquePeriodicWork(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC, workPolicy, work)
-  }
-
  private fun setPerformLA(on: Boolean) {
    vm.chatModel.controller.appPrefs.laNoticeShown.set(true)
    if (on) {
@@ -305,7 +288,8 @@ fun MainPage(
          if (chatModel.showCallView.value) ActiveCallView(chatModel)
          else {
            showAdvertiseLAAlert = true
-            if (chatModel.chatId.value == null) ChatListView(chatModel, setPerformLA = { setPerformLA(it) })
+            val stopped = chatModel.chatRunning.value == false
+            if (chatModel.chatId.value == null) ChatListView(chatModel, setPerformLA, stopped)
            else ChatView(chatModel)
          }
        }
@@ -4,14 +4,17 @@ import android.app.Application
 import android.net.LocalServerSocket
 import android.util.Log
 import androidx.lifecycle.*
+import androidx.work.*
 import chat.simplex.app.model.*
 import chat.simplex.app.views.helpers.getFilesDirectory
 import chat.simplex.app.views.helpers.withApi
 import chat.simplex.app.views.onboarding.OnboardingStage
+import kotlinx.coroutines.*
 import java.io.BufferedReader
 import java.io.InputStreamReader
 import java.util.*
 import java.util.concurrent.Semaphore
+import java.util.concurrent.TimeUnit
 import kotlin.concurrent.thread

 const val TAG = "SIMPLEX"
@@ -24,8 +27,10 @@ external fun pipeStdOutToSocket(socketName: String) : Int
 // SimpleX API
 typealias ChatCtrl = Long
 external fun chatInit(path: String): ChatCtrl
-external fun chatSendCmd(ctrl: ChatCtrl, msg: String) : String
-external fun chatRecvMsg(ctrl: ChatCtrl) : String
+external fun chatSendCmd(ctrl: ChatCtrl, msg: String): String
+external fun chatRecvMsg(ctrl: ChatCtrl): String
+external fun chatRecvMsgWait(ctrl: ChatCtrl, timeout: Int): String
+external fun chatParseMarkdown(str: String): String

 class SimplexApp: Application(), LifecycleEventObserver {
  val chatController: ChatController by lazy {
@@ -55,8 +60,6 @@ class SimplexApp: Application(), LifecycleEventObserver {
        chatModel.onboardingStage.value = OnboardingStage.Step1_SimpleXInfo
      } else {
        chatController.startChat(user)
-        SimplexService.start(applicationContext)
-        chatController.showBackgroundServiceNoticeIfNeeded()
      }
    }
  }
@@ -68,20 +71,49 @@ class SimplexApp: Application(), LifecycleEventObserver {
        Lifecycle.Event.ON_STOP ->
          if (!appPreferences.runServiceInBackground.get()) SimplexService.stop(applicationContext)
        Lifecycle.Event.ON_START ->
-          SimplexService.start(applicationContext)
+          if (chatModel.chatRunning.value != false)  SimplexService.start(applicationContext)
        Lifecycle.Event.ON_RESUME ->
          if (chatModel.onboardingStage.value == OnboardingStage.OnboardingComplete) {
            chatController.showBackgroundServiceNoticeIfNeeded()
          }
+        else -> {}
      }
    }
  }

+  fun allowToStartServiceAfterAppExit() = with(chatModel.controller) {
+    appPrefs.runServiceInBackground.get() && isIgnoringBatteryOptimizations(chatModel.controller.appContext)
+  }
+
+  /*
+  * It takes 1-10 milliseconds to process this function. Better to do it in a background thread
+  * */
+  fun schedulePeriodicServiceRestartWorker() = CoroutineScope(Dispatchers.Default).launch {
+    if (!allowToStartServiceAfterAppExit()) {
+      return@launch
+    }
+    val workerVersion = chatController.appPrefs.autoRestartWorkerVersion.get()
+    val workPolicy = if (workerVersion == SimplexService.SERVICE_START_WORKER_VERSION) {
+      Log.d(TAG, "ServiceStartWorker version matches: choosing KEEP as existing work policy")
+      ExistingPeriodicWorkPolicy.KEEP
+    } else {
+      Log.d(TAG, "ServiceStartWorker version DOES NOT MATCH: choosing REPLACE as existing work policy")
+      chatController.appPrefs.autoRestartWorkerVersion.set(SimplexService.SERVICE_START_WORKER_VERSION)
+      ExistingPeriodicWorkPolicy.REPLACE
+    }
+    val work = PeriodicWorkRequestBuilder<SimplexService.ServiceStartWorker>(SimplexService.SERVICE_START_WORKER_INTERVAL_MINUTES, TimeUnit.MINUTES)
+      .addTag(SimplexService.TAG)
+      .addTag(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC)
+      .build()
+    Log.d(TAG, "ServiceStartWorker: Scheduling period work every ${SimplexService.SERVICE_START_WORKER_INTERVAL_MINUTES} minutes")
+    WorkManager.getInstance(context)?.enqueueUniquePeriodicWork(SimplexService.SERVICE_START_WORKER_WORK_NAME_PERIODIC, workPolicy, work)
+  }
+
  companion object {
    lateinit var context: SimplexApp private set

    init {
-      val socketName = "local.socket.address.listen.native.cmd2"
+      val socketName = BuildConfig.APPLICATION_ID + ".local.socket.address.listen.native.cmd2"
      val s = Semaphore(0)
      thread(name="stdout/stderr pipe") {
        Log.d(TAG, "starting server")
@@ -95,12 +127,13 @@ class SimplexApp: Application(), LifecycleEventObserver {
          val inStream = receiver.inputStream
          val inStreamReader = InputStreamReader(inStream)
          val input = BufferedReader(inStreamReader)
-
+          Log.d(TAG, "starting receiver loop")
          while (true) {
            val line = input.readLine() ?: break
            Log.w("$TAG (stdout/stderr)", line)
            logbuffer.add(line)
          }
+          Log.w(TAG, "exited receiver loop")
        }
      }

@@ -2,7 +2,9 @@ package chat.simplex.app

 import android.app.*
 import android.content.*
+import android.content.pm.PackageManager
 import android.os.*
+import android.provider.Settings
 import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.content.ContextCompat
@@ -47,14 +49,16 @@ class SimplexService: Service() {
    val text = getString(R.string.simplex_service_notification_text)
    notificationManager = createNotificationChannel()
    serviceNotification = createNotification(title, text)
-
    startForeground(SIMPLEX_SERVICE_ID, serviceNotification)
  }

  override fun onDestroy() {
    Log.d(TAG, "Simplex service destroyed")
    stopService()
-    sendBroadcast(Intent(this, AutoRestartReceiver::class.java)) // Restart if necessary!
+
+    // If private notifications are enabled and battery optimization is disabled, restart the service
+    if (SimplexApp.context.allowToStartServiceAfterAppExit())
+      sendBroadcast(Intent(this, AutoRestartReceiver::class.java))
    super.onDestroy()
  }

@@ -71,7 +75,6 @@ class SimplexService: Service() {
        } else {
          Log.w(TAG, "Starting foreground service")
          chatController.startChat(user)
-          chatController.startReceiver()
          isServiceStarted = true
          saveServiceState(self, ServiceState.STARTED)
          wakeLock = (getSystemService(Context.POWER_SERVICE) as PowerManager).run {
@@ -98,7 +101,6 @@ class SimplexService: Service() {
    } catch (e: Exception) {
      Log.d(TAG, "Service stopped without being started: ${e.message}")
    }
-
    isServiceStarted = false
    saveServiceState(this, ServiceState.STOPPED)
  }
@@ -120,15 +122,27 @@ class SimplexService: Service() {
    val pendingIntent: PendingIntent = Intent(this, MainActivity::class.java).let { notificationIntent ->
      PendingIntent.getActivity(this, 0, notificationIntent, PendingIntent.FLAG_IMMUTABLE)
    }
-    return NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
-      .setSmallIcon(R.drawable.ntf_icon)
+
+    val builder =  NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
+      .setSmallIcon(R.drawable.ntf_service_icon)
      .setColor(0x88FFFF)
      .setContentTitle(title)
      .setContentText(text)
      .setContentIntent(pendingIntent)
-      .setSound(null)
+      .setSilent(true)
      .setShowWhen(false) // no date/time
-      .build()
+
+    // Shows a button which opens notification channel settings
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+      val flags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
+      val setupIntent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
+      setupIntent.putExtra(Settings.EXTRA_APP_PACKAGE, packageName)
+      setupIntent.putExtra(Settings.EXTRA_CHANNEL_ID, NOTIFICATION_CHANNEL_ID)
+      val setup = PendingIntent.getActivity(this, 0, setupIntent, flags)
+      builder.addAction(0, getString(R.string.hide_notification), setup)
+    }
+
+    return builder.build()
  }

  override fun onBind(intent: Intent): IBinder? {
@@ -137,6 +151,11 @@ class SimplexService: Service() {

  // re-schedules the task when "Clear recent apps" is pressed
  override fun onTaskRemoved(rootIntent: Intent) {
+    // If private notifications aren't enabled or battery optimization isn't disabled, we shouldn't restart the service
+    if (!SimplexApp.context.allowToStartServiceAfterAppExit()) {
+      return
+    }
+
    val restartServiceIntent = Intent(applicationContext, SimplexService::class.java).also {
      it.setPackage(packageName)
    };
@@ -152,6 +171,17 @@ class SimplexService: Service() {
      Log.d(TAG, "StartReceiver: onReceive called")
      scheduleStart(context)
    }
+    companion object {
+      fun toggleReceiver(enable: Boolean) {
+        Log.d(TAG, "StartReceiver: toggleReceiver enabled: $enable")
+        val component = ComponentName(BuildConfig.APPLICATION_ID, StartReceiver::class.java.name)
+        SimplexApp.context.packageManager.setComponentEnabledSetting(
+          component,
+          if (enable) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+          PackageManager.DONT_KILL_APP
+        )
+      }
+    }
  }

  // restart on destruction
@@ -23,9 +23,14 @@ class ChatModel(val controller: ChatController) {
  val onboardingStage = mutableStateOf<OnboardingStage?>(null)
  val currentUser = mutableStateOf<User?>(null)
  val userCreated = mutableStateOf<Boolean?>(null)
+  val chatRunning = mutableStateOf<Boolean?>(null)
+  val chatDbChanged = mutableStateOf<Boolean>(false)
  val chats = mutableStateListOf<Chat>()
+
+  // current chat
  val chatId = mutableStateOf<String?>(null)
  val chatItems = mutableStateListOf<ChatItem>()
+  val groupMembers = mutableStateListOf<GroupMember>()

  var connReqInvitation: String? = null
  val terminalItems = mutableStateListOf<TerminalItem>()
@@ -45,8 +50,8 @@ class ChatModel(val controller: ChatController) {

  // current WebRTC call
  val callManager = CallManager(this)
-  val callInvitations = mutableStateMapOf<String, CallInvitation>()
-  val activeCallInvitation = mutableStateOf<CallInvitation?>(null)
+  val callInvitations = mutableStateMapOf<String, RcvCallInvitation>()
+  val activeCallInvitation = mutableStateOf<RcvCallInvitation?>(null)
  val activeCall = mutableStateOf<Call?>(null)
  val callCommand = mutableStateOf<WCallCommand?>(null)
  val showCallView = mutableStateOf(false)
@@ -71,12 +76,14 @@ class ChatModel(val controller: ChatController) {

  fun updateContactConnection(contactConnection: PendingContactConnection) = updateChat(ChatInfo.ContactConnection(contactConnection))

-  fun updateContact(contact: Contact) = updateChat(ChatInfo.Direct(contact))
+  fun updateContact(contact: Contact) = updateChat(ChatInfo.Direct(contact), addMissing = !contact.isIndirectContact)

-  private fun updateChat(cInfo: ChatInfo) {
+  fun updateGroup(groupInfo: GroupInfo) = updateChat(ChatInfo.Group(groupInfo))
+
+  private fun updateChat(cInfo: ChatInfo, addMissing: Boolean = true) {
    if (hasChat(cInfo.id)) {
      updateChatInfo(cInfo)
-    } else {
+    } else if (addMissing) {
      addChat(Chat(chatInfo = cInfo, chatItems = arrayListOf()))
    }
  }
@@ -204,27 +211,39 @@ class ChatModel(val controller: ChatController) {
    }
  }

-  fun markChatItemsRead(cInfo: ChatInfo) {
+  fun markChatItemsRead(cInfo: ChatInfo, range: CC.ItemRange? = null, unreadCountAfter: Int? = null) {
+    val markedRead = markItemsReadInCurrentChat(cInfo, range)
    // update preview
    val chatIdx = getChatIndex(cInfo.id)
    if (chatIdx >= 0) {
      val chat = chats[chatIdx]
      val lastId = chat.chatItems.lastOrNull()?.id
      if (lastId != null) {
-        chats[chatIdx] = chat.copy(chatStats = chat.chatStats.copy(unreadCount = 0, minUnreadItemId = lastId + 1))
+        chats[chatIdx] = chat.copy(
+          chatStats = chat.chatStats.copy(
+            unreadCount = unreadCountAfter ?: if (range != null) chat.chatStats.unreadCount - markedRead else 0,
+            // Can't use minUnreadItemId currently since chat items can have unread items between read items
+            //minUnreadItemId = if (range != null) kotlin.math.max(chat.chatStats.minUnreadItemId, range.to + 1) else lastId + 1
+          )
+        )
      }
    }
-    // update current chat
+  }
+
+  private fun markItemsReadInCurrentChat(cInfo: ChatInfo, range: CC.ItemRange? = null): Int {
+    var markedRead = 0
    if (chatId.value == cInfo.id) {
      var i = 0
      while (i < chatItems.count()) {
        val item = chatItems[i]
-        if (item.meta.itemStatus is CIStatus.RcvNew) {
+        if (item.meta.itemStatus is CIStatus.RcvNew && (range == null || (range.from <= item.id && item.id <= range.to))) {
          chatItems[i] = item.withStatus(CIStatus.RcvRead())
+          markedRead++
        }
        i += 1
      }
    }
+    return markedRead
  }

 //  func popChat(_ id: String) {
@@ -241,6 +260,22 @@ class ChatModel(val controller: ChatController) {
  fun removeChat(id: String) {
    chats.removeAll { it.id == id }
  }
+
+  fun upsertGroupMember(groupInfo: GroupInfo, member: GroupMember): Boolean {
+    // update current chat
+    return if (chatId.value == groupInfo.id) {
+      val memberIndex = groupMembers.indexOfFirst { it.id == member.id }
+      if (memberIndex >= 0) {
+        groupMembers[memberIndex] = member
+        false
+      } else {
+        groupMembers.add(member)
+        true
+      }
+    } else {
+      false
+    }
+  }
 }

 enum class ChatType(val type: String) {
@@ -289,6 +324,7 @@ interface SomeChat {
  val id: ChatId
  val apiId: Long
  val ready: Boolean
+  val sendMsgEnabled: Boolean
  val createdAt: Instant
  val updatedAt: Instant
 }
@@ -310,7 +346,12 @@ data class Chat (

  @Serializable
  sealed class NetworkStatus {
-    val statusString: String get() = if (this is Connected) generalGetString(R.string.server_connected) else generalGetString(R.string.server_connecting)
+    val statusString: String get() =
+      when (this) {
+        is Connected -> generalGetString(R.string.server_connected)
+        is Error -> generalGetString(R.string.server_error)
+        else -> generalGetString(R.string.server_connecting)
+      }
    val statusExplanation: String get() =
      when (this) {
        is Connected -> generalGetString(R.string.connected_to_server_to_receive_messages_from_contact)
@@ -341,6 +382,7 @@ sealed class ChatInfo: SomeChat, NamedChat {
    override val id get() = contact.id
    override val apiId get() = contact.apiId
    override val ready get() = contact.ready
+    override val sendMsgEnabled get() = contact.sendMsgEnabled
    override val createdAt get() = contact.createdAt
    override val updatedAt get() = contact.updatedAt
    override val displayName get() = contact.displayName
@@ -359,6 +401,7 @@ sealed class ChatInfo: SomeChat, NamedChat {
    override val id get() = groupInfo.id
    override val apiId get() = groupInfo.apiId
    override val ready get() = groupInfo.ready
+    override val sendMsgEnabled get() = groupInfo.sendMsgEnabled
    override val createdAt get() = groupInfo.createdAt
    override val updatedAt get() = groupInfo.updatedAt
    override val displayName get() = groupInfo.displayName
@@ -377,6 +420,7 @@ sealed class ChatInfo: SomeChat, NamedChat {
    override val id get() = contactRequest.id
    override val apiId get() = contactRequest.apiId
    override val ready get() = contactRequest.ready
+    override val sendMsgEnabled get() = contactRequest.sendMsgEnabled
    override val createdAt get() = contactRequest.createdAt
    override val updatedAt get() = contactRequest.updatedAt
    override val displayName get() = contactRequest.displayName
@@ -395,6 +439,7 @@ sealed class ChatInfo: SomeChat, NamedChat {
    override val id get() = contactConnection.id
    override val apiId get() = contactConnection.apiId
    override val ready get() = contactConnection.ready
+    override val sendMsgEnabled get() = contactConnection.sendMsgEnabled
    override val createdAt get() = contactConnection.createdAt
    override val updatedAt get() = contactConnection.updatedAt
    override val displayName get() = contactConnection.displayName
@@ -415,6 +460,7 @@ class Contact(
  val profile: Profile,
  val activeConn: Connection,
  val viaGroup: Long? = null,
+//  val chatSettings: ChatSettings,
  override val createdAt: Instant,
  override val updatedAt: Instant
 ): SomeChat, NamedChat {
@@ -422,10 +468,14 @@ class Contact(
  override val id get() = "@$contactId"
  override val apiId get() = contactId
  override val ready get() = activeConn.connStatus == ConnStatus.Ready
+  override val sendMsgEnabled get() = true
  override val displayName get() = profile.displayName
  override val fullName get() = profile.fullName
  override val image get() = profile.image

+  val isIndirectContact: Boolean get() =
+    activeConn.connLevel > 0 || viaGroup != null
+
  companion object {
    val sampleData = Contact(
      contactId = 1,
@@ -453,10 +503,10 @@ class ContactSubStatus(
 )

@Serializable
-class Connection(val connId: Long, val connStatus: ConnStatus) {
+class Connection(val connId: Long, val connStatus: ConnStatus, val connLevel: Int) {
  val id: ChatId get() = ":$connId"
  companion object {
-    val sampleData = Connection(connId = 1, connStatus = ConnStatus.Ready)
+    val sampleData = Connection(connId = 1, connStatus = ConnStatus.Ready, connLevel = 0)
  }
 }

@@ -466,6 +516,11 @@ class Profile(
  override val fullName: String,
  override val image: String? = null
 ): NamedChat {
+  val profileViewName: String
+    get() {
+      return if (fullName == "" || displayName == fullName) displayName else "$displayName ($fullName)"
+    }
+
  companion object {
    val sampleData = Profile(
      displayName = "alice",
@@ -474,11 +529,19 @@ class Profile(
  }
 }

+@Serializable
+class Group (
+  val groupInfo: GroupInfo,
+  var members: List<GroupMember>
+)
+
@Serializable
 class GroupInfo (
  val groupId: Long,
  override val localDisplayName: String,
  val groupProfile: GroupProfile,
+  val membership: GroupMember,
+  //  val chatSettings: ChatSettings,
  override val createdAt: Instant,
  override val updatedAt: Instant
 ): SomeChat, NamedChat {
@@ -486,15 +549,26 @@ class GroupInfo (
  override val id get() = "#$groupId"
  override val apiId get() = groupId
  override val ready get() = true
+  override val sendMsgEnabled get() = membership.memberActive
  override val displayName get() = groupProfile.displayName
  override val fullName get() = groupProfile.fullName
  override val image get() = groupProfile.image

+  val canEdit: Boolean
+    get() = membership.memberRole == GroupMemberRole.Owner && membership.memberCurrent
+
+  val canDelete: Boolean
+    get() = membership.memberRole == GroupMemberRole.Owner || !membership.memberCurrent
+
+  val canAddMembers: Boolean
+    get() = membership.memberRole >= GroupMemberRole.Admin && membership.memberActive
+
  companion object {
    val sampleData = GroupInfo(
      groupId = 1,
      localDisplayName = "team",
      groupProfile = GroupProfile.sampleData,
+      membership = GroupMember.sampleData,
      createdAt = Clock.System.now(),
      updatedAt = Clock.System.now()
    )
@@ -518,27 +592,148 @@ class GroupProfile (
@Serializable
 class GroupMember (
  val groupMemberId: Long,
+  val groupId: Long,
  val memberId: String,
-//    var memberRole: GroupMemberRole
-//    var memberCategory: GroupMemberCategory
-//    var memberStatus: GroupMemberStatus
-//    var invitedBy: InvitedBy
+  var memberRole: GroupMemberRole,
+  var memberCategory: GroupMemberCategory,
+  var memberStatus: GroupMemberStatus,
+  var invitedBy: InvitedBy,
  val localDisplayName: String,
  val memberProfile: Profile,
-  val memberContactId: Long?
-//    var activeConn: Connection?
+  val memberContactId: Long? = null,
+  var activeConn: Connection? = null
 ) {
+  val id: String get() = "#$groupId @$groupMemberId"
+  val displayName: String get() = memberProfile.displayName
+  val fullName: String get() = memberProfile.fullName
+  val image: String? get() = memberProfile.image
+
+  val chatViewName: String
+    get() = displayName + (if (fullName == "" || fullName == displayName) "" else " / $fullName")
+
+  val memberActive: Boolean get() = when (this.memberStatus) {
+    GroupMemberStatus.MemRemoved -> false
+    GroupMemberStatus.MemLeft -> false
+    GroupMemberStatus.MemGroupDeleted -> false
+    GroupMemberStatus.MemInvited -> false
+    GroupMemberStatus.MemIntroduced -> false
+    GroupMemberStatus.MemIntroInvited -> false
+    GroupMemberStatus.MemAccepted -> false
+    GroupMemberStatus.MemAnnounced -> false
+    GroupMemberStatus.MemConnected -> true
+    GroupMemberStatus.MemComplete -> true
+    GroupMemberStatus.MemCreator -> true
+  }
+
+  val memberCurrent: Boolean get() = when (this.memberStatus) {
+    GroupMemberStatus.MemRemoved -> false
+    GroupMemberStatus.MemLeft -> false
+    GroupMemberStatus.MemGroupDeleted -> false
+    GroupMemberStatus.MemInvited -> false
+    GroupMemberStatus.MemIntroduced -> true
+    GroupMemberStatus.MemIntroInvited -> true
+    GroupMemberStatus.MemAccepted -> true
+    GroupMemberStatus.MemAnnounced -> true
+    GroupMemberStatus.MemConnected -> true
+    GroupMemberStatus.MemComplete -> true
+    GroupMemberStatus.MemCreator -> true
+  }
+
+  fun canBeRemoved(membership: GroupMember): Boolean {
+    val userRole = membership.memberRole
+    return memberStatus != GroupMemberStatus.MemRemoved && memberStatus != GroupMemberStatus.MemLeft
+        && userRole >= GroupMemberRole.Admin && userRole >= memberRole && membership.memberCurrent
+  }
+
  companion object {
    val sampleData = GroupMember(
      groupMemberId = 1,
+      groupId = 1,
      memberId = "abcd",
+      memberRole = GroupMemberRole.Member,
+      memberCategory = GroupMemberCategory.InviteeMember,
+      memberStatus = GroupMemberStatus.MemComplete,
+      invitedBy = InvitedBy.IBUser(),
      localDisplayName = "alice",
      memberProfile = Profile.sampleData,
-      memberContactId = 1
+      memberContactId = 1,
+      activeConn = Connection.sampleData
    )
  }
 }

+@Serializable
+enum class GroupMemberRole(val memberRole: String) {
+  @SerialName("member") Member("member"), // order matters in comparisons
+  @SerialName("admin") Admin("admin"),
+  @SerialName("owner") Owner("owner");
+
+  val text: String get() = when (this) {
+    Member -> generalGetString(R.string.group_member_role_member)
+    Admin -> generalGetString(R.string.group_member_role_admin)
+    Owner -> generalGetString(R.string.group_member_role_owner)
+  }
+}
+
+@Serializable
+enum class GroupMemberCategory {
+  @SerialName("user") UserMember,
+  @SerialName("invitee") InviteeMember,
+  @SerialName("host") HostMember,
+  @SerialName("pre") PreMember,
+  @SerialName("post") PostMember;
+}
+
+@Serializable
+enum class GroupMemberStatus {
+  @SerialName("removed") MemRemoved,
+  @SerialName("left") MemLeft,
+  @SerialName("deleted") MemGroupDeleted,
+  @SerialName("invited") MemInvited,
+  @SerialName("introduced") MemIntroduced,
+  @SerialName("intro-inv") MemIntroInvited,
+  @SerialName("accepted") MemAccepted,
+  @SerialName("announced") MemAnnounced,
+  @SerialName("connected") MemConnected,
+  @SerialName("complete") MemComplete,
+  @SerialName("creator") MemCreator;
+
+  val text: String get() = when (this) {
+    MemRemoved -> generalGetString(R.string.group_member_status_removed)
+    MemLeft -> generalGetString(R.string.group_member_status_left)
+    MemGroupDeleted -> generalGetString(R.string.group_member_status_group_deleted)
+    MemInvited -> generalGetString(R.string.group_member_status_invited)
+    MemIntroduced -> generalGetString(R.string.group_member_status_introduced)
+    MemIntroInvited -> generalGetString(R.string.group_member_status_intro_invitation)
+    MemAccepted -> generalGetString(R.string.group_member_status_accepted)
+    MemAnnounced -> generalGetString(R.string.group_member_status_announced)
+    MemConnected -> generalGetString(R.string.group_member_status_connected)
+    MemComplete -> generalGetString(R.string.group_member_status_complete)
+    MemCreator -> generalGetString(R.string.group_member_status_creator)
+  }
+
+  val shortText: String get() = when (this) {
+    MemRemoved -> generalGetString(R.string.group_member_status_removed)
+    MemLeft -> generalGetString(R.string.group_member_status_left)
+    MemGroupDeleted -> generalGetString(R.string.group_member_status_group_deleted)
+    MemInvited -> generalGetString(R.string.group_member_status_invited)
+    MemIntroduced -> generalGetString(R.string.group_member_status_connecting)
+    MemIntroInvited -> generalGetString(R.string.group_member_status_connecting)
+    MemAccepted -> generalGetString(R.string.group_member_status_connecting)
+    MemAnnounced -> generalGetString(R.string.group_member_status_connecting)
+    MemConnected -> generalGetString(R.string.group_member_status_connected)
+    MemComplete -> generalGetString(R.string.group_member_status_complete)
+    MemCreator -> generalGetString(R.string.group_member_status_creator)
+  }
+}
+
+@Serializable
+sealed class InvitedBy {
+  @Serializable @SerialName("contact") class IBContact(val byContactId: Long): InvitedBy()
+  @Serializable @SerialName("user") class IBUser: InvitedBy()
+  @Serializable @SerialName("unknown") class IBUnknown: InvitedBy()
+}
+
@Serializable
 class LinkPreview (
  val uri: String,
@@ -574,6 +769,7 @@ class UserContactRequest (
  override val id get() = "<@$contactRequestId"
  override val apiId get() = contactRequestId
  override val ready get() = true
+  override val sendMsgEnabled get() = false
  override val displayName get() = profile.displayName
  override val fullName get() = profile.fullName
  override val image get() = profile.image
@@ -602,6 +798,7 @@ class PendingContactConnection(
  override val id get () = ":$pccConnId"
  override val apiId get() = pccConnId
  override val ready get() = false
+  override val sendMsgEnabled get() = false
  override val localDisplayName get() = String.format(generalGetString(R.string.connection_local_display_name), pccConnId)
  override val displayName: String get() {
    val initiated = pccConnStatus.initiated
@@ -758,6 +955,24 @@ data class ChatItem (
        quotedItem = null,
        file = null
      )
+
+    fun getGroupInvitationSample(status: CIGroupInvitationStatus = CIGroupInvitationStatus.Pending) =
+      ChatItem(
+        chatDir = CIDirection.DirectRcv(),
+        meta = CIMeta.getSample(1, Clock.System.now(), "received invitation to join group team as admin", CIStatus.RcvRead(), itemDeleted = false, itemEdited = false, editable = false),
+        content = CIContent.RcvGroupInvitation(groupInvitation = CIGroupInvitation.getSample(status = status), memberRole = GroupMemberRole.Admin),
+        quotedItem = null,
+        file = null
+      )
+
+    fun getGroupEventSample() =
+      ChatItem(
+        chatDir = CIDirection.DirectRcv(),
+        meta = CIMeta.getSample(1, Clock.System.now(), "group event text", CIStatus.RcvRead(), itemDeleted = false, itemEdited = false, editable = false),
+        content = CIContent.RcvGroupEventContent(rcvGroupEvent = RcvGroupEvent.MemberAdded(groupMemberId = 1, profile = Profile.sampleData)),
+        quotedItem = null,
+        file = null
+      )
  }
 }

@@ -848,6 +1063,10 @@ sealed class CIContent: ItemContent {
  @Serializable @SerialName("sndCall") class SndCall(val status: CICallStatus, val duration: Int): CIContent() { override val msgContent: MsgContent? get() = null }
  @Serializable @SerialName("rcvCall") class RcvCall(val status: CICallStatus, val duration: Int): CIContent() { override val msgContent: MsgContent? get() = null }
  @Serializable @SerialName("rcvIntegrityError") class RcvIntegrityError(val msgError: MsgErrorType): CIContent() { override val msgContent: MsgContent? get() = null }
+  @Serializable @SerialName("rcvGroupInvitation") class RcvGroupInvitation(val groupInvitation: CIGroupInvitation, val memberRole: GroupMemberRole): CIContent() { override val msgContent: MsgContent? get() = null }
+  @Serializable @SerialName("sndGroupInvitation") class SndGroupInvitation(val groupInvitation: CIGroupInvitation, val memberRole: GroupMemberRole): CIContent() { override val msgContent: MsgContent? get() = null }
+  @Serializable @SerialName("rcvGroupEvent") class RcvGroupEventContent(val rcvGroupEvent: RcvGroupEvent): CIContent() { override val msgContent: MsgContent? get() = null }
+  @Serializable @SerialName("sndGroupEvent") class SndGroupEventContent(val sndGroupEvent: SndGroupEvent): CIContent() { override val msgContent: MsgContent? get() = null }

  override val text: String get() = when(this) {
    is SndMsgContent -> msgContent.text
@@ -857,6 +1076,10 @@ sealed class CIContent: ItemContent {
    is SndCall -> status.text(duration)
    is RcvCall -> status.text(duration)
    is RcvIntegrityError -> msgError.text
+    is RcvGroupInvitation -> groupInvitation.text
+    is SndGroupInvitation -> groupInvitation.text
+    is RcvGroupEventContent -> rcvGroupEvent.text
+    is SndGroupEventContent -> sndGroupEvent.text
  }
 }

@@ -950,6 +1173,36 @@ sealed class MsgContent {
  }
 }

+@Serializable
+class CIGroupInvitation (
+  val groupId: Long,
+  val groupMemberId: Long,
+  val localDisplayName: String,
+  val groupProfile: GroupProfile,
+  val status: CIGroupInvitationStatus
+  ) {
+  val text: String get() = String.format(generalGetString(R.string.group_invitation_item_description), groupProfile.displayName)
+
+  companion object {
+    fun getSample(
+      groupId: Long = 1,
+      groupMemberId: Long = 1,
+      localDisplayName: String = "team",
+      groupProfile: GroupProfile = GroupProfile.sampleData,
+      status: CIGroupInvitationStatus = CIGroupInvitationStatus.Pending
+    ): CIGroupInvitation =
+      CIGroupInvitation(groupId = groupId, groupMemberId = groupMemberId, localDisplayName = localDisplayName, groupProfile = groupProfile, status = status)
+  }
+}
+
+@Serializable
+enum class CIGroupInvitationStatus {
+  @SerialName("pending") Pending,
+  @SerialName("accepted") Accepted,
+  @SerialName("rejected") Rejected,
+  @SerialName("expired") Expired;
+}
+
 object MsgContentSerializer : KSerializer<MsgContent> {
  override val descriptor: SerialDescriptor = buildSerialDescriptor("MsgContent", PolymorphicKind.SEALED) {
    element("MCText", buildClassSerialDescriptor("MCText") {
@@ -1135,3 +1388,37 @@ sealed class MsgErrorType() {
    is MsgDuplicate -> generalGetString(R.string.integrity_msg_duplicate) // not used now
  }
 }
+
+@Serializable
+sealed class RcvGroupEvent() {
+  @Serializable @SerialName("memberAdded") class MemberAdded(val groupMemberId: Long, val profile: Profile): RcvGroupEvent()
+  @Serializable @SerialName("memberConnected") class MemberConnected(): RcvGroupEvent()
+  @Serializable @SerialName("memberLeft") class MemberLeft(): RcvGroupEvent()
+  @Serializable @SerialName("memberDeleted") class MemberDeleted(val groupMemberId: Long, val profile: Profile): RcvGroupEvent()
+  @Serializable @SerialName("userDeleted") class UserDeleted(): RcvGroupEvent()
+  @Serializable @SerialName("groupDeleted") class GroupDeleted(): RcvGroupEvent()
+  @Serializable @SerialName("groupUpdated") class GroupUpdated(val groupProfile: GroupProfile): RcvGroupEvent()
+
+  val text: String get() = when (this) {
+    is MemberAdded -> String.format(generalGetString(R.string.rcv_group_event_member_added), profile.profileViewName)
+    is MemberConnected -> generalGetString(R.string.rcv_group_event_member_connected)
+    is MemberLeft -> generalGetString(R.string.rcv_group_event_member_left)
+    is MemberDeleted -> String.format(generalGetString(R.string.rcv_group_event_member_deleted), profile.profileViewName)
+    is UserDeleted -> generalGetString(R.string.rcv_group_event_user_deleted)
+    is GroupDeleted -> generalGetString(R.string.rcv_group_event_group_deleted)
+    is GroupUpdated -> generalGetString(R.string.rcv_group_event_updated_group_profile)
+  }
+}
+
+@Serializable
+sealed class SndGroupEvent() {
+  @Serializable @SerialName("memberDeleted") class MemberDeleted(val groupMemberId: Long, val profile: Profile): SndGroupEvent()
+  @Serializable @SerialName("userLeft") class UserLeft(): SndGroupEvent()
+  @Serializable @SerialName("groupUpdated") class GroupUpdated(val groupProfile: GroupProfile): SndGroupEvent()
+
+  val text: String get() = when (this) {
+    is MemberDeleted -> String.format(generalGetString(R.string.snd_group_event_member_deleted), profile.profileViewName)
+    is UserLeft -> generalGetString(R.string.snd_group_event_user_left)
+    is GroupUpdated -> generalGetString(R.string.snd_group_event_group_profile_updated)
+  }
+}
@@ -102,7 +102,7 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
    }
  }

-  fun notifyCallInvitation(invitation: CallInvitation) {
+  fun notifyCallInvitation(invitation: RcvCallInvitation) {
    if (isAppOnForeground(context)) return
    val contactId = invitation.contact.id
    Log.d(TAG, "notifyCallInvitation $contactId")
@@ -124,7 +124,7 @@ class NtfManager(val context: Context, private val appPreferences: AppPreference
          .setSound(soundUri)
      }
    val text = generalGetString(
-      if (invitation.peerMedia == CallMediaType.Video) {
+      if (invitation.callType.media == CallMediaType.Video) {
        if (invitation.sharedKey == null) R.string.video_call_no_encryption else R.string.encrypted_video_call
      } else {
        if (invitation.sharedKey == null) R.string.audio_call_no_encryption else R.string.encrypted_audio_call
@@ -5,6 +5,7 @@ import android.app.ActivityManager
 import android.app.ActivityManager.RunningAppProcessInfo
 import android.app.Application
 import android.content.*
+import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
 import android.os.PowerManager
@@ -81,6 +82,18 @@ class AppPreferences(val context: Context) {
  val privacyAcceptImages = mkBoolPreference(SHARED_PREFS_PRIVACY_ACCEPT_IMAGES, true)
  val privacyLinkPreviews = mkBoolPreference(SHARED_PREFS_PRIVACY_LINK_PREVIEWS, true)
  val experimentalCalls = mkBoolPreference(SHARED_PREFS_EXPERIMENTAL_CALLS, false)
+  val chatArchiveName = mkStrPreference(SHARED_PREFS_CHAT_ARCHIVE_NAME, null)
+  val chatArchiveTime = mkDatePreference(SHARED_PREFS_CHAT_ARCHIVE_TIME, null)
+  val chatLastStart = mkDatePreference(SHARED_PREFS_CHAT_LAST_START, null)
+  val developerTools = mkBoolPreference(SHARED_PREFS_DEVELOPER_TOOLS, false)
+  val networkUseSocksProxy = mkBoolPreference(SHARED_PREFS_NETWORK_USE_SOCKS_PROXY, false)
+  val networkTCPConnectTimeout = mkTimeoutPreference(SHARED_PREFS_NETWORK_TCP_CONNECT_TIMEOUT, NetCfg.defaults.tcpConnectTimeout, NetCfg.proxyDefaults.tcpConnectTimeout)
+  val networkTCPTimeout = mkTimeoutPreference(SHARED_PREFS_NETWORK_TCP_TIMEOUT, NetCfg.defaults.tcpTimeout, NetCfg.proxyDefaults.tcpTimeout)
+  val networkSMPPingInterval = mkLongPreference(SHARED_PREFS_NETWORK_SMP_PING_INTERVAL, NetCfg.defaults.smpPingInterval)
+  val networkEnableKeepAlive = mkBoolPreference(SHARED_PREFS_NETWORK_ENABLE_KEEP_ALIVE, NetCfg.defaults.enableKeepAlive)
+  val networkTCPKeepIdle = mkIntPreference(SHARED_PREFS_NETWORK_TCP_KEEP_IDLE, KeepAliveOpts.defaults.keepIdle)
+  val networkTCPKeepIntvl = mkIntPreference(SHARED_PREFS_NETWORK_TCP_KEEP_INTVL, KeepAliveOpts.defaults.keepIntvl)
+  val networkTCPKeepCnt = mkIntPreference(SHARED_PREFS_NETWORK_TCP_KEEP_CNT, KeepAliveOpts.defaults.keepCnt)

  private fun mkIntPreference(prefName: String, default: Int) =
    Preference(
@@ -88,6 +101,20 @@ class AppPreferences(val context: Context) {
      set = fun(value) = sharedPreferences.edit().putInt(prefName, value).apply()
    )

+  private fun mkLongPreference(prefName: String, default: Long) =
+    Preference(
+      get = fun() = sharedPreferences.getLong(prefName, default),
+      set = fun(value) = sharedPreferences.edit().putLong(prefName, value).apply()
+    )
+
+  private fun mkTimeoutPreference(prefName: String, default: Long, proxyDefault: Long): Preference<Long> {
+    val d = if (networkUseSocksProxy.get()) proxyDefault else default
+    return Preference(
+      get = fun() = sharedPreferences.getLong(prefName, d),
+      set = fun(value) = sharedPreferences.edit().putLong(prefName, value).apply()
+    )
+  }
+
  private fun mkBoolPreference(prefName: String, default: Boolean) =
    Preference(
      get = fun() = sharedPreferences.getBoolean(prefName, default),
@@ -100,6 +127,15 @@ class AppPreferences(val context: Context) {
      set = fun(value) = sharedPreferences.edit().putString(prefName, value).apply()
    )

+  private fun mkDatePreference(prefName: String, default: Instant?): Preference<Instant?> =
+    Preference(
+      get = {
+        val pref = sharedPreferences.getString(prefName, default?.toEpochMilliseconds()?.toString())
+        pref?.let { Instant.fromEpochMilliseconds(pref.toLong()) }
+      },
+      set = fun(value) = sharedPreferences.edit().putString(prefName, value?.toEpochMilliseconds()?.toString()).apply()
+    )
+
  companion object {
    private const val SHARED_PREFS_ID = "chat.simplex.app.SIMPLEX_APP_PREFS"
    private const val SHARED_PREFS_AUTO_RESTART_WORKER_VERSION = "AutoRestartWorkerVersion"
@@ -113,12 +149,26 @@ class AppPreferences(val context: Context) {
    private const val SHARED_PREFS_PRIVACY_ACCEPT_IMAGES = "PrivacyAcceptImages"
    private const val SHARED_PREFS_PRIVACY_LINK_PREVIEWS = "PrivacyLinkPreviews"
    private const val SHARED_PREFS_EXPERIMENTAL_CALLS = "ExperimentalCalls"
-
+    private const val SHARED_PREFS_CHAT_ARCHIVE_NAME = "ChatArchiveName"
+    private const val SHARED_PREFS_CHAT_ARCHIVE_TIME = "ChatArchiveTime"
+    private const val SHARED_PREFS_CHAT_LAST_START = "ChatLastStart"
+    private const val SHARED_PREFS_DEVELOPER_TOOLS = "DeveloperTools"
+    private const val SHARED_PREFS_NETWORK_USE_SOCKS_PROXY = "NetworkUseSocksProxy"
+    private const val SHARED_PREFS_NETWORK_TCP_CONNECT_TIMEOUT = "NetworkTCPConnectTimeout"
+    private const val SHARED_PREFS_NETWORK_TCP_TIMEOUT = "NetworkTCPTimeout"
+    private const val SHARED_PREFS_NETWORK_SMP_PING_INTERVAL = "NetworkSMPPingInterval"
+    private const val SHARED_PREFS_NETWORK_ENABLE_KEEP_ALIVE = "NetworkEnableKeepAlive"
+    private const val SHARED_PREFS_NETWORK_TCP_KEEP_IDLE = "NetworkTCPKeepIdle"
+    private const val SHARED_PREFS_NETWORK_TCP_KEEP_INTVL = "NetworkTCPKeepIntvl"
+    private const val SHARED_PREFS_NETWORK_TCP_KEEP_CNT = "NetworkTCPKeepCnt"
  }
 }

+private const val MESSAGE_TIMEOUT: Int = 15_000_000
+
 open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager, val appContext: Context, val appPrefs: AppPreferences) {
  val chatModel = ChatModel(this)
+  private var receiverStarted = false

  init {
    chatModel.runServiceInBackground.value = appPrefs.runServiceInBackground.get()
@@ -128,29 +178,36 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
  suspend fun startChat(user: User) {
    Log.d(TAG, "user: $user")
    try {
-      val chatStarted = apiStartChat()
-      apiSetFilesFolder(getAppFilesDirectory(appContext))
-      chatModel.userAddress.value = apiGetUserAddress()
-      chatModel.userSMPServers.value = getUserSMPServers()
-      val chats = apiGetChats()
-      if (chatStarted) {
-        chatModel.chats.clear()
-        chatModel.chats.addAll(chats)
-      } else {
+      if (chatModel.chatRunning.value == true) return
+      apiSetNetworkConfig(getNetCfg())
+      val justStarted = apiStartChat()
+      if (justStarted) {
+        apiSetFilesFolder(getAppFilesDirectory(appContext))
+        chatModel.userAddress.value = apiGetUserAddress()
+        chatModel.userSMPServers.value = getUserSMPServers()
+        val chats = apiGetChats()
        chatModel.updateChats(chats)
+        chatModel.currentUser.value = user
+        chatModel.userCreated.value = true
+        chatModel.onboardingStage.value = OnboardingStage.OnboardingComplete
+        chatModel.controller.appPrefs.chatLastStart.set(Clock.System.now())
+        chatModel.chatRunning.value = true
+        startReceiver()
+        Log.d(TAG, "startChat: started")
+      } else {
+        val chats = apiGetChats()
+        chatModel.updateChats(chats)
+        Log.d(TAG, "startChat: running")
      }
-      chatModel.currentUser.value = user
-      chatModel.userCreated.value = true
-      chatModel.onboardingStage.value = OnboardingStage.OnboardingComplete
-      Log.d(TAG, "chat started")
    } catch (e: Error) {
      Log.e(TAG, "failed starting chat $e")
      throw e
    }
  }

-  fun startReceiver() {
+  private fun startReceiver() {
    Log.d(TAG, "ChatController startReceiver")
+    if (receiverStarted) return
    thread(name="receiver") {
      GlobalScope.launch { withContext(Dispatchers.IO) { recvMspLoop() } }
    }
@@ -176,18 +233,23 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
    }
  }

-  suspend fun recvMsg(): CR {
+  private suspend fun recvMsg(): CR? {
    return withContext(Dispatchers.IO) {
-      val json = chatRecvMsg(ctrl)
-      val r = APIResponse.decodeStr(json).resp
-      Log.d(TAG, "chatRecvMsg: ${r.responseType}")
-      if (r is CR.Response || r is CR.Invalid) Log.d(TAG, "chatRecvMsg json: $json")
-      r
+      val json = chatRecvMsgWait(ctrl, MESSAGE_TIMEOUT)
+      if (json == "") {
+        null
+      } else {
+        val r = APIResponse.decodeStr(json).resp
+        Log.d(TAG, "chatRecvMsg: ${r.responseType}")
+        if (r is CR.Response || r is CR.Invalid) Log.d(TAG, "chatRecvMsg json: $json")
+        r
+      }
    }
  }

-  suspend fun recvMspLoop() {
-    processReceivedMsg(recvMsg())
+  private suspend fun recvMspLoop() {
+    val msg = recvMsg()
+    if (msg != null) processReceivedMsg(msg)
    recvMspLoop()
  }

@@ -215,20 +277,46 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
    }
  }

-  suspend fun apiSetFilesFolder(filesFolder: String) {
+  suspend fun apiStopChat(): Boolean {
+    val r = sendCmd(CC.ApiStopChat())
+    when (r) {
+      is CR.ChatStopped -> return true
+      else -> throw Error("failed stopping chat: ${r.responseType} ${r.details}")
+    }
+  }
+
+  private suspend fun apiSetFilesFolder(filesFolder: String) {
    val r = sendCmd(CC.SetFilesFolder(filesFolder))
    if (r is CR.CmdOk) return
    throw Error("failed to set files folder: ${r.responseType} ${r.details}")
  }

-  suspend fun apiGetChats(): List<Chat> {
+  suspend fun apiExportArchive(config: ArchiveConfig) {
+    val r = sendCmd(CC.ApiExportArchive(config))
+    if (r is CR.CmdOk) return
+    throw Error("failed to export archive: ${r.responseType} ${r.details}")
+  }
+
+  suspend fun apiImportArchive(config: ArchiveConfig) {
+    val r = sendCmd(CC.ApiImportArchive(config))
+    if (r is CR.CmdOk) return
+    throw Error("failed to import archive: ${r.responseType} ${r.details}")
+  }
+
+  suspend fun apiDeleteStorage() {
+    val r = sendCmd(CC.ApiDeleteStorage())
+    if (r is CR.CmdOk) return
+    throw Error("failed to delete storage: ${r.responseType} ${r.details}")
+  }
+
+  private suspend fun apiGetChats(): List<Chat> {
    val r = sendCmd(CC.ApiGetChats())
    if (r is CR.ApiChats ) return r.chats
    throw Error("failed getting the list of chats: ${r.responseType} ${r.details}")
  }

-  suspend fun apiGetChat(type: ChatType, id: Long): Chat? {
-    val r = sendCmd(CC.ApiGetChat(type, id))
+  suspend fun apiGetChat(type: ChatType, id: Long, pagination: ChatPagination = ChatPagination.Last(ChatPagination.INITIAL_COUNT), search: String = ""): Chat? {
+    val r = sendCmd(CC.ApiGetChat(type, id, pagination, search))
    if (r is CR.ApiChat ) return r.chat
    Log.e(TAG, "apiGetChat bad response: ${r.responseType} ${r.details}")
    return null
@@ -256,7 +344,7 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
    return null
  }

-  suspend fun getUserSMPServers(): List<String>? {
+  private suspend fun getUserSMPServers(): List<String>? {
    val r = sendCmd(CC.GetUserSMPServers())
    if (r is CR.UserSMPServers) return r.smpServers
    Log.e(TAG, "getUserSMPServers bad response: ${r.responseType} ${r.details}")
@@ -278,6 +366,42 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
    }
  }

+  suspend fun apiGetNetworkConfig(): NetCfg? {
+    val r = sendCmd(CC.APIGetNetworkConfig())
+    if (r is CR.NetworkConfig) return r.networkConfig
+    Log.e(TAG, "apiGetNetworkConfig bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
+  suspend fun apiSetNetworkConfig(cfg: NetCfg): Boolean {
+    val r = sendCmd(CC.APISetNetworkConfig(cfg))
+    return when (r) {
+      is CR.CmdOk -> true
+      else -> {
+        Log.e(TAG, "apiSetNetworkConfig bad response: ${r.responseType} ${r.details}")
+        AlertManager.shared.showAlertMsg(
+          generalGetString(R.string.error_setting_network_config),
+          "${r.responseType}: ${r.details}"
+        )
+        false
+      }
+    }
+  }
+
+  suspend fun apiContactInfo(contactId: Long): ConnectionStats? {
+    val r = sendCmd(CC.APIContactInfo(contactId))
+    if (r is CR.ContactInfo) return r.connectionStats
+    Log.e(TAG, "apiContactInfo bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
+  suspend fun apiGroupMemberInfo(groupId: Long, groupMemberId: Long): ConnectionStats? {
+    val r = sendCmd(CC.APIGroupMemberInfo(groupId, groupMemberId))
+    if (r is CR.GroupMemberInfo) return r.connectionStats_
+    Log.e(TAG, "apiGroupMemberInfo bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
  suspend fun apiAddContact(): String? {
    val r = sendCmd(CC.AddContact())
    if (r is CR.Invitation) return r.connReqInvitation
@@ -325,6 +449,7 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
    when {
      r is CR.ContactDeleted && type == ChatType.Direct -> return true
      r is CR.ContactConnectionDeleted && type == ChatType.ContactConnection -> return true
+      r is CR.GroupDeletedUser && type == ChatType.Group -> return true
      r is CR.ChatCmdError -> {
        val e = r.chatError
        if (e is ChatError.ChatErrorChat && e.errorType is ChatErrorType.ContactGroups) {
@@ -354,6 +479,13 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
    return null
  }

+  suspend fun apiListContacts(): List<Contact>? {
+    val r = sendCmd(CC.ListContacts())
+    if (r is CR.ContactsList) return r.contacts
+    Log.e(TAG, "apiListContacts bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
  suspend fun apiUpdateProfile(profile: Profile): Profile? {
    val r = sendCmd(CC.ApiUpdateProfile(profile))
    if (r is CR.UserProfileNoChange) return profile
@@ -383,7 +515,7 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
    return false
  }

-  suspend fun apiGetUserAddress(): String? {
+  private suspend fun apiGetUserAddress(): String? {
    val r = sendCmd(CC.ShowMyAddress())
    if (r is CR.UserContactLink) return r.connReqContact
    if (r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorStore
@@ -457,10 +589,85 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
  suspend fun apiReceiveFile(fileId: Long): AChatItem? {
    val r = sendCmd(CC.ReceiveFile(fileId))
    if (r is CR.RcvFileAccepted) return r.chatItem
-    Log.e(TAG, "receiveFile bad response: ${r.responseType} ${r.details}")
+    Log.e(TAG, "apiReceiveFile bad response: ${r.responseType} ${r.details}")
    return null
  }

+  suspend fun apiNewGroup(p: GroupProfile): GroupInfo? {
+    val r = sendCmd(CC.NewGroup(p))
+    if (r is CR.GroupCreated) return r.groupInfo
+    Log.e(TAG, "apiNewGroup bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
+  suspend fun apiAddMember(groupId: Long, contactId: Long, memberRole: GroupMemberRole): GroupMember? {
+    val r = sendCmd(CC.ApiAddMember(groupId, contactId, memberRole))
+    if (r is CR.SentGroupInvitation) return r.member
+    Log.e(TAG, "apiAddMember bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
+  suspend fun apiJoinGroup(groupId: Long) {
+    val r = sendCmd(CC.ApiJoinGroup(groupId))
+    when (r) {
+      is CR.UserAcceptedGroupSent ->
+        chatModel.updateGroup(r.groupInfo)
+      is CR.ChatCmdError -> {
+        val e = r.chatError
+        suspend fun deleteGroup() { if (apiDeleteChat(ChatType.Group, groupId)) { chatModel.removeChat("#$groupId") } }
+        if (e is ChatError.ChatErrorAgent && e.agentError is AgentErrorType.SMP && e.agentError.smpErr is SMPErrorType.AUTH) {
+          deleteGroup()
+          AlertManager.shared.showAlertMsg(generalGetString(R.string.alert_title_group_invitation_expired), generalGetString(R.string.alert_message_group_invitation_expired))
+        } else if (e is ChatError.ChatErrorStore && e.storeError is StoreError.GroupNotFound) {
+          deleteGroup()
+          AlertManager.shared.showAlertMsg(generalGetString(R.string.alert_title_no_group), generalGetString(R.string.alert_message_no_group))
+        } else {
+          AlertManager.shared.showAlertMsg(generalGetString(R.string.alert_title_join_group_error), "$e")
+        }
+      }
+      else -> Log.e(TAG, "apiJoinGroup bad response: ${r.responseType} ${r.details}")
+    }
+  }
+
+  suspend fun apiRemoveMember(groupId: Long, memberId: Long): GroupMember? {
+    val r = sendCmd(CC.ApiRemoveMember(groupId, memberId))
+    if (r is CR.UserDeletedMember) return r.member
+    Log.e(TAG, "apiRemoveMember bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
+  suspend fun apiLeaveGroup(groupId: Long): GroupInfo? {
+    val r = sendCmd(CC.ApiLeaveGroup(groupId))
+    if (r is CR.LeftMemberUser) return r.groupInfo
+    Log.e(TAG, "apiLeaveGroup bad response: ${r.responseType} ${r.details}")
+    return null
+  }
+
+  suspend fun apiListMembers(groupId: Long): List<GroupMember> {
+    val r = sendCmd(CC.ApiListMembers(groupId))
+    if (r is CR.GroupMembers) return r.group.members
+    Log.e(TAG, "apiListMembers bad response: ${r.responseType} ${r.details}")
+    return emptyList()
+  }
+
+  suspend fun apiUpdateGroup(groupId: Long, groupProfile: GroupProfile): GroupInfo? {
+    return when (val r = sendCmd(CC.ApiUpdateGroupProfile(groupId, groupProfile))) {
+      is CR.GroupUpdated -> r.toGroup
+      is CR.ChatCmdError -> {
+        AlertManager.shared.showAlertMsg(generalGetString(R.string.error_saving_group_profile), "$r.chatError")
+        null
+      }
+      else -> {
+        Log.e(TAG, "apiUpdateGroup bad response: ${r.responseType} ${r.details}")
+        AlertManager.shared.showAlertMsg(
+          generalGetString(R.string.error_saving_group_profile),
+          "${r.responseType}: ${r.details}"
+        )
+        null
+      }
+    }
+  }
+
  fun apiErrorAlert(method: String, title: String, r: CR) {
    val errMsg = "${r.responseType}: ${r.details}"
    Log.e(TAG, "$method bad response: $errMsg")
@@ -520,7 +727,7 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
        if (cItem.content.msgContent is MsgContent.MCImage && file != null && file.fileSize <= MAX_IMAGE_SIZE && appPrefs.privacyAcceptImages.get()) {
          withApi { receiveFile(file.fileId) }
        }
-        if (!cItem.isCall && (!isAppOnForeground(appContext) || chatModel.chatId.value != cInfo.id)) {
+        if (!cItem.chatDir.sent && !cItem.isCall && (!isAppOnForeground(appContext) || chatModel.chatId.value != cInfo.id)) {
          ntfManager.notifyMessageReceived(cInfo, cItem)
        }
      }
@@ -547,6 +754,28 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
          chatModel.upsertChatItem(cInfo, cItem)
        }
      }
+      is CR.ReceivedGroupInvitation -> {
+        chatModel.addChat(Chat(chatInfo = ChatInfo.Group(r.groupInfo), chatItems = listOf()))
+        // TODO NtfManager.shared.notifyGroupInvitation
+      }
+      is CR.JoinedGroupMemberConnecting ->
+        chatModel.upsertGroupMember(r.groupInfo, r.member)
+      is CR.DeletedMemberUser -> // TODO update user member
+        chatModel.updateGroup(r.groupInfo)
+      is CR.DeletedMember ->
+        chatModel.upsertGroupMember(r.groupInfo, r.deletedMember)
+      is CR.LeftMember ->
+        chatModel.upsertGroupMember(r.groupInfo, r.member)
+      is CR.GroupDeleted -> // TODO update user member
+        chatModel.updateGroup(r.groupInfo)
+      is CR.UserJoinedGroup ->
+        chatModel.updateGroup(r.groupInfo)
+      is CR.JoinedGroupMember ->
+        chatModel.upsertGroupMember(r.groupInfo, r.member)
+      is CR.ConnectedToGroupMember ->
+        chatModel.upsertGroupMember(r.groupInfo, r.member)
+      is CR.GroupUpdated ->
+        chatModel.updateGroup(r.toGroup)
      is CR.RcvFileStart ->
        chatItemSimpleUpdate(r.chatItem)
      is CR.RcvFileComplete ->
@@ -566,10 +795,8 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
          removeFile(appContext, fileName)
        }
      }
-      is CR.CallInvitation -> {
-        val invitation = CallInvitation(r.contact, r.callType.media, r.sharedKey, r.callTs)
-        chatModel.callManager.reportNewIncomingCall(invitation)
-      }
+      is CR.CallInvitation ->
+        chatModel.callManager.reportNewIncomingCall(r.callInvitation)
      is CR.CallOffer -> {
        // TODO askConfirmation?
        // TODO check encryption is compatible
@@ -624,6 +851,13 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
    }
  }

+  suspend fun leaveGroup(groupId: Long) {
+    val groupInfo = apiLeaveGroup(groupId)
+    if (groupInfo != null) {
+      chatModel.updateGroup(groupInfo)
+    }
+  }
+
  private fun chatItemSimpleUpdate(aChatItem: AChatItem) {
    val cInfo = aChatItem.chatInfo
    val cItem = aChatItem.chatItem
@@ -657,7 +891,7 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
  fun showBackgroundServiceNoticeIfNeeded() {
    Log.d(TAG, "showBackgroundServiceNoticeIfNeeded")
    if (!appPrefs.backgroundServiceNoticeShown.get()) {
-      // the branch for the new users who has never seen service notice
+      // the branch for the new users who have never seen service notice
      if (isIgnoringBatteryOptimizations(appContext)) {
        showBGServiceNotice()
      } else {
@@ -670,15 +904,19 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
      // the branch for users who have app installed, and have seen the service notice,
      // but the battery optimization for the app is on (Android 12) AND the service is running
      if (appPrefs.backgroundServiceBatteryNoticeShown.get()) {
-        // users have been presented with battery notice before - they did not allow ignoring optimizitions -> disable service
+        // users have been presented with battery notice before - they did not allow ignoring optimizations -> disable service
        showDisablingServiceNotice()
        appPrefs.runServiceInBackground.set(false)
        chatModel.runServiceInBackground.value = false
+        SimplexService.StartReceiver.toggleReceiver(false)
      } else {
        // show battery optimization notice
        showBGServiceNoticeIgnoreOptimization()
        appPrefs.backgroundServiceBatteryNoticeShown.set(true)
      }
+    } else {
+      // service is allowed and battery optimization is disabled
+      SimplexApp.context.schedulePeriodicServiceRestartWorker()
    }
  }

@@ -827,6 +1065,45 @@ open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager
      context.startActivity(this)
    }
  }
+
+  fun getNetCfg(): NetCfg {
+    val useSocksProxy = appPrefs.networkUseSocksProxy.get()
+    val socksProxy = if (useSocksProxy) ":9050" else null
+    val tcpConnectTimeout = appPrefs.networkTCPConnectTimeout.get()
+    val tcpTimeout = appPrefs.networkTCPTimeout.get()
+    val smpPingInterval = appPrefs.networkSMPPingInterval.get()
+    val enableKeepAlive = appPrefs.networkEnableKeepAlive.get()
+    val tcpKeepAlive = if (enableKeepAlive) {
+      val keepIdle = appPrefs.networkTCPKeepIdle.get()
+      val keepIntvl = appPrefs.networkTCPKeepIntvl.get()
+      val keepCnt = appPrefs.networkTCPKeepCnt.get()
+      KeepAliveOpts(keepIdle = keepIdle, keepIntvl = keepIntvl, keepCnt = keepCnt)
+    } else {
+      null
+    }
+    return NetCfg(
+      socksProxy = socksProxy,
+      tcpConnectTimeout = tcpConnectTimeout,
+      tcpTimeout = tcpTimeout,
+      tcpKeepAlive = tcpKeepAlive,
+      smpPingInterval = smpPingInterval
+    )
+  }
+
+  fun setNetCfg(cfg: NetCfg) {
+    appPrefs.networkUseSocksProxy.set(cfg.useSocksProxy)
+    appPrefs.networkTCPConnectTimeout.set(cfg.tcpConnectTimeout)
+    appPrefs.networkTCPTimeout.set(cfg.tcpTimeout)
+    appPrefs.networkSMPPingInterval.set(cfg.smpPingInterval)
+    if (cfg.tcpKeepAlive != null) {
+      appPrefs.networkEnableKeepAlive.set(true)
+      appPrefs.networkTCPKeepIdle.set(cfg.tcpKeepAlive.keepIdle)
+      appPrefs.networkTCPKeepIntvl.set(cfg.tcpKeepAlive.keepIntvl)
+      appPrefs.networkTCPKeepCnt.set(cfg.tcpKeepAlive.keepCnt)
+    } else {
+      appPrefs.networkEnableKeepAlive.set(false)
+    }
+  }
 }

 class Preference<T>(val get: () -> T, val set: (T) -> Unit)
@@ -837,18 +1114,36 @@ sealed class CC {
  class ShowActiveUser: CC()
  class CreateActiveUser(val profile: Profile): CC()
  class StartChat: CC()
+  class ApiStopChat: CC()
  class SetFilesFolder(val filesFolder: String): CC()
+  class ApiExportArchive(val config: ArchiveConfig): CC()
+  class ApiImportArchive(val config: ArchiveConfig): CC()
+  class ApiDeleteStorage: CC()
  class ApiGetChats: CC()
-  class ApiGetChat(val type: ChatType, val id: Long): CC()
+  class ApiGetChat(val type: ChatType, val id: Long, val pagination: ChatPagination, val search: String = ""): CC()
  class ApiSendMessage(val type: ChatType, val id: Long, val file: String?, val quotedItemId: Long?, val mc: MsgContent): CC()
  class ApiUpdateChatItem(val type: ChatType, val id: Long, val itemId: Long, val mc: MsgContent): CC()
  class ApiDeleteChatItem(val type: ChatType, val id: Long, val itemId: Long, val mode: CIDeleteMode): CC()
-  class GetUserSMPServers(): CC()
+  class NewGroup(val groupProfile: GroupProfile): CC()
+  class ApiAddMember(val groupId: Long, val contactId: Long, val memberRole: GroupMemberRole): CC()
+  class ApiJoinGroup(val groupId: Long): CC()
+  // class ApiMemberRole(val groupId: Long, val memberId: Long, val memberRole: GroupMemberRole): CC()
+  class ApiRemoveMember(val groupId: Long, val memberId: Long): CC()
+  class ApiLeaveGroup(val groupId: Long): CC()
+  class ApiListMembers(val groupId: Long): CC()
+  class ApiUpdateGroupProfile(val groupId: Long, val groupProfile: GroupProfile): CC()
+  class GetUserSMPServers: CC()
  class SetUserSMPServers(val smpServers: List<String>): CC()
+  class APISetNetworkConfig(val networkConfig: NetCfg): CC()
+  class APIGetNetworkConfig: CC()
+  class APISetChatSettings(val type: ChatType, val id: Long, val chatSettings: ChatSettings): CC()
+  class APIContactInfo(val contactId: Long): CC()
+  class APIGroupMemberInfo(val groupId: Long, val groupMemberId: Long): CC()
  class AddContact: CC()
  class Connect(val connReq: String): CC()
  class ApiDeleteChat(val type: ChatType, val id: Long): CC()
  class ApiClearChat(val type: ChatType, val id: Long): CC()
+  class ListContacts: CC()
  class ApiUpdateProfile(val profile: Profile): CC()
  class ApiParseMarkdown(val text: String): CC()
  class CreateMyAddress: CC()
@@ -871,18 +1166,35 @@ sealed class CC {
    is ShowActiveUser -> "/u"
    is CreateActiveUser -> "/u ${profile.displayName} ${profile.fullName}"
    is StartChat -> "/_start"
+    is ApiStopChat -> "/_stop"
    is SetFilesFolder -> "/_files_folder $filesFolder"
+    is ApiExportArchive -> "/_db export ${json.encodeToString(config)}"
+    is ApiImportArchive -> "/_db import ${json.encodeToString(config)}"
+    is ApiDeleteStorage -> "/_db delete"
    is ApiGetChats -> "/_get chats pcc=on"
-    is ApiGetChat -> "/_get chat ${chatRef(type, id)} count=100"
+    is ApiGetChat -> "/_get chat ${chatRef(type, id)} ${pagination.cmdString}" + (if (search == "") "" else " search=$search")
    is ApiSendMessage -> "/_send ${chatRef(type, id)} json ${json.encodeToString(ComposedMessage(file, quotedItemId, mc))}"
    is ApiUpdateChatItem -> "/_update item ${chatRef(type, id)} $itemId ${mc.cmdString}"
    is ApiDeleteChatItem -> "/_delete item ${chatRef(type, id)} $itemId ${mode.deleteMode}"
+    is NewGroup -> "/_group ${json.encodeToString(groupProfile)}"
+    is ApiAddMember -> "/_add #$groupId $contactId ${memberRole.memberRole}"
+    is ApiJoinGroup -> "/_join #$groupId"
+    is ApiRemoveMember -> "/_remove #$groupId $memberId"
+    is ApiLeaveGroup -> "/_leave #$groupId"
+    is ApiListMembers -> "/_members #$groupId"
+    is ApiUpdateGroupProfile -> "/_group_profile #$groupId ${json.encodeToString(groupProfile)}"
    is GetUserSMPServers -> "/smp_servers"
    is SetUserSMPServers -> "/smp_servers ${smpServersStr(smpServers)}"
+    is APISetNetworkConfig -> "/_network ${json.encodeToString(networkConfig)}"
+    is APIGetNetworkConfig -> "/network"
+    is APISetChatSettings -> "/_settings ${chatRef(type, id)} ${json.encodeToString(chatSettings)}"
+    is APIContactInfo -> "/_info @$contactId"
+    is APIGroupMemberInfo -> "/_info #$groupId $groupMemberId"
    is AddContact -> "/connect"
    is Connect -> "/connect $connReq"
    is ApiDeleteChat -> "/_delete ${chatRef(type, id)}"
    is ApiClearChat -> "/_clear chat ${chatRef(type, id)}"
+    is ListContacts -> "/contacts"
    is ApiUpdateProfile -> "/_profile ${json.encodeToString(profile)}"
    is ApiParseMarkdown -> "/_parse $text"
    is CreateMyAddress -> "/address"
@@ -906,18 +1218,35 @@ sealed class CC {
    is ShowActiveUser -> "showActiveUser"
    is CreateActiveUser -> "createActiveUser"
    is StartChat -> "startChat"
+    is ApiStopChat -> "apiStopChat"
    is SetFilesFolder -> "setFilesFolder"
+    is ApiExportArchive -> "apiExportArchive"
+    is ApiImportArchive -> "apiImportArchive"
+    is ApiDeleteStorage -> "apiDeleteStorage"
    is ApiGetChats -> "apiGetChats"
    is ApiGetChat -> "apiGetChat"
    is ApiSendMessage -> "apiSendMessage"
    is ApiUpdateChatItem -> "apiUpdateChatItem"
    is ApiDeleteChatItem -> "apiDeleteChatItem"
+    is NewGroup -> "newGroup"
+    is ApiAddMember -> "apiAddMember"
+    is ApiJoinGroup -> "apiJoinGroup"
+    is ApiRemoveMember -> "apiRemoveMember"
+    is ApiLeaveGroup -> "apiLeaveGroup"
+    is ApiListMembers -> "apiListMembers"
+    is ApiUpdateGroupProfile -> "apiUpdateGroupProfile"
    is GetUserSMPServers -> "getUserSMPServers"
    is SetUserSMPServers -> "setUserSMPServers"
+    is APISetNetworkConfig -> "/apiSetNetworkConfig"
+    is APIGetNetworkConfig -> "/apiGetNetworkConfig"
+    is APISetChatSettings -> "/apiSetChatSettings"
+    is APIContactInfo -> "apiContactInfo"
+    is APIGroupMemberInfo -> "apiGroupMemberInfo"
    is AddContact -> "addContact"
    is Connect -> "connect"
    is ApiDeleteChat -> "apiDeleteChat"
    is ApiClearChat -> "apiClearChat"
+    is ListContacts -> "listContacts"
    is ApiUpdateProfile -> "updateProfile"
    is ApiParseMarkdown -> "apiParseMarkdown"
    is CreateMyAddress -> "createMyAddress"
@@ -945,12 +1274,92 @@ sealed class CC {
  }
 }

+sealed class ChatPagination {
+  class Last(val count: Int): ChatPagination()
+  class After(val chatItemId: Long, val count: Int): ChatPagination()
+  class Before(val chatItemId: Long, val count: Int): ChatPagination()
+
+  val cmdString: String get() = when (this) {
+    is Last -> "count=${this.count}"
+    is After -> "after=${this.chatItemId} count=${this.count}"
+    is Before -> "before=${this.chatItemId} count=${this.count}"
+  }
+
+  companion object {
+    const val INITIAL_COUNT = 100
+    const val PRELOAD_COUNT = 100
+    const val UNTIL_PRELOAD_COUNT = 50
+  }
+}
+
@Serializable
 class ComposedMessage(val filePath: String?, val quotedItemId: Long?, val msgContent: MsgContent)

+@Serializable
+class ArchiveConfig(val archivePath: String, val disableCompression: Boolean? = null, val parentTempDirectory: String? = null)
+
+@Serializable
+data class NetCfg(
+  val socksProxy: String? = null,
+  val hostMode: HostMode = HostMode.OnionViaSocks,
+  val requiredHostMode: Boolean = false,
+  val tcpConnectTimeout: Long, // microseconds
+  val tcpTimeout: Long, // microseconds
+  val tcpKeepAlive: KeepAliveOpts?,
+  val smpPingInterval: Long // microseconds
+) {
+  val useSocksProxy: Boolean get() = socksProxy != null
+  val enableKeepAlive: Boolean get() = tcpKeepAlive != null
+
+  companion object {
+    val defaults: NetCfg =
+      NetCfg(
+        socksProxy = null,
+        tcpConnectTimeout = 7_500_000,
+        tcpTimeout = 5_000_000,
+        tcpKeepAlive = KeepAliveOpts.defaults,
+        smpPingInterval = 600_000_000
+      )
+
+    val proxyDefaults: NetCfg =
+      NetCfg(
+        socksProxy = ":9050",
+        tcpConnectTimeout = 15_000_000,
+        tcpTimeout = 10_000_000,
+        tcpKeepAlive = KeepAliveOpts.defaults,
+        smpPingInterval = 600_000_000
+      )
+  }
+}
+
+@Serializable
+enum class HostMode {
+  @SerialName("onionViaSocks") OnionViaSocks,
+  @SerialName("onion") Onion,
+  @SerialName("public") Public;
+}
+
+@Serializable
+data class KeepAliveOpts(
+  val keepIdle: Int, // seconds
+  val keepIntvl: Int, // seconds
+  val keepCnt: Int // times
+) {
+  companion object {
+    val defaults: KeepAliveOpts =
+      KeepAliveOpts(keepIdle = 30, keepIntvl = 15, keepCnt = 4)
+  }
+}
+
+@Serializable
+data class ChatSettings(
+  val enableNtfs: Boolean
+)
+
 val json = Json {
  prettyPrint = true
  ignoreUnknownKeys = true
+  encodeDefaults = true
 }

@Serializable
@@ -981,9 +1390,13 @@ sealed class CR {
  @Serializable @SerialName("activeUser") class ActiveUser(val user: User): CR()
  @Serializable @SerialName("chatStarted") class ChatStarted: CR()
  @Serializable @SerialName("chatRunning") class ChatRunning: CR()
+  @Serializable @SerialName("chatStopped") class ChatStopped: CR()
  @Serializable @SerialName("apiChats") class ApiChats(val chats: List<Chat>): CR()
  @Serializable @SerialName("apiChat") class ApiChat(val chat: Chat): CR()
  @Serializable @SerialName("userSMPServers") class UserSMPServers(val smpServers: List<String>): CR()
+  @Serializable @SerialName("networkConfig") class NetworkConfig(val networkConfig: NetCfg): CR()
+  @Serializable @SerialName("contactInfo") class ContactInfo(val contact: Contact, val connectionStats: ConnectionStats): CR()
+  @Serializable @SerialName("groupMemberInfo") class GroupMemberInfo(val groupInfo: GroupInfo, val member: GroupMember, val connectionStats_: ConnectionStats?): CR()
  @Serializable @SerialName("invitation") class Invitation(val connReqInvitation: String): CR()
  @Serializable @SerialName("sentConfirmation") class SentConfirmation: CR()
  @Serializable @SerialName("sentInvitation") class SentInvitation: CR()
@@ -1014,15 +1427,39 @@ sealed class CR {
  @Serializable @SerialName("chatItemStatusUpdated") class ChatItemStatusUpdated(val chatItem: AChatItem): CR()
  @Serializable @SerialName("chatItemUpdated") class ChatItemUpdated(val chatItem: AChatItem): CR()
  @Serializable @SerialName("chatItemDeleted") class ChatItemDeleted(val deletedChatItem: AChatItem, val toChatItem: AChatItem): CR()
+  @Serializable @SerialName("contactsList") class ContactsList(val contacts: List<Contact>): CR()
+  // group events
+  @Serializable @SerialName("groupCreated") class GroupCreated(val groupInfo: GroupInfo): CR()
+  @Serializable @SerialName("sentGroupInvitation") class SentGroupInvitation(val groupInfo: GroupInfo, val contact: Contact, val member: GroupMember): CR()
+  @Serializable @SerialName("userAcceptedGroupSent") class UserAcceptedGroupSent (val groupInfo: GroupInfo): CR()
+  @Serializable @SerialName("userDeletedMember") class UserDeletedMember(val groupInfo: GroupInfo, val member: GroupMember): CR()
+  @Serializable @SerialName("leftMemberUser") class LeftMemberUser(val groupInfo: GroupInfo): CR()
+  @Serializable @SerialName("groupMembers") class GroupMembers(val group: Group): CR()
+  @Serializable @SerialName("receivedGroupInvitation") class ReceivedGroupInvitation(val groupInfo: GroupInfo, val contact: Contact, val memberRole: GroupMemberRole): CR()
+  @Serializable @SerialName("groupDeletedUser") class GroupDeletedUser(val groupInfo: GroupInfo): CR()
+  @Serializable @SerialName("joinedGroupMemberConnecting") class JoinedGroupMemberConnecting(val groupInfo: GroupInfo, val hostMember: GroupMember, val member: GroupMember): CR()
+  @Serializable @SerialName("deletedMemberUser") class DeletedMemberUser(val groupInfo: GroupInfo, val member: GroupMember): CR()
+  @Serializable @SerialName("deletedMember") class DeletedMember(val groupInfo: GroupInfo, val byMember: GroupMember, val deletedMember: GroupMember): CR()
+  @Serializable @SerialName("leftMember") class LeftMember(val groupInfo: GroupInfo, val member: GroupMember): CR()
+  @Serializable @SerialName("groupDeleted") class GroupDeleted(val groupInfo: GroupInfo, val member: GroupMember): CR()
+  @Serializable @SerialName("contactsMerged") class ContactsMerged(val intoContact: Contact, val mergedContact: Contact): CR()
+  @Serializable @SerialName("groupInvitation") class GroupInvitation(val groupInfo: GroupInfo): CR() // unused
+  @Serializable @SerialName("userJoinedGroup") class UserJoinedGroup(val groupInfo: GroupInfo): CR()
+  @Serializable @SerialName("joinedGroupMember") class JoinedGroupMember(val groupInfo: GroupInfo, val member: GroupMember): CR()
+  @Serializable @SerialName("connectedToGroupMember") class ConnectedToGroupMember(val groupInfo: GroupInfo, val member: GroupMember): CR()
+  @Serializable @SerialName("groupRemoved") class GroupRemoved(val groupInfo: GroupInfo): CR() // unused
+  @Serializable @SerialName("groupUpdated") class GroupUpdated(val toGroup: GroupInfo): CR()
+  // receiving file events
  @Serializable @SerialName("rcvFileAccepted") class RcvFileAccepted(val chatItem: AChatItem): CR()
  @Serializable @SerialName("rcvFileStart") class RcvFileStart(val chatItem: AChatItem): CR()
  @Serializable @SerialName("rcvFileComplete") class RcvFileComplete(val chatItem: AChatItem): CR()
+  // sending file events
  @Serializable @SerialName("sndFileStart") class SndFileStart(val chatItem: AChatItem, val sndFileTransfer: SndFileTransfer): CR()
  @Serializable @SerialName("sndFileComplete") class SndFileComplete(val chatItem: AChatItem, val sndFileTransfer: SndFileTransfer): CR()
  @Serializable @SerialName("sndFileCancelled") class SndFileCancelled(val chatItem: AChatItem, val sndFileTransfer: SndFileTransfer): CR()
  @Serializable @SerialName("sndFileRcvCancelled") class SndFileRcvCancelled(val chatItem: AChatItem, val sndFileTransfer: SndFileTransfer): CR()
  @Serializable @SerialName("sndGroupFileCancelled") class SndGroupFileCancelled(val chatItem: AChatItem, val fileTransferMeta: FileTransferMeta, val sndFileTransfers: List<SndFileTransfer>): CR()
-  @Serializable @SerialName("callInvitation") class CallInvitation(val contact: Contact, val callType: CallType, val sharedKey: String? = null, val callTs: Instant): CR()
+  @Serializable @SerialName("callInvitation") class CallInvitation(val callInvitation: RcvCallInvitation): CR()
  @Serializable @SerialName("callOffer") class CallOffer(val contact: Contact, val callType: CallType, val offer: WebRTCSession, val sharedKey: String? = null, val askConfirmation: Boolean): CR()
  @Serializable @SerialName("callAnswer") class CallAnswer(val contact: Contact, val answer: WebRTCSession): CR()
  @Serializable @SerialName("callExtraInfo") class CallExtraInfo(val contact: Contact, val extraInfo: WebRTCExtraInfo): CR()
@@ -1039,9 +1476,13 @@ sealed class CR {
    is ActiveUser -> "activeUser"
    is ChatStarted -> "chatStarted"
    is ChatRunning -> "chatRunning"
+    is ChatStopped -> "chatStopped"
    is ApiChats -> "apiChats"
    is ApiChat -> "apiChat"
    is UserSMPServers -> "userSMPServers"
+    is NetworkConfig -> "networkConfig"
+    is ContactInfo -> "contactInfo"
+    is GroupMemberInfo -> "groupMemberInfo"
    is Invitation -> "invitation"
    is SentConfirmation -> "sentConfirmation"
    is SentInvitation -> "sentInvitation"
@@ -1072,6 +1513,27 @@ sealed class CR {
    is ChatItemStatusUpdated -> "chatItemStatusUpdated"
    is ChatItemUpdated -> "chatItemUpdated"
    is ChatItemDeleted -> "chatItemDeleted"
+    is ContactsList -> "contactsList"
+    is GroupCreated -> "groupCreated"
+    is SentGroupInvitation -> "sentGroupInvitation"
+    is UserAcceptedGroupSent -> "userAcceptedGroupSent"
+    is UserDeletedMember -> "userDeletedMember"
+    is LeftMemberUser -> "leftMemberUser"
+    is GroupMembers -> "groupMembers"
+    is ReceivedGroupInvitation -> "receivedGroupInvitation"
+    is GroupDeletedUser -> "groupDeletedUser"
+    is JoinedGroupMemberConnecting -> "joinedGroupMemberConnecting"
+    is DeletedMemberUser -> "deletedMemberUser"
+    is DeletedMember -> "deletedMember"
+    is LeftMember -> "leftMember"
+    is GroupDeleted -> "groupDeleted"
+    is ContactsMerged -> "contactsMerged"
+    is GroupInvitation -> "groupInvitation"
+    is UserJoinedGroup -> "userJoinedGroup"
+    is JoinedGroupMember -> "joinedGroupMember"
+    is ConnectedToGroupMember -> "connectedToGroupMember"
+    is GroupRemoved -> "groupRemoved"
+    is GroupUpdated -> "groupUpdated"
    is RcvFileAccepted -> "rcvFileAccepted"
    is RcvFileStart -> "rcvFileStart"
    is RcvFileComplete -> "rcvFileComplete"
@@ -1098,9 +1560,13 @@ sealed class CR {
    is ActiveUser -> json.encodeToString(user)
    is ChatStarted -> noDetails()
    is ChatRunning -> noDetails()
+    is ChatStopped -> noDetails()
    is ApiChats -> json.encodeToString(chats)
    is ApiChat -> json.encodeToString(chat)
    is UserSMPServers -> json.encodeToString(smpServers)
+    is NetworkConfig -> json.encodeToString(networkConfig)
+    is ContactInfo -> "contact: ${json.encodeToString(contact)}\nconnectionStats: ${json.encodeToString(connectionStats)}"
+    is GroupMemberInfo -> "group: ${json.encodeToString(groupInfo)}\nmember: ${json.encodeToString(member)}\nconnectionStats: ${json.encodeToString(connectionStats_)}"
    is Invitation -> connReqInvitation
    is SentConfirmation -> noDetails()
    is SentInvitation -> noDetails()
@@ -1131,6 +1597,27 @@ sealed class CR {
    is ChatItemStatusUpdated -> json.encodeToString(chatItem)
    is ChatItemUpdated -> json.encodeToString(chatItem)
    is ChatItemDeleted -> "deletedChatItem:\n${json.encodeToString(deletedChatItem)}\ntoChatItem:\n${json.encodeToString(toChatItem)}"
+    is ContactsList -> json.encodeToString(contacts)
+    is GroupCreated -> json.encodeToString(groupInfo)
+    is SentGroupInvitation -> "groupInfo: $groupInfo\ncontact: $contact\nmember: $member"
+    is UserAcceptedGroupSent -> json.encodeToString(groupInfo)
+    is UserDeletedMember -> "groupInfo: $groupInfo\nmember: $member"
+    is LeftMemberUser -> json.encodeToString(groupInfo)
+    is GroupMembers -> json.encodeToString(group)
+    is ReceivedGroupInvitation -> "groupInfo: $groupInfo\ncontact: $contact\nmemberRole: $memberRole"
+    is GroupDeletedUser -> json.encodeToString(groupInfo)
+    is JoinedGroupMemberConnecting -> "groupInfo: $groupInfo\nhostMember: $hostMember\nmember: $member"
+    is DeletedMemberUser -> "groupInfo: $groupInfo\nmember: $member"
+    is DeletedMember -> "groupInfo: $groupInfo\nbyMember: $byMember\ndeletedMember: $deletedMember"
+    is LeftMember -> "groupInfo: $groupInfo\nmember: $member"
+    is GroupDeleted -> "groupInfo: $groupInfo\nmember: $member"
+    is ContactsMerged -> "intoContact: $intoContact\nmergedContact: $mergedContact"
+    is GroupInvitation -> json.encodeToString(groupInfo)
+    is UserJoinedGroup -> json.encodeToString(groupInfo)
+    is JoinedGroupMember -> "groupInfo: $groupInfo\nmember: $member"
+    is ConnectedToGroupMember -> "groupInfo: $groupInfo\nmember: $member"
+    is GroupRemoved -> json.encodeToString(groupInfo)
+    is GroupUpdated -> json.encodeToString(toGroup)
    is RcvFileAccepted -> json.encodeToString(chatItem)
    is RcvFileStart -> json.encodeToString(chatItem)
    is RcvFileComplete -> json.encodeToString(chatItem)
@@ -1139,7 +1626,7 @@ sealed class CR {
    is SndFileRcvCancelled -> json.encodeToString(chatItem)
    is SndFileStart -> json.encodeToString(chatItem)
    is SndGroupFileCancelled -> json.encodeToString(chatItem)
-    is CallInvitation -> "contact: ${contact.id}\ncallType: $callType\nsharedKey: ${sharedKey ?: ""}"
+    is CallInvitation -> "contact: ${callInvitation.contact.id}\ncallType: $callInvitation.callType\nsharedKey: ${callInvitation.sharedKey ?: ""}"
    is CallOffer -> "contact: ${contact.id}\ncallType: $callType\nsharedKey: ${sharedKey ?: ""}\naskConfirmation: $askConfirmation\noffer: ${json.encodeToString(offer)}"
    is CallAnswer -> "contact: ${contact.id}\nanswer: ${json.encodeToString(answer)}"
    is CallExtraInfo -> "contact: ${contact.id}\nextraInfo: ${json.encodeToString(extraInfo)}"
@@ -1183,6 +1670,9 @@ abstract class TerminalItem {
  }
 }

+@Serializable
+class ConnectionStats(val rcvServers: List<String>?, val sndServers: List<String>?)
+
@Serializable
 sealed class ChatError {
  val string: String get() = when (this) {
@@ -1211,8 +1701,10 @@ sealed class ChatErrorType {
 sealed class StoreError {
  val string: String get() = when (this) {
    is UserContactLinkNotFound -> "userContactLinkNotFound"
+    is GroupNotFound -> "groupNotFound"
  }
  @Serializable @SerialName("userContactLinkNotFound") class UserContactLinkNotFound: StoreError()
+  @Serializable @SerialName("groupNotFound") class GroupNotFound: StoreError()
 }

@Serializable
@@ -15,9 +15,10 @@ val DarkGray = Color(43, 44, 46, 255)
 val HighOrLowlight = Color(139, 135, 134, 255)
 val MessagePreviewDark = Color(179, 175, 174, 255)
 val MessagePreviewLight = Color(49, 45, 44, 255)
-val ToolbarLight = Color(220, 220, 220, 20)
-val ToolbarDark = Color(80, 80, 80, 20)
+val ToolbarLight = Color(220, 220, 220, 12)
+val ToolbarDark = Color(80, 80, 80, 12)
 val SettingsBackgroundLight = Color(220, 216, 215, 90)
+val SettingsSecondaryLight = Color(200, 196, 195, 90)
 val GroupDark = Color(80, 80, 80, 60)
 val IncomingCallLight = Color(239, 237, 236, 255)
 val IncomingCallDark = Color(34, 30, 29, 255)
@@ -13,6 +13,7 @@ val Inter = FontFamily(
  Font(R.font.inter_bold, weight = FontWeight.Bold),
  Font(R.font.inter_semi_bold, weight = FontWeight.SemiBold),
  Font(R.font.inter_medium, weight = FontWeight.Medium),
+  Font(R.font.inter_light, weight = FontWeight.Light),
 )

 // Set of Material typography styles to start with
@@ -8,6 +8,7 @@ import androidx.compose.foundation.lazy.*
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.*
 import androidx.compose.runtime.*
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
@@ -17,8 +18,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.SimpleXTheme
-import chat.simplex.app.views.chat.ComposeState
-import chat.simplex.app.views.chat.SendMsgView
+import chat.simplex.app.views.chat.*
 import chat.simplex.app.views.helpers.*
 import com.google.accompanist.insets.ProvideWindowInsets
 import com.google.accompanist.insets.navigationBarsWithImePadding
@@ -82,6 +82,10 @@ fun TerminalLayout(
@Composable
 fun TerminalLog(terminalItems: List<TerminalItem>) {
  val listState = rememberLazyListState()
+  val keyboardState by getKeyboardState()
+  val ciListState = rememberSaveable(stateSaver = CIListStateSaver) {
+    mutableStateOf(CIListState(false, terminalItems.count(), keyboardState))
+  }
  val scope = rememberCoroutineScope()
  LazyColumn(state = listState) {
    items(terminalItems) { item ->
@@ -101,8 +105,9 @@ fun TerminalLog(terminalItems: List<TerminalItem>) {
      )
    }
    val len = terminalItems.count()
-    if (len > 1) {
+    if (len > 1 && (keyboardState != ciListState.value.keyboardState || !ciListState.value.scrolled || len != ciListState.value.itemCount)) {
      scope.launch {
+        ciListState.value = CIListState(true, len, keyboardState)
        listState.animateScrollToItem(len - 1)
      }
    }
@@ -114,8 +114,8 @@ fun createProfile(chatModel: ChatModel, displayName: String, fullName: String) {
      Profile(displayName, fullName, null)
    )
    chatModel.controller.startChat(user)
-    SimplexService.start(chatModel.controller.appContext)
    chatModel.controller.showBackgroundServiceNoticeIfNeeded()
+    SimplexService.start(chatModel.controller.appContext)
    chatModel.onboardingStage.value = OnboardingStage.OnboardingComplete
  }
 }
@@ -9,11 +9,10 @@ import kotlinx.datetime.Clock
 import kotlin.time.Duration.Companion.minutes

 class CallManager(val chatModel: ChatModel) {
-  fun reportNewIncomingCall(invitation: CallInvitation) {
+  fun reportNewIncomingCall(invitation: RcvCallInvitation) {
    Log.d(TAG, "CallManager.reportNewIncomingCall")
    with (chatModel) {
      callInvitations[invitation.contact.id] = invitation
-      if (!chatModel.controller.appPrefs.experimentalCalls.get()) return
      if (Clock.System.now() - invitation.callTs <= 3.minutes) {
        activeCallInvitation.value = invitation
        controller.ntfManager.notifyCallInvitation(invitation)
@@ -24,7 +23,7 @@ class CallManager(val chatModel: ChatModel) {
    }
  }

-  fun acceptIncomingCall(invitation: CallInvitation) {
+  fun acceptIncomingCall(invitation: RcvCallInvitation) {
    ModalManager.shared.closeModals()
    val call = chatModel.activeCall.value
    if (call == null) {
@@ -42,17 +41,17 @@ class CallManager(val chatModel: ChatModel) {
    }
  }

-  private fun justAcceptIncomingCall(invitation: CallInvitation) {
+  private fun justAcceptIncomingCall(invitation: RcvCallInvitation) {
    with (chatModel) {
      activeCall.value = Call(
        contact = invitation.contact,
        callState = CallState.InvitationAccepted,
-        localMedia = invitation.peerMedia,
+        localMedia = invitation.callType.media,
        sharedKey = invitation.sharedKey
      )
      showCallView.value = true
      val useRelay = controller.appPrefs.webrtcPolicyRelay.get()
-      callCommand.value = WCallCommand.Start (media = invitation.peerMedia, aesKey = invitation.sharedKey, relay = useRelay)
+      callCommand.value = WCallCommand.Start (media = invitation.callType.media, aesKey = invitation.sharedKey, relay = useRelay)
      callInvitations.remove(invitation.contact.id)
      if (invitation.contact.id == activeCallInvitation.value?.contact?.id) {
        activeCallInvitation.value = null
@@ -77,7 +76,7 @@ class CallManager(val chatModel: ChatModel) {
    }
  }

-  fun endCall(invitation: CallInvitation) {
+  fun endCall(invitation: RcvCallInvitation) {
    with (chatModel) {
      callInvitations.remove(invitation.contact.id)
      if (invitation.contact.id == activeCallInvitation.value?.contact?.id) {
@@ -92,7 +91,7 @@ class CallManager(val chatModel: ChatModel) {
    }
  }

-  fun reportCallRemoteEnded(invitation: CallInvitation) {
+  fun reportCallRemoteEnded(invitation: RcvCallInvitation) {
    if (chatModel.activeCallInvitation.value?.contact?.id == invitation.contact.id) {
      chatModel.activeCallInvitation.value = null
      chatModel.controller.ntfManager.cancelCallNotification()
@@ -1,6 +1,8 @@
 package chat.simplex.app.views.call

 import android.Manifest
+import android.content.Context
+import android.media.AudioManager
 import android.util.Log
 import android.view.ViewGroup
 import android.webkit.*
@@ -35,6 +37,7 @@ import chat.simplex.app.views.helpers.ProfileImage
 import chat.simplex.app.views.helpers.withApi
 import com.google.accompanist.permissions.rememberMultiplePermissionsState
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.encodeToString

@@ -44,6 +47,8 @@ fun ActiveCallView(chatModel: ChatModel) {
    val call = chatModel.activeCall.value
    if (call != null) withApi { chatModel.callManager.endCall(call) }
  })
+  val cxt = LocalContext.current
+  val scope = rememberCoroutineScope()
  Box(Modifier.fillMaxSize()) {
    WebRTCView(chatModel.callCommand) { apiMsg ->
      Log.d(TAG, "received from WebRTCView: $apiMsg")
@@ -79,6 +84,10 @@ fun ActiveCallView(chatModel: ChatModel) {
            }
          is WCallResponse.Connected -> {
            chatModel.activeCall.value = call.copy(callState = CallState.Connected, connectionInfo = r.connectionInfo)
+            scope.launch {
+              delay(2000L)
+              setCallSound(cxt, call)
+            }
          }
          is WCallResponse.Ended -> {
            chatModel.activeCall.value = call.copy(callState = CallState.Ended)
@@ -117,21 +126,43 @@ fun ActiveCallView(chatModel: ChatModel) {

@Composable
 private fun ActiveCallOverlay(call: Call, chatModel: ChatModel) {
+  var cxt = LocalContext.current
  ActiveCallOverlayLayout(
    call = call,
    dismiss = { withApi { chatModel.callManager.endCall(call) } },
    toggleAudio = { chatModel.callCommand.value = WCallCommand.Media(CallMediaType.Audio, enable = !call.audioEnabled) },
    toggleVideo = { chatModel.callCommand.value = WCallCommand.Media(CallMediaType.Video, enable = !call.videoEnabled) },
+    toggleSound = {
+      var call = chatModel.activeCall.value
+      if (call != null) {
+        call = call.copy(soundSpeaker = !call.soundSpeaker)
+        chatModel.activeCall.value = call
+        setCallSound(cxt, call)
+      }
+    },
    flipCamera = { chatModel.callCommand.value = WCallCommand.Camera(call.localCamera.flipped) }
  )
 }

+private fun setCallSound(cxt: Context, call: Call) {
+  Log.d(TAG, "setCallSound: set audio mode")
+  val am = cxt.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+  if (call.soundSpeaker) {
+    am.mode = AudioManager.MODE_NORMAL
+    am.isSpeakerphoneOn = true
+  } else {
+    am.mode = AudioManager.MODE_IN_CALL
+    am.isSpeakerphoneOn = false
+  }
+}
+
@Composable
 private fun ActiveCallOverlayLayout(
  call: Call,
  dismiss: () -> Unit,
  toggleAudio: () -> Unit,
  toggleVideo: () -> Unit,
+  toggleSound: () -> Unit,
  flipCamera: () -> Unit
 ) {
  Column(Modifier.padding(16.dp)) {
@@ -174,6 +205,11 @@ private fun ActiveCallOverlayLayout(
          Box(Modifier.padding(start = 32.dp)) {
            ToggleAudioButton(call, toggleAudio)
          }
+          Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.CenterEnd) {
+            Box(Modifier.padding(end = 32.dp)) {
+              ToggleSoundButton(call, toggleSound)
+            }
+          }
        }
      }
    }
@@ -194,12 +230,21 @@ private fun ControlButton(call: Call, icon: ImageVector, @StringRes iconText: In
@Composable
 private fun ToggleAudioButton(call: Call, toggleAudio: () -> Unit) {
  if (call.audioEnabled) {
-    ControlButton(call, Icons.Outlined.Mic, R.string.icon_descr_video_off, toggleAudio)
+    ControlButton(call, Icons.Outlined.Mic, R.string.icon_descr_audio_off, toggleAudio)
  } else {
    ControlButton(call, Icons.Outlined.MicOff, R.string.icon_descr_audio_on, toggleAudio)
  }
 }

+@Composable
+private fun ToggleSoundButton(call: Call, toggleSound: () -> Unit) {
+  if (call.soundSpeaker) {
+    ControlButton(call, Icons.Outlined.VolumeUp, R.string.icon_descr_speaker_off, toggleSound)
+  } else {
+    ControlButton(call, Icons.Outlined.VolumeDown, R.string.icon_descr_speaker_on, toggleSound)
+  }
+}
+
@Composable
 fun CallInfoView(call: Call, alignment: Alignment.Horizontal) {
  @Composable fun InfoText(text: String, style: TextStyle = MaterialTheme.typography.body2) =
@@ -393,6 +438,7 @@ fun PreviewActiveCallOverlayVideo() {
      dismiss = {},
      toggleAudio = {},
      toggleVideo = {},
+      toggleSound = {},
      flipCamera = {}
    )
  }
@@ -413,6 +459,7 @@ fun PreviewActiveCallOverlayAudio() {
      dismiss = {},
      toggleAudio = {},
      toggleVideo = {},
+      toggleSound = {},
      flipCamera = {}
    )
  }
@@ -112,7 +112,7 @@ fun IncomingCallActivityView(m: ChatModel, activity: IncomingCallActivity) {
 }

@Composable
-fun IncomingCallLockScreenAlert(invitation: CallInvitation, chatModel: ChatModel, activity: IncomingCallActivity) {
+fun IncomingCallLockScreenAlert(invitation: RcvCallInvitation, chatModel: ChatModel, activity: IncomingCallActivity) {
  val cm = chatModel.callManager
  val cxt = LocalContext.current
  val scope = rememberCoroutineScope()
@@ -141,7 +141,7 @@ fun IncomingCallLockScreenAlert(invitation: CallInvitation, chatModel: ChatModel

@Composable
 fun IncomingCallLockScreenAlertLayout(
-  invitation: CallInvitation,
+  invitation: RcvCallInvitation,
  callOnLockScreen: CallOnLockScreen?,
  rejectCall: () -> Unit,
  ignoreCall: () -> Unit,
@@ -210,9 +210,9 @@ fun PreviewIncomingCallLockScreenAlert() {
        .background(MaterialTheme.colors.background)
        .fillMaxSize()) {
      IncomingCallLockScreenAlertLayout(
-        invitation = CallInvitation(
+        invitation = RcvCallInvitation(
          contact = Contact.sampleData,
-          peerMedia = CallMediaType.Audio,
+          callType = CallType(media = CallMediaType.Audio, capabilities = CallCapabilities(encryption = false)),
          sharedKey = null,
          callTs = Clock.System.now()
        ),
@@ -24,7 +24,7 @@ import chat.simplex.app.views.usersettings.ProfilePreview
 import kotlinx.datetime.Clock

@Composable
-fun IncomingCallAlertView(invitation: CallInvitation, chatModel: ChatModel) {
+fun IncomingCallAlertView(invitation: RcvCallInvitation, chatModel: ChatModel) {
  val cm = chatModel.callManager
  val cxt = LocalContext.current
  val scope = rememberCoroutineScope()
@@ -40,7 +40,7 @@ fun IncomingCallAlertView(invitation: CallInvitation, chatModel: ChatModel) {

@Composable
 fun IncomingCallAlertLayout(
-  invitation: CallInvitation,
+  invitation: RcvCallInvitation,
  rejectCall: () -> Unit,
  ignoreCall: () -> Unit,
  acceptCall: () -> Unit
@@ -60,10 +60,10 @@ fun IncomingCallAlertLayout(
 }

@Composable
-fun IncomingCallInfo(invitation: CallInvitation) {
+fun IncomingCallInfo(invitation: RcvCallInvitation) {
  @Composable fun CallIcon(icon: ImageVector, descr: String) = Icon(icon, descr, tint = SimplexGreen)
  Row {
-    if (invitation.peerMedia == CallMediaType.Video) CallIcon(Icons.Filled.Videocam, stringResource(R.string.icon_descr_video_call))
+    if (invitation.callType.media == CallMediaType.Video) CallIcon(Icons.Filled.Videocam, stringResource(R.string.icon_descr_video_call))
    else CallIcon(Icons.Filled.Phone, stringResource(R.string.icon_descr_audio_call))
    Spacer(Modifier.width(4.dp))
    Text(invitation.callTypeText)
@@ -94,9 +94,9 @@ private fun CallButton(text: String, icon: ImageVector, color: Color, action: ()
 fun PreviewIncomingCallAlertLayout() {
  SimpleXTheme {
    IncomingCallAlertLayout(
-      invitation = CallInvitation(
+      invitation = RcvCallInvitation(
        contact = Contact.sampleData,
-        peerMedia = CallMediaType.Audio,
+        callType = CallType(media = CallMediaType.Audio, capabilities = CallCapabilities(encryption = false)),
        sharedKey = null,
        callTs = Clock.System.now()
      ),
@@ -18,6 +18,7 @@ data class Call(
  val sharedKey: String? = null,
  val audioEnabled: Boolean = true,
  val videoEnabled: Boolean = localMedia == CallMediaType.Video,
+  val soundSpeaker: Boolean = localMedia == CallMediaType.Video,
  var localCamera: VideoCamera = VideoCamera.User,
  val connectionInfo: ConnectionInfo? = null
 ) {
@@ -90,12 +91,12 @@ sealed class WCallResponse {
@Serializable class WebRTCSession(val rtcSession: String, val rtcIceCandidates: String)
@Serializable class WebRTCExtraInfo(val rtcIceCandidates: String)
@Serializable class CallType(val media: CallMediaType, val capabilities: CallCapabilities)
-@Serializable class CallInvitation(val contact: Contact, val peerMedia: CallMediaType, val sharedKey: String?, val callTs: Instant) {
-  val callTypeText: String get() = generalGetString(when(peerMedia) {
+@Serializable class RcvCallInvitation(val contact: Contact, val callType: CallType, val sharedKey: String?, val callTs: Instant) {
+  val callTypeText: String get() = generalGetString(when(callType.media) {
    CallMediaType.Video -> if (sharedKey == null) R.string.video_call_no_encryption else R.string.encrypted_video_call
    CallMediaType.Audio -> if (sharedKey == null) R.string.audio_call_no_encryption else R.string.encrypted_audio_call
  })
-  val callTitle: String get() = generalGetString(when(peerMedia) {
+  val callTitle: String get() = generalGetString(when(callType.media) {
    CallMediaType.Video -> R.string.incoming_video_call
    CallMediaType.Audio -> R.string.incoming_audio_call
  })
@@ -1,7 +1,12 @@
 package chat.simplex.app.views.chat

+import InfoRow
+import SectionDivider
+import SectionItemView
+import SectionSpacer
+import SectionView
 import androidx.activity.compose.BackHandler
-import androidx.compose.foundation.background
+import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
@@ -13,7 +18,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
@@ -22,13 +27,15 @@ import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.helpers.*

@Composable
-fun ChatInfoView(chatModel: ChatModel, close: () -> Unit) {
+fun ChatInfoView(chatModel: ChatModel, connStats: ConnectionStats?, close: () -> Unit) {
  BackHandler(onBack = close)
  val chat = chatModel.chats.firstOrNull { it.id == chatModel.chatId.value }
+  val developerTools = chatModel.controller.appPrefs.developerTools.get()
  if (chat != null) {
    ChatInfoLayout(
      chat,
-      close = close,
+      connStats,
+      developerTools,
      deleteContact = { deleteContactDialog(chat.chatInfo, chatModel, close) },
      clearChat = { clearChatDialog(chat.chatInfo, chatModel, close) }
    )
@@ -37,7 +44,7 @@ fun ChatInfoView(chatModel: ChatModel, close: () -> Unit) {

 fun deleteContactDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.delete_contact__question),
+    title = generalGetString(R.string.delete_contact_question),
    text = generalGetString(R.string.delete_contact_all_messages_deleted_cannot_undo_warning),
    confirmText = generalGetString(R.string.delete_verb),
    onConfirm = {
@@ -75,107 +82,183 @@ fun clearChatDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit
@Composable
 fun ChatInfoLayout(
  chat: Chat,
-  close: () -> Unit,
+  connStats: ConnectionStats?,
+  developerTools: Boolean,
  deleteContact: () -> Unit,
  clearChat: () -> Unit
 ) {
  Column(
    Modifier
-      .fillMaxSize()
-      .background(MaterialTheme.colors.background)
-      .padding(horizontal = 8.dp),
-    horizontalAlignment = Alignment.CenterHorizontally
+      .fillMaxWidth()
+      .verticalScroll(rememberScrollState()),
+    horizontalAlignment = Alignment.Start
  ) {
-    CloseSheetBar(close)
-    Spacer(Modifier.size(48.dp))
-    val cInfo = chat.chatInfo
-    ChatInfoImage(cInfo, size = 192.dp)
-    Text(
-      cInfo.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
-      color = MaterialTheme.colors.onBackground,
-      modifier = Modifier
-        .padding(top = 32.dp)
-        .padding(bottom = 8.dp)
-    )
-    Text(
-      cInfo.fullName, style = MaterialTheme.typography.h2,
-      color = MaterialTheme.colors.onBackground,
-      modifier = Modifier.padding(bottom = 16.dp)
-    )
+    Row(
+      Modifier.fillMaxWidth(),
+      horizontalArrangement = Arrangement.Center
+    ) {
+      ChatInfoHeader(chat.chatInfo)
+    }
+    SectionSpacer()

-    if (cInfo is ChatInfo.Direct) {
-      Column(horizontalAlignment = Alignment.CenterHorizontally) {
-        Row(Modifier.padding(horizontal = 32.dp)) {
-          ServerImage(chat)
-          Text(
-            chat.serverInfo.networkStatus.statusString,
-            textAlign = TextAlign.Center,
-            color = MaterialTheme.colors.onBackground,
-            modifier = Modifier.padding(start = 8.dp)
-          )
+    if (connStats != null) {
+      SectionView(title = stringResource(R.string.conn_stats_section_title_servers)) {
+        SectionItemView {
+          NetworkStatusRow(chat.serverInfo.networkStatus)
+        }
+        val rcvServers = connStats.rcvServers
+        if (rcvServers != null && rcvServers.isNotEmpty()) {
+          SectionDivider()
+          SimplexServers(stringResource(R.string.receiving_via), rcvServers)
+        }
+        val sndServers = connStats.sndServers
+        if (sndServers != null && sndServers.isNotEmpty()) {
+          SectionDivider()
+          SimplexServers(stringResource(R.string.sending_via), sndServers)
        }
-        Text(
-          chat.serverInfo.networkStatus.statusExplanation,
-          style = MaterialTheme.typography.body2,
-          color = MaterialTheme.colors.onBackground,
-          textAlign = TextAlign.Center,
-          modifier = Modifier
-            .padding(top = 16.dp)
-            .padding(horizontal = 16.dp)
-        )
      }
+      SectionSpacer()
+    }

-      Spacer(Modifier.weight(1F))
+    SectionView {
+      SectionItemView {
+        ClearChatButton(clearChat)
+      }
+      SectionDivider()
+      SectionItemView {
+        DeleteContactButton(deleteContact)
+      }
+    }
+    SectionSpacer()

-      Box(Modifier.padding(4.dp)) {
-        SimpleButton(
-          stringResource(R.string.clear_chat_button),
-          icon = Icons.Outlined.Restore,
-          color = WarningOrange,
-          click = clearChat
-        )
-      }
-      Box(
-        Modifier
-          .padding(4.dp)
-          .padding(bottom = 32.dp)
-      ) {
-        SimpleButton(
-          stringResource(R.string.button_delete_contact),
-          icon = Icons.Outlined.Delete,
-          color = Color.Red,
-          click = deleteContact
-        )
-      }
-    } else if (cInfo is ChatInfo.Group) {
-      Spacer(Modifier.weight(1F))
-
-      Box(
-        Modifier
-          .padding(4.dp)
-          .padding(bottom = 32.dp)
-      ) {
-        SimpleButton(
-          stringResource(R.string.clear_chat_button),
-          icon = Icons.Outlined.Restore,
-          color = WarningOrange,
-          click = clearChat
-        )
+    if (developerTools) {
+      SectionView(title = stringResource(R.string.section_title_for_console)) {
+        InfoRow(stringResource(R.string.info_row_local_name), chat.chatInfo.localDisplayName)
+        SectionDivider()
+        InfoRow(stringResource(R.string.info_row_database_id), chat.chatInfo.apiId.toString())
      }
+      SectionSpacer()
    }
  }
 }

@Composable
-fun ServerImage(chat: Chat) {
-  when (chat.serverInfo.networkStatus) {
-    is Chat.NetworkStatus.Connected ->
-      Icon(Icons.Filled.Circle, stringResource(R.string.icon_descr_server_status_connected), tint = MaterialTheme.colors.primaryVariant)
-    is Chat.NetworkStatus.Disconnected ->
-      Icon(Icons.Filled.Pending, stringResource(R.string.icon_descr_server_status_disconnected), tint = HighOrLowlight)
-    is Chat.NetworkStatus.Error ->
-      Icon(Icons.Filled.Error, stringResource(R.string.icon_descr_server_status_error), tint = HighOrLowlight)
-    else -> Icon(Icons.Outlined.Circle, stringResource(R.string.icon_descr_server_status_pending), tint = HighOrLowlight)
+fun ChatInfoHeader(cInfo: ChatInfo) {
+  Column(
+    Modifier.padding(horizontal = 8.dp),
+    horizontalAlignment = Alignment.CenterHorizontally
+  ) {
+    ChatInfoImage(cInfo, size = 192.dp, iconColor = if (isSystemInDarkTheme()) GroupDark else SettingsSecondaryLight)
+    Text(
+      cInfo.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
+      color = MaterialTheme.colors.onBackground,
+      maxLines = 1,
+      overflow = TextOverflow.Ellipsis
+    )
+    if (cInfo.fullName != "" && cInfo.fullName != cInfo.displayName) {
+      Text(
+        cInfo.fullName, style = MaterialTheme.typography.h2,
+        color = MaterialTheme.colors.onBackground,
+        maxLines = 2,
+        overflow = TextOverflow.Ellipsis
+      )
+    }
+  }
+}
+
+@Composable
+fun NetworkStatusRow(networkStatus: Chat.NetworkStatus) {
+  Row(
+    Modifier
+      .fillMaxSize()
+      .clickable {
+        AlertManager.shared.showAlertMsg(
+          generalGetString(R.string.network_status),
+          networkStatus.statusExplanation
+        )
+      },
+    horizontalArrangement = Arrangement.SpaceBetween,
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Row(
+      verticalAlignment = Alignment.CenterVertically,
+      horizontalArrangement = Arrangement.spacedBy(4.dp)
+    ) {
+      Text(stringResource(R.string.network_status))
+      Icon(
+        Icons.Outlined.Info,
+        stringResource(R.string.network_status),
+        tint = MaterialTheme.colors.primary
+      )
+    }
+
+    Row(
+      verticalAlignment = Alignment.CenterVertically,
+      horizontalArrangement = Arrangement.spacedBy(4.dp)
+    ) {
+      Text(
+        networkStatus.statusString,
+        color = HighOrLowlight
+      )
+      ServerImage(networkStatus)
+    }
+  }
+}
+
+@Composable
+fun ServerImage(networkStatus: Chat.NetworkStatus) {
+  Box(Modifier.size(18.dp)) {
+    when (networkStatus) {
+      is Chat.NetworkStatus.Connected ->
+        Icon(Icons.Filled.Circle, stringResource(R.string.icon_descr_server_status_connected), tint = MaterialTheme.colors.primaryVariant)
+      is Chat.NetworkStatus.Disconnected ->
+        Icon(Icons.Filled.Pending, stringResource(R.string.icon_descr_server_status_disconnected), tint = HighOrLowlight)
+      is Chat.NetworkStatus.Error ->
+        Icon(Icons.Filled.Error, stringResource(R.string.icon_descr_server_status_error), tint = HighOrLowlight)
+      else -> Icon(Icons.Outlined.Circle, stringResource(R.string.icon_descr_server_status_pending), tint = HighOrLowlight)
+    }
+  }
+}
+
+@Composable
+fun SimplexServers(text: String, servers: List<String>) {
+  val info = servers.joinToString(separator = ", ") { it.substringAfter("@") }
+  InfoRow(text, info)
+}
+
+@Composable
+fun ClearChatButton(clearChat: () -> Unit) {
+  Row(
+    Modifier
+      .fillMaxSize()
+      .clickable { clearChat() },
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Icon(
+      Icons.Outlined.Restore,
+      stringResource(R.string.clear_chat_button),
+      tint = WarningOrange
+    )
+    Spacer(Modifier.size(8.dp))
+    Text(stringResource(R.string.clear_chat_button), color = WarningOrange)
+  }
+}
+
+@Composable
+fun DeleteContactButton(deleteContact: () -> Unit) {
+  Row(
+    Modifier
+      .fillMaxSize()
+      .clickable { deleteContact() },
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Icon(
+      Icons.Outlined.Delete,
+      stringResource(R.string.button_delete_contact),
+      tint = Color.Red
+    )
+    Spacer(Modifier.size(8.dp))
+    Text(stringResource(R.string.button_delete_contact), color = Color.Red)
  }
 }

@@ -189,7 +272,9 @@ fun PreviewChatInfoLayout() {
        chatItems = arrayListOf(),
        serverInfo = Chat.ServerInfo(Chat.NetworkStatus.Error("agent BROKER TIMEOUT"))
      ),
-      close = {}, deleteContact = {}, clearChat = {}
+      developerTools = false,
+      connStats = null,
+      deleteContact = {}, clearChat = {}
    )
  }
 }
@@ -1,16 +1,17 @@
 package chat.simplex.app.views.chat

 import android.content.res.Configuration
-import android.util.Log
 import androidx.activity.compose.BackHandler
-import androidx.annotation.StringRes
 import androidx.compose.foundation.*
+import androidx.compose.foundation.gestures.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.KeyboardArrowDown
+import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.mapSaver
@@ -19,81 +20,122 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.platform.*
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.capitalize
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.*
 import chat.simplex.app.R
-import chat.simplex.app.TAG
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.call.*
+import chat.simplex.app.views.chat.group.AddGroupMembersView
+import chat.simplex.app.views.chat.group.GroupChatInfoView
 import chat.simplex.app.views.chat.item.ChatItemView
-import chat.simplex.app.views.chatlist.openChat
+import chat.simplex.app.views.chat.item.ItemAction
+import chat.simplex.app.views.chatlist.*
 import chat.simplex.app.views.helpers.*
+import chat.simplex.app.views.helpers.AppBarHeight
 import com.google.accompanist.insets.ProvideWindowInsets
 import com.google.accompanist.insets.navigationBarsWithImePadding
 import kotlinx.coroutines.*
+import kotlinx.coroutines.flow.*
 import kotlinx.datetime.Clock

@Composable
 fun ChatView(chatModel: ChatModel) {
-  val chat: Chat? = chatModel.chats.firstOrNull { chat -> chat.chatInfo.id == chatModel.chatId.value }
+  var activeChat by remember { mutableStateOf(chatModel.chats.firstOrNull { chat -> chat.chatInfo.id == chatModel.chatId.value }) }
+  val searchText = remember { mutableStateOf("") }
  val user = chatModel.currentUser.value
  val useLinkPreviews = chatModel.controller.appPrefs.privacyLinkPreviews.get()
-  val enableCalls = chatModel.controller.appPrefs.experimentalCalls.get()
  val composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = useLinkPreviews)) }
  val attachmentOption = remember { mutableStateOf<AttachmentOption?>(null) }
  val attachmentBottomSheetState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden)
  val scope = rememberCoroutineScope()

-  if (chat == null || user == null) {
+  if (activeChat == null || user == null) {
    chatModel.chatId.value = null
  } else {
+    val chat = activeChat!!
    BackHandler { chatModel.chatId.value = null }
-    // TODO a more advanced version would mark as read only if in view
-    LaunchedEffect(chat.chatItems) {
-      Log.d(TAG, "ChatView ${chatModel.chatId.value}: LaunchedEffect")
-      delay(750L)
-      if (chat.chatItems.isNotEmpty()) {
-        chatModel.markChatItemsRead(chat.chatInfo)
-        chatModel.controller.ntfManager.cancelNotificationsForChat(chat.id)
-        withApi {
-          chatModel.controller.apiChatRead(
-            chat.chatInfo.chatType,
-            chat.chatInfo.apiId,
-            CC.ItemRange(chat.chatStats.minUnreadItemId, chat.chatItems.last().id)
-          )
-        }
+
+    // We need to have real unreadCount value for displaying it inside top right button
+    // Having activeChat reloaded on every change in it is inefficient (UI lags)
+    val unreadCount = remember {
+      derivedStateOf {
+        chatModel.chats.firstOrNull { chat -> chat.chatInfo.id == chatModel.chatId.value }?.chatStats?.unreadCount ?: 0
      }
    }
+
    ChatLayout(
      user,
      chat,
+      unreadCount,
      composeState,
      composeView = {
-        ComposeView(
-          chatModel, chat, composeState, attachmentOption,
-          showChooseAttachment = { scope.launch { attachmentBottomSheetState.show() } }
-        )
+        if (chat.chatInfo.sendMsgEnabled) {
+          ComposeView(
+            chatModel, chat, composeState, attachmentOption,
+            showChooseAttachment = { scope.launch { attachmentBottomSheetState.show() } }
+          )
+        }
      },
      attachmentOption,
      scope,
      attachmentBottomSheetState,
      chatModel.chatItems,
+      searchText,
      useLinkPreviews = useLinkPreviews,
-      enableCalls = enableCalls,
      back = { chatModel.chatId.value = null },
-      info = { ModalManager.shared.showCustomModal { close -> ChatInfoView(chatModel, close) } },
+      info = {
+        withApi {
+          val cInfo = chat.chatInfo
+          if (cInfo is ChatInfo.Direct) {
+            val connStats = chatModel.controller.apiContactInfo(cInfo.apiId)
+            ModalManager.shared.showCustomModal { close ->
+              ModalView(
+                close = close, modifier = Modifier,
+                background = if (isSystemInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
+              ) {
+                ChatInfoView(chatModel, connStats, close)
+              }
+            }
+          } else if (cInfo is ChatInfo.Group) {
+            setGroupMembers(cInfo.groupInfo, chatModel)
+            ModalManager.shared.showCustomModal { close ->
+              ModalView(
+                close = close, modifier = Modifier,
+                background = if (isSystemInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
+              ) {
+                GroupChatInfoView(chatModel, close)
+              }
+            }
+          }
+        }
+      },
      openDirectChat = { contactId ->
        val c = chatModel.chats.firstOrNull {
          it.chatInfo is ChatInfo.Direct && it.chatInfo.contact.contactId == contactId
        }
-        if (c != null) withApi { openChat(c.chatInfo, chatModel) }
+        if (c != null) {
+          withApi {
+            openChat(c.chatInfo, chatModel)
+            // Redisplay the whole hierarchy if the chat is different to make going from groups to direct chat working correctly
+            activeChat = c
+          }
+        }
+      },
+      loadPrevMessages = { cInfo ->
+        val c = chatModel.getChat(cInfo.id)
+        val firstId = chatModel.chatItems.firstOrNull()?.id
+        if (c != null && firstId != null) {
+          withApi {
+            apiLoadPrevMessages(c.chatInfo, chatModel, firstId, searchText.value)
+          }
+        }
      },
      deleteMessage = { itemId, mode ->
        withApi {
@@ -110,6 +152,9 @@ fun ChatView(chatModel: ChatModel) {
      receiveFile = { fileId ->
        withApi { chatModel.controller.receiveFile(fileId) }
      },
+      joinGroup = { groupId ->
+        withApi { chatModel.controller.apiJoinGroup(groupId) }
+      },
      startCall = { media ->
        val cInfo = chat.chatInfo
        if (cInfo is ChatInfo.Direct) {
@@ -125,6 +170,38 @@ fun ChatView(chatModel: ChatModel) {
        } else {
          chatModel.callManager.acceptIncomingCall(invitation = invitation)
        }
+      },
+      addMembers = { groupInfo ->
+        withApi {
+          setGroupMembers(groupInfo, chatModel)
+          ModalManager.shared.showCustomModal { close ->
+            ModalView(
+              close = close, modifier = Modifier,
+              background = if (isSystemInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
+            ) {
+              AddGroupMembersView(groupInfo, chatModel, close)
+            }
+          }
+        }
+      },
+      markRead = { range, unreadCountAfter ->
+        chatModel.markChatItemsRead(chat.chatInfo, range, unreadCountAfter)
+        chatModel.controller.ntfManager.cancelNotificationsForChat(chat.id)
+        withApi {
+          chatModel.controller.apiChatRead(
+            chat.chatInfo.chatType,
+            chat.chatInfo.apiId,
+            range
+          )
+        }
+      },
+      onSearchValueChanged = { value ->
+        if (searchText.value == value) return@ChatLayout
+        val c = chatModel.getChat(chat.chatInfo.id) ?: return@ChatLayout
+        withApi {
+          apiFindMessages(c.chatInfo, chatModel, value)
+          searchText.value = value
+        }
      }
    )
  }
@@ -134,21 +211,27 @@ fun ChatView(chatModel: ChatModel) {
 fun ChatLayout(
  user: User,
  chat: Chat,
+  unreadCount: State<Int>,
  composeState: MutableState<ComposeState>,
  composeView: (@Composable () -> Unit),
  attachmentOption: MutableState<AttachmentOption?>,
  scope: CoroutineScope,
  attachmentBottomSheetState: ModalBottomSheetState,
  chatItems: List<ChatItem>,
+  searchValue: State<String>,
  useLinkPreviews: Boolean,
-  enableCalls: Boolean = false,
  back: () -> Unit,
  info: () -> Unit,
  openDirectChat: (Long) -> Unit,
+  loadPrevMessages: (ChatInfo) -> Unit,
  deleteMessage: (Long, CIDeleteMode) -> Unit,
  receiveFile: (Long) -> Unit,
+  joinGroup: (Long) -> Unit,
  startCall: (CallMediaType) -> Unit,
-  acceptCall: (Contact) -> Unit
+  acceptCall: (Contact) -> Unit,
+  addMembers: (GroupInfo) -> Unit,
+  markRead: (CC.ItemRange, unreadCountAfter: Int?) -> Unit,
+  onSearchValueChanged: (String) -> Unit,
 ) {
  Surface(
    Modifier
@@ -168,13 +251,25 @@ fun ChatLayout(
        sheetState = attachmentBottomSheetState,
        sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
      ) {
+        val floatingButton: MutableState<@Composable () -> Unit> = remember { mutableStateOf({}) }
        Scaffold(
-          topBar = { ChatInfoToolbar(chat, enableCalls, back, info, startCall) },
+          topBar = { ChatInfoToolbar(chat, back, info, startCall, addMembers, onSearchValueChanged) },
          bottomBar = composeView,
-          modifier = Modifier.navigationBarsWithImePadding()
+          modifier = Modifier.navigationBarsWithImePadding(),
+          floatingActionButton = floatingButton.value,
        ) { contentPadding ->
-          Box(Modifier.padding(contentPadding)) {
-            ChatItemsList(user, chat, composeState, chatItems, useLinkPreviews, openDirectChat, deleteMessage, receiveFile, acceptCall)
+          CompositionLocalProvider(
+            // Makes horizontal and vertical scrolling to coexist nicely.
+            // With default touchSlop when you scroll LazyColumn, you can unintentionally open reply view
+            LocalViewConfiguration provides LocalViewConfiguration.current.bigTouchSlop()
+          ) {
+            BoxWithConstraints(Modifier.padding(contentPadding)) {
+              ChatItemsList(
+                user, chat, unreadCount, composeState, chatItems, searchValue,
+                useLinkPreviews, openDirectChat, loadPrevMessages, deleteMessage,
+                receiveFile, joinGroup, acceptCall, markRead, floatingButton
+              )
+            }
          }
        }
      }
@@ -183,62 +278,109 @@ fun ChatLayout(
 }

@Composable
-fun ChatInfoToolbar(chat: Chat, enableCalls: Boolean, back: () -> Unit, info: () -> Unit, startCall: (CallMediaType) -> Unit) {
-  @Composable fun toolbarButton(icon: ImageVector, @StringRes textId: Int, modifier: Modifier = Modifier.padding(0.dp), onClick: () -> Unit) {
-    IconButton(onClick, modifier = modifier) {
-      Icon(icon, stringResource(textId), tint = MaterialTheme.colors.primary)
+fun ChatInfoToolbar(
+  chat: Chat,
+  back: () -> Unit,
+  info: () -> Unit,
+  startCall: (CallMediaType) -> Unit,
+  addMembers: (GroupInfo) -> Unit,
+  onSearchValueChanged: (String) -> Unit,
+) {
+  var showMenu by remember { mutableStateOf(false) }
+  var showSearch by remember { mutableStateOf(false) }
+  val onBackClicked = {
+    if (!showSearch) {
+      back()
+    } else {
+      onSearchValueChanged("")
+      showSearch = false
    }
  }
-  Column {
-    Box(
-      Modifier
-        .fillMaxWidth()
-        .height(52.dp)
-        .background(if (isSystemInDarkTheme()) ToolbarDark else ToolbarLight)
-        .padding(horizontal = 4.dp),
-      contentAlignment = Alignment.CenterStart,
-    ) {
-      val cInfo = chat.chatInfo
-      toolbarButton(Icons.Outlined.ArrowBackIos, R.string.back, onClick = back)
-      if (cInfo is ChatInfo.Direct && enableCalls) {
-        Box(Modifier.fillMaxWidth(), contentAlignment = Alignment.CenterEnd) {
-          Box(Modifier.width(85.dp), contentAlignment = Alignment.CenterStart) {
-            toolbarButton(Icons.Outlined.Phone, R.string.icon_descr_audio_call) {
-              startCall(CallMediaType.Audio)
-            }
-          }
-          toolbarButton(Icons.Outlined.Videocam, R.string.icon_descr_video_call) {
-            startCall(CallMediaType.Video)
-          }
-        }
-      }
-      Row(
-        Modifier
-          .padding(horizontal = 80.dp)
-          .fillMaxWidth()
-          .clickable(onClick = info),
-        horizontalArrangement = Arrangement.Center,
-        verticalAlignment = Alignment.CenterVertically
-      ) {
-        ChatInfoImage(cInfo, size = 40.dp)
-        Column(
-          Modifier.padding(start = 8.dp),
-          horizontalAlignment = Alignment.CenterHorizontally
-        ) {
-          Text(
-            cInfo.displayName, fontWeight = FontWeight.SemiBold,
-            maxLines = 1, overflow = TextOverflow.Ellipsis
-          )
-          if (cInfo.fullName != "" && cInfo.fullName != cInfo.displayName) {
-            Text(
-              cInfo.fullName,
-              maxLines = 1, overflow = TextOverflow.Ellipsis
-            )
-          }
-        }
+  BackHandler(onBack = onBackClicked)
+  val barButtons = arrayListOf<@Composable RowScope.() -> Unit>()
+  val menuItems = arrayListOf<@Composable () -> Unit>()
+  menuItems.add {
+    ItemAction(stringResource(android.R.string.search_go).capitalize(Locale.current), Icons.Outlined.Search, onClick = {
+      showMenu = false
+      showSearch = true
+    })
+  }
+
+  if (chat.chatInfo is ChatInfo.Direct) {
+    barButtons.add {
+      IconButton({
+        showMenu = false
+        startCall(CallMediaType.Audio)
+      }) {
+        Icon(Icons.Outlined.Phone, stringResource(R.string.icon_descr_more_button), tint = MaterialTheme.colors.primary)
+      }
+    }
+    menuItems.add {
+      ItemAction(stringResource(R.string.icon_descr_video_call).capitalize(Locale.current), Icons.Outlined.Videocam, onClick = {
+        showMenu = false
+        startCall(CallMediaType.Video)
+      })
+    }
+  } else if (chat.chatInfo is ChatInfo.Group && chat.chatInfo.groupInfo.canAddMembers) {
+    barButtons.add {
+      IconButton({
+        showMenu = false
+        addMembers(chat.chatInfo.groupInfo)
+      }) {
+        Icon(Icons.Outlined.PersonAdd, stringResource(R.string.icon_descr_add_members), tint = MaterialTheme.colors.primary)
+      }
+    }
+  }
+  barButtons.add {
+    IconButton({ showMenu = true }) {
+      Icon(Icons.Default.MoreVert, stringResource(R.string.icon_descr_more_button), tint = MaterialTheme.colors.primary)
+    }
+  }
+
+  DefaultTopAppBar(
+    navigationButton = { NavigationButtonBack(onBackClicked) },
+    title = { ChatInfoToolbarTitle(chat.chatInfo) },
+    onTitleClick = info,
+    showSearch = showSearch,
+    onSearchValueChanged = onSearchValueChanged,
+    buttons = barButtons
+  )
+
+  Divider(Modifier.padding(top = AppBarHeight))
+
+  Box(Modifier.fillMaxWidth().wrapContentSize(Alignment.TopEnd).offset(y = AppBarHeight)) {
+    DropdownMenu(
+      expanded = showMenu,
+      onDismissRequest = { showMenu = false },
+      Modifier.widthIn(min = 220.dp)
+    ) {
+      menuItems.forEach { it() }
+    }
+  }
+}
+
+@Composable
+fun ChatInfoToolbarTitle(cInfo: ChatInfo, imageSize: Dp = 40.dp, iconColor: Color = MaterialTheme.colors.secondary) {
+  Row(
+    horizontalArrangement = Arrangement.Center,
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    ChatInfoImage(cInfo, size = imageSize, iconColor)
+    Column(
+      Modifier.padding(start = 8.dp),
+      horizontalAlignment = Alignment.CenterHorizontally
+    ) {
+      Text(
+        cInfo.displayName, fontWeight = FontWeight.SemiBold,
+        maxLines = 1, overflow = TextOverflow.Ellipsis
+      )
+      if (cInfo.fullName != "" && cInfo.fullName != cInfo.displayName) {
+        Text(
+          cInfo.fullName,
+          maxLines = 1, overflow = TextOverflow.Ellipsis
+        )
      }
    }
-    Divider()
  }
 }

@@ -255,36 +397,87 @@ val CIListStateSaver = run {
 }

@Composable
-fun ChatItemsList(
+fun BoxWithConstraintsScope.ChatItemsList(
  user: User,
  chat: Chat,
+  unreadCount: State<Int>,
  composeState: MutableState<ComposeState>,
  chatItems: List<ChatItem>,
+  searchValue: State<String>,
  useLinkPreviews: Boolean,
  openDirectChat: (Long) -> Unit,
+  loadPrevMessages: (ChatInfo) -> Unit,
  deleteMessage: (Long, CIDeleteMode) -> Unit,
  receiveFile: (Long) -> Unit,
-  acceptCall: (Contact) -> Unit
+  joinGroup: (Long) -> Unit,
+  acceptCall: (Contact) -> Unit,
+  markRead: (CC.ItemRange, unreadCountAfter: Int?) -> Unit,
+  floatingButton: MutableState<@Composable () -> Unit>
 ) {
-  val listState = rememberLazyListState(initialFirstVisibleItemIndex = chatItems.size - chatItems.count { it.isRcvNew })
-  val keyboardState by getKeyboardState()
-  val ciListState = rememberSaveable(stateSaver = CIListStateSaver) {
-    mutableStateOf(CIListState(false, chatItems.count(), keyboardState))
-  }
+  val listState = rememberLazyListState()
  val scope = rememberCoroutineScope()
  val uriHandler = LocalUriHandler.current
  val cxt = LocalContext.current
-  LazyColumn(state = listState) {
-    itemsIndexed(chatItems) { i, cItem ->
-      if (i == 0) {
-        Spacer(Modifier.size(8.dp))
+
+  // Helps to scroll to bottom after moving from Group to Direct chat
+  // and prevents scrolling to bottom on orientation change
+  var shouldAutoScroll by rememberSaveable { mutableStateOf(true) }
+  LaunchedEffect(chat.chatInfo.apiId, chat.chatInfo.chatType, shouldAutoScroll) {
+    if (shouldAutoScroll && listState.firstVisibleItemIndex != 0) {
+      scope.launch { listState.scrollToItem(0) }
+    }
+    // Don't autoscroll next time until it will be needed
+    shouldAutoScroll = false
+  }
+  var prevSearchEmptiness by rememberSaveable { mutableStateOf(searchValue.value.isEmpty()) }
+  // Scroll to bottom when search value changes from something to nothing and back
+  LaunchedEffect(searchValue.value.isEmpty()) {
+    // They are equal when orientation was changed, don't need to scroll.
+    // LaunchedEffect unaware of this event since it uses remember, not rememberSaveable
+    if (prevSearchEmptiness == searchValue.value.isEmpty()) return@LaunchedEffect
+    prevSearchEmptiness = searchValue.value.isEmpty()
+
+    if (listState.firstVisibleItemIndex != 0) {
+      scope.launch { listState.scrollToItem(0) }
+    }
+  }
+
+  PreloadItems(listState, ChatPagination.UNTIL_PRELOAD_COUNT, chat, chatItems) { c ->
+    loadPrevMessages(c.chatInfo)
+  }
+
+  Spacer(Modifier.size(8.dp))
+
+  val reversedChatItems by remember { derivedStateOf { chatItems.reversed() } }
+  LazyColumn(state = listState, reverseLayout = true) {
+    itemsIndexed(reversedChatItems) { i, cItem ->
+      val dismissState = rememberDismissState(initialValue = DismissValue.Default) { false }
+      val directions = setOf(DismissDirection.EndToStart)
+      val swipeableModifier = SwipeToDismissModifier(
+        state = dismissState,
+        directions = directions,
+        swipeDistance = with(LocalDensity.current) { 30.dp.toPx() },
+      )
+      val swipedToEnd = (dismissState.overflow.value > 0f && directions.contains(DismissDirection.StartToEnd))
+      val swipedToStart = (dismissState.overflow.value < 0f && directions.contains(DismissDirection.EndToStart))
+      if (dismissState.isAnimationRunning && (swipedToStart || swipedToEnd)) {
+        LaunchedEffect(Unit) {
+          scope.launch {
+            if (composeState.value.editing) {
+              composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
+            } else {
+              composeState.value = composeState.value.copy(contextItem = ComposeContextItem.QuotedItem(cItem))
+            }
+          }
+        }
      }
+
      if (chat.chatInfo is ChatInfo.Group) {
        if (cItem.chatDir is CIDirection.GroupRcv) {
-          val prevItem = if (i > 0) chatItems[i - 1] else null
+          val prevItem = if (i < reversedChatItems.lastIndex) reversedChatItems[i + 1] else null
          val member = cItem.chatDir.groupMember
          val showMember = showMemberImage(member, prevItem)
-          Row(Modifier.padding(start = 8.dp, end = 66.dp)) {
+          Row(Modifier.padding(start = 8.dp, end = 66.dp).then(swipeableModifier)) {
            if (showMember) {
              val contactId = member.memberContactId
              if (contactId == null) {
@@ -293,7 +486,11 @@ fun ChatItemsList(
                Box(
                  Modifier
                    .clip(CircleShape)
-                    .clickable { openDirectChat(contactId) }
+                    .clickable {
+                      openDirectChat(contactId)
+                      // Scroll to first unread message when direct chat will be loaded
+                      shouldAutoScroll = true
+                    }
                ) {
                  MemberImage(member)
                }
@@ -302,11 +499,11 @@ fun ChatItemsList(
            } else {
              Spacer(Modifier.size(42.dp))
            }
-            ChatItemView(user, chat.chatInfo, cItem, composeState, cxt, uriHandler, showMember = showMember, useLinkPreviews = useLinkPreviews, deleteMessage = deleteMessage, receiveFile = receiveFile, acceptCall = acceptCall)
+            ChatItemView(user, chat.chatInfo, cItem, composeState, cxt, uriHandler, showMember = showMember, useLinkPreviews = useLinkPreviews, deleteMessage = deleteMessage, receiveFile = receiveFile, joinGroup = {}, acceptCall = acceptCall)
          }
        } else {
-          Box(Modifier.padding(start = 86.dp, end = 12.dp)) {
-            ChatItemView(user, chat.chatInfo, cItem, composeState, cxt, uriHandler, useLinkPreviews = useLinkPreviews, deleteMessage = deleteMessage, receiveFile = receiveFile, acceptCall = acceptCall)
+          Box(Modifier.padding(start = 86.dp, end = 12.dp).then(swipeableModifier)) {
+            ChatItemView(user, chat.chatInfo, cItem, composeState, cxt, uriHandler, useLinkPreviews = useLinkPreviews, deleteMessage = deleteMessage, receiveFile = receiveFile, joinGroup = {}, acceptCall = acceptCall)
          }
        }
      } else { // direct message
@@ -315,20 +512,148 @@ fun ChatItemsList(
          Modifier.padding(
            start = if (sent) 76.dp else 12.dp,
            end = if (sent) 12.dp else 76.dp,
-          )
+          ).then(swipeableModifier)
        ) {
-          ChatItemView(user, chat.chatInfo, cItem, composeState, cxt, uriHandler, useLinkPreviews = useLinkPreviews, deleteMessage = deleteMessage, receiveFile = receiveFile, acceptCall = acceptCall)
+          ChatItemView(user, chat.chatInfo, cItem, composeState, cxt, uriHandler, useLinkPreviews = useLinkPreviews, deleteMessage = deleteMessage, receiveFile = receiveFile, joinGroup = joinGroup, acceptCall = acceptCall)
+        }
+      }
+
+      if (cItem.isRcvNew) {
+        LaunchedEffect(cItem.id) {
+          scope.launch {
+            delay(750)
+            markRead(CC.ItemRange(cItem.id, cItem.id), null)
+          }
        }
      }
    }
-    val len = chatItems.count()
-    if (len > 1 && (keyboardState != ciListState.value.keyboardState || !ciListState.value.scrolled || len != ciListState.value.itemCount)) {
-      scope.launch {
-        ciListState.value = CIListState(true, len, keyboardState)
-        listState.animateScrollToItem(len - 1)
+  }
+  FloatingButtons(chatItems, unreadCount, chat.chatStats.minUnreadItemId, searchValue, markRead, floatingButton, listState)
+}
+
+@Composable
+fun BoxWithConstraintsScope.FloatingButtons(
+  chatItems: List<ChatItem>,
+  unreadCount: State<Int>,
+  minUnreadItemId: Long,
+  searchValue: State<String>,
+  markRead: (CC.ItemRange, unreadCountAfter: Int?) -> Unit,
+  floatingButton: MutableState<@Composable () -> Unit>,
+  listState: LazyListState
+) {
+  val scope = rememberCoroutineScope()
+
+  var firstVisibleIndex by remember { mutableStateOf(listState.firstVisibleItemIndex) }
+  var lastIndexOfVisibleItems by remember { mutableStateOf(listState.layoutInfo.visibleItemsInfo.lastIndex) }
+  var firstItemIsVisible by remember { mutableStateOf(firstVisibleIndex == 0)  }
+
+  LaunchedEffect(listState) {
+    snapshotFlow { listState.firstVisibleItemIndex }
+      .distinctUntilChanged()
+      .collect {
+        firstVisibleIndex = it
+        firstItemIsVisible = firstVisibleIndex == 0
      }
+    snapshotFlow { listState.layoutInfo.visibleItemsInfo.lastIndex }
+      .distinctUntilChanged()
+      .collect {
+        lastIndexOfVisibleItems = it
+      }
+  }
+
+  val bottomUnreadCount by remember {
+    derivedStateOf {
+      if (unreadCount.value == 0) return@derivedStateOf 0
+
+      val from = chatItems.lastIndex - firstVisibleIndex - lastIndexOfVisibleItems
+      if (chatItems.size <= from || from < 0) return@derivedStateOf 0
+
+      chatItems.subList(from, chatItems.size).count { it.isRcvNew }
    }
  }
+
+  val firstVisibleOffset = (-with(LocalDensity.current) { maxHeight.roundToPx() } * 0.8).toInt()
+
+  LaunchedEffect(bottomUnreadCount, firstItemIsVisible) {
+    val showButtonWithCounter = bottomUnreadCount > 0 && !firstItemIsVisible && searchValue.value.isEmpty()
+    val showButtonWithArrow = !showButtonWithCounter && !firstItemIsVisible
+    floatingButton.value = bottomEndFloatingButton(
+      bottomUnreadCount,
+      showButtonWithCounter,
+      showButtonWithArrow,
+      onClickArrowDown = {
+        scope.launch { listState.animateScrollToItem(0) }
+      },
+      onClickCounter = {
+        scope.launch { listState.animateScrollToItem(kotlin.math.max(0, bottomUnreadCount - 1), firstVisibleOffset) }
+      }
+    )
+  }
+  // Don't show top FAB if is in search
+  if (searchValue.value.isNotEmpty()) return
+  val fabSize = 56.dp
+  val topUnreadCount by remember {
+    derivedStateOf { unreadCount.value - bottomUnreadCount }
+  }
+  val showButtonWithCounter = topUnreadCount > 0
+  val height = with(LocalDensity.current) { maxHeight.toPx() }
+  var showDropDown by remember { mutableStateOf(false) }
+
+  TopEndFloatingButton(
+    Modifier.padding(end = 16.dp, top = 24.dp).align(Alignment.TopEnd),
+    topUnreadCount,
+    showButtonWithCounter,
+    onClick = { scope.launch { listState.animateScrollBy(height) } },
+    onLongClick = { showDropDown = true }
+  )
+
+  DropdownMenu(
+    expanded = showDropDown,
+    onDismissRequest = { showDropDown = false },
+    Modifier.width(220.dp),
+    offset = DpOffset(maxWidth - 16.dp, 24.dp + fabSize)
+  ) {
+    DropdownMenuItem(
+      onClick = {
+        markRead(
+          CC.ItemRange(minUnreadItemId, chatItems[chatItems.size - listState.layoutInfo.visibleItemsInfo.lastIndex - 1].id - 1),
+          bottomUnreadCount
+        )
+        showDropDown = false
+      }
+    ) {
+      Text(
+        generalGetString(R.string.mark_read),
+        maxLines = 1,
+      )
+    }
+  }
+}
+
+@Composable
+fun PreloadItems(
+  listState: LazyListState,
+  remaining: Int = 10,
+  chat: Chat,
+  items: List<*>,
+  onLoadMore: (chat: Chat) -> Unit,
+) {
+  LaunchedEffect(listState, chat, items) {
+    snapshotFlow { listState.layoutInfo }
+      .map {
+        val totalItemsNumber = it.totalItemsCount
+        val lastVisibleItemIndex = (it.visibleItemsInfo.lastOrNull()?.index ?: 0) + 1
+        if (lastVisibleItemIndex > (totalItemsNumber - remaining))
+          totalItemsNumber
+        else
+          0
+      }
+      .distinctUntilChanged()
+      .filter { it > 0 }
+      .collect {
+        onLoadMore(chat)
+      }
+  }
 }

 fun showMemberImage(member: GroupMember, prevItem: ChatItem?): Boolean {
@@ -341,6 +666,88 @@ fun MemberImage(member: GroupMember) {
  ProfileImage(38.dp, member.memberProfile.image)
 }

+@Composable
+private fun TopEndFloatingButton(
+  modifier: Modifier = Modifier,
+  unreadCount: Int,
+  showButtonWithCounter: Boolean,
+  onClick: () -> Unit,
+  onLongClick: () -> Unit
+) = when {
+  showButtonWithCounter -> {
+    val interactionSource = interactionSourceWithDetection(onClick, onLongClick)
+    FloatingActionButton(
+      {}, // no action here
+      modifier.size(48.dp),
+      elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp),
+      interactionSource = interactionSource,
+    ) {
+      Text(
+        unreadCountStr(unreadCount),
+        color = MaterialTheme.colors.primary,
+        fontSize = 14.sp,
+      )
+    }
+  }
+  else -> {
+  }
+}
+
+private fun bottomEndFloatingButton(
+  unreadCount: Int,
+  showButtonWithCounter: Boolean,
+  showButtonWithArrow: Boolean,
+  onClickArrowDown: () -> Unit,
+  onClickCounter: () -> Unit
+): @Composable () -> Unit = when {
+  showButtonWithCounter -> {
+    {
+      FloatingActionButton(
+        onClick = onClickCounter,
+        elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),
+        modifier = Modifier.size(48.dp)
+      ) {
+        Text(
+          unreadCountStr(unreadCount),
+          color = MaterialTheme.colors.primary,
+          fontSize = 14.sp,
+        )
+      }
+    }
+  }
+  showButtonWithArrow -> {
+    {
+      FloatingActionButton(
+        onClick = onClickArrowDown,
+        elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),
+        modifier = Modifier.size(48.dp)
+      ) {
+        Icon(
+          imageVector = Icons.Default.KeyboardArrowDown,
+          contentDescription = null,
+          tint = MaterialTheme.colors.primary
+        )
+      }
+    }
+  }
+  else -> {
+    {}
+  }
+}
+
+private fun ViewConfiguration.bigTouchSlop(slop: Float = 80f) = object: ViewConfiguration {
+  override val longPressTimeoutMillis
+    get() =
+      this@bigTouchSlop.longPressTimeoutMillis
+  override val doubleTapTimeoutMillis
+    get() =
+      this@bigTouchSlop.doubleTapTimeoutMillis
+  override val doubleTapMinTimeMillis
+    get() =
+      this@bigTouchSlop.doubleTapMinTimeMillis
+  override val touchSlop: Float get() = slop
+}
+
@Preview(showBackground = true)
@Preview(
  uiMode = Configuration.UI_MODE_NIGHT_YES,
@@ -368,6 +775,8 @@ fun PreviewChatLayout() {
        6, CIDirection.DirectRcv(), Clock.System.now(), "hello"
      )
    )
+    val unreadCount = remember { mutableStateOf(chatItems.count { it.isRcvNew }) }
+    val searchValue = remember { mutableStateOf("") }
    ChatLayout(
      user = User.sampleData,
      chat = Chat(
@@ -375,20 +784,27 @@ fun PreviewChatLayout() {
        chatItems = chatItems,
        chatStats = Chat.ChatStats()
      ),
+      unreadCount = unreadCount,
      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
      composeView = {},
      attachmentOption = remember { mutableStateOf<AttachmentOption?>(null) },
      scope = rememberCoroutineScope(),
      attachmentBottomSheetState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden),
      chatItems = chatItems,
+      searchValue,
      useLinkPreviews = true,
      back = {},
      info = {},
      openDirectChat = {},
+      loadPrevMessages = { _ -> },
      deleteMessage = { _, _ -> },
      receiveFile = {},
+      joinGroup = {},
      startCall = {},
-      acceptCall = { _ ->  }
+      acceptCall = { _ -> },
+      addMembers = { _ -> },
+      markRead = { _, _ -> },
+      onSearchValueChanged = {},
    )
  }
 }
@@ -415,6 +831,8 @@ fun PreviewGroupChatLayout() {
        6, CIDirection.GroupRcv(GroupMember.sampleData), Clock.System.now(), "hello"
      )
    )
+    val unreadCount = remember { mutableStateOf(chatItems.count { it.isRcvNew }) }
+    val searchValue = remember { mutableStateOf("") }
    ChatLayout(
      user = User.sampleData,
      chat = Chat(
@@ -422,20 +840,27 @@ fun PreviewGroupChatLayout() {
        chatItems = chatItems,
        chatStats = Chat.ChatStats()
      ),
+      unreadCount = unreadCount,
      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
      composeView = {},
      attachmentOption = remember { mutableStateOf<AttachmentOption?>(null) },
      scope = rememberCoroutineScope(),
      attachmentBottomSheetState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden),
      chatItems = chatItems,
+      searchValue,
      useLinkPreviews = true,
      back = {},
      info = {},
      openDirectChat = {},
+      loadPrevMessages = { _ -> },
      deleteMessage = { _, _ -> },
      receiveFile = {},
+      joinGroup = {},
      startCall = {},
-      acceptCall = { _ ->  }
+      acceptCall = { _ -> },
+      addMembers = { _ -> },
+      markRead = { _, _ -> },
+      onSearchValueChanged = {},
    )
  }
 }
@@ -12,11 +12,13 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.icons.outlined.ArrowUpward
 import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
+import androidx.compose.ui.*
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.input.KeyboardCapitalization
@@ -26,7 +28,9 @@ import chat.simplex.app.R
 import chat.simplex.app.model.ChatItem
 import chat.simplex.app.ui.theme.HighOrLowlight
 import chat.simplex.app.ui.theme.SimpleXTheme
+import kotlinx.coroutines.delay

+@OptIn(ExperimentalComposeUiApi::class)
@Composable
 fun SendMsgView(
  composeState: MutableState<ComposeState>,
@@ -35,6 +39,16 @@ fun SendMsgView(
  textStyle: MutableState<TextStyle>
 ) {
  val cs = composeState.value
+  val focusRequester = remember { FocusRequester() }
+  val keyboard = LocalSoftwareKeyboardController.current
+  LaunchedEffect(cs.contextItem) {
+    if (cs.contextItem !is ComposeContextItem.QuotedItem) return@LaunchedEffect
+    // In replying state
+    focusRequester.requestFocus()
+    delay(50)
+    keyboard?.show()
+  }
+
  BasicTextField(
    value = cs.message,
    onValueChange = onMessageChange,
@@ -44,7 +58,7 @@ fun SendMsgView(
      capitalization = KeyboardCapitalization.Sentences,
      autoCorrect = true
    ),
-    modifier = Modifier.padding(vertical = 8.dp),
+    modifier = Modifier.padding(vertical = 8.dp).focusRequester(focusRequester),
    cursorBrush = SolidColor(HighOrLowlight),
    decorationBox = { innerTextField ->
      Surface(
@@ -0,0 +1,320 @@
+package chat.simplex.app.views.chat.group
+
+import SectionCustomFooter
+import SectionDivider
+import SectionItemView
+import SectionSpacer
+import SectionView
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.runtime.*
+import androidx.compose.runtime.snapshots.SnapshotStateList
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.R
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.chat.ChatInfoToolbarTitle
+import chat.simplex.app.views.helpers.*
+
+@Composable
+fun AddGroupMembersView(groupInfo: GroupInfo, chatModel: ChatModel, close: () -> Unit) {
+  val selectedContacts = remember { mutableStateListOf<Long>() }
+  val selectedRole = remember { mutableStateOf(GroupMemberRole.Admin) }
+
+  BackHandler(onBack = close)
+  AddGroupMembersLayout(
+    groupInfo = groupInfo,
+    contactsToAdd = getContactsToAdd(chatModel),
+    selectedContacts = selectedContacts,
+    selectedRole = selectedRole,
+    inviteMembers = {
+      withApi {
+        selectedContacts.forEach {
+          val member = chatModel.controller.apiAddMember(groupInfo.groupId, it, selectedRole.value)
+          if (member != null) {
+            chatModel.upsertGroupMember(groupInfo, member)
+          }
+        }
+        close.invoke()
+      }
+    },
+    clearSelection = { selectedContacts.clear() },
+    addContact = { contactId -> if (contactId !in selectedContacts) selectedContacts.add(contactId) },
+    removeContact = { contactId -> selectedContacts.removeIf { it == contactId } },
+  )
+}
+
+fun getContactsToAdd(chatModel: ChatModel): List<Contact> {
+  val memberContactIds = chatModel.groupMembers
+    .filter { it.memberCurrent }
+    .mapNotNull { it.memberContactId }
+  return chatModel.chats
+    .asSequence()
+    .map { it.chatInfo }
+    .filterIsInstance<ChatInfo.Direct>()
+    .map { it.contact }
+    .filter { it.contactId !in memberContactIds }
+    .sortedBy { it.displayName.lowercase() }
+    .toList()
+}
+
+@Composable
+fun AddGroupMembersLayout(
+  groupInfo: GroupInfo,
+  contactsToAdd: List<Contact>,
+  selectedContacts: SnapshotStateList<Long>,
+  selectedRole: MutableState<GroupMemberRole>,
+  inviteMembers: () -> Unit,
+  clearSelection: () -> Unit,
+  addContact: (Long) -> Unit,
+  removeContact: (Long) -> Unit,
+) {
+  Column(
+    Modifier
+      .fillMaxWidth()
+      .verticalScroll(rememberScrollState()),
+    horizontalAlignment = Alignment.Start,
+  ) {
+    Row(
+      Modifier.fillMaxWidth(),
+      horizontalArrangement = Arrangement.Center
+    ) {
+      ChatInfoToolbarTitle(
+        ChatInfo.Group(groupInfo),
+        imageSize = 60.dp,
+        iconColor = if (isSystemInDarkTheme()) GroupDark else SettingsSecondaryLight
+      )
+    }
+    SectionSpacer()
+
+    if (contactsToAdd.isEmpty()) {
+      Row(
+        Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.Center
+      ) {
+        Text(
+          stringResource(R.string.no_contacts_to_add),
+          Modifier.padding(),
+          color = HighOrLowlight
+        )
+      }
+    } else {
+      SectionView {
+        SectionItemView {
+          RoleSelectionRow(groupInfo, selectedRole)
+        }
+        SectionDivider()
+        SectionItemView {
+          InviteMembersButton(inviteMembers, disabled = selectedContacts.isEmpty())
+        }
+      }
+      SectionCustomFooter {
+        InviteSectionFooter(selectedContactsCount = selectedContacts.count(), clearSelection)
+      }
+      SectionSpacer()
+
+      SectionView {
+        ContactList(contacts = contactsToAdd, selectedContacts, addContact, removeContact)
+      }
+      SectionSpacer()
+    }
+  }
+}
+
+@Composable
+fun RoleSelectionRow(groupInfo: GroupInfo, selectedRole: MutableState<GroupMemberRole>) {
+  Row(
+    Modifier.fillMaxWidth(),
+    verticalAlignment = Alignment.CenterVertically,
+    horizontalArrangement = Arrangement.SpaceBetween
+  ) {
+    Text(stringResource(R.string.new_member_role))
+    RoleDropdownMenu(groupInfo, selectedRole)
+  }
+}
+
+@Composable
+fun RoleDropdownMenu(groupInfo: GroupInfo, selectedRole: MutableState<GroupMemberRole>) {
+  val options = GroupMemberRole.values()
+    .filter { it <= groupInfo.membership.memberRole }
+  var expanded by remember { mutableStateOf(false) }
+
+  ExposedDropdownMenuBox(
+    expanded = expanded,
+    onExpandedChange = {
+      expanded = !expanded
+    }
+  ) {
+    Row(
+      Modifier.fillMaxWidth(0.7f),
+      verticalAlignment = Alignment.CenterVertically,
+      horizontalArrangement = Arrangement.End
+    ) {
+      Text(
+        selectedRole.value.text,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        color = HighOrLowlight
+      )
+      Spacer(Modifier.size(4.dp))
+      Icon(
+        if (!expanded) Icons.Outlined.ExpandMore else Icons.Outlined.ExpandLess,
+        generalGetString(R.string.invite_to_group_button),
+        modifier = Modifier.padding(start = 8.dp),
+        tint = HighOrLowlight
+      )
+    }
+    ExposedDropdownMenu(
+      expanded = expanded,
+      onDismissRequest = {
+        expanded = false
+      }
+    ) {
+      options.forEach { selectionOption ->
+        DropdownMenuItem(
+          onClick = {
+            selectedRole.value = selectionOption
+            expanded = false
+          }
+        ) {
+          Text(
+            selectionOption.text,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+          )
+        }
+      }
+    }
+  }
+}
+
+@Composable
+fun InviteMembersButton(inviteMembers: () -> Unit, disabled: Boolean) {
+  val modifier = if (disabled) Modifier else Modifier.clickable { inviteMembers() }
+  Row(
+    modifier.fillMaxSize(),
+    horizontalArrangement = Arrangement.End,
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    val color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary
+    Text(stringResource(R.string.invite_to_group_button), color = color)
+    Spacer(Modifier.size(8.dp))
+    Icon(
+      Icons.Outlined.Check,
+      stringResource(R.string.invite_to_group_button),
+      tint = color
+    )
+  }
+}
+
+@Composable
+fun InviteSectionFooter(selectedContactsCount: Int, clearSelection: () -> Unit) {
+  Row(
+    Modifier.fillMaxWidth(),
+    horizontalArrangement = if (selectedContactsCount >= 1) Arrangement.SpaceBetween else Arrangement.End,
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    if (selectedContactsCount >= 1) {
+      Box(
+        Modifier.clickable { clearSelection() }
+      ) {
+        Text(
+          stringResource(R.string.clear_contacts_selection_button),
+          color = MaterialTheme.colors.primary,
+          fontSize = 12.sp
+        )
+      }
+
+      Text(
+        String.format(generalGetString(R.string.num_contacts_selected), selectedContactsCount),
+        color = HighOrLowlight,
+        fontSize = 12.sp
+      )
+    } else {
+      Text(
+        stringResource(R.string.no_contacts_selected),
+        color = HighOrLowlight,
+        fontSize = 12.sp
+      )
+    }
+  }
+}
+
+@Composable
+fun ContactList(
+  contacts: List<Contact>,
+  selectedContacts: SnapshotStateList<Long>,
+  addContact: (Long) -> Unit,
+  removeContact: (Long) -> Unit
+) {
+  Column {
+    contacts.forEachIndexed { index, contact ->
+      SectionItemView {
+        ContactCheckRow(
+          contact, addContact, removeContact,
+          checked = selectedContacts.contains(contact.apiId)
+        )
+      }
+      if (index < contacts.lastIndex) {
+        SectionDivider()
+      }
+    }
+  }
+}
+
+@Composable
+fun ContactCheckRow(
+  contact: Contact,
+  addContact: (Long) -> Unit,
+  removeContact: (Long) -> Unit,
+  checked: Boolean
+) {
+  Row(
+    Modifier
+      .fillMaxSize()
+      .clickable { if (!checked) addContact(contact.apiId) else removeContact(contact.apiId) },
+    horizontalArrangement = Arrangement.SpaceBetween,
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Row(
+      verticalAlignment = Alignment.CenterVertically,
+      horizontalArrangement = Arrangement.spacedBy(4.dp)
+    ) {
+      ProfileImage(size = 36.dp, contact.image)
+      Text(contact.chatViewName, maxLines = 1, overflow = TextOverflow.Ellipsis)
+    }
+    Icon(
+      if (checked) Icons.Filled.CheckCircle else Icons.Outlined.Circle,
+      contentDescription = stringResource(R.string.icon_descr_contact_checked),
+      tint = if (checked) MaterialTheme.colors.primary else HighOrLowlight
+    )
+  }
+}
+
+@Preview
+@Composable
+fun PreviewAddGroupMembersLayout() {
+  SimpleXTheme {
+    AddGroupMembersLayout(
+      groupInfo = GroupInfo.sampleData,
+      contactsToAdd = listOf(Contact.sampleData, Contact.sampleData, Contact.sampleData),
+      selectedContacts = remember { mutableStateListOf() },
+      selectedRole = remember { mutableStateOf(GroupMemberRole.Admin) },
+      inviteMembers = {},
+      clearSelection = {},
+      addContact = {},
+      removeContact = {}
+    )
+  }
+}
@@ -0,0 +1,328 @@
+package chat.simplex.app.views.chat.group
+
+import InfoRow
+import SectionDivider
+import SectionItemView
+import SectionSpacer
+import SectionView
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.R
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.chat.*
+import chat.simplex.app.views.chatlist.setGroupMembers
+import chat.simplex.app.views.helpers.*
+
+@Composable
+fun GroupChatInfoView(chatModel: ChatModel, close: () -> Unit) {
+  BackHandler(onBack = close)
+  val chat = chatModel.chats.firstOrNull { it.id == chatModel.chatId.value }
+  val developerTools = chatModel.controller.appPrefs.developerTools.get()
+  if (chat != null && chat.chatInfo is ChatInfo.Group) {
+    val groupInfo = chat.chatInfo.groupInfo
+    GroupChatInfoLayout(
+      chat,
+      groupInfo,
+      members = chatModel.groupMembers
+        .filter { it.memberStatus != GroupMemberStatus.MemLeft && it.memberStatus != GroupMemberStatus.MemRemoved }
+        .sortedBy { it.displayName.lowercase() },
+      developerTools,
+      addMembers = {
+        withApi {
+          setGroupMembers(groupInfo, chatModel)
+          ModalManager.shared.showCustomModal { close ->
+            ModalView(
+              close = close, modifier = Modifier,
+              background = if (isSystemInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
+            ) {
+              AddGroupMembersView(groupInfo, chatModel, close)
+            }
+          }
+        }
+      },
+      showMemberInfo = { member ->
+        withApi {
+          val connStats = chatModel.controller.apiGroupMemberInfo(groupInfo.groupId, member.groupMemberId)
+          ModalManager.shared.showCustomModal { close ->
+            ModalView(
+              close = close, modifier = Modifier,
+              background = if (isSystemInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
+            ) {
+              GroupMemberInfoView(groupInfo, member, connStats, chatModel, close)
+            }
+          }
+        }
+      },
+      editGroupProfile = {
+        ModalManager.shared.showCustomModal { close -> GroupProfileView(groupInfo, chatModel, close) }
+      },
+      deleteGroup = { deleteGroupDialog(chat.chatInfo, chatModel, close) },
+      clearChat = { clearChatDialog(chat.chatInfo, chatModel, close) },
+      leaveGroup = { leaveGroupDialog(groupInfo, chatModel, close) }
+    )
+  }
+}
+
+fun deleteGroupDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
+  AlertManager.shared.showAlertMsg(
+    title = generalGetString(R.string.delete_group_question),
+    text = generalGetString(R.string.delete_group_for_all_members_cannot_undo_warning),
+    confirmText = generalGetString(R.string.delete_verb),
+    onConfirm = {
+      withApi {
+        val r = chatModel.controller.apiDeleteChat(chatInfo.chatType, chatInfo.apiId)
+        if (r) {
+          chatModel.removeChat(chatInfo.id)
+          chatModel.chatId.value = null
+          chatModel.controller.ntfManager.cancelNotificationsForChat(chatInfo.id)
+          close?.invoke()
+        }
+      }
+    }
+  )
+}
+
+fun leaveGroupDialog(groupInfo: GroupInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
+  AlertManager.shared.showAlertMsg(
+    title = generalGetString(R.string.leave_group_question),
+    text = generalGetString(R.string.you_will_stop_receiving_messages_from_this_group_chat_history_will_be_preserved),
+    confirmText = generalGetString(R.string.leave_group_button),
+    onConfirm = {
+      withApi {
+        chatModel.controller.leaveGroup(groupInfo.groupId)
+        close?.invoke()
+      }
+    }
+  )
+}
+
+@Composable
+fun GroupChatInfoLayout(
+  chat: Chat,
+  groupInfo: GroupInfo,
+  members: List<GroupMember>,
+  developerTools: Boolean,
+  addMembers: () -> Unit,
+  showMemberInfo: (GroupMember) -> Unit,
+  editGroupProfile: () -> Unit,
+  deleteGroup: () -> Unit,
+  clearChat: () -> Unit,
+  leaveGroup: () -> Unit,
+) {
+  Column(
+    Modifier
+      .fillMaxWidth()
+      .verticalScroll(rememberScrollState()),
+    horizontalAlignment = Alignment.Start
+  ) {
+    Row(
+      Modifier.fillMaxWidth(),
+      horizontalArrangement = Arrangement.Center
+    ) {
+      ChatInfoHeader(chat.chatInfo)
+    }
+    SectionSpacer()
+
+    SectionView(title = String.format(generalGetString(R.string.group_info_section_title_num_members), members.count() + 1)) {
+      if (groupInfo.canAddMembers) {
+        SectionItemView {
+          AddMembersButton(addMembers)
+        }
+        SectionDivider()
+      }
+      SectionItemView(height = 50.dp) {
+        MemberRow(groupInfo.membership, user = true)
+      }
+      if (members.isNotEmpty()) {
+        SectionDivider()
+      }
+      MembersList(members, showMemberInfo)
+    }
+    SectionSpacer()
+
+    SectionView {
+      if (groupInfo.canEdit) {
+        SectionItemView {
+          EditGroupProfileButton(editGroupProfile)
+        }
+        SectionDivider()
+      }
+      SectionItemView {
+        ClearChatButton(clearChat)
+      }
+      if (groupInfo.canDelete) {
+        SectionDivider()
+        SectionItemView {
+          DeleteGroupButton(deleteGroup)
+        }
+      }
+      if (groupInfo.membership.memberCurrent) {
+        SectionDivider()
+        SectionItemView {
+          LeaveGroupButton(leaveGroup)
+        }
+      }
+    }
+    SectionSpacer()
+
+    if (developerTools) {
+      SectionView(title = stringResource(R.string.section_title_for_console)) {
+        InfoRow(stringResource(R.string.info_row_local_name), groupInfo.localDisplayName)
+        SectionDivider()
+        InfoRow(stringResource(R.string.info_row_database_id), groupInfo.apiId.toString())
+      }
+      SectionSpacer()
+    }
+  }
+}
+
+@Composable
+fun AddMembersButton(addMembers: () -> Unit) {
+  Row(
+    Modifier
+      .fillMaxSize()
+      .clickable { addMembers() },
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Icon(
+      Icons.Outlined.Add,
+      stringResource(R.string.button_add_members),
+      tint = MaterialTheme.colors.primary
+    )
+    Spacer(Modifier.size(8.dp))
+    Text(stringResource(R.string.button_add_members), color = MaterialTheme.colors.primary)
+  }
+}
+
+@Composable
+fun MembersList(members: List<GroupMember>, showMemberInfo: (GroupMember) -> Unit) {
+  Column {
+    members.forEachIndexed { index, member ->
+      SectionItemView(height = 50.dp) {
+        MemberRow(member, showMemberInfo)
+      }
+      if (index < members.lastIndex) {
+        SectionDivider()
+      }
+    }
+  }
+}
+
+@Composable
+fun MemberRow(member: GroupMember, showMemberInfo: ((GroupMember) -> Unit)? = null, user: Boolean = false) {
+  val modifier = if (showMemberInfo != null) Modifier.clickable { showMemberInfo(member) } else Modifier
+  Row(
+    modifier.fillMaxSize(),
+    horizontalArrangement = Arrangement.SpaceBetween,
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Row(
+      verticalAlignment = Alignment.CenterVertically,
+      horizontalArrangement = Arrangement.spacedBy(4.dp)
+    ) {
+      ProfileImage(size = 46.dp, member.image)
+      Column {
+        Text(member.chatViewName, maxLines = 1, overflow = TextOverflow.Ellipsis)
+        val s = member.memberStatus.shortText
+        val statusDescr = if (user) String.format(generalGetString(R.string.group_info_member_you), s) else s
+        Text(
+          statusDescr,
+          color = HighOrLowlight,
+          fontSize = 12.sp,
+          maxLines = 1,
+          overflow = TextOverflow.Ellipsis
+        )
+      }
+    }
+    val role = member.memberRole
+    if (role == GroupMemberRole.Owner || role == GroupMemberRole.Admin) {
+      Text(role.text, color = HighOrLowlight)
+    }
+  }
+}
+
+@Composable
+fun EditGroupProfileButton(editGroupProfile: () -> Unit) {
+  Row(
+    Modifier
+      .fillMaxSize()
+      .clickable { editGroupProfile() },
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Icon(
+      Icons.Outlined.Edit,
+      stringResource(R.string.button_edit_group_profile),
+      tint = MaterialTheme.colors.primary
+    )
+    Spacer(Modifier.size(8.dp))
+    Text(stringResource(R.string.button_edit_group_profile), color = MaterialTheme.colors.primary)
+  }
+}
+
+@Composable
+fun LeaveGroupButton(leaveGroup: () -> Unit) {
+  Row(
+    Modifier
+      .fillMaxSize()
+      .clickable { leaveGroup() },
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Icon(
+      Icons.Outlined.Logout,
+      stringResource(R.string.button_leave_group),
+      tint = Color.Red
+    )
+    Spacer(Modifier.size(8.dp))
+    Text(stringResource(R.string.button_leave_group), color = Color.Red)
+  }
+}
+
+@Composable
+fun DeleteGroupButton(deleteGroup: () -> Unit) {
+  Row(
+    Modifier
+      .fillMaxSize()
+      .clickable { deleteGroup() },
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Icon(
+      Icons.Outlined.Delete,
+      stringResource(R.string.button_delete_group),
+      tint = Color.Red
+    )
+    Spacer(Modifier.size(8.dp))
+    Text(stringResource(R.string.button_delete_group), color = Color.Red)
+  }
+}
+
+@Preview
+@Composable
+fun PreviewGroupChatInfoLayout() {
+  SimpleXTheme {
+    GroupChatInfoLayout(
+      chat = Chat(
+        chatInfo = ChatInfo.Direct.sampleData,
+        chatItems = arrayListOf(),
+        serverInfo = Chat.ServerInfo(Chat.NetworkStatus.Error("agent BROKER TIMEOUT"))
+      ),
+      groupInfo = GroupInfo.sampleData,
+      members = listOf(GroupMember.sampleData, GroupMember.sampleData, GroupMember.sampleData),
+      developerTools = false,
+      addMembers = {}, showMemberInfo = {}, editGroupProfile = {}, deleteGroup = {}, clearChat = {}, leaveGroup = {}
+    )
+  }
+}
@@ -0,0 +1,190 @@
+package chat.simplex.app.views.chat.group
+
+import InfoRow
+import SectionDivider
+import SectionItemView
+import SectionSpacer
+import SectionView
+import androidx.activity.compose.BackHandler
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import chat.simplex.app.R
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.chat.SimplexServers
+import chat.simplex.app.views.helpers.*
+
+@Composable
+fun GroupMemberInfoView(groupInfo: GroupInfo, member: GroupMember, connStats: ConnectionStats?, chatModel: ChatModel, close: () -> Unit) {
+  BackHandler(onBack = close)
+  val chat = chatModel.chats.firstOrNull { it.id == chatModel.chatId.value }
+  val developerTools = chatModel.controller.appPrefs.developerTools.get()
+  if (chat != null) {
+    GroupMemberInfoLayout(
+      groupInfo,
+      member,
+      connStats,
+      developerTools,
+      removeMember = { removeMemberDialog(groupInfo, member, chatModel, close) }
+    )
+  }
+}
+
+fun removeMemberDialog(groupInfo: GroupInfo, member: GroupMember, chatModel: ChatModel, close: (() -> Unit)? = null) {
+  AlertManager.shared.showAlertMsg(
+    title = generalGetString(R.string.button_remove_member),
+    text = generalGetString(R.string.member_will_be_removed_from_group_cannot_be_undone),
+    confirmText = generalGetString(R.string.remove_member_confirmation),
+    onConfirm = {
+      withApi {
+        val removedMember = chatModel.controller.apiRemoveMember(member.groupId, member.groupMemberId)
+        if (removedMember != null) {
+          chatModel.upsertGroupMember(groupInfo, removedMember)
+        }
+        close?.invoke()
+      }
+    }
+  )
+}
+
+@Composable
+fun GroupMemberInfoLayout(
+  groupInfo: GroupInfo,
+  member: GroupMember,
+  connStats: ConnectionStats?,
+  developerTools: Boolean,
+  removeMember: () -> Unit,
+) {
+  Column(
+    Modifier
+      .fillMaxWidth()
+      .verticalScroll(rememberScrollState()),
+    horizontalAlignment = Alignment.Start
+  ) {
+    Row(
+      Modifier.fillMaxWidth(),
+      horizontalArrangement = Arrangement.Center
+    ) {
+      GroupMemberInfoHeader(member)
+    }
+    SectionSpacer()
+
+    SectionView(title = stringResource(R.string.member_info_section_title_member)) {
+      InfoRow(stringResource(R.string.info_row_group), groupInfo.displayName)
+      val conn = member.activeConn
+      if (conn != null) {
+        SectionDivider()
+        val connLevelDesc =
+          if (conn.connLevel == 0) stringResource(R.string.conn_level_desc_direct)
+          else String.format(generalGetString(R.string.conn_level_desc_indirect), conn.connLevel)
+        InfoRow(stringResource(R.string.info_row_connection), connLevelDesc)
+      }
+    }
+    SectionSpacer()
+
+    if (connStats != null) {
+      val rcvServers = connStats.rcvServers
+      val sndServers = connStats.sndServers
+      if ((rcvServers != null && rcvServers.isNotEmpty()) || (sndServers != null && sndServers.isNotEmpty())) {
+        SectionView(title = stringResource(R.string.conn_stats_section_title_servers)) {
+          if (rcvServers != null && rcvServers.isNotEmpty()) {
+            SimplexServers(stringResource(R.string.receiving_via), rcvServers)
+            if (sndServers != null && sndServers.isNotEmpty()) {
+              SectionDivider()
+              SimplexServers(stringResource(R.string.sending_via), sndServers)
+            }
+          } else if (sndServers != null && sndServers.isNotEmpty()) {
+            SimplexServers(stringResource(R.string.sending_via), sndServers)
+          }
+        }
+        SectionSpacer()
+      }
+    }
+
+    if (member.canBeRemoved(groupInfo.membership)) {
+      SectionView {
+        SectionItemView {
+          RemoveMemberButton(removeMember)
+        }
+      }
+      SectionSpacer()
+    }
+
+    if (developerTools) {
+      SectionView(title = stringResource(R.string.section_title_for_console)) {
+        InfoRow(stringResource(R.string.info_row_local_name), member.localDisplayName)
+        SectionDivider()
+        InfoRow(stringResource(R.string.info_row_database_id), member.groupMemberId.toString())
+      }
+      SectionSpacer()
+    }
+  }
+}
+
+@Composable
+fun GroupMemberInfoHeader(member: GroupMember) {
+  Column(
+    Modifier.padding(horizontal = 8.dp),
+    horizontalAlignment = Alignment.CenterHorizontally
+  ) {
+    ProfileImage(size = 192.dp, member.image, color = if (isSystemInDarkTheme()) GroupDark else SettingsSecondaryLight)
+    Text(
+      member.displayName, style = MaterialTheme.typography.h1.copy(fontWeight = FontWeight.Normal),
+      color = MaterialTheme.colors.onBackground,
+      maxLines = 1,
+      overflow = TextOverflow.Ellipsis
+    )
+    if (member.fullName != "" && member.fullName != member.displayName) {
+      Text(
+        member.fullName, style = MaterialTheme.typography.h2,
+        color = MaterialTheme.colors.onBackground,
+        maxLines = 2,
+        overflow = TextOverflow.Ellipsis
+      )
+    }
+  }
+}
+
+@Composable
+fun RemoveMemberButton(removeMember: () -> Unit) {
+  Row(
+    Modifier
+      .fillMaxSize()
+      .clickable { removeMember() },
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    Icon(
+      Icons.Outlined.Delete,
+      stringResource(R.string.button_remove_member),
+      tint = Color.Red
+    )
+    Spacer(Modifier.size(8.dp))
+    Text(stringResource(R.string.button_remove_member), color = Color.Red)
+  }
+}
+
+@Preview
+@Composable
+fun PreviewGroupMemberInfoLayout() {
+  SimpleXTheme {
+    GroupMemberInfoLayout(
+      groupInfo = GroupInfo.sampleData,
+      member = GroupMember.sampleData,
+      connStats = null,
+      developerTools = false,
+      removeMember = {}
+    )
+  }
+}
@@ -0,0 +1,173 @@
+package chat.simplex.app.views.chat.group
+
+import android.content.res.Configuration
+import android.graphics.Bitmap
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.R
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.HighOrLowlight
+import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.views.ProfileNameField
+import chat.simplex.app.views.helpers.*
+import chat.simplex.app.views.isValidDisplayName
+import chat.simplex.app.views.usersettings.*
+import com.google.accompanist.insets.ProvideWindowInsets
+import com.google.accompanist.insets.navigationBarsWithImePadding
+import kotlinx.coroutines.launch
+
+@Composable
+fun GroupProfileView(groupInfo: GroupInfo, chatModel: ChatModel, close: () -> Unit) {
+  GroupProfileLayout(
+    close = close,
+    groupProfile = groupInfo.groupProfile,
+    saveProfile = { p ->
+      withApi {
+        val gInfo = chatModel.controller.apiUpdateGroup(groupInfo.groupId, p)
+        if (gInfo != null) {
+          chatModel.updateGroup(gInfo)
+          close.invoke()
+        }
+      }
+    }
+  )
+}
+
+@Composable
+fun GroupProfileLayout(
+  close: () -> Unit,
+  groupProfile: GroupProfile,
+  saveProfile: (GroupProfile) -> Unit,
+) {
+  val bottomSheetModalState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden)
+  val displayName = remember { mutableStateOf(groupProfile.displayName) }
+  val fullName = remember { mutableStateOf(groupProfile.fullName) }
+  val chosenImage = remember { mutableStateOf<Bitmap?>(null) }
+  val profileImage = remember { mutableStateOf(groupProfile.image) }
+  val scope = rememberCoroutineScope()
+  val scrollState = rememberScrollState()
+  val focusRequester = remember { FocusRequester() }
+
+  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
+    ModalBottomSheetLayout(
+      scrimColor = Color.Black.copy(alpha = 0.12F),
+      modifier = Modifier.navigationBarsWithImePadding(),
+      sheetContent = {
+        GetImageBottomSheet(
+          chosenImage,
+          onImageChange = { bitmap -> profileImage.value = resizeImageToStrSize(cropToSquare(bitmap), maxDataSize = 12500) },
+          hideBottomSheet = {
+            scope.launch { bottomSheetModalState.hide() }
+          })
+      },
+      sheetState = bottomSheetModalState,
+      sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
+    ) {
+      ModalView(close = close) {
+        Column(
+          Modifier
+            .verticalScroll(scrollState)
+            .padding(bottom = 16.dp),
+          horizontalAlignment = Alignment.Start
+        ) {
+          Text(
+            stringResource(R.string.group_profile_is_stored_on_members_devices),
+            Modifier.padding(bottom = 24.dp),
+            color = MaterialTheme.colors.onBackground,
+            lineHeight = 22.sp
+          )
+          Column(
+            Modifier.fillMaxWidth(),
+            horizontalAlignment = Alignment.Start
+          ) {
+            Box(
+              Modifier
+                .fillMaxWidth()
+                .padding(bottom = 24.dp),
+              contentAlignment = Alignment.Center
+            ) {
+              Box(contentAlignment = Alignment.TopEnd) {
+                Box(contentAlignment = Alignment.Center) {
+                  ProfileImage(192.dp, profileImage.value)
+                  EditImageButton { scope.launch { bottomSheetModalState.show() } }
+                }
+                if (profileImage.value != null) {
+                  DeleteImageButton { profileImage.value = null }
+                }
+              }
+            }
+            Text(
+              stringResource(R.string.group_display_name_field),
+              Modifier.padding(bottom = 3.dp)
+            )
+            ProfileNameField(displayName, focusRequester)
+            val errorText = if (!isValidDisplayName(displayName.value)) stringResource(R.string.display_name_cannot_contain_whitespace) else ""
+            Text(
+              errorText,
+              fontSize = 15.sp,
+              color = MaterialTheme.colors.error
+            )
+            Spacer(Modifier.height(3.dp))
+            Text(
+              stringResource(R.string.group_full_name_field),
+              Modifier.padding(bottom = 5.dp)
+            )
+            ProfileNameField(fullName)
+            Spacer(Modifier.height(16.dp))
+            Row {
+              TextButton(stringResource(R.string.cancel_verb)) {
+                close.invoke()
+              }
+              Spacer(Modifier.padding(horizontal = 8.dp))
+              val enabled = displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
+              if (enabled) {
+                Text(
+                  stringResource(R.string.save_group_profile),
+                  modifier = Modifier.clickable { saveProfile(GroupProfile(displayName.value, fullName.value, profileImage.value)) },
+                  color = MaterialTheme.colors.primary
+                )
+              } else {
+                Text(
+                  stringResource(R.string.save_group_profile),
+                  color = HighOrLowlight
+                )
+              }
+            }
+          }
+
+          LaunchedEffect(Unit) {
+            focusRequester.requestFocus()
+          }
+        }
+      }
+    }
+  }
+}
+
+@Preview(showBackground = true)
+@Preview(
+  uiMode = Configuration.UI_MODE_NIGHT_YES,
+  showBackground = true,
+  name = "Dark Mode"
+)
+@Composable
+fun PreviewGroupProfileLayout() {
+  SimpleXTheme {
+    GroupProfileLayout(
+      close = {},
+      groupProfile = GroupProfile.sampleData,
+      saveProfile = { _ -> }
+    )
+  }
+}
@@ -40,6 +40,7 @@ fun CICallItemView(cInfo: ChatInfo, cItem: ChatItem, status: CICallStatus, durat
        Icon(Icons.Outlined.CallEnd, stringResource(R.string.icon_descr_call_ended), tint = HighOrLowlight, modifier = Modifier.padding(end = 4.dp))
        Text(status.duration(duration), color = HighOrLowlight)
      }
+      CICallStatus.Error -> {}
    }

    Text(
@@ -0,0 +1,59 @@
+package chat.simplex.app.views.chat.item
+
+import android.content.res.Configuration
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.*
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.model.ChatItem
+import chat.simplex.app.ui.theme.HighOrLowlight
+import chat.simplex.app.ui.theme.SimpleXTheme
+
+@Composable
+fun CIGroupEventView(ci: ChatItem) {
+  fun withGroupEventStyle(builder: AnnotatedString.Builder, text: String) {
+    return builder.withStyle(SpanStyle(fontSize = 12.sp, fontWeight = FontWeight.Light, color = HighOrLowlight)) { append(text) }
+  }
+
+  Surface {
+    Row(
+      Modifier.padding(horizontal = 6.dp, vertical = 6.dp),
+      verticalAlignment = Alignment.Bottom
+    ) {
+      Text(
+        buildAnnotatedString {
+          val memberDisplayName = ci.memberDisplayName
+          if (memberDisplayName != null) {
+            withGroupEventStyle(this, memberDisplayName)
+            append(" ")
+          }
+          withGroupEventStyle(this, ci.content.text)
+          append(" ")
+          withGroupEventStyle(this, ci.timestampText)
+        },
+        style = MaterialTheme.typography.body1.copy(lineHeight = 22.sp)
+      )
+    }
+  }
+}
+
+@Preview(showBackground = true)
+@Preview(
+  uiMode = Configuration.UI_MODE_NIGHT_YES,
+  name = "Dark Mode"
+)
+@Composable
+fun CIGroupEventViewPreview() {
+  SimpleXTheme {
+    CIGroupEventView(
+      ChatItem.getGroupEventSample()
+    )
+  }
+}
@@ -0,0 +1,169 @@
+package chat.simplex.app.views.chat.item
+
+import android.content.res.Configuration
+import android.util.Log
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.SupervisedUserCircle
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.*
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.R
+import chat.simplex.app.TAG
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.helpers.*
+
+@Composable
+fun CIGroupInvitationView(
+  ci: ChatItem,
+  groupInvitation: CIGroupInvitation,
+  memberRole: GroupMemberRole,
+  joinGroup: (Long) -> Unit
+) {
+  val sent = ci.chatDir.sent
+  val action = !sent && groupInvitation.status == CIGroupInvitationStatus.Pending
+
+  @Composable
+  fun groupInfoView() {
+    val p = groupInvitation.groupProfile
+    val iconColor =
+      if (action) MaterialTheme.colors.primary
+      else if (isSystemInDarkTheme()) FileDark else FileLight
+
+    Row(
+      Modifier
+        .defaultMinSize(minWidth = 220.dp)
+        .padding(vertical = 4.dp)
+        .padding(end = 2.dp)
+    ) {
+      ProfileImage(size = 60.dp, icon = Icons.Filled.SupervisedUserCircle, color = iconColor)
+      Spacer(Modifier.padding(horizontal = 3.dp))
+      Column(
+        Modifier.defaultMinSize(minHeight = 60.dp),
+        verticalArrangement = Arrangement.Center
+      ) {
+        Text(p.displayName, style = MaterialTheme.typography.caption, fontWeight = FontWeight.Medium, maxLines = 2, overflow = TextOverflow.Ellipsis)
+        if (p.fullName != "" && p.displayName != p.fullName) {
+          Text(p.fullName, maxLines = 2, overflow = TextOverflow.Ellipsis)
+        }
+      }
+    }
+  }
+
+  @Composable
+  fun groupInvitationText() {
+    when {
+      sent -> Text(stringResource(R.string.you_sent_group_invitation))
+      !sent && groupInvitation.status == CIGroupInvitationStatus.Pending -> Text(stringResource(R.string.you_are_invited_to_group))
+      !sent && groupInvitation.status == CIGroupInvitationStatus.Accepted -> Text(stringResource(R.string.you_joined_this_group))
+      !sent && groupInvitation.status == CIGroupInvitationStatus.Rejected -> Text(stringResource(R.string.you_rejected_group_invitation))
+      !sent && groupInvitation.status == CIGroupInvitationStatus.Expired -> Text(stringResource(R.string.group_invitation_expired))
+    }
+  }
+
+  fun acceptInvitation() {
+    Log.d(TAG, "CIGroupInvitationView acceptInvitation")
+    joinGroup(groupInvitation.groupId)
+  }
+
+  Surface(
+    modifier = if (action) Modifier.clickable(onClick = ::acceptInvitation) else Modifier,
+    shape = RoundedCornerShape(18.dp),
+    color = if (sent) SentColorLight else ReceivedColorLight,
+  ) {
+    Box(
+      Modifier
+        .width(IntrinsicSize.Min)
+        .padding(vertical = 3.dp)
+        .padding(start = 8.dp, end = 12.dp),
+      contentAlignment = Alignment.BottomEnd
+    ) {
+      Column(
+        Modifier
+          .defaultMinSize(minWidth = 220.dp)
+          .padding(bottom = 4.dp),
+        horizontalAlignment = Alignment.Start
+      ) {
+        groupInfoView()
+        Column(Modifier.padding(top = 2.dp, start = 5.dp)) {
+          Divider(Modifier.fillMaxWidth().padding(bottom = 4.dp))
+          if (action) {
+            groupInvitationText()
+            Text(stringResource(R.string.group_invitation_tap_to_join), color = MaterialTheme.colors.primary)
+          } else {
+            Box(Modifier.padding(end = 48.dp)) {
+              groupInvitationText()
+            }
+          }
+        }
+      }
+      Text(
+        ci.timestampText,
+        color = HighOrLowlight,
+        fontSize = 14.sp,
+        modifier = Modifier.padding(start = 3.dp)
+      )
+    }
+  }
+}
+
+@Preview(showBackground = true)
+@Preview(
+  uiMode = Configuration.UI_MODE_NIGHT_YES,
+  name = "Dark Mode"
+)
+@Composable
+fun PendingCIGroupInvitationViewPreview() {
+  SimpleXTheme {
+    CIGroupInvitationView(
+      ci = ChatItem.getGroupInvitationSample(),
+      groupInvitation = CIGroupInvitation.getSample(),
+      memberRole = GroupMemberRole.Admin,
+      joinGroup = {}
+    )
+  }
+}
+
+@Preview(showBackground = true)
+@Preview(
+  uiMode = Configuration.UI_MODE_NIGHT_YES,
+  name = "Dark Mode"
+)
+@Composable
+fun CIGroupInvitationViewAcceptedPreview() {
+  SimpleXTheme {
+    CIGroupInvitationView(
+      ci = ChatItem.getGroupInvitationSample(),
+      groupInvitation = CIGroupInvitation.getSample(status = CIGroupInvitationStatus.Accepted),
+      memberRole = GroupMemberRole.Admin,
+      joinGroup = {}
+    )
+  }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun CIGroupInvitationViewLongNamePreview() {
+  SimpleXTheme {
+    CIGroupInvitationView(
+      ci = ChatItem.getGroupInvitationSample(),
+      groupInvitation = CIGroupInvitation.getSample(
+        groupProfile = GroupProfile("group_with_a_really_really_really_long_name", "Group With A Really Really Really Long Name"),
+        status = CIGroupInvitationStatus.Accepted
+      ),
+      memberRole = GroupMemberRole.Admin,
+      joinGroup = {}
+    )
+  }
+}
@@ -1,6 +1,6 @@
 package chat.simplex.app.views.chat.item

-import android.content.Context
+import android.content.*
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
@@ -14,8 +14,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.platform.UriHandler
+import androidx.compose.ui.platform.*
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
@@ -39,6 +38,7 @@ fun ChatItemView(
  useLinkPreviews: Boolean,
  deleteMessage: (Long, CIDeleteMode) -> Unit,
  receiveFile: (Long) -> Unit,
+  joinGroup: (Long) -> Unit,
  acceptCall: (Contact) -> Unit
 ) {
  val context = LocalContext.current
@@ -61,7 +61,8 @@ fun ChatItemView(
        if (cItem.file == null && cItem.quotedItem == null && isShortEmoji(cItem.content.text)) {
          EmojiItemView(cItem)
        } else {
-          FramedItemView(user, cItem, uriHandler, showMember = showMember, showMenu, receiveFile)
+          val onLinkLongClick = { _: String -> showMenu.value = true }
+          FramedItemView(user, cItem, uriHandler, showMember = showMember, showMenu, receiveFile, onLinkLongClick)
        }
        DropdownMenu(
          expanded = showMenu.value,
@@ -146,6 +147,10 @@ fun ChatItemView(
        is CIContent.SndCall -> CallItem(c.status, c.duration)
        is CIContent.RcvCall -> CallItem(c.status, c.duration)
        is CIContent.RcvIntegrityError -> IntegrityErrorItemView(cItem, showMember = showMember)
+        is CIContent.RcvGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup)
+        is CIContent.SndGroupInvitation -> CIGroupInvitationView(cItem, c.groupInvitation, c.memberRole, joinGroup = joinGroup)
+        is CIContent.RcvGroupEventContent -> CIGroupEventView(cItem)
+        is CIContent.SndGroupEventContent -> CIGroupEventView(cItem)
      }
    }
  }
@@ -159,7 +164,8 @@ fun ItemAction(text: String, icon: ImageVector, onClick: () -> Unit, color: Colo
        text,
        modifier = Modifier
          .fillMaxWidth()
-          .weight(1F),
+          .weight(1F)
+          .padding(end = 15.dp),
        color = color
      )
      Icon(icon, text, tint = color)
@@ -209,6 +215,7 @@ fun PreviewChatItemView() {
      cxt = LocalContext.current,
      deleteMessage = { _, _ -> },
      receiveFile = {},
+      joinGroup = {},
      acceptCall = { _ -> }
    )
  }
@@ -227,6 +234,7 @@ fun PreviewChatItemViewDeletedContent() {
      cxt = LocalContext.current,
      deleteMessage = { _, _ -> },
      receiveFile = {},
+      joinGroup = {},
      acceptCall = { _ -> }
    )
  }
@@ -39,7 +39,8 @@ fun FramedItemView(
  uriHandler: UriHandler? = null,
  showMember: Boolean = false,
  showMenu: MutableState<Boolean>,
-  receiveFile: (Long) -> Unit
+  receiveFile: (Long) -> Unit,
+  onLinkLongClick: (link: String) -> Unit = {}
 ) {
  val sent = ci.chatDir.sent

@@ -136,9 +137,9 @@ fun FramedItemView(
              }
              is MsgContent.MCLink -> {
                ChatItemLinkView(mc.preview)
-                CIMarkdownText(ci, showMember, uriHandler)
+                CIMarkdownText(ci, showMember, uriHandler, onLinkLongClick)
              }
-              else -> CIMarkdownText(ci, showMember, uriHandler)
+              else -> CIMarkdownText(ci, showMember, uriHandler, onLinkLongClick)
            }
          }
        }
@@ -151,11 +152,17 @@ fun FramedItemView(
 }

@Composable
-fun CIMarkdownText(ci: ChatItem, showMember: Boolean, uriHandler: UriHandler?) {
+fun CIMarkdownText(
+  ci: ChatItem,
+  showMember: Boolean,
+  uriHandler: UriHandler?,
+  onLinkLongClick: (link: String) -> Unit = {}
+) {
  Box(Modifier.padding(vertical = 6.dp, horizontal = 12.dp)) {
    MarkdownText(
      ci.content.text, ci.formattedText, if (showMember) ci.memberDisplayName else null,
-      metaText = ci.timestampText, edited = ci.meta.itemEdited, uriHandler = uriHandler, senderBold = true
+      metaText = ci.timestampText, edited = ci.meta.itemEdited,
+      uriHandler = uriHandler, senderBold = true, onLinkLongClick = onLinkLongClick
    )
  }
 }
@@ -56,7 +56,7 @@ fun IntegrityErrorItemView(ci: ChatItem, showMember: Boolean = false) {
  name = "Dark Mode"
 )
@Composable
-fun IntegrityErrorItemViewView() {
+fun IntegrityErrorItemViewPreview() {
  SimpleXTheme {
    IntegrityErrorItemView(
      ChatItem.getDeletedContentSampleData()
@@ -1,17 +1,19 @@
 package chat.simplex.app.views.chat.item

-import androidx.compose.foundation.text.ClickableText
+import androidx.compose.foundation.text.*
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
-import androidx.compose.runtime.Composable
+import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.platform.UriHandler
 import androidx.compose.ui.text.*
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.sp
+import androidx.compose.ui.unit.*
 import chat.simplex.app.model.*
+import chat.simplex.app.views.helpers.detectGesture

 val reserveTimestampStyle = SpanStyle(color = Color.Transparent)
 val boldFont = SpanStyle(fontWeight = FontWeight.Medium)
@@ -45,7 +47,8 @@ fun MarkdownText (
  overflow: TextOverflow = TextOverflow.Clip,
  uriHandler: UriHandler? = null,
  senderBold: Boolean = false,
-  modifier: Modifier = Modifier
+  modifier: Modifier = Modifier,
+  onLinkLongClick: (link: String) -> Unit = {}
 ) {
  val reserve = if (edited) "        " else "    "
  if (formattedText == null) {
@@ -65,8 +68,9 @@ fun MarkdownText (
          val link = ft.link
          if (link != null) {
            hasLinks = true
+            val ftStyle = ft.format.style
            withAnnotation(tag = "URL", annotation = link) {
-              withStyle(ft.format.style) { append(ft.text) }
+              withStyle(ftStyle) { append(ft.text) }
            }
          } else {
            withStyle(ft.format.style) { append(ft.text) }
@@ -77,9 +81,16 @@ fun MarkdownText (
    }
    if (hasLinks && uriHandler != null) {
      ClickableText(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow,
+        onLongClick = { offset ->
+          annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset)
+            .firstOrNull()?.let { annotation -> onLinkLongClick(annotation.item) }
+        },
        onClick = { offset ->
          annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset)
            .firstOrNull()?.let { annotation -> uriHandler.openUri(annotation.item) }
+        },
+        shouldConsumeEvent = { offset ->
+          annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset).any()
        }
      )
    } else {
@@ -87,3 +98,53 @@ fun MarkdownText (
    }
  }
 }
+
+@Composable
+fun ClickableText(
+  text: AnnotatedString,
+  modifier: Modifier = Modifier,
+  style: TextStyle = TextStyle.Default,
+  softWrap: Boolean = true,
+  overflow: TextOverflow = TextOverflow.Clip,
+  maxLines: Int = Int.MAX_VALUE,
+  onTextLayout: (TextLayoutResult) -> Unit = {},
+  onClick: (Int) -> Unit,
+  onLongClick: (Int) -> Unit = {},
+  shouldConsumeEvent: (Int) -> Boolean
+) {
+  val layoutResult = remember { mutableStateOf<TextLayoutResult?>(null) }
+  val pressIndicator = Modifier.pointerInput(onClick, onLongClick) {
+    detectGesture(onLongPress = { pos ->
+      layoutResult.value?.let { layoutResult ->
+        onLongClick(layoutResult.getOffsetForPosition(pos))
+      }
+    }, onPress = { pos ->
+      layoutResult.value?.let { layoutResult ->
+        val res  = tryAwaitRelease()
+        if (res) {
+          onClick(layoutResult.getOffsetForPosition(pos))
+        }
+      }
+    }, shouldConsumeEvent = { pos ->
+      var consume = false
+        layoutResult.value?.let { layoutResult ->
+          consume = shouldConsumeEvent(layoutResult.getOffsetForPosition(pos))
+        }
+      consume
+      }
+    )
+  }
+
+  BasicText(
+    text = text,
+    modifier = modifier.then(pressIndicator),
+    style = style,
+    softWrap = softWrap,
+    overflow = overflow,
+    maxLines = maxLines,
+    onTextLayout = {
+      layoutResult.value = it
+      onTextLayout(it)
+    }
+  )
+}
@@ -17,8 +17,9 @@ import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.SimpleXTheme
 import chat.simplex.app.ui.theme.WarningOrange
-import chat.simplex.app.views.chat.clearChatDialog
-import chat.simplex.app.views.chat.deleteContactDialog
+import chat.simplex.app.views.chat.*
+import chat.simplex.app.views.chat.group.deleteGroupDialog
+import chat.simplex.app.views.chat.group.leaveGroupDialog
 import chat.simplex.app.views.chat.item.ItemAction
 import chat.simplex.app.views.helpers.*
 import kotlinx.coroutines.delay
@@ -28,6 +29,7 @@ import kotlinx.datetime.Clock
 fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
  val showMenu = remember { mutableStateOf(false) }
  var showMarkRead by remember { mutableStateOf(false) }
+  val stopped = chatModel.chatRunning.value == false
  LaunchedEffect(chat.id, chat.chatStats.unreadCount > 0) {
    showMenu.value = false
    delay(500L)
@@ -36,36 +38,40 @@ fun ChatListNavLinkView(chat: Chat, chatModel: ChatModel) {
  when (chat.chatInfo) {
    is ChatInfo.Direct ->
      ChatListNavLinkLayout(
-        chatLinkPreview = { ChatPreviewView(chat) },
-        click = { openOrPendingChat(chat.chatInfo, chatModel) },
+        chatLinkPreview = { ChatPreviewView(chat, stopped) },
+        click = { directChatAction(chat.chatInfo, chatModel) },
        dropdownMenuItems = { ContactMenuItems(chat, chatModel, showMenu, showMarkRead) },
-        showMenu
+        showMenu,
+        stopped
      )
    is ChatInfo.Group ->
      ChatListNavLinkLayout(
-        chatLinkPreview = { ChatPreviewView(chat) },
-        click = { openOrPendingChat(chat.chatInfo, chatModel) },
-        dropdownMenuItems = { GroupMenuItems(chat, chatModel, showMenu, showMarkRead) },
-        showMenu
+        chatLinkPreview = { ChatPreviewView(chat, stopped) },
+        click = { groupChatAction(chat.chatInfo.groupInfo, chatModel) },
+        dropdownMenuItems = { GroupMenuItems(chat, chat.chatInfo.groupInfo, chatModel, showMenu, showMarkRead) },
+        showMenu,
+        stopped
      )
    is ChatInfo.ContactRequest ->
      ChatListNavLinkLayout(
        chatLinkPreview = { ContactRequestView(chat.chatInfo) },
        click = { contactRequestAlertDialog(chat.chatInfo, chatModel) },
        dropdownMenuItems = { ContactRequestMenuItems(chat.chatInfo, chatModel, showMenu) },
-        showMenu
+        showMenu,
+        stopped
      )
    is ChatInfo.ContactConnection ->
      ChatListNavLinkLayout(
        chatLinkPreview = { ContactConnectionView(chat.chatInfo.contactConnection) },
        click = { contactConnectionAlertDialog(chat.chatInfo.contactConnection, chatModel) },
        dropdownMenuItems = { ContactConnectionMenuItems(chat.chatInfo, chatModel, showMenu) },
-        showMenu
+        showMenu,
+        stopped
      )
  }
 }

-fun openOrPendingChat(chatInfo: ChatInfo, chatModel: ChatModel) {
+fun directChatAction(chatInfo: ChatInfo, chatModel: ChatModel) {
  if (chatInfo.ready) {
    withApi { openChat(chatInfo, chatModel) }
  } else {
@@ -73,6 +79,14 @@ fun openOrPendingChat(chatInfo: ChatInfo, chatModel: ChatModel) {
  }
 }

+fun groupChatAction(groupInfo: GroupInfo, chatModel: ChatModel) {
+  when (groupInfo.membership.memberStatus) {
+    GroupMemberStatus.MemInvited -> acceptGroupInvitationAlertDialog(groupInfo, chatModel)
+    GroupMemberStatus.MemAccepted -> groupInvitationAcceptedAlert()
+    else -> withApi { openChat(ChatInfo.Group(groupInfo), chatModel) }
+  }
+}
+
 suspend fun openChat(chatInfo: ChatInfo, chatModel: ChatModel) {
  val chat = chatModel.controller.apiGetChat(chatInfo.chatType, chatInfo.apiId)
  if (chat != null) {
@@ -82,19 +96,72 @@ suspend fun openChat(chatInfo: ChatInfo, chatModel: ChatModel) {
  }
 }

+suspend fun apiLoadPrevMessages(chatInfo: ChatInfo, chatModel: ChatModel, beforeChatItemId: Long, search: String) {
+  val pagination = ChatPagination.Before(beforeChatItemId, ChatPagination.PRELOAD_COUNT)
+  val chat = chatModel.controller.apiGetChat(chatInfo.chatType, chatInfo.apiId, pagination, search) ?: return
+  chatModel.chatItems.addAll(0, chat.chatItems)
+}
+
+suspend fun apiFindMessages(chatInfo: ChatInfo, chatModel: ChatModel, search: String) {
+  val chat = chatModel.controller.apiGetChat(chatInfo.chatType, chatInfo.apiId, search = search) ?: return
+  chatModel.chatItems.clear()
+  chatModel.chatItems.addAll(0, chat.chatItems)
+}
+
+suspend fun setGroupMembers(groupInfo: GroupInfo, chatModel: ChatModel) {
+  val groupMembers = chatModel.controller.apiListMembers(groupInfo.groupId)
+  chatModel.groupMembers.clear()
+  chatModel.groupMembers.addAll(groupMembers)
+}
+
@Composable
 fun ContactMenuItems(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>, showMarkRead: Boolean) {
  if (showMarkRead) {
-    ItemAction(
-      stringResource(R.string.mark_read),
-      Icons.Outlined.Check,
-      onClick = {
-        markChatRead(chat, chatModel)
-        chatModel.controller.ntfManager.cancelNotificationsForChat(chat.id)
-        showMenu.value = false
-      }
-    )
+    MarkReadChatAction(chat, chatModel, showMenu)
  }
+  ClearChatAction(chat, chatModel, showMenu)
+  DeleteContactAction(chat, chatModel, showMenu)
+}
+
+@Composable
+fun GroupMenuItems(chat: Chat, groupInfo: GroupInfo, chatModel: ChatModel, showMenu: MutableState<Boolean>, showMarkRead: Boolean) {
+  when (groupInfo.membership.memberStatus) {
+    GroupMemberStatus.MemInvited -> {
+      JoinGroupAction(groupInfo, chatModel, showMenu)
+      if (groupInfo.canDelete) {
+        DeleteGroupAction(chat, chatModel, showMenu)
+      }
+    }
+    else -> {
+      if (showMarkRead) {
+        MarkReadChatAction(chat, chatModel, showMenu)
+      }
+      ClearChatAction(chat, chatModel, showMenu)
+      if (groupInfo.membership.memberCurrent) {
+        LeaveGroupAction(groupInfo, chatModel, showMenu)
+      }
+      if (groupInfo.canDelete) {
+        DeleteGroupAction(chat, chatModel, showMenu)
+      }
+    }
+  }
+}
+
+@Composable
+fun MarkReadChatAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
+  ItemAction(
+    stringResource(R.string.mark_read),
+    Icons.Outlined.Check,
+    onClick = {
+      markChatRead(chat, chatModel)
+      chatModel.controller.ntfManager.cancelNotificationsForChat(chat.id)
+      showMenu.value = false
+    }
+  )
+}
+
+@Composable
+fun ClearChatAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
  ItemAction(
    stringResource(R.string.clear_verb),
    Icons.Outlined.Restore,
@@ -104,11 +171,15 @@ fun ContactMenuItems(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Bo
    },
    color = WarningOrange
  )
+}
+
+@Composable
+fun DeleteContactAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
  ItemAction(
    stringResource(R.string.delete_verb),
    Icons.Outlined.Delete,
    onClick = {
-      deleteContactDialog(chat.chatInfo as ChatInfo.Direct, chatModel)
+      deleteContactDialog(chat.chatInfo, chatModel)
      showMenu.value = false
    },
    color = Color.Red
@@ -116,26 +187,40 @@ fun ContactMenuItems(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Bo
 }

@Composable
-fun GroupMenuItems(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>, showMarkRead: Boolean) {
-  if (showMarkRead) {
-    ItemAction(
-      stringResource(R.string.mark_read),
-      Icons.Outlined.Check,
-      onClick = {
-        markChatRead(chat, chatModel)
-        chatModel.controller.ntfManager.cancelNotificationsForChat(chat.id)
-        showMenu.value = false
-      }
-    )
-  }
+fun DeleteGroupAction(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
  ItemAction(
-    stringResource(R.string.clear_verb),
-    Icons.Outlined.Restore,
+    stringResource(R.string.delete_verb),
+    Icons.Outlined.Delete,
    onClick = {
-      clearChatDialog(chat.chatInfo, chatModel)
+      deleteGroupDialog(chat.chatInfo, chatModel)
      showMenu.value = false
    },
-    color = WarningOrange
+    color = Color.Red
+  )
+}
+
+@Composable
+fun JoinGroupAction(groupInfo: GroupInfo, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
+  ItemAction(
+    stringResource(R.string.join_group_button),
+    Icons.Outlined.Login,
+    onClick = {
+      withApi { chatModel.controller.apiJoinGroup(groupInfo.groupId) }
+      showMenu.value = false
+    }
+  )
+}
+
+@Composable
+fun LeaveGroupAction(groupInfo: GroupInfo, chatModel: ChatModel, showMenu: MutableState<Boolean>) {
+  ItemAction(
+    stringResource(R.string.leave_group_button),
+    Icons.Outlined.Logout,
+    onClick = {
+      leaveGroupDialog(groupInfo, chatModel)
+      showMenu.value = false
+    },
+    color = Color.Red
  )
 }

@@ -174,12 +259,16 @@ fun ContactConnectionMenuItems(chatInfo: ChatInfo.ContactConnection, chatModel:
 }

 fun markChatRead(chat: Chat, chatModel: ChatModel) {
+  // Just to be sure
+  if (chat.chatStats.unreadCount == 0) return
+
+  val minUnreadItemId = chat.chatStats.minUnreadItemId
  chatModel.markChatItemsRead(chat.chatInfo)
  withApi {
    chatModel.controller.apiChatRead(
      chat.chatInfo.chatType,
      chat.chatInfo.apiId,
-      CC.ItemRange(chat.chatStats.minUnreadItemId, chat.chatItems.last().id)
+      CC.ItemRange(minUnreadItemId, chat.chatItems.last().id)
    )
  }
 }
@@ -281,22 +370,46 @@ fun pendingContactAlertDialog(chatInfo: ChatInfo, chatModel: ChatModel) {
  )
 }

+fun acceptGroupInvitationAlertDialog(groupInfo: GroupInfo, chatModel: ChatModel) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(R.string.join_group_question),
+    text = generalGetString(R.string.you_are_invited_to_group_join_to_connect_with_group_members),
+    confirmText = generalGetString(R.string.join_group_button),
+    onConfirm = { withApi { chatModel.controller.apiJoinGroup(groupInfo.groupId) } },
+    dismissText = generalGetString(R.string.delete_verb),
+    onDismiss = { deleteGroup(groupInfo, chatModel) }
+  )
+}
+
+fun deleteGroup(groupInfo: GroupInfo, chatModel: ChatModel) {
+  withApi {
+    val r = chatModel.controller.apiDeleteChat(ChatType.Group, groupInfo.apiId)
+    if (r) {
+      chatModel.removeChat(groupInfo.id)
+      chatModel.chatId.value = null
+      chatModel.controller.ntfManager.cancelNotificationsForChat(groupInfo.id)
+    }
+  }
+}
+
+fun groupInvitationAcceptedAlert() {
+  AlertManager.shared.showAlertMsg(
+    generalGetString(R.string.joining_group),
+    generalGetString(R.string.youve_accepted_group_invitation_connecting_to_inviting_group_member)
+  )
+}
+
@Composable
 fun ChatListNavLinkLayout(
  chatLinkPreview: @Composable () -> Unit,
  click: () -> Unit,
  dropdownMenuItems: (@Composable () -> Unit)?,
-  showMenu: MutableState<Boolean>
+  showMenu: MutableState<Boolean>,
+  stopped: Boolean
 ) {
-  Surface(
-    modifier = Modifier
-      .fillMaxWidth()
-      .combinedClickable(
-        onClick = click,
-        onLongClick = { showMenu.value = true }
-      )
-      .height(88.dp)
-  ) {
+  var modifier = Modifier.fillMaxWidth().height(88.dp)
+  if (!stopped) modifier = modifier.combinedClickable(onClick = click, onLongClick = { showMenu.value = true })
+  Surface(modifier) {
    Row(
      modifier = Modifier
        .fillMaxWidth()
@@ -345,12 +458,14 @@ fun PreviewChatListNavLinkDirect() {
              )
            ),
            chatStats = Chat.ChatStats()
-          )
+          ),
+          stopped = false
        )
      },
      click = {},
      dropdownMenuItems = null,
-      showMenu = remember { mutableStateOf(false) }
+      showMenu = remember { mutableStateOf(false) },
+      stopped = false
    )
  }
 }
@@ -378,12 +493,14 @@ fun PreviewChatListNavLinkGroup() {
              )
            ),
            chatStats = Chat.ChatStats()
-          )
+          ),
+          stopped = false
        )
      },
      click = {},
      dropdownMenuItems = null,
-      showMenu = remember { mutableStateOf(false) }
+      showMenu = remember { mutableStateOf(false) },
+      stopped = false
    )
  }
 }
@@ -403,7 +520,8 @@ fun PreviewChatListNavLinkContactRequest() {
      },
      click = {},
      dropdownMenuItems = null,
-      showMenu = remember { mutableStateOf(false) }
+      showMenu = remember { mutableStateOf(false) },
+      stopped = false
    )
  }
 }
@@ -7,10 +7,9 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.Menu
-import androidx.compose.material.icons.outlined.PersonAdd
+import androidx.compose.material.icons.filled.Report
+import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
@@ -18,8 +17,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
 import chat.simplex.app.model.ChatModel
-import chat.simplex.app.ui.theme.ToolbarDark
-import chat.simplex.app.ui.theme.ToolbarLight
+import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.newchat.NewChatSheet
 import chat.simplex.app.views.onboarding.MakeConnection
 import chat.simplex.app.views.usersettings.SettingsView
@@ -64,12 +62,13 @@ fun scaffoldController(): ScaffoldController {
 }

@Composable
-fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
+fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit, stopped: Boolean) {
  val scaffoldCtrl = scaffoldController()
  LaunchedEffect(chatModel.clearOverlays.value) {
    if (chatModel.clearOverlays.value && scaffoldCtrl.expanded.value) scaffoldCtrl.collapse()
  }
  BottomSheetScaffold(
+    topBar = { ChatListToolbar(scaffoldCtrl, stopped) },
    scaffoldState = scaffoldCtrl.state,
    drawerContent = { SettingsView(chatModel, setPerformLA) },
    sheetPeekHeight = 0.dp,
@@ -82,8 +81,6 @@ fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
          .fillMaxSize()
          .background(MaterialTheme.colors.background)
      ) {
-        ChatListToolbar(scaffoldCtrl)
-        Divider()
        if (chatModel.chats.isNotEmpty()) {
          ChatList(chatModel)
        } else {
@@ -103,39 +100,43 @@ fun ChatListView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
 }

@Composable
-fun ChatListToolbar(scaffoldCtrl: ScaffoldController) {
-  Row(
-    horizontalArrangement = Arrangement.SpaceBetween,
-    verticalAlignment = Alignment.CenterVertically,
-    modifier = Modifier
-      .fillMaxWidth()
-      .height(52.dp)
-      .background(if (isSystemInDarkTheme()) ToolbarDark else ToolbarLight)
-      .padding(horizontal = 8.dp)
-  ) {
-    IconButton(onClick = { scaffoldCtrl.toggleDrawer() }) {
-      Icon(
-        Icons.Outlined.Menu,
-        stringResource(R.string.icon_descr_settings),
-        tint = MaterialTheme.colors.primary,
-        modifier = Modifier.padding(10.dp)
+fun ChatListToolbar(scaffoldCtrl: ScaffoldController, stopped: Boolean) {
+  DefaultTopAppBar(
+    navigationButton = { NavigationButtonMenu { scaffoldCtrl.toggleDrawer() } },
+    title = {
+      Text(
+        stringResource(R.string.your_chats),
+        color = MaterialTheme.colors.onBackground,
+        fontWeight = FontWeight.SemiBold,
      )
+    },
+    onTitleClick = null,
+    showSearch = false,
+    onSearchValueChanged = {},
+    buttons = listOf{
+      if (!stopped) {
+        IconButton(onClick = { scaffoldCtrl.toggleSheet() }) {
+          Icon(
+            Icons.Outlined.AddCircle,
+            stringResource(R.string.add_contact),
+            tint = MaterialTheme.colors.primary,
+            modifier = Modifier.padding(10.dp).size(26.dp)
+          )
+        }
+      } else {
+        IconButton(onClick = { AlertManager.shared.showAlertMsg(generalGetString(R.string.chat_is_stopped_indication),
+          generalGetString(R.string.you_can_start_chat_via_setting_or_by_restarting_the_app)) }) {
+          Icon(
+            Icons.Filled.Report,
+            generalGetString(R.string.chat_is_stopped_indication),
+            tint = Color.Red,
+            modifier = Modifier.padding(10.dp)
+          )
+        }
+      }
    }
-    Text(
-      stringResource(R.string.your_chats),
-      color = MaterialTheme.colors.onBackground,
-      fontWeight = FontWeight.SemiBold,
-      modifier = Modifier.padding(5.dp)
-    )
-    IconButton(onClick = { scaffoldCtrl.toggleSheet() }) {
-      Icon(
-        Icons.Outlined.PersonAdd,
-        stringResource(R.string.add_contact),
-        tint = MaterialTheme.colors.primary,
-        modifier = Modifier.padding(10.dp)
-      )
-    }
-  }
+  )
+  Divider()
 }

@Composable
@@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Cancel
 import androidx.compose.material.icons.outlined.ErrorOutline
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -26,37 +27,100 @@ import chat.simplex.app.views.helpers.ChatInfoImage
 import chat.simplex.app.views.helpers.badgeLayout

@Composable
-fun ChatPreviewView(chat: Chat) {
+fun ChatPreviewView(chat: Chat, stopped: Boolean) {
+  val cInfo = chat.chatInfo
+
+  @Composable
+  fun groupInactiveIcon() {
+    Icon(
+      Icons.Filled.Cancel,
+      stringResource(R.string.icon_descr_group_inactive),
+      Modifier.size(18.dp).background(MaterialTheme.colors.background, CircleShape),
+      tint = HighOrLowlight
+    )
+  }
+
+  @Composable
+  fun chatPreviewImageOverlayIcon() {
+    if (cInfo is ChatInfo.Group) {
+      when (cInfo.groupInfo.membership.memberStatus) {
+        GroupMemberStatus.MemLeft -> groupInactiveIcon()
+        GroupMemberStatus.MemRemoved -> groupInactiveIcon()
+        GroupMemberStatus.MemGroupDeleted -> groupInactiveIcon()
+        else -> {}
+      }
+    }
+  }
+
+  @Composable
+  fun chatPreviewTitleText(color: Color = Color.Unspecified) {
+    Text(
+      cInfo.chatViewName,
+      maxLines = 1,
+      overflow = TextOverflow.Ellipsis,
+      style = MaterialTheme.typography.h3,
+      fontWeight = FontWeight.Bold,
+      color = color
+    )
+  }
+
+  @Composable
+  fun chatPreviewTitle() {
+    when (cInfo) {
+      is ChatInfo.Direct ->
+        chatPreviewTitleText(if (cInfo.ready) Color.Unspecified else HighOrLowlight)
+      is ChatInfo.Group ->
+        when (cInfo.groupInfo.membership.memberStatus) {
+          GroupMemberStatus.MemInvited -> chatPreviewTitleText(MaterialTheme.colors.primary)
+          GroupMemberStatus.MemAccepted -> chatPreviewTitleText(HighOrLowlight)
+          else -> chatPreviewTitleText()
+        }
+      else -> chatPreviewTitleText()
+    }
+  }
+
+  @Composable
+  fun chatPreviewText() {
+    val ci = chat.chatItems.lastOrNull()
+    if (ci != null) {
+      MarkdownText(
+        ci.text, ci.formattedText, ci.memberDisplayName,
+        metaText = ci.timestampText,
+        maxLines = 2,
+        overflow = TextOverflow.Ellipsis,
+        style = MaterialTheme.typography.body1.copy(color = if (isSystemInDarkTheme()) MessagePreviewDark else MessagePreviewLight, lineHeight = 22.sp),
+      )
+    } else {
+      when (cInfo) {
+        is ChatInfo.Direct ->
+          if (!cInfo.ready) {
+            Text(stringResource(R.string.contact_connection_pending), color = HighOrLowlight)
+          }
+        is ChatInfo.Group ->
+          when (cInfo.groupInfo.membership.memberStatus) {
+            GroupMemberStatus.MemInvited -> Text(stringResource(R.string.group_preview_you_are_invited))
+            GroupMemberStatus.MemAccepted -> Text(stringResource(R.string.group_connection_pending), color = HighOrLowlight)
+            else -> {}
+          }
+        else -> {}
+      }
+    }
+  }
+
  Row {
-    val cInfo = chat.chatInfo
-    ChatInfoImage(cInfo, size = 72.dp)
+    Box(contentAlignment = Alignment.BottomEnd) {
+      ChatInfoImage(cInfo, size = 72.dp)
+      Box(Modifier.padding(end = 6.dp, bottom = 6.dp)) {
+        chatPreviewImageOverlayIcon()
+      }
+    }
    Column(
      modifier = Modifier
        .padding(horizontal = 8.dp)
        .weight(1F)
    ) {
-      Text(
-        cInfo.chatViewName,
-        maxLines = 1,
-        overflow = TextOverflow.Ellipsis,
-        style = MaterialTheme.typography.h3,
-        fontWeight = FontWeight.Bold,
-        color = if (cInfo.ready) Color.Unspecified else HighOrLowlight
-      )
-      if (cInfo.ready) {
-        val ci = chat.chatItems.lastOrNull()
-        if (ci != null) {
-          MarkdownText(
-            ci.text, ci.formattedText, ci.memberDisplayName,
-            metaText = ci.timestampText,
-            maxLines = 2,
-            overflow = TextOverflow.Ellipsis,
-            style = MaterialTheme.typography.body1.copy(color = if (isSystemInDarkTheme()) MessagePreviewDark else MessagePreviewLight, lineHeight = 22.sp),
-          )
-        }
-      } else {
-        Text(stringResource(R.string.contact_connection_pending), color = HighOrLowlight)
-      }
+      chatPreviewTitle()
+      chatPreviewText()
    }
    val ts = chat.chatItems.lastOrNull()?.timestampText ?: getTimestampText(chat.chatInfo.updatedAt)

@@ -76,11 +140,11 @@ fun ChatPreviewView(chat: Chat) {
          contentAlignment = Alignment.Center
        ) {
          Text(
-            if (n < 1000) "$n" else "${n / 1000}" + stringResource(R.string.thousand_abbreviation),
+            unreadCountStr(n),
            color = MaterialTheme.colors.onPrimary,
            fontSize = 11.sp,
            modifier = Modifier
-              .background(MaterialTheme.colors.primary, shape = CircleShape)
+              .background(if (stopped) HighOrLowlight else MaterialTheme.colors.primary, shape = CircleShape)
              .badgeLayout()
              .padding(horizontal = 3.dp)
              .padding(vertical = 1.dp)
@@ -99,6 +163,11 @@ fun ChatPreviewView(chat: Chat) {
  }
 }

+@Composable
+fun unreadCountStr(n: Int): String {
+  return if (n < 1000) "$n" else "${n / 1000}" + stringResource(R.string.thousand_abbreviation)
+}
+
@Composable
 fun ChatStatusImage(chat: Chat) {
  val s = chat.serverInfo.networkStatus
@@ -131,6 +200,6 @@ fun ChatStatusImage(chat: Chat) {
@Composable
 fun PreviewChatPreviewView() {
  SimpleXTheme {
-    ChatPreviewView(Chat.sampleData)
+    ChatPreviewView(Chat.sampleData, stopped = false)
  }
 }
@@ -0,0 +1,146 @@
+package chat.simplex.app.views.database
+
+import SectionDivider
+import SectionTextFooter
+import SectionView
+import android.content.Context
+import android.content.res.Configuration
+import android.net.Uri
+import android.util.Log
+import android.widget.Toast
+import androidx.activity.compose.ManagedActivityResultLauncher
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import chat.simplex.app.R
+import chat.simplex.app.TAG
+import chat.simplex.app.model.ChatModel
+import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.views.helpers.*
+import chat.simplex.app.views.usersettings.*
+import kotlinx.datetime.*
+import java.io.BufferedOutputStream
+import java.io.File
+import java.text.SimpleDateFormat
+import java.util.*
+
+@Composable
+fun ChatArchiveView(m: ChatModel, title: String, archiveName: String, archiveTime: Instant) {
+  val context = LocalContext.current
+  val archivePath = "${getFilesDirectory(context)}/$archiveName"
+  val saveArchiveLauncher = rememberSaveArchiveLauncher(cxt = context, archivePath)
+  ChatArchiveLayout(
+    title,
+    archiveTime,
+    saveArchive = { saveArchiveLauncher.launch(archivePath.substringAfterLast("/")) },
+    deleteArchiveAlert = { deleteArchiveAlert(m, archivePath) }
+  )
+}
+
+@Composable
+fun ChatArchiveLayout(
+  title: String,
+  archiveTime: Instant,
+  saveArchive: () -> Unit,
+  deleteArchiveAlert: () -> Unit
+) {
+  Column(
+    Modifier.fillMaxWidth(),
+    horizontalAlignment = Alignment.Start,
+  ) {
+    Text(
+      title,
+      Modifier.padding(start = 16.dp, bottom = 24.dp),
+      style = MaterialTheme.typography.h1
+    )
+
+    SectionView(stringResource(R.string.chat_archive_section)) {
+      SettingsActionItem(
+        Icons.Outlined.IosShare,
+        stringResource(R.string.save_archive),
+        saveArchive,
+        textColor = MaterialTheme.colors.primary
+      )
+      SectionDivider()
+      SettingsActionItem(
+        Icons.Outlined.Delete,
+        stringResource(R.string.delete_archive),
+        deleteArchiveAlert,
+        textColor = Color.Red
+      )
+    }
+    val archiveTs = SimpleDateFormat("yyyy-MM-dd HH:mm:ss Z", Locale.US).format(Date.from(archiveTime.toJavaInstant()))
+    SectionTextFooter(
+      String.format(generalGetString(R.string.archive_created_on_ts), archiveTs)
+    )
+  }
+}
+
+@Composable
+private fun rememberSaveArchiveLauncher(cxt: Context, chatArchivePath: String): ManagedActivityResultLauncher<String, Uri?> =
+  rememberLauncherForActivityResult(
+    contract = ActivityResultContracts.CreateDocument(),
+    onResult = { destination ->
+      try {
+        destination?.let {
+          val contentResolver = cxt.contentResolver
+          contentResolver.openOutputStream(destination)?.let { stream ->
+            val outputStream = BufferedOutputStream(stream)
+            val file = File(chatArchivePath)
+            outputStream.write(file.readBytes())
+            outputStream.close()
+            Toast.makeText(cxt, generalGetString(R.string.file_saved), Toast.LENGTH_SHORT).show()
+          }
+        }
+      } catch (e: Error) {
+        Toast.makeText(cxt, generalGetString(R.string.error_saving_file), Toast.LENGTH_SHORT).show()
+        Log.e(TAG, "rememberSaveArchiveLauncher error saving archive $e")
+      }
+    }
+  )
+
+private fun deleteArchiveAlert(m: ChatModel, archivePath: String) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(R.string.delete_chat_archive_question),
+    confirmText = generalGetString(R.string.delete_verb),
+    onConfirm = {
+      val fileDeleted = File(archivePath).delete()
+      if (fileDeleted) {
+        m.controller.appPrefs.chatArchiveName.set(null)
+        m.controller.appPrefs.chatArchiveTime.set(null)
+        ModalManager.shared.closeModal()
+      } else {
+        Log.e(TAG, "deleteArchiveAlert delete() error")
+      }
+    }
+  )
+}
+
+@Preview(showBackground = true)
+@Preview(
+  uiMode = Configuration.UI_MODE_NIGHT_YES,
+  showBackground = true,
+  name = "Dark Mode"
+)
+@Composable
+fun PreviewChatArchiveLayout() {
+  SimpleXTheme {
+    ChatArchiveLayout(
+      title = "New database archive",
+      archiveTime = Clock.System.now(),
+      saveArchive = {},
+      deleteArchiveAlert = {}
+    )
+  }
+}
@@ -0,0 +1,473 @@
+package chat.simplex.app.views.database
+
+import SectionDivider
+import SectionTextFooter
+import SectionItemView
+import SectionSpacer
+import SectionView
+import android.content.Context
+import android.content.res.Configuration
+import android.net.Uri
+import android.os.FileUtils
+import android.util.Log
+import android.widget.Toast
+import androidx.activity.compose.ManagedActivityResultLauncher
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.PlayArrow
+import androidx.compose.material.icons.filled.Report
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import chat.simplex.app.*
+import chat.simplex.app.R
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.HighOrLowlight
+import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.views.helpers.*
+import chat.simplex.app.views.usersettings.*
+import kotlinx.datetime.*
+import java.io.*
+import java.text.SimpleDateFormat
+import java.util.*
+
+@Composable
+fun DatabaseView(
+  m: ChatModel,
+  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit)
+) {
+  val context = LocalContext.current
+  val progressIndicator = remember { mutableStateOf(false) }
+  val runChat = remember { mutableStateOf(m.chatRunning.value ?: true) }
+  val prefs = m.controller.appPrefs
+  val chatArchiveName = remember { mutableStateOf(prefs.chatArchiveName.get()) }
+  val chatArchiveTime = remember { mutableStateOf(prefs.chatArchiveTime.get()) }
+  val chatLastStart = remember { mutableStateOf(prefs.chatLastStart.get()) }
+  val chatArchiveFile = remember { mutableStateOf<String?>(null) }
+  val saveArchiveLauncher = rememberSaveArchiveLauncher(cxt = context, chatArchiveFile)
+  val importArchiveLauncher = rememberGetContentLauncher { uri: Uri? ->
+    if (uri != null) {
+      importArchiveAlert(m, context, uri, progressIndicator)
+    }
+  }
+  LaunchedEffect(m.chatRunning) {
+    runChat.value = m.chatRunning.value ?: true
+  }
+  Box(
+    Modifier.fillMaxSize(),
+  ) {
+    DatabaseLayout(
+      progressIndicator.value,
+      runChat.value,
+      m.chatDbChanged.value,
+      importArchiveLauncher,
+      chatArchiveName,
+      chatArchiveTime,
+      chatLastStart,
+      startChat = { startChat(m, runChat, chatLastStart, context) },
+      stopChatAlert = { stopChatAlert(m, runChat, context) },
+      exportArchive = { exportArchive(context, m, progressIndicator, chatArchiveName, chatArchiveTime, chatArchiveFile, saveArchiveLauncher) },
+      deleteChatAlert = { deleteChatAlert(m, progressIndicator) },
+      showSettingsModal
+    )
+    if (progressIndicator.value) {
+      Box(
+        Modifier.fillMaxSize(),
+        contentAlignment = Alignment.Center
+      ) {
+        CircularProgressIndicator(
+          Modifier
+            .padding(horizontal = 2.dp)
+            .size(30.dp),
+          color = HighOrLowlight,
+          strokeWidth = 2.5.dp
+        )
+      }
+    }
+  }
+}
+
+@Composable
+fun DatabaseLayout(
+  progressIndicator: Boolean,
+  runChat: Boolean,
+  chatDbChanged: Boolean,
+  importArchiveLauncher: ManagedActivityResultLauncher<String, Uri?>,
+  chatArchiveName: MutableState<String?>,
+  chatArchiveTime: MutableState<Instant?>,
+  chatLastStart: MutableState<Instant?>,
+  startChat: () -> Unit,
+  stopChatAlert: () -> Unit,
+  exportArchive: () -> Unit,
+  deleteChatAlert: () -> Unit,
+  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit)
+) {
+  val stopped = !runChat
+  val operationsDisabled = !stopped || progressIndicator || chatDbChanged
+
+  Column(
+    Modifier.fillMaxWidth(),
+    horizontalAlignment = Alignment.Start,
+  ) {
+    Text(
+      stringResource(R.string.your_chat_database),
+      Modifier.padding(start = 16.dp, bottom = 24.dp),
+      style = MaterialTheme.typography.h1
+    )
+
+    SectionView(stringResource(R.string.run_chat_section)) {
+      RunChatSetting(runChat, stopped, chatDbChanged, startChat, stopChatAlert)
+    }
+    SectionSpacer()
+
+    SectionView(stringResource(R.string.chat_database_section)) {
+      SettingsActionItem(
+        Icons.Outlined.IosShare,
+        stringResource(R.string.export_database),
+        exportArchive,
+        textColor = MaterialTheme.colors.primary,
+        disabled = operationsDisabled
+      )
+      SectionDivider()
+      SettingsActionItem(
+        Icons.Outlined.FileDownload,
+        stringResource(R.string.import_database),
+        { importArchiveLauncher.launch("application/zip") },
+        textColor = Color.Red,
+        disabled = operationsDisabled
+      )
+      SectionDivider()
+      val chatArchiveNameVal = chatArchiveName.value
+      val chatArchiveTimeVal = chatArchiveTime.value
+      val chatLastStartVal = chatLastStart.value
+      if (chatArchiveNameVal != null && chatArchiveTimeVal != null && chatLastStartVal != null) {
+        val title = chatArchiveTitle(chatArchiveTimeVal, chatLastStartVal)
+        SettingsActionItem(
+          Icons.Outlined.Inventory2,
+          title,
+          click = showSettingsModal { ChatArchiveView(it, title, chatArchiveNameVal, chatArchiveTimeVal) },
+          disabled = operationsDisabled
+        )
+        SectionDivider()
+      }
+      SettingsActionItem(
+        Icons.Outlined.DeleteForever,
+        stringResource(R.string.delete_database),
+        deleteChatAlert,
+        textColor = Color.Red,
+        disabled = operationsDisabled
+      )
+    }
+    SectionTextFooter(
+      if (chatDbChanged) {
+        stringResource(R.string.restart_the_app_to_use_new_chat_database)
+      } else {
+        if (stopped) {
+          stringResource(R.string.you_must_use_the_most_recent_version_of_database)
+        } else {
+          stringResource(R.string.stop_chat_to_enable_database_actions)
+        }
+      }
+    )
+  }
+}
+
+@Composable
+fun RunChatSetting(
+  runChat: Boolean,
+  stopped: Boolean,
+  chatDbChanged: Boolean,
+  startChat: () -> Unit,
+  stopChatAlert: () -> Unit
+) {
+  SectionItemView() {
+    Row(verticalAlignment = Alignment.CenterVertically) {
+      val chatRunningText = if (stopped) stringResource(R.string.chat_is_stopped) else stringResource(R.string.chat_is_running)
+      Icon(
+        if (stopped) Icons.Filled.Report else Icons.Filled.PlayArrow,
+        chatRunningText,
+        tint = if (chatDbChanged) HighOrLowlight else if (stopped) Color.Red else MaterialTheme.colors.primary
+      )
+      Spacer(Modifier.padding(horizontal = 4.dp))
+      Text(
+        chatRunningText,
+        Modifier.padding(end = 24.dp),
+        color = if (chatDbChanged) HighOrLowlight else Color.Unspecified
+      )
+      Spacer(Modifier.fillMaxWidth().weight(1f))
+      Switch(
+        checked = runChat,
+        onCheckedChange = { runChatSwitch ->
+          if (runChatSwitch) {
+            startChat()
+          } else {
+            stopChatAlert()
+          }
+        },
+        colors = SwitchDefaults.colors(
+          checkedThumbColor = MaterialTheme.colors.primary,
+          uncheckedThumbColor = HighOrLowlight
+        ),
+        enabled = !chatDbChanged
+      )
+    }
+  }
+}
+
+@Composable
+fun chatArchiveTitle(chatArchiveTime: Instant, chatLastStart: Instant): String {
+  return stringResource(if (chatArchiveTime < chatLastStart) R.string.old_database_archive else R.string.new_database_archive)
+}
+
+private fun startChat(m: ChatModel, runChat: MutableState<Boolean>, chatLastStart: MutableState<Instant?>, context: Context) {
+  withApi {
+    try {
+      m.controller.apiStartChat()
+      runChat.value = true
+      m.chatRunning.value = true
+      val ts = Clock.System.now()
+      m.controller.appPrefs.chatLastStart.set(ts)
+      chatLastStart.value = ts
+      SimplexService.start(context)
+    } catch (e: Error) {
+      runChat.value = false
+      AlertManager.shared.showAlertMsg(generalGetString(R.string.error_starting_chat), e.toString())
+    }
+  }
+}
+
+private fun stopChatAlert(m: ChatModel, runChat: MutableState<Boolean>, context: Context) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(R.string.stop_chat_question),
+    text = generalGetString(R.string.stop_chat_to_export_import_or_delete_chat_database),
+    confirmText = generalGetString(R.string.stop_chat_confirmation),
+    onConfirm = { stopChat(m, runChat, context) },
+    onDismiss = { runChat.value = true }
+  )
+}
+
+private fun stopChat(m: ChatModel, runChat: MutableState<Boolean>, context: Context) {
+  withApi {
+    try {
+      m.controller.apiStopChat()
+      runChat.value = false
+      m.chatRunning.value = false
+      SimplexService.stop(context)
+    } catch (e: Error) {
+      runChat.value = true
+      AlertManager.shared.showAlertMsg(generalGetString(R.string.error_starting_chat), e.toString())
+    }
+  }
+}
+
+private fun exportArchive(
+  context: Context,
+  m: ChatModel,
+  progressIndicator: MutableState<Boolean>,
+  chatArchiveName: MutableState<String?>,
+  chatArchiveTime: MutableState<Instant?>,
+  chatArchiveFile: MutableState<String?>,
+  saveArchiveLauncher: ManagedActivityResultLauncher<String, Uri?>
+) {
+  progressIndicator.value = true
+  withApi {
+    try {
+      val archiveFile = exportChatArchive(m, context, chatArchiveName, chatArchiveTime, chatArchiveFile)
+      chatArchiveFile.value = archiveFile
+      saveArchiveLauncher.launch(archiveFile.substringAfterLast("/"))
+      progressIndicator.value = false
+    } catch (e: Error) {
+      AlertManager.shared.showAlertMsg(generalGetString(R.string.error_exporting_chat_database), e.toString())
+      progressIndicator.value = false
+    }
+  }
+}
+
+private suspend fun exportChatArchive(
+  m: ChatModel,
+  context: Context,
+  chatArchiveName: MutableState<String?>,
+  chatArchiveTime: MutableState<Instant?>,
+  chatArchiveFile: MutableState<String?>
+): String {
+  val archiveTime = Clock.System.now()
+  val ts = SimpleDateFormat("yyyy-MM-dd'T'HHmmss", Locale.US).format(Date.from(archiveTime.toJavaInstant()))
+  val archiveName = "simplex-chat.$ts.zip"
+  val archivePath = "${getFilesDirectory(context)}/$archiveName"
+  val config = ArchiveConfig(archivePath, parentTempDirectory = context.cacheDir.toString())
+  m.controller.apiExportArchive(config)
+  deleteOldArchive(m, context)
+  m.controller.appPrefs.chatArchiveName.set(archiveName)
+  chatArchiveName.value = archiveName
+  m.controller.appPrefs.chatArchiveTime.set(archiveTime)
+  chatArchiveTime.value = archiveTime
+  chatArchiveFile.value = archivePath
+  return archivePath
+}
+
+private fun deleteOldArchive(m: ChatModel, context: Context) {
+  val chatArchiveName = m.controller.appPrefs.chatArchiveName.get()
+  if (chatArchiveName != null) {
+    val file = File("${getFilesDirectory(context)}/$chatArchiveName")
+    val fileDeleted = file.delete()
+    if (fileDeleted) {
+      m.controller.appPrefs.chatArchiveName.set(null)
+      m.controller.appPrefs.chatArchiveTime.set(null)
+    } else {
+      Log.e(TAG, "deleteOldArchive file.delete() error")
+    }
+  }
+}
+
+@Composable
+private fun rememberSaveArchiveLauncher(cxt: Context, chatArchiveFile: MutableState<String?>): ManagedActivityResultLauncher<String, Uri?> =
+  rememberLauncherForActivityResult(
+    contract = ActivityResultContracts.CreateDocument(),
+    onResult = { destination ->
+      try {
+        destination?.let {
+          val filePath = chatArchiveFile.value
+          if (filePath != null) {
+            val contentResolver = cxt.contentResolver
+            contentResolver.openOutputStream(destination)?.let { stream ->
+              val outputStream = BufferedOutputStream(stream)
+              val file = File(filePath)
+              outputStream.write(file.readBytes())
+              outputStream.close()
+              Toast.makeText(cxt, generalGetString(R.string.file_saved), Toast.LENGTH_SHORT).show()
+            }
+          } else {
+            Toast.makeText(cxt, generalGetString(R.string.file_not_found), Toast.LENGTH_SHORT).show()
+          }
+        }
+      } catch (e: Error) {
+        Toast.makeText(cxt, generalGetString(R.string.error_saving_file), Toast.LENGTH_SHORT).show()
+        Log.e(TAG, "rememberSaveArchiveLauncher error saving archive $e")
+      } finally {
+        chatArchiveFile.value = null
+      }
+    }
+  )
+
+private fun importArchiveAlert(m: ChatModel, context: Context, importedArchiveUri: Uri, progressIndicator: MutableState<Boolean>) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(R.string.import_database_question),
+    text = generalGetString(R.string.your_current_chat_database_will_be_deleted_and_replaced_with_the_imported_one),
+    confirmText = generalGetString(R.string.import_database_confirmation),
+    onConfirm = { importArchive(m, context, importedArchiveUri, progressIndicator) }
+  )
+}
+
+private fun importArchive(m: ChatModel, context: Context, importedArchiveUri: Uri, progressIndicator: MutableState<Boolean>) {
+  progressIndicator.value = true
+  val archivePath = saveArchiveFromUri(context, importedArchiveUri)
+  if (archivePath != null) {
+    withApi {
+      try {
+        m.controller.apiDeleteStorage()
+        try {
+          val config = ArchiveConfig(archivePath, parentTempDirectory = context.cacheDir.toString())
+          m.controller.apiImportArchive(config)
+          operationEnded(m, progressIndicator) {
+            AlertManager.shared.showAlertMsg(generalGetString(R.string.chat_database_imported), generalGetString(R.string.restart_the_app_to_use_imported_chat_database))
+          }
+        } catch (e: Error) {
+          operationEnded(m, progressIndicator) {
+            AlertManager.shared.showAlertMsg(generalGetString(R.string.error_importing_database), e.toString())
+          }
+        }
+      } catch (e: Error) {
+        operationEnded(m, progressIndicator) {
+          AlertManager.shared.showAlertMsg(generalGetString(R.string.error_deleting_database), e.toString())
+        }
+      } finally {
+        File(archivePath).delete()
+      }
+    }
+  }
+}
+
+private fun saveArchiveFromUri(context: Context, importedArchiveUri: Uri): String? {
+  return try {
+    val inputStream = context.contentResolver.openInputStream(importedArchiveUri)
+    val archiveName = getFileName(context, importedArchiveUri)
+    if (inputStream != null && archiveName != null) {
+      val archivePath = "${context.cacheDir}/$archiveName"
+      val destFile = File(archivePath)
+      FileUtils.copy(inputStream, FileOutputStream(destFile))
+      archivePath
+    } else {
+      Log.e(TAG, "saveArchiveFromUri null inputStream")
+      null
+    }
+  } catch (e: Exception) {
+    Log.e(TAG, "saveArchiveFromUri error: ${e.message}")
+    null
+  }
+}
+
+private fun deleteChatAlert(m: ChatModel, progressIndicator: MutableState<Boolean>) {
+  AlertManager.shared.showAlertDialog(
+    title = generalGetString(R.string.delete_chat_profile_question),
+    text = generalGetString(R.string.delete_chat_profile_action_cannot_be_undone_warning),
+    confirmText = generalGetString(R.string.delete_verb),
+    onConfirm = { deleteChat(m, progressIndicator) }
+  )
+}
+
+private fun deleteChat(m: ChatModel, progressIndicator: MutableState<Boolean>) {
+  progressIndicator.value = true
+  withApi {
+    try {
+      m.controller.apiDeleteStorage()
+      operationEnded(m, progressIndicator) {
+        AlertManager.shared.showAlertMsg(generalGetString(R.string.chat_database_deleted), generalGetString(R.string.restart_the_app_to_create_a_new_chat_profile))
+      }
+    } catch (e: Error) {
+      operationEnded(m, progressIndicator) {
+        AlertManager.shared.showAlertMsg(generalGetString(R.string.error_deleting_database), e.toString())
+      }
+    }
+  }
+}
+
+private fun operationEnded(m: ChatModel, progressIndicator: MutableState<Boolean>, alert: () -> Unit) {
+  m.chatDbChanged.value = true
+  progressIndicator.value = false
+  alert.invoke()
+}
+
+@Preview(showBackground = true)
+@Preview(
+  uiMode = Configuration.UI_MODE_NIGHT_YES,
+  showBackground = true,
+  name = "Dark Mode"
+)
+@Composable
+fun PreviewDatabaseLayout() {
+  SimpleXTheme {
+    DatabaseLayout(
+      progressIndicator = false,
+      runChat = true,
+      chatDbChanged = false,
+      importArchiveLauncher = rememberGetContentLauncher {},
+      chatArchiveName = remember { mutableStateOf("dummy_archive") },
+      chatArchiveTime = remember { mutableStateOf(Clock.System.now()) },
+      chatLastStart = remember { mutableStateOf(Clock.System.now()) },
+      startChat = {},
+      stopChatAlert = {},
+      exportArchive = {},
+      deleteChatAlert = {},
+      showSettingsModal = { {} }
+    )
+  }
+}
@@ -24,11 +24,11 @@ import chat.simplex.app.model.ChatInfo
 import chat.simplex.app.ui.theme.SimpleXTheme

@Composable
-fun ChatInfoImage(chatInfo: ChatInfo, size: Dp) {
+fun ChatInfoImage(chatInfo: ChatInfo, size: Dp, iconColor: Color = MaterialTheme.colors.secondary) {
  val icon =
    if (chatInfo is ChatInfo.Group) Icons.Filled.SupervisedUserCircle
                                    else Icons.Filled.AccountCircle
-  ProfileImage(size, chatInfo.image, icon)
+  ProfileImage(size, chatInfo.image, icon, iconColor)
 }

@Composable
@@ -0,0 +1,124 @@
+package chat.simplex.app.views.helpers
+
+import chat.simplex.app.R
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.ArrowBackIos
+import androidx.compose.material.icons.outlined.Menu
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.*
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import chat.simplex.app.ui.theme.ToolbarDark
+import chat.simplex.app.ui.theme.ToolbarLight
+
+@Composable
+fun DefaultTopAppBar(
+  navigationButton: @Composable RowScope.() -> Unit,
+  title: @Composable () -> Unit,
+  onTitleClick: (() -> Unit)? = null,
+  showSearch: Boolean,
+  onSearchValueChanged: (String) -> Unit,
+  buttons: List<@Composable RowScope.() -> Unit> = emptyList(),
+) {
+  // If I just disable clickable modifier when don't need it, it will stop passing clicks to search. Replacing the whole modifier
+  val modifier = if (!showSearch) {
+    Modifier.clickable(enabled = onTitleClick != null, onClick = onTitleClick ?: { })
+  } else Modifier
+
+  TopAppBar(
+    modifier = modifier,
+    title = {
+      if (!showSearch) {
+        title()
+      } else {
+        SearchTextField(Modifier.fillMaxWidth(), stringResource(android.R.string.search_go), onSearchValueChanged)
+      }
+    },
+    backgroundColor = if (isSystemInDarkTheme()) ToolbarDark else ToolbarLight,
+    navigationIcon = navigationButton,
+    buttons = if (!showSearch) buttons else emptyList(),
+    centered = !showSearch
+  )
+}
+
+@Composable
+fun NavigationButtonBack(onButtonClicked: () -> Unit) {
+  IconButton(onButtonClicked) {
+    Icon(
+      Icons.Outlined.ArrowBackIos, stringResource(R.string.back), tint = MaterialTheme.colors.primary
+    )
+  }
+}
+
+@Composable
+fun NavigationButtonMenu(onButtonClicked: () -> Unit) {
+  IconButton(onClick = onButtonClicked) {
+    Icon(
+      Icons.Outlined.Menu,
+      stringResource(R.string.icon_descr_settings),
+      tint = MaterialTheme.colors.primary,
+    )
+  }
+}
+
+@Composable
+private fun TopAppBar(
+  title: @Composable () -> Unit,
+  modifier: Modifier = Modifier,
+  navigationIcon: @Composable (RowScope.() -> Unit)? = null,
+  buttons: List<@Composable RowScope.() -> Unit> = emptyList(),
+  backgroundColor: Color = MaterialTheme.colors.primarySurface,
+  centered: Boolean,
+) {
+  Box(
+    modifier
+      .fillMaxWidth()
+      .height(AppBarHeight)
+      .background(backgroundColor)
+      .padding(horizontal = 4.dp),
+    contentAlignment = Alignment.CenterStart,
+  ) {
+    if (navigationIcon != null) {
+      Row(
+        Modifier
+          .fillMaxHeight()
+          .width(TitleInsetWithIcon - AppBarHorizontalPadding),
+        verticalAlignment = Alignment.CenterVertically,
+        content = navigationIcon
+      )
+    }
+
+    Row(
+      Modifier
+        .fillMaxHeight()
+        .fillMaxWidth(),
+      horizontalArrangement = Arrangement.End,
+      verticalAlignment = Alignment.CenterVertically,
+    ) {
+      buttons.forEach { it() }
+    }
+    val startPadding = if (navigationIcon != null) TitleInsetWithIcon else TitleInsetWithoutIcon
+    val endPadding = (buttons.size * 50f).dp
+    Box(
+      Modifier
+        .fillMaxWidth()
+        .padding(
+          start = if (centered) kotlin.math.max(startPadding.value, endPadding.value).dp else startPadding,
+          end = if (centered) kotlin.math.max(startPadding.value, endPadding.value).dp else endPadding
+        ),
+      contentAlignment = Alignment.Center
+    ) {
+      title()
+    }
+  }
+}
+
+val AppBarHeight = 56.dp
+private val AppBarHorizontalPadding = 4.dp
+private val TitleInsetWithoutIcon = 16.dp - AppBarHorizontalPadding
+private val TitleInsetWithIcon = 72.dp
@@ -0,0 +1,227 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package chat.simplex.app.views.helpers
+
+import android.util.Log
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.combinedClickable
+import androidx.compose.foundation.gestures.forEachGesture
+import androidx.compose.foundation.interaction.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.input.pointer.AwaitPointerEventScope
+import androidx.compose.ui.input.pointer.PointerEventTimeoutCancellationException
+import androidx.compose.ui.input.pointer.PointerEvent
+import androidx.compose.ui.input.pointer.PointerEventPass
+import androidx.compose.ui.input.pointer.PointerInputChange
+import androidx.compose.ui.input.pointer.PointerInputScope
+import androidx.compose.ui.input.pointer.changedToDown
+import androidx.compose.ui.input.pointer.changedToDownIgnoreConsumed
+import androidx.compose.ui.input.pointer.changedToUp
+import androidx.compose.ui.input.pointer.consumeAllChanges
+import androidx.compose.ui.input.pointer.consumeDownChange
+import androidx.compose.ui.input.pointer.isOutOfBounds
+import androidx.compose.ui.input.pointer.positionChangeConsumed
+import androidx.compose.ui.platform.LocalViewConfiguration
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.util.fastAll
+import androidx.compose.ui.util.fastAny
+import androidx.compose.ui.util.fastForEach
+import chat.simplex.app.TAG
+import kotlinx.coroutines.*
+import kotlinx.coroutines.sync.Mutex
+
+/**
+ * See original code here: [androidx.compose.foundation.gestures.detectTapGestures]
+ * */
+interface PressGestureScope: Density {
+  suspend fun tryAwaitRelease(): Boolean
+}
+
+private val NoPressGesture: suspend PressGestureScope.(Offset) -> Unit = { }
+
+suspend fun PointerInputScope.detectGesture(
+  onLongPress: ((Offset) -> Unit)? = null,
+  onPress: suspend PressGestureScope.(Offset) -> Unit = NoPressGesture,
+  shouldConsumeEvent: (Offset) -> Boolean
+) = coroutineScope {
+  val pressScope = PressGestureScopeImpl(this@detectGesture)
+
+  forEachGesture {
+    awaitPointerEventScope {
+      val down = awaitFirstDown()
+      // If shouldConsumeEvent == false, all touches will be propagated to parent
+      val shouldConsume = shouldConsumeEvent(down.position)
+      if (shouldConsume)
+        down.consumeDownChange()
+      pressScope.reset()
+      if (onPress !== NoPressGesture) launch {
+        pressScope.onPress(down.position)
+      }
+      val longPressTimeout = onLongPress?.let {
+        viewConfiguration.longPressTimeoutMillis
+      } ?: (Long.MAX_VALUE / 2)
+
+      try {
+        val upOrCancel: PointerInputChange? = withTimeout(longPressTimeout) {
+          waitForUpOrCancellation()
+        }
+        if (upOrCancel == null) {
+          pressScope.cancel()
+        } else {
+          if (shouldConsume)
+            upOrCancel.consumeDownChange()
+          // If onLongPress event is needed, cancel short press event
+          if (onLongPress != null)
+            pressScope.cancel()
+          else
+            pressScope.release()
+        }
+      } catch (_: PointerEventTimeoutCancellationException) {
+        onLongPress?.invoke(down.position)
+        if (shouldConsume)
+          consumeUntilUp()
+        pressScope.release()
+      }
+    }
+  }
+}
+
+private suspend fun AwaitPointerEventScope.consumeUntilUp() {
+  do {
+    val event = awaitPointerEvent()
+    event.changes.fastForEach { it.consumeAllChanges() }
+  } while (event.changes.fastAny { it.pressed })
+}
+
+suspend fun AwaitPointerEventScope.awaitFirstDown(
+  requireUnconsumed: Boolean = true
+): PointerInputChange =
+  awaitFirstDownOnPass(pass = PointerEventPass.Main, requireUnconsumed = requireUnconsumed)
+
+internal suspend fun AwaitPointerEventScope.awaitFirstDownOnPass(
+  pass: PointerEventPass,
+  requireUnconsumed: Boolean
+): PointerInputChange {
+  var event: PointerEvent
+  do {
+    event = awaitPointerEvent(pass)
+  } while (
+    !event.changes.fastAll {
+      if (requireUnconsumed) it.changedToDown() else it.changedToDownIgnoreConsumed()
+    }
+  )
+  return event.changes[0]
+}
+
+suspend fun AwaitPointerEventScope.waitForUpOrCancellation(): PointerInputChange? {
+  while (true) {
+    val event = awaitPointerEvent(PointerEventPass.Main)
+    if (event.changes.fastAll { it.changedToUp() }) {
+      return event.changes[0]
+    }
+
+    if (event.changes.fastAny {
+        it.consumed.downChange || it.isOutOfBounds(size, extendedTouchPadding)
+      }
+    ) {
+      return null
+    }
+    val consumeCheck = awaitPointerEvent(PointerEventPass.Final)
+    if (consumeCheck.changes.fastAny { it.positionChangeConsumed() }) {
+      return null
+    }
+  }
+}
+
+private class PressGestureScopeImpl(
+  density: Density
+): PressGestureScope, Density by density {
+  private var isReleased = false
+  private var isCanceled = false
+  private val mutex = Mutex(locked = false)
+
+  fun cancel() {
+    isCanceled = true
+    mutex.unlock()
+  }
+
+  fun release() {
+    isReleased = true
+    mutex.unlock()
+  }
+
+  fun reset() {
+    mutex.tryLock()
+    isReleased = false
+    isCanceled = false
+  }
+
+  override suspend fun tryAwaitRelease(): Boolean {
+    if (!isReleased && !isCanceled) {
+      mutex.lock()
+    }
+    return isCanceled
+  }
+}
+
+/**
+ * Captures click events and calls [onLongClick] or [onClick] when such even happens. Otherwise, does nothing.
+ * Apply [MutableInteractionSource] to any element that allows to pass it in (for example, in [Modifier.clickable]).
+ * Works in situations when using [Modifier.combinedClickable] doesn't work because external element overrides [Modifier.clickable]
+ * */
+@Composable
+fun interactionSourceWithDetection(onClick: () -> Unit, onLongClick: () -> Unit): MutableInteractionSource {
+  val interactionSource = remember { MutableInteractionSource() }
+  val longPressTimeoutMillis = LocalViewConfiguration.current.longPressTimeoutMillis
+  var topLevelInteraction: Interaction? by remember { mutableStateOf(null) }
+  LaunchedEffect(interactionSource) {
+    interactionSource.interactions.collect { interaction ->
+      topLevelInteraction = interaction
+    }
+  }
+  LaunchedEffect(topLevelInteraction is PressInteraction.Press) {
+    if (topLevelInteraction !is PressInteraction.Press) return@LaunchedEffect
+    try {
+      withTimeout(longPressTimeoutMillis) {
+        while (isActive) {
+          delay(10)
+          when (topLevelInteraction) {
+            is PressInteraction.Press -> {}
+            is PressInteraction.Release -> {
+              onClick(); break
+            }
+            is PressInteraction.Cancel -> break
+          }
+        }
+      }
+    } catch (_: TimeoutCancellationException) {
+      // Long click happened
+      onLongClick()
+    } catch (ex: CancellationException) {
+      // Canceled coroutine + PressInteraction.Release == short click
+      if (topLevelInteraction is PressInteraction.Release)
+        onClick()
+      Log.e(TAG, ex.stackTraceToString())
+    } catch (ex: Exception) {
+      // Should never be called
+      Log.e(TAG, ex.stackTraceToString())
+    }
+  }
+  return interactionSource
+}
@@ -88,12 +88,20 @@ private fun compressImageData(bitmap: Bitmap): ByteArrayOutputStream {
  return stream
 }

+val errorBitmapBytes = Base64.decode("iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAAAKVJREFUeF7t1kENACEUQ0FQhnVQ9lfGO+xggITQdvbMzArPey+8fa3tAfwAEdABZQspQStgBssEcgAIkSAJkiAJljtEgiRIgmUCSZAESZAESZAEyx0iQRIkwTKBJEiCv5fgvTd1wDmn7QAP4AeIgA4oW0gJWgEzWCZwbQ7gAA7ggLKFOIADOKBMIAeAEAmSIAmSYLlDJEiCJFgmkARJkARJ8N8S/ADTZUewBvnTOQAAAABJRU5ErkJggg==", Base64.NO_WRAP)
+val errorBitmap: Bitmap = BitmapFactory.decodeByteArray(errorBitmapBytes, 0, errorBitmapBytes.size)
+
 fun base64ToBitmap(base64ImageString: String): Bitmap {
  val imageString = base64ImageString
    .removePrefix("data:image/png;base64,")
    .removePrefix("data:image/jpg;base64,")
-  val imageBytes = Base64.decode(imageString, Base64.NO_WRAP)
-  return BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
+  try {
+    val imageBytes = Base64.decode(imageString, Base64.NO_WRAP)
+    return BitmapFactory.decodeByteArray(imageBytes, 0, imageBytes.size)
+  } catch (e: Exception) {
+    Log.e(TAG, "base64ToBitmap error: $e")
+    return errorBitmap
+  }
 }

 class CustomTakePicturePreview: ActivityResultContract<Void?, Bitmap?>() {
@@ -1,7 +1,15 @@
 package chat.simplex.app.views.helpers

+import androidx.compose.foundation.gestures.Orientation
+import androidx.compose.foundation.layout.offset
+import androidx.compose.material.*
+import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.layout.layout
+import androidx.compose.ui.platform.LocalLayoutDirection
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.LayoutDirection
+import kotlin.math.roundToInt

 fun Modifier.badgeLayout() =
  layout { measurable, constraints ->
@@ -15,3 +23,22 @@ fun Modifier.badgeLayout() =
      placeable.place((width - placeable.width) / 2, 0)
    }
  }
+
+@Composable
+fun SwipeToDismissModifier(
+  state: DismissState,
+  directions: Set<DismissDirection> = setOf(DismissDirection.EndToStart, DismissDirection.StartToEnd),
+  swipeDistance: Float,
+): Modifier {
+  val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
+  val anchors = mutableMapOf(0f to DismissValue.Default)
+  if (DismissDirection.StartToEnd in directions) anchors += swipeDistance to DismissValue.DismissedToEnd
+  if (DismissDirection.EndToStart in directions) anchors += -swipeDistance to DismissValue.DismissedToStart
+  return Modifier.swipeable(
+    state = state,
+    anchors = anchors,
+    thresholds = { _, _ -> FractionalThreshold(0.5f) },
+    orientation = Orientation.Horizontal,
+    reverseDirection = isRtl,
+  ).offset { IntOffset(state.offset.value.roundToInt(), 0) }
+}
@@ -0,0 +1,97 @@
+package chat.simplex.app.views.helpers
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.defaultMinSize
+import androidx.compose.foundation.shape.ZeroCornerSize
+import androidx.compose.foundation.text.*
+import androidx.compose.material.*
+import androidx.compose.material.TextFieldDefaults.indicatorLine
+import androidx.compose.material.TextFieldDefaults.textFieldWithLabelPadding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.runtime.*
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.focus.focusRequester
+import androidx.compose.ui.graphics.*
+import androidx.compose.ui.platform.LocalSoftwareKeyboardController
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.VisualTransformation
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.R
+import kotlinx.coroutines.delay
+
+@OptIn(ExperimentalComposeUiApi::class)
+@Composable
+fun SearchTextField(modifier: Modifier, placeholder: String, onValueChange: (String) -> Unit) {
+  var searchText by remember { mutableStateOf("") }
+  val focusRequester = remember { FocusRequester() }
+  val keyboard = LocalSoftwareKeyboardController.current
+
+  LaunchedEffect(Unit) {
+    focusRequester.requestFocus()
+    delay(200)
+    keyboard?.show()
+  }
+
+  val enabled = true
+  val colors = TextFieldDefaults.textFieldColors(
+    backgroundColor = Color.Unspecified,
+    textColor = MaterialTheme.colors.onBackground,
+    focusedIndicatorColor = Color.Unspecified,
+    unfocusedIndicatorColor = Color.Unspecified,
+  )
+  val shape = MaterialTheme.shapes.small.copy(bottomEnd = ZeroCornerSize, bottomStart = ZeroCornerSize)
+  val interactionSource = remember { MutableInteractionSource() }
+  BasicTextField(
+    value = searchText,
+    modifier = modifier
+      .background(colors.backgroundColor(enabled).value, shape)
+      .indicatorLine(enabled, false, interactionSource, colors)
+      .focusRequester(focusRequester)
+      .defaultMinSize(
+        minWidth = TextFieldDefaults.MinWidth,
+        minHeight = TextFieldDefaults.MinHeight
+      ),
+    onValueChange = {
+      searchText = it
+      onValueChange(it)
+    },
+    cursorBrush = SolidColor(colors.cursorColor(false).value),
+    visualTransformation = VisualTransformation.None,
+    keyboardOptions = KeyboardOptions(imeAction = ImeAction.Search),
+    singleLine = true,
+    textStyle = TextStyle(
+      color = MaterialTheme.colors.onBackground,
+      fontWeight = FontWeight.Normal,
+      fontSize = 16.sp
+    ),
+    interactionSource = interactionSource,
+    decorationBox = @Composable { innerTextField ->
+      TextFieldDefaults.TextFieldDecorationBox(
+        value = searchText,
+        innerTextField = innerTextField,
+        placeholder = {
+          Text(placeholder)
+        },
+        trailingIcon = if (searchText.isNotEmpty()) {{
+          IconButton({ searchText = ""; onValueChange("") }) {
+            Icon(Icons.Default.Close, stringResource(R.string.icon_descr_close_button), tint = MaterialTheme.colors.primary,)
+          }
+        }} else null,
+        singleLine = true,
+        enabled = enabled,
+        interactionSource = interactionSource,
+        contentPadding = textFieldWithLabelPadding(start = 0.dp, end = 0.dp),
+        visualTransformation = VisualTransformation.None,
+        colors = colors
+      )
+    }
+  )
+}
@@ -0,0 +1,82 @@
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.*
+import chat.simplex.app.ui.theme.GroupDark
+import chat.simplex.app.ui.theme.HighOrLowlight
+
+@Composable
+fun SectionView(title: String? = null, content: (@Composable () -> Unit)) {
+  Column {
+    if (title != null) {
+      Text(
+        title, color = HighOrLowlight, style = MaterialTheme.typography.body2,
+        modifier = Modifier.padding(start = 16.dp, bottom = 5.dp), fontSize = 12.sp
+      )
+    }
+    Surface(color = if (isSystemInDarkTheme()) GroupDark else MaterialTheme.colors.background) {
+      Column(Modifier.padding(horizontal = 6.dp).fillMaxWidth()) { content() }
+    }
+  }
+}
+
+@Composable
+fun SectionItemView(click: (() -> Unit)? = null, height: Dp = 46.dp, disabled: Boolean = false, content: (@Composable () -> Unit)) {
+  val modifier = Modifier
+    .padding(horizontal = 8.dp)
+    .fillMaxWidth()
+    .height(height)
+  Row(
+    if (click == null || disabled) modifier else modifier.clickable(onClick = click),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    content()
+  }
+}
+
+@Composable
+fun SectionTextFooter(text: String) {
+  Text(
+    text,
+    Modifier.padding(horizontal = 16.dp).padding(top = 5.dp).fillMaxWidth(0.9F),
+    color = HighOrLowlight,
+    fontSize = 12.sp
+  )
+}
+
+@Composable
+fun SectionCustomFooter(content: (@Composable () -> Unit)) {
+  Row(
+    Modifier.padding(horizontal = 16.dp).padding(top = 5.dp)
+  ) {
+    content()
+  }
+}
+
+@Composable
+fun SectionDivider() {
+  Divider(Modifier.padding(horizontal = 8.dp))
+}
+
+@Composable
+fun SectionSpacer() {
+  Spacer(Modifier.height(30.dp))
+}
+
+@Composable
+fun InfoRow(title: String, value: String) {
+  SectionItemView {
+    Row(
+      Modifier.fillMaxWidth(),
+      horizontalArrangement = Arrangement.SpaceBetween,
+      verticalAlignment = Alignment.CenterVertically
+    ) {
+      Text(title)
+      Text(value, color = HighOrLowlight)
+    }
+  }
+}
@@ -29,13 +29,12 @@ fun SimpleButton(text: String, icon: ImageVector,
 }

@Composable
-fun SimpleButtonFrame(click: () -> Unit, content: @Composable () -> Unit) {
+fun SimpleButtonFrame(click: () -> Unit, disabled: Boolean = false, content: @Composable () -> Unit) {
  Surface(shape = RoundedCornerShape(20.dp)) {
+    val modifier = if (disabled) Modifier else Modifier.clickable { click() }
    Row(
      verticalAlignment = Alignment.CenterVertically,
-      modifier = Modifier
-        .clickable { click() }
-        .padding(8.dp)
+      modifier = modifier.padding(8.dp)
    ) { content() }
  }
 }
@@ -27,12 +27,10 @@ import chat.simplex.app.BuildConfig
 import chat.simplex.app.SimplexApp
 import chat.simplex.app.model.CIFile
 import kotlinx.coroutines.*
-import java.io.File
-import java.io.FileOutputStream
+import java.io.*
 import java.text.SimpleDateFormat
 import java.util.*
-import kotlin.math.log2
-import kotlin.math.pow
+import kotlin.math.*

 fun withApi(action: suspend CoroutineScope.() -> Unit): Job = withScope(GlobalScope, action)

@@ -245,7 +243,7 @@ fun getLoadedImage(context: Context, file: CIFile?): Bitmap? {
      val uri = FileProvider.getUriForFile(context, "${BuildConfig.APPLICATION_ID}.provider", File(filePath))
      val parcelFileDescriptor = context.contentResolver.openFileDescriptor(uri, "r")
      val fileDescriptor = parcelFileDescriptor?.fileDescriptor
-      val image = BitmapFactory.decodeFileDescriptor(fileDescriptor)
+      val image = decodeSampledBitmapFromFileDescriptor(fileDescriptor, 1000, 1000)
      parcelFileDescriptor?.close()
      image
    } catch (e: Exception) {
@@ -256,6 +254,39 @@ fun getLoadedImage(context: Context, file: CIFile?): Bitmap? {
  }
 }

+// https://developer.android.com/topic/performance/graphics/load-bitmap#load-bitmap
+private fun decodeSampledBitmapFromFileDescriptor(fileDescriptor: FileDescriptor?, reqWidth: Int, reqHeight: Int): Bitmap {
+  // First decode with inJustDecodeBounds=true to check dimensions
+  return BitmapFactory.Options().run {
+    inJustDecodeBounds = true
+    BitmapFactory.decodeFileDescriptor(fileDescriptor, null, this)
+    // Calculate inSampleSize
+    inSampleSize = calculateInSampleSize(this, reqWidth, reqHeight)
+    // Decode bitmap with inSampleSize set
+    inJustDecodeBounds = false
+
+    BitmapFactory.decodeFileDescriptor(fileDescriptor, null, this)
+  }
+}
+
+private fun calculateInSampleSize(options: BitmapFactory.Options, reqWidth: Int, reqHeight: Int): Int {
+  // Raw height and width of image
+  val (height: Int, width: Int) = options.run { outHeight to outWidth }
+  var inSampleSize = 1
+
+  if (height > reqHeight || width > reqWidth) {
+    val halfHeight: Int = height / 2
+    val halfWidth: Int = width / 2
+    // Calculate the largest inSampleSize value that is a power of 2 and keeps both
+    // height and width larger than the requested height and width.
+    while (halfHeight / inSampleSize >= reqHeight && halfWidth / inSampleSize >= reqWidth) {
+      inSampleSize *= 2
+    }
+  }
+
+  return inSampleSize
+}
+
 fun getFileName(context: Context, uri: Uri): String? {
  return context.contentResolver.query(uri, null, null, null, null)?.use { cursor ->
    val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
@@ -0,0 +1,177 @@
+package chat.simplex.app.views.newchat
+
+import android.graphics.Bitmap
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.ArrowForwardIos
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.focus.FocusRequester
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import chat.simplex.app.R
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.ProfileNameField
+import chat.simplex.app.views.chat.group.AddGroupMembersView
+import chat.simplex.app.views.chatlist.setGroupMembers
+import chat.simplex.app.views.helpers.*
+import chat.simplex.app.views.isValidDisplayName
+import chat.simplex.app.views.onboarding.ReadableText
+import chat.simplex.app.views.usersettings.DeleteImageButton
+import chat.simplex.app.views.usersettings.EditImageButton
+import com.google.accompanist.insets.ProvideWindowInsets
+import com.google.accompanist.insets.navigationBarsWithImePadding
+import kotlinx.coroutines.launch
+
+@Composable
+fun AddGroupView(chatModel: ChatModel, close: () -> Unit) {
+  AddGroupLayout(
+    createGroup = { groupProfile ->
+      withApi {
+        val groupInfo = chatModel.controller.apiNewGroup(groupProfile)
+        if (groupInfo != null) {
+          chatModel.addChat(Chat(chatInfo = ChatInfo.Group(groupInfo), chatItems = listOf()))
+          chatModel.chatItems.clear()
+          chatModel.chatId.value = groupInfo.id
+          setGroupMembers(groupInfo, chatModel)
+          close.invoke()
+          ModalManager.shared.showCustomModal { close ->
+            ModalView(
+              close = close, modifier = Modifier,
+              background = if (isSystemInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
+            ) {
+              AddGroupMembersView(groupInfo, chatModel, close)
+            }
+          }
+        }
+      }
+    },
+    close
+  )
+}
+
+@Composable
+fun AddGroupLayout(createGroup: (GroupProfile) -> Unit, close: () -> Unit) {
+  val bottomSheetModalState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden)
+  val scope = rememberCoroutineScope()
+  val displayName = remember { mutableStateOf("") }
+  val fullName = remember { mutableStateOf("") }
+  val profileImage = remember { mutableStateOf<String?>(null) }
+  val chosenImage = remember { mutableStateOf<Bitmap?>(null) }
+  val focusRequester = remember { FocusRequester() }
+
+  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
+    ModalBottomSheetLayout(
+      scrimColor = Color.Black.copy(alpha = 0.12F),
+      modifier = Modifier.navigationBarsWithImePadding(),
+      sheetContent = {
+        GetImageBottomSheet(
+          chosenImage,
+          onImageChange = { bitmap -> profileImage.value = resizeImageToStrSize(cropToSquare(bitmap), maxDataSize = 12500) },
+          hideBottomSheet = {
+            scope.launch { bottomSheetModalState.hide() }
+          })
+      },
+      sheetState = bottomSheetModalState,
+      sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
+    ) {
+      ModalView(close) {
+        Surface(Modifier.background(MaterialTheme.colors.onBackground).fillMaxSize()) {
+          Column(
+            Modifier
+              .verticalScroll(rememberScrollState())
+              .padding(bottom = 16.dp),
+          ) {
+            Text(
+              stringResource(R.string.create_secret_group_title),
+              style = MaterialTheme.typography.h4,
+              modifier = Modifier.padding(vertical = 5.dp)
+            )
+            ReadableText(R.string.group_is_decentralized)
+            Spacer(Modifier.height(10.dp))
+            Box(
+              Modifier
+                .fillMaxWidth()
+                .padding(bottom = 24.dp),
+              contentAlignment = Alignment.Center
+            ) {
+              Box(contentAlignment = Alignment.TopEnd) {
+                Box(contentAlignment = Alignment.Center) {
+                  ProfileImage(size = 192.dp, image = profileImage.value)
+                  EditImageButton { scope.launch { bottomSheetModalState.show() } }
+                }
+                if (profileImage.value != null) {
+                  DeleteImageButton { profileImage.value = null }
+                }
+              }
+            }
+            Text(
+              stringResource(R.string.group_display_name_field),
+              Modifier.padding(bottom = 3.dp)
+            )
+            ProfileNameField(displayName, focusRequester)
+            val errorText = if (!isValidDisplayName(displayName.value)) stringResource(R.string.display_name_cannot_contain_whitespace) else ""
+            Text(
+              errorText,
+              fontSize = 15.sp,
+              color = MaterialTheme.colors.error
+            )
+            Spacer(Modifier.height(3.dp))
+            Text(
+              stringResource(R.string.group_full_name_field),
+              Modifier.padding(bottom = 5.dp)
+            )
+            ProfileNameField(fullName)
+
+            Spacer(Modifier.height(8.dp))
+            val enabled = displayName.value.isNotEmpty() && isValidDisplayName(displayName.value)
+            if (enabled) {
+              CreateGroupButton(MaterialTheme.colors.primary, Modifier
+                .clickable { createGroup(GroupProfile(displayName.value, fullName.value, profileImage.value)) }
+                .padding(8.dp))
+            } else {
+              CreateGroupButton(HighOrLowlight, Modifier.padding(8.dp))
+            }
+            LaunchedEffect(Unit) {
+              focusRequester.requestFocus()
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+@Composable
+fun CreateGroupButton(color: Color, modifier: Modifier) {
+  Row(
+    Modifier.fillMaxWidth(),
+    horizontalArrangement = Arrangement.End
+  ) {
+    Surface(shape = RoundedCornerShape(20.dp)) {
+      Row(modifier, verticalAlignment = Alignment.CenterVertically) {
+        Text(stringResource(R.string.create_profile_button), style = MaterialTheme.typography.caption, color = color)
+        Icon(Icons.Outlined.ArrowForwardIos, stringResource(R.string.create_profile_button), tint = color)
+      }
+    }
+  }
+}
+
+@Preview
+@Composable
+fun PreviewAddGroupLayout() {
+  SimpleXTheme {
+    AddGroupLayout(
+      createGroup = {},
+      close = {}
+    )
+  }
+}
@@ -1,7 +1,7 @@
 package chat.simplex.app.views.newchat

 import android.Manifest
-import androidx.compose.foundation.clickable
+import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
@@ -48,66 +48,108 @@ fun NewChatSheet(chatModel: ChatModel, newChatCtrl: ScaffoldController) {
    pasteLink = {
      newChatCtrl.collapse()
      ModalManager.shared.showCustomModal { close -> PasteToConnectView(chatModel, close) }
+    },
+    createGroup = {
+      newChatCtrl.collapse()
+      ModalManager.shared.showCustomModal { close -> AddGroupView(chatModel, close) }
    }
  )
 }

@Composable
-fun NewChatSheetLayout(addContact: () -> Unit, scanCode: () -> Unit, pasteLink: () -> Unit) {
-  Column(
-    horizontalAlignment = Alignment.CenterHorizontally
-  ) {
+fun NewChatSheetLayout(
+  addContact: () -> Unit,
+  scanCode: () -> Unit,
+  pasteLink: () -> Unit,
+  createGroup: () -> Unit
+) {
+  Column(horizontalAlignment = Alignment.CenterHorizontally) {
    Text(
-      stringResource(R.string.add_contact_to_start_new_chat),
-      modifier = Modifier.padding(horizontal = 8.dp).padding(top = 32.dp)
+      stringResource(R.string.add_contact_or_create_group),
+      modifier = Modifier.padding(horizontal = 4.dp).padding(top = 20.dp, bottom = 20.dp),
+      style = MaterialTheme.typography.body2
    )
+    val boxModifier = Modifier.fillMaxWidth().height(80.dp).padding(horizontal = 0.dp)
+    Divider(Modifier.padding(horizontal = 8.dp))
+    Box(boxModifier) {
+      ActionRowButton(
+        stringResource(R.string.create_one_time_link),
+        stringResource(R.string.to_share_with_your_contact),
+        Icons.Outlined.AddLink,
+        click = addContact
+      )
+    }
+    Divider(Modifier.padding(horizontal = 8.dp))
+    Box(boxModifier) {
+      ActionRowButton(
+        stringResource(R.string.paste_received_link),
+        stringResource(R.string.paste_received_link_from_clipboard),
+        Icons.Outlined.Article,
+        click = pasteLink
+      )
+    }
+    Divider(Modifier.padding(horizontal = 8.dp))
+    Box(boxModifier) {
+      ActionRowButton(
+        stringResource(R.string.scan_QR_code),
+        stringResource(R.string.in_person_or_in_video_call__bracketed),
+        Icons.Outlined.QrCode,
+        click = scanCode
+      )
+    }
+    Divider(Modifier.padding(horizontal = 8.dp))
+    Box(boxModifier) {
+      ActionRowButton(
+        stringResource(R.string.create_group),
+        stringResource(R.string.only_stored_on_members_devices),
+        icon = Icons.Outlined.Group,
+        click = createGroup
+      )
+    }
+  }
+}
+
+@Composable
+fun ActionRowButton(
+  text: String, comment: String? = null, icon: ImageVector, disabled: Boolean = false,
+  click: () -> Unit = {}
+) {
+  Surface(Modifier.fillMaxSize()) {
    Row(
-      Modifier
-        .fillMaxWidth()
-        .padding(horizontal = 8.dp)
-        .padding(top = 24.dp, bottom = 40.dp),
-      horizontalArrangement = Arrangement.SpaceEvenly
+      Modifier.clickable(onClick = click).size(48.dp).padding(8.dp),
+      verticalAlignment = Alignment.CenterVertically
    ) {
-      Box(
-        Modifier
-          .weight(1F)
-          .fillMaxWidth()) {
-        ActionButton(
-          stringResource(R.string.create_one_time_link),
-          stringResource(R.string.to_share_with_your_contact),
-          Icons.Outlined.AddLink,
-          click = addContact
-        )
-      }
-      Box(
-        Modifier
-          .weight(1F)
-          .fillMaxWidth()) {
-        ActionButton(
-          stringResource(R.string.paste_received_link),
-          stringResource(R.string.paste_received_link_from_clipboard),
-          Icons.Outlined.Article,
-          click = pasteLink
-        )
-      }
-      Box(
-        Modifier
-          .weight(1F)
-          .fillMaxWidth()) {
-        ActionButton(
-          stringResource(R.string.scan_QR_code),
-          stringResource(R.string.in_person_or_in_video_call__bracketed),
-          Icons.Outlined.QrCode,
-          click = scanCode
+      val tint = if (disabled) HighOrLowlight else MaterialTheme.colors.primary
+      Icon(icon, text, tint = tint, modifier = Modifier.size(48.dp).padding(start = 4.dp, end = 16.dp))
+
+      Column {
+        Text(
+          text,
+          textAlign = TextAlign.Center,
+          fontWeight = FontWeight.Bold,
+          color = tint
        )
+
+        if (comment != null) {
+          Text(
+            comment,
+            textAlign = TextAlign.Center,
+            style = MaterialTheme.typography.body2
+          )
+        }
      }
    }
  }
 }

@Composable
-fun ActionButton(text: String?, comment: String?, icon: ImageVector, disabled: Boolean = false,
-                 click: () -> Unit = {}) {
+fun ActionButton(
+  text: String?,
+  comment: String?,
+  icon: ImageVector,
+  disabled: Boolean = false,
+  click: () -> Unit = {}
+) {
  Surface(shape = RoundedCornerShape(18.dp)) {
    Column(
      Modifier
@@ -148,7 +190,8 @@ fun PreviewNewChatSheet() {
    NewChatSheetLayout(
      addContact = {},
      scanCode = {},
-      pasteLink = {}
+      pasteLink = {},
+      createGroup = {}
    )
  }
 }
@@ -30,6 +30,16 @@ fun QRCodeScanner(onBarcode: (String) -> Unit) {
  var lastAnalyzedTimeStamp = 0L
  var contactLink = ""

+  val cameraProviderFuture by produceState<ListenableFuture<ProcessCameraProvider>?>(initialValue = null) {
+    value = ProcessCameraProvider.getInstance(context)
+  }
+
+  DisposableEffect(lifecycleOwner) {
+    onDispose {
+      cameraProviderFuture?.get()?.unbindAll()
+    }
+  }
+
  AndroidView(
    factory = { AndroidViewContext ->
      PreviewView(AndroidViewContext).apply {
@@ -46,14 +56,10 @@ fun QRCodeScanner(onBarcode: (String) -> Unit) {
      .requireLensFacing(CameraSelector.LENS_FACING_BACK)
      .build()
    val cameraExecutor: ExecutorService = Executors.newSingleThreadExecutor()
-    val cameraProviderFuture: ListenableFuture<ProcessCameraProvider> =
-      ProcessCameraProvider.getInstance(context)
-
-    cameraProviderFuture.addListener({
+    cameraProviderFuture?.addListener({
      preview = Preview.Builder().build().also {
        it.setSurfaceProvider(previewView.surfaceProvider)
      }
-      val cameraProvider: ProcessCameraProvider = cameraProviderFuture.get()
      val detector: QrCodeDetector<GrayU8> = FactoryFiducial.qrcode(null, GrayU8::class.java)
      fun getQR(imageProxy: ImageProxy) {
        val currentTimeStamp = System.currentTimeMillis()
@@ -78,8 +84,8 @@ fun QRCodeScanner(onBarcode: (String) -> Unit) {
        .build()
        .also { it.setAnalyzer(cameraExecutor, imageAnalyzer) }
      try {
-        cameraProvider.unbindAll()
-        cameraProvider.bindToLifecycle(lifecycleOwner, cameraSelector, preview, imageAnalysis)
+        cameraProviderFuture?.get()?.unbindAll()
+        cameraProviderFuture?.get()?.bindToLifecycle(lifecycleOwner, cameraSelector, preview, imageAnalysis)
      } catch (e: Exception) {
        Log.d(TAG, "CameraPreview: ${e.localizedMessage}")
      }
@@ -3,6 +3,7 @@ package chat.simplex.app.views.onboarding
 import android.content.res.Configuration
 import androidx.annotation.StringRes
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
@@ -76,7 +77,7 @@ fun SimpleXInfoLayout(
@Composable
 fun SimpleXLogo() {
  Image(
-    painter = painterResource(R.drawable.logo),
+    painter = painterResource(if (isSystemInDarkTheme()) R.drawable.logo_light else R.drawable.logo),
    contentDescription = stringResource(R.string.image_descr_simplex_logo),
    modifier = Modifier
      .padding(vertical = 20.dp)
@@ -0,0 +1,432 @@
+package chat.simplex.app.views.usersettings
+
+import SectionCustomFooter
+import SectionDivider
+import SectionItemView
+import SectionSpacer
+import SectionView
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import chat.simplex.app.R
+import chat.simplex.app.model.*
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.helpers.*
+import java.text.DecimalFormat
+
+@Composable
+fun AdvancedNetworkSettingsView(chatModel: ChatModel) {
+  val currentCfg = remember { mutableStateOf(chatModel.controller.getNetCfg()) }
+  val currentCfgVal = currentCfg.value // used only on initialization
+  val networkTCPConnectTimeout = remember { mutableStateOf(currentCfgVal.tcpConnectTimeout) }
+  val networkTCPTimeout = remember { mutableStateOf(currentCfgVal.tcpTimeout) }
+  val networkSMPPingInterval = remember { mutableStateOf(currentCfgVal.smpPingInterval) }
+  val networkEnableKeepAlive = remember { mutableStateOf(currentCfgVal.enableKeepAlive) }
+  val networkTCPKeepIdle: MutableState<Int>
+  val networkTCPKeepIntvl: MutableState<Int>
+  val networkTCPKeepCnt: MutableState<Int>
+  if (currentCfgVal.tcpKeepAlive != null) {
+    networkTCPKeepIdle = remember { mutableStateOf(currentCfgVal.tcpKeepAlive.keepIdle) }
+    networkTCPKeepIntvl = remember { mutableStateOf(currentCfgVal.tcpKeepAlive.keepIntvl) }
+    networkTCPKeepCnt = remember { mutableStateOf(currentCfgVal.tcpKeepAlive.keepCnt) }
+  } else {
+    networkTCPKeepIdle = remember { mutableStateOf(KeepAliveOpts.defaults.keepIdle) }
+    networkTCPKeepIntvl = remember { mutableStateOf(KeepAliveOpts.defaults.keepIntvl) }
+    networkTCPKeepCnt = remember { mutableStateOf(KeepAliveOpts.defaults.keepCnt) }
+  }
+
+  fun buildCfg(): NetCfg {
+    val socksProxy = currentCfg.value.socksProxy
+    val tcpConnectTimeout = networkTCPConnectTimeout.value
+    val tcpTimeout = networkTCPTimeout.value
+    val smpPingInterval = networkSMPPingInterval.value
+    val enableKeepAlive = networkEnableKeepAlive.value
+    val tcpKeepAlive = if (enableKeepAlive) {
+      val keepIdle = networkTCPKeepIdle.value
+      val keepIntvl = networkTCPKeepIntvl.value
+      val keepCnt = networkTCPKeepCnt.value
+      KeepAliveOpts(keepIdle = keepIdle, keepIntvl = keepIntvl, keepCnt = keepCnt)
+    } else {
+      null
+    }
+    return NetCfg(
+      socksProxy = socksProxy,
+      tcpConnectTimeout = tcpConnectTimeout,
+      tcpTimeout = tcpTimeout,
+      tcpKeepAlive = tcpKeepAlive,
+      smpPingInterval = smpPingInterval
+    )
+  }
+
+  fun updateView(cfg: NetCfg) {
+    networkTCPConnectTimeout.value = cfg.tcpConnectTimeout
+    networkTCPTimeout.value = cfg.tcpTimeout
+    networkSMPPingInterval.value = cfg.smpPingInterval
+    networkEnableKeepAlive.value = cfg.enableKeepAlive
+    if (cfg.tcpKeepAlive != null) {
+      networkTCPKeepIdle.value = cfg.tcpKeepAlive.keepIdle
+      networkTCPKeepIntvl.value = cfg.tcpKeepAlive.keepIntvl
+      networkTCPKeepCnt.value = cfg.tcpKeepAlive.keepCnt
+    } else {
+      networkTCPKeepIdle.value = KeepAliveOpts.defaults.keepIdle
+      networkTCPKeepIntvl.value = KeepAliveOpts.defaults.keepIntvl
+      networkTCPKeepCnt.value = KeepAliveOpts.defaults.keepCnt
+    }
+  }
+
+  fun saveCfg(cfg: NetCfg) {
+    withApi {
+      chatModel.controller.apiSetNetworkConfig(cfg)
+      currentCfg.value = cfg
+      chatModel.controller.setNetCfg(cfg)
+    }
+  }
+
+  fun reset() {
+    val newCfg = if (currentCfg.value.useSocksProxy) NetCfg.proxyDefaults else NetCfg.defaults
+    updateView(newCfg)
+    saveCfg(newCfg)
+  }
+
+  fun updateSettingsDialog(action: () -> Unit) {
+    AlertManager.shared.showAlertMsg(
+      title = generalGetString(R.string.update_network_settings_question),
+      text = generalGetString(R.string.updating_settings_will_reconnect_client_to_all_servers),
+      confirmText = generalGetString(R.string.update_network_settings_confirmation),
+      onConfirm = action
+    )
+  }
+
+  AdvancedNetworkSettingsLayout(
+    networkTCPConnectTimeout,
+    networkTCPTimeout,
+    networkSMPPingInterval,
+    networkEnableKeepAlive,
+    networkTCPKeepIdle,
+    networkTCPKeepIntvl,
+    networkTCPKeepCnt,
+    resetDisabled = if (currentCfg.value.useSocksProxy) currentCfg.value == NetCfg.proxyDefaults else currentCfg.value == NetCfg.defaults,
+    reset = { updateSettingsDialog(::reset) },
+    footerDisabled = buildCfg() == currentCfg.value,
+    revert = { updateView(currentCfg.value) },
+    save = { updateSettingsDialog { saveCfg(buildCfg()) } }
+  )
+}
+
+@Composable fun AdvancedNetworkSettingsLayout(
+  networkTCPConnectTimeout: MutableState<Long>,
+  networkTCPTimeout: MutableState<Long>,
+  networkSMPPingInterval: MutableState<Long>,
+  networkEnableKeepAlive: MutableState<Boolean>,
+  networkTCPKeepIdle: MutableState<Int>,
+  networkTCPKeepIntvl: MutableState<Int>,
+  networkTCPKeepCnt: MutableState<Int>,
+  resetDisabled: Boolean,
+  reset: () -> Unit,
+  footerDisabled: Boolean,
+  revert: () -> Unit,
+  save: () -> Unit
+) {
+  val secondsLabel = stringResource(R.string.network_option_seconds_label)
+
+  Column(
+    Modifier
+      .fillMaxWidth()
+      .verticalScroll(rememberScrollState()),
+    horizontalAlignment = Alignment.Start,
+  ) {
+    Text(
+      stringResource(R.string.network_settings_title),
+      Modifier.padding(start = 16.dp, bottom = 24.dp),
+      style = MaterialTheme.typography.h1
+    )
+    SectionSpacer()
+
+    SectionView {
+      SectionItemView {
+        ResetToDefaultsButton(reset, disabled = resetDisabled)
+      }
+      SectionDivider()
+      SectionItemView {
+        TimeoutSettingRow(
+          stringResource(R.string.network_option_tcp_connection_timeout), networkTCPConnectTimeout,
+          listOf(2_500000, 5_000000, 7_500000, 10_000000, 15_000000, 20_000000), secondsLabel
+        )
+      }
+      SectionDivider()
+      SectionItemView {
+        TimeoutSettingRow(
+          stringResource(R.string.network_option_protocol_timeout), networkTCPTimeout,
+          listOf(1_500000, 3_000000, 5_000000, 7_000000, 10_000000, 15_000000), secondsLabel
+        )
+      }
+      SectionDivider()
+      SectionItemView {
+        TimeoutSettingRow(
+          stringResource(R.string.network_option_ping_interval), networkSMPPingInterval,
+          listOf(120_000000, 300_000000, 600_000000, 1200_000000, 2400_000000), secondsLabel
+        )
+      }
+      SectionDivider()
+      SectionItemView {
+        EnableKeepAliveSwitch(networkEnableKeepAlive)
+      }
+      SectionDivider()
+      if (networkEnableKeepAlive.value) {
+        SectionItemView {
+          IntSettingRow("TCP_KEEPIDLE", networkTCPKeepIdle, listOf(15, 30, 60, 120, 180), secondsLabel)
+        }
+        SectionDivider()
+        SectionItemView {
+          IntSettingRow("TCP_KEEPINTVL", networkTCPKeepIntvl, listOf(5, 10, 15, 30, 60), secondsLabel)
+        }
+        SectionDivider()
+        SectionItemView {
+          IntSettingRow("TCP_KEEPCNT", networkTCPKeepCnt, listOf(1, 2, 4, 6, 8), "")
+        }
+      } else {
+        SectionItemView {
+          Text("TCP_KEEPIDLE", color = HighOrLowlight)
+        }
+        SectionDivider()
+        SectionItemView {
+          Text("TCP_KEEPINTVL", color = HighOrLowlight)
+        }
+        SectionDivider()
+        SectionItemView {
+          Text("TCP_KEEPCNT", color = HighOrLowlight)
+        }
+      }
+    }
+    SectionCustomFooter {
+      SettingsSectionFooter(revert, save, footerDisabled)
+    }
+    SectionSpacer()
+  }
+}
+
+@Composable
+fun ResetToDefaultsButton(reset: () -> Unit, disabled: Boolean) {
+  val modifier = if (disabled) Modifier else Modifier.clickable { reset() }
+  Row(
+    modifier.fillMaxSize(),
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    val color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary
+    Text(stringResource(R.string.network_options_reset_to_defaults), color = color)
+  }
+}
+
+@Composable
+fun EnableKeepAliveSwitch(
+  networkEnableKeepAlive: MutableState<Boolean>
+) {
+  Row(
+    Modifier.fillMaxWidth(),
+    verticalAlignment = Alignment.CenterVertically,
+    horizontalArrangement = Arrangement.SpaceBetween
+  ) {
+    Text(stringResource(R.string.network_option_enable_tcp_keep_alive))
+    Switch(
+      checked = networkEnableKeepAlive.value,
+      onCheckedChange = { networkEnableKeepAlive.value = it },
+      colors = SwitchDefaults.colors(
+        checkedThumbColor = MaterialTheme.colors.primary,
+        uncheckedThumbColor = HighOrLowlight
+      ),
+    )
+  }
+}
+
+@Composable
+fun IntSettingRow(title: String, selection: MutableState<Int>, values: List<Int>, label: String) {
+  Row(
+    Modifier.fillMaxWidth(),
+    verticalAlignment = Alignment.CenterVertically,
+    horizontalArrangement = Arrangement.SpaceBetween
+  ) {
+    var expanded by remember { mutableStateOf(false) }
+
+    Text(title)
+
+    ExposedDropdownMenuBox(
+      expanded = expanded,
+      onExpandedChange = {
+        expanded = !expanded
+      }
+    ) {
+      Row(
+        Modifier.width(140.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.End
+      ) {
+        Text(
+          "${selection.value} $label",
+          maxLines = 1,
+          overflow = TextOverflow.Ellipsis,
+          color = HighOrLowlight
+        )
+        Spacer(Modifier.size(4.dp))
+        Icon(
+          if (!expanded) Icons.Outlined.ExpandMore else Icons.Outlined.ExpandLess,
+          generalGetString(R.string.invite_to_group_button),
+          modifier = Modifier.padding(start = 8.dp),
+          tint = HighOrLowlight
+        )
+      }
+      ExposedDropdownMenu(
+        expanded = expanded,
+        onDismissRequest = {
+          expanded = false
+        }
+      ) {
+        values.forEach { selectionOption ->
+          DropdownMenuItem(
+            onClick = {
+              selection.value = selectionOption
+              expanded = false
+            }
+          ) {
+            Text(
+              "$selectionOption $label",
+              maxLines = 1,
+              overflow = TextOverflow.Ellipsis,
+            )
+          }
+        }
+      }
+    }
+  }
+}
+
+@Composable
+fun TimeoutSettingRow(title: String, selection: MutableState<Long>, values: List<Long>, label: String) {
+  Row(
+    Modifier.fillMaxWidth(),
+    verticalAlignment = Alignment.CenterVertically,
+    horizontalArrangement = Arrangement.SpaceBetween
+  ) {
+    var expanded by remember { mutableStateOf(false) }
+
+    Text(title)
+
+    ExposedDropdownMenuBox(
+      expanded = expanded,
+      onExpandedChange = {
+        expanded = !expanded
+      }
+    ) {
+      val df = DecimalFormat("#.#")
+
+      Row(
+        Modifier.width(140.dp),
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.End
+      ) {
+        Text(
+          "${df.format(selection.value / 1_000_000.toDouble())} $label",
+          maxLines = 1,
+          overflow = TextOverflow.Ellipsis,
+          color = HighOrLowlight
+        )
+        Spacer(Modifier.size(4.dp))
+        Icon(
+          if (!expanded) Icons.Outlined.ExpandMore else Icons.Outlined.ExpandLess,
+          generalGetString(R.string.invite_to_group_button),
+          modifier = Modifier.padding(start = 8.dp),
+          tint = HighOrLowlight
+        )
+      }
+      ExposedDropdownMenu(
+        expanded = expanded,
+        onDismissRequest = {
+          expanded = false
+        }
+      ) {
+        values.forEach { selectionOption ->
+          DropdownMenuItem(
+            onClick = {
+              selection.value = selectionOption
+              expanded = false
+            }
+          ) {
+            Text(
+              "${df.format(selectionOption / 1_000_000.toDouble())} $label",
+              maxLines = 1,
+              overflow = TextOverflow.Ellipsis,
+            )
+          }
+        }
+      }
+    }
+  }
+}
+
+@Composable
+fun SettingsSectionFooter(revert: () -> Unit, save: () -> Unit, disabled: Boolean) {
+  Row(
+    Modifier.fillMaxWidth(),
+    horizontalArrangement = Arrangement.SpaceBetween,
+    verticalAlignment = Alignment.CenterVertically
+  ) {
+    FooterButton(Icons.Outlined.Replay, stringResource(R.string.network_options_revert), revert, disabled)
+    FooterButton(Icons.Outlined.Check, stringResource(R.string.network_options_save), save, disabled)
+  }
+}
+
+@Composable
+fun FooterButton(icon: ImageVector, title: String, action: () -> Unit, disabled: Boolean) {
+  Surface(
+    shape = RoundedCornerShape(20.dp),
+    color = Color.Black.copy(alpha = 0f)
+  ) {
+    val modifier = if (disabled) Modifier else Modifier.clickable { action() }
+    Row(
+      modifier.padding(8.dp),
+      horizontalArrangement = Arrangement.spacedBy(8.dp)
+    ) {
+      Icon(
+        icon,
+        title,
+        tint = if (disabled) HighOrLowlight else MaterialTheme.colors.primary
+      )
+      Text(
+        title,
+        color = if (disabled) HighOrLowlight else MaterialTheme.colors.primary
+      )
+    }
+  }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun PreviewAdvancedNetworkSettingsLayout() {
+  SimpleXTheme {
+    AdvancedNetworkSettingsLayout(
+      networkTCPConnectTimeout = remember { mutableStateOf(10_000000) },
+      networkTCPTimeout = remember { mutableStateOf(10_000000) },
+      networkSMPPingInterval = remember { mutableStateOf(10_000000) },
+      networkEnableKeepAlive = remember { mutableStateOf(true) },
+      networkTCPKeepIdle = remember { mutableStateOf(10) },
+      networkTCPKeepIntvl = remember { mutableStateOf(10) },
+      networkTCPKeepCnt = remember { mutableStateOf(10) },
+      resetDisabled = false,
+      reset = {},
+      footerDisabled = false,
+      revert = {},
+      save = {}
+    )
+  }
+}
@@ -0,0 +1,118 @@
+package chat.simplex.app.views.usersettings
+
+import SectionView
+import android.content.ComponentName
+import android.content.pm.PackageManager
+import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT
+import android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+import androidx.compose.foundation.*
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.material.*
+import androidx.compose.material.MaterialTheme.colors
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.core.content.ContextCompat
+import androidx.core.graphics.drawable.toBitmap
+import chat.simplex.app.*
+import chat.simplex.app.R
+import chat.simplex.app.ui.theme.*
+
+enum class AppIcon(val resId: Int) {
+  DEFAULT(R.mipmap.icon),
+  DARK_BLUE(R.mipmap.icon_dark_blue),
+}
+
+@Composable
+fun AppearanceView() {
+  val appIcon = remember { mutableStateOf(findEnabledIcon()) }
+
+  fun setAppIcon(newIcon: AppIcon) {
+    if (appIcon.value == newIcon) return
+    val newComponent = ComponentName(BuildConfig.APPLICATION_ID, "chat.simplex.app.MainActivity_${newIcon.name.lowercase()}")
+    val oldComponent = ComponentName(BuildConfig.APPLICATION_ID, "chat.simplex.app.MainActivity_${appIcon.value.name.lowercase()}")
+    SimplexApp.context.packageManager.setComponentEnabledSetting(
+      newComponent,
+      COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP
+    )
+
+    SimplexApp.context.packageManager.setComponentEnabledSetting(
+      oldComponent,
+      PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP
+    )
+
+    appIcon.value = newIcon
+  }
+
+  AppearanceLayout(
+    appIcon,
+    changeIcon = ::setAppIcon
+  )
+}
+
+@Composable fun AppearanceLayout(
+  icon: MutableState<AppIcon>,
+  changeIcon: (AppIcon) -> Unit
+) {
+  Column(
+    Modifier.fillMaxWidth(),
+    horizontalAlignment = Alignment.Start,
+    verticalArrangement = Arrangement.spacedBy(8.dp)
+  ) {
+    Text(
+      stringResource(R.string.appearance_settings),
+      Modifier.padding(start = 16.dp, bottom = 24.dp),
+      style = MaterialTheme.typography.h1
+    )
+    SectionView(stringResource(R.string.settings_section_title_icon)) {
+      LazyRow(
+        Modifier
+          .padding(horizontal = 8.dp)
+      ) {
+        items(AppIcon.values().size, { index -> AppIcon.values()[index] }) { index ->
+          val item = AppIcon.values()[index]
+          val mipmap = ContextCompat.getDrawable(LocalContext.current, item.resId)!!
+          Image(
+            bitmap = mipmap.toBitmap().asImageBitmap(),
+            contentDescription = "",
+            contentScale = ContentScale.Fit,
+            modifier = Modifier
+              .shadow(if (item == icon.value) 1.dp else 0.dp, ambientColor = colors.secondary)
+              .size(70.dp)
+              .clickable { changeIcon(item) }
+              .padding(10.dp)
+          )
+
+          if (index + 1 != AppIcon.values().size) {
+            Spacer(Modifier.padding(horizontal = 4.dp))
+          }
+        }
+      }
+    }
+  }
+}
+
+private fun findEnabledIcon(): AppIcon = AppIcon.values().first { icon ->
+  SimplexApp.context.packageManager.getComponentEnabledSetting(
+    ComponentName(BuildConfig.APPLICATION_ID, "chat.simplex.app.MainActivity_${icon.name.lowercase()}")
+  ).let { it == COMPONENT_ENABLED_STATE_DEFAULT || it == COMPONENT_ENABLED_STATE_ENABLED }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun PreviewAppearanceSettings() {
+  SimpleXTheme {
+    AppearanceLayout(
+      icon = remember { mutableStateOf(AppIcon.DARK_BLUE) },
+      changeIcon = {}
+    )
+  }
+}
@@ -1,5 +1,8 @@
 package chat.simplex.app.views.usersettings

+import SectionDivider
+import SectionItemView
+import SectionView
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
@@ -29,18 +32,17 @@ fun CallSettingsLayout(
    horizontalAlignment = Alignment.Start,
    verticalArrangement = Arrangement.spacedBy(8.dp)
  ) {
-    @Composable fun divider() = Divider(Modifier.padding(horizontal = 8.dp))
    val lockCallState = remember { mutableStateOf(callOnLockScreen.get()) }
    Text(
      stringResource(R.string.your_calls),
      Modifier.padding(start = 16.dp, bottom = 24.dp),
      style = MaterialTheme.typography.h1
    )
-    SettingsSectionView(stringResource(R.string.settings_section_title_settings)) {
-      Box(Modifier.padding(start = 10.dp)) {
+    SectionView(stringResource(R.string.settings_section_title_settings)) {
+      SectionItemView() {
        SharedPreferenceToggle(stringResource(R.string.connect_calls_via_relay), webrtcPolicyRelay)
      }
-      divider()
+      SectionDivider()

      Column(Modifier.padding(start = 10.dp, top = 12.dp)) {
        Text(stringResource(R.string.call_on_lock_screen))
@@ -75,8 +77,7 @@ fun SharedPreferenceToggle(
      colors = SwitchDefaults.colors(
        checkedThumbColor = MaterialTheme.colors.primary,
        uncheckedThumbColor = HighOrLowlight
-      ),
-      modifier = Modifier.padding(end = 6.dp)
+      )
    )
  }
 }
@@ -1,5 +1,6 @@
 package chat.simplex.app.views.usersettings

+import SectionView
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
@@ -25,7 +26,7 @@ fun ExperimentalFeaturesView(chatModel: ChatModel, enableCalls: MutableState<Boo
      style = MaterialTheme.typography.h1,
      modifier = Modifier.padding(start = 16.dp, bottom = 24.dp)
    )
-    SettingsSectionView("") {
+    SectionView("") {
      SettingsPreferenceItem(Icons.Outlined.Videocam, stringResource(R.string.settings_audio_video_calls), chatModel.controller.appPrefs.experimentalCalls, enableCalls)
    }
  }
@@ -0,0 +1,144 @@
+package chat.simplex.app.views.usersettings
+
+import SectionDivider
+import SectionItemView
+import SectionView
+import androidx.compose.foundation.layout.*
+import androidx.compose.material.*
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import chat.simplex.app.R
+import chat.simplex.app.model.ChatModel
+import chat.simplex.app.model.NetCfg
+import chat.simplex.app.ui.theme.*
+import chat.simplex.app.views.helpers.*
+
+@Composable
+fun NetworkAndServersView(
+  chatModel: ChatModel,
+  showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
+  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit)
+) {
+  val netCfg: MutableState<NetCfg> = remember { mutableStateOf(chatModel.controller.getNetCfg()) }
+  val networkUseSocksProxy: MutableState<Boolean> = remember { mutableStateOf(netCfg.value.useSocksProxy) }
+  val developerTools = chatModel.controller.appPrefs.developerTools.get()
+
+  NetworkAndServersLayout(
+    developerTools = developerTools,
+    networkUseSocksProxy = networkUseSocksProxy,
+    showModal = showModal,
+    showSettingsModal = showSettingsModal,
+        toggleSocksProxy = { enable ->
+      if (enable) {
+        AlertManager.shared.showAlertMsg(
+          title = generalGetString(R.string.network_enable_socks),
+          text = generalGetString(R.string.network_enable_socks_info),
+          confirmText = generalGetString(R.string.confirm_verb),
+          onConfirm = {
+            withApi {
+              chatModel.controller.apiSetNetworkConfig(NetCfg.proxyDefaults)
+              chatModel.controller.setNetCfg(NetCfg.proxyDefaults)
+              networkUseSocksProxy.value = true
+            }
+          }
+        )
+      } else {
+        AlertManager.shared.showAlertMsg(
+          title = generalGetString(R.string.network_disable_socks),
+          text = generalGetString(R.string.network_disable_socks_info),
+          confirmText = generalGetString(R.string.confirm_verb),
+          onConfirm = {
+            withApi {
+              chatModel.controller.apiSetNetworkConfig(NetCfg.defaults)
+              chatModel.controller.setNetCfg(NetCfg.defaults)
+              networkUseSocksProxy.value = false
+            }
+          }
+        )
+      }
+    }
+  )
+}
+
+@Composable fun NetworkAndServersLayout(
+  developerTools: Boolean,
+  networkUseSocksProxy: MutableState<Boolean>,
+  showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
+  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
+  toggleSocksProxy: (Boolean) -> Unit
+) {
+  Column(
+    Modifier.fillMaxWidth(),
+    horizontalAlignment = Alignment.Start,
+    verticalArrangement = Arrangement.spacedBy(8.dp)
+  ) {
+    Text(
+      stringResource(R.string.network_and_servers),
+      Modifier.padding(start = 16.dp, bottom = 24.dp),
+      style = MaterialTheme.typography.h1
+    )
+    SectionView {
+      SettingsActionItem(Icons.Outlined.Dns, stringResource(R.string.smp_servers), showModal { SMPServersView(it) })
+      SectionDivider()
+      SectionItemView {
+        UseSocksProxySwitch(networkUseSocksProxy, toggleSocksProxy)
+      }
+      if (developerTools) {
+        SectionDivider()
+        SettingsActionItem(Icons.Outlined.Cable, stringResource(R.string.network_settings), showSettingsModal { AdvancedNetworkSettingsView(it) })
+      }
+    }
+  }
+}
+
+@Composable
+fun UseSocksProxySwitch(
+  networkUseSocksProxy: MutableState<Boolean>,
+  toggleSocksProxy: (Boolean) -> Unit
+) {
+  Row(
+    Modifier.fillMaxWidth(),
+    verticalAlignment = Alignment.CenterVertically,
+    horizontalArrangement = Arrangement.SpaceBetween
+  ) {
+    Row(
+      verticalAlignment = Alignment.CenterVertically,
+      horizontalArrangement = Arrangement.spacedBy(8.dp)
+    ) {
+      Icon(
+        Icons.Outlined.SettingsEthernet,
+        stringResource(R.string.network_socks_toggle),
+        tint = HighOrLowlight
+      )
+      Text(stringResource(R.string.network_socks_toggle))
+    }
+    Switch(
+      checked = networkUseSocksProxy.value,
+      onCheckedChange = toggleSocksProxy,
+      colors = SwitchDefaults.colors(
+        checkedThumbColor = MaterialTheme.colors.primary,
+        uncheckedThumbColor = HighOrLowlight
+      ),
+    )
+  }
+}
+
+@Preview(showBackground = true)
+@Composable
+fun PreviewNetworkAndServersLayout() {
+  SimpleXTheme {
+    NetworkAndServersLayout(
+      developerTools = true,
+      networkUseSocksProxy = remember { mutableStateOf(true) },
+      showModal = { {} },
+      showSettingsModal = { {} },
+      toggleSocksProxy = {}
+    )
+  }
+}
@@ -1,5 +1,8 @@
 package chat.simplex.app.views.usersettings

+import SectionDivider
+import SectionSpacer
+import SectionView
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
@@ -15,7 +18,6 @@ import chat.simplex.app.model.ChatModel

@Composable
 fun PrivacySettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
-  @Composable fun divider() = Divider(Modifier.padding(horizontal = 8.dp))
  Column(
    Modifier.fillMaxWidth(),
    horizontalAlignment = Alignment.Start
@@ -25,14 +27,14 @@ fun PrivacySettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
      style = MaterialTheme.typography.h1,
      modifier = Modifier.padding(start = 16.dp, bottom = 24.dp)
    )
-    SettingsSectionView(stringResource(R.string.settings_section_title_device)) {
+    SectionView(stringResource(R.string.settings_section_title_device)) {
      ChatLockItem(chatModel.performLA, setPerformLA)
    }
-    Spacer(Modifier.height(30.dp))
+    SectionSpacer()

-    SettingsSectionView(stringResource(R.string.settings_section_title_chats)) {
+    SectionView(stringResource(R.string.settings_section_title_chats)) {
      SettingsPreferenceItem(Icons.Outlined.Image, stringResource(R.string.auto_accept_images), chatModel.controller.appPrefs.privacyAcceptImages)
-      divider()
+      SectionDivider()
      SettingsPreferenceItem(Icons.Outlined.TravelExplore, stringResource(R.string.send_link_previews), chatModel.controller.appPrefs.privacyLinkPreviews)
    }
  }
@@ -1,10 +1,15 @@
 package chat.simplex.app.views.usersettings

+import SectionDivider
+import SectionItemView
+import SectionSpacer
+import SectionView
 import android.content.res.Configuration
 import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Report
 import androidx.compose.material.icons.outlined.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
@@ -18,17 +23,19 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.*
-import chat.simplex.app.BuildConfig
+import chat.simplex.app.*
 import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.*
 import chat.simplex.app.views.TerminalView
+import chat.simplex.app.views.database.DatabaseView
 import chat.simplex.app.views.helpers.*
 import chat.simplex.app.views.onboarding.SimpleXInfo

@Composable
 fun SettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
  val user = chatModel.currentUser.value
+  val stopped = chatModel.chatRunning.value == false

  fun setRunServiceInBackground(on: Boolean) {
    chatModel.controller.appPrefs.runServiceInBackground.set(on)
@@ -37,15 +44,17 @@ fun SettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
    }
    chatModel.controller.showBackgroundServiceNoticeIfNeeded()
    chatModel.runServiceInBackground.value = on
+    SimplexService.StartReceiver.toggleReceiver(on)
  }

  if (user != null) {
    SettingsLayout(
      profile = user.profile,
+      stopped,
      runServiceInBackground = chatModel.runServiceInBackground,
+      developerTools = chatModel.controller.appPrefs.developerTools,
      setRunServiceInBackground = ::setRunServiceInBackground,
      setPerformLA = setPerformLA,
-      enableCalls = remember { mutableStateOf(chatModel.controller.appPrefs.experimentalCalls.get()) },
      showModal = { modalView -> { ModalManager.shared.showModal { modalView(chatModel) } } },
      showSettingsModal = { modalView -> { ModalManager.shared.showCustomModal { close ->
        ModalView(close = close, modifier = Modifier,
@@ -54,7 +63,19 @@ fun SettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
        }
      } } },
      showCustomModal = { modalView -> { ModalManager.shared.showCustomModal { close -> modalView(chatModel, close) } } },
-      showTerminal = { ModalManager.shared.showCustomModal { close -> TerminalView(chatModel, close) } }
+      showTerminal = { ModalManager.shared.showCustomModal { close -> TerminalView(chatModel, close) } },
+      showAppearance = {
+        withApi {
+          ModalManager.shared.showCustomModal { close ->
+            ModalView(
+              close = close, modifier = Modifier,
+              background = if (isSystemInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight
+            ) {
+              AppearanceView()
+            }
+          }
+        }
+      }
 //      showVideoChatPrototype = { ModalManager.shared.showCustomModal { close -> CallViewDebug(close) } },
    )
  }
@@ -63,17 +84,29 @@ fun SettingsView(chatModel: ChatModel, setPerformLA: (Boolean) -> Unit) {
 val simplexTeamUri =
  "simplex:/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D"

+// TODO pass close
+//fun showSectionedModal(chatModel: ChatModel, modalView: (@Composable (ChatModel) -> Unit)) {
+//  ModalManager.shared.showCustomModal { close ->
+//    ModalView(close = close, modifier = Modifier,
+//      background = if (isSystemInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight) {
+//      modalView(chatModel)
+//    }
+//  }
+//}
+
@Composable
 fun SettingsLayout(
  profile: Profile,
+  stopped: Boolean,
  runServiceInBackground: MutableState<Boolean>,
+  developerTools: Preference<Boolean>,
  setRunServiceInBackground: (Boolean) -> Unit,
  setPerformLA: (Boolean) -> Unit,
-  enableCalls: MutableState<Boolean>,
  showModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
  showCustomModal: (@Composable (ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
  showTerminal: () -> Unit,
+  showAppearance: () -> Unit
 //  showVideoChatPrototype: () -> Unit
 ) {
  val uriHandler = LocalUriHandler.current
@@ -84,78 +117,98 @@ fun SettingsLayout(
        .background(if (isSystemInDarkTheme()) MaterialTheme.colors.background else SettingsBackgroundLight)
        .padding(top = 16.dp)
    ) {
-      @Composable fun divider() = Divider(Modifier.padding(horizontal = 8.dp))
-      @Composable fun spacer() = Spacer(Modifier.height(30.dp))
      Text(
        stringResource(R.string.your_settings),
        style = MaterialTheme.typography.h1,
        modifier = Modifier.padding(start = 16.dp)
      )
-      Spacer(Modifier.height(30.dp))
+      SectionSpacer()

-      SettingsSectionView(stringResource(R.string.settings_section_title_you)) {
-        SettingsItemView(showCustomModal { chatModel, close -> UserProfileView(chatModel, close) }, 80.dp) {
-          ProfilePreview(profile)
+      SectionView(stringResource(R.string.settings_section_title_you)) {
+        SectionItemView(showCustomModal { chatModel, close -> UserProfileView(chatModel, close) }, 80.dp, disabled = stopped) {
+          ProfilePreview(profile, stopped = stopped)
        }
-        divider()
-        SettingsActionItem(Icons.Outlined.QrCode, stringResource(R.string.your_simplex_contact_address), showModal { UserAddressView(it) })
+        SectionDivider()
+        SettingsActionItem(Icons.Outlined.QrCode, stringResource(R.string.your_simplex_contact_address), showModal { UserAddressView(it) }, disabled = stopped)
+        SectionDivider()
+        DatabaseItem(showSettingsModal { DatabaseView(it, showSettingsModal) }, stopped)
      }
-      spacer()
+      SectionSpacer()

-      SettingsSectionView(stringResource(R.string.settings_section_title_settings)) {
-        if (enableCalls.value) {
-          SettingsActionItem(Icons.Outlined.Videocam, stringResource(R.string.settings_audio_video_calls), showSettingsModal { CallSettingsView(it) })
-          divider()
-        }
-        SettingsActionItem(Icons.Outlined.Lock, stringResource(R.string.privacy_and_security), showSettingsModal { PrivacySettingsView(it, setPerformLA) })
-        divider()
-        PrivateNotificationsItem(runServiceInBackground, setRunServiceInBackground)
-        divider()
-        SettingsActionItem(Icons.Outlined.Dns, stringResource(R.string.smp_servers), showModal { SMPServersView(it) })
+      SectionView(stringResource(R.string.settings_section_title_settings)) {
+        PrivateNotificationsItem(runServiceInBackground, setRunServiceInBackground, stopped)
+        SectionDivider()
+        SettingsActionItem(Icons.Outlined.Videocam, stringResource(R.string.settings_audio_video_calls), showSettingsModal { CallSettingsView(it) }, disabled = stopped)
+        SectionDivider()
+        SettingsActionItem(Icons.Outlined.Lock, stringResource(R.string.privacy_and_security), showSettingsModal { PrivacySettingsView(it, setPerformLA) }, disabled = stopped)
+        SectionDivider()
+        SettingsActionItem(Icons.Outlined.LightMode, stringResource(R.string.appearance_settings), showAppearance, disabled = stopped)
+        SectionDivider()
+        SettingsActionItem(Icons.Outlined.WifiTethering, stringResource(R.string.network_and_servers), showSettingsModal { NetworkAndServersView(it, showModal, showSettingsModal) }, disabled = stopped)
      }
-      spacer()
+      SectionSpacer()

-      SettingsSectionView(stringResource(R.string.settings_section_title_help)) {
-        SettingsActionItem(Icons.Outlined.HelpOutline, stringResource(R.string.how_to_use_simplex_chat), showModal { HelpView(it) })
-        divider()
+      SectionView(stringResource(R.string.settings_section_title_help)) {
+        SettingsActionItem(Icons.Outlined.HelpOutline, stringResource(R.string.how_to_use_simplex_chat), showModal { HelpView(it) }, disabled = stopped)
+        SectionDivider()
        SettingsActionItem(Icons.Outlined.Info, stringResource(R.string.about_simplex_chat), showModal { SimpleXInfo(it, onboarding = false) })
-        divider()
+        SectionDivider()
        SettingsActionItem(Icons.Outlined.TextFormat, stringResource(R.string.markdown_in_messages), showModal { MarkdownHelpView() })
-        divider()
-        SettingsActionItem(Icons.Outlined.Tag, stringResource(R.string.chat_with_the_founder), { uriHandler.openUri(simplexTeamUri) }, textColor = MaterialTheme.colors.primary)
-        divider()
+        SectionDivider()
+        SettingsActionItem(Icons.Outlined.Tag, stringResource(R.string.chat_with_the_founder), { uriHandler.openUri(simplexTeamUri) }, textColor = MaterialTheme.colors.primary, disabled = stopped)
+        SectionDivider()
        SettingsActionItem(Icons.Outlined.Email, stringResource(R.string.send_us_an_email), { uriHandler.openUri("mailto:chat@simplex.chat") }, textColor = MaterialTheme.colors.primary)
      }
-      spacer()
+      SectionSpacer()

-      SettingsSectionView(stringResource(R.string.settings_section_title_develop)) {
-        ChatConsoleItem(showTerminal)
-        divider()
+      SectionView(stringResource(R.string.settings_section_title_develop)) {
+        ChatConsoleItem(showTerminal, stopped)
+        SectionDivider()
+        SettingsPreferenceItem(Icons.Outlined.Construction, stringResource(R.string.settings_developer_tools), developerTools)
+        SectionDivider()
        InstallTerminalAppItem(uriHandler)
-        divider()
-        SettingsActionItem(Icons.Outlined.Science, stringResource(R.string.settings_experimental_features), showSettingsModal { ExperimentalFeaturesView(it, enableCalls) })
-        divider()
+        SectionDivider()
+//        SettingsActionItem(Icons.Outlined.Science, stringResource(R.string.settings_experimental_features), showSettingsModal { ExperimentalFeaturesView(it, enableCalls) })
+//        SectionDivider()
        AppVersionItem()
      }
    }
  }
 }

-@Composable fun SettingsSectionView(title: String, content: (@Composable () -> Unit)) {
-  Column {
-    Text(title, color = HighOrLowlight, style = MaterialTheme.typography.body2,
-      modifier = Modifier.padding(start = 16.dp, bottom = 5.dp), fontSize = 12.sp)
-    Surface(color = if (isSystemInDarkTheme()) GroupDark else MaterialTheme.colors.background) {
-      Column(Modifier.padding(horizontal = 6.dp)) { content() }
+@Composable private fun DatabaseItem(openDatabaseView: () -> Unit, stopped: Boolean) {
+  SectionItemView(openDatabaseView) {
+    Row(
+      Modifier.fillMaxWidth(),
+      horizontalArrangement = Arrangement.SpaceBetween
+    ) {
+      Row {
+        Icon(
+          Icons.Outlined.Archive,
+          contentDescription = stringResource(R.string.database_export_and_import),
+          tint = HighOrLowlight,
+        )
+        Spacer(Modifier.padding(horizontal = 4.dp))
+        Text(stringResource(R.string.database_export_and_import))
+      }
+      if (stopped) {
+        Icon(
+          Icons.Filled.Report,
+          contentDescription = stringResource(R.string.chat_is_stopped),
+          tint = Color.Red,
+          modifier = Modifier.padding(end = 6.dp)
+        )
+      }
    }
  }
 }

@Composable private fun PrivateNotificationsItem(
  runServiceInBackground: MutableState<Boolean>,
-  setRunServiceInBackground: (Boolean) -> Unit
+  setRunServiceInBackground: (Boolean) -> Unit,
+  stopped: Boolean
 ) {
-  SettingsItemView() {
+  SectionItemView(disabled = stopped) {
    Row(verticalAlignment = Alignment.CenterVertically) {
      Icon(
        Icons.Outlined.Bolt,
@@ -168,7 +221,8 @@ fun SettingsLayout(
        Modifier
          .padding(end = 24.dp)
          .fillMaxWidth()
-          .weight(1f)
+          .weight(1f),
+        color = if (stopped) HighOrLowlight else Color.Unspecified
      )
      Switch(
        checked = runServiceInBackground.value,
@@ -177,14 +231,15 @@ fun SettingsLayout(
          checkedThumbColor = MaterialTheme.colors.primary,
          uncheckedThumbColor = HighOrLowlight
        ),
-        modifier = Modifier.padding(end = 6.dp)
+        modifier = Modifier.padding(end = 6.dp),
+        enabled = !stopped
      )
    }
  }
 }

@Composable fun ChatLockItem(performLA: MutableState<Boolean>, setPerformLA: (Boolean) -> Unit) {
-  SettingsItemView() {
+  SectionItemView() {
    Row(verticalAlignment = Alignment.CenterVertically) {
      Icon(
        Icons.Outlined.Lock,
@@ -204,27 +259,29 @@ fun SettingsLayout(
        colors = SwitchDefaults.colors(
          checkedThumbColor = MaterialTheme.colors.primary,
          uncheckedThumbColor = HighOrLowlight
-        ),
-        modifier = Modifier.padding(end = 6.dp)
+        )
      )
    }
  }
 }

-@Composable private fun ChatConsoleItem(showTerminal: () -> Unit) {
-  SettingsItemView(showTerminal) {
+@Composable private fun ChatConsoleItem(showTerminal: () -> Unit, stopped: Boolean) {
+  SectionItemView(showTerminal, disabled = stopped) {
    Icon(
      painter = painterResource(id = R.drawable.ic_outline_terminal),
      contentDescription = stringResource(R.string.chat_console),
      tint = HighOrLowlight,
    )
    Spacer(Modifier.padding(horizontal = 4.dp))
-    Text(stringResource(R.string.chat_console))
+    Text(
+      stringResource(R.string.chat_console),
+      color = if (stopped) HighOrLowlight else Color.Unspecified
+    )
  }
 }

@Composable private fun InstallTerminalAppItem(uriHandler: UriHandler) {
-  SettingsItemView({ uriHandler.openUri("https://github.com/simplex-chat/simplex-chat") }) {
+  SectionItemView({ uriHandler.openUri("https://github.com/simplex-chat/simplex-chat") }) {
    Icon(
      painter = painterResource(id = R.drawable.ic_github),
      contentDescription = "GitHub",
@@ -236,12 +293,12 @@ fun SettingsLayout(
 }

@Composable private fun AppVersionItem() {
-  SettingsItemView() {
+  SectionItemView() {
    Text("v${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
  }
 }

-@Composable fun ProfilePreview(profileOf: NamedChat, size: Dp = 60.dp, color: Color = MaterialTheme.colors.secondary) {
+@Composable fun ProfilePreview(profileOf: NamedChat, size: Dp = 60.dp, color: Color = MaterialTheme.colors.secondary, stopped: Boolean = false) {
  ProfileImage(size = size, image = profileOf.image, color = color)
  Spacer(Modifier.padding(horizontal = 4.dp))
  Column {
@@ -249,37 +306,27 @@ fun SettingsLayout(
      profileOf.displayName,
      style = MaterialTheme.typography.caption,
      fontWeight = FontWeight.Bold,
+      color = if (stopped) HighOrLowlight else Color.Unspecified
+    )
+    Text(
+      profileOf.fullName,
+      color = if (stopped) HighOrLowlight else Color.Unspecified
    )
-    Text(profileOf.fullName)
  }
 }

@Composable
-fun SettingsItemView(click: (() -> Unit)? = null, height: Dp = 46.dp, content: (@Composable () -> Unit)) {
-  val modifier = Modifier
-    .padding(start = 8.dp)
-    .fillMaxWidth()
-    .height(height)
-  Row(
-    if (click == null) modifier else modifier.clickable(onClick = click),
-    verticalAlignment = Alignment.CenterVertically
-  ) {
-    content()
-  }
-}
-
-@Composable
-fun SettingsActionItem(icon: ImageVector, text: String, click: (() -> Unit)? = null, textColor: Color = Color.Unspecified) {
-  SettingsItemView(click) {
+fun SettingsActionItem(icon: ImageVector, text: String, click: (() -> Unit)? = null, textColor: Color = Color.Unspecified, disabled: Boolean = false) {
+  SectionItemView(click, disabled = disabled) {
    Icon(icon, text, tint = HighOrLowlight)
    Spacer(Modifier.padding(horizontal = 4.dp))
-    Text(text, color = textColor)
+    Text(text, color = if (disabled) HighOrLowlight else textColor)
  }
 }

@Composable
 fun SettingsPreferenceItem(icon: ImageVector, text: String, pref: Preference<Boolean>, prefState: MutableState<Boolean>? = null) {
-  SettingsItemView() {
+  SectionItemView() {
    Row(verticalAlignment = Alignment.CenterVertically) {
      Icon(icon, text, tint = HighOrLowlight)
      Spacer(Modifier.padding(horizontal = 4.dp))
@@ -299,14 +346,16 @@ fun PreviewSettingsLayout() {
  SimpleXTheme {
    SettingsLayout(
      profile = Profile.sampleData,
+      stopped = false,
      runServiceInBackground = remember { mutableStateOf(true) },
+      developerTools = Preference({ false }, {}),
      setRunServiceInBackground = {},
      setPerformLA = {},
-      enableCalls = remember { mutableStateOf(true) },
      showModal = { {} },
      showSettingsModal = { {} },
      showCustomModal = { {} },
      showTerminal = {},
+      showAppearance = {},
 //      showVideoChatPrototype = {}
    )
  }
@@ -200,7 +200,7 @@ fun UserProfileLayout(
 }

@Composable
-private fun ProfileNameTextField(name: MutableState<String>) {
+fun ProfileNameTextField(name: MutableState<String>) {
  BasicTextField(
    value = name.value,
    onValueChange = { name.value = it },
@@ -218,7 +218,7 @@ private fun ProfileNameTextField(name: MutableState<String>) {
 }

@Composable
-private fun ProfileNameRow(label: String, text: String) {
+fun ProfileNameRow(label: String, text: String) {
  Row(Modifier.padding(bottom = 24.dp)) {
    Text(
      label,
@@ -234,7 +234,7 @@ private fun ProfileNameRow(label: String, text: String) {
 }

@Composable
-private fun TextButton(text: String, click: () -> Unit) {
+fun TextButton(text: String, click: () -> Unit) {
  Text(
    text,
    color = MaterialTheme.colors.primary,
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
+    <background android:drawable="@color/icon_background"/>
    <foreground android:drawable="@mipmap/icon_foreground"/>
-</adaptive-icon>
+</adaptive-icon>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/icon_dark_blue_background"/>
+    <foreground android:drawable="@mipmap/icon_dark_blue_foreground"/>
+</adaptive-icon>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/icon_dark_blue_background"/>
+    <foreground android:drawable="@mipmap/icon_dark_blue_foreground"/>
+</adaptive-icon>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/white"/>
-    <foreground android:drawable="@color/white"/>
-</adaptive-icon>
+    <background android:drawable="@color/icon_background"/>
+    <foreground android:drawable="@mipmap/icon_foreground"/>
+</adaptive-icon>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/icon_background"/>
+    <foreground android:drawable="@mipmap/icon_dark_blue_round"/>
+</adaptive-icon>
--- a/Show More
+++ b/Show More