android <= 11

android: prevent WebView from changing audio device when toggling mic
2024-12-17 17:20:21 +01:00 · 2024-10-11 16:53:54 +07:00 · 2024-10-11 16:27:49 +07:00
262 changed files with 3304 additions and 7463 deletions
@@ -29,7 +29,7 @@ RUN cp ./scripts/cabal.project.local.linux ./cabal.project.local

 # Compile simplex-chat
 RUN cabal update
-RUN cabal build exe:simplex-chat --constraint 'simplexmq +client_library'
+RUN cabal build exe:simplex-chat

 # Strip the binary from debug symbols to reduce size
 RUN bin=$(find /project/dist-newstyle -name "simplex-chat" -type f -executable) && \
@@ -25,9 +25,7 @@ While SimpleX Chat Ltd is not a communication service provider, and provide publ

 We see users and data sovereignty, and device and provider portability as critically important properties for any communication system.

-The implementation security assessment of SimpleX cryptography and networking was done in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2 – see [the announcement](/blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
-
-The cryptographic review of SimpleX protocols design was done in July 2024 by Trail of Bits – see [the announcement](/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.md).
+SimpleX Chat security assessment was done in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2 – see [the announcement](/blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).

 ### Your information

@@ -174,4 +172,4 @@ You accept the Conditions of Use of Software and Infrastructure ("Conditions") b

 **Ending these conditions**. You may end these Conditions with SimpleX Chat Ltd at any time by deleting our Applications from your devices and discontinuing use of our Infrastructure. The provisions related to Licenses, Disclaimers, Limitation of Liability, Resolving dispute, Availability, Changes to the conditions, Enforcing the conditions, and Ending these conditions will survive termination of your relationship with SimpleX Chat Ltd.

-Updated October 14, 2024
+Updated April 24, 2024
@@ -233,12 +233,14 @@ You can use SimpleX with your own servers and still communicate with people usin

 Recent and important updates:

-[Oct 14, 2024. SimpleX network: security review of protocols design by Trail of Bits, v6.1 released with better calls and user experience.](./blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.md)
-
 [Aug 14, 2024. SimpleX network: the investment from Jack Dorsey and Asymmetric, v6.0 released with the new user experience and private message routing](./blog/20240814-simplex-chat-vision-funding-v6-private-routing-new-user-experience.md)

 [Jun 4, 2024. SimpleX network: private message routing, v5.8 released with IP address protection and chat themes](./blog/20240604-simplex-chat-v5.8-private-message-routing-chat-themes.md)

+[Apr 26, 2024. SimpleX network: legally binding transparency, v5.7 released with better calls and messages.](./blog/20240426-simplex-legally-binding-transparency-v5-7-better-user-experience.md)
+
+[Mar 23, 2024. SimpleX network: real privacy and stable profits, non-profits for protocols, v5.6 released with quantum resistant e2e encryption and simple profile migration.](./blog/20240323-simplex-network-privacy-non-profit-v5-6-quantum-resistant-e2e-encryption-simple-migration.md)
+
 [Mar 14, 2024. SimpleX Chat v5.6 beta: adding quantum resistance to Signal double ratchet algorithm.](./blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md)

 [Jan 24, 2024. SimpleX Chat: free infrastructure from Linode, v5.5 released with private notes, group history and a simpler UX to connect.](./blog/20240124-simplex-chat-infrastructure-costs-v5-5-simplex-ux-private-notes-group-history.md)
@@ -247,6 +249,10 @@ Recent and important updates:

 [Sep 25, 2023. SimpleX Chat v5.3 released: desktop app, local file encryption, improved groups and directory service](./blog/20230925-simplex-chat-v5-3-desktop-app-local-file-encryption-directory-service.md).

+[Jul 22, 2023. SimpleX Chat: v5.2 released with message delivery receipts](./blog/20230722-simplex-chat-v5-2-message-delivery-receipts.md).
+
+[May 23, 2023. SimpleX Chat: v5.1 released with message reactions and self-destruct passcode](./blog/20230523-simplex-chat-v5-1-message-reactions-self-destruct-passcode.md).
+
 [Apr 22, 2023. SimpleX Chat: vision and funding, v5.0 released with videos and files up to 1gb](./blog/20230422-simplex-chat-vision-funding-v5-videos-files-passcode.md).

 [Mar 1, 2023. SimpleX File Transfer Protocol – send large files efficiently, privately and securely, soon to be integrated into SimpleX Chat apps.](./blog/20230301-simplex-file-transfer-protocol.md).
@@ -403,9 +409,7 @@ Please also join [#simplex-devs](https://simplex.chat/contact#/?v=1-2&smp=smp%3A

 [SimpleX protocols and security model](https://github.com/simplex-chat/simplexmq/blob/master/protocol/overview-tjr.md) was reviewed, and had many breaking changes and improvements in v1.0.0.

-The implementation security assessment of SimpleX cryptography and networking was done in October 2022 by [Trail of Bits](https://www.trailofbits.com/about) – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).
-
-The cryptographic review of SimpleX protocols was done in July 2024 by Trail of Bits – see [the announcement](./blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.md).
+The security audit was performed in October 2022 by [Trail of Bits](https://www.trailofbits.com/about), and most fixes were released in v4.2.0 – see [the announcement](./blog/20221108-simplex-chat-v4.2-security-audit-new-website.md).

 SimpleX Chat is still a relatively early stage platform (the mobile apps were released in March 2022), so you may discover some bugs and missing features. We would really appreciate if you let us know anything that needs to be fixed or improved.

@@ -13,7 +13,6 @@ struct ContentView: View {
    @EnvironmentObject var chatModel: ChatModel
    @ObservedObject var alertManager = AlertManager.shared
    @ObservedObject var callController = CallController.shared
-    @ObservedObject var appSheetState = AppSheetState.shared
    @Environment(\.colorScheme) var colorScheme
    @EnvironmentObject var theme: AppTheme
    @EnvironmentObject var sceneDelegate: SceneDelegate
@@ -251,8 +250,7 @@ struct ContentView: View {

    private func mainView() -> some View {
        ZStack(alignment: .top) {
-            ChatListView(activeUserPickerSheet: $chatListUserPickerSheet)
-                .redacted(reason: appSheetState.redactionReasons(protectScreen))
+            ChatListView(activeUserPickerSheet: $chatListUserPickerSheet).privacySensitive(protectScreen)
            .onAppear {
                requestNtfAuthorization()
                // Local Authentication notice is to be shown on next start after onboarding is complete
@@ -147,7 +147,6 @@ final class ChatModel: ObservableObject {
    @Published var chatDbEncrypted: Bool?
    @Published var chatDbStatus: DBMigrationResult?
    @Published var ctrlInitInProgress: Bool = false
-    @Published var notificationResponse: UNNotificationResponse?
    // local authentication
    @Published var contentViewAccessAuthenticated: Bool = false
    @Published var laRequest: LocalAuthRequest?
@@ -29,33 +29,17 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
    private var granted = false
    private var prevNtfTime: Dictionary<ChatId, Date> = [:]

-    override init() {
-        super.init()
-        UNUserNotificationCenter.current().delegate = self
-    }
-
    // Handle notification when app is in background
    func userNotificationCenter(_ center: UNUserNotificationCenter,
                                didReceive response: UNNotificationResponse,
                                withCompletionHandler handler: () -> Void) {
        logger.debug("NtfManager.userNotificationCenter: didReceive")
-        if appStateGroupDefault.get() == .active {
-            processNotificationResponse(response)
-        } else {
-            logger.debug("NtfManager.userNotificationCenter: remember response in model")
-            ChatModel.shared.notificationResponse = response
-        }
-        handler()
-    }
-
-    func processNotificationResponse(_ ntfResponse: UNNotificationResponse) {
+        let content = response.notification.request.content
        let chatModel = ChatModel.shared
-        let content = ntfResponse.notification.request.content
-        let action = ntfResponse.actionIdentifier
-        logger.debug("NtfManager.processNotificationResponse: didReceive: action \(action), categoryIdentifier \(content.categoryIdentifier)")
+        let action = response.actionIdentifier
+        logger.debug("NtfManager.userNotificationCenter: didReceive: action \(action), categoryIdentifier \(content.categoryIdentifier)")
        if let userId = content.userInfo["userId"] as? Int64,
           userId != chatModel.currentUser?.userId {
-            logger.debug("NtfManager.processNotificationResponse changeActiveUser")
            changeActiveUser(userId, viewPwd: nil)
        }
        if content.categoryIdentifier == ntfCategoryContactRequest && (action == ntfActionAcceptContact || action == ntfActionAcceptContactIncognito),
@@ -77,6 +61,7 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                ItemsModel.shared.loadOpenChat(chatId)
            }
        }
+        handler()
    }

    private func ntfCallAction(_ content: UNNotificationContent, _ action: String) -> (ChatId, NtfCallAction)? {
@@ -91,6 +76,7 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
        return nil
    }

+
    // Handle notification when the app is in foreground
    func userNotificationCenter(_ center: UNUserNotificationCenter,
                                willPresent notification: UNNotification,
@@ -199,12 +185,6 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                actions: [],
                intentIdentifiers: [],
                hiddenPreviewsBodyPlaceholder: NSLocalizedString("SimpleX encrypted message or connection event", comment: "notification")
-            ),
-            UNNotificationCategory(
-                identifier: ntfCategoryManyEvents,
-                actions: [],
-                intentIdentifiers: [],
-                hiddenPreviewsBodyPlaceholder: NSLocalizedString("New events", comment: "notification")
            )
        ])
    }
@@ -230,28 +210,29 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                }
            }
        }
+        center.delegate = self
    }

    func notifyContactRequest(_ user: any UserLike, _ contactRequest: UserContactRequest) {
        logger.debug("NtfManager.notifyContactRequest")
-        addNotification(createContactRequestNtf(user, contactRequest, 0))
+        addNotification(createContactRequestNtf(user, contactRequest))
    }

    func notifyContactConnected(_ user: any UserLike, _ contact: Contact) {
        logger.debug("NtfManager.notifyContactConnected")
-        addNotification(createContactConnectedNtf(user, contact, 0))
+        addNotification(createContactConnectedNtf(user, contact))
    }

    func notifyMessageReceived(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem) {
        logger.debug("NtfManager.notifyMessageReceived")
        if cInfo.ntfsEnabled {
-            addNotification(createMessageReceivedNtf(user, cInfo, cItem, 0))
+            addNotification(createMessageReceivedNtf(user, cInfo, cItem))
        }
    }

    func notifyCallInvitation(_ invitation: RcvCallInvitation) {
        logger.debug("NtfManager.notifyCallInvitation")
-        addNotification(createCallInvitationNtf(invitation, 0))
+        addNotification(createCallInvitationNtf(invitation))
    }

    func setNtfBadgeCount(_ count: Int) {
@@ -462,7 +462,7 @@ func apiGetNtfToken() -> (DeviceToken?, NtfTknStatus?, NotificationsMode, String
    let r = chatSendCmdSync(.apiGetNtfToken)
    switch r {
    case let .ntfToken(token, status, ntfMode, ntfServer): return (token, status, ntfMode, ntfServer)
-    case .chatCmdError(_, .errorAgent(.CMD(.PROHIBITED, _))): return (nil, nil, .off, nil)
+    case .chatCmdError(_, .errorAgent(.CMD(.PROHIBITED))): return (nil, nil, .off, nil)
    default:
        logger.debug("apiGetNtfToken response: \(String(describing: r))")
        return (nil, nil, .off, nil)
@@ -743,12 +743,6 @@ func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, Pendi
            message: "Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.\nTo connect, please ask your contact to create another connection link and check that you have a stable network connection."
        )
        return (nil, alert)
-    case .chatCmdError(_, .errorAgent(.SMP(_, .QUOTA))):
-        let alert = mkAlert(
-            title: "Undelivered messages",
-            message: "The connection reached the limit of undelivered messages, your contact may be offline."
-        )
-        return (nil, alert)
    case let .chatCmdError(_, .errorAgent(.INTERNAL(internalErr))):
        if internalErr == "SEUniqueID" {
            let alert = mkAlert(
@@ -82,17 +82,11 @@ struct SimpleXApp: App {

                        if appState != .stopped {
                            startChatAndActivate {
-                                if chatModel.chatRunning == true {
-                                    if let ntfResponse = chatModel.notificationResponse {
-                                        chatModel.notificationResponse = nil
-                                        NtfManager.shared.processNotificationResponse(ntfResponse)
-                                    }
-                                    if appState.inactive {
-                                        Task {
-                                            await updateChats()
-                                            if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
-                                                await updateCallInvitations()
-                                            }
+                                if appState.inactive && chatModel.chatRunning == true {
+                                    Task {
+                                        await updateChats()
+                                        if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
+                                            await updateCallInvitations()
                                        }
                                    }
                                }
@@ -11,11 +11,11 @@ import SimpleXChat

 struct CIChatFeatureView: View {
    @EnvironmentObject var m: ChatModel
-    @Environment(\.revealed) var revealed: Bool
    @ObservedObject var im = ItemsModel.shared
    @ObservedObject var chat: Chat
    @EnvironmentObject var theme: AppTheme
    var chatItem: ChatItem
+    @Binding var revealed: Bool
    var feature: Feature
    var icon: String? = nil
    var iconColor: Color
@@ -106,9 +106,6 @@ struct CIChatFeatureView: View {
 struct CIChatFeatureView_Previews: PreviewProvider {
    static var previews: some View {
        let enabled = FeatureEnabled(forUser: false, forContact: false)
-        CIChatFeatureView(
-            chat: Chat.sampleData,
-            chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor(.secondary)
-        ).environment(\.revealed, true)
+        CIChatFeatureView(chat: Chat.sampleData, chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), revealed: Binding.constant(true), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor(.secondary))
    }
 }
@@ -285,18 +285,17 @@ struct CIFileView_Previews: PreviewProvider {
            file: nil
        )
        Group {
-            ChatItemView(chat: Chat.sampleData, chatItem: sentFile)
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample())
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus: .rcvInvitation))
-            ChatItemView(chat: Chat.sampleData, chatItem: fileChatItemWtFile)
+            ChatItemView(chat: Chat.sampleData, chatItem: sentFile, revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileName: "some_long_file_name_here", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvAccepted), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileStatus: .rcvCancelled), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(fileSize: 1_000_000_000, fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Hello there", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getFileMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.", fileStatus: .rcvInvitation), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: fileChatItemWtFile, revealed: Binding.constant(false))
        }
-        .environment(\.revealed, false)
        .previewLayout(.fixed(width: 360, height: 360))
    }
 }
@@ -510,10 +510,10 @@ struct CIVoiceView_Previews: PreviewProvider {
                duration: 30,
                allowMenu: Binding.constant(true)
            )
-            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, allowMenu: .constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(), allowMenu: .constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), allowMenu: .constant(true))
-            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWtFile, allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, revealed: Binding.constant(false), allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(), revealed: Binding.constant(false), allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false), allowMenu: .constant(true))
+            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWtFile, revealed: Binding.constant(false), allowMenu: .constant(true))
        }
        .previewLayout(.fixed(width: 360, height: 360))
    }
@@ -92,13 +92,12 @@ struct FramedCIVoiceView_Previews: PreviewProvider {
            file: CIFile.getSample(fileStatus: .sndComplete)
        )
        Group {
-            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage)
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there", fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."))
-            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWithQuote)
+            ChatItemView(chat: Chat.sampleData, chatItem: sentVoiceMessage, revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Hello there", fileStatus: .rcvTransfer(rcvProgress: 7, rcvTotal: 10)), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getVoiceMsgContentSample(text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: voiceMessageWithQuote, revealed: Binding.constant(false))
        }
-        .environment(\.revealed, false)
        .previewLayout(.fixed(width: 360, height: 360))
    }
 }
@@ -12,9 +12,9 @@ import SimpleXChat
 struct MarkedDeletedItemView: View {
    @EnvironmentObject var m: ChatModel
    @EnvironmentObject var theme: AppTheme
-    @Environment(\.revealed) var revealed: Bool
    @ObservedObject var chat: Chat
    var chatItem: ChatItem
+    @Binding var revealed: Bool

    var body: some View {
        (Text(mergedMarkedDeletedText).italic() + Text(" ") + chatItem.timestampText)
@@ -79,10 +79,7 @@ struct MarkedDeletedItemView: View {
 struct MarkedDeletedItemView_Previews: PreviewProvider {
    static var previews: some View {
        Group {
-            MarkedDeletedItemView(
-                chat: Chat.sampleData,
-                chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now))
-            ).environment(\.revealed, true)
+            MarkedDeletedItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(true))
        }
        .previewLayout(.fixed(width: 360, height: 200))
    }
@@ -14,28 +14,19 @@ extension EnvironmentValues {
        static let defaultValue: Bool = true
    }

-    struct Revealed: EnvironmentKey {
-        static let defaultValue: Bool = true
-    }
-
    var showTimestamp: Bool {
        get { self[ShowTimestamp.self] }
        set { self[ShowTimestamp.self] = newValue }
    }
-
-    var revealed: Bool {
-        get { self[Revealed.self] }
-        set { self[Revealed.self] = newValue }
-    }
 }

 struct ChatItemView: View {
    @ObservedObject var chat: Chat
    @EnvironmentObject var theme: AppTheme
    @Environment(\.showTimestamp) var showTimestamp: Bool
-    @Environment(\.revealed) var revealed: Bool
    var chatItem: ChatItem
    var maxWidth: CGFloat = .infinity
+    @Binding var revealed: Bool
    @Binding var allowMenu: Bool

    init(
@@ -43,25 +34,27 @@ struct ChatItemView: View {
        chatItem: ChatItem,
        showMember: Bool = false,
        maxWidth: CGFloat = .infinity,
+        revealed: Binding<Bool>,
        allowMenu: Binding<Bool> = .constant(false)
    ) {
        self.chat = chat
        self.chatItem = chatItem
        self.maxWidth = maxWidth
+        _revealed = revealed
        _allowMenu = allowMenu
    }

    var body: some View {
        let ci = chatItem
        if chatItem.meta.itemDeleted != nil && (!revealed || chatItem.isDeletedContent) {
-            MarkedDeletedItemView(chat: chat, chatItem: chatItem)
+            MarkedDeletedItemView(chat: chat, chatItem: chatItem, revealed: $revealed)
        } else if ci.quotedItem == nil && ci.meta.itemForwarded == nil && ci.meta.itemDeleted == nil && !ci.meta.isLive {
            if let mc = ci.content.msgContent, mc.isText && isShortEmoji(ci.content.text) {
                EmojiItemView(chat: chat, chatItem: ci)
            } else if ci.content.text.isEmpty, case let .voice(_, duration) = ci.content.msgContent {
                CIVoiceView(chat: chat, chatItem: ci, recordingFile: ci.file, duration: duration, allowMenu: $allowMenu)
            } else if ci.content.msgContent == nil {
-                ChatItemContentView(chat: chat, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
+                ChatItemContentView(chat: chat, chatItem: chatItem, revealed: $revealed, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
            } else {
                framedItemView()
            }
@@ -91,6 +84,7 @@ struct ChatItemView: View {
            chat: chat,
            chatItem: chatItem,
            preview: preview,
+            revealed: $revealed,
            maxWidth: maxWidth,
            imgWidth: adjustedMaxWidth,
            videoWidth: adjustedMaxWidth,
@@ -102,9 +96,9 @@ struct ChatItemView: View {
 struct ChatItemContentView<Content: View>: View {
    @EnvironmentObject var chatModel: ChatModel
    @EnvironmentObject var theme: AppTheme
-    @Environment(\.revealed) var revealed: Bool
    @ObservedObject var chat: Chat
    var chatItem: ChatItem
+    @Binding var revealed: Bool
    var msgContentView: () -> Content
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false

@@ -136,7 +130,7 @@ struct ChatItemContentView<Content: View>: View {
        case let .rcvChatPreference(feature, allowed, param):
            CIFeaturePreferenceView(chat: chat, chatItem: chatItem, feature: feature, allowed: allowed, param: param)
        case let .sndChatPreference(feature, _, _):
-            CIChatFeatureView(chat: chat, chatItem: chatItem, feature: feature, icon: feature.icon, iconColor: theme.colors.secondary)
+            CIChatFeatureView(chat: chat, chatItem: chatItem, revealed: $revealed, feature: feature, icon: feature.icon, iconColor: theme.colors.secondary)
        case let .rcvGroupFeature(feature, preference, _, role): chatFeatureView(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor(theme.colors.secondary))
        case let .sndGroupFeature(feature, preference, _, role): chatFeatureView(feature, preference.enabled(role, for: chat.chatInfo.groupInfo?.membership).iconColor(theme.colors.secondary))
        case let .rcvChatFeatureRejected(feature): chatFeatureView(feature, .red)
@@ -183,7 +177,7 @@ struct ChatItemContentView<Content: View>: View {
    }

    private func chatFeatureView(_ feature: Feature, _ iconColor: Color) -> some View {
-        CIChatFeatureView(chat: chat, chatItem: chatItem, feature: feature, iconColor: iconColor)
+        CIChatFeatureView(chat: chat, chatItem: chatItem, revealed: $revealed, feature: feature, iconColor: iconColor)
    }

    private var mergedGroupEventText: Text? {
@@ -244,17 +238,16 @@ func chatEventText(_ ci: ChatItem, _ secondaryColor: Color) -> Text {
 struct ChatItemView_Previews: PreviewProvider {
    static var previews: some View {
        Group{
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample())
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)))
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true)).environment(\.revealed, true)
-            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true)).environment(\.revealed, true)
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "hello there too"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(2, .directRcv, .now, "🙂🙂🙂🙂🙂🙂"), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getDeletedContentSample(), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now)), revealed: Binding.constant(false))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "🙂", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
+            ChatItemView(chat: Chat.sampleData, chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemLive: true), revealed: Binding.constant(true))
        }
-        .environment(\.revealed, false)
        .previewLayout(.fixed(width: 360, height: 70))
        .environmentObject(Chat.sampleData)
    }
@@ -272,7 +265,8 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                    content: .rcvIntegrityError(msgError: .msgSkipped(fromMsgId: 1, toMsgId: 2)),
                    quotedItem: nil,
                    file: nil
-                )
+                ),
+                revealed: Binding.constant(true)
            )
            ChatItemView(
                chat: Chat.sampleData,
@@ -282,7 +276,8 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                    content: .rcvDecryptionError(msgDecryptError: .ratchetHeader, msgCount: 2),
                    quotedItem: nil,
                    file: nil
-                )
+                ),
+                revealed: Binding.constant(true)
            )
            ChatItemView(
                chat: Chat.sampleData,
@@ -292,7 +287,8 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                    content: .rcvGroupInvitation(groupInvitation: CIGroupInvitation.getSample(status: .pending), memberRole: .admin),
                    quotedItem: nil,
                    file: nil
-                )
+                ),
+                revealed: Binding.constant(true)
            )
            ChatItemView(
                chat: Chat.sampleData,
@@ -302,7 +298,8 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                    content: .rcvGroupEvent(rcvGroupEvent: .memberAdded(groupMemberId: 1, profile: Profile.sampleData)),
                    quotedItem: nil,
                    file: nil
-                )
+                ),
+                revealed: Binding.constant(true)
            )
            ChatItemView(
                chat: Chat.sampleData,
@@ -312,10 +309,10 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                    content: ciFeatureContent,
                    quotedItem: nil,
                    file: nil
-                )
+                ),
+                revealed: Binding.constant(true)
            )
        }
-        .environment(\.revealed, true)
        .previewLayout(.fixed(width: 360, height: 70))
        .environmentObject(Chat.sampleData)
    }
@@ -1183,11 +1183,11 @@ struct ChatView: View {
                    chat: chat,
                    chatItem: ci,
                    maxWidth: maxWidth,
+                    revealed: .constant(revealed),
                    allowMenu: $allowMenu
                )
-                .environment(\.revealed, revealed)
                .environment(\.showTimestamp, itemSeparation.timestamp)
-                .modifier(ChatItemClipped(ci, tailVisible: itemSeparation.largeGap && (ci.meta.itemDeleted == nil || revealed)))
+                .modifier(ChatItemClipped(ci, tailVisible: itemSeparation.largeGap))
                .contextMenu { menu(ci, range, live: composeState.liveMessage != nil) }
                .accessibilityLabel("")
                if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {
@@ -287,8 +287,8 @@ struct ComposeView: View {
    // this is a workaround to fire an explicit event in certain cases
    @State private var stopPlayback: Bool = false

-    @UserDefault(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
-    @UserDefault(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial
+    @AppStorage(DEFAULT_PRIVACY_SAVE_LAST_DRAFT) private var saveLastDraft = true
+    @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial

    var body: some View {
        VStack(spacing: 0) {
@@ -40,7 +40,7 @@ struct SendMessageView: View {
    @State private var showCustomTimePicker = false
    @State private var selectedDisappearingMessageTime: Int? = customDisappearingMessageTimeDefault.get()
    @State private var progressByTimeout = false
-    @UserDefault(DEFAULT_LIVE_MESSAGE_ALERT_SHOWN) private var liveMessageAlertShown = false
+    @AppStorage(DEFAULT_LIVE_MESSAGE_ALERT_SHOWN) private var liveMessageAlertShown = false

    var body: some View {
        ZStack {
@@ -78,7 +78,7 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
            self.dataSource = UITableViewDiffableDataSource<Section, ChatItem>(
                tableView: tableView
            ) { (tableView, indexPath, item) -> UITableViewCell? in
-                if indexPath.item > self.itemCount - 8 {
+                if indexPath.item > self.itemCount - 8, self.itemCount > 8 {
                    self.representer.loadPage()
                }
                let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseId, for: indexPath)
@@ -121,11 +121,9 @@ struct ChatListView: View {
                UserPicker(userPickerShown: $userPickerShown, activeSheet: $activeUserPickerSheet)
            }
        )
-        .appSheet(
-            item: $activeUserPickerSheet,
-            onDismiss: { chatModel.laRequest = nil },
-            content: { UserPickerSheetView(sheet: $0) }
-        )
+        .sheet(item: $activeUserPickerSheet) {
+            UserPickerSheetView(sheet: $0)
+        }
        .onChange(of: activeUserPickerSheet) {
            if $0 != nil {
                DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
@@ -11,12 +11,6 @@ import SwiftUI
 class AppSheetState: ObservableObject {
    static let shared = AppSheetState()
    @Published var scenePhaseActive: Bool = false
-
-    func redactionReasons(_ protectScreen: Bool) -> RedactionReasons {
-        !protectScreen || scenePhaseActive
-        ? RedactionReasons()
-        : RedactionReasons.placeholder
-    }
 }

 private struct PrivacySensitive: ViewModifier {
@@ -25,7 +19,11 @@ private struct PrivacySensitive: ViewModifier {
    @ObservedObject var appSheetState: AppSheetState = AppSheetState.shared

    func body(content: Content) -> some View {
-        content.redacted(reason: appSheetState.redactionReasons(protectScreen))
+        if !protectScreen {
+            content
+        } else {
+            content.privacySensitive(!appSheetState.scenePhaseActive).redacted(reason: .privacy)
+        }
    }
 }

@@ -36,7 +36,12 @@ struct ChatItemClipped: ViewModifier {
                    .sndMsgContent,
                    .rcvMsgContent,
                    .rcvDecryptionError,
+                    .sndDeleted,
+                    .rcvDeleted,
                    .rcvIntegrityError,
+                    .sndModerated,
+                    .rcvModerated,
+                    .rcvBlocked,
                    .invalidJSON:
                let tail = if let mc = ci.content.msgContent, mc.isImageOrVideo && mc.text.isEmpty {
                    false
@@ -16,7 +16,6 @@ struct UserWallpaperEditor: View {
    @State var themeModeOverride: ThemeModeOverride
    @State var applyToMode: DefaultThemeMode?
    @State var showMore: Bool = false
-    @State var showFileImporter: Bool = false
    @Binding var globalThemeUsed: Bool
    var save: (DefaultThemeMode?, ThemeModeOverride?) async -> Void

@@ -126,27 +125,24 @@ struct UserWallpaperEditor: View {

                CustomizeThemeColorsSection(editColor: { name in editColor(name, theme) })

-                ImportExportThemeSection(showFileImporter: $showFileImporter, perChat: nil, perUser: ChatModel.shared.currentUser?.uiThemes)
+                ImportExportThemeSection(perChat: nil, perUser: ChatModel.shared.currentUser?.uiThemes) { imported in
+                    let importedFromString = imported.wallpaper?.importFromString()
+                    let importedType = importedFromString?.toAppWallpaper().type
+                    let currentTheme = ThemeManager.currentColors(nil, nil, nil, themeOverridesDefault.get())
+                    let type: WallpaperType? = if importedType?.sameType(currentTheme.wallpaper.type) == true { nil } else { importedType }
+                    let colors = ThemeManager.currentThemeOverridesForExport(type, nil, nil).colors
+                    let res = ThemeModeOverride(mode: imported.base.mode, colors: imported.colors, wallpaper: importedFromString).removeSameColors(imported.base, colorsToCompare: colors)
+                    Task {
+                        await MainActor.run {
+                            themeModeOverride = res
+                        }
+                        await save(applyToMode, res)
+                    }
+                }
            } else {
                AdvancedSettingsButton(theme.colors.primary) { showMore = true }
            }
        }
-        .modifier(
-            ThemeImporter(isPresented: $showFileImporter) { imported in
-                let importedFromString = imported.wallpaper?.importFromString()
-                let importedType = importedFromString?.toAppWallpaper().type
-                let currentTheme = ThemeManager.currentColors(nil, nil, nil, themeOverridesDefault.get())
-                let type: WallpaperType? = if importedType?.sameType(currentTheme.wallpaper.type) == true { nil } else { importedType }
-                let colors = ThemeManager.currentThemeOverridesForExport(type, nil, nil).colors
-                let res = ThemeModeOverride(mode: imported.base.mode, colors: imported.colors, wallpaper: importedFromString).removeSameColors(imported.base, colorsToCompare: colors)
-                Task {
-                    await MainActor.run {
-                        themeModeOverride = res
-                    }
-                    await save(applyToMode, res)
-                }
-            }
-        )
    }

    private func onTypeCopyFromSameTheme(_ type: WallpaperType?) -> Bool {
@@ -220,7 +216,6 @@ struct ChatWallpaperEditor: View {
    @State var themeModeOverride: ThemeModeOverride
    @State var applyToMode: DefaultThemeMode?
    @State var showMore: Bool = false
-    @State var showFileImporter: Bool = false
    @Binding var globalThemeUsed: Bool
    var save: (DefaultThemeMode?, ThemeModeOverride?) async -> Void

@@ -333,27 +328,24 @@ struct ChatWallpaperEditor: View {

                CustomizeThemeColorsSection(editColor: editColor)

-                ImportExportThemeSection(showFileImporter: $showFileImporter, perChat: themeModeOverride, perUser: ChatModel.shared.currentUser?.uiThemes)
+                ImportExportThemeSection(perChat: themeModeOverride, perUser: ChatModel.shared.currentUser?.uiThemes) { imported in
+                    let importedFromString = imported.wallpaper?.importFromString()
+                    let importedType = importedFromString?.toAppWallpaper().type
+                    let currentTheme = ThemeManager.currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
+                    let type: WallpaperType? = if importedType?.sameType(currentTheme.wallpaper.type) == true { nil } else { importedType }
+                    let colors = ThemeManager.currentThemeOverridesForExport(type, nil, ChatModel.shared.currentUser?.uiThemes).colors
+                    let res = ThemeModeOverride(mode: imported.base.mode, colors: imported.colors, wallpaper: importedFromString).removeSameColors(imported.base, colorsToCompare: colors)
+                    Task {
+                        await MainActor.run {
+                            themeModeOverride = res
+                        }
+                        await save(applyToMode, res)
+                    }
+                }
            } else {
                AdvancedSettingsButton(theme.colors.primary) { showMore = true }
            }
        }
-        .modifier(
-            ThemeImporter(isPresented: $showFileImporter) { imported in
-                let importedFromString = imported.wallpaper?.importFromString()
-                let importedType = importedFromString?.toAppWallpaper().type
-                let currentTheme = ThemeManager.currentColors(nil, nil, ChatModel.shared.currentUser?.uiThemes, themeOverridesDefault.get())
-                let type: WallpaperType? = if importedType?.sameType(currentTheme.wallpaper.type) == true { nil } else { importedType }
-                let colors = ThemeManager.currentThemeOverridesForExport(type, nil, ChatModel.shared.currentUser?.uiThemes).colors
-                let res = ThemeModeOverride(mode: imported.base.mode, colors: imported.colors, wallpaper: importedFromString).removeSameColors(imported.base, colorsToCompare: colors)
-                Task {
-                    await MainActor.run {
-                        themeModeOverride = res
-                    }
-                    await save(applyToMode, res)
-                }
-            }
-        )
    }

    private func onTypeCopyFromSameTheme(_ type: WallpaperType?) -> Bool {
@@ -1,62 +0,0 @@
-//
-//  UserDefault.swift
-//  SimpleX (iOS)
-//
-//  Created by user on 14/10/2024.
-//  Copyright © 2024 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-import Combine
-
-@propertyWrapper
-public struct UserDefault<Value: Equatable>: DynamicProperty {
-    @StateObject private var observer = UserDefaultObserver()
-    let initialValue: Value
-    let key: String
-    let store: UserDefaults
-
-    public init(
-        wrappedValue: Value,
-        _ key: String,
-        store: UserDefaults = .standard
-    ) {
-        self.initialValue = wrappedValue
-        self.key = key
-        self.store = store
-    }
-
-    public var wrappedValue: Value {
-        get {
-            // Observer can only be accessed after the property wrapper is installed in view (runtime exception)
-            observer.subscribe(to: key)
-            return store.object(forKey: key) as? Value ?? initialValue
-        }
-        nonmutating set {
-            store.set(newValue, forKey: key)
-        }
-    }
-}
-
-private class UserDefaultObserver: ObservableObject {
-    private var subscribed = false
-
-    func subscribe(to key: String) {
-        if !subscribed {
-            NotificationCenter.default.addObserver(
-                self,
-                selector: #selector(userDefaultsDidChange),
-                name: UserDefaults.didChangeNotification,
-                object: nil
-            )
-            subscribed = true
-        }
-    }
-
-    @objc
-    private func userDefaultsDidChange(_ notification: Notification) {
-        Task { @MainActor in objectWillChange.send() }
-    }
-
-    deinit { NotificationCenter.default.removeObserver(self) }
-}
@@ -105,12 +105,7 @@ struct TerminalView: View {
            }
        }
        .navigationViewStyle(.stack)
-        .toolbar {
-            // Redaction broken for `.navigationTitle` - using a toolbar item instead.
-            ToolbarItem(placement: .principal) {
-                Text("Chat console").font(.headline)
-            }
-        }
+        .navigationTitle("Chat console")
        .modifier(ThemedBackground())
    }

@@ -367,13 +367,13 @@ struct ChatThemePreview: View {
                let alice = ChatItem.getSample(1, CIDirection.directRcv, Date.now, NSLocalizedString("Good afternoon!", comment: "message preview"))
                let bob = ChatItem.getSample(2, CIDirection.directSnd, Date.now, NSLocalizedString("Good morning!", comment: "message preview"), quotedItem: CIQuote.getSample(alice.id, alice.meta.itemTs, alice.content.text, chatDir: alice.chatDir))
                HStack {
-                    ChatItemView(chat: Chat.sampleData, chatItem: alice)
+                    ChatItemView(chat: Chat.sampleData, chatItem: alice, revealed: Binding.constant(false))
                        .modifier(ChatItemClipped(alice, tailVisible: true))
                    Spacer()
                }
                HStack {
                    Spacer()
-                    ChatItemView(chat: Chat.sampleData, chatItem: bob)
+                    ChatItemView(chat: Chat.sampleData, chatItem: bob, revealed: Binding.constant(false))
                        .modifier(ChatItemClipped(bob, tailVisible: true))
                        .frame(alignment: .trailing)
                }
@@ -583,14 +583,11 @@ struct CustomizeThemeView: View {
                }
            }

-            ImportExportThemeSection(showFileImporter: $showFileImporter, perChat: nil, perUser: nil)
-        }
-        .modifier(
-            ThemeImporter(isPresented: $showFileImporter) { theme in
+            ImportExportThemeSection(perChat: nil, perUser: nil, save: { theme in
                ThemeManager.saveAndApplyThemeOverrides(theme)
                saveThemeToDatabase(nil)
-            }
-        )
+            })
+        }
        /// When changing app theme, user overrides are hidden. User overrides will be returned back after closing Appearance screen, see ThemeDestinationPicker()
        .interactiveDismissDisabled(true)
    }
@@ -598,9 +595,10 @@ struct CustomizeThemeView: View {

 struct ImportExportThemeSection: View {
    @EnvironmentObject var theme: AppTheme
-    @Binding var showFileImporter: Bool
    var perChat: ThemeModeOverride?
    var perUser: ThemeModeOverrides?
+    var save: (ThemeOverrides) -> Void
+    @State private var showFileImporter = false

    var body: some View {
        Section {
@@ -628,47 +626,39 @@ struct ImportExportThemeSection: View {
            } label: {
                Text("Import theme").foregroundColor(theme.colors.primary)
            }
-        }
-    }
-}
-
-struct ThemeImporter: ViewModifier {
-    @Binding var isPresented: Bool
-    var save: (ThemeOverrides) -> Void
-
-    func body(content: Content) -> some View {
-        content.fileImporter(
-            isPresented: $isPresented,
-            allowedContentTypes: [.data/*.plainText*/],
-            allowsMultipleSelection: false
-        ) { result in
-            if case let .success(files) = result, let fileURL = files.first {
-                do {
-                    var fileSize: Int? = nil
-                    if fileURL.startAccessingSecurityScopedResource() {
-                        let resourceValues = try fileURL.resourceValues(forKeys: [.fileSizeKey])
-                        fileSize = resourceValues.fileSize
-                    }
-                    if let fileSize = fileSize,
-                       // Same as Android/desktop
-                       fileSize <= 5_500_000 {
-                        if let string = try? String(contentsOf: fileURL, encoding: .utf8), let theme: ThemeOverrides = decodeYAML("themeId: \(UUID().uuidString)\n" + string) {
-                            save(theme)
-                            logger.error("Saved theme from file")
-                        } else {
-                            logger.error("Error decoding theme file")
+            .fileImporter(
+                isPresented: $showFileImporter,
+                allowedContentTypes: [.data/*.plainText*/],
+                allowsMultipleSelection: false
+            ) { result in
+                if case let .success(files) = result, let fileURL = files.first {
+                    do {
+                        var fileSize: Int? = nil
+                        if fileURL.startAccessingSecurityScopedResource() {
+                            let resourceValues = try fileURL.resourceValues(forKeys: [.fileSizeKey])
+                            fileSize = resourceValues.fileSize
                        }
-                        fileURL.stopAccessingSecurityScopedResource()
-                    } else {
-                        fileURL.stopAccessingSecurityScopedResource()
-                        let prettyMaxFileSize = ByteCountFormatter.string(fromByteCount: 5_500_000, countStyle: .binary)
-                        AlertManager.shared.showAlertMsg(
-                            title: "Large file!",
-                            message: "Currently maximum supported file size is \(prettyMaxFileSize)."
-                        )
+                        if let fileSize = fileSize,
+                           // Same as Android/desktop
+                           fileSize <= 5_500_000 {
+                            if let string = try? String(contentsOf: fileURL, encoding: .utf8), let theme: ThemeOverrides = decodeYAML("themeId: \(UUID().uuidString)\n" + string) {
+                                save(theme)
+                                logger.error("Saved theme from file")
+                            } else {
+                                logger.error("Error decoding theme file")
+                            }
+                            fileURL.stopAccessingSecurityScopedResource()
+                        } else {
+                            fileURL.stopAccessingSecurityScopedResource()
+                            let prettyMaxFileSize = ByteCountFormatter.string(fromByteCount: 5_500_000, countStyle: .binary)
+                            AlertManager.shared.showAlertMsg(
+                                title: "Large file!",
+                                message: "Currently maximum supported file size is \(prettyMaxFileSize)."
+                            )
+                        }
+                    } catch {
+                        logger.error("Appearance fileImporter error \(error.localizedDescription)")
                    }
-                } catch {
-                    logger.error("Appearance fileImporter error \(error.localizedDescription)")
                }
            }
        }
@@ -331,12 +331,7 @@ struct SettingsView: View {
                    chatDatabaseRow()
                    NavigationLink {
                        MigrateFromDevice(showProgressOnSettings: $showProgress)
-                            .toolbar {
-                                // Redaction broken for `.navigationTitle` - using a toolbar item instead.
-                                ToolbarItem(placement: .principal) {
-                                    Text("Migrate device").font(.headline)
-                                }
-                            }
+                            .navigationTitle("Migrate device")
                            .modifier(ThemedBackground(grouped: true))
                            .navigationBarTitleDisplayMode(.large)
                    } label: {
@@ -1087,7 +1087,6 @@
      </trans-unit>
      <trans-unit id="Better calls" xml:space="preserve">
        <source>Better calls</source>
-        <target>Verbesserte Anrufe</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
@@ -1097,7 +1096,6 @@
      </trans-unit>
      <trans-unit id="Better message dates." xml:space="preserve">
        <source>Better message dates.</source>
-        <target>Verbesserte Nachrichten-Datumsinformation</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
@@ -1112,17 +1110,14 @@
      </trans-unit>
      <trans-unit id="Better notifications" xml:space="preserve">
        <source>Better notifications</source>
-        <target>Verbesserte Benachrichtigungen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better security ✅" xml:space="preserve">
        <source>Better security ✅</source>
-        <target>Verbesserte Sicherheit ✅</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better user experience" xml:space="preserve">
        <source>Better user experience</source>
-        <target>Verbesserte Nutzer-Erfahrung</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
@@ -1947,7 +1942,6 @@ Das ist Ihr eigener Einmal-Link!</target>
      </trans-unit>
      <trans-unit id="Customizable message shape." xml:space="preserve">
        <source>Customizable message shape.</source>
-        <target>Anpassbares Format des Nachrichtenfelds</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
@@ -2246,7 +2240,6 @@ Das ist Ihr eigener Einmal-Link!</target>
      </trans-unit>
      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
        <source>Delete or moderate up to 200 messages.</source>
-        <target>Bis zu 200 Nachrichten löschen oder moderieren</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
@@ -3374,7 +3367,6 @@ Das ist Ihr eigener Einmal-Link!</target>
      </trans-unit>
      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
        <source>Forward up to 20 messages at once.</source>
-        <target>Bis zu 20 Nachrichten auf einmal weiterleiten</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
@@ -3769,8 +3761,6 @@ Fehler: %2$@</target>
      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
        <source>Improved delivery, reduced traffic usage.
 More improvements are coming soon!</source>
-        <target>Verbesserte Nachrichten-Auslieferung und verringerter Datenverbrauch.
-Weitere Verbesserungen sind bald verfügbar!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
@@ -6473,7 +6463,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
      </trans-unit>
      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <target>Die SimpleX-Protokolle wurden von Trail of Bits überprüft.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
@@ -6653,12 +6642,10 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
      </trans-unit>
      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
        <source>Switch audio and video during the call.</source>
-        <target>Während des Anrufs zwischen Audio und Video wechseln</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
        <source>Switch chat profile for 1-time invitations.</source>
-        <target>Das Chat-Profil für Einmal-Einladungen wechseln</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
@@ -1087,7 +1087,6 @@
      </trans-unit>
      <trans-unit id="Better calls" xml:space="preserve">
        <source>Better calls</source>
-        <target>Llamadas mejoradas</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
@@ -1097,7 +1096,6 @@
      </trans-unit>
      <trans-unit id="Better message dates." xml:space="preserve">
        <source>Better message dates.</source>
-        <target>Sistema de fechas mejorado.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
@@ -1112,17 +1110,14 @@
      </trans-unit>
      <trans-unit id="Better notifications" xml:space="preserve">
        <source>Better notifications</source>
-        <target>Notificaciones mejoradas</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better security ✅" xml:space="preserve">
        <source>Better security ✅</source>
-        <target>Seguridad mejorada ✅</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better user experience" xml:space="preserve">
        <source>Better user experience</source>
-        <target>Experiencia de usuario mejorada</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
@@ -1947,7 +1942,6 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Customizable message shape." xml:space="preserve">
        <source>Customizable message shape.</source>
-        <target>Forma personalizable de los mensajes.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
@@ -2246,7 +2240,6 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
        <source>Delete or moderate up to 200 messages.</source>
-        <target>Borra o modera hasta 200 mensajes a la vez.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
@@ -3374,7 +3367,6 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
        <source>Forward up to 20 messages at once.</source>
-        <target>Desplazamiento de hasta 20 mensajes.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
@@ -3769,8 +3761,6 @@ Error: %2$@</target>
      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
        <source>Improved delivery, reduced traffic usage.
 More improvements are coming soon!</source>
-        <target>Reducción del tráfico y entrega mejorada.
-¡Pronto habrá nuevas mejoras!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
@@ -6473,7 +6463,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </trans-unit>
      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <target>Protocolos de SimpleX auditados por Trail of Bits.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
@@ -6653,12 +6642,10 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </trans-unit>
      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
        <source>Switch audio and video during the call.</source>
-        <target>Intercambia audio y video durante la llamada.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
        <source>Switch chat profile for 1-time invitations.</source>
-        <target>Cambia el perfil de chat para invitaciones de un solo uso.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
@@ -762,7 +762,7 @@
      </trans-unit>
      <trans-unit id="All your contacts will remain connected. Profile update will be sent to your contacts." xml:space="preserve">
        <source>All your contacts will remain connected. Profile update will be sent to your contacts.</source>
-        <target>Az ismerőseivel kapcsolatban marad. A profil-változtatások frissítésre kerülnek az ismerősöknél.</target>
+        <target>Az ismerőseivel kapcsolatban marad. A profil változtatások frissítésre kerülnek az ismerősöknél.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." xml:space="preserve">
@@ -1087,7 +1087,6 @@
      </trans-unit>
      <trans-unit id="Better calls" xml:space="preserve">
        <source>Better calls</source>
-        <target>Továbbfejlesztett hívásélmény</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
@@ -1097,7 +1096,6 @@
      </trans-unit>
      <trans-unit id="Better message dates." xml:space="preserve">
        <source>Better message dates.</source>
-        <target>Továbbfejlesztett üzenetdátumok.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
@@ -1112,17 +1110,14 @@
      </trans-unit>
      <trans-unit id="Better notifications" xml:space="preserve">
        <source>Better notifications</source>
-        <target>Továbbfejlesztett értesítések</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better security ✅" xml:space="preserve">
        <source>Better security ✅</source>
-        <target>Továbbfejlesztett biztonság ✅</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better user experience" xml:space="preserve">
        <source>Better user experience</source>
-        <target>Továbbfejlesztett felhasználói élmény</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
@@ -1413,7 +1408,7 @@
      </trans-unit>
      <trans-unit id="Chat profile" xml:space="preserve">
        <source>Chat profile</source>
-        <target>Csevegési profil</target>
+        <target>Felhasználói profil</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
@@ -1438,7 +1433,7 @@
      </trans-unit>
      <trans-unit id="Choose _Migrate from another device_ on the new device and scan QR code." xml:space="preserve">
        <source>Choose _Migrate from another device_ on the new device and scan QR code.</source>
-        <target>Válassza az _Átköltöztetés egy másik eszközről_ opciót az új eszközén és olvassa be a QR-kódot.</target>
+        <target>Válassza az _Átköltöztetés egy másik eszközről opciót az új eszközén és olvassa be a QR-kódot.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Choose file" xml:space="preserve">
@@ -1722,7 +1717,7 @@ Ez az Ön egyszer használható hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Connection timeout" xml:space="preserve">
        <source>Connection timeout</source>
-        <target>Időtúllépés kapcsolódáskor</target>
+        <target>Kapcsolat időtúllépés</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connection with desktop stopped" xml:space="preserve">
@@ -1947,7 +1942,6 @@ Ez az Ön egyszer használható hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Customizable message shape." xml:space="preserve">
        <source>Customizable message shape.</source>
-        <target>Testreszabható üzenetbuborékok.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
@@ -1977,7 +1971,7 @@ Ez az Ön egyszer használható hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Database IDs and Transport isolation option." xml:space="preserve">
        <source>Database IDs and Transport isolation option.</source>
-        <target>Adatbázis-azonosítók és átvitel-izolációs beállítások.</target>
+        <target>Adatbázis-azonosítók és átviteli izolációs beállítások.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Database downgrade" xml:space="preserve">
@@ -2246,7 +2240,6 @@ Ez az Ön egyszer használható hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
        <source>Delete or moderate up to 200 messages.</source>
-        <target>Legfeljebb 200 üzenet egyszerre való törlése, vagy moderálása.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
@@ -2356,7 +2349,7 @@ Ez az Ön egyszer használható hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Details" xml:space="preserve">
        <source>Details</source>
-        <target>További részletek</target>
+        <target>Részletek</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Develop" xml:space="preserve">
@@ -2391,7 +2384,7 @@ Ez az Ön egyszer használható hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Different names, avatars and transport isolation." xml:space="preserve">
        <source>Different names, avatars and transport isolation.</source>
-        <target>Különböző nevek, profilképek és átvitel-izoláció.</target>
+        <target>Különböző nevek, avatarok és átviteli izoláció.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Direct messages" xml:space="preserve">
@@ -2917,7 +2910,7 @@ Ez az Ön egyszer használható hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Error deleting user profile" xml:space="preserve">
        <source>Error deleting user profile</source>
-        <target>Hiba a felhasználó-profil törlésekor</target>
+        <target>Hiba a felhasználói profil törlésekor</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error downloading the archive" xml:space="preserve">
@@ -3032,7 +3025,7 @@ Ez az Ön egyszer használható hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Error saving user password" xml:space="preserve">
        <source>Error saving user password</source>
-        <target>Hiba a felhasználói jelszó mentésekor</target>
+        <target>Hiba a felhasználó jelszavának mentésekor</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error scanning code: %@" xml:space="preserve">
@@ -3102,7 +3095,7 @@ Ez az Ön egyszer használható hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Error updating user privacy" xml:space="preserve">
        <source>Error updating user privacy</source>
-        <target>Hiba a felhasználói adatvédelem frissítésekor</target>
+        <target>Hiba a felhasználói beállítások frissítésekor</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error uploading the archive" xml:space="preserve">
@@ -3374,7 +3367,6 @@ Ez az Ön egyszer használható hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
        <source>Forward up to 20 messages at once.</source>
-        <target>Legfeljebb 20 üzenet egyszerre való továbbítása.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
@@ -3623,7 +3615,7 @@ Hiba: %2$@</target>
      </trans-unit>
      <trans-unit id="Hide" xml:space="preserve">
        <source>Hide</source>
-        <target>Összecsukás</target>
+        <target>Elrejtés</target>
        <note>chat item action</note>
      </trans-unit>
      <trans-unit id="Hide app screen in the recent apps." xml:space="preserve">
@@ -3708,7 +3700,7 @@ Hiba: %2$@</target>
      </trans-unit>
      <trans-unit id="If you need to use the chat now tap **Do it later** below (you will be offered to migrate the database when you restart the app)." xml:space="preserve">
        <source>If you need to use the chat now tap **Do it later** below (you will be offered to migrate the database when you restart the app).</source>
-        <target>Ha most kell használnia a csevegést, koppintson alább a **Befejezés később** lehetőségre (az alkalmazás újraindításakor felajánlásra kerül az adatbázis átköltöztetése).</target>
+        <target>Ha most kell használnia a csevegést, koppintson alább az **Befejezés később** lehetőségre (az alkalmazás újraindításakor felajánlásra kerül az adatbázis átköltöztetése).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Ignore" xml:space="preserve">
@@ -3769,8 +3761,6 @@ Hiba: %2$@</target>
      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
        <source>Improved delivery, reduced traffic usage.
 More improvements are coming soon!</source>
-        <target>Továbbfejlesztett kézbesítés, csökkentett adatforgalom-használat.
-További fejlesztések hamarosan!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
@@ -4215,7 +4205,7 @@ Ez az Ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="Many people asked: *if SimpleX has no user identifiers, how can it deliver messages?*" xml:space="preserve">
        <source>Many people asked: *if SimpleX has no user identifiers, how can it deliver messages?*</source>
-        <target>Sokan kérdezték: *ha a SimpleX Chatnek nincsenek felhasználó-azonosítói, akkor hogyan tud üzeneteket kézbesíteni?*</target>
+        <target>Sokan kérdezték: *ha a SimpleX Chatnek nincsenek felhasználói azonosítói, akkor hogyan tud üzeneteket kézbesíteni?*</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Mark deleted for everyone" xml:space="preserve">
@@ -4793,7 +4783,7 @@ VPN engedélyezése szükséges.</target>
      </trans-unit>
      <trans-unit id="Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**." xml:space="preserve">
        <source>Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**.</source>
-        <target>Csak az eszközök alkalmazásai tárolják a felhasználó-profilokat, névjegyeket, csoportokat és a **2 rétegű végpontok közötti titkosítással** küldött üzeneteket.</target>
+        <target>Csak az eszközök alkalmazásai tárolják a felhasználói profilokat, névjegyeket, csoportokat és a **2 rétegű végpontok közötti titkosítással** küldött üzeneteket.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only delete conversation" xml:space="preserve">
@@ -4903,7 +4893,7 @@ VPN engedélyezése szükséges.</target>
      </trans-unit>
      <trans-unit id="Open user profiles" xml:space="preserve">
        <source>Open user profiles</source>
-        <target>Felhasználó-profilok megnyitása</target>
+        <target>Felhasználói profilok megnyitása</target>
        <note>authentication reason</note>
      </trans-unit>
      <trans-unit id="Open-source protocol and code – anybody can run the servers." xml:space="preserve">
@@ -4955,12 +4945,12 @@ VPN engedélyezése szükséges.</target>
      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
-        <target>PING-ek száma</target>
+        <target>PING számláló</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="PING interval" xml:space="preserve">
        <source>PING interval</source>
-        <target>Időtartam a PING-ek között</target>
+        <target>PING időköze</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Passcode" xml:space="preserve">
@@ -5316,12 +5306,12 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
      </trans-unit>
      <trans-unit id="Protocol timeout" xml:space="preserve">
        <source>Protocol timeout</source>
-        <target>Protokoll időtúllépése</target>
+        <target>Protokoll időtúllépés</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Protocol timeout per KB" xml:space="preserve">
        <source>Protocol timeout per KB</source>
-        <target>Protokoll időtúllépése KB-onként</target>
+        <target>Protokoll időkorlát KB-onként</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Proxied" xml:space="preserve">
@@ -5446,7 +5436,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
      </trans-unit>
      <trans-unit id="Received total" xml:space="preserve">
        <source>Received total</source>
-        <target>Összes fogadott üzenet</target>
+        <target>Összes fogadott</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Receiving address will be changed to a different server. Address change will complete after sender comes online." xml:space="preserve">
@@ -5818,7 +5808,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
      </trans-unit>
      <trans-unit id="Save profile password" xml:space="preserve">
        <source>Save profile password</source>
-        <target>Profiljelszó mentése</target>
+        <target>Felhasználói fiók jelszavának mentése</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Save servers" xml:space="preserve">
@@ -6158,7 +6148,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
      </trans-unit>
      <trans-unit id="Sent total" xml:space="preserve">
        <source>Sent total</source>
-        <target>Összes elküldött üzenet</target>
+        <target>Összes elküldött</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Sent via proxy" xml:space="preserve">
@@ -6373,7 +6363,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
      </trans-unit>
      <trans-unit id="Show message status" xml:space="preserve">
        <source>Show message status</source>
-        <target>Üzenetállapot megjelenítése</target>
+        <target>Üzenet állapot megjelenítése</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Show percentage" xml:space="preserve">
@@ -6473,7 +6463,6 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
      </trans-unit>
      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <target>A SimpleX Chat biztonsága a Trail of Bits által lett újraauditálva.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
@@ -6653,12 +6642,10 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
      </trans-unit>
      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
        <source>Switch audio and video during the call.</source>
-        <target>Hang/Videó váltása hívás közben.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
        <source>Switch chat profile for 1-time invitations.</source>
-        <target>Csevegési profilváltás az egyszer használható meghívókhoz.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
@@ -6678,7 +6665,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
      </trans-unit>
      <trans-unit id="TCP connection timeout" xml:space="preserve">
        <source>TCP connection timeout</source>
-        <target>TCP kapcsolat időtúllépése</target>
+        <target>TCP kapcsolat időtúllépés</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="TCP_KEEPCNT" xml:space="preserve">
@@ -6713,7 +6700,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
      </trans-unit>
      <trans-unit id="Tap to Connect" xml:space="preserve">
        <source>Tap to Connect</source>
-        <target>Koppintson ide a kapcsolódáshoz</target>
+        <target>Koppintson a kapcsolódáshoz</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Tap to activate profile." xml:space="preserve">
@@ -6723,12 +6710,12 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
      </trans-unit>
      <trans-unit id="Tap to join" xml:space="preserve">
        <source>Tap to join</source>
-        <target>Koppintson ide a csatlakozáshoz</target>
+        <target>Koppintson a csatlakozáshoz</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Tap to join incognito" xml:space="preserve">
        <source>Tap to join incognito</source>
-        <target>Koppintson ide az inkognitóban való csatlakozáshoz</target>
+        <target>Koppintson az inkognitóban való csatlakozáshoz</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Tap to paste link" xml:space="preserve">
@@ -6738,7 +6725,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
      </trans-unit>
      <trans-unit id="Tap to scan" xml:space="preserve">
        <source>Tap to scan</source>
-        <target>Koppintson ide a QR-kód beolvasáshoz</target>
+        <target>Koppintson a beolvasáshoz</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Temporary file error" xml:space="preserve">
@@ -6783,7 +6770,7 @@ Engedélyezze a „Beállítások -&gt; Hálózat és kiszolgálók” menüben.
      </trans-unit>
      <trans-unit id="The 1st platform without any user identifiers – private by design." xml:space="preserve">
        <source>The 1st platform without any user identifiers – private by design.</source>
-        <target>Az első csevegési rendszer bármiféle felhasználó-azonosító nélkül - privátra lett tervezre.</target>
+        <target>Az első csevegési rendszer bármiféle felhasználó azonosító nélkül - privátra lett tervezre.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The ID of the next message is incorrect (less or equal to the previous).&#10;It can happen because of some bug or when the connection is compromised." xml:space="preserve">
@@ -7005,7 +6992,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
      </trans-unit>
      <trans-unit id="To protect privacy, instead of user IDs used by all other platforms, SimpleX has identifiers for message queues, separate for each of your contacts." xml:space="preserve">
        <source>To protect privacy, instead of user IDs used by all other platforms, SimpleX has identifiers for message queues, separate for each of your contacts.</source>
-        <target>Az adatvédelem érdekében, a más csevegési platformokon megszokott felhasználó-azonosítók helyett, a SimpleX csak az üzenetek sorbaállításához használ azonosítókat, minden egyes ismerőshöz egy-egy különbözőt.</target>
+        <target>Az adatvédelem érdekében, a más csevegési platformokon megszokott felhasználói azonosítók helyett, a SimpleX csak az üzenetek sorbaállításához használ azonosítókat, minden egyes ismerőshöz egy-egy különbözőt.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="To protect timezone, image/voice files use UTC." xml:space="preserve">
@@ -7072,12 +7059,12 @@ A funkció bekapcsolása előtt a rendszer felszólítja a képernyőzár beáll
      </trans-unit>
      <trans-unit id="Total" xml:space="preserve">
        <source>Total</source>
-        <target>Összes kapcsolat</target>
+        <target>Összesen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Transport isolation" xml:space="preserve">
        <source>Transport isolation</source>
-        <target>Átvitel-izoláció módja</target>
+        <target>Kapcsolat izolációs mód</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Transport sessions" xml:space="preserve">
@@ -7741,7 +7728,7 @@ Csatlakozáskérés megismétlése?</target>
      </trans-unit>
      <trans-unit id="You can enable them later via app Privacy &amp; Security settings." xml:space="preserve">
        <source>You can enable them later via app Privacy &amp; Security settings.</source>
-        <target>Később engedélyezheti őket az alkalmazás „Adatvédelem és biztonság” menüjében.</target>
+        <target>Később engedélyezheti őket az alkalmazás „Adatvédelem és biztonság” menüben.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can give another try." xml:space="preserve">
@@ -7751,7 +7738,7 @@ Csatlakozáskérés megismétlése?</target>
      </trans-unit>
      <trans-unit id="You can hide or mute a user profile - swipe it to the right." xml:space="preserve">
        <source>You can hide or mute a user profile - swipe it to the right.</source>
-        <target>Elrejtheti vagy lenémíthatja a felhasználó -profiljait - csúsztassa jobbra a profilt.</target>
+        <target>Elrejtheti vagy lenémíthatja a felhasználó profiljait - csúsztassa jobbra a profilt.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can make it visible to your SimpleX contacts via Settings." xml:space="preserve">
@@ -9081,7 +9068,7 @@ utoljára fogadott üzenet: %2$@</target>
      </trans-unit>
      <trans-unit id="NSCameraUsageDescription" xml:space="preserve">
        <source>SimpleX needs camera access to scan QR codes to connect to other users and for video calls.</source>
-        <target>A SimpleXnek kamera-hozzáférésre van szüksége a QR-kódok beolvasásához, hogy kapcsolódhasson más felhasználókhoz és videohívásokhoz.</target>
+        <target>A SimpleX-nek kamera-hozzáférésre van szüksége a QR-kódok beolvasásához, hogy kapcsolódhasson más felhasználókhoz és videohívásokhoz.</target>
        <note>Privacy - Camera Usage Description</note>
      </trans-unit>
      <trans-unit id="NSFaceIDUsageDescription" xml:space="preserve">
@@ -9096,12 +9083,12 @@ utoljára fogadott üzenet: %2$@</target>
      </trans-unit>
      <trans-unit id="NSMicrophoneUsageDescription" xml:space="preserve">
        <source>SimpleX needs microphone access for audio and video calls, and to record voice messages.</source>
-        <target>A SimpleXnek mikrofon-hozzáférésre van szüksége hang- és videohívásokhoz, valamint hangüzenetek rögzítéséhez.</target>
+        <target>A SimpleX-nek mikrofon-hozzáférésre van szüksége hang- és videohívásokhoz, valamint hangüzenetek rögzítéséhez.</target>
        <note>Privacy - Microphone Usage Description</note>
      </trans-unit>
      <trans-unit id="NSPhotoLibraryAddUsageDescription" xml:space="preserve">
        <source>SimpleX needs access to Photo Library for saving captured and received media</source>
-        <target>A SimpleXnek galéria-hozzáférésre van szüksége a rögzített és fogadott média mentéséhez</target>
+        <target>A SimpleX-nek hozzáférésre van szüksége a Galériához a rögzített és fogadott média mentéséhez</target>
        <note>Privacy - Photo Library Additions Usage Description</note>
      </trans-unit>
    </body>
@@ -1087,7 +1087,6 @@
      </trans-unit>
      <trans-unit id="Better calls" xml:space="preserve">
        <source>Better calls</source>
-        <target>Chiamate migliorate</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
@@ -1097,7 +1096,6 @@
      </trans-unit>
      <trans-unit id="Better message dates." xml:space="preserve">
        <source>Better message dates.</source>
-        <target>Date dei messaggi migliorate.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
@@ -1112,17 +1110,14 @@
      </trans-unit>
      <trans-unit id="Better notifications" xml:space="preserve">
        <source>Better notifications</source>
-        <target>Notifiche migliorate</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better security ✅" xml:space="preserve">
        <source>Better security ✅</source>
-        <target>Sicurezza migliorata ✅</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better user experience" xml:space="preserve">
        <source>Better user experience</source>
-        <target>Esperienza utente migliorata</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
@@ -1947,7 +1942,6 @@ Questo è il tuo link una tantum!</target>
      </trans-unit>
      <trans-unit id="Customizable message shape." xml:space="preserve">
        <source>Customizable message shape.</source>
-        <target>Forma dei messaggi personalizzabile.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
@@ -2246,7 +2240,6 @@ Questo è il tuo link una tantum!</target>
      </trans-unit>
      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
        <source>Delete or moderate up to 200 messages.</source>
-        <target>Elimina o modera fino a 200 messaggi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
@@ -3374,7 +3367,6 @@ Questo è il tuo link una tantum!</target>
      </trans-unit>
      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
        <source>Forward up to 20 messages at once.</source>
-        <target>Inoltra fino a 20 messaggi alla volta.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
@@ -3769,8 +3761,6 @@ Errore: %2$@</target>
      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
        <source>Improved delivery, reduced traffic usage.
 More improvements are coming soon!</source>
-        <target>Consegna migliorata, utilizzo di traffico ridotto.
-Altri miglioramenti sono in arrivo!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
@@ -6473,7 +6463,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
      </trans-unit>
      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <target>Protocolli di SimpleX esaminati da Trail of Bits.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
@@ -6653,12 +6642,10 @@ Attivalo nelle impostazioni *Rete e server*.</target>
      </trans-unit>
      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
        <source>Switch audio and video during the call.</source>
-        <target>Cambia tra audio e video durante la chiamata.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
        <source>Switch chat profile for 1-time invitations.</source>
-        <target>Cambia profilo di chat per inviti una tantum.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
@@ -4121,12 +4121,10 @@ This is your link for group %@!</source>
      </trans-unit>
      <trans-unit id="Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
        <source>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
-        <target>メッセージ、ファイル、通話は、前方秘匿性、否認可能性および侵入復元性を備えた**エンドツーエンドの暗号化**によって保護されます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." xml:space="preserve">
        <source>Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery.</source>
-        <target>メッセージ、ファイル、通話は、前方秘匿性、否認可能性および侵入復元性を備えた**耐量子E2E暗号化**によって保護されます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Migrate device" xml:space="preserve">
@@ -1087,7 +1087,6 @@
      </trans-unit>
      <trans-unit id="Better calls" xml:space="preserve">
        <source>Better calls</source>
-        <target>Betere gesprekken</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
@@ -1097,7 +1096,6 @@
      </trans-unit>
      <trans-unit id="Better message dates." xml:space="preserve">
        <source>Better message dates.</source>
-        <target>Betere datums voor berichten.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
@@ -1112,17 +1110,14 @@
      </trans-unit>
      <trans-unit id="Better notifications" xml:space="preserve">
        <source>Better notifications</source>
-        <target>Betere meldingen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better security ✅" xml:space="preserve">
        <source>Better security ✅</source>
-        <target>Betere beveiliging ✅</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better user experience" xml:space="preserve">
        <source>Better user experience</source>
-        <target>Betere gebruikerservaring</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
@@ -1947,7 +1942,6 @@ Dit is uw eigen eenmalige link!</target>
      </trans-unit>
      <trans-unit id="Customizable message shape." xml:space="preserve">
        <source>Customizable message shape.</source>
-        <target>Aanpasbare berichtvorm.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
@@ -2246,7 +2240,6 @@ Dit is uw eigen eenmalige link!</target>
      </trans-unit>
      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
        <source>Delete or moderate up to 200 messages.</source>
-        <target>Maximaal 200 berichten verwijderen of modereren.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
@@ -3374,7 +3367,6 @@ Dit is uw eigen eenmalige link!</target>
      </trans-unit>
      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
        <source>Forward up to 20 messages at once.</source>
-        <target>Stuur maximaal 20 berichten tegelijk door.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
@@ -3769,8 +3761,6 @@ Fout: %2$@</target>
      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
        <source>Improved delivery, reduced traffic usage.
 More improvements are coming soon!</source>
-        <target>Verbeterde levering, minder data gebruik.
-Binnenkort meer verbeteringen!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
@@ -6473,7 +6463,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
      </trans-unit>
      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <target>SimpleX-protocollen beoordeeld door Trail of Bits.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
@@ -6653,12 +6642,10 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
      </trans-unit>
      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
        <source>Switch audio and video during the call.</source>
-        <target>Wisselen tussen audio en video tijdens het gesprek.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
        <source>Switch chat profile for 1-time invitations.</source>
-        <target>Wijzig chatprofiel voor eenmalige uitnodigingen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
@@ -139,7 +139,6 @@
      </trans-unit>
      <trans-unit id="%@, %@" xml:space="preserve">
        <source>%1$@, %2$@</source>
-        <target>%1$@, %2$@</target>
        <note>format for date separator in chat</note>
      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
@@ -1087,7 +1086,6 @@
      </trans-unit>
      <trans-unit id="Better calls" xml:space="preserve">
        <source>Better calls</source>
-        <target>Улучшенные звонки</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
@@ -1097,7 +1095,6 @@
      </trans-unit>
      <trans-unit id="Better message dates." xml:space="preserve">
        <source>Better message dates.</source>
-        <target>Улучшенные даты сообщений.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
@@ -1112,17 +1109,14 @@
      </trans-unit>
      <trans-unit id="Better notifications" xml:space="preserve">
        <source>Better notifications</source>
-        <target>Улучшенные уведомления</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better security ✅" xml:space="preserve">
        <source>Better security ✅</source>
-        <target>Улучшенная безопасность ✅</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better user experience" xml:space="preserve">
        <source>Better user experience</source>
-        <target>Улучшенный интерфейс</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
@@ -1947,7 +1941,6 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Customizable message shape." xml:space="preserve">
        <source>Customizable message shape.</source>
-        <target>Настраиваемая форма сообщений.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
@@ -2246,7 +2239,6 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
        <source>Delete or moderate up to 200 messages.</source>
-        <target>Удаляйте или модерируйте до 200 сообщений.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
@@ -3374,7 +3366,6 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
        <source>Forward up to 20 messages at once.</source>
-        <target>Пересылайте до 20 сообщений за раз.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
@@ -3769,7 +3760,6 @@ Error: %2$@</source>
      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
        <source>Improved delivery, reduced traffic usage.
 More improvements are coming soon!</source>
-        <target>Улучшенная доставка, меньше трафик.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
@@ -6472,7 +6462,6 @@ Enable in *Network &amp; servers* settings.</source>
      </trans-unit>
      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <target>Аудит SimpleX протоколов от Trail of Bits.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
@@ -6652,12 +6641,10 @@ Enable in *Network &amp; servers* settings.</source>
      </trans-unit>
      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
        <source>Switch audio and video during the call.</source>
-        <target>Переключайте звук и видео во время звонка.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
        <source>Switch chat profile for 1-time invitations.</source>
-        <target>Переключайте профиль чата для одноразовых приглашений.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
@@ -1087,7 +1087,6 @@
      </trans-unit>
      <trans-unit id="Better calls" xml:space="preserve">
        <source>Better calls</source>
-        <target>Daha iyi aramalar</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
@@ -1097,7 +1096,6 @@
      </trans-unit>
      <trans-unit id="Better message dates." xml:space="preserve">
        <source>Better message dates.</source>
-        <target>Daha iyi mesaj tarihleri.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
@@ -1112,17 +1110,14 @@
      </trans-unit>
      <trans-unit id="Better notifications" xml:space="preserve">
        <source>Better notifications</source>
-        <target>Daha iyi bildirimler</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better security ✅" xml:space="preserve">
        <source>Better security ✅</source>
-        <target>Daha iyi güvenlik ✅</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better user experience" xml:space="preserve">
        <source>Better user experience</source>
-        <target>Daha iyi kullanıcı deneyimi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
@@ -1947,7 +1942,6 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
      </trans-unit>
      <trans-unit id="Customizable message shape." xml:space="preserve">
        <source>Customizable message shape.</source>
-        <target>Özelleştirilebilir mesaj şekli.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
@@ -2246,7 +2240,6 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
      </trans-unit>
      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
        <source>Delete or moderate up to 200 messages.</source>
-        <target>200'e kadar mesajı silin veya düzenleyin.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
@@ -3374,7 +3367,6 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
      </trans-unit>
      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
        <source>Forward up to 20 messages at once.</source>
-        <target>Aynı anda en fazla 20 mesaj iletin.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
@@ -3769,8 +3761,6 @@ Hata: %2$@</target>
      <trans-unit id="Improved delivery, reduced traffic usage.&#10;More improvements are coming soon!" xml:space="preserve">
        <source>Improved delivery, reduced traffic usage.
 More improvements are coming soon!</source>
-        <target>İyileştirilmiş teslimat, azaltılmış trafik kullanımı.
-Daha fazla iyileştirme yakında geliyor!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
@@ -6473,7 +6463,6 @@ Enable in *Network &amp; servers* settings.</source>
      </trans-unit>
      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
        <source>SimpleX protocols reviewed by Trail of Bits.</source>
-        <target>SimpleX protokolleri Trail of Bits tarafından incelenmiştir.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
@@ -6653,12 +6642,10 @@ Enable in *Network &amp; servers* settings.</source>
      </trans-unit>
      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
        <source>Switch audio and video during the call.</source>
-        <target>Görüşme sırasında ses ve görüntüyü değiştirin.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Switch chat profile for 1-time invitations." xml:space="preserve">
        <source>Switch chat profile for 1-time invitations.</source>
-        <target>Sohbet profilini 1 kerelik davetler için değiştirin.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
@@ -26,52 +26,14 @@ enum NSENotification {
    case nse(UNMutableNotificationContent)
    case callkit(RcvCallInvitation)
    case empty
-}
-
-public enum NSENotificationData {
-    case connectionEvent(_ user: User, _ connEntity: ConnectionEntity)
-    case contactConnected(_ user: any UserLike, _ contact: Contact)
-    case contactRequest(_ user: any UserLike, _ contactRequest: UserContactRequest)
-    case messageReceived(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem)
-    case callInvitation(_ invitation: RcvCallInvitation)
    case msgInfo(NtfMsgAckInfo)
-    case noNtf

-    var callInvitation: RcvCallInvitation? {
+    var isCallInvitation: Bool {
        switch self {
-        case let .callInvitation(invitation): invitation
-        default: nil
-        }
-    }
-
-    func notificationContent(_ badgeCount: Int) -> UNMutableNotificationContent {
-        return switch self {
-        case let .connectionEvent(user, connEntity): createConnectionEventNtf(user, connEntity, badgeCount)
-        case let .contactConnected(user, contact): createContactConnectedNtf(user, contact, badgeCount)
-        case let .contactRequest(user, contactRequest): createContactRequestNtf(user, contactRequest, badgeCount)
-        case let .messageReceived(user, cInfo, cItem): createMessageReceivedNtf(user, cInfo, cItem, badgeCount)
-        case let .callInvitation(invitation): createCallInvitationNtf(invitation, badgeCount)
-        case .msgInfo: UNMutableNotificationContent()
-        case .noNtf: UNMutableNotificationContent()
-        }
-    }
-
-    var notificationEvent: NSENotificationData? {
-        return switch self {
-        case .connectionEvent: self
-        case .contactConnected: self
-        case .contactRequest: self
-        case .messageReceived: self
-        case .callInvitation: self
-        case .msgInfo: nil
-        case .noNtf: nil
-        }
-    }
-
-    var newMsgData: (any UserLike, ChatInfo)? {
-        return switch self {
-        case let .messageReceived(user, cInfo, _): (user, cInfo)
-        default: nil
+        case let .nse(ntf): ntf.categoryIdentifier == ntfCategoryCallInvitation
+        case .callkit: true
+        case .empty: false
+        case .msgInfo: false
        }
    }
 }
@@ -81,10 +43,9 @@ public enum NSENotificationData {
 // or when background notification is received.
 class NSEThreads {
    static let shared = NSEThreads()
-    static let queue = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.notification-threads.lock")
+    private static let queue = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.notification-threads.lock")
    private var allThreads: Set<UUID> = []
-    var activeThreads: [(UUID, NotificationService)] = []
-    var droppedNotifications: [(ChatId, NSENotificationData)] = []
+    private var activeThreads: [(UUID, NotificationService)] = []

    func newThread() -> UUID {
        NSEThreads.queue.sync {
@@ -103,19 +64,22 @@ class NSEThreads {
        }
    }

-    func processNotification(_ id: ChatId, _ ntf: NSENotificationData) async -> Void {
-        if let (_, nse) = rcvEntityThread(id),
-           nse.expectedMessages[id]?.shouldProcessNtf ?? false {
-            nse.processReceivedNtf(id, ntf, signalReady: true)
+    func processNotification(_ id: ChatId, _ ntf: NSENotification) async -> Void {
+        var waitTime: Int64 = 5_000_000000
+        while waitTime > 0 {
+            if let (_, nse) = rcvEntityThread(id),
+               nse.shouldProcessNtf && nse.processReceivedNtf(ntf) {
+                break
+            } else {
+                try? await Task.sleep(nanoseconds: 10_000000)
+                waitTime -= 10_000000
+            }
        }
    }

    private func rcvEntityThread(_ id: ChatId) -> (UUID, NotificationService)? {
        NSEThreads.queue.sync {
-            // this selects the earliest thread that:
-            // 1) has this connection in nse.expectedMessages
-            // 2) has not completed processing messages for this connection (not ready)
-            activeThreads.first(where: { (_, nse) in nse.expectedMessages[id]?.ready == false })
+            activeThreads.first(where: { (_, nse) in nse.receiveEntityId == id })
        }
    }

@@ -142,38 +106,31 @@ class NSEThreads {
    }
 }

-struct ExpectedMessage {
-    var ntfConn: UserNtfConn
-    var receiveConnId: String?
-    var expectedMsgId: String?
-    var allowedGetNextAttempts: Int
-    var msgBestAttemptNtf: NSENotificationData?
-    var ready: Bool
-    var shouldProcessNtf: Bool
-    var startedProcessingNewMsgs: Bool
-    var semaphore: DispatchSemaphore
-}
-
 // Notification service extension creates a new instance of the class and calls didReceive for each notification.
 // Each didReceive is called in its own thread, but multiple calls can be made in one process, and, empirically, there is never
 // more than one process of notification service extension exists at a time.
 // Soon after notification service delivers the last notification it is either suspended or terminated.
 class NotificationService: UNNotificationServiceExtension {
    var contentHandler: ((UNNotificationContent) -> Void)?
-    // served as notification if no message attempts (msgBestAttemptNtf) could be produced
-    var serviceBestAttemptNtf: NSENotification?
+    var bestAttemptNtf: NSENotification?
    var badgeCount: Int = 0
    // thread is added to allThreads here - if thread did not start chat,
    // chat does not need to be suspended but NSE state still needs to be set to "suspended".
    var threadId: UUID? = NSEThreads.shared.newThread()
-    var expectedMessages: Dictionary<String, ExpectedMessage> = [:] // key is receiveEntityId
+    var notificationInfo: NtfMessages?
+    var receiveEntityId: String?
+    var receiveConnId: String?
+    var expectedMessage: String?
+    var allowedGetNextAttempts: Int = 3
+    // return true if the message is taken - it prevents sending it to another NotificationService instance for processing
+    var shouldProcessNtf = false
    var appSubscriber: AppSubscriber?
    var returnedSuspension = false

    override func didReceive(_ request: UNNotificationRequest, withContentHandler contentHandler: @escaping (UNNotificationContent) -> Void) {
        logger.debug("DEBUGGING: NotificationService.didReceive")
        let ntf = if let ntf_ = request.content.mutableCopy() as? UNMutableNotificationContent { ntf_ } else { UNMutableNotificationContent() }
-        setServiceBestAttemptNtf(ntf)
+        setBestAttemptNtf(ntf)
        self.contentHandler = contentHandler
        registerGroupDefaults()
        let appState = appStateGroupDefault.get()
@@ -181,11 +138,13 @@ class NotificationService: UNNotificationServiceExtension {
        switch appState {
        case .stopped:
            setBadgeCount()
-            setServiceBestAttemptNtf(createAppStoppedNtf(badgeCount))
+            setBestAttemptNtf(createAppStoppedNtf())
            deliverBestAttemptNtf()
        case .suspended:
+            setBadgeCount()
            receiveNtfMessages(request, contentHandler)
        case .suspending:
+            setBadgeCount()
            Task {
                let state: AppState = await withCheckedContinuation { cont in
                    appSubscriber = appStateSubscriber { s in
@@ -212,9 +171,8 @@ class NotificationService: UNNotificationServiceExtension {
                    deliverBestAttemptNtf()
                }
            }
-        case .active: contentHandler(UNMutableNotificationContent())
-        case .activating: contentHandler(UNMutableNotificationContent())
-        case .bgRefresh: contentHandler(UNMutableNotificationContent())
+        default:
+            deliverBestAttemptNtf()
        }
    }

@@ -234,165 +192,78 @@ class NotificationService: UNNotificationServiceExtension {
            if let t = threadId { NSEThreads.shared.startThread(t, self) }
            let dbStatus = startChat()
            if case .ok = dbStatus,
-               let ntfConns = apiGetNtfConns(nonce: nonce, encNtfInfo: encNtfInfo) {
-                logger.debug("NotificationService: receiveNtfMessages: apiGetNtfConns ntfConns count = \(ntfConns.count)")
-
-                for ntfConn in ntfConns {
-                    addExpectedMessage(ntfConn: ntfConn)
-                }
-
-                let connIdsToGet = expectedMessages.compactMap { (id, _) in
-                    let started = NSEThreads.queue.sync {
-                        let canStart = checkCanStart(id)
-                        if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): receiveNtfMessages: can start: \(canStart)") }
-                        if canStart {
-                            processDroppedNotifications(id)
-                            expectedMessages[id]?.startedProcessingNewMsgs = true
-                            expectedMessages[id]?.shouldProcessNtf = true
-                        }
-                        return canStart
+               let ntfInfo = apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo) {
+                logger.debug("NotificationService: receiveNtfMessages: apiGetNtfMessage \(String(describing: ntfInfo.receivedMsg_ == nil ? 0 : 1))")
+                if let connEntity = ntfInfo.connEntity_ {
+                    setBestAttemptNtf(
+                        ntfInfo.ntfsEnabled
+                        ? .nse(createConnectionEventNtf(ntfInfo.user, connEntity))
+                        : .empty
+                    )
+                    if let id = connEntity.id, ntfInfo.expectedMsg_ != nil {
+                        notificationInfo = ntfInfo
+                        receiveEntityId = id
+                        receiveConnId = connEntity.conn.agentConnId
+                        let expectedMsgId = ntfInfo.expectedMsg_?.msgId
+                        let receivedMsgId = ntfInfo.receivedMsg_?.msgId
+                        logger.debug("NotificationService: receiveNtfMessages: expectedMsgId = \(expectedMsgId ?? "nil", privacy: .private), receivedMsgId = \(receivedMsgId ?? "nil", privacy: .private)")
+                        expectedMessage = expectedMsgId
+                        shouldProcessNtf = true
+                        return
                    }
-                    if started {
-                        return expectedMessages[id]?.receiveConnId
-                    } else {
-                        if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): receiveNtfMessages: entity \(id, privacy: .private) waiting on semaphore") }
-                        expectedMessages[id]?.semaphore.wait()
-                        if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): receiveNtfMessages: entity \(id, privacy: .private) proceeding after semaphore") }
-                        Task {
-                            NSEThreads.queue.sync {
-                                processDroppedNotifications(id)
-                                expectedMessages[id]?.startedProcessingNewMsgs = true
-                                expectedMessages[id]?.shouldProcessNtf = true
-                            }
-                            if let connId = expectedMessages[id]?.receiveConnId {
-                                let _ = getConnNtfMessage(connId: connId)
-                            }
-                        }
-                        return nil
-                    }
-                }
-
-                if !connIdsToGet.isEmpty {
-                    if let r = apiGetConnNtfMessages(connIds: connIdsToGet) {
-                        logger.debug("NotificationService: receiveNtfMessages: apiGetConnNtfMessages count = \(r.count)")
-                    }
-                    return
                }
            } else if let dbStatus = dbStatus {
-                setServiceBestAttemptNtf(createErrorNtf(dbStatus, badgeCount))
+                setBestAttemptNtf(createErrorNtf(dbStatus))
            }
        }
        deliverBestAttemptNtf()
    }

-    func addExpectedMessage(ntfConn: UserNtfConn) {
-        if let connEntity = ntfConn.connEntity_,
-           let receiveEntityId = connEntity.id, ntfConn.expectedMsg_ != nil {
-            let expectedMsgId = ntfConn.expectedMsg_?.msgId
-            logger.debug("NotificationService: addExpectedMessage: expectedMsgId = \(expectedMsgId ?? "nil", privacy: .private)")
-            expectedMessages[receiveEntityId] = ExpectedMessage(
-                ntfConn: ntfConn,
-                receiveConnId: connEntity.conn.agentConnId,
-                expectedMsgId: expectedMsgId,
-                allowedGetNextAttempts: 3,
-                msgBestAttemptNtf: ntfConn.defaultBestAttemptNtf,
-                ready: false,
-                shouldProcessNtf: false,
-                startedProcessingNewMsgs: false,
-                semaphore: DispatchSemaphore(value: 0)
-            )
-        }
-    }
-
-    func checkCanStart(_ entityId: String) -> Bool {
-        return !NSEThreads.shared.activeThreads.contains(where: {
-            (tId, nse) in tId != threadId && nse.expectedMessages.contains(where: { $0.key == entityId })
-        })
-    }
-
-    func processDroppedNotifications(_ entityId: String) {
-        if !NSEThreads.shared.droppedNotifications.isEmpty {
-            let messagesToProcess = NSEThreads.shared.droppedNotifications.filter { (eId, _) in eId == entityId }
-            NSEThreads.shared.droppedNotifications.removeAll(where: { (eId, _) in eId == entityId })
-            for (index, (_, ntf)) in messagesToProcess.enumerated() {
-                if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): entity \(entityId, privacy: .private): processing dropped notification \(index, privacy: .private)") }
-                processReceivedNtf(entityId, ntf, signalReady: false)
-            }
-        }
-    }
-
    override func serviceExtensionTimeWillExpire() {
        logger.debug("DEBUGGING: NotificationService.serviceExtensionTimeWillExpire")
        deliverBestAttemptNtf(urgent: true)
    }

-    var expectingMoreMessages: Bool {
-        !expectedMessages.allSatisfy { $0.value.ready }
-    }
-
-    func processReceivedNtf(_ id: ChatId, _ ntf: NSENotificationData, signalReady: Bool) {
-        guard let expectedMessage = expectedMessages[id] else {
-            return
-        }
-        guard let expectedMsgTs = expectedMessage.ntfConn.expectedMsg_?.msgTs else {
-            NSEThreads.shared.droppedNotifications.append((id, ntf))
-            if signalReady { entityReady(id) }
-            return
+    func processReceivedNtf(_ ntf: NSENotification) -> Bool {
+        guard let ntfInfo = notificationInfo, let expectedMsgTs = ntfInfo.expectedMsg_?.msgTs else { return false }
+        if !ntfInfo.user.showNotifications {
+            self.setBestAttemptNtf(.empty)
        }
        if case let .msgInfo(info) = ntf {
-            if info.msgId == expectedMessage.expectedMsgId {
+            if info.msgId == expectedMessage {
+                expectedMessage = nil
                logger.debug("NotificationService processNtf: msgInfo msgId = \(info.msgId, privacy: .private): expected")
-                expectedMessages[id]?.expectedMsgId = nil
-                if signalReady { entityReady(id) }
                self.deliverBestAttemptNtf()
+                return true
            } else if let msgTs = info.msgTs_, msgTs > expectedMsgTs {
                logger.debug("NotificationService processNtf: msgInfo msgId = \(info.msgId, privacy: .private): unexpected msgInfo, let other instance to process it, stopping this one")
-                NSEThreads.shared.droppedNotifications.append((id, ntf))
-                if signalReady { entityReady(id) }
                self.deliverBestAttemptNtf()
-            } else if (expectedMessages[id]?.allowedGetNextAttempts ?? 0) > 0, let receiveConnId = expectedMessages[id]?.receiveConnId {
+                return false
+            } else if allowedGetNextAttempts > 0, let receiveConnId = receiveConnId {
                logger.debug("NotificationService processNtf: msgInfo msgId = \(info.msgId, privacy: .private): unexpected msgInfo, get next message")
-                expectedMessages[id]?.allowedGetNextAttempts -= 1
-                if let receivedMsg = getConnNtfMessage(connId: receiveConnId) {
-                    logger.debug("NotificationService processNtf, on getConnNtfMessage: msgInfo msgId = \(info.msgId, privacy: .private), receivedMsg msgId = \(receivedMsg.msgId, privacy: .private)")
+                allowedGetNextAttempts -= 1
+                if let receivedMsg = apiGetConnNtfMessage(connId: receiveConnId) {
+                    logger.debug("NotificationService processNtf, on apiGetConnNtfMessage: msgInfo msgId = \(info.msgId, privacy: .private), receivedMsg msgId = \(receivedMsg.msgId, privacy: .private)")
+                    return true
                } else {
-                    logger.debug("NotificationService processNtf, on getConnNtfMessage: msgInfo msgId = \(info.msgId, privacy: .private): no next message, deliver best attempt")
-                    NSEThreads.shared.droppedNotifications.append((id, ntf))
-                    if signalReady { entityReady(id) }
+                    logger.debug("NotificationService processNtf, on apiGetConnNtfMessage: msgInfo msgId = \(info.msgId, privacy: .private): no next message, deliver best attempt")
                    self.deliverBestAttemptNtf()
+                    return false
                }
            } else {
                logger.debug("NotificationService processNtf: msgInfo msgId = \(info.msgId, privacy: .private): unknown message, let other instance to process it")
-                NSEThreads.shared.droppedNotifications.append((id, ntf))
-                if signalReady { entityReady(id) }
+                self.deliverBestAttemptNtf()
+                return false
+            }
+        } else if ntfInfo.user.showNotifications {
+            logger.debug("NotificationService processNtf: setting best attempt")
+            self.setBestAttemptNtf(ntf)
+            if ntf.isCallInvitation {
                self.deliverBestAttemptNtf()
            }
-        } else if expectedMessage.ntfConn.user.showNotifications {
-            logger.debug("NotificationService processNtf: setting best attempt")
-            if ntf.notificationEvent != nil {
-                setBadgeCount()
-            }
-            let prevBestAttempt = expectedMessages[id]?.msgBestAttemptNtf
-            if prevBestAttempt?.callInvitation != nil {
-                if ntf.callInvitation != nil { // replace with newer call
-                    expectedMessages[id]?.msgBestAttemptNtf = ntf
-                } // otherwise keep call as best attempt
-            } else {
-                expectedMessages[id]?.msgBestAttemptNtf = ntf
-            }
-        } else {
-            NSEThreads.shared.droppedNotifications.append((id, ntf))
-            if signalReady { entityReady(id) }
-        }
-    }
-
-    func entityReady(_ entityId: ChatId) {
-        if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): entityReady: entity \(entityId, privacy: .private)") }
-        expectedMessages[entityId]?.ready = true
-        if let (tNext, nse) = NSEThreads.shared.activeThreads.first(where: { (_, nse) in nse.expectedMessages[entityId]?.startedProcessingNewMsgs == false }) {
-            if let t = threadId { logger.debug("NotificationService thread \(t, privacy: .private): entityReady: signal next thread \(tNext, privacy: .private) for entity \(entityId, privacy: .private)") }
-            nse.expectedMessages[entityId]?.semaphore.signal()
+            return true
        }
+        return false
    }

    func setBadgeCount() {
@@ -400,32 +271,37 @@ class NotificationService: UNNotificationServiceExtension {
        ntfBadgeCountGroupDefault.set(badgeCount)
    }

-    func setServiceBestAttemptNtf(_ ntf: UNMutableNotificationContent) {
-        logger.debug("NotificationService.setServiceBestAttemptNtf")
-        serviceBestAttemptNtf = .nse(ntf)
+    func setBestAttemptNtf(_ ntf: UNMutableNotificationContent) {
+        setBestAttemptNtf(.nse(ntf))
    }

-    private func deliverBestAttemptNtf(urgent: Bool = false) {
-        if (urgent || !expectingMoreMessages) {
-            logger.debug("NotificationService.deliverBestAttemptNtf")
-            // stop processing other messages
-            for (key, _) in expectedMessages {
-                expectedMessages[key]?.shouldProcessNtf = false
-            }
-
-            let suspend: Bool
-            if let t = threadId {
-                threadId = nil
-                suspend = NSEThreads.shared.endThread(t) && NSEThreads.shared.noThreads
-            } else {
-                suspend = false
-            }
-            deliverCallkitOrNotification(urgent: urgent, suspend: suspend)
+    func setBestAttemptNtf(_ ntf: NSENotification) {
+        logger.debug("NotificationService.setBestAttemptNtf")
+        if case let .nse(notification) = ntf {
+            notification.badge = badgeCount as NSNumber
+            bestAttemptNtf = .nse(notification)
+        } else {
+            bestAttemptNtf = ntf
        }
    }

+    private func deliverBestAttemptNtf(urgent: Bool = false) {
+        logger.debug("NotificationService.deliverBestAttemptNtf")
+        // stop processing other messages
+        shouldProcessNtf = false
+
+        let suspend: Bool
+        if let t = threadId {
+            threadId = nil
+            suspend = NSEThreads.shared.endThread(t) && NSEThreads.shared.noThreads
+        } else {
+            suspend = false
+        }
+        deliverCallkitOrNotification(urgent: urgent, suspend: suspend)
+    }
+
    private func deliverCallkitOrNotification(urgent: Bool, suspend: Bool = false) {
-        if useCallKit() && expectedMessages.contains(where: { $0.value.msgBestAttemptNtf?.callInvitation != nil }) {
+        if case .callkit = bestAttemptNtf {
            logger.debug("NotificationService.deliverCallkitOrNotification: will suspend, callkit")
            if urgent {
                // suspending NSE even though there may be other notifications
@@ -463,13 +339,19 @@ class NotificationService: UNNotificationServiceExtension {
    }

    private func deliverNotification() {
-        if let handler = contentHandler, let ntf = prepareNotification() {
+        if let handler = contentHandler, let ntf = bestAttemptNtf {
            contentHandler = nil
-            serviceBestAttemptNtf = nil
+            bestAttemptNtf = nil
+            let deliver: (UNMutableNotificationContent?) -> Void = { ntf in
+                let useNtf = if let ntf = ntf {
+                    appStateGroupDefault.get().running ? UNMutableNotificationContent() : ntf
+                } else {
+                    UNMutableNotificationContent()
+                }
+                handler(useNtf)
+            }
            switch ntf {
-            case let .nse(content):
-                content.badge = badgeCount as NSNumber
-                handler(content)
+            case let .nse(content): deliver(content)
            case let .callkit(invitation):
                logger.debug("NotificationService reportNewIncomingVoIPPushPayload for \(invitation.contact.id)")
                CXProvider.reportNewIncomingVoIPPushPayload([
@@ -480,85 +362,13 @@ class NotificationService: UNNotificationServiceExtension {
                    "callTs": invitation.callTs.timeIntervalSince1970
                ]) { error in
                    logger.debug("reportNewIncomingVoIPPushPayload result: \(error)")
-                    handler(error == nil ? UNMutableNotificationContent() : createCallInvitationNtf(invitation, self.badgeCount))
+                    deliver(error == nil ? nil : createCallInvitationNtf(invitation))
                }
-            case .empty:
-                handler(UNMutableNotificationContent()) // used to mute notifications that did not unsubscribe yet
+            case .empty: deliver(nil) // used to mute notifications that did not unsubscribe yet
+            case .msgInfo: deliver(nil) // unreachable, the best attempt is never set to msgInfo
            }
        }
    }
-
-    private func prepareNotification() -> NSENotification? {
-        if expectedMessages.isEmpty {
-            return serviceBestAttemptNtf
-        } else if let callNtfKV = expectedMessages.first(where: { $0.value.msgBestAttemptNtf?.callInvitation != nil }),
-                  let callInv = callNtfKV.value.msgBestAttemptNtf?.callInvitation,
-                  let callNtf = callNtfKV.value.msgBestAttemptNtf {
-            return useCallKit() ? .callkit(callInv) : .nse(callNtf.notificationContent(badgeCount))
-        } else {
-            let ntfEvents = expectedMessages.compactMap { $0.value.msgBestAttemptNtf?.notificationEvent }
-            if ntfEvents.isEmpty {
-                return .empty
-            } else if let ntfEvent = ntfEvents.count == 1 ? ntfEvents.first : nil {
-                return .nse(ntfEvent.notificationContent(badgeCount))
-            } else {
-                return .nse(createJointNtf(ntfEvents))
-            }
-        }
-    }
-
-    private func createJointNtf(_ ntfEvents: [NSENotificationData]) -> UNMutableNotificationContent {
-        let previewMode = ntfPreviewModeGroupDefault.get()
-        let newMsgsData: [(any UserLike, ChatInfo)] = ntfEvents.compactMap { $0.newMsgData }
-        if !newMsgsData.isEmpty, let userId = newMsgsData.first?.0.userId {
-            let newMsgsChats: [ChatInfo] = newMsgsData.map { $0.1 }
-            let uniqueChatsNames = uniqueNewMsgsChatsNames(newMsgsChats)
-            var body: String
-            if previewMode == .hidden {
-                body = String.localizedStringWithFormat(NSLocalizedString("New messages in %d chats", comment: "notification body"), uniqueChatsNames.count)
-            } else {
-                body = String.localizedStringWithFormat(NSLocalizedString("From: %@", comment: "notification body"), newMsgsChatsNamesStr(uniqueChatsNames))
-            }
-            return createNotification(
-                categoryIdentifier: ntfCategoryManyEvents,
-                title: NSLocalizedString("New messages", comment: "notification"),
-                body: body,
-                userInfo: ["userId": userId],
-                badgeCount: badgeCount
-            )
-        } else {
-            return createNotification(
-                categoryIdentifier: ntfCategoryManyEvents,
-                title: NSLocalizedString("New events", comment: "notification"),
-                body: String.localizedStringWithFormat(NSLocalizedString("%d new events", comment: "notification body"), ntfEvents.count),
-                badgeCount: badgeCount
-            )
-        }
-    }
-
-    private func uniqueNewMsgsChatsNames(_ newMsgsChats: [ChatInfo]) -> [String] {
-        var seenChatIds = Set<ChatId>()
-        var uniqueChatsNames: [String] = []
-        for chat in newMsgsChats {
-            if !seenChatIds.contains(chat.id) {
-                seenChatIds.insert(chat.id)
-                uniqueChatsNames.append(chat.chatViewName)
-            }
-        }
-        return uniqueChatsNames
-    }
-
-    private func newMsgsChatsNamesStr(_ names: [String]) -> String {
-        return switch names.count {
-        case 1: names[0]
-        case 2: "\(names[0]) and \(names[1])"
-        case 3: "\(names[0] + ", " + names[1]) and \(names[2])"
-        default:
-            names.count > 3
-            ? "\(names[0]), \(names[1]) and \(names.count - 2) other chats"
-            : ""
-        }
-    }
 }

 // nseStateGroupDefault must not be used in NSE directly, only via this singleton
@@ -772,25 +582,28 @@ func chatRecvMsg() async -> ChatResponse? {
 private let isInChina = SKStorefront().countryCode == "CHN"
 private func useCallKit() -> Bool { !isInChina && callKitEnabledGroupDefault.get() }

-func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotificationData)? {
+func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
    logger.debug("NotificationService receivedMsgNtf: \(res.responseType)")
    switch res {
    case let .contactConnected(user, contact, _):
-        return (contact.id, .contactConnected(user, contact))
+        return (contact.id, .nse(createContactConnectedNtf(user, contact)))
 //        case let .contactConnecting(contact):
 //            TODO profile update
    case let .receivedContactRequest(user, contactRequest):
-        return (UserContact(contactRequest: contactRequest).id, .contactRequest(user, contactRequest))
+        return (UserContact(contactRequest: contactRequest).id, .nse(createContactRequestNtf(user, contactRequest)))
    case let .newChatItems(user, chatItems):
        // Received items are created one at a time
        if let chatItem = chatItems.first {
            let cInfo = chatItem.chatInfo
            var cItem = chatItem.chatItem
+            if !cInfo.ntfsEnabled {
+                ntfBadgeCountGroupDefault.set(max(0, ntfBadgeCountGroupDefault.get() - 1))
+            }
            if let file = cItem.autoReceiveFile() {
                cItem = autoReceiveFile(file) ?? cItem
            }
-            let ntf: NSENotificationData = (cInfo.ntfsEnabled && cItem.showNotification) ? .messageReceived(user, cInfo, cItem) : .noNtf
-            return (chatItem.chatId, ntf)
+            let ntf: NSENotification = cInfo.ntfsEnabled ? .nse(createMessageReceivedNtf(user, cInfo, cItem)) : .empty
+            return cItem.showNotification ? (chatItem.chatId, ntf) : nil
        } else {
            return nil
        }
@@ -807,7 +620,10 @@ func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotificationData)?
        return nil
    case let .callInvitation(invitation):
        // Do not post it without CallKit support, iOS will stop launching the app without showing CallKit
-        return (invitation.contact.id, .callInvitation(invitation))
+        return (
+            invitation.contact.id,
+            useCallKit() ? .callkit(invitation) : .nse(createCallInvitationNtf(invitation))
+        )
    case let .ntfMessage(_, connEntity, ntfMessage):
        return if let id = connEntity.id { (id, .msgInfo(ntfMessage)) } else { nil }
    case .chatSuspended:
@@ -888,15 +704,15 @@ func apiSetEncryptLocalFiles(_ enable: Bool) throws {
    throw r
 }

-func apiGetNtfConns(nonce: String, encNtfInfo: String) -> [UserNtfConn]? {
+func apiGetNtfMessage(nonce: String, encNtfInfo: String) -> NtfMessages? {
    guard apiGetActiveUser() != nil else {
        logger.debug("no active user")
        return nil
    }
-    let r = sendSimpleXCmd(.apiGetNtfConns(nonce: nonce, encNtfInfo: encNtfInfo))
-    if case let .ntfConns(ntfConns) = r {
-        logger.debug("apiGetNtfConns response ntfConns: \(ntfConns.count)")
-        return ntfConns.compactMap { toUserNtfConn($0) }
+    let r = sendSimpleXCmd(.apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo))
+    if case let .ntfMessages(user, connEntity_, expectedMsg_, receivedMsg_) = r, let user = user {
+        logger.debug("apiGetNtfMessage response ntfMessages: \(receivedMsg_ == nil ? 0 : 1)")
+        return NtfMessages(user: user, connEntity_: connEntity_, expectedMsg_: expectedMsg_, receivedMsg_: receivedMsg_)
    } else if case let .chatCmdError(_, error) = r {
        logger.debug("apiGetNtfMessage error response: \(String.init(describing: error))")
    } else {
@@ -905,33 +721,17 @@ func apiGetNtfConns(nonce: String, encNtfInfo: String) -> [UserNtfConn]? {
    return nil
 }

-func toUserNtfConn(_ ntfConn: NtfConn) -> UserNtfConn? {
-    if let user = ntfConn.user_ {
-        return UserNtfConn(user: user, connEntity_: ntfConn.connEntity_, expectedMsg_: ntfConn.expectedMsg_)
-    } else {
-        return nil
-    }
-}
-
-func apiGetConnNtfMessages(connIds: [String]) -> [NtfMsgInfo?]? {
+func apiGetConnNtfMessage(connId: String) -> NtfMsgInfo? {
    guard apiGetActiveUser() != nil else {
        logger.debug("no active user")
        return nil
    }
-    let r = sendSimpleXCmd(.apiGetConnNtfMessages(connIds: connIds))
-    if case let .connNtfMessages(receivedMsgs) = r {
-        logger.debug("apiGetConnNtfMessages response receivedMsgs: \(receivedMsgs.count)")
-        return receivedMsgs
-    }
-    logger.debug("apiGetConnNtfMessages error: \(responseError(r))")
-    return nil
-}
-
-func getConnNtfMessage(connId: String) -> NtfMsgInfo? {
-    let r_ = apiGetConnNtfMessages(connIds: [connId])
-    if let r = r_, let receivedMsg = r.count == 1 ? r.first : nil {
-        return receivedMsg
+    let r = sendSimpleXCmd(.apiGetConnNtfMessage(connId: connId))
+    if case let .connNtfMessage(receivedMsg_) = r {
+        logger.debug("apiGetConnNtfMessage response receivedMsg_: \(receivedMsg_ == nil ? 0 : 1)")
+        return receivedMsg_
    }
+    logger.debug("apiGetConnNtfMessage error: \(responseError(r))")
    return nil
 }

@@ -969,33 +769,13 @@ func setNetworkConfig(_ cfg: NetCfg) throws {
    throw r
 }

-struct UserNtfConn {
+struct NtfMessages {
    var user: User
    var connEntity_: ConnectionEntity?
    var expectedMsg_: NtfMsgInfo?
+    var receivedMsg_: NtfMsgInfo?

-    var defaultBestAttemptNtf: NSENotificationData {
-        return if !user.showNotifications {
-            .noNtf
-        } else if let connEntity = connEntity_ {
-            switch connEntity {
-            case let .rcvDirectMsgConnection(_, contact):
-                contact?.chatSettings.enableNtfs == .all
-                ? .connectionEvent(user, connEntity)
-                : .noNtf
-            case let .rcvGroupMsgConnection(_, groupInfo, _):
-                groupInfo.chatSettings.enableNtfs == .all
-                ? .connectionEvent(user, connEntity)
-                : .noNtf
-            case .sndFileConnection: .noNtf
-            case .rcvFileConnection: .noNtf
-            case let .userContactConnection(_, userContact):
-                userContact.groupId == nil
-                ? .connectionEvent(user, connEntity)
-                : .noNtf
-            }
-        } else {
-            .noNtf
-        }
+    var ntfsEnabled: Bool {
+        user.showNotifications && (connEntity_?.ntfsEnabled ?? false)
    }
 }
@@ -144,15 +144,15 @@
 		5CFE0922282EEAF60002594B /* ZoomableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5CFE0920282EEAF60002594B /* ZoomableScrollView.swift */; };
 		640417CD2B29B8C200CCB412 /* NewChatMenuButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 640417CB2B29B8C200CCB412 /* NewChatMenuButton.swift */; };
 		640417CE2B29B8C200CCB412 /* NewChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 640417CC2B29B8C200CCB412 /* NewChatView.swift */; };
+		640548A32CB56735005DE1E4 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6405489E2CB56735005DE1E4 /* libgmpxx.a */; };
+		640548A42CB56735005DE1E4 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 6405489F2CB56735005DE1E4 /* libgmp.a */; };
+		640548A52CB56735005DE1E4 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 640548A02CB56735005DE1E4 /* libffi.a */; };
+		640548A62CB56735005DE1E4 /* libHSsimplex-chat-6.1.0.7-EtclnBf7vnkLnhnDA1lixv-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 640548A12CB56735005DE1E4 /* libHSsimplex-chat-6.1.0.7-EtclnBf7vnkLnhnDA1lixv-ghc9.6.3.a */; };
+		640548A72CB56735005DE1E4 /* libHSsimplex-chat-6.1.0.7-EtclnBf7vnkLnhnDA1lixv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 640548A22CB56735005DE1E4 /* libHSsimplex-chat-6.1.0.7-EtclnBf7vnkLnhnDA1lixv.a */; };
 		6407BA83295DA85D0082BA18 /* CIInvalidJSONView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6407BA82295DA85D0082BA18 /* CIInvalidJSONView.swift */; };
 		6419EC562AB8BC8B004A607A /* ContextInvitingContactMemberView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6419EC552AB8BC8B004A607A /* ContextInvitingContactMemberView.swift */; };
 		6419EC582AB97507004A607A /* CIMemberCreatedContactView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6419EC572AB97507004A607A /* CIMemberCreatedContactView.swift */; };
 		6432857C2925443C00FBE5C8 /* GroupPreferencesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6432857B2925443C00FBE5C8 /* GroupPreferencesView.swift */; };
-		643B3B452CCBEB080083A2CF /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 643B3B402CCBEB080083A2CF /* libgmpxx.a */; };
-		643B3B462CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-CTfGB7l09cqEHVIdvhrnH5-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 643B3B412CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-CTfGB7l09cqEHVIdvhrnH5-ghc9.6.3.a */; };
-		643B3B472CCBEB080083A2CF /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 643B3B422CCBEB080083A2CF /* libffi.a */; };
-		643B3B482CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-CTfGB7l09cqEHVIdvhrnH5.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 643B3B432CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-CTfGB7l09cqEHVIdvhrnH5.a */; };
-		643B3B492CCBEB080083A2CF /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 643B3B442CCBEB080083A2CF /* libgmp.a */; };
 		6440CA00288857A10062C672 /* CIEventView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6440C9FF288857A10062C672 /* CIEventView.swift */; };
 		6440CA03288AECA70062C672 /* AddGroupMembersView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6440CA02288AECA70062C672 /* AddGroupMembersView.swift */; };
 		6442E0BA287F169300CEC0F9 /* AddGroupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6442E0B9287F169300CEC0F9 /* AddGroupView.swift */; };
@@ -209,7 +209,6 @@
 		CE38A29C2C3FCD72005ED185 /* SwiftyGif in Frameworks */ = {isa = PBXBuildFile; productRef = CE38A29B2C3FCD72005ED185 /* SwiftyGif */; };
 		CE75480A2C622630009579B7 /* SwipeLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE7548092C622630009579B7 /* SwipeLabel.swift */; };
 		CE984D4B2C36C5D500E3AEFF /* ChatItemClipShape.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE984D4A2C36C5D500E3AEFF /* ChatItemClipShape.swift */; };
-		CEA6E91C2CBD21B0002B5DB4 /* UserDefault.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA6E91B2CBD21B0002B5DB4 /* UserDefault.swift */; };
 		CEDB245B2C9CD71800FBC5F6 /* StickyScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEDB245A2C9CD71800FBC5F6 /* StickyScrollView.swift */; };
 		CEDE70222C48FD9500233B1F /* SEChatState.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEDE70212C48FD9500233B1F /* SEChatState.swift */; };
 		CEE723AA2C3BD3D70009AE93 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE723A92C3BD3D70009AE93 /* ShareViewController.swift */; };
@@ -487,15 +486,15 @@
 		5CFE0920282EEAF60002594B /* ZoomableScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ZoomableScrollView.swift; path = Shared/Views/ZoomableScrollView.swift; sourceTree = SOURCE_ROOT; };
 		640417CB2B29B8C200CCB412 /* NewChatMenuButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewChatMenuButton.swift; sourceTree = "<group>"; };
 		640417CC2B29B8C200CCB412 /* NewChatView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NewChatView.swift; sourceTree = "<group>"; };
+		6405489E2CB56735005DE1E4 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		6405489F2CB56735005DE1E4 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		640548A02CB56735005DE1E4 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
+		640548A12CB56735005DE1E4 /* libHSsimplex-chat-6.1.0.7-EtclnBf7vnkLnhnDA1lixv-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.1.0.7-EtclnBf7vnkLnhnDA1lixv-ghc9.6.3.a"; sourceTree = "<group>"; };
+		640548A22CB56735005DE1E4 /* libHSsimplex-chat-6.1.0.7-EtclnBf7vnkLnhnDA1lixv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.1.0.7-EtclnBf7vnkLnhnDA1lixv.a"; sourceTree = "<group>"; };
 		6407BA82295DA85D0082BA18 /* CIInvalidJSONView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIInvalidJSONView.swift; sourceTree = "<group>"; };
 		6419EC552AB8BC8B004A607A /* ContextInvitingContactMemberView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContextInvitingContactMemberView.swift; sourceTree = "<group>"; };
 		6419EC572AB97507004A607A /* CIMemberCreatedContactView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIMemberCreatedContactView.swift; sourceTree = "<group>"; };
 		6432857B2925443C00FBE5C8 /* GroupPreferencesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GroupPreferencesView.swift; sourceTree = "<group>"; };
-		643B3B402CCBEB080083A2CF /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgmpxx.a; path = Libraries/libgmpxx.a; sourceTree = "<group>"; };
-		643B3B412CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-CTfGB7l09cqEHVIdvhrnH5-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libHSsimplex-chat-6.1.1.0-CTfGB7l09cqEHVIdvhrnH5-ghc9.6.3.a"; path = "Libraries/libHSsimplex-chat-6.1.1.0-CTfGB7l09cqEHVIdvhrnH5-ghc9.6.3.a"; sourceTree = "<group>"; };
-		643B3B422CCBEB080083A2CF /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libffi.a; path = Libraries/libffi.a; sourceTree = "<group>"; };
-		643B3B432CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-CTfGB7l09cqEHVIdvhrnH5.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libHSsimplex-chat-6.1.1.0-CTfGB7l09cqEHVIdvhrnH5.a"; path = "Libraries/libHSsimplex-chat-6.1.1.0-CTfGB7l09cqEHVIdvhrnH5.a"; sourceTree = "<group>"; };
-		643B3B442CCBEB080083A2CF /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgmp.a; path = Libraries/libgmp.a; sourceTree = "<group>"; };
 		6440C9FF288857A10062C672 /* CIEventView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIEventView.swift; sourceTree = "<group>"; };
 		6440CA02288AECA70062C672 /* AddGroupMembersView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddGroupMembersView.swift; sourceTree = "<group>"; };
 		6442E0B9287F169300CEC0F9 /* AddGroupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddGroupView.swift; sourceTree = "<group>"; };
@@ -551,7 +550,6 @@
 		CE3097FA2C4C0C9F00180898 /* ErrorAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorAlert.swift; sourceTree = "<group>"; };
 		CE7548092C622630009579B7 /* SwipeLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwipeLabel.swift; sourceTree = "<group>"; };
 		CE984D4A2C36C5D500E3AEFF /* ChatItemClipShape.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemClipShape.swift; sourceTree = "<group>"; };
-		CEA6E91B2CBD21B0002B5DB4 /* UserDefault.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefault.swift; sourceTree = "<group>"; };
 		CEDB245A2C9CD71800FBC5F6 /* StickyScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StickyScrollView.swift; sourceTree = "<group>"; };
 		CEDE70212C48FD9500233B1F /* SEChatState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SEChatState.swift; sourceTree = "<group>"; };
 		CEE723A72C3BD3D70009AE93 /* SimpleX SE.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "SimpleX SE.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -657,14 +655,14 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				643B3B452CCBEB080083A2CF /* libgmpxx.a in Frameworks */,
-				643B3B472CCBEB080083A2CF /* libffi.a in Frameworks */,
-				643B3B492CCBEB080083A2CF /* libgmp.a in Frameworks */,
+				640548A32CB56735005DE1E4 /* libgmpxx.a in Frameworks */,
+				640548A72CB56735005DE1E4 /* libHSsimplex-chat-6.1.0.7-EtclnBf7vnkLnhnDA1lixv.a in Frameworks */,
+				640548A52CB56735005DE1E4 /* libffi.a in Frameworks */,
+				640548A42CB56735005DE1E4 /* libgmp.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
+				640548A62CB56735005DE1E4 /* libHSsimplex-chat-6.1.0.7-EtclnBf7vnkLnhnDA1lixv-ghc9.6.3.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
 				CE38A29C2C3FCD72005ED185 /* SwiftyGif in Frameworks */,
-				643B3B482CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-CTfGB7l09cqEHVIdvhrnH5.a in Frameworks */,
-				643B3B462CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-CTfGB7l09cqEHVIdvhrnH5-ghc9.6.3.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -741,6 +739,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
+				640548A02CB56735005DE1E4 /* libffi.a */,
+				6405489F2CB56735005DE1E4 /* libgmp.a */,
+				6405489E2CB56735005DE1E4 /* libgmpxx.a */,
+				640548A12CB56735005DE1E4 /* libHSsimplex-chat-6.1.0.7-EtclnBf7vnkLnhnDA1lixv-ghc9.6.3.a */,
+				640548A22CB56735005DE1E4 /* libHSsimplex-chat-6.1.0.7-EtclnBf7vnkLnhnDA1lixv.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -799,7 +802,6 @@
 				CE176F1F2C87014C00145DBC /* InvertedForegroundStyle.swift */,
 				CEDB245A2C9CD71800FBC5F6 /* StickyScrollView.swift */,
 				CEFB2EDE2CA1BCC7004B1ECE /* SheetRepresentable.swift */,
-				CEA6E91B2CBD21B0002B5DB4 /* UserDefault.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -812,11 +814,6 @@
 				5CC2C0FA2809BF11000C35E3 /* Localizable.strings */,
 				5C422A7C27A9A6FA0097A1E1 /* SimpleX (iOS).entitlements */,
 				5C764E5C279C70B7000C6508 /* Libraries */,
-				643B3B422CCBEB080083A2CF /* libffi.a */,
-				643B3B442CCBEB080083A2CF /* libgmp.a */,
-				643B3B402CCBEB080083A2CF /* libgmpxx.a */,
-				643B3B412CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-CTfGB7l09cqEHVIdvhrnH5-ghc9.6.3.a */,
-				643B3B432CCBEB080083A2CF /* libHSsimplex-chat-6.1.1.0-CTfGB7l09cqEHVIdvhrnH5.a */,
 				5CA059C2279559F40002BEB4 /* Shared */,
 				5CDCAD462818589900503DA2 /* SimpleX NSE */,
 				CEE723A82C3BD3D70009AE93 /* SimpleX SE */,
@@ -912,9 +909,10 @@
 		5CB924DF27A8678B00ACCCDD /* UserSettings */ = {
 			isa = PBXGroup;
 			children = (
-				643B3B4C2CCFD34B0083A2CF /* NetworkAndServers */,
 				5CB924D627A8563F00ACCCDD /* SettingsView.swift */,
 				5CB346E62868D76D001FD2EF /* NotificationsView.swift */,
+				5C9C2DA6289957AE00CC63B1 /* AdvancedNetworkSettings.swift */,
+				5C9C2DA82899DA6F00CC63B1 /* NetworkAndServers.swift */,
 				5CADE79929211BB900072E13 /* PreferencesView.swift */,
 				5C5DB70D289ABDD200730FFF /* AppearanceSettings.swift */,
 				5C05DF522840AA1D00C683F9 /* CallSettings.swift */,
@@ -922,6 +920,9 @@
 				5CC036DF29C488D500C0EF20 /* HiddenProfileView.swift */,
 				5C577F7C27C83AA10006112D /* MarkdownHelp.swift */,
 				5C3F1D57284363C400EC8A82 /* PrivacySettings.swift */,
+				5C93292E29239A170090FFF9 /* ProtocolServersView.swift */,
+				5C93293029239BED0090FFF9 /* ProtocolServerView.swift */,
+				5C9329402929248A0090FFF9 /* ScanProtocolServer.swift */,
 				5CB2084E28DA4B4800D024EC /* RTCServers.swift */,
 				64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */,
 				18415845648CA4F5A8BCA272 /* UserProfilesView.swift */,
@@ -1052,18 +1053,6 @@
 			path = Database;
 			sourceTree = "<group>";
 		};
-		643B3B4C2CCFD34B0083A2CF /* NetworkAndServers */ = {
-			isa = PBXGroup;
-			children = (
-				5C9329402929248A0090FFF9 /* ScanProtocolServer.swift */,
-				5C93293029239BED0090FFF9 /* ProtocolServerView.swift */,
-				5C93292E29239A170090FFF9 /* ProtocolServersView.swift */,
-				5C9C2DA6289957AE00CC63B1 /* AdvancedNetworkSettings.swift */,
-				5C9C2DA82899DA6F00CC63B1 /* NetworkAndServers.swift */,
-			);
-			path = NetworkAndServers;
-			sourceTree = "<group>";
-		};
 		6440CA01288AEC770062C672 /* Group */ = {
 			isa = PBXGroup;
 			children = (
@@ -1493,7 +1482,6 @@
 				5CFA59D12864782E00863A68 /* ChatArchiveView.swift in Sources */,
 				649BCDA22805D6EF00C3A862 /* CIImageView.swift in Sources */,
 				5CADE79C292131E900072E13 /* ContactPreferencesView.swift in Sources */,
-				CEA6E91C2CBD21B0002B5DB4 /* UserDefault.swift in Sources */,
 				5CB346E52868AA7F001FD2EF /* SuspendChat.swift in Sources */,
 				5C9C2DA52894777E00CC63B1 /* GroupProfileView.swift in Sources */,
 				5CEACCED27DEA495000BD591 /* MsgContentView.swift in Sources */,
@@ -1911,7 +1899,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 242;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1936,7 +1924,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1960,7 +1948,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 242;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1985,7 +1973,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -2001,11 +1989,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 242;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2021,11 +2009,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 242;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2046,7 +2034,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 242;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -2061,7 +2049,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2083,7 +2071,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 242;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -2098,7 +2086,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2120,7 +2108,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 242;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2146,7 +2134,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2171,7 +2159,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 242;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2197,7 +2185,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2222,7 +2210,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 242;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2237,7 +2225,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2256,7 +2244,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 245;
+				CURRENT_PROJECT_VERSION = 242;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2271,7 +2259,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.1.1;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -55,8 +55,8 @@ public enum ChatCommand {
    case apiRegisterToken(token: DeviceToken, notificationMode: NotificationsMode)
    case apiVerifyToken(token: DeviceToken, nonce: String, code: String)
    case apiDeleteToken(token: DeviceToken)
-    case apiGetNtfConns(nonce: String, encNtfInfo: String)
-    case apiGetConnNtfMessages(connIds: [String])
+    case apiGetNtfMessage(nonce: String, encNtfInfo: String)
+    case apiGetConnNtfMessage(connId: String)
    case apiNewGroup(userId: Int64, incognito: Bool, groupProfile: GroupProfile)
    case apiAddMember(groupId: Int64, contactId: Int64, memberRole: GroupMemberRole)
    case apiJoinGroup(groupId: Int64)
@@ -214,8 +214,8 @@ public enum ChatCommand {
            case let .apiRegisterToken(token, notificationMode): return "/_ntf register \(token.cmdString) \(notificationMode.rawValue)"
            case let .apiVerifyToken(token, nonce, code): return "/_ntf verify \(token.cmdString) \(nonce) \(code)"
            case let .apiDeleteToken(token): return "/_ntf delete \(token.cmdString)"
-            case let .apiGetNtfConns(nonce, encNtfInfo): return "/_ntf conns \(nonce) \(encNtfInfo)"
-            case let .apiGetConnNtfMessages(connIds): return "/_ntf conn messages \(connIds.joined(separator: ","))"
+            case let .apiGetNtfMessage(nonce, encNtfInfo): return "/_ntf message \(nonce) \(encNtfInfo)"
+            case let .apiGetConnNtfMessage(connId): return "/_ntf conn message \(connId)"
            case let .apiNewGroup(userId, incognito, groupProfile): return "/_group \(userId) incognito=\(onOff(incognito)) \(encodeJSON(groupProfile))"
            case let .apiAddMember(groupId, contactId, memberRole): return "/_add #\(groupId) \(contactId) \(memberRole)"
            case let .apiJoinGroup(groupId): return "/_join #\(groupId)"
@@ -369,8 +369,8 @@ public enum ChatCommand {
            case .apiRegisterToken: return "apiRegisterToken"
            case .apiVerifyToken: return "apiVerifyToken"
            case .apiDeleteToken: return "apiDeleteToken"
-            case .apiGetNtfConns: return "apiGetNtfConns"
-            case .apiGetConnNtfMessages: return "apiGetConnNtfMessages"
+            case .apiGetNtfMessage: return "apiGetNtfMessage"
+            case .apiGetConnNtfMessage: return "apiGetConnNtfMessage"
            case .apiNewGroup: return "apiNewGroup"
            case .apiAddMember: return "apiAddMember"
            case .apiJoinGroup: return "apiJoinGroup"
@@ -682,8 +682,8 @@ public enum ChatResponse: Decodable, Error {
    case callInvitations(callInvitations: [RcvCallInvitation])
    case ntfTokenStatus(status: NtfTknStatus)
    case ntfToken(token: DeviceToken, status: NtfTknStatus, ntfMode: NotificationsMode, ntfServer: String)
-    case ntfConns(ntfConns: [NtfConn])
-    case connNtfMessages(receivedMsgs: [NtfMsgInfo?])
+    case ntfMessages(user_: User?, connEntity_: ConnectionEntity?, expectedMsg_: NtfMsgInfo?, receivedMsg_: NtfMsgInfo?)
+    case connNtfMessage(receivedMsg_: NtfMsgInfo?)
    case ntfMessage(user: UserRef, connEntity: ConnectionEntity, ntfMessage: NtfMsgAckInfo)
    case contactConnectionDeleted(user: UserRef, connection: PendingContactConnection)
    case contactDisabled(user: UserRef, contact: Contact)
@@ -851,8 +851,8 @@ public enum ChatResponse: Decodable, Error {
            case .callInvitations: return "callInvitations"
            case .ntfTokenStatus: return "ntfTokenStatus"
            case .ntfToken: return "ntfToken"
-            case .ntfConns: return "ntfConns"
-            case .connNtfMessages: return "connNtfMessages"
+            case .ntfMessages: return "ntfMessages"
+            case .connNtfMessage: return "connNtfMessage"
            case .ntfMessage: return "ntfMessage"
            case .contactConnectionDeleted: return "contactConnectionDeleted"
            case .contactDisabled: return "contactDisabled"
@@ -1029,8 +1029,8 @@ public enum ChatResponse: Decodable, Error {
            case let .callInvitations(invs): return String(describing: invs)
            case let .ntfTokenStatus(status): return String(describing: status)
            case let .ntfToken(token, status, ntfMode, ntfServer): return "token: \(token)\nstatus: \(status.rawValue)\nntfMode: \(ntfMode.rawValue)\nntfServer: \(ntfServer)"
-            case let .ntfConns(ntfConns): return String(describing: ntfConns)
-            case let .connNtfMessages(receivedMsgs): return "receivedMsgs: \(String(describing: receivedMsgs))"
+            case let .ntfMessages(u, connEntity, expectedMsg_, receivedMsg_): return withUser(u, "connEntity: \(String(describing: connEntity))\nexpectedMsg_: \(String(describing: expectedMsg_))\nreceivedMsg_: \(String(describing: receivedMsg_))")
+            case let .connNtfMessage(receivedMsg_): return "receivedMsg_: \(String(describing: receivedMsg_))"
            case let .ntfMessage(u, connEntity, ntfMessage): return withUser(u, "connEntity: \(String(describing: connEntity))\nntfMessage: \(String(describing: ntfMessage))")
            case let .contactConnectionDeleted(u, connection): return withUser(u, String(describing: connection))
            case let .contactDisabled(u, contact): return withUser(u, String(describing: contact))
@@ -2041,7 +2041,7 @@ public enum SQLiteError: Decodable, Hashable {
 }

 public enum AgentErrorType: Decodable, Hashable {
-    case CMD(cmdErr: CommandErrorType, errContext: String)
+    case CMD(cmdErr: CommandErrorType)
    case CONN(connErr: ConnectionErrorType)
    case SMP(serverAddress: String, smpErr: ProtocolErrorType)
    case NTF(ntfErr: ProtocolErrorType)
@@ -2088,7 +2088,6 @@ public enum ProtocolErrorType: Decodable, Hashable {
    case AUTH
    case CRYPTO
    case QUOTA
-    case STORE(storeErr: String)
    case NO_MSG
    case LARGE_MSG
    case EXPIRED
@@ -85,7 +85,7 @@ public func registerGroupDefaults() {
        GROUP_DEFAULT_INITIAL_RANDOM_DB_PASSPHRASE: false,
        GROUP_DEFAULT_APP_LOCAL_AUTH_ENABLED: true,
        GROUP_DEFAULT_ALLOW_SHARE_EXTENSION: false,
-        GROUP_DEFAULT_PRIVACY_LINK_PREVIEWS: true,
+        GROUP_DEFAULT_PRIVACY_LINK_PREVIEWS: false,
        GROUP_DEFAULT_PRIVACY_ACCEPT_IMAGES: true,
        GROUP_DEFAULT_PRIVACY_TRANSFER_IMAGES_INLINE: false,
        GROUP_DEFAULT_PRIVACY_ENCRYPT_LOCAL_FILES: true,
@@ -1852,7 +1852,6 @@ public struct PendingContactConnection: Decodable, NamedChat, Hashable {

 public enum ConnStatus: String, Decodable, Hashable {
    case new = "new"
-    case prepared = "prepared"
    case joined = "joined"
    case requested = "requested"
    case accepted = "accepted"
@@ -1864,7 +1863,6 @@ public enum ConnStatus: String, Decodable, Hashable {
        get {
            switch self {
            case .new: return true
-            case .prepared: return false
            case .joined: return false
            case .requested: return true
            case .accepted: return true
@@ -2270,13 +2268,16 @@ public enum ConnectionEntity: Decodable, Hashable {
        case let .userContactConnection(entityConnection, _): entityConnection
        }
    }
-}
-
-public struct NtfConn: Decodable, Hashable {
-    public var user_: User?
-    public var connEntity_: ConnectionEntity?
-    public var expectedMsg_: NtfMsgInfo?

+    public var ntfsEnabled: Bool {
+        switch self {
+        case let .rcvDirectMsgConnection(_, contact): return contact?.chatSettings.enableNtfs == .all
+        case let .rcvGroupMsgConnection(_, groupInfo, _): return groupInfo.chatSettings.enableNtfs == .all
+        case .sndFileConnection: return false
+        case .rcvFileConnection: return false
+        case let .userContactConnection(_, userContact): return userContact.groupId == nil
+        }
+    }
 }

 public struct NtfMsgInfo: Decodable, Hashable {
@@ -15,14 +15,13 @@ public let ntfCategoryContactConnected = "NTF_CAT_CONTACT_CONNECTED"
 public let ntfCategoryMessageReceived = "NTF_CAT_MESSAGE_RECEIVED"
 public let ntfCategoryCallInvitation = "NTF_CAT_CALL_INVITATION"
 public let ntfCategoryConnectionEvent = "NTF_CAT_CONNECTION_EVENT"
-public let ntfCategoryManyEvents = "NTF_CAT_MANY_EVENTS"
 public let ntfCategoryCheckMessage = "NTF_CAT_CHECK_MESSAGE"

 public let appNotificationId = "chat.simplex.app.notification"

 let contactHidden = NSLocalizedString("Contact hidden:", comment: "notification")

-public func createContactRequestNtf(_ user: any UserLike, _ contactRequest: UserContactRequest, _ badgeCount: Int) -> UNMutableNotificationContent {
+public func createContactRequestNtf(_ user: any UserLike, _ contactRequest: UserContactRequest) -> UNMutableNotificationContent {
    let hideContent = ntfPreviewModeGroupDefault.get() == .hidden
    return createNotification(
        categoryIdentifier: ntfCategoryContactRequest,
@@ -35,12 +34,11 @@ public func createContactRequestNtf(_ user: any UserLike, _ contactRequest: User
            hideContent ? NSLocalizedString("this contact", comment: "notification title") : contactRequest.chatViewName
        ),
        targetContentIdentifier: nil,
-        userInfo: ["chatId": contactRequest.id, "contactRequestId": contactRequest.apiId, "userId": user.userId],
-        badgeCount: badgeCount
+        userInfo: ["chatId": contactRequest.id, "contactRequestId": contactRequest.apiId, "userId": user.userId]
    )
 }

-public func createContactConnectedNtf(_ user: any UserLike, _ contact: Contact, _ badgeCount: Int) -> UNMutableNotificationContent {
+public func createContactConnectedNtf(_ user: any UserLike, _ contact: Contact) -> UNMutableNotificationContent {
    let hideContent = ntfPreviewModeGroupDefault.get() == .hidden
    return createNotification(
        categoryIdentifier: ntfCategoryContactConnected,
@@ -53,13 +51,12 @@ public func createContactConnectedNtf(_ user: any UserLike, _ contact: Contact,
            hideContent ? NSLocalizedString("this contact", comment: "notification title") : contact.chatViewName
        ),
        targetContentIdentifier: contact.id,
-        userInfo: ["userId": user.userId],
+        userInfo: ["userId": user.userId]
 //            userInfo: ["chatId": contact.id, "contactId": contact.apiId]
-        badgeCount: badgeCount
    )
 }

-public func createMessageReceivedNtf(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem, _ badgeCount: Int) -> UNMutableNotificationContent {
+public func createMessageReceivedNtf(_ user: any UserLike, _ cInfo: ChatInfo, _ cItem: ChatItem) -> UNMutableNotificationContent {
    let previewMode = ntfPreviewModeGroupDefault.get()
    var title: String
    if case let .group(groupInfo) = cInfo, case let .groupRcv(groupMember) = cItem.chatDir {
@@ -72,13 +69,12 @@ public func createMessageReceivedNtf(_ user: any UserLike, _ cInfo: ChatInfo, _
        title: title,
        body: previewMode == .message ? hideSecrets(cItem) : NSLocalizedString("new message", comment: "notification"),
        targetContentIdentifier: cInfo.id,
-        userInfo: ["userId": user.userId],
+        userInfo: ["userId": user.userId]
 //            userInfo: ["chatId": cInfo.id, "chatItemId": cItem.id]
-        badgeCount: badgeCount
    )
 }

-public func createCallInvitationNtf(_ invitation: RcvCallInvitation, _ badgeCount: Int) -> UNMutableNotificationContent {
+public func createCallInvitationNtf(_ invitation: RcvCallInvitation) -> UNMutableNotificationContent {
    let text = invitation.callType.media == .video
                ? NSLocalizedString("Incoming video call", comment: "notification")
                : NSLocalizedString("Incoming audio call", comment: "notification")
@@ -88,12 +84,11 @@ public func createCallInvitationNtf(_ invitation: RcvCallInvitation, _ badgeCoun
        title: hideContent ? contactHidden : "\(invitation.contact.chatViewName):",
        body: text,
        targetContentIdentifier: nil,
-        userInfo: ["chatId": invitation.contact.id, "userId": invitation.user.userId],
-        badgeCount: badgeCount
+        userInfo: ["chatId": invitation.contact.id, "userId": invitation.user.userId]
    )
 }

-public func createConnectionEventNtf(_ user: User, _ connEntity: ConnectionEntity, _ badgeCount: Int) -> UNMutableNotificationContent {
+public func createConnectionEventNtf(_ user: User, _ connEntity: ConnectionEntity) -> UNMutableNotificationContent {
    let hideContent = ntfPreviewModeGroupDefault.get() == .hidden
    var title: String
    var body: String? = nil
@@ -123,12 +118,11 @@ public func createConnectionEventNtf(_ user: User, _ connEntity: ConnectionEntit
        title: title,
        body: body,
        targetContentIdentifier: targetContentIdentifier,
-        userInfo: ["userId": user.userId],
-        badgeCount: badgeCount
+        userInfo: ["userId": user.userId]
    )
 }

-public func createErrorNtf(_ dbStatus: DBMigrationResult, _ badgeCount: Int) -> UNMutableNotificationContent {
+public func createErrorNtf(_ dbStatus: DBMigrationResult) -> UNMutableNotificationContent {
    var title: String
    switch dbStatus {
    case .errorNotADatabase:
@@ -148,16 +142,14 @@ public func createErrorNtf(_ dbStatus: DBMigrationResult, _ badgeCount: Int) ->
    }
    return createNotification(
        categoryIdentifier: ntfCategoryConnectionEvent,
-        title: title,
-        badgeCount: badgeCount
+        title: title
    )
 }

-public func createAppStoppedNtf(_ badgeCount: Int) -> UNMutableNotificationContent {
+public func createAppStoppedNtf() -> UNMutableNotificationContent {
    return createNotification(
        categoryIdentifier: ntfCategoryConnectionEvent,
-        title: NSLocalizedString("Encrypted message: app is stopped", comment: "notification"),
-        badgeCount: badgeCount
+        title: NSLocalizedString("Encrypted message: app is stopped", comment: "notification")
    )
 }

@@ -167,15 +159,8 @@ private func groupMsgNtfTitle(_ groupInfo: GroupInfo, _ groupMember: GroupMember
    : "#\(groupInfo.displayName) \(groupMember.chatViewName):"
 }

-public func createNotification(
-    categoryIdentifier: String,
-    title: String,
-    subtitle: String? = nil,
-    body: String? = nil,
-    targetContentIdentifier: String? = nil,
-    userInfo: [AnyHashable : Any] = [:],
-    badgeCount: Int
-) -> UNMutableNotificationContent {
+public func createNotification(categoryIdentifier: String, title: String, subtitle: String? = nil, body: String? = nil,
+                        targetContentIdentifier: String? = nil, userInfo: [AnyHashable : Any] = [:]) -> UNMutableNotificationContent {
    let content = UNMutableNotificationContent()
    content.categoryIdentifier = categoryIdentifier
    content.title = title
@@ -185,7 +170,6 @@ public func createNotification(
    content.userInfo = userInfo
    // TODO move logic of adding sound here, so it applies to background notifications too
    content.sound = .default
-    content.badge = badgeCount as NSNumber
 //        content.interruptionLevel = .active
 //        content.relevanceScore = 0.5 // 0-1
    return content
@@ -694,30 +694,15 @@
 /* No comment provided by engineer. */
 "Bad message ID" = "Falsche Nachrichten-ID";

-/* No comment provided by engineer. */
-"Better calls" = "Verbesserte Anrufe";
-
 /* No comment provided by engineer. */
 "Better groups" = "Bessere Gruppen";

-/* No comment provided by engineer. */
-"Better message dates." = "Verbesserte Nachrichten-Datumsinformation";
-
 /* No comment provided by engineer. */
 "Better messages" = "Verbesserungen bei Nachrichten";

 /* No comment provided by engineer. */
 "Better networking" = "Kontrollieren Sie Ihr Netzwerk";

-/* No comment provided by engineer. */
-"Better notifications" = "Verbesserte Benachrichtigungen";
-
-/* No comment provided by engineer. */
-"Better security ✅" = "Verbesserte Sicherheit ✅";
-
-/* No comment provided by engineer. */
-"Better user experience" = "Verbesserte Nutzer-Erfahrung";
-
 /* No comment provided by engineer. */
 "Black" = "Schwarz";

@@ -1307,9 +1292,6 @@
 /* No comment provided by engineer. */
 "Custom time" = "Zeit anpassen";

-/* No comment provided by engineer. */
-"Customizable message shape." = "Anpassbares Format des Nachrichtenfelds";
-
 /* No comment provided by engineer. */
 "Customize theme" = "Design anpassen";

@@ -1500,9 +1482,6 @@
 /* No comment provided by engineer. */
 "Delete old database?" = "Alte Datenbank löschen?";

-/* No comment provided by engineer. */
-"Delete or moderate up to 200 messages." = "Bis zu 200 Nachrichten löschen oder moderieren";
-
 /* No comment provided by engineer. */
 "Delete pending connection?" = "Ausstehende Verbindung löschen?";

@@ -2251,9 +2230,6 @@
 /* alert message */
 "Forward messages without files?" = "Nachrichten ohne Dateien weiterleiten?";

-/* No comment provided by engineer. */
-"Forward up to 20 messages at once." = "Bis zu 20 Nachrichten auf einmal weiterleiten";
-
 /* No comment provided by engineer. */
 "forwarded" = "weitergeleitet";

@@ -2494,9 +2470,6 @@
 /* No comment provided by engineer. */
 "Importing archive" = "Archiv wird importiert";

-/* No comment provided by engineer. */
-"Improved delivery, reduced traffic usage.\nMore improvements are coming soon!" = "Verbesserte Nachrichten-Auslieferung und verringerter Datenverbrauch.\nWeitere Verbesserungen sind bald verfügbar!";
-
 /* No comment provided by engineer. */
 "Improved message delivery" = "Verbesserte Zustellung von Nachrichten";

@@ -4298,9 +4271,6 @@
 /* simplex link type */
 "SimpleX one-time invitation" = "SimpleX-Einmal-Einladung";

-/* No comment provided by engineer. */
-"SimpleX protocols reviewed by Trail of Bits." = "Die SimpleX-Protokolle wurden von Trail of Bits überprüft.";
-
 /* No comment provided by engineer. */
 "Simplified incognito mode" = "Vereinfachter Inkognito-Modus";

@@ -4421,12 +4391,6 @@
 /* No comment provided by engineer. */
 "Support SimpleX Chat" = "Unterstützung von SimpleX Chat";

-/* No comment provided by engineer. */
-"Switch audio and video during the call." = "Während des Anrufs zwischen Audio und Video wechseln";
-
-/* No comment provided by engineer. */
-"Switch chat profile for 1-time invitations." = "Das Chat-Profil für Einmal-Einladungen wechseln";
-
 /* No comment provided by engineer. */
 "System" = "System";

@@ -694,30 +694,15 @@
 /* No comment provided by engineer. */
 "Bad message ID" = "ID de mensaje incorrecto";

-/* No comment provided by engineer. */
-"Better calls" = "Llamadas mejoradas";
-
 /* No comment provided by engineer. */
 "Better groups" = "Grupos mejorados";

-/* No comment provided by engineer. */
-"Better message dates." = "Sistema de fechas mejorado.";
-
 /* No comment provided by engineer. */
 "Better messages" = "Mensajes mejorados";

 /* No comment provided by engineer. */
 "Better networking" = "Uso de red mejorado";

-/* No comment provided by engineer. */
-"Better notifications" = "Notificaciones mejoradas";
-
-/* No comment provided by engineer. */
-"Better security ✅" = "Seguridad mejorada ✅";
-
-/* No comment provided by engineer. */
-"Better user experience" = "Experiencia de usuario mejorada";
-
 /* No comment provided by engineer. */
 "Black" = "Negro";

@@ -1307,9 +1292,6 @@
 /* No comment provided by engineer. */
 "Custom time" = "Tiempo personalizado";

-/* No comment provided by engineer. */
-"Customizable message shape." = "Forma personalizable de los mensajes.";
-
 /* No comment provided by engineer. */
 "Customize theme" = "Personalizar tema";

@@ -1500,9 +1482,6 @@
 /* No comment provided by engineer. */
 "Delete old database?" = "¿Eliminar base de datos antigua?";

-/* No comment provided by engineer. */
-"Delete or moderate up to 200 messages." = "Borra o modera hasta 200 mensajes a la vez.";
-
 /* No comment provided by engineer. */
 "Delete pending connection?" = "¿Eliminar conexión pendiente?";

@@ -2251,9 +2230,6 @@
 /* alert message */
 "Forward messages without files?" = "¿Reenviar mensajes sin los archivos?";

-/* No comment provided by engineer. */
-"Forward up to 20 messages at once." = "Desplazamiento de hasta 20 mensajes.";
-
 /* No comment provided by engineer. */
 "forwarded" = "reenviado";

@@ -2494,9 +2470,6 @@
 /* No comment provided by engineer. */
 "Importing archive" = "Importando archivo";

-/* No comment provided by engineer. */
-"Improved delivery, reduced traffic usage.\nMore improvements are coming soon!" = "Reducción del tráfico y entrega mejorada.\n¡Pronto habrá nuevas mejoras!";
-
 /* No comment provided by engineer. */
 "Improved message delivery" = "Entrega de mensajes mejorada";

@@ -4298,9 +4271,6 @@
 /* simplex link type */
 "SimpleX one-time invitation" = "Invitación SimpleX de un uso";

-/* No comment provided by engineer. */
-"SimpleX protocols reviewed by Trail of Bits." = "Protocolos de SimpleX auditados por Trail of Bits.";
-
 /* No comment provided by engineer. */
 "Simplified incognito mode" = "Modo incógnito simplificado";

@@ -4421,12 +4391,6 @@
 /* No comment provided by engineer. */
 "Support SimpleX Chat" = "Soporte SimpleX Chat";

-/* No comment provided by engineer. */
-"Switch audio and video during the call." = "Intercambia audio y video durante la llamada.";
-
-/* No comment provided by engineer. */
-"Switch chat profile for 1-time invitations." = "Cambia el perfil de chat para invitaciones de un solo uso.";
-
 /* No comment provided by engineer. */
 "System" = "Sistema";

@@ -479,7 +479,7 @@
 "All your contacts will remain connected." = "Minden ismerősével kapcsolatban marad.";

 /* No comment provided by engineer. */
-"All your contacts will remain connected. Profile update will be sent to your contacts." = "Az ismerőseivel kapcsolatban marad. A profil-változtatások frissítésre kerülnek az ismerősöknél.";
+"All your contacts will remain connected. Profile update will be sent to your contacts." = "Az ismerőseivel kapcsolatban marad. A profil változtatások frissítésre kerülnek az ismerősöknél.";

 /* No comment provided by engineer. */
 "All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." = "Minden ismerőse, a beszélgetései és a fájljai biztonságosan titkosításra kerülnek, melyek részletekben feltöltődnek a beállított XFTP-közvetítő-kiszolgálóra.";
@@ -694,30 +694,15 @@
 /* No comment provided by engineer. */
 "Bad message ID" = "Téves üzenet ID";

-/* No comment provided by engineer. */
-"Better calls" = "Továbbfejlesztett hívásélmény";
-
 /* No comment provided by engineer. */
 "Better groups" = "Javított csoportok";

-/* No comment provided by engineer. */
-"Better message dates." = "Továbbfejlesztett üzenetdátumok.";
-
 /* No comment provided by engineer. */
 "Better messages" = "Jobb üzenetek";

 /* No comment provided by engineer. */
 "Better networking" = "Jobb hálózatkezelés";

-/* No comment provided by engineer. */
-"Better notifications" = "Továbbfejlesztett értesítések";
-
-/* No comment provided by engineer. */
-"Better security ✅" = "Továbbfejlesztett biztonság ✅";
-
-/* No comment provided by engineer. */
-"Better user experience" = "Továbbfejlesztett felhasználói élmény";
-
 /* No comment provided by engineer. */
 "Black" = "Fekete";

@@ -933,7 +918,7 @@
 "Chat preferences were changed." = "A csevegési beállítások megváltoztak.";

 /* No comment provided by engineer. */
-"Chat profile" = "Csevegési profil";
+"Chat profile" = "Felhasználói profil";

 /* No comment provided by engineer. */
 "Chat theme" = "Csevegés témája";
@@ -948,7 +933,7 @@
 "Chinese and Spanish interface" = "Kínai és spanyol kezelőfelület";

 /* No comment provided by engineer. */
-"Choose _Migrate from another device_ on the new device and scan QR code." = "Válassza az _Átköltöztetés egy másik eszközről_ opciót az új eszközén és olvassa be a QR-kódot.";
+"Choose _Migrate from another device_ on the new device and scan QR code." = "Válassza az _Átköltöztetés egy másik eszközről opciót az új eszközén és olvassa be a QR-kódot.";

 /* No comment provided by engineer. */
 "Choose file" = "Fájl kiválasztása";
@@ -1155,7 +1140,7 @@
 "Connection terminated" = "Kapcsolat megszakítva";

 /* No comment provided by engineer. */
-"Connection timeout" = "Időtúllépés kapcsolódáskor";
+"Connection timeout" = "Kapcsolat időtúllépés";

 /* No comment provided by engineer. */
 "Connection with desktop stopped" = "A kapcsolat a számítógéppel megszakadt";
@@ -1307,9 +1292,6 @@
 /* No comment provided by engineer. */
 "Custom time" = "Személyreszabott idő";

-/* No comment provided by engineer. */
-"Customizable message shape." = "Testreszabható üzenetbuborékok.";
-
 /* No comment provided by engineer. */
 "Customize theme" = "Téma személyre szabása";

@@ -1341,7 +1323,7 @@
 "Database ID: %d" = "Adatbázis-azonosító: %d";

 /* No comment provided by engineer. */
-"Database IDs and Transport isolation option." = "Adatbázis-azonosítók és átvitel-izolációs beállítások.";
+"Database IDs and Transport isolation option." = "Adatbázis-azonosítók és átviteli izolációs beállítások.";

 /* No comment provided by engineer. */
 "Database is encrypted using a random passphrase, you can change it." = "Az adatbázis egy véletlenszerű jelmondattal van titkosítva, ami megváltoztatható.";
@@ -1500,9 +1482,6 @@
 /* No comment provided by engineer. */
 "Delete old database?" = "Régi adatbázis törlése?";

-/* No comment provided by engineer. */
-"Delete or moderate up to 200 messages." = "Legfeljebb 200 üzenet egyszerre való törlése, vagy moderálása.";
-
 /* No comment provided by engineer. */
 "Delete pending connection?" = "Függőben lévő ismerőskérelem törlése?";

@@ -1576,7 +1555,7 @@
 "Detailed statistics" = "Részletes statisztikák";

 /* No comment provided by engineer. */
-"Details" = "További részletek";
+"Details" = "Részletek";

 /* No comment provided by engineer. */
 "Develop" = "Fejlesztés";
@@ -1600,7 +1579,7 @@
 "different migration in the app/database: %@ / %@" = "különböző átköltöztetések az alkalmazásban/adatbázisban: %@ / %@";

 /* No comment provided by engineer. */
-"Different names, avatars and transport isolation." = "Különböző nevek, profilképek és átvitel-izoláció.";
+"Different names, avatars and transport isolation." = "Különböző nevek, avatarok és átviteli izoláció.";

 /* connection level description */
 "direct" = "közvetlen";
@@ -1973,7 +1952,7 @@
 "Error deleting token" = "Hiba a token törlésekor";

 /* No comment provided by engineer. */
-"Error deleting user profile" = "Hiba a felhasználó-profil törlésekor";
+"Error deleting user profile" = "Hiba a felhasználói profil törlésekor";

 /* No comment provided by engineer. */
 "Error downloading the archive" = "Hiba az archívum letöltésekor";
@@ -2042,7 +2021,7 @@
 "Error saving settings" = "Hiba a beállítások mentésekor";

 /* No comment provided by engineer. */
-"Error saving user password" = "Hiba a felhasználói jelszó mentésekor";
+"Error saving user password" = "Hiba a felhasználó jelszavának mentésekor";

 /* No comment provided by engineer. */
 "Error scanning code: %@" = "Hiba a kód beolvasásakor: %@";
@@ -2084,7 +2063,7 @@
 "Error updating settings" = "Hiba történt a beállítások frissítésekor";

 /* No comment provided by engineer. */
-"Error updating user privacy" = "Hiba a felhasználói adatvédelem frissítésekor";
+"Error updating user privacy" = "Hiba a felhasználói beállítások frissítésekor";

 /* No comment provided by engineer. */
 "Error uploading the archive" = "Hiba az archívum feltöltésekor";
@@ -2251,9 +2230,6 @@
 /* alert message */
 "Forward messages without files?" = "Üzenetek továbbítása fájlok nélkül?";

-/* No comment provided by engineer. */
-"Forward up to 20 messages at once." = "Legfeljebb 20 üzenet egyszerre való továbbítása.";
-
 /* No comment provided by engineer. */
 "forwarded" = "továbbított";

@@ -2408,7 +2384,7 @@
 "Hidden profile password" = "Rejtett profiljelszó";

 /* chat item action */
-"Hide" = "Összecsukás";
+"Hide" = "Elrejtés";

 /* No comment provided by engineer. */
 "Hide app screen in the recent apps." = "Alkalmazás képernyőjének elrejtése a gyakran használt alkalmazások között.";
@@ -2459,7 +2435,7 @@
 "If you enter your self-destruct passcode while opening the app:" = "Ha az alkalmazás megnyitásakor megadja az önmegsemmisítő jelkódot:";

 /* No comment provided by engineer. */
-"If you need to use the chat now tap **Do it later** below (you will be offered to migrate the database when you restart the app)." = "Ha most kell használnia a csevegést, koppintson alább a **Befejezés később** lehetőségre (az alkalmazás újraindításakor felajánlásra kerül az adatbázis átköltöztetése).";
+"If you need to use the chat now tap **Do it later** below (you will be offered to migrate the database when you restart the app)." = "Ha most kell használnia a csevegést, koppintson alább az **Befejezés később** lehetőségre (az alkalmazás újraindításakor felajánlásra kerül az adatbázis átköltöztetése).";

 /* No comment provided by engineer. */
 "Ignore" = "Mellőzés";
@@ -2494,9 +2470,6 @@
 /* No comment provided by engineer. */
 "Importing archive" = "Archívum importálása";

-/* No comment provided by engineer. */
-"Improved delivery, reduced traffic usage.\nMore improvements are coming soon!" = "Továbbfejlesztett kézbesítés, csökkentett adatforgalom-használat.\nTovábbi fejlesztések hamarosan!";
-
 /* No comment provided by engineer. */
 "Improved message delivery" = "Továbbfejlesztett üzenetkézbesítés";

@@ -2816,7 +2789,7 @@
 "Make sure WebRTC ICE server addresses are in correct format, line separated and are not duplicated." = "Győződjön meg arról, hogy a WebRTC ICE-kiszolgáló címei megfelelő formátumúak, sorszeparáltak és nincsenek duplikálva.";

 /* No comment provided by engineer. */
-"Many people asked: *if SimpleX has no user identifiers, how can it deliver messages?*" = "Sokan kérdezték: *ha a SimpleX Chatnek nincsenek felhasználó-azonosítói, akkor hogyan tud üzeneteket kézbesíteni?*";
+"Many people asked: *if SimpleX has no user identifiers, how can it deliver messages?*" = "Sokan kérdezték: *ha a SimpleX Chatnek nincsenek felhasználói azonosítói, akkor hogyan tud üzeneteket kézbesíteni?*";

 /* No comment provided by engineer. */
 "Mark deleted for everyone" = "Jelölje meg mindenki számára töröltként";
@@ -3226,7 +3199,7 @@
 "Onion hosts will not be used." = "Onion-kiszolgálók nem lesznek használva.";

 /* No comment provided by engineer. */
-"Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**." = "Csak az eszközök alkalmazásai tárolják a felhasználó-profilokat, névjegyeket, csoportokat és a **2 rétegű végpontok közötti titkosítással** küldött üzeneteket.";
+"Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**." = "Csak az eszközök alkalmazásai tárolják a felhasználói profilokat, névjegyeket, csoportokat és a **2 rétegű végpontok közötti titkosítással** küldött üzeneteket.";

 /* No comment provided by engineer. */
 "Only delete conversation" = "Csak a beszélgetés törlése";
@@ -3292,7 +3265,7 @@
 "Open Settings" = "Beállítások megnyitása";

 /* authentication reason */
-"Open user profiles" = "Felhasználó-profilok megnyitása";
+"Open user profiles" = "Felhasználói profilok megnyitása";

 /* No comment provided by engineer. */
 "Open-source protocol and code – anybody can run the servers." = "Nyílt forráskódú protokoll és forráskód – bárki üzemeltethet kiszolgálókat.";
@@ -3388,10 +3361,10 @@
 "Picture-in-picture calls" = "Kép a képben hívások";

 /* No comment provided by engineer. */
-"PING count" = "PING-ek száma";
+"PING count" = "PING számláló";

 /* No comment provided by engineer. */
-"PING interval" = "Időtartam a PING-ek között";
+"PING interval" = "PING időköze";

 /* No comment provided by engineer. */
 "Play from the chat list." = "Lejátszás a csevegési listából.";
@@ -3550,10 +3523,10 @@
 "Protect your IP address from the messaging relays chosen by your contacts.\nEnable in *Network & servers* settings." = "Védje IP-címét az ismerősei által kiválasztott üzenet-közvetítő-kiszolgálókkal szemben.\nEngedélyezze a „Beállítások -> Hálózat és kiszolgálók” menüben.";

 /* No comment provided by engineer. */
-"Protocol timeout" = "Protokoll időtúllépése";
+"Protocol timeout" = "Protokoll időtúllépés";

 /* No comment provided by engineer. */
-"Protocol timeout per KB" = "Protokoll időtúllépése KB-onként";
+"Protocol timeout per KB" = "Protokoll időkorlát KB-onként";

 /* No comment provided by engineer. */
 "Proxied" = "Proxyzott";
@@ -3637,7 +3610,7 @@
 "Received reply" = "Fogadott válaszüzenet-buborék színe";

 /* No comment provided by engineer. */
-"Received total" = "Összes fogadott üzenet";
+"Received total" = "Összes fogadott";

 /* No comment provided by engineer. */
 "Receiving address will be changed to a different server. Address change will complete after sender comes online." = "A fogadó cím egy másik kiszolgálóra változik. A címváltoztatás a feladó online állapotba kerülése után fejeződik be.";
@@ -3873,7 +3846,7 @@
 "Save preferences?" = "Beállítások mentése?";

 /* No comment provided by engineer. */
-"Save profile password" = "Profiljelszó mentése";
+"Save profile password" = "Felhasználói fiók jelszavának mentése";

 /* No comment provided by engineer. */
 "Save servers" = "Kiszolgálók mentése";
@@ -4101,7 +4074,7 @@
 "Sent reply" = "Válaszüzenet-buborék színe";

 /* No comment provided by engineer. */
-"Sent total" = "Összes elküldött üzenet";
+"Sent total" = "Összes elküldött";

 /* No comment provided by engineer. */
 "Sent via proxy" = "Proxyn keresztül küldve";
@@ -4239,7 +4212,7 @@
 "Show last messages" = "Szobák utolsó üzeneteinek megjelenítése a listanézetben";

 /* No comment provided by engineer. */
-"Show message status" = "Üzenetállapot megjelenítése";
+"Show message status" = "Üzenet állapot megjelenítése";

 /* No comment provided by engineer. */
 "Show percentage" = "Százalék megjelenítése";
@@ -4298,9 +4271,6 @@
 /* simplex link type */
 "SimpleX one-time invitation" = "Egyszer használható SimpleX-meghívó";

-/* No comment provided by engineer. */
-"SimpleX protocols reviewed by Trail of Bits." = "A SimpleX Chat biztonsága a Trail of Bits által lett újraauditálva.";
-
 /* No comment provided by engineer. */
 "Simplified incognito mode" = "Egyszerűsített inkognitómód";

@@ -4421,12 +4391,6 @@
 /* No comment provided by engineer. */
 "Support SimpleX Chat" = "SimpleX Chat támogatása";

-/* No comment provided by engineer. */
-"Switch audio and video during the call." = "Hang/Videó váltása hívás közben.";
-
-/* No comment provided by engineer. */
-"Switch chat profile for 1-time invitations." = "Csevegési profilváltás az egyszer használható meghívókhoz.";
-
 /* No comment provided by engineer. */
 "System" = "Rendszer";

@@ -4446,25 +4410,25 @@
 "Tap to activate profile." = "A profil aktiválásához koppintson az ikonra.";

 /* No comment provided by engineer. */
-"Tap to Connect" = "Koppintson ide a kapcsolódáshoz";
+"Tap to Connect" = "Koppintson a kapcsolódáshoz";

 /* No comment provided by engineer. */
-"Tap to join" = "Koppintson ide a csatlakozáshoz";
+"Tap to join" = "Koppintson a csatlakozáshoz";

 /* No comment provided by engineer. */
-"Tap to join incognito" = "Koppintson ide az inkognitóban való csatlakozáshoz";
+"Tap to join incognito" = "Koppintson az inkognitóban való csatlakozáshoz";

 /* No comment provided by engineer. */
 "Tap to paste link" = "Koppintson ide a hivatkozás beillesztéséhez";

 /* No comment provided by engineer. */
-"Tap to scan" = "Koppintson ide a QR-kód beolvasáshoz";
+"Tap to scan" = "Koppintson a beolvasáshoz";

 /* No comment provided by engineer. */
 "TCP connection" = "TCP kapcsolat";

 /* No comment provided by engineer. */
-"TCP connection timeout" = "TCP kapcsolat időtúllépése";
+"TCP connection timeout" = "TCP kapcsolat időtúllépés";

 /* No comment provided by engineer. */
 "TCP_KEEPCNT" = "TCP_KEEPCNT";
@@ -4500,7 +4464,7 @@
 "Thanks to the users – contribute via Weblate!" = "Köszönet a felhasználóknak - hozzájárulás a Weblate-en!";

 /* No comment provided by engineer. */
-"The 1st platform without any user identifiers – private by design." = "Az első csevegési rendszer bármiféle felhasználó-azonosító nélkül - privátra lett tervezre.";
+"The 1st platform without any user identifiers – private by design." = "Az első csevegési rendszer bármiféle felhasználó azonosító nélkül - privátra lett tervezre.";

 /* No comment provided by engineer. */
 "The app can notify you when you receive messages or contact requests - please open settings to enable." = "Az alkalmazás értesíteni fogja, amikor üzeneteket vagy kapcsolatkéréseket kap – beállítások megnyitása az engedélyezéshez.";
@@ -4635,7 +4599,7 @@
 "To make a new connection" = "Új kapcsolat létrehozásához";

 /* No comment provided by engineer. */
-"To protect privacy, instead of user IDs used by all other platforms, SimpleX has identifiers for message queues, separate for each of your contacts." = "Az adatvédelem érdekében, a más csevegési platformokon megszokott felhasználó-azonosítók helyett, a SimpleX csak az üzenetek sorbaállításához használ azonosítókat, minden egyes ismerőshöz egy-egy különbözőt.";
+"To protect privacy, instead of user IDs used by all other platforms, SimpleX has identifiers for message queues, separate for each of your contacts." = "Az adatvédelem érdekében, a más csevegési platformokon megszokott felhasználói azonosítók helyett, a SimpleX csak az üzenetek sorbaállításához használ azonosítókat, minden egyes ismerőshöz egy-egy különbözőt.";

 /* No comment provided by engineer. */
 "To protect timezone, image/voice files use UTC." = "Az időzóna védelme érdekében a kép-/hangfájlok UTC-t használnak.";
@@ -4674,10 +4638,10 @@
 "Toolbar opacity" = "Eszköztár átlátszatlansága";

 /* No comment provided by engineer. */
-"Total" = "Összes kapcsolat";
+"Total" = "Összesen";

 /* No comment provided by engineer. */
-"Transport isolation" = "Átvitel-izoláció módja";
+"Transport isolation" = "Kapcsolat izolációs mód";

 /* No comment provided by engineer. */
 "Transport sessions" = "Munkamenetek átvitele";
@@ -5151,13 +5115,13 @@
 "You can enable later via Settings" = "Később engedélyezheti a „Beállításokban”";

 /* No comment provided by engineer. */
-"You can enable them later via app Privacy & Security settings." = "Később engedélyezheti őket az alkalmazás „Adatvédelem és biztonság” menüjében.";
+"You can enable them later via app Privacy & Security settings." = "Később engedélyezheti őket az alkalmazás „Adatvédelem és biztonság” menüben.";

 /* No comment provided by engineer. */
 "You can give another try." = "Megpróbálhatja még egyszer.";

 /* No comment provided by engineer. */
-"You can hide or mute a user profile - swipe it to the right." = "Elrejtheti vagy lenémíthatja a felhasználó -profiljait - csúsztassa jobbra a profilt.";
+"You can hide or mute a user profile - swipe it to the right." = "Elrejtheti vagy lenémíthatja a felhasználó profiljait - csúsztassa jobbra a profilt.";

 /* No comment provided by engineer. */
 "You can make it visible to your SimpleX contacts via Settings." = "Láthatóvá teheti a SimpleXbeli ismerősei számára a „Beállításokban”.";
@@ -2,7 +2,7 @@
 "CFBundleName" = "SimpleX";

 /* Privacy - Camera Usage Description */
-"NSCameraUsageDescription" = "A SimpleXnek kamera-hozzáférésre van szüksége a QR-kódok beolvasásához, hogy kapcsolódhasson más felhasználókhoz és videohívásokhoz.";
+"NSCameraUsageDescription" = "A SimpleX-nek kamera-hozzáférésre van szüksége a QR-kódok beolvasásához, hogy kapcsolódhasson más felhasználókhoz és videohívásokhoz.";

 /* Privacy - Face ID Usage Description */
 "NSFaceIDUsageDescription" = "A SimpleX Face ID-t használ a helyi hitelesítéshez";
@@ -11,8 +11,8 @@
 "NSLocalNetworkUsageDescription" = "A SimpleX helyi hálózati hozzáférést használ, hogy lehetővé tegye a felhasználói csevegőprofil használatát számítógépen keresztül ugyanazon a hálózaton.";

 /* Privacy - Microphone Usage Description */
-"NSMicrophoneUsageDescription" = "A SimpleXnek mikrofon-hozzáférésre van szüksége hang- és videohívásokhoz, valamint hangüzenetek rögzítéséhez.";
+"NSMicrophoneUsageDescription" = "A SimpleX-nek mikrofon-hozzáférésre van szüksége hang- és videohívásokhoz, valamint hangüzenetek rögzítéséhez.";

 /* Privacy - Photo Library Additions Usage Description */
-"NSPhotoLibraryAddUsageDescription" = "A SimpleXnek galéria-hozzáférésre van szüksége a rögzített és fogadott média mentéséhez";
+"NSPhotoLibraryAddUsageDescription" = "A SimpleX-nek hozzáférésre van szüksége a Galériához a rögzített és fogadott média mentéséhez";

@@ -694,30 +694,15 @@
 /* No comment provided by engineer. */
 "Bad message ID" = "ID del messaggio errato";

-/* No comment provided by engineer. */
-"Better calls" = "Chiamate migliorate";
-
 /* No comment provided by engineer. */
 "Better groups" = "Gruppi migliorati";

-/* No comment provided by engineer. */
-"Better message dates." = "Date dei messaggi migliorate.";
-
 /* No comment provided by engineer. */
 "Better messages" = "Messaggi migliorati";

 /* No comment provided by engineer. */
 "Better networking" = "Rete migliorata";

-/* No comment provided by engineer. */
-"Better notifications" = "Notifiche migliorate";
-
-/* No comment provided by engineer. */
-"Better security ✅" = "Sicurezza migliorata ✅";
-
-/* No comment provided by engineer. */
-"Better user experience" = "Esperienza utente migliorata";
-
 /* No comment provided by engineer. */
 "Black" = "Nero";

@@ -1307,9 +1292,6 @@
 /* No comment provided by engineer. */
 "Custom time" = "Tempo personalizzato";

-/* No comment provided by engineer. */
-"Customizable message shape." = "Forma dei messaggi personalizzabile.";
-
 /* No comment provided by engineer. */
 "Customize theme" = "Personalizza il tema";

@@ -1500,9 +1482,6 @@
 /* No comment provided by engineer. */
 "Delete old database?" = "Eliminare il database vecchio?";

-/* No comment provided by engineer. */
-"Delete or moderate up to 200 messages." = "Elimina o modera fino a 200 messaggi.";
-
 /* No comment provided by engineer. */
 "Delete pending connection?" = "Eliminare la connessione in attesa?";

@@ -2251,9 +2230,6 @@
 /* alert message */
 "Forward messages without files?" = "Inoltrare i messaggi senza file?";

-/* No comment provided by engineer. */
-"Forward up to 20 messages at once." = "Inoltra fino a 20 messaggi alla volta.";
-
 /* No comment provided by engineer. */
 "forwarded" = "inoltrato";

@@ -2494,9 +2470,6 @@
 /* No comment provided by engineer. */
 "Importing archive" = "Importazione archivio";

-/* No comment provided by engineer. */
-"Improved delivery, reduced traffic usage.\nMore improvements are coming soon!" = "Consegna migliorata, utilizzo di traffico ridotto.\nAltri miglioramenti sono in arrivo!";
-
 /* No comment provided by engineer. */
 "Improved message delivery" = "Consegna dei messaggi migliorata";

@@ -4298,9 +4271,6 @@
 /* simplex link type */
 "SimpleX one-time invitation" = "Invito SimpleX una tantum";

-/* No comment provided by engineer. */
-"SimpleX protocols reviewed by Trail of Bits." = "Protocolli di SimpleX esaminati da Trail of Bits.";
-
 /* No comment provided by engineer. */
 "Simplified incognito mode" = "Modalità incognito semplificata";

@@ -4421,12 +4391,6 @@
 /* No comment provided by engineer. */
 "Support SimpleX Chat" = "Supporta SimpleX Chat";

-/* No comment provided by engineer. */
-"Switch audio and video during the call." = "Cambia tra audio e video durante la chiamata.";
-
-/* No comment provided by engineer. */
-"Switch chat profile for 1-time invitations." = "Cambia profilo di chat per inviti una tantum.";
-
 /* No comment provided by engineer. */
 "System" = "Sistema";

@@ -2067,12 +2067,6 @@
 /* No comment provided by engineer. */
 "Messages & files" = "メッセージ & ファイル";

-/* No comment provided by engineer. */
-"Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery." = "メッセージ、ファイル、通話は、前方秘匿性、否認可能性および侵入復元性を備えた**エンドツーエンドの暗号化**によって保護されます。";
-
-/* No comment provided by engineer. */
-"Messages, files and calls are protected by **quantum resistant e2e encryption** with perfect forward secrecy, repudiation and break-in recovery." = "メッセージ、ファイル、通話は、前方秘匿性、否認可能性および侵入復元性を備えた**耐量子E2E暗号化**によって保護されます。";
-
 /* No comment provided by engineer. */
 "Migrating database archive…" = "データベースのアーカイブを移行しています…";

@@ -694,30 +694,15 @@
 /* No comment provided by engineer. */
 "Bad message ID" = "Onjuiste bericht-ID";

-/* No comment provided by engineer. */
-"Better calls" = "Betere gesprekken";
-
 /* No comment provided by engineer. */
 "Better groups" = "Betere groepen";

-/* No comment provided by engineer. */
-"Better message dates." = "Betere datums voor berichten.";
-
 /* No comment provided by engineer. */
 "Better messages" = "Betere berichten";

 /* No comment provided by engineer. */
 "Better networking" = "Beter netwerk";

-/* No comment provided by engineer. */
-"Better notifications" = "Betere meldingen";
-
-/* No comment provided by engineer. */
-"Better security ✅" = "Betere beveiliging ✅";
-
-/* No comment provided by engineer. */
-"Better user experience" = "Betere gebruikerservaring";
-
 /* No comment provided by engineer. */
 "Black" = "Zwart";

@@ -1307,9 +1292,6 @@
 /* No comment provided by engineer. */
 "Custom time" = "Aangepaste tijd";

-/* No comment provided by engineer. */
-"Customizable message shape." = "Aanpasbare berichtvorm.";
-
 /* No comment provided by engineer. */
 "Customize theme" = "Thema aanpassen";

@@ -1500,9 +1482,6 @@
 /* No comment provided by engineer. */
 "Delete old database?" = "Oude database verwijderen?";

-/* No comment provided by engineer. */
-"Delete or moderate up to 200 messages." = "Maximaal 200 berichten verwijderen of modereren.";
-
 /* No comment provided by engineer. */
 "Delete pending connection?" = "Wachtende verbinding verwijderen?";

@@ -2251,9 +2230,6 @@
 /* alert message */
 "Forward messages without files?" = "Berichten doorsturen zonder bestanden?";

-/* No comment provided by engineer. */
-"Forward up to 20 messages at once." = "Stuur maximaal 20 berichten tegelijk door.";
-
 /* No comment provided by engineer. */
 "forwarded" = "doorgestuurd";

@@ -2494,9 +2470,6 @@
 /* No comment provided by engineer. */
 "Importing archive" = "Archief importeren";

-/* No comment provided by engineer. */
-"Improved delivery, reduced traffic usage.\nMore improvements are coming soon!" = "Verbeterde levering, minder data gebruik.\nBinnenkort meer verbeteringen!";
-
 /* No comment provided by engineer. */
 "Improved message delivery" = "Verbeterde berichtbezorging";

@@ -4298,9 +4271,6 @@
 /* simplex link type */
 "SimpleX one-time invitation" = "Eenmalige SimpleX uitnodiging";

-/* No comment provided by engineer. */
-"SimpleX protocols reviewed by Trail of Bits." = "SimpleX-protocollen beoordeeld door Trail of Bits.";
-
 /* No comment provided by engineer. */
 "Simplified incognito mode" = "Vereenvoudigde incognitomodus";

@@ -4421,12 +4391,6 @@
 /* No comment provided by engineer. */
 "Support SimpleX Chat" = "Ondersteuning van SimpleX Chat";

-/* No comment provided by engineer. */
-"Switch audio and video during the call." = "Wisselen tussen audio en video tijdens het gesprek.";
-
-/* No comment provided by engineer. */
-"Switch chat profile for 1-time invitations." = "Wijzig chatprofiel voor eenmalige uitnodigingen.";
-
 /* No comment provided by engineer. */
 "System" = "Systeem";

@@ -160,9 +160,6 @@
 /* notification title */
 "%@ wants to connect!" = "%@ хочет соединиться!";

-/* format for date separator in chat */
-"%@, %@" = "%1$@, %2$@";
-
 /* No comment provided by engineer. */
 "%@, %@ and %lld members" = "%@, %@ и %lld членов группы";

@@ -694,30 +691,15 @@
 /* No comment provided by engineer. */
 "Bad message ID" = "Ошибка ID сообщения";

-/* No comment provided by engineer. */
-"Better calls" = "Улучшенные звонки";
-
 /* No comment provided by engineer. */
 "Better groups" = "Улучшенные группы";

-/* No comment provided by engineer. */
-"Better message dates." = "Улучшенные даты сообщений.";
-
 /* No comment provided by engineer. */
 "Better messages" = "Улучшенные сообщения";

 /* No comment provided by engineer. */
 "Better networking" = "Улучшенные сетевые функции";

-/* No comment provided by engineer. */
-"Better notifications" = "Улучшенные уведомления";
-
-/* No comment provided by engineer. */
-"Better security ✅" = "Улучшенная безопасность ✅";
-
-/* No comment provided by engineer. */
-"Better user experience" = "Улучшенный интерфейс";
-
 /* No comment provided by engineer. */
 "Black" = "Черная";

@@ -1307,9 +1289,6 @@
 /* No comment provided by engineer. */
 "Custom time" = "Пользовательское время";

-/* No comment provided by engineer. */
-"Customizable message shape." = "Настраиваемая форма сообщений.";
-
 /* No comment provided by engineer. */
 "Customize theme" = "Настроить тему";

@@ -1500,9 +1479,6 @@
 /* No comment provided by engineer. */
 "Delete old database?" = "Удалить предыдущую версию данных?";

-/* No comment provided by engineer. */
-"Delete or moderate up to 200 messages." = "Удаляйте или модерируйте до 200 сообщений.";
-
 /* No comment provided by engineer. */
 "Delete pending connection?" = "Удалить ожидаемое соединение?";

@@ -2251,9 +2227,6 @@
 /* alert message */
 "Forward messages without files?" = "Переслать сообщения без файлов?";

-/* No comment provided by engineer. */
-"Forward up to 20 messages at once." = "Пересылайте до 20 сообщений за раз.";
-
 /* No comment provided by engineer. */
 "forwarded" = "переслано";

@@ -2494,9 +2467,6 @@
 /* No comment provided by engineer. */
 "Importing archive" = "Импорт архива";

-/* No comment provided by engineer. */
-"Improved delivery, reduced traffic usage.\nMore improvements are coming soon!" = "Улучшенная доставка, меньше трафик.";
-
 /* No comment provided by engineer. */
 "Improved message delivery" = "Улучшенная доставка сообщений";

@@ -4298,9 +4268,6 @@
 /* simplex link type */
 "SimpleX one-time invitation" = "SimpleX одноразовая ссылка";

-/* No comment provided by engineer. */
-"SimpleX protocols reviewed by Trail of Bits." = "Аудит SimpleX протоколов от Trail of Bits.";
-
 /* No comment provided by engineer. */
 "Simplified incognito mode" = "Упрощенный режим Инкогнито";

@@ -4421,12 +4388,6 @@
 /* No comment provided by engineer. */
 "Support SimpleX Chat" = "Поддержать SimpleX Chat";

-/* No comment provided by engineer. */
-"Switch audio and video during the call." = "Переключайте звук и видео во время звонка.";
-
-/* No comment provided by engineer. */
-"Switch chat profile for 1-time invitations." = "Переключайте профиль чата для одноразовых приглашений.";
-
 /* No comment provided by engineer. */
 "System" = "Системная";

@@ -694,30 +694,15 @@
 /* No comment provided by engineer. */
 "Bad message ID" = "Kötü mesaj kimliği";

-/* No comment provided by engineer. */
-"Better calls" = "Daha iyi aramalar";
-
 /* No comment provided by engineer. */
 "Better groups" = "Daha iyi gruplar";

-/* No comment provided by engineer. */
-"Better message dates." = "Daha iyi mesaj tarihleri.";
-
 /* No comment provided by engineer. */
 "Better messages" = "Daha iyi mesajlar";

 /* No comment provided by engineer. */
 "Better networking" = "Daha iyi ağ oluşturma";

-/* No comment provided by engineer. */
-"Better notifications" = "Daha iyi bildirimler";
-
-/* No comment provided by engineer. */
-"Better security ✅" = "Daha iyi güvenlik ✅";
-
-/* No comment provided by engineer. */
-"Better user experience" = "Daha iyi kullanıcı deneyimi";
-
 /* No comment provided by engineer. */
 "Black" = "Siyah";

@@ -1307,9 +1292,6 @@
 /* No comment provided by engineer. */
 "Custom time" = "Özel saat";

-/* No comment provided by engineer. */
-"Customizable message shape." = "Özelleştirilebilir mesaj şekli.";
-
 /* No comment provided by engineer. */
 "Customize theme" = "Renk temalarını kişiselleştir";

@@ -1500,9 +1482,6 @@
 /* No comment provided by engineer. */
 "Delete old database?" = "Eski veritabanı silinsin mi?";

-/* No comment provided by engineer. */
-"Delete or moderate up to 200 messages." = "200'e kadar mesajı silin veya düzenleyin.";
-
 /* No comment provided by engineer. */
 "Delete pending connection?" = "Bekleyen bağlantı silinsin mi?";

@@ -2251,9 +2230,6 @@
 /* alert message */
 "Forward messages without files?" = "Mesajlar dosyalar olmadan iletilsin mi ?";

-/* No comment provided by engineer. */
-"Forward up to 20 messages at once." = "Aynı anda en fazla 20 mesaj iletin.";
-
 /* No comment provided by engineer. */
 "forwarded" = "iletildi";

@@ -2494,9 +2470,6 @@
 /* No comment provided by engineer. */
 "Importing archive" = "Arşiv içe aktarılıyor";

-/* No comment provided by engineer. */
-"Improved delivery, reduced traffic usage.\nMore improvements are coming soon!" = "İyileştirilmiş teslimat, azaltılmış trafik kullanımı.\nDaha fazla iyileştirme yakında geliyor!";
-
 /* No comment provided by engineer. */
 "Improved message delivery" = "İyileştirilmiş mesaj iletimi";

@@ -4298,9 +4271,6 @@
 /* simplex link type */
 "SimpleX one-time invitation" = "SimpleX tek kullanımlık davet";

-/* No comment provided by engineer. */
-"SimpleX protocols reviewed by Trail of Bits." = "SimpleX protokolleri Trail of Bits tarafından incelenmiştir.";
-
 /* No comment provided by engineer. */
 "Simplified incognito mode" = "Basitleştirilmiş gizli mod";

@@ -4421,12 +4391,6 @@
 /* No comment provided by engineer. */
 "Support SimpleX Chat" = "SimpleX Chat'e destek ol";

-/* No comment provided by engineer. */
-"Switch audio and video during the call." = "Görüşme sırasında ses ve görüntüyü değiştirin.";
-
-/* No comment provided by engineer. */
-"Switch chat profile for 1-time invitations." = "Sohbet profilini 1 kerelik davetler için değiştirin.";
-
 /* No comment provided by engineer. */
 "System" = "Sistem";

@@ -4,10 +4,8 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.*
-import android.view.View
 import android.view.WindowManager
 import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
 import androidx.compose.ui.platform.ClipboardManager
 import androidx.fragment.app.FragmentActivity
 import chat.simplex.app.model.NtfManager
@@ -15,6 +13,7 @@ import chat.simplex.app.model.NtfManager.getUserIdFromIntent
 import chat.simplex.common.*
 import chat.simplex.common.helpers.*
 import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chatlist.*
 import chat.simplex.common.views.helpers.*
@@ -25,21 +24,13 @@ import kotlinx.coroutines.*
 import java.lang.ref.WeakReference

 class MainActivity: FragmentActivity() {
-  companion object {
-    const val OLD_ANDROID_UI_FLAGS = View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-  }

  override fun onCreate(savedInstanceState: Bundle?) {
    mainActivity = WeakReference(this)
    platform.androidSetNightModeIfSupported()
    val c = CurrentColors.value.colors
-    platform.androidSetStatusAndNavigationBarAppearance(c.isLight, c.isLight)
+    platform.androidSetStatusAndNavBarColors(c.isLight, c.background, !appPrefs.oneHandUI.get(), appPrefs.oneHandUI.get())
    applyAppLocale(ChatModel.controller.appPrefs.appLanguage)
-    // This flag makes status bar and navigation bar fully transparent. But on API level < 30 it breaks insets entirely
-    // https://issuetracker.google.com/issues/236862874
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-      window.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS)
-    }
    super.onCreate(savedInstanceState)
    // testJson()
    // When call ended and orientation changes, it re-process old intent, it's unneeded.
@@ -56,7 +47,6 @@ class MainActivity: FragmentActivity() {
        WindowManager.LayoutParams.FLAG_SECURE
      )
    }
-    enableEdgeToEdge()
    setContent {
      AppScreen()
    }
@@ -7,7 +7,6 @@ import chat.simplex.common.platform.Log
 import android.content.Intent
 import android.content.pm.ActivityInfo
 import android.os.*
-import android.view.View
 import androidx.compose.animation.core.*
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
@@ -17,7 +16,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.core.view.ViewCompat
 import androidx.lifecycle.*
 import androidx.work.*
-import chat.simplex.app.MainActivity.Companion.OLD_ANDROID_UI_FLAGS
 import chat.simplex.app.model.NtfManager
 import chat.simplex.app.model.NtfManager.AcceptCallAction
 import chat.simplex.app.views.call.CallActivity
@@ -28,6 +26,7 @@ import chat.simplex.common.model.ChatModel.withChats
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.call.*
+import chat.simplex.common.views.chatlist.statusBarColorAfterCall
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.onboarding.OnboardingStage
 import com.jakewharton.processphoenix.ProcessPhoenix
@@ -275,32 +274,79 @@ class SimplexApp: Application(), LifecycleEventObserver {
        uiModeManager.setApplicationNightMode(mode)
      }

-      override fun androidSetStatusAndNavigationBarAppearance(isLightStatusBar: Boolean, isLightNavBar: Boolean, blackNavBar: Boolean, themeBackgroundColor: Color) {
+      override fun androidSetDrawerStatusAndNavBarColor(
+        isLight: Boolean,
+        drawerShadingColor: Color,
+        toolbarOnTop: Boolean,
+        navBarColor: Color,
+      ) {
+        val window = mainActivity.get()?.window ?: return
+
+        @Suppress("DEPRECATION")
+        val windowInsetController = ViewCompat.getWindowInsetsController(window.decorView)
+        // Blend status bar color to the animated color
+        val colors = CurrentColors.value.colors
+        val baseBackgroundColor = if (toolbarOnTop) colors.background.mixWith(colors.onBackground, 0.97f) else colors.background
+        var statusBar = baseBackgroundColor.mixWith(drawerShadingColor.copy(1f), 1 - drawerShadingColor.alpha).toArgb()
+        var statusBarLight = isLight
+
+        // SimplexGreen while in call
+        if (window.statusBarColor == SimplexGreen.toArgb()) {
+          statusBarColorAfterCall.intValue = statusBar
+          statusBar = SimplexGreen.toArgb()
+          statusBarLight = false
+        }
+        window.statusBarColor = statusBar
+        val navBar = navBarColor.toArgb()
+        if (windowInsetController?.isAppearanceLightStatusBars != statusBarLight) {
+          windowInsetController?.isAppearanceLightStatusBars = statusBarLight
+        }
+        if (window.navigationBarColor != navBar) {
+          window.navigationBarColor = navBar
+        }
+        if (windowInsetController?.isAppearanceLightNavigationBars != isLight) {
+          windowInsetController?.isAppearanceLightNavigationBars = isLight
+        }
+      }
+
+      override fun androidSetStatusAndNavBarColors(isLight: Boolean, backgroundColor: Color, hasTop: Boolean, hasBottom: Boolean) {
        val window = mainActivity.get()?.window ?: return
        @Suppress("DEPRECATION")
-        val statusLight = isLightStatusBar && chatModel.activeCall.value == null
-        val navBarLight = isLightNavBar || windowOrientation() == WindowOrientation.LANDSCAPE
        val windowInsetController = ViewCompat.getWindowInsetsController(window.decorView)
-        if (windowInsetController?.isAppearanceLightStatusBars != statusLight) {
-          windowInsetController?.isAppearanceLightStatusBars = statusLight
-        }
-        window.navigationBarColor = Color.Transparent.toArgb()
-        if (windowInsetController?.isAppearanceLightNavigationBars != navBarLight) {
-          windowInsetController?.isAppearanceLightNavigationBars = navBarLight
-        }
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
-          window.decorView.systemUiVisibility = if (statusLight && navBarLight) {
-            View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR or OLD_ANDROID_UI_FLAGS
-          } else if (statusLight) {
-            View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR or OLD_ANDROID_UI_FLAGS
-          } else if (navBarLight) {
-            View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR or OLD_ANDROID_UI_FLAGS
-          } else {
-            OLD_ANDROID_UI_FLAGS
-          }
-          window.navigationBarColor = if (blackNavBar) Color.Black.toArgb() else themeBackgroundColor.toArgb()
+
+        var statusBar = (if (hasTop && appPrefs.onboardingStage.get() == OnboardingStage.OnboardingComplete) {
+          backgroundColor.mixWith(CurrentColors.value.colors.onBackground, 0.97f)
        } else {
-          window.navigationBarColor = Color.Transparent.toArgb()
+          if (CurrentColors.value.base == DefaultTheme.SIMPLEX) {
+            backgroundColor.lighter(0.4f)
+          } else {
+            backgroundColor
+          }
+        }).toArgb()
+        var statusBarLight = isLight
+
+        // SimplexGreen while in call
+        if (window.statusBarColor == SimplexGreen.toArgb()) {
+          statusBarColorAfterCall.intValue = statusBar
+          statusBar = SimplexGreen.toArgb()
+          statusBarLight = false
+        }
+        val navBar = (if (hasBottom && appPrefs.onboardingStage.get() == OnboardingStage.OnboardingComplete) {
+          backgroundColor.mixWith(CurrentColors.value.colors.onBackground, 0.97f)
+        } else {
+          backgroundColor
+        }).toArgb()
+        if (window.statusBarColor != statusBar) {
+          window.statusBarColor = statusBar
+        }
+        if (windowInsetController?.isAppearanceLightStatusBars != statusBarLight) {
+          windowInsetController?.isAppearanceLightStatusBars = statusBarLight
+        }
+        if (window.navigationBarColor != navBar) {
+          window.navigationBarColor = navBar
+        }
+        if (windowInsetController?.isAppearanceLightNavigationBars != isLight) {
+          windowInsetController?.isAppearanceLightNavigationBars = isLight
        }
      }

@@ -355,8 +401,6 @@ class SimplexApp: Application(), LifecycleEventObserver {
        }
        return true
      }
-
-      override val androidApiLevel: Int get() = Build.VERSION.SDK_INT
    }
  }
 }
@@ -24,7 +24,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.scale
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.platform.*
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -36,9 +37,7 @@ import chat.simplex.app.R
 import chat.simplex.app.TAG
 import chat.simplex.app.model.NtfManager
 import chat.simplex.app.model.NtfManager.AcceptCallAction
-import chat.simplex.common.helpers.applyAppLocale
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.platform.*
 import chat.simplex.common.platform.chatModel
 import chat.simplex.common.ui.theme.*
@@ -50,7 +49,6 @@ import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
 import java.lang.ref.WeakReference
-import java.util.*
 import chat.simplex.common.platform.chatModel as m

 class CallActivity: ComponentActivity(), ServiceConnection {
@@ -58,7 +56,6 @@ class CallActivity: ComponentActivity(), ServiceConnection {
  var boundService: CallService? = null

  override fun onCreate(savedInstanceState: Bundle?) {
-    applyAppLocale(appPrefs.appLanguage)
    super.onCreate(savedInstanceState)
    callActivity = WeakReference(this)
    when (intent?.action) {
@@ -83,7 +80,6 @@ class CallActivity: ComponentActivity(), ServiceConnection {

  override fun onDestroy() {
    super.onDestroy()
-    (mainActivity.get() ?: this).applyAppLocale(appPrefs.appLanguage)
    if (isOnLockScreenNow()) {
      lockAfterIncomingCall()
    }
@@ -237,7 +233,7 @@ fun CallActivityView() {
  }
  SimpleXTheme {
    var prevCall by remember { mutableStateOf(call) }
-    KeyChangeEffect(m.activeCall.value, remember { appPrefs.appLanguage.state }.value) {
+    KeyChangeEffect(m.activeCall.value) {
      if (m.activeCall.value != null) {
        prevCall = m.activeCall.value
        activity.boundService?.updateNotification()
@@ -64,6 +64,7 @@ kotlin {
        implementation("androidx.activity:activity-compose:1.9.1")
        val workVersion = "2.9.1"
        implementation("androidx.work:work-runtime-ktx:$workVersion")
+        implementation("com.google.accompanist:accompanist-insets:0.30.1")

        // Video support
        implementation("com.google.android.exoplayer:exoplayer:2.19.1")
@@ -31,7 +31,8 @@ private fun Activity.applyLocale(locale: Locale) {
  Locale.setDefault(locale)
  val appConf = Configuration(androidAppContext.resources.configuration).apply { setLocale(locale) }
  val activityConf = Configuration(resources.configuration).apply { setLocale(locale) }
-  androidAppContext = androidAppContext.createConfigurationContext(appConf)
+  @Suppress("DEPRECATION")
+  androidAppContext.resources.updateConfiguration(appConf, resources.displayMetrics)
  @Suppress("DEPRECATION")
  resources.updateConfiguration(activityConf, resources.displayMetrics)
 }
@@ -3,13 +3,25 @@ package chat.simplex.common.platform
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.painter.Painter
+import com.google.accompanist.insets.navigationBarsWithImePadding
 import java.io.File

+actual fun Modifier.navigationBarsWithImePadding(): Modifier = navigationBarsWithImePadding()
+
+@Composable
+actual fun ProvideWindowInsets(
+  consumeWindowInsets: Boolean,
+  windowInsetsAnimationsEnabled: Boolean,
+  content: @Composable () -> Unit
+) {
+  com.google.accompanist.insets.ProvideWindowInsets(content = content)
+}
+
@Composable
 actual fun Modifier.desktopOnExternalDrag(
  enabled: Boolean,
  onFiles: (List<File>) -> Unit,
-  onImage: (File) -> Unit,
+  onImage: (Painter) -> Unit,
  onText: (String) -> Unit
 ): Modifier = this

@@ -6,7 +6,8 @@ import android.graphics.drawable.ColorDrawable
 import android.os.Build
 import android.text.InputType
 import android.util.Log
-import android.view.*
+import android.view.OnReceiveContentListener
+import android.view.ViewGroup
 import android.view.inputmethod.*
 import android.widget.EditText
 import android.widget.TextView
@@ -25,7 +26,6 @@ import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.core.graphics.drawable.DrawableCompat
-import androidx.core.view.children
 import androidx.core.view.inputmethod.EditorInfoCompat
 import androidx.core.view.inputmethod.InputConnectionCompat
 import androidx.core.widget.doAfterTextChanged
@@ -94,8 +94,8 @@ actual fun PlatformTextField(
  }

  val isRtl = LocalLayoutDirection.current == LayoutDirection.Rtl
-  AndroidView(modifier = Modifier, factory = { context ->
-    val editText = @SuppressLint("AppCompatCustomView") object: EditText(context) {
+  AndroidView(modifier = Modifier, factory = {
+    val editText = @SuppressLint("AppCompatCustomView") object: EditText(it) {
      override fun setOnReceiveContentListener(
        mimeTypes: Array<out String>?,
        listener: OnReceiveContentListener?
@@ -140,13 +140,6 @@ actual fun PlatformTextField(
        Log.e(TAG, e.stackTraceToString())
      }
    }
-    editText.onFocusChangeListener = View.OnFocusChangeListener { _, hasFocus ->
-      // shows keyboard when user had search field on ChatView focused before clicking on this text field
-      // it still produce weird animation of closing/opening keyboard but the solution is to replace this Android EditText with Compose BasicTextField
-      if (hasFocus) {
-        showKeyboard = true
-      }
-    }
    editText.doOnTextChanged { text, _, _, _ ->
      if (!composeState.value.inProgress) {
        onMessageChange(text.toString())
@@ -155,12 +148,8 @@ actual fun PlatformTextField(
      }
    }
    editText.doAfterTextChanged { text -> if (composeState.value.preview is ComposePreview.VoicePreview && text.toString() != "") editText.setText("") }
-    val workaround = WorkaroundFocusSearchLayout(context)
-    workaround.addView(editText)
-    workaround.layoutParams = ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
-    workaround
+    editText
  }) {
-    val it = it.children.first() as EditText
    it.setTextColor(textColor.toArgb())
    it.setHintTextColor(hintColor.toArgb())
    it.hint = placeholder
@@ -6,11 +6,11 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.content.res.Configuration
 import android.text.BidiFormatter
-import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.asImageBitmap
-import androidx.compose.ui.platform.*
+import androidx.compose.ui.platform.LocalConfiguration
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -50,11 +50,7 @@ actual fun windowOrientation(): WindowOrientation = when (mainActivity.get()?.re
 }

@Composable
-actual fun windowWidth(): Dp {
-  val direction = LocalLayoutDirection.current
-  val cutout = WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal).asPaddingValues()
-  return LocalConfiguration.current.screenWidthDp.dp - cutout.calculateStartPadding(direction) - cutout.calculateEndPadding(direction)
-}
+actual fun windowWidth(): Dp = LocalConfiguration.current.screenWidthDp.dp

@Composable
 actual fun windowHeight(): Dp = LocalConfiguration.current.screenHeightDp.dp
@@ -7,12 +7,10 @@ import androidx.compose.foundation.lazy.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
-import chat.simplex.common.model.ChatController.appPrefs
-import chat.simplex.common.ui.theme.DEFAULT_PADDING
-import chat.simplex.common.views.chatlist.NavigationBarBackground
 import chat.simplex.common.views.helpers.*
 import kotlinx.coroutines.flow.filter
 import kotlin.math.absoluteValue
@@ -27,74 +25,25 @@ actual fun LazyColumnWithScrollBar(
  horizontalAlignment: Alignment.Horizontal,
  flingBehavior: FlingBehavior,
  userScrollEnabled: Boolean,
-  additionalBarOffset: State<Dp>?,
-  fillMaxSize: Boolean,
  content: LazyListScope.() -> Unit
 ) {
-  val handler = LocalAppBarHandler.current
-  require(handler != null) { "Using LazyColumnWithScrollBar and without AppBarHandler is an error. Use LazyColumnWithScrollBarNoAppBar instead" }
-
-  val state = state ?: handler.listState
-  val connection = handler.connection
+  val state = state ?: LocalAppBarHandler.current?.listState ?: rememberLazyListState()
+  val connection = LocalAppBarHandler.current?.connection
  LaunchedEffect(Unit) {
-    if (reverseLayout) {
-      snapshotFlow { state.layoutInfo.visibleItemsInfo.lastOrNull()?.offset ?: 0 }
-        .collect { scrollPosition ->
-            connection.appBarOffset = if (state.layoutInfo.visibleItemsInfo.lastOrNull()?.index == state.layoutInfo.totalItemsCount - 1) {
-              state.layoutInfo.viewportEndOffset - scrollPosition.toFloat() - state.layoutInfo.afterContentPadding
-            } else {
-              // show always when last item is not visible
-              -1000f
-            }
-            //Log.d(TAG, "Scrolling position changed from $offset to ${connection.appBarOffset}")
+    snapshotFlow { state.firstVisibleItemScrollOffset }
+      .filter { state.firstVisibleItemIndex == 0 }
+      .collect { scrollPosition ->
+        val offset = connection?.appBarOffset
+        if (offset != null && (offset + scrollPosition).absoluteValue > 1) {
+          connection.appBarOffset = -scrollPosition.toFloat()
+//          Log.d(TAG, "Scrolling position changed from $offset to ${connection.appBarOffset}")
        }
-    } else {
-      snapshotFlow { state.firstVisibleItemScrollOffset }
-        .filter { state.firstVisibleItemIndex == 0 }
-        .collect { scrollPosition ->
-          val offset = connection.appBarOffset
-          if ((offset + scrollPosition + state.layoutInfo.afterContentPadding).absoluteValue > 1) {
-            connection.appBarOffset = -scrollPosition.toFloat()
-            //Log.d(TAG, "Scrolling position changed from $offset to ${connection.appBarOffset}")
-          }
-        }
-    }
+      }
  }
-  LazyColumn(
-    if (fillMaxSize) {
-      Modifier.fillMaxSize().copyViewToAppBar(remember { appPrefs.appearanceBarsBlurRadius.state }.value, LocalAppBarHandler.current?.graphicsLayer).then(modifier).nestedScroll(connection)
-    } else {
-      Modifier.copyViewToAppBar(remember { appPrefs.appearanceBarsBlurRadius.state }.value, LocalAppBarHandler.current?.graphicsLayer).then(modifier).nestedScroll(connection)
-    },
-    state,
-    contentPadding,
-    reverseLayout,
-    verticalArrangement,
-    horizontalAlignment,
-    flingBehavior,
-    userScrollEnabled
-  ) {
-    content()
-  }
-}
-
-
-@Composable
-actual fun LazyColumnWithScrollBarNoAppBar(
-  modifier: Modifier,
-  state: LazyListState?,
-  contentPadding: PaddingValues,
-  reverseLayout: Boolean,
-  verticalArrangement: Arrangement.Vertical,
-  horizontalAlignment: Alignment.Horizontal,
-  flingBehavior: FlingBehavior,
-  userScrollEnabled: Boolean,
-  additionalBarOffset: State<Dp>?,
-  content: LazyListScope.() -> Unit
-) {
-  val state = state ?: rememberLazyListState()
-  LazyColumn(modifier, state, contentPadding, reverseLayout, verticalArrangement, horizontalAlignment, flingBehavior, userScrollEnabled) {
-    content()
+  if (connection != null) {
+    LazyColumn(modifier.nestedScroll(connection), state, contentPadding, reverseLayout, verticalArrangement, horizontalAlignment, flingBehavior, userScrollEnabled, content)
+  } else {
+    LazyColumn(modifier, state, contentPadding, reverseLayout, verticalArrangement, horizontalAlignment, flingBehavior, userScrollEnabled, content)
  }
 }

@@ -105,80 +54,32 @@ actual fun ColumnWithScrollBar(
  horizontalAlignment: Alignment.Horizontal,
  state: ScrollState?,
  maxIntrinsicSize: Boolean,
-  fillMaxSize: Boolean,
  content: @Composable() (ColumnScope.() -> Unit)
 ) {
-  val handler = LocalAppBarHandler.current
-  require(handler != null) { "Using ColumnWithScrollBar and without AppBarHandler is an error. Use ColumnWithScrollBarNoAppBar instead" }
-
-  val modifier = if (fillMaxSize) Modifier.fillMaxSize().then(modifier).imePadding() else modifier.imePadding()
-  val state = state ?: handler.scrollState
-  val connection = handler.connection
+  val state = state ?: LocalAppBarHandler.current?.scrollState ?: rememberScrollState()
+  val connection = LocalAppBarHandler.current?.connection
  LaunchedEffect(Unit) {
    snapshotFlow { state.value }
      .collect { scrollPosition ->
-        val offset = connection.appBarOffset
-        if ((offset + scrollPosition).absoluteValue > 1) {
+        val offset = connection?.appBarOffset
+        if (offset != null && (offset + scrollPosition).absoluteValue > 1) {
          connection.appBarOffset = -scrollPosition.toFloat()
 //          Log.d(TAG, "Scrolling position changed from $offset to ${connection.appBarOffset}")
        }
      }
  }
-  val oneHandUI = remember { appPrefs.oneHandUI.state }
-  Box(Modifier.fillMaxHeight()) {
-    Column(
-      if (maxIntrinsicSize) {
-        Modifier.copyViewToAppBar(remember { appPrefs.appearanceBarsBlurRadius.state }.value, LocalAppBarHandler.current?.graphicsLayer).then(modifier).nestedScroll(connection).verticalScroll(state).height(IntrinsicSize.Max)
-      } else {
-        Modifier.copyViewToAppBar(remember { appPrefs.appearanceBarsBlurRadius.state }.value, LocalAppBarHandler.current?.graphicsLayer).then(modifier).nestedScroll(connection).verticalScroll(state)
-      }, verticalArrangement, horizontalAlignment
-    ) {
-      if (oneHandUI.value) {
-        Spacer(Modifier.padding(top = DEFAULT_PADDING + 5.dp).windowInsetsTopHeight(WindowInsets.statusBars))
-        content()
-        Spacer(Modifier.navigationBarsPadding().padding(bottom = AppBarHeight * fontSizeSqrtMultiplier))
-      } else {
-        Spacer(Modifier.statusBarsPadding().padding(top = AppBarHeight * fontSizeSqrtMultiplier))
-        content()
-        Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
-      }
-    }
-    if (!oneHandUI.value) {
-      NavigationBarBackground(false, false)
-    }
-  }
-}
-
-@Composable
-actual fun ColumnWithScrollBarNoAppBar(
-  modifier: Modifier,
-  verticalArrangement: Arrangement.Vertical,
-  horizontalAlignment: Alignment.Horizontal,
-  state: ScrollState?,
-  maxIntrinsicSize: Boolean,
-  content: @Composable() (ColumnScope.() -> Unit)
-) {
-  val modifier = modifier.imePadding()
-  val state = state ?: rememberScrollState()
-  val oneHandUI = remember { appPrefs.oneHandUI.state }
-  Box(Modifier.fillMaxHeight()) {
-    Column(
-      if (maxIntrinsicSize) {
+  if (connection != null) {
+      Column(
+        if (maxIntrinsicSize) {
+          modifier.nestedScroll(connection).verticalScroll(state).height(IntrinsicSize.Max)
+        } else {
+          modifier.nestedScroll(connection).verticalScroll(state)
+        }, verticalArrangement, horizontalAlignment, content)
+  } else {
+      Column(if (maxIntrinsicSize) {
        modifier.verticalScroll(state).height(IntrinsicSize.Max)
      } else {
        modifier.verticalScroll(state)
-      }, verticalArrangement, horizontalAlignment
-    ) {
-      if (oneHandUI.value) {
-        Spacer(Modifier.windowInsetsTopHeight(WindowInsets.systemBars))
-        content()
-      } else {
-        content()
-        Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.systemBars))
-      }
-    }
-    if (!oneHandUI.value) {
-      NavigationBarBackground(false, false)
-    }
+      }, verticalArrangement, horizontalAlignment, content)
  }
 }
@@ -3,18 +3,17 @@ package chat.simplex.common.platform
 import android.app.Activity
 import android.content.Context
 import android.content.pm.ActivityInfo
+import android.graphics.Rect
 import android.os.*
 import android.view.*
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
 import androidx.activity.compose.setContent
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.ime
 import androidx.compose.runtime.*
-import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalView
 import chat.simplex.common.AppScreen
 import chat.simplex.common.model.clear
+import chat.simplex.common.ui.theme.SimpleXTheme
 import chat.simplex.common.views.helpers.*
 import androidx.compose.ui.platform.LocalContext as LocalContext1
 import chat.simplex.res.MR
@@ -44,13 +43,28 @@ actual fun LocalMultiplatformView(): Any? = LocalView.current

@Composable
 actual fun getKeyboardState(): State<KeyboardState> {
-  val density = LocalDensity.current
-  val ime = WindowInsets.ime
-  return remember {
-    derivedStateOf {
-      if (ime.getBottom(density) == 0) KeyboardState.Closed else KeyboardState.Opened
+  val keyboardState = remember { mutableStateOf(KeyboardState.Closed) }
+  val view = LocalView.current
+  DisposableEffect(view) {
+    val onGlobalListener = ViewTreeObserver.OnGlobalLayoutListener {
+      val rect = Rect()
+      view.getWindowVisibleDisplayFrame(rect)
+      val screenHeight = view.rootView.height
+      val keypadHeight = screenHeight - rect.bottom
+      keyboardState.value = if (keypadHeight > screenHeight * 0.15) {
+        KeyboardState.Opened
+      } else {
+        KeyboardState.Closed
+      }
+    }
+    view.viewTreeObserver.addOnGlobalLayoutListener(onGlobalListener)
+
+    onDispose {
+      view.viewTreeObserver.removeOnGlobalLayoutListener(onGlobalListener)
    }
  }
+
+  return keyboardState
 }

 actual fun hideKeyboard(view: Any?, clearFocus: Boolean) {
@@ -7,9 +7,12 @@ import android.os.Build
 import androidx.annotation.RequiresApi
 import androidx.compose.runtime.*
 import chat.simplex.common.platform.*
+import chat.simplex.common.views.helpers.withBGApi
 import dev.icerock.moko.resources.ImageResource
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.StringResource
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.delay
 import java.util.concurrent.Executors

 interface CallAudioDeviceManagerInterface {
@@ -19,6 +22,7 @@ interface CallAudioDeviceManagerInterface {
  fun stop()
  // AudioDeviceInfo.AudioDeviceType
  fun selectLastExternalDeviceOrDefault(speaker: Boolean, keepAnyExternal: Boolean)
+  fun selectSameDeviceOnWebViewChange()
  // AudioDeviceInfo.AudioDeviceType
  fun selectDevice(id: Int)

@@ -35,12 +39,15 @@ interface CallAudioDeviceManagerInterface {
@RequiresApi(Build.VERSION_CODES.S)
 class PostSCallAudioDeviceManager: CallAudioDeviceManagerInterface {
  private val am = androidAppContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+  private var resetCurrentToDevice: AudioDeviceInfo? = null
+  private var resetCurrentToDeviceJob: Job = Job()
  override val devices: MutableState<List<AudioDeviceInfo>> = mutableStateOf(emptyList())
  override val currentDevice: MutableState<AudioDeviceInfo?> = mutableStateOf(null)

  private val audioCallback = object: AudioDeviceCallback() {
    override fun onAudioDevicesAdded(addedDevices: Array<out AudioDeviceInfo>) {
      Log.d(TAG, "Added audio devices: ${addedDevices.map { it.type }}")
+      resetCurrentToDevice = null
      super.onAudioDevicesAdded(addedDevices)
      val oldDevices = devices.value
      devices.value = am.availableCommunicationDevices
@@ -53,13 +60,21 @@ class PostSCallAudioDeviceManager: CallAudioDeviceManagerInterface {

    override fun onAudioDevicesRemoved(removedDevices: Array<out AudioDeviceInfo>) {
      Log.d(TAG, "Removed audio devices: ${removedDevices.map { it.type }}")
+      resetCurrentToDevice = null
      super.onAudioDevicesRemoved(removedDevices)
      devices.value = am.availableCommunicationDevices
    }
  }

  private val listener: OnCommunicationDeviceChangedListener = OnCommunicationDeviceChangedListener { device ->
+    val resetTo = resetCurrentToDevice
+    if (resetTo != null && device != null && resetTo.id != device.id) {
+      Log.w(TAG, "Resetting device that was set by WebView ${device.name?.localized()} to previously set device ${resetTo.name?.localized()}")
+      selectDevice(resetTo.id)
+      return@OnCommunicationDeviceChangedListener
+    }
    devices.value = am.availableCommunicationDevices
+    //Log.d(TAG, "Devices changed ${device?.details()} | ${devices.value.map { it.details() }}")
    currentDevice.value = device
  }

@@ -98,7 +113,18 @@ class PostSCallAudioDeviceManager: CallAudioDeviceManagerInterface {
    }
  }

+  // WebView modifies speaker when muting/unmuting microphone. It's not needed at all, returning back current device if it will be changed
+  override fun selectSameDeviceOnWebViewChange() {
+    resetCurrentToDevice = currentDevice.value
+    resetCurrentToDeviceJob.cancel()
+    resetCurrentToDeviceJob = withBGApi {
+      delay(5000)
+      resetCurrentToDevice = null
+    }
+  }
+
  override fun selectDevice(id: Int) {
+    resetCurrentToDevice = null
    val device = devices.value.lastOrNull { it.id == id }
    if (device != null && am.communicationDevice?.id != id ) {
      am.setCommunicationDevice(device)
@@ -108,12 +134,14 @@ class PostSCallAudioDeviceManager: CallAudioDeviceManagerInterface {

 class PreSCallAudioDeviceManager: CallAudioDeviceManagerInterface {
  private val am = androidAppContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
+  private var resetCurrentToDeviceJob: Job = Job()
  override val devices: MutableState<List<AudioDeviceInfo>> = mutableStateOf(emptyList())
  override val currentDevice: MutableState<AudioDeviceInfo?> = mutableStateOf(null)

  private val audioCallback = object: AudioDeviceCallback() {
    override fun onAudioDevicesAdded(addedDevices: Array<out AudioDeviceInfo>) {
      Log.d(TAG, "Added audio devices: ${addedDevices.map { it.type }}")
+      resetCurrentToDeviceJob.cancel()
      super.onAudioDevicesAdded(addedDevices)
      devices.value = am.getDevices(AudioManager.GET_DEVICES_OUTPUTS).filter { it.hasSupportedType() }.excludeSameType().excludeEarpieceIfWired()
      selectLastExternalDeviceOrDefault(chatModel.activeCall.value?.hasVideo == true, false)
@@ -121,6 +149,7 @@ class PreSCallAudioDeviceManager: CallAudioDeviceManagerInterface {

    override fun onAudioDevicesRemoved(removedDevices: Array<out AudioDeviceInfo>) {
      Log.d(TAG, "Removed audio devices: ${removedDevices.map { it.type }}")
+      resetCurrentToDeviceJob.cancel()
      super.onAudioDevicesRemoved(removedDevices)
      devices.value = am.getDevices(AudioManager.GET_DEVICES_OUTPUTS).filter { it.hasSupportedType() }.excludeSameType().excludeEarpieceIfWired()
      selectLastExternalDeviceOrDefault(chatModel.activeCall.value?.hasVideo == true, true)
@@ -153,7 +182,22 @@ class PreSCallAudioDeviceManager: CallAudioDeviceManagerInterface {
    }
  }

+  override fun selectSameDeviceOnWebViewChange() {
+    val current = currentDevice.value ?: return
+    resetCurrentToDeviceJob.cancel()
+    resetCurrentToDeviceJob = withBGApi {
+      // select old device manually because WebView will change it for sure.
+      // smaller delay first if it's possible to make the switch less noticeable
+      delay(300)
+      selectDevice(current.id)
+      // and in order to be sure that it will be selected even if WebView will be slow in changing its device
+      delay(700)
+      selectDevice(current.id)
+    }
+  }
+
  override fun selectDevice(id: Int) {
+    resetCurrentToDeviceJob.cancel()
    val device = devices.value.lastOrNull { it.id == id }
    val isExternalDevice = device != null && device.type != AudioDeviceInfo.TYPE_BUILTIN_EARPIECE && device.type != AudioDeviceInfo.TYPE_BUILTIN_SPEAKER
    if (isExternalDevice) {
@@ -216,6 +260,8 @@ val AudioDeviceInfo.icon: ImageResource
    else -> MR.images.ic_brand_awareness_filled
  }

+private fun AudioDeviceInfo.details(): String = "$productName id:$id name:${name?.localized()} type:$type sink:$isSink source:$isSource"
+
 val AudioDeviceInfo.name: StringResource?
  get() = when (this.type) {
    AudioDeviceInfo.TYPE_BUILTIN_EARPIECE -> MR.strings.audio_device_earpiece
@@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.*
+import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.snapshots.SnapshotStateList
@@ -40,14 +41,11 @@ import androidx.core.content.ContextCompat
 import androidx.lifecycle.*
 import androidx.webkit.WebViewAssetLoader
 import androidx.webkit.WebViewClientCompat
-import chat.simplex.common.helpers.applyAppLocale
 import chat.simplex.common.helpers.showAllowPermissionInSettingsAlert
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
-import chat.simplex.common.views.onboarding.OnboardingStage
 import chat.simplex.res.MR
 import com.google.accompanist.permissions.*
 import dev.icerock.moko.resources.StringResource
@@ -194,11 +192,7 @@ actual fun ActiveCallView() {
              updateActiveCall(call) {
                val sources = it.localMediaSources
                when (cmd.source) {
-                  CallMediaSource.Mic -> {
-                    val am = androidAppContext.getSystemService(Context.AUDIO_SERVICE) as AudioManager
-                    am.isMicrophoneMute = !cmd.enable
-                    it.copy(localMediaSources = sources.copy(mic = cmd.enable))
-                  }
+                  CallMediaSource.Mic -> it.copy(localMediaSources = sources.copy(mic = cmd.enable))
                  CallMediaSource.Camera -> it.copy(localMediaSources = sources.copy(camera = cmd.enable))
                  CallMediaSource.ScreenAudio -> it.copy(localMediaSources = sources.copy(screenAudio = cmd.enable))
                  CallMediaSource.ScreenVideo -> it.copy(localMediaSources = sources.copy(screenVideo = cmd.enable))
@@ -208,6 +202,7 @@ actual fun ActiveCallView() {
            is WCallCommand.Camera -> {
              updateActiveCall(call) { it.copy(localCamera = cmd.camera) }
              if (!call.localMediaSources.mic) {
+                callAudioDeviceManager.selectSameDeviceOnWebViewChange()
                chatModel.callCommand.add(WCallCommand.Media(CallMediaSource.Mic, enable = false))
              }
            }
@@ -267,7 +262,10 @@ private fun ActiveCallOverlay(call: Call, chatModel: ChatModel, callAudioDeviceM
    devices = remember { callAudioDeviceManager.devices }.value,
    currentDevice = remember { callAudioDeviceManager.currentDevice },
    dismiss = { withBGApi { chatModel.callManager.endCall(call) } },
-    toggleAudio = { chatModel.callCommand.add(WCallCommand.Media(CallMediaSource.Mic, enable = !call.localMediaSources.mic)) },
+    toggleAudio = {
+      callAudioDeviceManager.selectSameDeviceOnWebViewChange()
+      chatModel.callCommand.add(WCallCommand.Media(CallMediaSource.Mic, enable = !call.localMediaSources.mic))
+    },
    selectDevice = { callAudioDeviceManager.selectDevice(it.id) },
    toggleVideo = {
      if (ContextCompat.checkSelfPermission(androidAppContext, Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) {
@@ -329,14 +327,11 @@ private fun ActiveCallOverlayLayout(
  flipCamera: () -> Unit
 ) {
  Column {
-    CallAppBar(
-      title = {
-        if (call.hasVideo) {
-          Text(call.contact.chatViewName, Modifier.offset(x = (-4).dp).padding(end = DEFAULT_PADDING), color = Color(0xFFFFFFD8), style = MaterialTheme.typography.h2, overflow = TextOverflow.Ellipsis, maxLines = 1)
-        }
-      },
-      onBack = { chatModel.activeCallViewIsCollapsed.value = true }
-    )
+    CloseSheetBar({ chatModel.activeCallViewIsCollapsed.value = true }, true, tintColor = Color(0xFFFFFFD8)) {
+      if (call.hasVideo) {
+        Text(call.contact.chatViewName, Modifier.fillMaxWidth().padding(end = DEFAULT_PADDING), color = Color(0xFFFFFFD8), style = MaterialTheme.typography.h2, overflow = TextOverflow.Ellipsis, maxLines = 1)
+      }
+    }
    Column(Modifier.padding(horizontal = DEFAULT_PADDING)) {
      @Composable
      fun SelectSoundDevice(size: Dp) {
@@ -414,7 +409,6 @@ private fun ControlButton(icon: Painter, iconText: StringResource, enabled: Bool

@Composable
 private fun ControlButtonWrap(enabled: Boolean = true, action: () -> Unit, background: Color = controlButtonsBackground(), size: Dp, content: @Composable () -> Unit) {
-  val ripple = remember { ripple(bounded = false, radius = size / 2, color = background.lighter(0.1f)) }
  Box(
    Modifier
      .background(background, CircleShape)
@@ -423,7 +417,7 @@ private fun ControlButtonWrap(enabled: Boolean = true, action: () -> Unit, backg
        onClick = action,
        role = Role.Button,
        interactionSource = remember { MutableInteractionSource() },
-        indication = ripple,
+        indication = rememberRipple(bounded = false, radius = size / 2, color = background.lighter(0.1f)),
        enabled = enabled
      ),
    contentAlignment = Alignment.Center
@@ -594,9 +588,8 @@ fun CallPermissionsView(pipActive: Boolean, hasVideo: Boolean, cancel: () -> Uni
      }
    }
  } else {
-    ModalView(background = Color.Black, showAppBar = false, close = {}) {
-      Column {
-        Spacer(Modifier.height(AppBarHeight * fontSizeSqrtMultiplier))
+    ModalView(background = Color.Black, showClose = false, close = {}) {
+      ColumnWithScrollBar(Modifier.fillMaxSize()) {
        AppBarTitle(stringResource(MR.strings.permissions_required))
        Spacer(Modifier.weight(1f))
        val onClick = {
@@ -713,10 +706,9 @@ fun WebRTCView(callCommand: SnapshotStateList<WCallCommand>, onResponse: (WVAPIM

  Box(Modifier.fillMaxSize()) {
    AndroidView(
-      factory = {
+      factory = { AndroidViewContext ->
        try {
          (staticWebView ?: WebView(androidAppContext)).apply {
-            reapplyLocale()
            layoutParams = ViewGroup.LayoutParams(
              ViewGroup.LayoutParams.MATCH_PARENT,
              ViewGroup.LayoutParams.MATCH_PARENT,
@@ -787,16 +779,6 @@ private fun updateActiveCall(initial: Call, transform: (Call) -> Call) {
  }
 }

-/*
-* Creating WebView automatically drops user's custom app locale to default system locale.
-* Preventing it by re-applying custom locale
-* https://issuetracker.google.com/issues/109833940
-* */
-private fun reapplyLocale() {
-  mainActivity.get()?.applyAppLocale(appPrefs.appLanguage)
-  callActivity.get()?.applyAppLocale(appPrefs.appLanguage)
-}
-
 private class LocalContentWebViewClient(val webView: MutableState<WebView?>, private val assetLoader: WebViewAssetLoader) : WebViewClientCompat() {
  override fun shouldInterceptRequest(
    view: WebView,
@@ -8,6 +8,7 @@ import androidx.compose.ui.graphics.painter.BitmapPainter
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalContext
 import chat.simplex.common.model.CIFile
+import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.CurrentColors
 import chat.simplex.common.views.helpers.ModalManager
@@ -38,6 +39,14 @@ actual fun SimpleAndAnimatedImageView(
    if (getLoadedFilePath(file) != null) {
      ModalManager.fullscreen.showCustomModal(animated = false) { close ->
        ImageFullScreenView(imageProvider, close)
+        if (smallView) {
+          DisposableEffect(Unit) {
+            onDispose {
+              val c = CurrentColors.value.colors
+              platform.androidSetStatusAndNavBarColors(c.isLight, c.background, !appPrefs.oneHandUI.get(), appPrefs.oneHandUI.get())
+            }
+          }
+        }
      }
    }
  }
@@ -1,26 +1,32 @@
 package chat.simplex.common.views.chatlist

+import android.app.Activity
 import androidx.compose.foundation.*
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.*
+import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.*
 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.toArgb
 import androidx.compose.ui.platform.*
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.*
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import chat.simplex.common.ANDROID_CALL_TOP_PADDING
 import chat.simplex.common.model.durationText
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.call.*
+import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.painterResource
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.datetime.Clock

 private val CALL_INTERACTIVE_AREA_HEIGHT = 74.dp
@@ -32,12 +38,11 @@ private val CALL_BOTTOM_ICON_HEIGHT = CALL_INTERACTIVE_AREA_HEIGHT + CALL_BOTTOM
@Composable
 actual fun ActiveCallInteractiveArea(call: Call) {
  val onClick = { platform.androidStartCallActivity(false) }
-  val statusBar = WindowInsets.statusBars.asPaddingValues().calculateTopPadding()
-  Box(Modifier.offset(y = CALL_TOP_OFFSET).height(CALL_INTERACTIVE_AREA_HEIGHT + statusBar)) {
+  Box(Modifier.offset(y = CALL_TOP_OFFSET).height(CALL_INTERACTIVE_AREA_HEIGHT)) {
    val source = remember { MutableInteractionSource() }
-    val ripple = remember { ripple(bounded = true, 3000.dp) }
-    Box(Modifier.height(CALL_TOP_GREEN_LINE_HEIGHT + statusBar).clickable(onClick = onClick, indication = ripple, interactionSource = source)) {
-      GreenLine(statusBar, call)
+    val indication = rememberRipple(bounded = true, 3000.dp)
+    Box(Modifier.height(CALL_TOP_GREEN_LINE_HEIGHT).clickable(onClick = onClick, indication = indication, interactionSource = source)) {
+      GreenLine(call)
    }
    Box(
      Modifier
@@ -45,7 +50,7 @@ actual fun ActiveCallInteractiveArea(call: Call) {
        .size(CALL_BOTTOM_ICON_HEIGHT)
        .background(SimplexGreen, CircleShape)
        .clip(CircleShape)
-        .clickable(onClick = onClick, indication = ripple, interactionSource = source)
+        .clickable(onClick = onClick, indication = indication, interactionSource = source)
        .align(Alignment.BottomCenter),
      contentAlignment = Alignment.Center
    ) {
@@ -58,13 +63,16 @@ actual fun ActiveCallInteractiveArea(call: Call) {
  }
 }

+// Temporary solution for storing a color that needs to be applied after call ends
+var statusBarColorAfterCall = mutableIntStateOf(CurrentColors.value.colors.background.toArgb())
+
@Composable
-private fun GreenLine(statusBarHeight: Dp, call: Call) {
+private fun GreenLine(call: Call) {
  Row(
    Modifier
      .fillMaxSize()
      .background(SimplexGreen)
-      .padding(top = -CALL_TOP_OFFSET + statusBarHeight)
+      .padding(top = -CALL_TOP_OFFSET)
      .padding(horizontal = DEFAULT_PADDING),
    verticalAlignment = Alignment.CenterVertically,
    horizontalArrangement = Arrangement.Center
@@ -73,10 +81,12 @@ private fun GreenLine(statusBarHeight: Dp, call: Call) {
    Spacer(Modifier.weight(1f))
    CallDuration(call)
  }
+  val window = (LocalContext.current as Activity).window
  DisposableEffect(Unit) {
-    platform.androidSetStatusAndNavigationBarAppearance(false, CurrentColors.value.colors.isLight)
+    statusBarColorAfterCall.intValue = window.statusBarColor
+    window.statusBarColor = SimplexGreen.toArgb()
    onDispose {
-      platform.androidSetStatusAndNavigationBarAppearance(CurrentColors.value.colors.isLight, CurrentColors.value.colors.isLight)
+      window.statusBarColor = statusBarColorAfterCall.intValue
    }
  }
 }
@@ -19,11 +19,13 @@ import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
+import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.User
 import chat.simplex.common.model.UserInfo
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
+import chat.simplex.common.views.onboarding.OnboardingStage
 import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -34,7 +36,6 @@ private val USER_PICKER_ROW_PADDING = 16.dp
@Composable
 actual fun UserPickerUsersSection(
  users: List<UserInfo>,
-  iconColor: Color,
  stopped: Boolean,
  onUserClicked: (user: User) -> Unit,
 ) {
@@ -139,73 +140,87 @@ actual fun PlatformUserPicker(modifier: Modifier, pickerState: MutableStateFlow<
  } else {
    Modifier
  }
-  Box {
+  Box(
+    Modifier
+      .fillMaxSize()
+      .then(clickableModifier)
+      .drawBehind {
+        val pos = when {
+          dismissState.progress.from == DismissValue.Default && dismissState.progress.to == DismissValue.Default -> 1f
+          dismissState.progress.from == DismissValue.DismissedToEnd && dismissState.progress.to == DismissValue.DismissedToEnd -> 0f
+          dismissState.progress.to == DismissValue.Default -> dismissState.progress.fraction
+          else -> 1 - dismissState.progress.fraction
+        }
+        val colors = CurrentColors.value.colors
+        val resultingColor = if (colors.isLight) colors.onSurface.copy(alpha = ScrimOpacity) else Color.Black.copy(0.64f)
+        val adjustedAlpha = resultingColor.alpha * calculateFraction(pos = pos)
+        val shadingColor = resultingColor.copy(alpha = adjustedAlpha)
+
+        if (pickerState.value.isVisible()) {
+          platform.androidSetDrawerStatusAndNavBarColor(
+            isLight = colors.isLight,
+            drawerShadingColor = shadingColor,
+            toolbarOnTop = !appPrefs.oneHandUI.get(),
+            navBarColor = colors.background.mixWith(colors.onBackground, 1 - userPickerAlpha())
+          )
+        } else if (ModalManager.start.modalCount.value == 0) {
+          platform.androidSetDrawerStatusAndNavBarColor(
+            isLight = colors.isLight,
+            drawerShadingColor = shadingColor,
+            toolbarOnTop = !appPrefs.oneHandUI.get(),
+            navBarColor = (if (appPrefs.oneHandUI.get() && appPrefs.onboardingStage.get() == OnboardingStage.OnboardingComplete) {
+              colors.background.mixWith(CurrentColors.value.colors.onBackground, 0.97f)
+            } else {
+              colors.background
+            })
+          )
+        }
+        drawRect(
+          if (pos != 0f) resultingColor else Color.Transparent,
+          alpha = calculateFraction(pos = pos)
+        )
+      }
+      .graphicsLayer {
+        if (heightValue == 0) {
+          alpha = 0f
+        }
+        translationY = dismissState.offset.value
+       },
+    contentAlignment = Alignment.BottomCenter
+  ) {
    Box(
-      Modifier
-        .fillMaxSize()
-        .then(clickableModifier)
-        .drawBehind {
-          val pos = calculatePosition(dismissState)
-          val colors = CurrentColors.value.colors
-          val resultingColor = if (colors.isLight) colors.onSurface.copy(alpha = ScrimOpacity) else Color.Black.copy(0.64f)
-          drawRect(
-            if (pos != 0f) resultingColor else Color.Transparent,
-            alpha = calculateFraction(pos = pos)
-          )
-        }
-        .graphicsLayer {
-          if (heightValue == 0) {
-            alpha = 0f
-          }
-          translationY = dismissState.offset.value
-        },
-      contentAlignment = Alignment.BottomCenter
+      Modifier.onSizeChanged { height.intValue = it.height }
    ) {
-      Box(
-        Modifier.onSizeChanged { height.intValue = it.height }
-      ) {
-        KeyChangeEffect(pickerIsVisible) {
-          if (pickerState.value.isVisible()) {
-            try {
-              dismissState.animateTo(DismissValue.Default, userPickerAnimSpec())
-            } catch (e: CancellationException) {
-              Log.e(TAG, "Cancelled animateTo: ${e.stackTraceToString()}")
-              pickerState.value = AnimatedViewState.GONE
-            }
-          } else {
-            try {
-              dismissState.animateTo(DismissValue.DismissedToEnd, userPickerAnimSpec())
-            } catch (e: CancellationException) {
-              Log.e(TAG, "Cancelled animateTo2: ${e.stackTraceToString()}")
-              pickerState.value = AnimatedViewState.VISIBLE
-            }
+      KeyChangeEffect(pickerIsVisible) {
+        if (pickerState.value.isVisible()) {
+          try {
+            dismissState.animateTo(DismissValue.Default, userPickerAnimSpec())
+          } catch (e: CancellationException) {
+            Log.e(TAG, "Cancelled animateTo: ${e.stackTraceToString()}")
+            pickerState.value = AnimatedViewState.GONE
+          }
+        } else {
+          try {
+            dismissState.animateTo(DismissValue.DismissedToEnd, userPickerAnimSpec())
+          } catch (e: CancellationException) {
+            Log.e(TAG, "Cancelled animateTo2: ${e.stackTraceToString()}")
+            pickerState.value = AnimatedViewState.VISIBLE
          }
-        }
-        val draggableModifier = if (height.intValue != 0)
-          Modifier.draggableBottomDrawerModifier(
-            state = dismissState,
-            swipeDistance = height.intValue.toFloat(),
-          )
-        else Modifier
-        Box(draggableModifier.then(modifier).navigationBarsPadding()) {
-          content()
        }
      }
+      val draggableModifier = if (height.intValue != 0)
+        Modifier.draggableBottomDrawerModifier(
+          state = dismissState,
+          swipeDistance = height.intValue.toFloat(),
+        )
+      else Modifier
+      Box(draggableModifier.then(modifier)) {
+        content()
+      }
    }
-    NavigationBarBackground(
-      modifier = Modifier.graphicsLayer { alpha = if (calculatePosition(dismissState) > 0.1f) 1f else 0f },
-      color = MaterialTheme.colors.background.mixWith(MaterialTheme.colors.onBackground, alpha = 1 - userPickerAlpha())
-    )
  }
 }

-private fun calculatePosition(dismissState: DismissState): Float = when {
-  dismissState.progress.from == DismissValue.Default && dismissState.progress.to == DismissValue.Default -> 1f
-  dismissState.progress.from == DismissValue.DismissedToEnd && dismissState.progress.to == DismissValue.DismissedToEnd -> 0f
-  dismissState.progress.to == DismissValue.Default -> dismissState.progress.fraction
-  else -> 1 - dismissState.progress.fraction
-}
-
 private fun Modifier.draggableBottomDrawerModifier(
  state: DismissState,
  swipeDistance: Float,
@@ -171,8 +171,6 @@ actual fun GetImageBottomSheet(
    modifier = Modifier
      .fillMaxWidth()
      .wrapContentHeight()
-      .imePadding()
-      .navigationBarsPadding()
      .onFocusChanged { focusState ->
        if (!focusState.hasFocus) hideBottomSheet()
      }
@@ -1,41 +0,0 @@
-package chat.simplex.common.views.helpers
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.View
-import android.widget.FrameLayout
-
-/**
- * A workaround for the ANR issue on Compose 1.7.x.
- * https://issuetracker.google.com/issues/369354336
- * Code from:
- * https://issuetracker.google.com/issues/369354336#comment8
-*/
-class WorkaroundFocusSearchLayout : FrameLayout {
-
-  constructor(
-    context: Context,
-  ) : super(context)
-
-  constructor(
-    context: Context,
-    attrs: AttributeSet?,
-  ) : super(context, attrs)
-
-  constructor(
-    context: Context,
-    attrs: AttributeSet?,
-    defStyleAttr: Int,
-  ) : super(context, attrs, defStyleAttr)
-
-  constructor(
-    context: Context,
-    attrs: AttributeSet?,
-    defStyleAttr: Int,
-    defStyleRes: Int,
-  ) : super(context, attrs, defStyleAttr, defStyleRes)
-
-  override fun focusSearch(focused: View?, direction: Int): View? {
-    return null
-  }
-}
@@ -2,7 +2,6 @@ package chat.simplex.common.views.usersettings

 import SectionBottomSpacer
 import SectionDividerSpaced
-import SectionSpacer
 import SectionView
 import android.app.Activity
 import android.content.ComponentName
@@ -32,7 +31,6 @@ import chat.simplex.common.model.ChatModel
 import chat.simplex.common.platform.*
 import chat.simplex.common.helpers.APPLICATION_ID
 import chat.simplex.common.helpers.saveAppLocale
-import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.res.MR
 import dev.icerock.moko.resources.ImageResource
 import dev.icerock.moko.resources.compose.painterResource
@@ -77,7 +75,9 @@ fun AppearanceScope.AppearanceLayout(
  systemDarkTheme: SharedPreference<String?>,
  changeIcon: (AppIcon) -> Unit,
 ) {
-  ColumnWithScrollBar {
+  ColumnWithScrollBar(
+    Modifier.fillMaxWidth(),
+  ) {
    AppBarTitle(stringResource(MR.strings.appearance_settings))
    SectionView(stringResource(MR.strings.settings_section_title_interface), contentPadding = PaddingValues()) {
      val context = LocalContext.current
@@ -106,15 +106,15 @@ fun AppearanceScope.AppearanceLayout(
      }
      //      }

-      SettingsPreferenceItem(icon = null, stringResource(MR.strings.one_hand_ui), ChatModel.controller.appPrefs.oneHandUI)
+      SettingsPreferenceItem(icon = null, stringResource(MR.strings.one_hand_ui), ChatModel.controller.appPrefs.oneHandUI) {
+        val c = CurrentColors.value.colors
+        platform.androidSetStatusAndNavBarColors(c.isLight, c.background, false, false)
+      }
    }

    SectionDividerSpaced()
    ThemesSection(systemDarkTheme)

-    SectionDividerSpaced()
-    AppToolbarsSection()
-
    SectionDividerSpaced()
    MessageShapeSection()

@@ -13,13 +13,14 @@ import dev.icerock.moko.resources.compose.stringResource
@Composable
 actual fun SettingsSectionApp(
  showSettingsModal: (@Composable (ChatModel) -> Unit) -> (() -> Unit),
+  showCustomModal: (@Composable ModalData.(ChatModel, () -> Unit) -> Unit) -> (() -> Unit),
  showVersion: () -> Unit,
  withAuth: (title: String, desc: String, block: () -> Unit) -> Unit
 ) {
  SectionView(stringResource(MR.strings.settings_section_title_app)) {
    SettingsActionItem(painterResource(MR.images.ic_restart_alt), stringResource(MR.strings.settings_restart_app), ::restartApp)
    SettingsActionItem(painterResource(MR.images.ic_power_settings_new), stringResource(MR.strings.settings_shutdown), { shutdownAppAlert(::shutdownApp) })
-    SettingsActionItem(painterResource(MR.images.ic_code), stringResource(MR.strings.settings_developer_tools), showSettingsModal { DeveloperView(withAuth) })
+    SettingsActionItem(painterResource(MR.images.ic_code), stringResource(MR.strings.settings_developer_tools), showSettingsModal { DeveloperView(it, showCustomModal, withAuth) })
    AppVersionItem(showVersion)
  }
 }
@@ -11,13 +11,10 @@ import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.*
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.geometry.Size
-import androidx.compose.ui.graphics.*
-import androidx.compose.ui.graphics.drawscope.clipRect
+import androidx.compose.ui.draw.clipToBounds
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.views.usersettings.SetDeliveryReceiptsView
 import chat.simplex.common.model.*
@@ -42,39 +39,14 @@ import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.*
-import kotlin.math.absoluteValue

@Composable
 fun AppScreen() {
  AppBarHandler.appBarMaxHeightPx = with(LocalDensity.current) { AppBarHeight.roundToPx() }
  SimpleXTheme {
-    Surface(color = MaterialTheme.colors.background, contentColor = LocalContentColor.current) {
-      // This padding applies to landscape view only taking care of navigation bar and holes in screen in status bar area
-      // (because nav bar and holes located on vertical sides of screen in landscape view)
-      val direction = LocalLayoutDirection.current
-      val safePadding = WindowInsets.safeDrawing.asPaddingValues()
-      val cutout = WindowInsets.displayCutout.asPaddingValues()
-      val cutoutStart = cutout.calculateStartPadding(direction)
-      val cutoutEnd = cutout.calculateEndPadding(direction)
-      val cutoutMax = maxOf(cutoutStart, cutoutEnd)
-      val paddingStartUntouched = safePadding.calculateStartPadding(direction)
-      val paddingStart = paddingStartUntouched - cutoutStart
-      val paddingEndUntouched = safePadding.calculateEndPadding(direction)
-      val paddingEnd = paddingEndUntouched - cutoutEnd
-      // Such a strange layout is needed because the main content should be covered by solid color in order to hide overflow
-      // of some elements that may have negative offset (so, can't use Row {}).
-      // To check: go to developer settings of Android, choose Display cutout -> Punch hole, and rotate the phone to landscape, open any chat
-      Box {
-        val fullscreenGallery = remember { chatModel.fullscreenGalleryVisible }
-        Box(Modifier.padding(start = paddingStart + cutoutMax, end = paddingEnd + cutoutMax).consumeWindowInsets(PaddingValues(start = paddingStartUntouched, end = paddingEndUntouched))) {
-          Box(Modifier.drawBehind {
-            if (fullscreenGallery.value) {
-              drawRect(Color.Black,  topLeft = Offset(-(paddingStart + cutoutMax).toPx(), 0f), Size(size.width + (paddingStart + cutoutMax).toPx() + (paddingEnd + cutoutMax).toPx(), size.height))
-            }
-          }) {
-            MainScreen()
-          }
-        }
+    ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
+      Surface(color = MaterialTheme.colors.background, contentColor = LocalContentColor.current) {
+        MainScreen()
      }
    }
  }
@@ -166,9 +138,7 @@ fun MainScreen() {
          }
          SetupClipboardListener()
          if (appPlatform.isAndroid) {
-            AndroidWrapInCallLayout {
-              AndroidScreen(userPickerState)
-            }
+            AndroidScreen(userPickerState)
          } else {
            DesktopScreen(userPickerState)
          }
@@ -200,9 +170,7 @@ fun MainScreen() {
      }
    }
    if (appPlatform.isAndroid) {
-      AndroidWrapInCallLayout {
-        ModalManager.fullscreen.showInView()
-      }
+      ModalManager.fullscreen.showInView()
      SwitchingUsersView()
    }

@@ -269,39 +237,19 @@ fun MainScreen() {

 val ANDROID_CALL_TOP_PADDING = 40.dp

-@Composable
-fun AndroidWrapInCallLayout(content: @Composable () -> Unit) {
-  val call = remember { chatModel.activeCall}.value
-  val showCallArea = call != null && call.callState != CallState.WaitCapabilities && call.callState != CallState.InvitationAccepted
-  Box {
-    Box(Modifier.padding(top = if (showCallArea) ANDROID_CALL_TOP_PADDING else 0.dp)) {
-      content()
-    }
-    if (call != null && showCallArea) {
-      ActiveCallInteractiveArea(call)
-    }
-  }
-}
-
@Composable
 fun AndroidScreen(userPickerState: MutableStateFlow<AnimatedViewState>) {
  BoxWithConstraints {
+    val call = remember { chatModel.activeCall} .value
+    val showCallArea = call != null && call.callState != CallState.WaitCapabilities && call.callState != CallState.InvitationAccepted
    val currentChatId = remember { mutableStateOf(chatModel.chatId.value) }
    val offset = remember { Animatable(if (chatModel.chatId.value == null) 0f else maxWidth.value) }
-    val cutout = WindowInsets.displayCutout.only(WindowInsetsSides.Horizontal).asPaddingValues()
-    val direction = LocalLayoutDirection.current
-    val hasCutout = cutout.calculateStartPadding(direction) + cutout.calculateEndPadding(direction) > 0.dp
    Box(
      Modifier
-        // clipping only for devices with cutout currently visible on sides. It prevents showing chat list with open chat view
-        // In order cases it's not needed to use clip
-        .then(if (hasCutout) Modifier.clip(RectangleShape) else Modifier)
        .graphicsLayer {
-          // minOf thing is needed for devices with holes in screen while the user on ChatView rotates his phone from portrait to landscape
-          // because in this case (at least in emulator) maxWidth changes in two steps: big first, smaller on next frame.
-          // But offset is remembered already, so this is a better way than dropping a value of offset
-          translationX = -minOf(offset.value.dp, maxWidth).toPx()
+          translationX = -offset.value.dp.toPx()
        }
+        .padding(top = if (showCallArea) ANDROID_CALL_TOP_PADDING else 0.dp)
    ) {
      StartPartOfScreen(userPickerState)
    }
@@ -323,40 +271,51 @@ fun AndroidScreen(userPickerState: MutableStateFlow<AnimatedViewState>) {
        snapshotFlow { chatModel.chatId.value }
          .distinctUntilChanged()
          .collect {
-            if (it == null) onComposed(null)
+            if (it == null) {
+              platform.androidSetStatusAndNavBarColors(CurrentColors.value.colors.isLight, CurrentColors.value.colors.background, !appPrefs.oneHandUI.get(), appPrefs.oneHandUI.get())
+              onComposed(null)
+            }
            currentChatId.value = it
          }
      }
    }
+    LaunchedEffect(Unit) {
+      snapshotFlow { ModalManager.center.modalCount.value > 0 }
+        .filter { chatModel.chatId.value == null }
+        .collect { modalBackground ->
+          if (chatModel.newChatSheetVisible.value) {
+            platform.androidSetStatusAndNavBarColors(CurrentColors.value.colors.isLight, CurrentColors.value.colors.background, false, appPrefs.oneHandUI.get())
+          } else if (modalBackground) {
+            platform.androidSetStatusAndNavBarColors(CurrentColors.value.colors.isLight, CurrentColors.value.colors.background, false, false)
+          } else {
+            platform.androidSetStatusAndNavBarColors(CurrentColors.value.colors.isLight, CurrentColors.value.colors.background, !appPrefs.oneHandUI.get(), appPrefs.oneHandUI.get())
+          }
+        }
+    }
    Box(Modifier
-      .then(if (hasCutout) Modifier.clip(RectangleShape) else Modifier)
-      .graphicsLayer { translationX = maxWidth.toPx() - minOf(offset.value.dp, maxWidth).toPx() }
+      .graphicsLayer { translationX = maxWidth.toPx() - offset.value.dp.toPx() }
+      .padding(top = if (showCallArea) ANDROID_CALL_TOP_PADDING else 0.dp)
    ) Box2@{
      currentChatId.value?.let {
        ChatView(currentChatId, onComposed)
      }
    }
+    if (call != null && showCallArea) {
+      ActiveCallInteractiveArea(call)
+    }
  }
 }

@Composable
 fun StartPartOfScreen(userPickerState: MutableStateFlow<AnimatedViewState>) {
  if (chatModel.setDeliveryReceipts.value) {
-    CompositionLocalProvider(LocalAppBarHandler provides rememberAppBarHandler()) {
-      SetDeliveryReceiptsView(chatModel)
-    }
+    SetDeliveryReceiptsView(chatModel)
  } else {
    val stopped = chatModel.chatRunning.value == false
-    if (chatModel.sharedContent.value == null) {
-      CompositionLocalProvider(LocalAppBarHandler provides rememberAppBarHandler()) {
-        ChatListView(chatModel, userPickerState, AppLock::setPerformLA, stopped)
-      }
-    } else {
-      // LALAL initial load of view doesn't show blur. Focusing text field shows it
-      CompositionLocalProvider(LocalAppBarHandler provides rememberAppBarHandler(keyboardCoversBar = false)) {
-        ShareListView(chatModel, stopped)
-      }
-    }
+    if (chatModel.sharedContent.value == null)
+      ChatListView(chatModel, userPickerState, AppLock::setPerformLA, stopped)
+    else
+      ShareListView(chatModel, stopped)
  }
 }

@@ -90,9 +90,6 @@ object ChatModel {
  // Needed to check for bottom nav bar and to apply or not navigation bar color on Android
  val newChatSheetVisible = mutableStateOf(false)

-  // Needed to apply black color to left/right cutout area on Android
-  val fullscreenGalleryVisible = mutableStateOf(false)
-
  // preferences
  val notificationPreviewMode by lazy {
    mutableStateOf(
@@ -1892,7 +1889,6 @@ class PendingContactConnection(
@Serializable
 enum class ConnStatus {
  @SerialName("new") New,
-  @SerialName("prepared") Prepared,
  @SerialName("joined") Joined,
  @SerialName("requested") Requested,
  @SerialName("accepted") Accepted,
@@ -1902,7 +1898,6 @@ enum class ConnStatus {

  val initiated: Boolean? get() = when (this) {
    New -> true
-    Prepared -> false
    Joined -> false
    Requested -> true
    Accepted -> true
@@ -118,9 +118,6 @@ class AppPreferences {
  val privacyEncryptLocalFiles = mkBoolPreference(SHARED_PREFS_PRIVACY_ENCRYPT_LOCAL_FILES, true)
  val privacyAskToApproveRelays = mkBoolPreference(SHARED_PREFS_PRIVACY_ASK_TO_APPROVE_RELAYS, true)
  val privacyMediaBlurRadius = mkIntPreference(SHARED_PREFS_PRIVACY_MEDIA_BLUR_RADIUS, 0)
-  // Blur broken on Android 12, see https://github.com/chrisbanes/haze/issues/77. And not available before 12
-  val deviceSupportsBlur = appPlatform.isDesktop || (platform.androidApiLevel ?: 0) >= 32
-  val appearanceBarsBlurRadius = mkIntPreference(SHARED_PREFS_APPEARANCE_BARS_BLUR_RADIUS, if (deviceSupportsBlur) 50 else 0)
  val experimentalCalls = mkBoolPreference(SHARED_PREFS_EXPERIMENTAL_CALLS, false)
  val showUnreadAndFavorites = mkBoolPreference(SHARED_PREFS_SHOW_UNREAD_AND_FAVORITES, false)
  val chatArchiveName = mkStrPreference(SHARED_PREFS_CHAT_ARCHIVE_NAME, null)
@@ -226,8 +223,6 @@ class AppPreferences {
  val chatItemTail = mkBoolPreference(SHARED_PREFS_CHAT_ITEM_TAIL, true)
  val fontScale = mkFloatPreference(SHARED_PREFS_FONT_SCALE, 1f)
  val densityScale = mkFloatPreference(SHARED_PREFS_DENSITY_SCALE, 1f)
-  val inAppBarsDefaultAlpha = if (deviceSupportsBlur) 0.875f else 0.975f
-  val inAppBarsAlpha = mkFloatPreference(SHARED_PREFS_IN_APP_BARS_ALPHA, inAppBarsDefaultAlpha)

  val whatsNewVersion = mkStrPreference(SHARED_PREFS_WHATS_NEW_VERSION, null)
  val lastMigratedVersionCode = mkIntPreference(SHARED_PREFS_LAST_MIGRATED_VERSION_CODE, 0)
@@ -249,7 +244,7 @@ class AppPreferences {
  val iosCallKitEnabled = mkBoolPreference(SHARED_PREFS_IOS_CALL_KIT_ENABLED, true)
  val iosCallKitCallsInRecents = mkBoolPreference(SHARED_PREFS_IOS_CALL_KIT_CALLS_IN_RECENTS, false)

-  val oneHandUI = mkBoolPreference(SHARED_PREFS_ONE_HAND_UI, true)
+  val oneHandUI = mkBoolPreference(SHARED_PREFS_ONE_HAND_UI, appPlatform.isAndroid)

  val hintPreferences: List<Pair<SharedPreference<Boolean>, Boolean>> = listOf(
    laNoticeShown to false,
@@ -367,7 +362,6 @@ class AppPreferences {
    private const val SHARED_PREFS_PRIVACY_ENCRYPT_LOCAL_FILES = "PrivacyEncryptLocalFiles"
    private const val SHARED_PREFS_PRIVACY_ASK_TO_APPROVE_RELAYS = "PrivacyAskToApproveRelays"
    private const val SHARED_PREFS_PRIVACY_MEDIA_BLUR_RADIUS = "PrivacyMediaBlurRadius"
-    private const val SHARED_PREFS_APPEARANCE_BARS_BLUR_RADIUS = "AppearanceBarsBlurRadius"
    const val SHARED_PREFS_PRIVACY_FULL_BACKUP = "FullBackup"
    private const val SHARED_PREFS_EXPERIMENTAL_CALLS = "ExperimentalCalls"
    private const val SHARED_PREFS_SHOW_UNREAD_AND_FAVORITES = "ShowUnreadAndFavorites"
@@ -434,7 +428,6 @@ class AppPreferences {
    private const val SHARED_PREFS_CHAT_ITEM_TAIL = "ChatItemTail"
    private const val SHARED_PREFS_FONT_SCALE = "FontScale"
    private const val SHARED_PREFS_DENSITY_SCALE = "DensityScale"
-    private const val SHARED_PREFS_IN_APP_BARS_ALPHA = "InAppBarsAlpha"
    private const val SHARED_PREFS_WHATS_NEW_VERSION = "WhatsNewVersion"
    private const val SHARED_PREFS_LAST_MIGRATED_VERSION_CODE = "LastMigratedVersionCode"
    private const val SHARED_PREFS_CUSTOM_DISAPPEARING_MESSAGE_TIME = "CustomDisappearingMessageTime"
@@ -1233,15 +1226,6 @@ object ChatController {
        )
        return null
      }
-      r is CR.ChatCmdError && r.chatError is ChatError.ChatErrorAgent
-          && r.chatError.agentError is AgentErrorType.SMP
-          && r.chatError.agentError.smpErr is SMPErrorType.QUOTA -> {
-        AlertManager.shared.showAlertMsg(
-          generalGetString(MR.strings.connection_error_quota),
-          generalGetString(MR.strings.connection_error_quota_desc)
-        )
-        return null
-      }
      else -> {
        if (!(networkErrorAlert(r))) {
          apiErrorAlert("apiConnect", generalGetString(MR.strings.connection_error), r)
@@ -6061,7 +6045,6 @@ sealed class SMPErrorType {
    is AUTH -> "AUTH"
    is CRYPTO -> "CRYPTO"
    is QUOTA -> "QUOTA"
-    is STORE -> "STORE ${storeErr}"
    is NO_MSG -> "NO_MSG"
    is LARGE_MSG -> "LARGE_MSG"
    is EXPIRED -> "EXPIRED"
@@ -6074,7 +6057,6 @@ sealed class SMPErrorType {
  @Serializable @SerialName("AUTH") class AUTH: SMPErrorType()
  @Serializable @SerialName("CRYPTO") class CRYPTO: SMPErrorType()
  @Serializable @SerialName("QUOTA") class QUOTA: SMPErrorType()
-  @Serializable @SerialName("STORE") class STORE(val storeErr: String): SMPErrorType()
  @Serializable @SerialName("NO_MSG") class NO_MSG: SMPErrorType()
  @Serializable @SerialName("LARGE_MSG") class LARGE_MSG: SMPErrorType()
  @Serializable @SerialName("EXPIRED") class EXPIRED: SMPErrorType()
@@ -14,11 +14,20 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.flow.filter
 import java.io.File

+expect fun Modifier.navigationBarsWithImePadding(): Modifier
+
+@Composable
+expect fun ProvideWindowInsets(
+  consumeWindowInsets: Boolean = true,
+  windowInsetsAnimationsEnabled: Boolean = true,
+  content: @Composable () -> Unit
+)
+
@Composable
 expect fun Modifier.desktopOnExternalDrag(
  enabled: Boolean = true,
  onFiles: (List<File>) -> Unit = {},
-  onImage: (File) -> Unit = {},
+  onImage: (Painter) -> Unit = {},
  onText: (String) -> Unit = {}
 ): Modifier

@@ -8,7 +8,6 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import chat.simplex.common.model.ChatId
 import chat.simplex.common.model.NotificationsMode
-import chat.simplex.common.ui.theme.CurrentColors
 import kotlinx.coroutines.Job

 interface PlatformInterface {
@@ -21,12 +20,12 @@ interface PlatformInterface {
  fun androidChatInitializedAndStarted() {}
  fun androidIsBackgroundCallAllowed(): Boolean = true
  fun androidSetNightModeIfSupported() {}
-  fun androidSetStatusAndNavigationBarAppearance(isLightStatusBar: Boolean, isLightNavBar: Boolean, blackNavBar: Boolean = false, themeBackgroundColor: Color = CurrentColors.value.colors.background) {}
+  fun androidSetStatusAndNavBarColors(isLight: Boolean, backgroundColor: Color, hasTop: Boolean, hasBottom: Boolean) {}
+  fun androidSetDrawerStatusAndNavBarColor(isLight: Boolean, drawerShadingColor: Color, toolbarOnTop: Boolean, navBarColor: Color) {}
  fun androidStartCallActivity(acceptCall: Boolean, remoteHostId: Long? = null, chatId: ChatId? = null) {}
  fun androidPictureInPictureAllowed(): Boolean = true
  fun androidCallEnded() {}
  fun androidRestartNetworkObserver() {}
-  val androidApiLevel: Int? get() = null
  @Composable fun androidLockPortraitOrientation() {}
  suspend fun androidAskToAllowBackgroundCalls(): Boolean = true
  @Composable fun desktopShowAppUpdateNotice() {}
@@ -8,7 +8,6 @@ import androidx.compose.foundation.lazy.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp

@Composable
@@ -22,44 +21,11 @@ expect fun LazyColumnWithScrollBar(
  horizontalAlignment: Alignment.Horizontal = Alignment.Start,
  flingBehavior: FlingBehavior = ScrollableDefaults.flingBehavior(),
  userScrollEnabled: Boolean = true,
-  additionalBarOffset: State<Dp>? = null,
-  // by default, this function will include .fillMaxSize() without you doing anything. If you don't need it, pass `false` here
-  // maxSize (at least maxHeight) is needed for blur on appBars to work correctly
-  fillMaxSize: Boolean = true,
-  content: LazyListScope.() -> Unit
-)
-
-@Composable
-expect fun LazyColumnWithScrollBarNoAppBar(
-  modifier: Modifier = Modifier,
-  state: LazyListState? = null,
-  contentPadding: PaddingValues = PaddingValues(0.dp),
-  reverseLayout: Boolean = false,
-  verticalArrangement: Arrangement.Vertical =
-    if (!reverseLayout) Arrangement.Top else Arrangement.Bottom,
-  horizontalAlignment: Alignment.Horizontal = Alignment.Start,
-  flingBehavior: FlingBehavior = ScrollableDefaults.flingBehavior(),
-  userScrollEnabled: Boolean = true,
-  additionalBarOffset: State<Dp>? = null,
  content: LazyListScope.() -> Unit
 )

@Composable
 expect fun ColumnWithScrollBar(
-  modifier: Modifier = Modifier,
-  verticalArrangement: Arrangement.Vertical = Arrangement.Top,
-  horizontalAlignment: Alignment.Horizontal = Alignment.Start,
-  state: ScrollState? = null,
-  // set true when you want to show something in the center with respected .fillMaxSize()
-  maxIntrinsicSize: Boolean = false,
-  // by default, this function will include .fillMaxSize() without you doing anything. If you don't need it, pass `false` here
-  // maxSize (at least maxHeight) is needed for blur on appBars to work correctly
-  fillMaxSize: Boolean = true,
-  content: @Composable ColumnScope.() -> Unit
-)
-
-@Composable
-expect fun ColumnWithScrollBarNoAppBar(
  modifier: Modifier = Modifier,
  verticalArrangement: Arrangement.Vertical = Arrangement.Top,
  horizontalAlignment: Alignment.Horizontal = Alignment.Start,
@@ -1,14 +1,14 @@
 package chat.simplex.common.ui.theme

+import androidx.compose.foundation.background
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.drawBehind
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.*
-import androidx.compose.ui.graphics.layer.GraphicsLayer
 import androidx.compose.ui.platform.LocalDensity
-import androidx.compose.ui.unit.*
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.ChatController
 import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.platform.*
@@ -587,27 +587,21 @@ data class ThemeModeOverride (
  }
 }

-fun Modifier.themedBackground(baseTheme: DefaultTheme = CurrentColors.value.base, bgLayerSize: MutableState<IntSize>?, bgLayer: GraphicsLayer?/*, shape: Shape = RectangleShape*/): Modifier {
-  return drawBehind {
-    copyBackgroundToAppBar(bgLayerSize, bgLayer) {
-      if (baseTheme == DefaultTheme.SIMPLEX) {
-        drawRect(brush = themedBackgroundBrush())
-      } else {
-        drawRect(CurrentColors.value.colors.background)
-      }
-    }
+fun Modifier.themedBackground(baseTheme: DefaultTheme = CurrentColors.value.base, shape: Shape = RectangleShape): Modifier {
+  return if (baseTheme == DefaultTheme.SIMPLEX) {
+    this.background(brush = Brush.linearGradient(
+      listOf(
+        CurrentColors.value.colors.background.darker(0.4f),
+        CurrentColors.value.colors.background.lighter(0.4f)
+      ),
+      Offset(0f, Float.POSITIVE_INFINITY),
+      Offset(Float.POSITIVE_INFINITY, 0f)
+    ), shape = shape)
+  } else {
+    this.background(color = CurrentColors.value.colors.background, shape = shape)
  }
 }

-fun themedBackgroundBrush(): Brush = Brush.linearGradient(
-  listOf(
-    CurrentColors.value.colors.background.darker(0.4f),
-    CurrentColors.value.colors.background.lighter(0.4f)
-  ),
-  Offset(0f, Float.POSITIVE_INFINITY),
-  Offset(Float.POSITIVE_INFINITY, 0f)
-)
-
 val DEFAULT_PADDING = 20.dp
 val DEFAULT_SPACE_AFTER_ICON = 4.dp
 val DEFAULT_PADDING_HALF = DEFAULT_PADDING / 2
@@ -1,6 +1,7 @@
 package chat.simplex.common.ui.theme

 import androidx.compose.material.Colors
+import androidx.compose.material.MaterialTheme
 import androidx.compose.runtime.MutableState
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
@@ -106,7 +107,7 @@ object ThemeManager {
    CurrentColors.value = currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
    platform.androidSetNightModeIfSupported()
    val c = CurrentColors.value.colors
-    platform.androidSetStatusAndNavigationBarAppearance(c.isLight, c.isLight)
+    platform.androidSetStatusAndNavBarColors(c.isLight, c.background, !ChatController.appPrefs.oneHandUI.get(), ChatController.appPrefs.oneHandUI.get())
  }

  fun changeDarkTheme(theme: String) {
@@ -124,6 +125,10 @@ object ThemeManager {
    themeIds[nonSystemThemeName] = prevValue.themeId
    appPrefs.currentThemeIds.set(themeIds)
    CurrentColors.value = currentColors(null, null, chatModel.currentUser.value?.uiThemes, appPrefs.themeOverrides.get())
+    if (name == ThemeColor.BACKGROUND) {
+      val c = CurrentColors.value.colors
+      platform.androidSetStatusAndNavBarColors(c.isLight, c.background, false, false)
+    }
  }

  fun applyThemeColor(name: ThemeColor, color: Color? = null, pref: MutableState<ThemeModeOverride>) {
@@ -7,34 +7,40 @@ import androidx.compose.foundation.lazy.*
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.*
 import androidx.compose.runtime.*
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.layout.layoutId
 import androidx.compose.ui.platform.LocalClipboardManager
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.*
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.*
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.model.ChatModel
 import chat.simplex.common.platform.*
-import chat.simplex.common.views.chat.item.CONSOLE_COMPOSE_LAYOUT_ID
-import chat.simplex.common.views.chat.item.AdaptingBottomPaddingLayout
-import chat.simplex.common.views.chatlist.NavigationBarBackground
+import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.launch

@Composable
-fun TerminalView(floating: Boolean = false) {
+fun TerminalView(floating: Boolean = false, close: () -> Unit) {
  val composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = false)) }
+  val close = {
+    close()
+    if (appPlatform.isDesktop) {
+      ModalManager.center.closeModals()
+    }
+  }
+  BackHandler(onBack = {
+    close()
+  })
  TerminalLayout(
    composeState,
    floating,
    sendCommand = { sendCommand(chatModel, composeState) },
+    close
  )
 }

@@ -63,6 +69,7 @@ fun TerminalLayout(
  composeState: MutableState<ComposeState>,
  floating: Boolean,
  sendCommand: () -> Unit,
+  close: () -> Unit
 ) {
  val smallFont = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onBackground)
  val textStyle = remember { mutableStateOf(smallFont) }
@@ -70,63 +77,65 @@ fun TerminalLayout(
  fun onMessageChange(s: String) {
    composeState.value = composeState.value.copy(message = s)
  }
-  val oneHandUI = remember { appPrefs.oneHandUI.state }
-  Box(Modifier.fillMaxSize()) {
-    val composeViewHeight = remember { mutableStateOf(0.dp) }
-    AdaptingBottomPaddingLayout(Modifier, CONSOLE_COMPOSE_LAYOUT_ID, composeViewHeight) {
-      TerminalLog(floating, composeViewHeight)
-      Column(
-        Modifier
-          .layoutId(CONSOLE_COMPOSE_LAYOUT_ID)
-          .align(Alignment.BottomCenter)
-          .navigationBarsPadding()
-          .consumeWindowInsets(PaddingValues(bottom = if (oneHandUI.value) AppBarHeight * fontSizeSqrtMultiplier else 0.dp))
-          .imePadding()
-          .padding(bottom = if (oneHandUI.value) AppBarHeight * fontSizeSqrtMultiplier else 0.dp)
-          .background(MaterialTheme.colors.background)
-      ) {
-        Divider()
-        Box(Modifier.padding(horizontal = 8.dp)) {
-          SendMsgView(
-            composeState = composeState,
-            showVoiceRecordIcon = false,
-            recState = remember { mutableStateOf(RecordingState.NotStarted) },
-            isDirectChat = false,
-            liveMessageAlertShown = SharedPreference(get = { false }, set = {}),
-            sendMsgEnabled = true,
-            sendButtonEnabled = true,
-            nextSendGrpInv = false,
-            needToAllowVoiceToContact = false,
-            allowedVoiceByPrefs = false,
-            userIsObserver = false,
-            userCanSend = true,
-            allowVoiceToContact = {},
-            placeholder = "",
-            sendMessage = { sendCommand() },
-            sendLiveMessage = null,
-            updateLiveMessage = null,
-            editPrevMessage = {},
-            onMessageChange = ::onMessageChange,
-            onFilesPasted = {},
-            textStyle = textStyle
-          )
+
+  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
+    Scaffold(
+      topBar = { CloseSheetBar(close) },
+      bottomBar = {
+        Column {
+          Divider()
+          Box(Modifier.padding(horizontal = 8.dp)) {
+            SendMsgView(
+              composeState = composeState,
+              showVoiceRecordIcon = false,
+              recState = remember { mutableStateOf(RecordingState.NotStarted) },
+              isDirectChat = false,
+              liveMessageAlertShown = SharedPreference(get = { false }, set = {}),
+              sendMsgEnabled = true,
+              sendButtonEnabled = true,
+              nextSendGrpInv = false,
+              needToAllowVoiceToContact = false,
+              allowedVoiceByPrefs = false,
+              userIsObserver = false,
+              userCanSend = true,
+              allowVoiceToContact = {},
+              placeholder = "",
+              sendMessage = { sendCommand() },
+              sendLiveMessage = null,
+              updateLiveMessage = null,
+              editPrevMessage = {},
+              onMessageChange = ::onMessageChange,
+              onFilesPasted = {},
+              textStyle = textStyle
+            )
+          }
        }
+      },
+      contentColor = LocalContentColor.current,
+      modifier = Modifier.navigationBarsWithImePadding()
+    ) { contentPadding ->
+      Surface(
+        modifier = Modifier
+          .padding(contentPadding)
+          .fillMaxWidth(),
+        color = MaterialTheme.colors.background,
+        contentColor = LocalContentColor.current
+      ) {
+        TerminalLog(floating)
      }
    }
-    if (!oneHandUI.value) {
-      NavigationBarBackground(true, oneHandUI.value)
-    }
  }
 }

@Composable
-fun TerminalLog(floating: Boolean, composeViewHeight: State<Dp>) {
+fun TerminalLog(floating: Boolean) {
  val reversedTerminalItems by remember {
    derivedStateOf { chatModel.terminalItems.value.asReversed() }
  }
+  val clipboard = LocalClipboardManager.current
  val listState = LocalAppBarHandler.current?.listState ?: rememberLazyListState()
  LaunchedEffect(Unit) {
-    var autoScrollToBottom = listState.firstVisibleItemIndex <= 1
+    var autoScrollToBottom = true
    launch {
      snapshotFlow { listState.layoutInfo.totalItemsCount }
        .filter { autoScrollToBottom }
@@ -141,21 +150,12 @@ fun TerminalLog(floating: Boolean, composeViewHeight: State<Dp>) {
    launch {
      snapshotFlow { listState.firstVisibleItemIndex }
        .collect {
-          autoScrollToBottom = it == 0
+          autoScrollToBottom = listState.firstVisibleItemIndex == 0
        }
    }
  }
-  LazyColumnWithScrollBar (
-    reverseLayout = true,
-    contentPadding = PaddingValues(
-      top = topPaddingToContent(),
-      bottom = composeViewHeight.value
-    ),
-    state = listState,
-    additionalBarOffset = composeViewHeight
-  ) {
+  LazyColumnWithScrollBar(reverseLayout = true, state = listState) {
    items(reversedTerminalItems, key = { item -> item.id to item.createdAtNanos }) { item ->
-      val clipboard = LocalClipboardManager.current
      val rhId = item.remoteHostId
      val rhIdStr = if (rhId == null) "" else "$rhId "
      Text(
@@ -172,15 +172,13 @@ fun TerminalLog(floating: Boolean, composeViewHeight: State<Dp>) {
              ModalManager.start
            }
            modalPlace.showModal(endButtons = { ShareButton { clipboard.shareText(item.details) } }) {
-              ColumnWithScrollBar {
-                SelectionContainer {
-                  val details = item.details
-                    .let {
-                      if (it.length < 100_000) it
-                      else it.substring(0, 100_000)
-                    }
-                  Text(details, modifier = Modifier.heightIn(max = 50_000.dp).padding(horizontal = DEFAULT_PADDING).padding(bottom = DEFAULT_PADDING))
-                }
+              SelectionContainer(modifier = Modifier.verticalScroll(rememberScrollState())) {
+                val details = item.details
+                  .let {
+                    if (it.length < 100_000) it
+                    else it.substring(0, 100_000)
+                  }
+                Text(details, modifier = Modifier.heightIn(max = 50_000.dp).padding(horizontal = DEFAULT_PADDING).padding(bottom = DEFAULT_PADDING))
              }
            }
          }.padding(horizontal = 8.dp, vertical = 4.dp)
@@ -210,7 +208,8 @@ fun PreviewTerminalLayout() {
    TerminalLayout(
      composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = false)) },
      sendCommand = {},
-      floating = false
+      floating = false,
+      close = {}
    )
  }
 }
@@ -40,6 +40,8 @@ fun CreateProfile(chatModel: ChatModel, close: () -> Unit) {
  val scrollState = rememberScrollState()
  val keyboardState by getKeyboardState()
  var savedKeyboardState by remember { mutableStateOf(keyboardState) }
+
+  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
    Box(
      modifier = Modifier
        .fillMaxSize()
@@ -48,9 +50,11 @@ fun CreateProfile(chatModel: ChatModel, close: () -> Unit) {
      val displayName = rememberSaveable { mutableStateOf("") }
      val focusRequester = remember { FocusRequester() }

-      ColumnWithScrollBar {
+      ColumnWithScrollBar(
+        modifier = Modifier.fillMaxSize()
+      ) {
        Column(Modifier.padding(horizontal = DEFAULT_PADDING)) {
-          AppBarTitle(stringResource(MR.strings.create_profile), withPadding = false, bottomPadding = DEFAULT_PADDING)
+          AppBarTitle(stringResource(MR.strings.create_profile), bottomPadding = DEFAULT_PADDING)
          Row(Modifier.padding(bottom = DEFAULT_PADDING_HALF).fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
            Text(
              stringResource(MR.strings.display_name),
@@ -98,6 +102,7 @@ fun CreateProfile(chatModel: ChatModel, close: () -> Unit) {
        }
      }
    }
+  }
 }

@Composable
@@ -106,42 +111,59 @@ fun CreateFirstProfile(chatModel: ChatModel, close: () -> Unit) {
  val scrollState = rememberScrollState()
  val keyboardState by getKeyboardState()
  var savedKeyboardState by remember { mutableStateOf(keyboardState) }
-  CompositionLocalProvider(LocalAppBarHandler provides rememberAppBarHandler()) {
-    ModalView({
-      if (chatModel.users.none { !it.user.hidden }) {
-        appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
-      } else {
-        close()
-      }
-    }) {
-      ColumnWithScrollBar {
-        val displayName = rememberSaveable { mutableStateOf("") }
-        val focusRequester = remember { FocusRequester() }
-        Column(if (appPlatform.isAndroid) Modifier.fillMaxSize().padding(horizontal = DEFAULT_PADDING) else Modifier.widthIn(max = 600.dp).fillMaxHeight().padding(horizontal = DEFAULT_PADDING).align(Alignment.CenterHorizontally)) {
-          Box(Modifier.align(Alignment.CenterHorizontally)) {
-            AppBarTitle(stringResource(MR.strings.create_profile), bottomPadding = DEFAULT_PADDING, withPadding = false)
+  val handler = remember { AppBarHandler() }
+  CompositionLocalProvider(
+    LocalAppBarHandler provides handler
+  ) {
+    ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
+      Column(
+        modifier = Modifier
+          .fillMaxSize()
+          .themedBackground(),
+        horizontalAlignment = Alignment.CenterHorizontally
+      ) {
+        CloseSheetBar(close = {
+          if (chatModel.users.none { !it.user.hidden }) {
+            appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
+          } else {
+            close()
          }
-          ProfileNameField(displayName, stringResource(MR.strings.display_name), { it.trim() == mkValidName(it) }, focusRequester)
-          Spacer(Modifier.height(DEFAULT_PADDING))
-          ReadableText(MR.strings.your_profile_is_stored_on_your_device, TextAlign.Start, padding = PaddingValues(), style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary))
-          ReadableText(MR.strings.profile_is_only_shared_with_your_contacts, TextAlign.Start, style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary))
-        }
-        Spacer(Modifier.fillMaxHeight().weight(1f))
-        Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
-          OnboardingActionButton(
-            if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_PADDING * 2).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
-            labelId = MR.strings.create_profile_button,
-            onboarding = null,
-            enabled = canCreateProfile(displayName.value),
-            onclick = { createProfileOnboarding(chat.simplex.common.platform.chatModel, displayName.value, close) }
-          )
-          // Reserve space
-          TextButtonBelowOnboardingButton("", null)
-        }
+        })
+        BackHandler(onBack = {
+          appPrefs.onboardingStage.set(OnboardingStage.Step1_SimpleXInfo)
+        })

-        LaunchedEffect(Unit) {
-          delay(300)
-          focusRequester.requestFocus()
+        ColumnWithScrollBar(
+          modifier = Modifier.fillMaxSize()
+        ) {
+          val displayName = rememberSaveable { mutableStateOf("") }
+          val focusRequester = remember { FocusRequester() }
+          Column(if (appPlatform.isAndroid) Modifier.fillMaxSize().padding(horizontal = DEFAULT_PADDING) else Modifier.widthIn(max = 600.dp).fillMaxHeight().padding(horizontal = DEFAULT_PADDING).align(Alignment.CenterHorizontally)) {
+            Box(Modifier.align(Alignment.CenterHorizontally)) {
+              AppBarTitle(stringResource(MR.strings.create_profile), bottomPadding = DEFAULT_PADDING, withPadding = false)
+            }
+            ProfileNameField(displayName, stringResource(MR.strings.display_name), { it.trim() == mkValidName(it) }, focusRequester)
+            Spacer(Modifier.height(DEFAULT_PADDING))
+            ReadableText(MR.strings.your_profile_is_stored_on_your_device, TextAlign.Start, padding = PaddingValues(), style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary))
+            ReadableText(MR.strings.profile_is_only_shared_with_your_contacts, TextAlign.Start, style = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.secondary))
+          }
+          Spacer(Modifier.fillMaxHeight().weight(1f))
+          Column(Modifier.widthIn(max = if (appPlatform.isAndroid) 450.dp else 1000.dp).align(Alignment.CenterHorizontally), horizontalAlignment = Alignment.CenterHorizontally) {
+            OnboardingActionButton(
+              if (appPlatform.isAndroid) Modifier.padding(horizontal = DEFAULT_PADDING * 2).fillMaxWidth() else Modifier.widthIn(min = 300.dp),
+              labelId = MR.strings.create_profile_button,
+              onboarding = null,
+              enabled = canCreateProfile(displayName.value),
+              onclick = { createProfileOnboarding(chat.simplex.common.platform.chatModel, displayName.value, close) }
+            )
+            // Reserve space
+            TextButtonBelowOnboardingButton("", null)
+          }
+
+          LaunchedEffect(Unit) {
+            delay(300)
+            focusRequester.requestFocus()
+          }
        }
      }
      LaunchedEffect(Unit) {
@@ -233,6 +255,7 @@ fun ProfileNameField(name: MutableState<String>, placeholder: String = "", isVal
  val modifier = Modifier
    .fillMaxWidth()
    .heightIn(min = 50.dp)
+    .navigationBarsWithImePadding()
    .onFocusChanged { focused = it.isFocused }
  Column(
    Modifier
@@ -266,7 +289,6 @@ fun ProfileNameField(name: MutableState<String>, placeholder: String = "", isVal
          enabled = true,
          isError = false,
          interactionSource = remember { MutableInteractionSource() },
-          colors = TextFieldDefaults.textFieldColors(backgroundColor = Color.Unspecified)
        )
      }
    )
@@ -53,7 +53,7 @@ fun IncomingCallAlertLayout(
  acceptCall: () -> Unit
 ) {
  val color = if (isInDarkTheme()) MaterialTheme.colors.surface else IncomingCallLight
-  Column(Modifier.fillMaxWidth().background(color).statusBarsPadding().padding(top = DEFAULT_PADDING, bottom = DEFAULT_PADDING, start = DEFAULT_PADDING, end = 8.dp)) {
+  Column(Modifier.fillMaxWidth().background(color).padding(top = DEFAULT_PADDING, bottom = DEFAULT_PADDING, start = DEFAULT_PADDING, end = 8.dp)) {
    IncomingCallInfo(invitation, chatModel)
    Spacer(Modifier.height(8.dp))
    Row(Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceBetween) {
@@ -529,7 +529,10 @@ fun ChatInfoLayout(
  KeyChangeEffect(chat.id) {
    scope.launch { scrollState.scrollTo(0) }
  }
-  ColumnWithScrollBar {
+  ColumnWithScrollBar(
+    Modifier
+      .fillMaxWidth()
+  ) {
    Row(
      Modifier.fillMaxWidth(),
      horizontalArrangement = Arrangement.Center
@@ -276,7 +276,7 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools

  @Composable
  fun HistoryTab() {
-    ColumnWithScrollBar {
+    ColumnWithScrollBar(Modifier.fillMaxWidth()) {
      Details()
      SectionDividerSpaced(maxTopPadding = false, maxBottomPadding = true)
      val versions = ciInfo.itemVersions
@@ -300,7 +300,7 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools

  @Composable
  fun QuoteTab(qi: CIQuote) {
-    ColumnWithScrollBar {
+    ColumnWithScrollBar(Modifier.fillMaxWidth()) {
      Details()
      SectionDividerSpaced(maxTopPadding = false, maxBottomPadding = true)
      SectionView(contentPadding = PaddingValues(horizontal = DEFAULT_PADDING)) {
@@ -313,7 +313,7 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools

  @Composable
  fun ForwardedFromTab(forwardedFromItem: AChatItem) {
-    ColumnWithScrollBar {
+    ColumnWithScrollBar(Modifier.fillMaxWidth()) {
      Details()
      SectionDividerSpaced(maxTopPadding = false, maxBottomPadding = true)
      SectionView {
@@ -375,7 +375,7 @@ fun ChatItemInfoView(chatRh: Long?, ci: ChatItem, ciInfo: ChatItemInfo, devTools

  @Composable
  fun DeliveryTab(memberDeliveryStatuses: List<MemberDeliveryStatus>) {
-    ColumnWithScrollBar {
+    ColumnWithScrollBar(Modifier.fillMaxWidth()) {
      Details()
      SectionDividerSpaced(maxTopPadding = false, maxBottomPadding = true)
      val mss = membersStatuses(chatModel, memberDeliveryStatuses)
@@ -12,11 +12,10 @@ import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.*
-import androidx.compose.ui.draw.*
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.drawWithCache
 import androidx.compose.ui.graphics.*
-import androidx.compose.ui.graphics.layer.GraphicsLayer
 import androidx.compose.ui.layout.layoutId
-import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.platform.*
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
@@ -109,7 +108,6 @@ fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -
      }
    }
    val clipboard = LocalClipboardManager.current
-    CompositionLocalProvider(LocalAppBarHandler provides rememberAppBarHandler(chatInfo.id, keyboardCoversBar = false)) {
    when (chatInfo) {
      is ChatInfo.Direct, is ChatInfo.Group, is ChatInfo.Local -> {
        val perChatTheme = remember(chatInfo, CurrentColors.value.base) { if (chatInfo is ChatInfo.Direct) chatInfo.contact.uiThemes?.preferredMode(!CurrentColors.value.colors.isLight) else if (chatInfo is ChatInfo.Group) chatInfo.groupInfo.uiThemes?.preferredMode(!CurrentColors.value.colors.isLight) else null }
@@ -525,10 +523,28 @@ fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -
            showViaProxy = chatModel.controller.appPrefs.showSentViaProxy.get(),
            showSearch = showSearch
          )
+          if (appPlatform.isAndroid) {
+            val backgroundColor = MaterialTheme.colors.background
+            val backgroundColorState = rememberUpdatedState(backgroundColor)
+            LaunchedEffect(Unit) {
+              snapshotFlow { ModalManager.center.modalCount.value > 0 }
+                .collect { modalBackground ->
+                  if (modalBackground) {
+                    platform.androidSetStatusAndNavBarColors(CurrentColors.value.colors.isLight, CurrentColors.value.colors.background, false, false)
+                  } else {
+                    platform.androidSetStatusAndNavBarColors(CurrentColors.value.colors.isLight, backgroundColorState.value, true, false)
+                  }
+                }
+            }
+          }
        }
      }
      is ChatInfo.ContactConnection -> {
        val close = { chatModel.chatId.value = null }
+        val handler = remember { AppBarHandler() }
+        CompositionLocalProvider(
+          LocalAppBarHandler provides handler
+        ) {
          ModalView(close, showClose = appPlatform.isAndroid, content = {
            ContactConnectionInfoView(chatModel, chatRh, chatInfo.contactConnection.connReqInv, chatInfo.contactConnection, false, close)
          })
@@ -537,9 +553,14 @@ fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -
            ModalManager.end.closeModals()
            chatModel.chatItems.clear()
          }
+        }
      }
      is ChatInfo.InvalidJSON -> {
        val close = { chatModel.chatId.value = null }
+        val handler = remember { AppBarHandler() }
+        CompositionLocalProvider(
+          LocalAppBarHandler provides handler
+        ) {
          ModalView(close, showClose = appPlatform.isAndroid, endButtons = { ShareButton { clipboard.shareText(chatInfo.json) } }, content = {
            InvalidJSONView(chatInfo.json)
          })
@@ -548,10 +569,10 @@ fun ChatView(staleChatId: State<String?>, onComposed: suspend (chatId: String) -
            ModalManager.end.closeModals()
            chatModel.chatItems.clear()
          }
+        }
      }
      else -> {}
    }
-    }
  }
 }

@@ -621,67 +642,81 @@ fun ChatLayout(
      .desktopOnExternalDrag(
        enabled = remember(attachmentDisabled.value, chatInfo.value?.userCanSend) { mutableStateOf(!attachmentDisabled.value && chatInfo.value?.userCanSend == true) }.value,
        onFiles = { paths -> composeState.onFilesAttached(paths.map { it.toURI() }) },
-        onImage = { file -> CoroutineScope(Dispatchers.IO).launch { composeState.processPickedMedia(listOf(file.toURI()), null) } },
+        onImage = {
+          // TODO: file is not saved anywhere?!
+          val tmpFile = File.createTempFile("image", ".bmp", tmpDir)
+          tmpFile.deleteOnExit()
+          chatModel.filesToDelete.add(tmpFile)
+          val uri = tmpFile.toURI()
+          CoroutineScope(Dispatchers.IO).launch { composeState.processPickedMedia(listOf(uri), null) }
+        },
        onText = {
          // Need to parse HTML in order to correctly display the content
          //composeState.value = composeState.value.copy(message = composeState.value.message + it)
        },
      )
  ) {
-    ModalBottomSheetLayout(
-      scrimColor = Color.Black.copy(alpha = 0.12F),
-      sheetElevation = 0.dp,
-      sheetContent = {
-        ChooseAttachmentView(
-          attachmentOption,
-          hide = { scope.launch { attachmentBottomSheetState.hide() } }
-        )
-      },
-      sheetState = attachmentBottomSheetState,
-      sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
-    ) {
-      val composeViewHeight = remember { mutableStateOf(0.dp) }
-      Box(Modifier.fillMaxSize().chatViewBackgroundModifier(MaterialTheme.colors, MaterialTheme.wallpaper, LocalAppBarHandler.current?.backgroundGraphicsLayerSize, LocalAppBarHandler.current?.backgroundGraphicsLayer)) {
-        val remoteHostId = remember { remoteHostId }.value
-        val chatInfo = remember { chatInfo }.value
-        AdaptingBottomPaddingLayout(Modifier, CHAT_COMPOSE_LAYOUT_ID, composeViewHeight) {
-          if (chatInfo != null) {
-            Box(Modifier.fillMaxSize()) {
+    ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
+      ModalBottomSheetLayout(
+        scrimColor = Color.Black.copy(alpha = 0.12F),
+        modifier = Modifier.navigationBarsWithImePadding(),
+        sheetElevation = 0.dp,
+        sheetContent = {
+          ChooseAttachmentView(
+            attachmentOption,
+            hide = { scope.launch { attachmentBottomSheetState.hide() } }
+          )
+        },
+        sheetState = attachmentBottomSheetState,
+        sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
+      ) {
+        val floatingButton: MutableState<@Composable () -> Unit> = remember { mutableStateOf({}) }
+        val setFloatingButton = { button: @Composable () -> Unit ->
+          floatingButton.value = button
+        }
+
+        Scaffold(
+          topBar = {
+            if (selectedChatItems.value == null) {
+              val chatInfo = chatInfo.value
+              if (chatInfo != null) {
+                ChatInfoToolbar(chatInfo, back, info, startCall, endCall, addMembers, openGroupLink, changeNtfsState, onSearchValueChanged, showSearch)
+              }
+            } else {
+              SelectedItemsTopToolbar(selectedChatItems)
+            }
+          },
+          bottomBar = composeView,
+          modifier = Modifier.navigationBarsWithImePadding(),
+          floatingActionButton = { floatingButton.value() },
+          contentColor = LocalContentColor.current,
+          backgroundColor = Color.Unspecified
+        ) { contentPadding ->
+          val wallpaperImage = MaterialTheme.wallpaper.type.image
+          val wallpaperType = MaterialTheme.wallpaper.type
+          val backgroundColor = MaterialTheme.wallpaper.background ?: wallpaperType.defaultBackgroundColor(CurrentColors.value.base, MaterialTheme.colors.background)
+          val tintColor = MaterialTheme.wallpaper.tint ?: wallpaperType.defaultTintColor(CurrentColors.value.base)
+          BoxWithConstraints(Modifier
+            .fillMaxSize()
+            .background(MaterialTheme.colors.background)
+            .then(if (wallpaperImage != null)
+              Modifier.drawWithCache { chatViewBackground(wallpaperImage, wallpaperType, backgroundColor, tintColor) }
+            else
+              Modifier)
+            .padding(contentPadding)
+          ) {
+            val remoteHostId = remember { remoteHostId }.value
+            val chatInfo = remember { chatInfo }.value
+            if (chatInfo != null) {
              ChatItemsList(
-                remoteHostId, chatInfo, unreadCount, composeState, composeViewHeight, searchValue,
+                remoteHostId, chatInfo, unreadCount, composeState, searchValue,
                useLinkPreviews, linkMode, selectedChatItems, showMemberInfo, loadPrevMessages, deleteMessage, deleteMessages,
                receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, openDirectChat, forwardItem,
                updateContactStats, updateMemberStats, syncContactConnection, syncMemberConnection, findModelChat, findModelMember,
-                setReaction, showItemDetails, markRead, remember { { onComposed(it) } }, developerTools, showViaProxy,
+                setReaction, showItemDetails, markRead, setFloatingButton, onComposed, developerTools, showViaProxy,
              )
            }
          }
-          val oneHandUI = remember { appPrefs.oneHandUI.state }
-          Box(
-            Modifier
-              .layoutId(CHAT_COMPOSE_LAYOUT_ID)
-              .align(Alignment.BottomCenter)
-              .imePadding()
-              .navigationBarsPadding()
-              .then(if (oneHandUI.value) Modifier.padding(bottom = AppBarHeight * fontSizeSqrtMultiplier) else Modifier)
-          ) {
-            composeView()
-          }
-        }
-        val oneHandUI = remember { appPrefs.oneHandUI.state }
-        if (oneHandUI.value) {
-          StatusBarBackground()
-        } else {
-          NavigationBarBackground(true, oneHandUI.value, noAlpha = true)
-        }
-        Box(if (oneHandUI.value) Modifier.align(Alignment.BottomStart).imePadding() else Modifier) {
-          if (selectedChatItems.value == null) {
-            if (chatInfo != null) {
-              ChatInfoToolbar(chatInfo, back, info, startCall, endCall, addMembers, openGroupLink, changeNtfsState, onSearchValueChanged, showSearch)
-            }
-          } else {
-            SelectedItemsTopToolbar(selectedChatItems)
-          }
        }
      }
    }
@@ -689,7 +724,7 @@ fun ChatLayout(
 }

@Composable
-fun BoxScope.ChatInfoToolbar(
+fun ChatInfoToolbar(
  chatInfo: ChatInfo,
  back: () -> Unit,
  info: () -> Unit,
@@ -841,33 +876,21 @@ fun BoxScope.ChatInfoToolbar(
      }
    }
  }
-  val oneHandUI = remember { appPrefs.oneHandUI.state }
-  DefaultAppBar(
+
+  DefaultTopAppBar(
    navigationButton = { if (appPlatform.isAndroid || showSearch.value) { NavigationButtonBack(onBackClicked) }  },
    title = { ChatInfoToolbarTitle(chatInfo) },
    onTitleClick = if (chatInfo is ChatInfo.Local) null else info,
    showSearch = showSearch.value,
-    onTop = !oneHandUI.value,
    onSearchValueChanged = onSearchValueChanged,
-    buttons = { barButtons.forEach { it() } }
+    buttons = barButtons
  )
-  Box(Modifier.fillMaxWidth().wrapContentSize(Alignment.TopEnd)) {
-    val density = LocalDensity.current
-    val width = remember { mutableStateOf(250.dp) }
-    val height = remember { mutableStateOf(0.dp) }
-    DefaultDropdownMenu(
-      showMenu,
-      modifier = Modifier.onSizeChanged { with(density) {
-        width.value = it.width.toDp().coerceAtLeast(250.dp)
-        if (oneHandUI.value && (appPlatform.isDesktop || (platform.androidApiLevel ?: 0) >= 30)) height.value = it.height.toDp()
-      } },
-      offset = DpOffset(-width.value, if (oneHandUI.value) -height.value else AppBarHeight)
-    ) {
-      if (oneHandUI.value) {
-        menuItems.asReversed().forEach { it() }
-      } else {
-        menuItems.forEach { it() }
-      }
+
+  Divider(Modifier.padding(top = AppBarHeight * fontSizeSqrtMultiplier))
+
+  Box(Modifier.fillMaxWidth().wrapContentSize(Alignment.TopEnd).offset(y = AppBarHeight * fontSizeSqrtMultiplier)) {
+    DefaultDropdownMenu(showMenu) {
+      menuItems.forEach { it() }
    }
  }
 }
@@ -911,12 +934,11 @@ private fun ContactVerifiedShield() {
 }

@Composable
-fun BoxScope.ChatItemsList(
+fun BoxWithConstraintsScope.ChatItemsList(
  remoteHostId: Long?,
  chatInfo: ChatInfo,
  unreadCount: State<Int>,
  composeState: MutableState<ComposeState>,
-  composeViewHeight: State<Dp>,
  searchValue: State<String>,
  useLinkPreviews: Boolean,
  linkMode: SimplexLinkMode,
@@ -941,6 +963,7 @@ fun BoxScope.ChatItemsList(
  setReaction: (ChatInfo, ChatItem, Boolean, MsgReaction) -> Unit,
  showItemDetails: (ChatInfo, ChatItem) -> Unit,
  markRead: (CC.ItemRange, unreadCountAfter: Int?) -> Unit,
+  setFloatingButton: (@Composable () -> Unit) -> Unit,
  onComposed: suspend (chatId: String) -> Unit,
  developerTools: Boolean,
  showViaProxy: Boolean
@@ -964,18 +987,13 @@ fun BoxScope.ChatItemsList(
  PreloadItems(chatInfo.id, listState, ChatPagination.UNTIL_PRELOAD_COUNT, loadPrevMessages)

  Spacer(Modifier.size(8.dp))
-  val reversedChatItems = remember { derivedStateOf { chatModel.chatItems.asReversed() } }
-  val topPaddingToContentPx = rememberUpdatedState(with(LocalDensity.current) { topPaddingToContent().roundToPx() })
-  val maxHeight = remember { derivedStateOf { listState.layoutInfo.viewportEndOffset - topPaddingToContentPx.value } }
-  val scrollToItem: State<(Long) -> Unit> = remember {
-    mutableStateOf(
-      { itemId: Long ->
-        val index = reversedChatItems.value.indexOfFirst { it.id == itemId }
-        if (index != -1) {
-          scope.launch { listState.animateScrollToItem(kotlin.math.min(reversedChatItems.value.lastIndex, index + 1), -maxHeight.value) }
-        }
-      }
-    )
+  val reversedChatItems by remember { derivedStateOf { chatModel.chatItems.asReversed() } }
+  val maxHeightRounded = with(LocalDensity.current) { maxHeight.roundToPx() }
+  val scrollToItem: (Long) -> Unit = { itemId: Long ->
+    val index = reversedChatItems.indexOfFirst { it.id == itemId }
+    if (index != -1) {
+      scope.launch { listState.animateScrollToItem(kotlin.math.min(reversedChatItems.lastIndex, index + 1), -maxHeightRounded) }
+    }
  }
  // TODO: Having this block on desktop makes ChatItemsList() to recompose twice on chatModel.chatId update instead of once
  LaunchedEffect(chatInfo.id) {
@@ -993,18 +1011,8 @@ fun BoxScope.ChatItemsList(
      VideoPlayerHolder.releaseAll()
    }
  )
-  LazyColumnWithScrollBar(
-    Modifier.align(Alignment.BottomCenter),
-    state = listState,
-    reverseLayout = true,
-    contentPadding = PaddingValues(
-      top = topPaddingToContent(),
-      bottom = composeViewHeight.value
-    ),
-    additionalBarOffset = composeViewHeight
-  ) {
-    itemsIndexed(reversedChatItems.value, key = { _, item -> item.id to item.meta.createdAt.toEpochMilliseconds() }) { i, cItem ->
-      val itemScope = rememberCoroutineScope()
+  LazyColumnWithScrollBar(Modifier.align(Alignment.BottomCenter), state = listState, reverseLayout = true) {
+    itemsIndexed(reversedChatItems, key = { _, item -> item.id to item.meta.createdAt.toEpochMilliseconds() }) { i, cItem ->
      CompositionLocalProvider(
        // Makes horizontal and vertical scrolling to coexist nicely.
        // With default touchSlop when you scroll LazyColumn, you can unintentionally open reply view
@@ -1012,10 +1020,10 @@ fun BoxScope.ChatItemsList(
      ) {
        val provider = {
          providerForGallery(i, chatModel.chatItems.value, cItem.id) { indexInReversed ->
-            itemScope.launch {
+            scope.launch {
              listState.scrollToItem(
-                kotlin.math.min(reversedChatItems.value.lastIndex, indexInReversed + 1),
-                -maxHeight.value
+                kotlin.math.min(reversedChatItems.lastIndex, indexInReversed + 1),
+                -maxHeightRounded
              )
            }
          }
@@ -1028,7 +1036,7 @@ fun BoxScope.ChatItemsList(
          tryOrShowError("${cItem.id}ChatItem", error = {
            CIBrokenComposableView(if (cItem.chatDir.sent) Alignment.CenterEnd else Alignment.CenterStart)
          }) {
-            ChatItemView(remoteHostId, chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, revealed = revealed, range = range, fillMaxWidth = fillMaxWidth, selectedChatItems = selectedChatItems, selectChatItem = { selectUnselectChatItem(true, cItem, revealed, selectedChatItems) }, deleteMessage = deleteMessage, deleteMessages = deleteMessages, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, forwardItem = forwardItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem.value, setReaction = setReaction, showItemDetails = showItemDetails, developerTools = developerTools, showViaProxy = showViaProxy, itemSeparation = itemSeparation, showTimestamp = itemSeparation.timestamp)
+            ChatItemView(remoteHostId, chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, revealed = revealed, range = range, fillMaxWidth = fillMaxWidth, selectedChatItems = selectedChatItems, selectChatItem = { selectUnselectChatItem(true, cItem, revealed, selectedChatItems) }, deleteMessage = deleteMessage, deleteMessages = deleteMessages, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, forwardItem = forwardItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, setReaction = setReaction, showItemDetails = showItemDetails, developerTools = developerTools, showViaProxy = showViaProxy, itemSeparation = itemSeparation, showTimestamp = itemSeparation.timestamp)
          }
        }

@@ -1036,7 +1044,7 @@ fun BoxScope.ChatItemsList(
        fun ChatItemView(cItem: ChatItem, range: IntRange?, prevItem: ChatItem?, itemSeparation: ItemSeparation, previousItemSeparation: ItemSeparation?) {
          val dismissState = rememberDismissState(initialValue = DismissValue.Default) {
            if (it == DismissValue.DismissedToStart) {
-              itemScope.launch {
+              scope.launch {
                if ((cItem.content is CIContent.SndMsgContent || cItem.content is CIContent.RcvMsgContent) && chatInfo !is ChatInfo.Local) {
                  if (composeState.value.editing) {
                    composeState.value = ComposeState(contextItem = ComposeContextItem.QuotedItem(cItem), useLinkPreviews = useLinkPreviews)
@@ -1233,17 +1241,16 @@ fun BoxScope.ChatItemsList(
          }

          val range = chatViewItemsRange(currIndex, prevHidden)
-          val reversed = reversedChatItems.value
          if (revealed.value && range != null) {
-            reversed.subList(range.first, range.last + 1).forEachIndexed { index, ci ->
-              val prev = if (index + range.first == prevHidden) prevItem else reversed[index + range.first + 1]
+            reversedChatItems.subList(range.first, range.last + 1).forEachIndexed { index, ci ->
+              val prev = if (index + range.first == prevHidden) prevItem else reversedChatItems[index + range.first + 1]
              ChatItemView(ci, null, prev, itemSeparation, previousItemSeparation)
            }
          } else {
            ChatItemView(cItem, range, prevItem, itemSeparation, previousItemSeparation)
          }

-          if (i == reversed.lastIndex) {
+          if (i == reversedChatItems.lastIndex) {
            DateSeparator(cItem.meta.itemTs)
          }
        }
@@ -1251,7 +1258,7 @@ fun BoxScope.ChatItemsList(

        if (cItem.isRcvNew && chatInfo.id == ChatModel.chatId.value) {
          LaunchedEffect(cItem.id) {
-            itemScope.launch {
+            scope.launch {
              delay(600)
              markRead(CC.ItemRange(cItem.id, cItem.id), null)
            }
@@ -1260,10 +1267,10 @@ fun BoxScope.ChatItemsList(
      }
    }
  }
-  FloatingButtons(chatModel.chatItems, unreadCount, composeViewHeight, remoteHostId, chatInfo, searchValue, markRead, listState)
+  FloatingButtons(chatModel.chatItems, unreadCount, remoteHostId, chatInfo, searchValue, markRead, setFloatingButton, listState)

  FloatingDate(
-    Modifier.padding(top = 10.dp + topPaddingToContent()).align(Alignment.TopCenter),
+    Modifier.padding(top = 10.dp).align(Alignment.TopCenter),
    listState,
  )

@@ -1318,65 +1325,87 @@ private fun ScrollToBottom(chatId: ChatId, listState: LazyListState, chatItems:
 }

@Composable
-fun BoxScope.FloatingButtons(
+fun BoxWithConstraintsScope.FloatingButtons(
  chatItems: State<List<ChatItem>>,
  unreadCount: State<Int>,
-  composeViewHeight: State<Dp>,
  remoteHostId: Long?,
  chatInfo: ChatInfo,
  searchValue: State<String>,
  markRead: (CC.ItemRange, unreadCountAfter: Int?) -> Unit,
+  setFloatingButton: (@Composable () -> Unit) -> Unit,
  listState: LazyListState
 ) {
  val scope = rememberCoroutineScope()
-  val maxHeight = remember { derivedStateOf { listState.layoutInfo.viewportSize.height } }
-  val bottomUnreadCount = remember {
+  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
+      }
+  }
+
+  LaunchedEffect(listState) {
+    // When both snapshotFlows located in one LaunchedEffect second block will never be called because coroutine is paused on first block
+    // so separate them into two LaunchedEffects
+    snapshotFlow { listState.layoutInfo.visibleItemsInfo.lastIndex }
+      .distinctUntilChanged()
+      .collect {
+        lastIndexOfVisibleItems = it
+      }
+  }
+  val bottomUnreadCount by remember {
    derivedStateOf {
      if (unreadCount.value == 0) return@derivedStateOf 0
      val items = chatItems.value
-      val from = items.lastIndex - listState.firstVisibleItemIndex - listState.layoutInfo.visibleItemsInfo.lastIndex
+      val from = items.lastIndex - firstVisibleIndex - lastIndexOfVisibleItems
      if (items.size <= from || from < 0) return@derivedStateOf 0

      items.subList(from, items.size).count { it.isRcvNew }
    }
  }
+  val firstVisibleOffset = (-with(LocalDensity.current) { maxHeight.roundToPx() } * 0.8).toInt()

-  val showBottomButtonWithCounter = remember { derivedStateOf { bottomUnreadCount.value > 0 && listState.firstVisibleItemIndex != 0 && searchValue.value.isEmpty() } }
-  val showBottomButtonWithArrow = remember { derivedStateOf { !showBottomButtonWithCounter.value && listState.firstVisibleItemIndex != 0 } }
-  BottomEndFloatingButton(
-    bottomUnreadCount,
-    showBottomButtonWithCounter,
-    showBottomButtonWithArrow,
-    composeViewHeight,
-    onClickArrowDown = {
-      scope.launch { listState.animateScrollToItem(0) }
-    },
-    onClickCounter = {
-      val firstVisibleOffset = (-maxHeight.value * 0.8).toInt()
-      scope.launch { listState.animateScrollToItem(kotlin.math.max(0, bottomUnreadCount.value - 1), firstVisibleOffset) }
-    }
-  )
+  LaunchedEffect(bottomUnreadCount, firstItemIsVisible) {
+    val showButtonWithCounter = bottomUnreadCount > 0 && !firstItemIsVisible && searchValue.value.isEmpty()
+    val showButtonWithArrow = !showButtonWithCounter && !firstItemIsVisible
+    setFloatingButton(
+      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 = remember { derivedStateOf { unreadCount.value - bottomUnreadCount.value } }
+  val topUnreadCount by remember {
+    derivedStateOf { unreadCount.value - bottomUnreadCount }
+  }
+  val showButtonWithCounter = topUnreadCount > 0
+  val height = with(LocalDensity.current) { maxHeight.toPx() }
  val showDropDown = remember { mutableStateOf(false) }

  TopEndFloatingButton(
-    Modifier.padding(end = DEFAULT_PADDING, top = 24.dp + topPaddingToContent()).align(Alignment.TopEnd),
+    Modifier.padding(end = DEFAULT_PADDING, top = 24.dp).align(Alignment.TopEnd),
    topUnreadCount,
-    onClick = { scope.launch { listState.animateScrollBy(maxHeight.value.toFloat()) } },
+    showButtonWithCounter,
+    onClick = { scope.launch { listState.animateScrollBy(height) } },
    onLongClick = { showDropDown.value = true }
  )

-  Box(Modifier.fillMaxWidth().wrapContentSize(Alignment.TopEnd)) {
-    val density = LocalDensity.current
-    val width = remember { mutableStateOf(250.dp) }
-    DefaultDropdownMenu(
-      showDropDown,
-      modifier = Modifier.onSizeChanged { with(density) { width.value = it.width.toDp().coerceAtLeast(250.dp) } },
-      offset = DpOffset(-DEFAULT_PADDING - width.value, 24.dp + fabSize + topPaddingToContent())
-    ) {
+  Box {
+    DefaultDropdownMenu(showDropDown, offset = DpOffset(this@FloatingButtons.maxWidth - DEFAULT_PADDING, 24.dp + fabSize)) {
      ItemAction(
        generalGetString(MR.strings.mark_read),
        painterResource(MR.images.ic_check),
@@ -1384,7 +1413,7 @@ fun BoxScope.FloatingButtons(
          val minUnreadItemId = chatModel.chats.value.firstOrNull { it.remoteHostId == remoteHostId && it.id == chatInfo.id }?.chatStats?.minUnreadItemId ?: return@ItemAction
          markRead(
            CC.ItemRange(minUnreadItemId, chatItems.value[chatItems.value.size - listState.layoutInfo.visibleItemsInfo.lastIndex - 1].id - 1),
-            bottomUnreadCount.value
+            bottomUnreadCount
          )
          showDropDown.value = false
        })
@@ -1446,11 +1475,12 @@ fun MemberImage(member: GroupMember) {
@Composable
 private fun TopEndFloatingButton(
  modifier: Modifier = Modifier,
-  unreadCount: State<Int>,
+  unreadCount: Int,
+  showButtonWithCounter: Boolean,
  onClick: () -> Unit,
  onLongClick: () -> Unit
 ) = when {
-  unreadCount.value > 0 -> {
+  showButtonWithCounter -> {
    val interactionSource = interactionSourceWithDetection(onClick, onLongClick)
    FloatingActionButton(
      {}, // no action here
@@ -1460,7 +1490,7 @@ private fun TopEndFloatingButton(
      interactionSource = interactionSource,
    ) {
      Text(
-        unreadCountStr(unreadCount.value),
+        unreadCountStr(unreadCount),
        color = MaterialTheme.colors.primary,
        fontSize = 14.sp,
      )
@@ -1470,16 +1500,6 @@ private fun TopEndFloatingButton(
  }
 }

-@Composable
-fun topPaddingToContent(): Dp {
-  val oneHandUI = remember { appPrefs.oneHandUI.state }
-  return if (oneHandUI.value) {
-    WindowInsets.statusBars.asPaddingValues().calculateTopPadding()
-  } else {
-    AppBarHeight * fontSizeSqrtMultiplier + WindowInsets.statusBars.asPaddingValues().calculateTopPadding()
-  }
-}
-
@Composable
 private fun FloatingDate(
  modifier: Modifier,
@@ -1489,9 +1509,8 @@ private fun FloatingDate(
  var isNearBottom by remember { mutableStateOf(true) }
  val lastVisibleItemDate = remember {
    derivedStateOf {
-      if (listState.layoutInfo.visibleItemsInfo.lastIndex >= 0) {
-        val lastFullyVisibleOffset = listState.layoutInfo.viewportEndOffset
-        val lastVisibleChatItemIndex = chatModel.chatItems.value.lastIndex - (listState.layoutInfo.visibleItemsInfo.lastOrNull { item -> item.offset + item.size <= lastFullyVisibleOffset && item.size > 0 }?.index ?: 0)
+      if (listState.layoutInfo.visibleItemsInfo.lastIndex >= 0 && listState.firstVisibleItemIndex >= 0) {
+        val lastVisibleChatItemIndex = chatModel.chatItems.value.lastIndex - listState.firstVisibleItemIndex - listState.layoutInfo.visibleItemsInfo.lastIndex
        val item = chatModel.chatItems.value.getOrNull(lastVisibleChatItemIndex)
        val timeZone = TimeZone.currentSystemDefault()
        item?.meta?.itemTs?.toLocalDateTime(timeZone)?.date?.atStartOfDayIn(timeZone)
@@ -1678,44 +1697,48 @@ fun openGroupLink(groupInfo: GroupInfo, rhId: Long?, view: Any? = null, close: (
  }
 }

-@Composable
-private fun BoxScope.BottomEndFloatingButton(
-  unreadCount: State<Int>,
-  showButtonWithCounter: State<Boolean>,
-  showButtonWithArrow: State<Boolean>,
-  composeViewHeight: State<Dp>,
+private fun bottomEndFloatingButton(
+  unreadCount: Int,
+  showButtonWithCounter: Boolean,
+  showButtonWithArrow: Boolean,
  onClickArrowDown: () -> Unit,
  onClickCounter: () -> Unit
-) = when {
-  showButtonWithCounter.value -> {
-    FloatingActionButton(
-      onClick = onClickCounter,
-      elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),
-      modifier = Modifier.padding(end = DEFAULT_PADDING, bottom = DEFAULT_PADDING + composeViewHeight.value).align(Alignment.BottomEnd).size(48.dp),
-      backgroundColor = MaterialTheme.colors.secondaryVariant,
-    ) {
-      Text(
-        unreadCountStr(unreadCount.value),
-        color = MaterialTheme.colors.primary,
-        fontSize = 14.sp,
-      )
+): @Composable () -> Unit = when {
+  showButtonWithCounter -> {
+    {
+      FloatingActionButton(
+        onClick = onClickCounter,
+        elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),
+        modifier = Modifier.size(48.dp),
+        backgroundColor = MaterialTheme.colors.secondaryVariant,
+      ) {
+        Text(
+          unreadCountStr(unreadCount),
+          color = MaterialTheme.colors.primary,
+          fontSize = 14.sp,
+        )
+      }
    }
  }
-  showButtonWithArrow.value -> {
-    FloatingActionButton(
-      onClick = onClickArrowDown,
-      elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),
-      modifier = Modifier.padding(end = DEFAULT_PADDING, bottom = DEFAULT_PADDING + composeViewHeight.value).align(Alignment.BottomEnd).size(48.dp),
-      backgroundColor = MaterialTheme.colors.secondaryVariant,
-    ) {
-      Icon(
-        painter = painterResource(MR.images.ic_keyboard_arrow_down),
-        contentDescription = null,
-        tint = MaterialTheme.colors.primary
-      )
+  showButtonWithArrow -> {
+    {
+      FloatingActionButton(
+        onClick = onClickArrowDown,
+        elevation = FloatingActionButtonDefaults.elevation(0.dp, 0.dp, 0.dp, 0.dp),
+        modifier = Modifier.size(48.dp),
+        backgroundColor = MaterialTheme.colors.secondaryVariant,
+      ) {
+        Icon(
+          painter = painterResource(MR.images.ic_keyboard_arrow_down),
+          contentDescription = null,
+          tint = MaterialTheme.colors.primary
+        )
+      }
    }
  }
-  else -> {}
+  else -> {
+    {}
+  }
 }

@Composable
@@ -1842,25 +1865,6 @@ private fun memberNames(member: GroupMember, prevMember: GroupMember?, memCount:
  }
 }

-fun Modifier.chatViewBackgroundModifier(
-  colors: Colors,
-  wallpaper: AppWallpaper,
-  backgroundGraphicsLayerSize: MutableState<IntSize>?,
-  backgroundGraphicsLayer: GraphicsLayer?
-): Modifier {
-  val wallpaperImage = wallpaper.type.image
-  val wallpaperType = wallpaper.type
-  val backgroundColor = wallpaper.background ?: wallpaperType.defaultBackgroundColor(CurrentColors.value.base, colors.background)
-  val tintColor = wallpaper.tint ?: wallpaperType.defaultTintColor(CurrentColors.value.base)
-
-  return this
-    .then(if (wallpaperImage != null)
-      Modifier.drawWithCache { chatViewBackground(wallpaperImage, wallpaperType, backgroundColor, tintColor, backgroundGraphicsLayerSize, backgroundGraphicsLayer) }
-    else
-      Modifier.drawWithCache { onDrawBehind { copyBackgroundToAppBar(backgroundGraphicsLayerSize, backgroundGraphicsLayer) { drawRect(backgroundColor) } } }
-    )
-}
-
 fun chatViewItemsRange(currIndex: Int?, prevHidden: Int?): IntRange? =
  if (currIndex != null && prevHidden != null && prevHidden > currIndex) {
    currIndex..prevHidden
@@ -13,14 +13,12 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.text.font.FontStyle
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.model.ChatModel.filesToDelete
 import chat.simplex.common.model.ChatModel.withChats
@@ -898,7 +896,7 @@ fun ComposeView(
        }
      }
    }
-    Box(Modifier.background(MaterialTheme.colors.background)) {
+    Column(Modifier.background(MaterialTheme.colors.background)) {
    Divider()
    Row(Modifier.padding(end = 8.dp), verticalAlignment = Alignment.Bottom) {
      val isGroupAndProhibitedFiles = chat.chatInfo is ChatInfo.Group && !chat.chatInfo.groupInfo.fullGroupPreferences.files.on(chat.chatInfo.groupInfo.membership)
@@ -920,7 +918,7 @@ fun ComposeView(
            && !nextSendGrpInv.value
      IconButton(
        attachmentClicked,
-        Modifier.padding(start = 3.dp, end = 1.dp, bottom = if (appPlatform.isAndroid) 2.sp.toDp() else 5.sp.toDp() * fontSizeSqrtMultiplier),
+        Modifier.padding(bottom = if (appPlatform.isAndroid) 2.sp.toDp() else 5.sp.toDp() * fontSizeSqrtMultiplier),
        enabled = attachmentEnabled
      ) {
        Icon(
@@ -81,7 +81,10 @@ private fun ContactPreferencesLayout(
  reset: () -> Unit,
  savePrefs: () -> Unit,
 ) {
-  ColumnWithScrollBar {
+  ColumnWithScrollBar(
+    Modifier
+      .fillMaxWidth(),
+  ) {
    AppBarTitle(stringResource(MR.strings.contact_preferences))
    val timedMessages: MutableState<Boolean> = remember(featuresAllowed) { mutableStateOf(featuresAllowed.timedMessagesAllowed) }
    val onTTLUpdated = { ttl: Int? ->
@@ -1,11 +1,9 @@
 package chat.simplex.common.views.chat

-import SectionBottomSpacer
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import chat.simplex.common.platform.ColumnWithScrollBar
 import chat.simplex.common.ui.theme.DEFAULT_PADDING
 import chat.simplex.common.views.helpers.*
 import chat.simplex.common.views.newchat.QRCodeScanner
@@ -14,7 +12,9 @@ import dev.icerock.moko.resources.compose.stringResource

@Composable
 fun ScanCodeView(verifyCode: (String?, cb: (Boolean) -> Unit) -> Unit, close: () -> Unit) {
-  ColumnWithScrollBar {
+  Column(
+    Modifier.fillMaxSize()
+  ) {
    AppBarTitle(stringResource(MR.strings.scan_code))
    QRCodeScanner { text ->
      verifyCode(text) {
@@ -28,6 +28,5 @@ fun ScanCodeView(verifyCode: (String?, cb: (Boolean) -> Unit) -> Unit, close: ()
      }
    }
    Text(stringResource(MR.strings.scan_code_from_contacts_app), Modifier.padding(horizontal = DEFAULT_PADDING))
-    SectionBottomSpacer()
  }
 }
@@ -12,7 +12,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.platform.BackHandler
 import chat.simplex.common.platform.chatModel
 import chat.simplex.common.views.helpers.*
@@ -21,12 +20,11 @@ import chat.simplex.res.MR
 import dev.icerock.moko.resources.compose.painterResource

@Composable
-fun BoxScope.SelectedItemsTopToolbar(selectedChatItems: MutableState<Set<Long>?>) {
+fun SelectedItemsTopToolbar(selectedChatItems: MutableState<Set<Long>?>) {
  val onBackClicked = { selectedChatItems.value = null }
  BackHandler(onBack = onBackClicked)
  val count = selectedChatItems.value?.size ?: 0
-  val oneHandUI = remember { appPrefs.oneHandUI.state }
-  DefaultAppBar(
+  DefaultTopAppBar(
    navigationButton = { NavigationButtonClose(onButtonClicked = onBackClicked) },
    title = {
      Text(
@@ -41,9 +39,10 @@ fun BoxScope.SelectedItemsTopToolbar(selectedChatItems: MutableState<Set<Long>?>
      )
    },
    onTitleClick = null,
-    onTop = !oneHandUI.value,
+    showSearch = false,
    onSearchValueChanged = {},
  )
+  Divider(Modifier.padding(top = AppBarHeight * fontSizeSqrtMultiplier))
 }

@Composable
@@ -69,8 +68,6 @@ fun SelectedItemsBottomToolbar(
      Modifier
        .matchParentSize()
        .background(MaterialTheme.colors.background)
-        .padding(horizontal = 2.dp)
-        .height(AppBarHeight * fontSizeSqrtMultiplier)
        .pointerInput(Unit) {
          detectGesture {
            true
@@ -106,7 +103,6 @@ fun SelectedItemsBottomToolbar(
        )
      }
    }
-    Divider(Modifier.align(Alignment.TopStart))
  }
  LaunchedEffect(chatInfo, chatItems, selectedChatItems.value) {
    recheckItems(chatInfo, chatItems, selectedChatItems, deleteEnabled, deleteForEveryoneEnabled, canModerate, moderateEnabled, forwardEnabled, deleteCountProhibited, forwardCountProhibited)
@@ -7,6 +7,7 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.*
 import androidx.compose.material.*
+import androidx.compose.material.ripple.rememberRipple
 import androidx.compose.runtime.*
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.*
@@ -14,7 +15,6 @@ import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.*
 import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.layout.onSizeChanged
 import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.*
@@ -61,8 +61,7 @@ fun SendMsgView(
 ) {
  val showCustomDisappearingMessageDialog = remember { mutableStateOf(false) }

-  val padding = if (appPlatform.isAndroid) PaddingValues(vertical = 8.dp) else PaddingValues(top = 3.dp, bottom = 4.dp)
-  Box(Modifier.padding(padding)) {
+  Box(Modifier.padding(vertical = if (appPlatform.isAndroid) 8.dp else 6.dp)) {
    val cs = composeState.value
    var progressByTimeout by rememberSaveable { mutableStateOf(false) }
    LaunchedEffect(composeState.value.inProgress) {
@@ -148,7 +147,7 @@ fun SendMsgView(
              && (cs.preview !is ComposePreview.VoicePreview || !stopRecOnNextClick.value)
              && cs.contextItem is ComposeContextItem.NoContextItem
            ) {
-              Spacer(Modifier.width(12.dp))
+              Spacer(Modifier.width(10.dp))
              StartLiveMessageButton(userCanSend) {
                if (composeState.value.preview is ComposePreview.NoPreview) {
                  startLiveMessage(scope, sendLiveMessage, updateLiveMessage, sendButtonSize, sendButtonAlpha, composeState, liveMessageAlertShown)
@@ -424,7 +423,6 @@ private fun SendMsgButton(
  onLongClick: (() -> Unit)? = null
 ) {
  val interactionSource = remember { MutableInteractionSource() }
-  val ripple = remember { ripple(bounded = false, radius = 24.dp) }
  Box(
    modifier = Modifier.requiredSize(36.dp)
      .combinedClickable(
@@ -433,7 +431,7 @@ private fun SendMsgButton(
        enabled = enabled,
        role = Role.Button,
        interactionSource = interactionSource,
-        indication = ripple
+        indication = rememberRipple(bounded = false, radius = 24.dp)
      )
      .onRightClick { onLongClick?.invoke() },
    contentAlignment = Alignment.Center
@@ -456,7 +454,6 @@ private fun SendMsgButton(
@Composable
 private fun StartLiveMessageButton(enabled: Boolean, onClick: () -> Unit) {
  val interactionSource = remember { MutableInteractionSource() }
-  val ripple = remember { ripple(bounded = false, radius = 24.dp) }
  Box(
    modifier = Modifier.requiredSize(36.dp)
      .clickable(
@@ -464,7 +461,7 @@ private fun StartLiveMessageButton(enabled: Boolean, onClick: () -> Unit) {
        enabled = enabled,
        role = Role.Button,
        interactionSource = interactionSource,
-        indication = ripple
+        indication = rememberRipple(bounded = false, radius = 24.dp)
      ),
    contentAlignment = Alignment.Center
  ) {
@@ -56,7 +56,11 @@ private fun VerifyCodeLayout(
  connectionVerified: Boolean,
  verifyCode: (String?, cb: (Boolean) -> Unit) -> Unit,
 ) {
-  ColumnWithScrollBar(Modifier.padding(horizontal = DEFAULT_PADDING)) {
+  ColumnWithScrollBar(
+    Modifier
+      .fillMaxSize()
+      .padding(horizontal = DEFAULT_PADDING)
+  ) {
    AppBarTitle(stringResource(MR.strings.security_code), withPadding = false)
    val splitCode = splitToParts(connectionCode, 24)
    Row(Modifier.fillMaxWidth().padding(bottom = DEFAULT_PADDING_HALF), horizontalArrangement = Arrangement.Center) {
@@ -130,7 +130,10 @@ fun AddGroupMembersLayout(
    }
  }

-  ColumnWithScrollBar {
+  ColumnWithScrollBar(
+    Modifier
+      .fillMaxWidth(),
+  ) {
    AppBarTitle(stringResource(MR.strings.button_add_members))
    profileText()
    Spacer(Modifier.size(DEFAULT_PADDING))
@@ -25,7 +25,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
-import chat.simplex.common.model.ChatController.appPrefs
 import chat.simplex.common.model.ChatModel.withChats
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.helpers.*
@@ -284,14 +283,9 @@ fun ModalData.GroupChatInfoLayout(
      if (s.isEmpty()) members else members.filter { m -> m.anyNameContains(s) }
    }
  }
-  Box {
-    val oneHandUI = remember { appPrefs.oneHandUI.state }
  LazyColumnWithScrollBar(
-    contentPadding = if (oneHandUI.value) {
-      PaddingValues(top = WindowInsets.statusBars.asPaddingValues().calculateTopPadding() + DEFAULT_PADDING + 5.dp, bottom = WindowInsets.navigationBars.asPaddingValues().calculateBottomPadding())
-    } else {
-      PaddingValues(top = topPaddingToContent())
-    },
+    Modifier
+      .fillMaxWidth(),
    state = listState
  ) {
    item {
@@ -403,11 +397,6 @@ fun ModalData.GroupChatInfoLayout(
        }
      }
      SectionBottomSpacer()
-      Spacer(Modifier.windowInsetsBottomHeight(WindowInsets.navigationBars))
-    }
-  }
-    if (!oneHandUI.value) {
-      NavigationBarBackground(oneHandUI.value, oneHandUI.value)
    }
  }
 }
@@ -119,7 +119,9 @@ fun GroupLinkLayout(
    )
  }

-  ColumnWithScrollBar {
+  ColumnWithScrollBar(
+    Modifier,
+  ) {
    AppBarTitle(stringResource(MR.strings.group_link))
    Text(
      stringResource(MR.strings.you_can_share_group_link_anybody_will_be_able_to_connect),
@@ -313,7 +313,10 @@ fun GroupMemberInfoLayout(
    }
  }

-  ColumnWithScrollBar {
+  ColumnWithScrollBar(
+    Modifier
+      .fillMaxWidth(),
+  ) {
    Row(
      Modifier.fillMaxWidth(),
      horizontalArrangement = Arrangement.Center
@@ -82,7 +82,9 @@ private fun GroupPreferencesLayout(
  reset: () -> Unit,
  savePrefs: () -> Unit,
 ) {
-  ColumnWithScrollBar {
+  ColumnWithScrollBar(
+    Modifier.fillMaxWidth(),
+  ) {
    AppBarTitle(stringResource(MR.strings.group_preferences))
    val timedMessages = remember(preferences) { mutableStateOf(preferences.timedMessages.enable) }
    val onTTLUpdated = { ttl: Int? ->
@@ -82,9 +82,10 @@ fun GroupProfileLayout(
      }, close)
    }
  }
+  ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
    ModalBottomSheetLayout(
      scrimColor = Color.Black.copy(alpha = 0.12F),
-      modifier = Modifier.imePadding(),
+      modifier = Modifier.navigationBarsWithImePadding(),
      sheetContent = {
        GetImageBottomSheet(
          chosenImage,
@@ -97,7 +98,9 @@ fun GroupProfileLayout(
      sheetShape = RoundedCornerShape(topStart = 18.dp, topEnd = 18.dp)
    ) {
      ModalView(close = closeWithAlert) {
-        ColumnWithScrollBar {
+        ColumnWithScrollBar(
+          Modifier
+        ) {
          Column(
            Modifier.fillMaxWidth()
              .padding(horizontal = DEFAULT_PADDING)
@@ -174,6 +177,7 @@ fun GroupProfileLayout(
        }
      }
    }
+  }
 }

 private fun canUpdateProfile(displayName: String, groupProfile: GroupProfile): Boolean =
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Avently	e2d00fb68a	android <= 11	2024-10-11 16:53:54 +07:00
Avently	98ccf5a17c	android: prevent WebView from changing audio device when toggling mic	2024-10-11 16:27:49 +07:00