wip putIntoGroups refactor

gap -> anchor
new api behaviour
2024-12-17 17:20:21 +01:00 · 2024-11-11 23:20:13 +00:00 · 2024-11-11 17:30:48 +00:00 · 2024-11-11 15:49:05 +00:00 · 2024-11-11 14:59:05 +00:00 · 2024-11-11 14:47:17 +00:00
423 changed files with 28652 additions and 9664 deletions
@@ -61,6 +61,7 @@ website/package/generated*
 # Ignore build tool output, e.g. code coverage
 website/.nyc_output/
 website/coverage/
+result

 # Ignore API documentation
 website/api-docs/
@@ -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
+RUN cabal build exe:simplex-chat --constraint 'simplexmq +client_library'

 # Strip the binary from debug symbols to reduce size
 RUN bin=$(find /project/dist-newstyle -name "simplex-chat" -type f -executable) && \
@@ -25,7 +25,9 @@ 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.

-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).
+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).

 ### Your information

@@ -172,4 +174,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 April 24, 2024
+Updated October 14, 2024
@@ -72,7 +72,7 @@ You must:

 Messages not following these rules will be deleted, the right to send messages may be revoked, and the access to the new members to the group may be temporarily restricted, to prevent re-joining under a different name - our imperfect group moderation does not have a better solution at the moment.

-You can join an English-speaking users group if you want to ask any questions: [#SimpleX users group](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2Fos8FftfoV8zjb2T89fUEjJtF7y64p5av%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAQqMgh0fw2lPhjn3PDIEfAKA_E0-gf8Hr8zzhYnDivRs%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22lBPiveK2mjfUH43SN77R0w%3D%3D%22%7D)
+You can join an English-speaking users group if you want to ask any questions: [#SimpleX users group](https://simplex.chat/contact#/?v=2-4&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2Fos8FftfoV8zjb2T89fUEjJtF7y64p5av%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAQqMgh0fw2lPhjn3PDIEfAKA_E0-gf8Hr8zzhYnDivRs%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22lBPiveK2mjfUH43SN77R0w%3D%3D%22%7D)

 There is also a group [#simplex-devs](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FvYCRjIflKNMGYlfTkuHe4B40qSlQ0439%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAHNdcqNbzXZhyMoSBjT2R0-Eb1EPaLyUg3KZjn-kmM1w%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22PD20tcXjw7IpkkMCfR6HLA%3D%3D%22%7D) for developers who build on SimpleX platform:

@@ -83,7 +83,7 @@ There is also a group [#simplex-devs](https://simplex.chat/contact#/?v=1-4&smp=s

 There are groups in other languages, that we have the apps interface translated into. These groups are for testing, and asking questions to other SimpleX Chat users:

-[\#SimpleX-DE](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FkIEl7OQzcp-J6aDmjdlQbRJwqkcZE7XR%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAR16PCu02MobRmKAsjzhDWMZcWP9hS8l5AUZi-Gs8z18%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22puYPMCQt11yPUvgmI5jCiw%3D%3D%22%7D) (German-speaking), [\#SimpleX-ES](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FaJ8O1O8A8GbeoaHTo_V8dcefaCl7ouPb%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA034qWTA3sWcTsi6aWhNf9BA34vKVCFaEBdP2R66z6Ao%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22wiZ1v_wNjLPlT-nCSB-bRA%3D%3D%22%7D) (Spanish-speaking), [\#SimpleX-FR](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FvIHQDxTor53nwnWWTy5cHNwQQAdWN5Hw%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAPdgK1eBnETmgiqEQufbUkydKBJafoRx4iRrtrC2NAGc%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%221FyUryBPza-1ZFFE80Ekbg%3D%3D%22%7D) (French-speaking), [\#SimpleX-RU](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FXZyt3hJmWsycpN7Dqve_wbrAqb6myk1R%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAMFVIoytozTEa_QXOgoZFq_oe0IwZBYKvW50trSFXzXo%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22xz05ngjA3pNIxLZ32a8Vxg%3D%3D%22%7D) (Russian-speaking), [\#SimpleX-IT](https://simplex.chat/contact#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2F0weR-ZgDUl7ruOtI_8TZwEsnJP6UiImA%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAq4PSThO9Fvb5ydF48wB0yNbpzCbuQJCW3vZ9BGUfcxk%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22e-iceLA0SctC62eARgYDWg%3D%3D%22%7D) (Italian-speaking).
+[\#SimpleX-DE](https://simplex.chat/contact#/?v=1-4&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FmfiivxDKWFuowXrQOp11jsY8TuP__rBL%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAiz3pKNwvKudckFYMUfgoT0s96B0jfZ7ALHAu7rtE9HQ%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22jZeJpXGrRXQJU_-MSJ_v2A%3D%3D%22%7D) (German-speaking), [\#SimpleX-ES](https://simplex.chat/contact#/?v=2-4&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FJ5ES83pJimY2BRklS8fvy_iQwIU37xra%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA0F0STP6UqN_12_k2cjjTrIjFgBGeWhOAmbY1qlk3pnM%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22VmUU0fqmYdCRmVCyvStvHA%3D%3D%22%7D) (Spanish-speaking), [\#SimpleX-FR](https://simplex.chat/contact#/?v=2-7&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FxCHBE_6PBRMqNEpm4UQDHXb9cz-mN7dd%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEAetqlcM7zTCRw-iatnwCrvpJSto7lq5Yv6AsBMWv7GSM%253D%26srv%3Dbylepyau3ty4czmn77q4fglvperknl4bi2eb2fdy2bh4jxtf32kf73yd.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22foO5Xw4hhjOa_x7zET7otw%3D%3D%22%7D) (French-speaking), [\#SimpleX-RU](https://simplex.chat/contact#/?v=2-4&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FVXQTB0J2lLjYkgjWByhl6-1qmb5fgZHh%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAI6JaEWezfSwvcoTEkk6au-gkjrXR2ew2OqZYMYBvayk%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%22ORH9OEe8Duissh-hslfeVg%3D%3D%22%7D) (Russian-speaking), [\#SimpleX-IT](https://simplex.chat/contact#/?v=2-7&smp=smp%3A%2F%2Fhpq7_4gGJiilmz5Rf-CswuU5kZGkm_zOIooSw6yALRg%3D%40smp5.simplex.im%2FqpHu0psOUdYfc11yQCzSyq5JhijrBzZT%23%2F%3Fv%3D1-3%26dh%3DMCowBQYDK2VuAyEACZ_7fbwlM45wl6cGif8cY47oPQ_AMdP0ATqOYLA6zHY%253D%26srv%3Djjbyvoemxysm7qxap7m5d5m35jzv5qq6gnlv7s4rsn7tdwwmuqciwpid.onion&data=%7B%22type%22%3A%22group%22%2C%22groupLinkId%22%3A%229uRQRTir3ealdcSfB0zsrw%3D%3D%22%7D) (Italian-speaking).

 You can join either by opening these links in the app or by opening them in a desktop browser and scanning the QR code.

@@ -233,14 +233,12 @@ 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)
@@ -249,10 +247,6 @@ 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).
@@ -409,7 +403,9 @@ 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 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).
+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).

 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.

@@ -15,16 +15,11 @@ class AppDelegate: NSObject, UIApplicationDelegate {
    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
        logger.debug("AppDelegate: didFinishLaunchingWithOptions")
        application.registerForRemoteNotifications()
-        NotificationCenter.default.addObserver(self, selector: #selector(pasteboardChanged), name: UIPasteboard.changedNotification, object: nil)
        removePasscodesIfReinstalled()
        prepareForLaunch()
        return true
    }

-    @objc func pasteboardChanged() {
-        ChatModel.shared.pasteboardHasStrings = UIPasteboard.general.hasStrings
-    }
-
    func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
        let token = deviceToken.map { String(format: "%02hhx", $0) }.joined()
        logger.debug("AppDelegate: didRegisterForRemoteNotificationsWithDeviceToken \(token)")
@@ -13,6 +13,7 @@ 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
@@ -29,12 +30,12 @@ struct ContentView: View {
    @AppStorage(DEFAULT_PERFORM_LA) private var prefPerformLA = false
    @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
    @AppStorage(DEFAULT_NOTIFICATION_ALERT_SHOWN) private var notificationAlertShown = false
-    @State private var showSettings = false
    @State private var showWhatsNew = false
    @State private var showChooseLAMode = false
    @State private var showSetPasscode = false
    @State private var waitingForOrPassedAuth = true
    @State private var chatListActionSheet: ChatListActionSheet? = nil
+    @State private var chatListUserPickerSheet: UserPickerSheet? = nil

    private let callTopPadding: CGFloat = 40

@@ -86,7 +87,7 @@ struct ContentView: View {
                callView(call)
            }

-            if !showSettings, let la = chatModel.laRequest {
+            if chatListUserPickerSheet == nil, let la = chatModel.laRequest {
                LocalAuthView(authRequest: la)
                    .onDisappear {
                        // this flag is separate from accessAuthenticated to show initializationView while we wait for authentication
@@ -109,9 +110,6 @@ struct ContentView: View {
            }
        }
        .alert(isPresented: $alertManager.presentAlert) { alertManager.alertView! }
-        .sheet(isPresented: $showSettings) {
-            SettingsView(showSettings: $showSettings)
-        }
        .confirmationDialog("SimpleX Lock mode", isPresented: $showChooseLAMode, titleVisibility: .visible) {
            Button("System authentication") { initialEnableLA() }
            Button("Passcode entry") { showSetPasscode = true }
@@ -253,7 +251,8 @@ struct ContentView: View {

    private func mainView() -> some View {
        ZStack(alignment: .top) {
-            ChatListView(showSettings: $showSettings).privacySensitive(protectScreen)
+            ChatListView(activeUserPickerSheet: $chatListUserPickerSheet)
+                .redacted(reason: appSheetState.redactionReasons(protectScreen))
            .onAppear {
                requestNtfAuthorization()
                // Local Authentication notice is to be shown on next start after onboarding is complete
@@ -300,9 +299,18 @@ struct ContentView: View {
        if let contactId = contacts?.first?.personHandle?.value,
           let chat = chatModel.getChat(contactId),
           case let .direct(contact) = chat.chatInfo {
-            logger.debug("callToRecentContact: schedule call")
-            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
-                CallController.shared.startCall(contact, mediaType)
+            let activeCall = chatModel.activeCall
+            // This line works when a user clicks on a video button in CallKit UI while in call.
+            // The app tries to make another call to the same contact and overwite activeCall instance making its state broken
+            if let activeCall, contactId == activeCall.contact.id, mediaType == .video, !activeCall.hasVideo {
+                Task {
+                    await chatModel.callCommand.processCommand(.media(source: .camera, enable: true))
+                }
+            } else if activeCall == nil {
+                logger.debug("callToRecentContact: schedule call")
+                DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
+                    CallController.shared.startCall(contact, mediaType)
+                }
            }
        }
    }
@@ -58,10 +58,11 @@ class ItemsModel: ObservableObject {
    // this will cause reversedChatItems to be rendered without throttling
    @Published var isLoading = false
    @Published var showLoadingProgress = false
+    @State var anchors: [ChatItem.ID] = []

    init() {
        publisher
-            .throttle(for: 0.25, scheduler: DispatchQueue.main, latest: true)
+            .throttle(for: 0.2, scheduler: DispatchQueue.main, latest: true)
            .sink { self.objectWillChange.send() }
            .store(in: &bag)
    }
@@ -147,6 +148,7 @@ 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?
@@ -191,7 +193,6 @@ final class ChatModel: ObservableObject {
    @Published var stopPreviousRecPlay: URL? = nil // coordinates currently playing source
    @Published var draft: ComposeState?
    @Published var draftChatId: String?
-    @Published var pasteboardHasStrings: Bool = UIPasteboard.general.hasStrings
    @Published var networkInfo = UserNetworkInfo(networkType: .other, online: true)

    var messageDelivery: Dictionary<Int64, () -> Void> = [:]
@@ -527,7 +528,7 @@ final class ChatModel: ObservableObject {
    }

    func updateCurrentUserUiThemes(uiThemes: ThemeModeOverrides?) {
-        guard var current = currentUser else { return }
+        guard var current = currentUser, current.uiThemes != uiThemes else { return }
        current.uiThemes = uiThemes
        let i = users.firstIndex(where: { $0.user.userId == current.userId })
        if let i {
@@ -563,6 +564,7 @@ final class ChatModel: ObservableObject {
        // update preview
        _updateChat(cInfo.id) { chat in
            self.decreaseUnreadCounter(user: self.currentUser!, by: chat.chatStats.unreadCount)
+            self.updateFloatingButtons(unreadCount: 0)
            chat.chatStats = ChatStats()
        }
        // update current chat
@@ -579,6 +581,12 @@ final class ChatModel: ObservableObject {
        }
    }

+    private func updateFloatingButtons(unreadCount: Int) {
+        let fbm = ChatView.FloatingButtonModel.shared
+        fbm.totalUnread = unreadCount
+        fbm.objectWillChange.send()
+    }
+
    func markChatItemsRead(_ cInfo: ChatInfo, aboveItem: ChatItem? = nil) {
        if let cItem = aboveItem {
            if chatId == cInfo.id, let i = getChatItemIndex(cItem) {
@@ -597,6 +605,7 @@ final class ChatModel: ObservableObject {
                    if markedCount > 0 {
                        chat.chatStats.unreadCount -= markedCount
                        self.decreaseUnreadCounter(user: self.currentUser!, by: markedCount)
+                        self.updateFloatingButtons(unreadCount: chat.chatStats.unreadCount)
                    }
                }
            }
@@ -626,19 +635,15 @@ final class ChatModel: ObservableObject {
        }
    }

-    func markChatItemRead(_ cInfo: ChatInfo, _ cItem: ChatItem) async {
-        if chatId == cInfo.id,
-           let itemIndex = getChatItemIndex(cItem),
-           im.reversedChatItems[itemIndex].isRcvNew {
-            await MainActor.run {
-                withTransaction(Transaction()) {
-                    // update current chat
-                    markChatItemRead_(itemIndex)
-                    // update preview
-                    unreadCollector.changeUnreadCounter(cInfo.id, by: -1)
+    func markChatItemsRead(_ cInfo: ChatInfo, _ itemIds: [ChatItem.ID]) {
+        if self.chatId == cInfo.id {
+            for itemId in itemIds {
+                if let i = im.reversedChatItems.firstIndex(where: { $0.id == itemId }) {
+                    markChatItemRead_(i)
                }
            }
        }
+        self.unreadCollector.changeUnreadCounter(cInfo.id, by: -itemIds.count)
    }

    private let unreadCollector = UnreadCollector()
@@ -664,9 +669,10 @@ final class ChatModel: ObservableObject {
        }

        func changeUnreadCounter(_ chatId: ChatId, by count: Int) {
-            DispatchQueue.main.async {
-                self.unreadCounts[chatId] = (self.unreadCounts[chatId] ?? 0) + count
+            if chatId == ChatModel.shared.chatId {
+                ChatView.FloatingButtonModel.shared.totalUnread += count
            }
+            self.unreadCounts[chatId] = (self.unreadCounts[chatId] ?? 0) + count
            subject.send()
        }
    }
@@ -29,17 +29,33 @@ 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")
-        let content = response.notification.request.content
+        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 chatModel = ChatModel.shared
-        let action = response.actionIdentifier
-        logger.debug("NtfManager.userNotificationCenter: didReceive: action \(action), categoryIdentifier \(content.categoryIdentifier)")
+        let content = ntfResponse.notification.request.content
+        let action = ntfResponse.actionIdentifier
+        logger.debug("NtfManager.processNotificationResponse: 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),
@@ -61,7 +77,6 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                ItemsModel.shared.loadOpenChat(chatId)
            }
        }
-        handler()
    }

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

-
    // Handle notification when the app is in foreground
    func userNotificationCenter(_ center: UNUserNotificationCenter,
                                willPresent notification: UNNotification,
@@ -185,6 +199,12 @@ 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")
            )
        ])
    }
@@ -210,29 +230,28 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                }
            }
        }
-        center.delegate = self
    }

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

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

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

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

    func setNtfBadgeCount(_ count: Int) {
@@ -318,10 +318,12 @@ private func apiChatsResponse(_ r: ChatResponse) throws -> [ChatData] {
    throw r
 }

-let loadItemsPerPage = 50
+let loadItemsPerPage = 100
+let preloadItem = 25
+let idealChatListSize = 300

 func apiGetChat(type: ChatType, id: Int64, search: String = "") async throws -> Chat {
-    let r = await chatSendCmd(.apiGetChat(type: type, id: id, pagination: .last(count: loadItemsPerPage), search: search))
+    let r = await chatSendCmd(.apiGetChat(type: type, id: id, pagination: .initial(count: loadItemsPerPage), search: search))
    if case let .apiChat(_, chat) = r { return Chat.init(chat) }
    throw r
 }
@@ -329,6 +331,15 @@ func apiGetChat(type: ChatType, id: Int64, search: String = "") async throws ->
 func apiGetChatItems(type: ChatType, id: Int64, pagination: ChatPagination, search: String = "") async throws -> [ChatItem] {
    let r = await chatSendCmd(.apiGetChat(type: type, id: id, pagination: pagination, search: search))
    if case let .apiChat(_, chat) = r { return chat.chatItems }
+    if case .chatCmdError(_, _) = r {
+        if case .chatError(_, let chatError) = r {
+            if case .errorStore(let storeError) = chatError {
+                if case .chatItemNotFound(_) = storeError {
+                    itemNotFoundAlert()
+                }
+            }
+        }
+    }
    throw r
 }

@@ -339,7 +350,9 @@ func loadChat(chat: Chat, search: String = "", clearItems: Bool = true) async {
        let im = ItemsModel.shared
        m.chatItemStatuses = [:]
        if clearItems {
-            await MainActor.run { im.reversedChatItems = [] }
+            await MainActor.run {
+                im.reversedChatItems = []
+            }
        }
        let chat = try await apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
        await MainActor.run {
@@ -357,6 +370,12 @@ func apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64) async throws -
    throw r
 }

+func apiPlanForwardChatItems(type: ChatType, id: Int64, itemIds: [Int64]) async throws -> ([Int64], ForwardConfirmation?) {
+    let r = await chatSendCmd(.apiPlanForwardChatItems(toChatType: type, toChatId: id, itemIds: itemIds))
+    if case let .forwardPlan(_, chatItemIds, forwardConfimation) = r { return (chatItemIds, forwardConfimation) }
+    throw r
+}
+
 func apiForwardChatItems(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemIds: [Int64], ttl: Int?) async -> [ChatItem]? {
    let cmd: ChatCommand = .apiForwardChatItems(toChatType: toChatType, toChatId: toChatId, fromChatType: fromChatType, fromChatId: fromChatId, itemIds: itemIds, ttl: ttl)
    return await processSendMessageCmd(toChatType: toChatType, cmd: cmd)
@@ -412,6 +431,13 @@ func apiCreateChatItems(noteFolderId: Int64, composedMessages: [ComposedMessage]
    return nil
 }

+func itemNotFoundAlert() {
+    AlertManager.shared.showAlertMsg(
+        title: "Message no longer available",
+        message: "The quoted message you are trying to view has been deleted."
+    )
+}
+
 private func sendMessageErrorAlert(_ r: ChatResponse) {
    logger.error("send message error: \(String(describing: r))")
    AlertManager.shared.showAlertMsg(
@@ -456,7 +482,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)
@@ -579,12 +605,18 @@ func apiContactInfo(_ contactId: Int64) async throws -> (ConnectionStats?, Profi
    throw r
 }

-func apiGroupMemberInfo(_ groupId: Int64, _ groupMemberId: Int64) throws -> (GroupMember, ConnectionStats?) {
+func apiGroupMemberInfoSync(_ groupId: Int64, _ groupMemberId: Int64) throws -> (GroupMember, ConnectionStats?) {
    let r = chatSendCmdSync(.apiGroupMemberInfo(groupId: groupId, groupMemberId: groupMemberId))
    if case let .groupMemberInfo(_, _, member, connStats_) = r { return (member, connStats_) }
    throw r
 }

+func apiGroupMemberInfo(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (GroupMember, ConnectionStats?) {
+    let r = await chatSendCmd(.apiGroupMemberInfo(groupId: groupId, groupMemberId: groupMemberId))
+    if case let .groupMemberInfo(_, _, member, connStats_) = r { return (member, connStats_) }
+    throw r
+}
+
 func apiContactQueueInfo(_ contactId: Int64) async throws -> (RcvMsgInfo?, ServerQueueInfo) {
    let r = await chatSendCmd(.apiContactQueueInfo(contactId: contactId))
    if case let .queueInfo(_, rcvMsgInfo, queueInfo) = r { return (rcvMsgInfo, queueInfo) }
@@ -639,8 +671,8 @@ func apiGetContactCode(_ contactId: Int64) async throws -> (Contact, String) {
    throw r
 }

-func apiGetGroupMemberCode(_ groupId: Int64, _ groupMemberId: Int64) throws -> (GroupMember, String) {
-    let r = chatSendCmdSync(.apiGetGroupMemberCode(groupId: groupId, groupMemberId: groupMemberId))
+func apiGetGroupMemberCode(_ groupId: Int64, _ groupMemberId: Int64) async throws -> (GroupMember, String) {
+    let r = await chatSendCmd(.apiGetGroupMemberCode(groupId: groupId, groupMemberId: groupMemberId))
    if case let .groupMemberCode(_, _, member, connectionCode) = r { return (member, connectionCode) }
    throw r
 }
@@ -731,6 +763,12 @@ 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(
@@ -1000,6 +1038,10 @@ func apiChatRead(type: ChatType, id: Int64, itemRange: (Int64, Int64)) async thr
    try await sendCommandOkResp(.apiChatRead(type: type, id: id, itemRange: itemRange))
 }

+func apiChatItemsRead(type: ChatType, id: Int64, itemIds: [Int64]) async throws {
+    try await sendCommandOkResp(.apiChatItemsRead(type: type, id: id, itemIds: itemIds))
+}
+
 func apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool) async throws {
    try await sendCommandOkResp(.apiChatUnread(type: type, id: id, unreadChat: unreadChat))
 }
@@ -1035,77 +1077,122 @@ func standaloneFileInfo(url: String, ctrl: chat_ctrl? = nil) async -> MigrationF
 }

 func receiveFile(user: any UserLike, fileId: Int64, userApprovedRelays: Bool = false, auto: Bool = false) async {
-    if let chatItem = await apiReceiveFile(
-        fileId: fileId,
-        userApprovedRelays: userApprovedRelays || !privacyAskToApproveRelaysGroupDefault.get(),
-        encrypted: privacyEncryptLocalFilesGroupDefault.get(),
+    await receiveFiles(
+        user: user,
+        fileIds: [fileId],
+        userApprovedRelays: userApprovedRelays,
        auto: auto
-    ) {
-        await chatItemSimpleUpdate(user, chatItem)
-    }
+    )
 }

-func apiReceiveFile(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool, inline: Bool? = nil, auto: Bool = false) async -> AChatItem? {
-    let r = await chatSendCmd(.receiveFile(fileId: fileId, userApprovedRelays: userApprovedRelays, encrypted: encrypted, inline: inline))
-    let am = AlertManager.shared
-    if case let .rcvFileAccepted(_, chatItem) = r { return chatItem }
-    if case .rcvFileAcceptedSndCancelled = r {
-        logger.debug("apiReceiveFile error: sender cancelled file transfer")
-        if !auto {
-            am.showAlertMsg(
-                title: "Cannot receive file",
-                message: "Sender cancelled file transfer."
+func receiveFiles(user: any UserLike, fileIds: [Int64], userApprovedRelays: Bool = false, auto: Bool = false) async {
+    var fileIdsToApprove = [Int64]()
+    var srvsToApprove = Set<String>()
+    var otherFileErrs = [ChatResponse]()
+
+    for fileId in fileIds {
+        let r = await chatSendCmd(
+            .receiveFile(
+                fileId: fileId,
+                userApprovedRelays: userApprovedRelays || !privacyAskToApproveRelaysGroupDefault.get(),
+                encrypted: privacyEncryptLocalFilesGroupDefault.get(),
+                inline: nil
            )
+        )
+        switch r {
+        case let .rcvFileAccepted(_, chatItem):
+            await chatItemSimpleUpdate(user, chatItem)
+        default:
+            if let chatError = chatError(r) {
+                switch chatError {
+                case let .fileNotApproved(fileId, unknownServers):
+                    fileIdsToApprove.append(fileId)
+                    srvsToApprove.formUnion(unknownServers)
+                default:
+                    otherFileErrs.append(r)
+                }
+            }
        }
-    } else if let networkErrorAlert = networkErrorAlert(r) {
-        logger.error("apiReceiveFile network error: \(String(describing: r))")
-        if !auto {
-            am.showAlert(networkErrorAlert)
+    }
+
+    if !auto {
+        let otherErrsStr = if otherFileErrs.isEmpty {
+            ""
+        } else if otherFileErrs.count == 1 {
+            "\(otherFileErrs[0])"
+        } else if otherFileErrs.count == 2 {
+            "\(otherFileErrs[0])\n\(otherFileErrs[1])"
+        } else {
+            "\(otherFileErrs[0])\n\(otherFileErrs[1])\nand \(otherFileErrs.count - 2) other error(s)"
        }
-    } else {
-        switch chatError(r) {
-        case .fileCancelled:
-            logger.debug("apiReceiveFile ignoring fileCancelled error")
-        case .fileAlreadyReceiving:
-            logger.debug("apiReceiveFile ignoring fileAlreadyReceiving error")
-        case let .fileNotApproved(fileId, unknownServers):
-            logger.debug("apiReceiveFile fileNotApproved error")
-            if !auto {
-                let srvs = unknownServers.map { s in
+
+        // If there are not approved files, alert is shown the same way both in case of singular and plural files reception
+        if !fileIdsToApprove.isEmpty {
+            let srvs = srvsToApprove
+                .map { s in
                    if let srv = parseServerAddress(s), !srv.hostnames.isEmpty {
                        srv.hostnames[0]
                    } else {
                        serverHost(s)
                    }
                }
-                am.showAlert(Alert(
-                    title: Text("Unknown servers!"),
-                    message: Text("Without Tor or VPN, your IP address will be visible to these XFTP relays: \(srvs.sorted().joined(separator: ", "))."),
-                    primaryButton: .default(
-                        Text("Download"),
-                        action: {
-                            Task {
-                                logger.debug("apiReceiveFile fileNotApproved alert - in Task")
-                                if let user = ChatModel.shared.currentUser {
-                                    await receiveFile(user: user, fileId: fileId, userApprovedRelays: true)
-                                }
+                .sorted()
+                .joined(separator: ", ")
+            let fIds = fileIdsToApprove
+            await MainActor.run {
+                showAlert(
+                    title: NSLocalizedString("Unknown servers!", comment: "alert title"),
+                    message: (
+                        String.localizedStringWithFormat(NSLocalizedString("Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.", comment: "alert message"), srvs) +
+                        (otherErrsStr != "" ? "\n\n" + String.localizedStringWithFormat(NSLocalizedString("Other file errors:\n%@", comment: "alert message"), otherErrsStr) : "")
+                    ),
+                    buttonTitle: NSLocalizedString("Download", comment: "alert button"),
+                    buttonAction: {
+                        Task {
+                            logger.debug("apiReceiveFile fileNotApproved alert - in Task")
+                            if let user = ChatModel.shared.currentUser {
+                                await receiveFiles(user: user, fileIds: fIds, userApprovedRelays: true)
                            }
                        }
-                    ),
-                    secondaryButton: .cancel()
-                ))
+                    },
+                    cancelButton: true
+                )
            }
-        default:
-            logger.error("apiReceiveFile error: \(String(describing: r))")
-            if !auto {
-                am.showAlertMsg(
-                    title: "Error receiving file",
-                    message: "Error: \(responseError(r))"
+        } else if otherFileErrs.count == 1 { // If there is a single other error, we differentiate on it
+            let errorResponse = otherFileErrs.first!
+            switch errorResponse {
+            case let .rcvFileAcceptedSndCancelled(_, rcvFileTransfer):
+                logger.debug("receiveFiles error: sender cancelled file transfer \(rcvFileTransfer.fileId)")
+                await MainActor.run {
+                    showAlert(
+                        NSLocalizedString("Cannot receive file", comment: "alert title"),
+                        message: NSLocalizedString("Sender cancelled file transfer.", comment: "alert message")
+                    )
+                }
+            default:
+                if let chatError = chatError(errorResponse) {
+                    switch chatError {
+                    case .fileCancelled, .fileAlreadyReceiving:
+                        logger.debug("receiveFiles ignoring FileCancelled or FileAlreadyReceiving error")
+                    default:
+                        await MainActor.run {
+                            showAlert(
+                                NSLocalizedString("Error receiving file", comment: "alert title"),
+                                message: responseError(errorResponse)
+                            )
+                        }
+                    }
+                }
+            }
+        } else if otherFileErrs.count > 1 { // If there are multiple other errors, we show general alert
+            await MainActor.run {
+                showAlert(
+                    NSLocalizedString("Error receiving file", comment: "alert title"),
+                    message: String.localizedStringWithFormat(NSLocalizedString("File errors:\n%@", comment: "alert message"), otherErrsStr)
                )
            }
        }
    }
-    return nil
 }

 func cancelFile(user: User, fileId: Int64) async {
@@ -1287,11 +1374,23 @@ func markChatUnread(_ chat: Chat, unreadChat: Bool = true) async {

 func apiMarkChatItemRead(_ cInfo: ChatInfo, _ cItem: ChatItem) async {
    do {
-        logger.debug("apiMarkChatItemRead: \(cItem.id)")
        try await apiChatRead(type: cInfo.chatType, id: cInfo.apiId, itemRange: (cItem.id, cItem.id))
-        await ChatModel.shared.markChatItemRead(cInfo, cItem)
+        DispatchQueue.main.async {
+            ChatModel.shared.markChatItemsRead(cInfo, [cItem.id])
+        }
    } catch {
-        logger.error("apiMarkChatItemRead apiChatRead error: \(responseError(error))")
+        logger.error("apiChatRead error: \(responseError(error))")
+    }
+}
+
+func apiMarkChatItemsRead(_ cInfo: ChatInfo, _ itemIds: [ChatItem.ID]) async {
+    do {
+        try await apiChatItemsRead(type: cInfo.chatType, id: cInfo.apiId, itemIds: itemIds)
+        DispatchQueue.main.async {
+            ChatModel.shared.markChatItemsRead(cInfo, itemIds)
+        }
+    } catch {
+        logger.error("apiChatItemsRead error: \(responseError(error))")
    }
 }

@@ -1805,23 +1904,25 @@ func processReceivedMsg(_ res: ChatResponse) async {
                NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
            }
        }
-    case let .chatItemStatusUpdated(user, aChatItem):
-        let cInfo = aChatItem.chatInfo
-        let cItem = aChatItem.chatItem
-        if !cItem.isDeletedContent && active(user) {
-            await MainActor.run { m.updateChatItem(cInfo, cItem, status: cItem.meta.itemStatus) }
-        }
-        if let endTask = m.messageDelivery[cItem.id] {
-            switch cItem.meta.itemStatus {
-            case .sndNew: ()
-            case .sndSent: endTask()
-            case .sndRcvd: endTask()
-            case .sndErrorAuth: endTask()
-            case .sndError: endTask()
-            case .sndWarning: endTask()
-            case .rcvNew: ()
-            case .rcvRead: ()
-            case .invalid: ()
+    case let .chatItemsStatusesUpdated(user, chatItems):
+        for chatItem in chatItems {
+            let cInfo = chatItem.chatInfo
+            let cItem = chatItem.chatItem
+            if !cItem.isDeletedContent && active(user) {
+                await MainActor.run { m.updateChatItem(cInfo, cItem, status: cItem.meta.itemStatus) }
+            }
+            if let endTask = m.messageDelivery[cItem.id] {
+                switch cItem.meta.itemStatus {
+                case .sndNew: ()
+                case .sndSent: endTask()
+                case .sndRcvd: endTask()
+                case .sndErrorAuth: endTask()
+                case .sndError: endTask()
+                case .sndWarning: endTask()
+                case .rcvNew: ()
+                case .rcvRead: ()
+                case .invalid: ()
+                }
            }
        }
    case let .chatItemUpdated(user, aChatItem):
@@ -2015,7 +2116,6 @@ func processReceivedMsg(_ res: ChatResponse) async {
        await withCall(contact) { call in
            await MainActor.run {
                call.callState = .offerReceived
-                call.peerMedia = callType.media
                call.sharedKey = sharedKey
            }
            let useRelay = UserDefaults.standard.bool(forKey: DEFAULT_WEBRTC_POLICY_RELAY)
@@ -82,11 +82,17 @@ struct SimpleXApp: App {

                        if appState != .stopped {
                            startChatAndActivate {
-                                if appState.inactive && chatModel.chatRunning == true {
-                                    Task {
-                                        await updateChats()
-                                        if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
-                                            await updateCallInvitations()
+                                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()
+                                            }
                                        }
                                    }
                                }
@@ -102,7 +102,7 @@ extension ThemeWallpaper {
    public func importFromString() -> ThemeWallpaper {
        if preset == nil, let image {
            // Need to save image from string and to save its path
-            if let parsed = UIImage(base64Encoded: image),
+            if let parsed = imageFromBase64(image),
               let filename = saveWallpaperFile(image: parsed) {
                var copy = self
                copy.image = nil
@@ -122,7 +122,7 @@ extension ThemeWallpaper {
        let preset: String? = if case let WallpaperType.preset(filename, _) = type { filename } else { nil }
        let scale: Float? = if case let WallpaperType.preset(_, scale) = type { scale } else { if case let WallpaperType.image(_, scale, _) = type { scale } else { 1.0 } }
        let scaleType: WallpaperScaleType? = if case let WallpaperType.image(_, _, scaleType) = type { scaleType } else { nil }
-        let image: String? = if case WallpaperType.image = type, let image = type.uiImage { resizeImageToStrSize(image, maxDataSize: 5_000_000) } else { nil }
+        let image: String? = if case WallpaperType.image = type, let image = type.uiImage { resizeImageToStrSizeSync(image, maxDataSize: 5_000_000) } else { nil }
        return ThemeWallpaper (
            preset: preset,
            scale: scale,
@@ -197,7 +197,7 @@ class ThemeManager {
        var themeIds = currentThemeIdsDefault.get()
        themeIds[nonSystemThemeName] = prevValue.themeId
        currentThemeIdsDefault.set(themeIds)
-        applyTheme(nonSystemThemeName)
+        applyTheme(currentThemeDefault.get())
    }

    static func copyFromSameThemeOverrides(_ type: WallpaperType?, _ lowerLevelOverride: ThemeModeOverride?, _ pref: Binding<ThemeModeOverride>) -> Bool {
@@ -17,8 +17,8 @@ struct ActiveCallView: View {
    @ObservedObject var call: Call
    @Environment(\.scenePhase) var scenePhase
    @State private var client: WebRTCClient? = nil
-    @State private var activeCall: WebRTCClient.Call? = nil
    @State private var localRendererAspectRatio: CGFloat? = nil
+    @State var remoteContentMode: UIView.ContentMode = .scaleAspectFill
    @Binding var canConnectCall: Bool
    @State var prevColorScheme: ColorScheme = .dark
    @State var pipShown = false
@@ -27,24 +27,39 @@ struct ActiveCallView: View {
    var body: some View {
        ZStack(alignment: .topLeading) {
            ZStack(alignment: .bottom) {
-                if let client = client, [call.peerMedia, call.localMedia].contains(.video), activeCall != nil {
+                if let client = client, call.hasVideo {
                    GeometryReader { g in
                        let width = g.size.width * 0.3
                        ZStack(alignment: .topTrailing) {
-                            CallViewRemote(client: client, activeCall: $activeCall, activeCallViewIsCollapsed: $m.activeCallViewIsCollapsed, pipShown: $pipShown)
-                            CallViewLocal(client: client, activeCall: $activeCall, localRendererAspectRatio: $localRendererAspectRatio, pipShown: $pipShown)
-                                .cornerRadius(10)
-                                .frame(width: width, height: width / (localRendererAspectRatio ?? 1))
-                                .padding([.top, .trailing], 17)
                            ZStack(alignment: .center) {
                                // For some reason, when the view in GeometryReader and ZStack is visible, it steals clicks on a back button, so showing something on top like this with background color helps (.clear color doesn't work)
                            }
                            .frame(maxWidth: .infinity, maxHeight: .infinity)
                            .background(Color.primary.opacity(0.000001))
+
+                            CallViewRemote(client: client, call: call, activeCallViewIsCollapsed: $m.activeCallViewIsCollapsed, contentMode: $remoteContentMode, pipShown: $pipShown)
+                                .onTapGesture {
+                                    remoteContentMode = remoteContentMode == .scaleAspectFill ? .scaleAspectFit : .scaleAspectFill
+                                }
+
+                            Group {
+                                let localVideoTrack = client.activeCall?.localVideoTrack ?? client.notConnectedCall?.localCameraAndTrack?.1
+                                if localVideoTrack != nil {
+                                    CallViewLocal(client: client, localRendererAspectRatio: $localRendererAspectRatio, pipShown: $pipShown)
+                                        .onDisappear {
+                                            localRendererAspectRatio = nil
+                                        }
+                                } else {
+                                    Rectangle().fill(.black)
+                                }
+                            }
+                            .cornerRadius(10)
+                            .frame(width: width, height: localRendererAspectRatio == nil ? (g.size.width < g.size.height ? width * 1.33 : width / 1.33) : width / (localRendererAspectRatio ?? 1))
+                            .padding([.top, .trailing], 17)
                        }
                    }
                }
-                if let call = m.activeCall, let client = client, (!pipShown || !call.supportsVideo) {
+                if let call = m.activeCall, let client = client, (!pipShown || !call.hasVideo) {
                    ActiveCallOverlay(call: call, client: client)
                }
            }
@@ -54,6 +69,9 @@ struct ActiveCallView: View {
        .onAppear {
            logger.debug("ActiveCallView: appear client is nil \(client == nil), scenePhase \(String(describing: scenePhase)), canConnectCall \(canConnectCall)")
            AppDelegate.keepScreenOn(true)
+            Task {
+                await askRequiredPermissions()
+            }
            createWebRTCClient()
            dismissAllSheets()
            hideKeyboard()
@@ -84,7 +102,7 @@ struct ActiveCallView: View {

    private func createWebRTCClient() {
        if client == nil && canConnectCall {
-            client = WebRTCClient($activeCall, { msg in await MainActor.run { processRtcMessage(msg: msg) } }, $localRendererAspectRatio)
+            client = WebRTCClient({ msg in await MainActor.run { processRtcMessage(msg: msg) } }, $localRendererAspectRatio)
            Task {
                await m.callCommand.setClient(client)
            }
@@ -99,7 +117,7 @@ struct ActiveCallView: View {
            logger.debug("ActiveCallView: response \(msg.resp.respType)")
            switch msg.resp {
            case let .capabilities(capabilities):
-                let callType = CallType(media: call.localMedia, capabilities: capabilities)
+                let callType = CallType(media: call.initialCallType, capabilities: capabilities)
                Task {
                    do {
                        try await apiSendCallInvitation(call.contact, callType)
@@ -110,7 +128,7 @@ struct ActiveCallView: View {
                        call.callState = .invitationSent
                        call.localCapabilities = capabilities
                    }
-                    if call.supportsVideo && !AVAudioSession.sharedInstance().hasExternalAudioDevice() {
+                    if call.hasVideo && !AVAudioSession.sharedInstance().hasExternalAudioDevice() {
                        try? AVAudioSession.sharedInstance().setCategory(.playback, options: [.allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
                    }
                    CallSoundsPlayer.shared.startConnectingCallSound()
@@ -120,7 +138,7 @@ struct ActiveCallView: View {
                Task {
                    do {
                        try await apiSendCallOffer(call.contact, offer, iceCandidates,
-                                                   media: call.localMedia, capabilities: capabilities)
+                                                   media: call.initialCallType, capabilities: capabilities)
                    } catch {
                        logger.error("apiSendCallOffer \(responseError(error))")
                    }
@@ -164,6 +182,9 @@ struct ActiveCallView: View {
                }
                if state.connectionState == "closed" {
                    closeCallView(client)
+                    if let callUUID = m.activeCall?.callUUID {
+                        CallController.shared.endCall(callUUID: callUUID)
+                    }
                    m.activeCall = nil
                    m.activeCallViewIsCollapsed = false
                }
@@ -182,6 +203,14 @@ struct ActiveCallView: View {
                    CallSoundsPlayer.shared.vibrate(long: false)
                    wasConnected = true
                }
+            case let .peerMedia(source, enabled):
+                switch source {
+                    case .mic: call.peerMediaSources.mic = enabled
+                    case .camera: call.peerMediaSources.camera = enabled
+                    case .screenAudio: call.peerMediaSources.screenAudio = enabled
+                    case .screenVideo: call.peerMediaSources.screenVideo = enabled
+                    case .unknown: ()
+                }
            case .ended:
                closeCallView(client)
                call.callState = .ended
@@ -214,16 +243,38 @@ struct ActiveCallView: View {
                ChatReceiver.shared.messagesChannel = nil
                return
            }
-            if case let .chatItemStatusUpdated(_, msg) = msg,
-               msg.chatInfo.id == call.contact.id,
-               case .sndCall = msg.chatItem.content,
-               case .sndRcvd = msg.chatItem.meta.itemStatus {
+            if case let .chatItemsStatusesUpdated(_, chatItems) = msg,
+               chatItems.contains(where: { ci in
+                   ci.chatInfo.id == call.contact.id &&
+                   ci.chatItem.content.isSndCall &&
+                   ci.chatItem.meta.itemStatus.isSndRcvd
+               }) {
                CallSoundsPlayer.shared.startInCallSound()
                ChatReceiver.shared.messagesChannel = nil
            }
        }
    }

+    private func askRequiredPermissions() async {
+        let mic = await WebRTCClient.isAuthorized(for: .audio)
+        await MainActor.run {
+            call.localMediaSources.mic = mic
+        }
+        let cameraAuthorized = AVCaptureDevice.authorizationStatus(for: .video) == .authorized
+        var camera = call.initialCallType == .audio || cameraAuthorized
+        if call.initialCallType == .video && !cameraAuthorized {
+            camera = await WebRTCClient.isAuthorized(for: .video)
+            await MainActor.run {
+                if camera, let client {
+                    client.setCameraEnabled(true)
+                }
+            }
+        }
+        if !mic || !camera {
+            WebRTCClient.showUnauthorizedAlert(for: !mic ? .audio : .video)
+        }
+    }
+
    private func closeCallView(_ client: WebRTCClient) {
        if m.activeCall != nil {
            m.showCallView = false
@@ -239,44 +290,16 @@ struct ActiveCallOverlay: View {

    var body: some View {
        VStack {
-            switch call.localMedia {
-            case .video:
+            switch call.hasVideo {
+            case true:
                videoCallInfoView(call)
                .foregroundColor(.white)
                .opacity(0.8)
-                .padding()
-
-                Spacer()
-
-                HStack {
-                    toggleAudioButton()
-                    Spacer()
-                    if deviceManager.availableInputs.allSatisfy({ $0.portType == .builtInMic }) {
-                        toggleSpeakerButton()
-                            .frame(width: 40, height: 40)
-                    } else if call.hasMedia {
-                        AudioDevicePicker()
-                            .scaleEffect(2)
-                            .frame(maxWidth: 40, maxHeight: 40)
-                    } else {
-                        Color.clear.frame(width: 40, height: 40)
-                    }
-                    Spacer()
-                    endCallButton()
-                    Spacer()
-                    if call.videoEnabled {
-                        flipCameraButton()
-                    } else {
-                        Color.clear.frame(width: 40, height: 40)
-                    }
-                    Spacer()
-                    toggleVideoButton()
-                }
-                .padding(.horizontal, 20)
-                .padding(.bottom, 16)
-                .frame(maxWidth: .infinity, alignment: .center)
-
-            case .audio:
+                .padding(.horizontal)
+                // Fixed vertical padding required for preserving position of buttons row when changing audio-to-video and back in landscape orientation.
+                // Otherwise, bigger padding is added by SwiftUI when switching call types
+                .padding(.vertical, 10)
+            case false:
                ZStack(alignment: .topLeading) {
                    Button {
                        chatModel.activeCallViewIsCollapsed = true
@@ -291,35 +314,32 @@ struct ActiveCallOverlay: View {
                    }
                    .foregroundColor(.white)
                    .opacity(0.8)
-                    .padding()
+                    .padding(.horizontal)
+                    .padding(.vertical, 10)
                    .frame(maxHeight: .infinity)
                }
-
-                Spacer()
-
-                ZStack(alignment: .bottom) {
-                    toggleAudioButton()
-                        .frame(maxWidth: .infinity, alignment: .leading)
-                    endCallButton()
-                    // Check if the only input is microphone. And in this case show toggle button, 
-                    // If there are more inputs, it probably means something like bluetooth headphones are available
-                    // and in this case show iOS button for choosing different output.
-                    // There is no way to get available outputs, only inputs
-                    if deviceManager.availableInputs.allSatisfy({ $0.portType == .builtInMic }) {
-                        toggleSpeakerButton()
-                            .frame(maxWidth: .infinity, alignment: .trailing)
-                    } else if call.hasMedia {
-                        AudioDevicePicker()
-                            .scaleEffect(2)
-                            .frame(maxWidth: 50, maxHeight: 40)
-                            .frame(maxWidth: .infinity, alignment: .trailing)
-                    } else {
-                        Color.clear.frame(width: 50, height: 40)
-                    }
-                }
-                .padding(.bottom, 60)
-                .padding(.horizontal, 48)
            }
+
+            Spacer()
+
+            HStack {
+                toggleMicButton()
+                Spacer()
+                audioDeviceButton()
+                Spacer()
+                endCallButton()
+                Spacer()
+                if call.localMediaSources.camera {
+                    flipCameraButton()
+                } else {
+                    Color.clear.frame(width: 60, height: 60)
+                }
+                Spacer()
+                toggleCameraButton()
+            }
+            .padding(.horizontal, 20)
+            .padding(.bottom, 16)
+            .frame(maxWidth: 440, alignment: .center)
        }
        .frame(maxWidth: .infinity)
        .onAppear {
@@ -381,36 +401,54 @@ struct ActiveCallOverlay: View {

    private func endCallButton() -> some View {
        let cc = CallController.shared
-        return callButton("phone.down.fill", width: 60, height: 60) {
+        return callButton("phone.down.fill", .red, padding: 10) {
            if let uuid = call.callUUID {
                cc.endCall(callUUID: uuid)
            } else {
                cc.endCall(call: call) {}
            }
        }
-        .foregroundColor(.red)
    }

-    private func toggleAudioButton() -> some View {
-        controlButton(call, call.audioEnabled ? "mic.fill" : "mic.slash") {
+    private func toggleMicButton() -> some View {
+        controlButton(call, call.localMediaSources.mic ? "mic.fill" : "mic.slash", padding: 14) {
            Task {
-                client.setAudioEnabled(!call.audioEnabled)
-                DispatchQueue.main.async {
-                    call.audioEnabled = !call.audioEnabled
-                }
+                if await WebRTCClient.isAuthorized(for: .audio) {
+                    client.setAudioEnabled(!call.localMediaSources.mic)
+                } else { WebRTCClient.showUnauthorizedAlert(for: .audio) }
+            }
+        }
+    }
+
+    func audioDeviceButton() -> some View {
+        // Check if the only input is microphone. And in this case show toggle button,
+        // If there are more inputs, it probably means something like bluetooth headphones are available
+        // and in this case show iOS button for choosing different output.
+        // There is no way to get available outputs, only inputs
+        Group {
+            if deviceManager.availableInputs.allSatisfy({ $0.portType == .builtInMic }) {
+                toggleSpeakerButton()
+            } else {
+                audioDevicePickerButton()
+            }
+        }
+        .onChange(of: call.localMediaSources.hasVideo) { hasVideo in
+            let current = AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType
+            let speakerEnabled = current == .builtInSpeaker
+            let receiverEnabled = current == .builtInReceiver
+            // react automatically only when receiver were selected, otherwise keep an external device selected
+            if !speakerEnabled && hasVideo && receiverEnabled {
+                client.setSpeakerEnabledAndConfigureSession(!speakerEnabled, skipExternalDevice: true)
+                call.speakerEnabled = !speakerEnabled
            }
        }
    }

    private func toggleSpeakerButton() -> some View {
-        controlButton(call, call.speakerEnabled ? "speaker.wave.2.fill" : "speaker.wave.1.fill") {
-            Task {
-                let speakerEnabled = AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType == .builtInSpeaker
-                client.setSpeakerEnabledAndConfigureSession(!speakerEnabled)
-                DispatchQueue.main.async {
-                    call.speakerEnabled = !speakerEnabled
-                }
-            }
+        controlButton(call, !call.peerMediaSources.mic ? "speaker.slash" : call.speakerEnabled ? "speaker.wave.2.fill" : "speaker.wave.1.fill", padding: !call.peerMediaSources.mic ? 16 : call.speakerEnabled ? 15 : 17) {
+            let speakerEnabled = AVAudioSession.sharedInstance().currentRoute.outputs.first?.portType == .builtInSpeaker
+            client.setSpeakerEnabledAndConfigureSession(!speakerEnabled)
+            call.speakerEnabled = !speakerEnabled
        }
        .onAppear {
            deviceManager.call = call
@@ -418,53 +456,67 @@ struct ActiveCallOverlay: View {
        }
    }

-    private func toggleVideoButton() -> some View {
-        controlButton(call, call.videoEnabled ? "video.fill" : "video.slash") {
+    private func toggleCameraButton() -> some View {
+        controlButton(call, call.localMediaSources.camera ? "video.fill" : "video.slash", padding: call.localMediaSources.camera ? 16 : 14) {
            Task {
-                client.setVideoEnabled(!call.videoEnabled)
-                DispatchQueue.main.async {
-                    call.videoEnabled = !call.videoEnabled
-                }
+                if await WebRTCClient.isAuthorized(for: .video) {
+                    client.setCameraEnabled(!call.localMediaSources.camera)
+                } else { WebRTCClient.showUnauthorizedAlert(for: .video) }
            }
        }
+        .disabled(call.initialCallType == .audio && client.activeCall?.peerHasOldVersion == true)
    }

    @ViewBuilder private func flipCameraButton() -> some View {
-        controlButton(call, "arrow.triangle.2.circlepath") {
+        controlButton(call, "arrow.triangle.2.circlepath", padding: 12) {
                Task {
-                    client.flipCamera()
+                    if await WebRTCClient.isAuthorized(for: .video) {
+                        client.flipCamera()
+                    }
                }
        }
    }

-    @ViewBuilder private func controlButton(_ call: Call, _ imageName: String, _ perform: @escaping () -> Void) -> some View {
-        if call.hasMedia {
-            callButton(imageName, width: 50, height: 38, perform)
-                .foregroundColor(.white)
-                .opacity(0.85)
-        } else {
-            Color.clear.frame(width: 50, height: 38)
-        }
+    @ViewBuilder private func controlButton(_ call: Call, _ imageName: String, padding: CGFloat, _ perform: @escaping () -> Void) -> some View {
+        callButton(imageName, call.peerMediaSources.hasVideo ? Color.black.opacity(0.2) : Color.white.opacity(0.2), padding: padding, perform)
    }

-    private func callButton(_ imageName: String, width: CGFloat, height: CGFloat, _ perform: @escaping () -> Void) -> some View {
+    @ViewBuilder private func audioDevicePickerButton() -> some View {
+        AudioDevicePicker()
+            .opacity(0.8)
+            .scaleEffect(2)
+            .padding(10)
+            .frame(width: 60, height: 60)
+            .background(call.peerMediaSources.hasVideo ? Color.black.opacity(0.2) : Color.white.opacity(0.2))
+            .clipShape(.circle)
+    }
+
+    private func callButton(_ imageName: String, _ background: Color, padding: CGFloat, _ perform: @escaping () -> Void) -> some View {
        Button {
            perform()
        } label: {
            Image(systemName: imageName)
                .resizable()
                .scaledToFit()
-                .frame(maxWidth: width, maxHeight: height)
+                .padding(padding)
+                .frame(width: 60, height: 60)
+                .background(background)
        }
+        .foregroundColor(whiteColorWithAlpha)
+        .clipShape(.circle)
+    }
+
+    private var whiteColorWithAlpha: Color {
+        get { Color(red: 204 / 255, green: 204 / 255, blue: 204 / 255) }
    }
 }

 struct ActiveCallOverlay_Previews: PreviewProvider {
    static var previews: some View {
        Group{
-            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callUUID: UUID().uuidString.lowercased(), callState: .offerSent, localMedia: .video), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
+            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callUUID: UUID().uuidString.lowercased(), callState: .offerSent, initialCallType: .video), client: WebRTCClient({ _ in }, Binding.constant(nil)))
                .background(.black)
-            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callUUID: UUID().uuidString.lowercased(), callState: .offerSent, localMedia: .audio), client: WebRTCClient(Binding.constant(nil), { _ in }, Binding.constant(nil)))
+            ActiveCallOverlay(call: Call(direction: .incoming, contact: Contact.sampleData, callUUID: UUID().uuidString.lowercased(), callState: .offerSent, initialCallType: .audio), client: WebRTCClient({ _ in }, Binding.constant(nil)))
                .background(.black)
        }
    }
@@ -104,7 +104,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
    }

    func provider(_ provider: CXProvider, perform action: CXSetMutedCallAction) {
-        if callManager.enableMedia(media: .audio, enable: !action.isMuted, callUUID:  action.callUUID.uuidString.lowercased()) {
+        if callManager.enableMedia(source: .mic, enable: !action.isMuted, callUUID:  action.callUUID.uuidString.lowercased()) {
            action.fulfill()
        } else {
            action.fail()
@@ -121,8 +121,8 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
        RTCAudioSession.sharedInstance().audioSessionDidActivate(audioSession)
        RTCAudioSession.sharedInstance().isAudioEnabled = true
        do {
-            let supportsVideo = ChatModel.shared.activeCall?.supportsVideo == true
-            if supportsVideo {
+            let hasVideo = ChatModel.shared.activeCall?.hasVideo == true
+            if hasVideo {
                try audioSession.setCategory(.playAndRecord, mode: .videoChat, options: [.defaultToSpeaker, .mixWithOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
            } else {
                try audioSession.setCategory(.playAndRecord, mode: .voiceChat, options: [.mixWithOthers, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
@@ -133,7 +133,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                    try? await Task.sleep(nanoseconds: UInt64(i) * 300_000000)
                    if let preferred = audioSession.preferredInputDevice() {
                        await MainActor.run { try? audioSession.setPreferredInput(preferred) }
-                    } else if supportsVideo {
+                    } else if hasVideo {
                        await MainActor.run { try? audioSession.overrideOutputAudioPort(.speaker) }
                    }
                }
@@ -357,11 +357,9 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
                self.provider.reportCall(with: uuid, updated: update)
            }
        } else if callManager.startOutgoingCall(callUUID: callUUID) {
-            if callManager.startOutgoingCall(callUUID: callUUID) {
-                logger.debug("CallController.startCall: call started")
-            } else {
-                logger.error("CallController.startCall: no active call")
-            }
+            logger.debug("CallController.startCall: call started")
+        } else {
+            logger.error("CallController.startCall: no active call")
        }
    }

@@ -12,7 +12,7 @@ import SimpleXChat
 class CallManager {
    func newOutgoingCall(_ contact: Contact, _ media: CallMediaType) -> String {
        let uuid = UUID().uuidString.lowercased()
-        let call = Call(direction: .outgoing, contact: contact, callUUID: uuid, callState: .waitCapabilities, localMedia: media)
+        let call = Call(direction: .outgoing, contact: contact, callUUID: uuid, callState: .waitCapabilities, initialCallType: media)
        call.speakerEnabled = media == .video
        ChatModel.shared.activeCall = call
        return uuid
@@ -22,7 +22,7 @@ class CallManager {
        let m = ChatModel.shared
        if let call = m.activeCall, call.callUUID == callUUID {
            m.showCallView = true
-            Task { await m.callCommand.processCommand(.capabilities(media: call.localMedia)) }
+            Task { await m.callCommand.processCommand(.capabilities(media: call.initialCallType)) }
            return true
        }
        return false
@@ -44,7 +44,7 @@ class CallManager {
            contact: invitation.contact,
            callUUID: invitation.callUUID,
            callState: .invitationAccepted,
-            localMedia: invitation.callType.media,
+            initialCallType: invitation.callType.media,
            sharedKey: invitation.sharedKey
        )
        call.speakerEnabled = invitation.callType.media == .video
@@ -68,10 +68,10 @@ class CallManager {
        }
    }

-    func enableMedia(media: CallMediaType, enable: Bool, callUUID: String) -> Bool {
+    func enableMedia(source: CallMediaSource, enable: Bool, callUUID: String) -> Bool {
        if let call = ChatModel.shared.activeCall, call.callUUID == callUUID {
            let m = ChatModel.shared
-            Task { await m.callCommand.processCommand(.media(media: media, enable: enable)) }
+            Task { await m.callCommand.processCommand(.media(source: source, enable: enable)) }
            return true
        }
        return false
@@ -10,40 +10,49 @@ import AVKit

 struct CallViewRemote: UIViewRepresentable {
    var client: WebRTCClient
-    var activeCall: Binding<WebRTCClient.Call?>
+    @ObservedObject var call: Call
    @State var enablePip: (Bool) -> Void = {_ in }
    @Binding var activeCallViewIsCollapsed: Bool
+    @Binding var contentMode: UIView.ContentMode
    @Binding var pipShown: Bool

-    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>, activeCallViewIsCollapsed: Binding<Bool>, pipShown: Binding<Bool>) {
-        self.client = client
-        self.activeCall = activeCall
-        self._activeCallViewIsCollapsed = activeCallViewIsCollapsed
-        self._pipShown = pipShown
-    }
-
    func makeUIView(context: Context) -> UIView {
        let view = UIView()
-        if let call = activeCall.wrappedValue {
-            let remoteRenderer = RTCMTLVideoView(frame: view.frame)
-            remoteRenderer.videoContentMode = .scaleAspectFill
-            client.addRemoteRenderer(call, remoteRenderer)
-            addSubviewAndResize(remoteRenderer, into: view)
+        let remoteCameraRenderer = RTCMTLVideoView(frame: view.frame)
+        remoteCameraRenderer.videoContentMode = contentMode
+        remoteCameraRenderer.tag = 0

-            if AVPictureInPictureController.isPictureInPictureSupported() {
-                makeViewWithRTCRenderer(call, remoteRenderer, view, context)
-            }
+        let screenVideo = call.peerMediaSources.screenVideo
+        let remoteScreenRenderer = RTCMTLVideoView(frame: view.frame)
+        remoteScreenRenderer.videoContentMode = contentMode
+        remoteScreenRenderer.tag = 1
+        remoteScreenRenderer.alpha = screenVideo ? 1 : 0
+
+        context.coordinator.cameraRenderer = remoteCameraRenderer
+        context.coordinator.screenRenderer = remoteScreenRenderer
+        client.addRemoteCameraRenderer(remoteCameraRenderer)
+        client.addRemoteScreenRenderer(remoteScreenRenderer)
+        if screenVideo {
+            addSubviewAndResize(remoteScreenRenderer, remoteCameraRenderer, into: view)
+        } else {
+            addSubviewAndResize(remoteCameraRenderer, remoteScreenRenderer, into: view)
+        }
+
+        if AVPictureInPictureController.isPictureInPictureSupported() {
+            makeViewWithRTCRenderer(remoteCameraRenderer, remoteScreenRenderer, view, context)
        }
        return view
    }
    
-    func makeViewWithRTCRenderer(_ call: WebRTCClient.Call, _ remoteRenderer: RTCMTLVideoView, _ view: UIView, _ context: Context) {
-        let pipRemoteRenderer = RTCMTLVideoView(frame: view.frame)
-        pipRemoteRenderer.videoContentMode = .scaleAspectFill
-        
+    func makeViewWithRTCRenderer(_ remoteCameraRenderer: RTCMTLVideoView, _ remoteScreenRenderer: RTCMTLVideoView, _ view: UIView, _ context: Context) {
+        let pipRemoteCameraRenderer = RTCMTLVideoView(frame: view.frame)
+        pipRemoteCameraRenderer.videoContentMode = .scaleAspectFill
+
+        let pipRemoteScreenRenderer = RTCMTLVideoView(frame: view.frame)
+        pipRemoteScreenRenderer.videoContentMode = .scaleAspectFill
+
        let pipVideoCallViewController = AVPictureInPictureVideoCallViewController()
        pipVideoCallViewController.preferredContentSize = CGSize(width: 1080, height: 1920)
-        addSubviewAndResize(pipRemoteRenderer, into: pipVideoCallViewController.view)
        let pipContentSource = AVPictureInPictureController.ContentSource(
            activeVideoCallSourceView: view,
            contentViewController: pipVideoCallViewController
@@ -55,7 +64,9 @@ struct CallViewRemote: UIViewRepresentable {
        context.coordinator.pipController = pipController
        context.coordinator.willShowHide = { show in
            if show {
-                client.addRemoteRenderer(call, pipRemoteRenderer)
+                client.addRemoteCameraRenderer(pipRemoteCameraRenderer)
+                client.addRemoteScreenRenderer(pipRemoteScreenRenderer)
+                context.coordinator.relayout()
                DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
                    activeCallViewIsCollapsed = true
                }
@@ -67,13 +78,29 @@ struct CallViewRemote: UIViewRepresentable {
        }
        context.coordinator.didShowHide = { show in
            if show {
-                remoteRenderer.isHidden = true
+                remoteCameraRenderer.isHidden = true
+                remoteScreenRenderer.isHidden = true
            } else {
-                client.removeRemoteRenderer(call, pipRemoteRenderer)
-                remoteRenderer.isHidden = false
+                client.removeRemoteCameraRenderer(pipRemoteCameraRenderer)
+                client.removeRemoteScreenRenderer(pipRemoteScreenRenderer)
+                remoteCameraRenderer.isHidden = false
+                remoteScreenRenderer.isHidden = false
            }
            pipShown = show
        }
+        context.coordinator.relayout = {
+            let camera = call.peerMediaSources.camera
+            let screenVideo = call.peerMediaSources.screenVideo
+            pipRemoteCameraRenderer.alpha = camera ? 1 : 0
+            pipRemoteScreenRenderer.alpha = screenVideo ? 1 : 0
+            if screenVideo {
+                addSubviewAndResize(pipRemoteScreenRenderer, pipRemoteCameraRenderer, pip: true, into: pipVideoCallViewController.view)
+            } else {
+                addSubviewAndResize(pipRemoteCameraRenderer, pipRemoteScreenRenderer, pip: true, into: pipVideoCallViewController.view)
+            }
+            (pipVideoCallViewController.view.subviews[0] as! RTCMTLVideoView).videoContentMode = contentMode
+            (pipVideoCallViewController.view.subviews[1] as! RTCMTLVideoView).videoContentMode = .scaleAspectFill
+        }
        DispatchQueue.main.async {
            enablePip = { enable in
                if enable != pipShown /* pipController.isPictureInPictureActive */ {
@@ -88,24 +115,50 @@ struct CallViewRemote: UIViewRepresentable {
    }
    
    func makeCoordinator() -> Coordinator {
-        Coordinator()
+        Coordinator(client)
    }

    func updateUIView(_ view: UIView, context: Context) {
        logger.debug("CallView.updateUIView remote")
+        let camera = view.subviews.first(where: { $0.tag == 0 })!
+        let screen = view.subviews.first(where: { $0.tag == 1 })!
+        let screenVideo = call.peerMediaSources.screenVideo
+        if screenVideo && screen.alpha == 0 {
+            screen.alpha = 1
+            addSubviewAndResize(screen, camera, into: view)
+        } else if !screenVideo && screen.alpha == 1 {
+            screen.alpha = 0
+            addSubviewAndResize(camera, screen, into: view)
+        }
+        (view.subviews[0] as! RTCMTLVideoView).videoContentMode = contentMode
+        (view.subviews[1] as! RTCMTLVideoView).videoContentMode = .scaleAspectFill
+
+        camera.alpha = call.peerMediaSources.camera ? 1 : 0
+        screen.alpha = call.peerMediaSources.screenVideo ? 1 : 0
+
        DispatchQueue.main.async {
            if activeCallViewIsCollapsed != pipShown {
                enablePip(activeCallViewIsCollapsed)
+            } else if pipShown {
+                context.coordinator.relayout()
            }
        }
    }
    
    // MARK: - Coordinator
    class Coordinator: NSObject, AVPictureInPictureControllerDelegate {
+        var cameraRenderer: RTCMTLVideoView?
+        var screenRenderer: RTCMTLVideoView?
+        var client: WebRTCClient
        var pipController: AVPictureInPictureController? = nil
        var willShowHide: (Bool) -> Void = { _ in }
        var didShowHide: (Bool) -> Void = { _ in }
-        
+        var relayout: () -> Void = {}
+
+        required init(_ client: WebRTCClient) {
+            self.client = client
+        }
+
        func pictureInPictureControllerWillStartPictureInPicture(_ pictureInPictureController: AVPictureInPictureController) {
            willShowHide(true)
        }
@@ -127,11 +180,20 @@ struct CallViewRemote: UIViewRepresentable {
        }

        deinit {
+            // TODO: deinit is not called when changing call type from audio to video and back,
+            // which causes many renderers can be created and added to stream (if enabling/disabling
+            // video while not yet connected in outgoing call)
            pipController?.stopPictureInPicture()
            pipController?.canStartPictureInPictureAutomaticallyFromInline = false
            pipController?.contentSource = nil
            pipController?.delegate = nil
            pipController = nil
+            if let cameraRenderer {
+                client.removeRemoteCameraRenderer(cameraRenderer)
+            }
+            if let screenRenderer {
+                client.removeRemoteScreenRenderer(screenRenderer)
+            }
        }
    }
    
@@ -148,51 +210,109 @@ struct CallViewRemote: UIViewRepresentable {

 struct CallViewLocal: UIViewRepresentable {
    var client: WebRTCClient
-    var activeCall: Binding<WebRTCClient.Call?>
    var localRendererAspectRatio: Binding<CGFloat?>
    @State var pipStateChanged: (Bool) -> Void = {_ in }
    @Binding var pipShown: Bool

-    init(client: WebRTCClient, activeCall: Binding<WebRTCClient.Call?>, localRendererAspectRatio: Binding<CGFloat?>, pipShown: Binding<Bool>) {
+    init(client: WebRTCClient, localRendererAspectRatio: Binding<CGFloat?>, pipShown: Binding<Bool>) {
        self.client = client
-        self.activeCall = activeCall
        self.localRendererAspectRatio = localRendererAspectRatio
        self._pipShown = pipShown
    }

    func makeUIView(context: Context) -> UIView {
        let view = UIView()
-        if let call = activeCall.wrappedValue {
-            let localRenderer = RTCEAGLVideoView(frame: .zero)
-            client.addLocalRenderer(call, localRenderer)
-            client.startCaptureLocalVideo(call)
-            addSubviewAndResize(localRenderer, into: view)
-            DispatchQueue.main.async {
-                pipStateChanged = { shown in
-                    localRenderer.isHidden = shown
-                }
+        let localRenderer = RTCEAGLVideoView(frame: .zero)
+        context.coordinator.renderer = localRenderer
+        client.addLocalRenderer(localRenderer)
+        addSubviewAndResize(localRenderer, nil, into: view)
+        DispatchQueue.main.async {
+            pipStateChanged = { shown in
+                localRenderer.isHidden = shown
            }
        }
        return view
    }

+    func makeCoordinator() -> Coordinator {
+        Coordinator(client)
+    }
+
    func updateUIView(_ view: UIView, context: Context) {
        logger.debug("CallView.updateUIView local")
        pipStateChanged(pipShown)
    }
+
+    // MARK: - Coordinator
+    class Coordinator: NSObject, AVPictureInPictureControllerDelegate {
+        var renderer: RTCEAGLVideoView?
+        var client: WebRTCClient
+
+        required init(_ client: WebRTCClient) {
+            self.client = client
+        }
+
+        deinit {
+            if let renderer {
+                client.removeLocalRenderer(renderer)
+            }
+        }
+    }
 }

-private func addSubviewAndResize(_ view: UIView, into containerView: UIView) {
-    containerView.addSubview(view)
-    view.translatesAutoresizingMaskIntoConstraints = false
-    containerView.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "H:|[view]|",
-        options: [],
-        metrics: nil,
-        views: ["view": view]))
+private func addSubviewAndResize(_ fullscreen: UIView, _ end: UIView?, pip: Bool = false, into containerView: UIView) {
+    if containerView.subviews.firstIndex(of: fullscreen) == 0 && ((end == nil && containerView.subviews.count == 1) || (end != nil && containerView.subviews.firstIndex(of: end!) == 1)) {
+        // Nothing to do, elements on their places
+        return
+    }
+    containerView.removeConstraints(containerView.constraints)
+    containerView.subviews.forEach { sub in sub.removeFromSuperview()}

-    containerView.addConstraints(NSLayoutConstraint.constraints(withVisualFormat: "V:|[view]|",
+    containerView.addSubview(fullscreen)
+    fullscreen.translatesAutoresizingMaskIntoConstraints = false
+    fullscreen.layer.cornerRadius = 0
+    fullscreen.layer.masksToBounds = false
+
+    if let end {
+        containerView.addSubview(end)
+        end.translatesAutoresizingMaskIntoConstraints = false
+        end.layer.cornerRadius = pip ? 8 : 10
+        end.layer.masksToBounds = true
+    }
+
+    let constraintFullscreenV = NSLayoutConstraint.constraints(
+        withVisualFormat: "V:|[fullscreen]|",
        options: [],
        metrics: nil,
-        views: ["view": view]))
+        views: ["fullscreen": fullscreen]
+    )
+    let constraintFullscreenH = NSLayoutConstraint.constraints(
+        withVisualFormat: "H:|[fullscreen]|",
+        options: [],
+        metrics: nil,
+        views: ["fullscreen": fullscreen]
+    )
+
+    containerView.addConstraints(constraintFullscreenV)
+    containerView.addConstraints(constraintFullscreenH)
+
+    if let end {
+        let constraintEndWidth = NSLayoutConstraint(
+            item: end, attribute: .width, relatedBy: .equal, toItem: containerView, attribute: .width, multiplier: pip ? 0.5 : 0.3, constant: 0
+        )
+        let constraintEndHeight = NSLayoutConstraint(
+            item: end, attribute: .height, relatedBy: .equal, toItem: containerView, attribute: .width, multiplier: pip ? 0.5 * 1.33 : 0.3 * 1.33, constant: 0
+        )
+        let constraintEndX = NSLayoutConstraint(
+            item: end, attribute: .leading, relatedBy: .equal, toItem: containerView, attribute: .trailing, multiplier: pip ? 0.5 : 0.7, constant: pip ? -8 : -17
+        )
+        let constraintEndY = NSLayoutConstraint(
+            item: end, attribute: .bottom, relatedBy: .equal, toItem: containerView, attribute: .bottom, multiplier: 1, constant: pip ? -8 : -92
+        )
+        containerView.addConstraint(constraintEndWidth)
+        containerView.addConstraint(constraintEndHeight)
+        containerView.addConstraint(constraintEndX)
+        containerView.addConstraint(constraintEndY)
+    }
    containerView.layoutIfNeeded()
 }
@@ -38,6 +38,7 @@ struct IncomingCallView: View {
            }
            HStack {
                ProfilePreview(profileOf: invitation.contact, color: .white)
+                    .padding(.vertical, 6)
                Spacer()

                callButton("Reject", "phone.down.fill", .red) {
@@ -19,14 +19,13 @@ class Call: ObservableObject, Equatable {
    var direction: CallDirection
    var contact: Contact
    var callUUID: String?
-    var localMedia: CallMediaType
+    var initialCallType: CallMediaType
+    @Published var localMediaSources: CallMediaSources
    @Published var callState: CallState
    @Published var localCapabilities: CallCapabilities?
-    @Published var peerMedia: CallMediaType?
+    @Published var peerMediaSources: CallMediaSources = CallMediaSources()
    @Published var sharedKey: String?
-    @Published var audioEnabled = true
    @Published var speakerEnabled = false
-    @Published var videoEnabled: Bool
    @Published var connectionInfo: ConnectionInfo?
    @Published var connectedAt: Date? = nil

@@ -35,32 +34,33 @@ class Call: ObservableObject, Equatable {
        contact: Contact,
        callUUID: String?,
        callState: CallState,
-        localMedia: CallMediaType,
+        initialCallType: CallMediaType,
        sharedKey: String? = nil
    ) {
        self.direction = direction
        self.contact = contact
        self.callUUID = callUUID
        self.callState = callState
-        self.localMedia = localMedia
+        self.initialCallType = initialCallType
        self.sharedKey = sharedKey
-        self.videoEnabled = localMedia == .video
+        self.localMediaSources = CallMediaSources(
+            mic: AVCaptureDevice.authorizationStatus(for: .audio) == .authorized,
+            camera: initialCallType == .video && AVCaptureDevice.authorizationStatus(for: .video) == .authorized)
    }

    var encrypted: Bool { get { localEncrypted && sharedKey != nil } }
-    var localEncrypted: Bool { get { localCapabilities?.encryption ?? false } }
+    private var localEncrypted: Bool { get { localCapabilities?.encryption ?? false } }
    var encryptionStatus: LocalizedStringKey {
        get {
            switch callState {
            case .waitCapabilities: return ""
            case .invitationSent: return localEncrypted ? "e2e encrypted" : "no e2e encryption"
            case .invitationAccepted: return sharedKey == nil ? "contact has no e2e encryption" : "contact has e2e encryption"
-            default: return !localEncrypted ? "no e2e encryption" : sharedKey == nil ? "contact has no e2e encryption" : "e2e encrypted" 
+            default: return !localEncrypted ? "no e2e encryption" : sharedKey == nil ? "contact has no e2e encryption" : "e2e encrypted"
            }
        }
    }
-    var hasMedia: Bool { get { callState == .offerSent || callState == .negotiated || callState == .connected } }
-    var supportsVideo: Bool { get { peerMedia == .video || localMedia == .video } }
+    var hasVideo: Bool { get { localMediaSources.hasVideo || peerMediaSources.hasVideo } }
 }

 enum CallDirection {
@@ -105,18 +105,28 @@ struct WVAPIMessage: Equatable, Decodable, Encodable {
    var command: WCallCommand?
 }

+struct CallMediaSources: Equatable, Codable {
+  var mic: Bool = false
+  var camera: Bool = false
+  var screenAudio: Bool = false
+  var screenVideo: Bool = false
+
+  var hasVideo: Bool { get { camera || screenVideo } }
+}
+
 enum WCallCommand: Equatable, Encodable, Decodable {
    case capabilities(media: CallMediaType)
    case start(media: CallMediaType, aesKey: String? = nil, iceServers: [RTCIceServer]? = nil, relay: Bool? = nil)
    case offer(offer: String, iceCandidates: String, media: CallMediaType, aesKey: String? = nil, iceServers: [RTCIceServer]? = nil, relay: Bool? = nil)
    case answer(answer: String, iceCandidates: String)
    case ice(iceCandidates: String)
-    case media(media: CallMediaType, enable: Bool)
+    case media(source: CallMediaSource, enable: Bool)
    case end

    enum CodingKeys: String, CodingKey {
        case type
        case media
+        case source
        case aesKey
        case offer
        case answer
@@ -167,9 +177,9 @@ enum WCallCommand: Equatable, Encodable, Decodable {
        case let .ice(iceCandidates):
            try container.encode("ice", forKey: .type)
            try container.encode(iceCandidates, forKey: .iceCandidates)
-        case let .media(media, enable):
+        case let .media(source, enable):
            try container.encode("media", forKey: .type)
-            try container.encode(media, forKey: .media)
+            try container.encode(source, forKey: .media)
            try container.encode(enable, forKey: .enable)
        case .end:
            try container.encode("end", forKey: .type)
@@ -205,9 +215,9 @@ enum WCallCommand: Equatable, Encodable, Decodable {
            let iceCandidates = try container.decode(String.self, forKey: CodingKeys.iceCandidates)
            self = .ice(iceCandidates: iceCandidates)
        case "media":
-            let media = try container.decode(CallMediaType.self, forKey: CodingKeys.media)
+            let source = try container.decode(CallMediaSource.self, forKey: CodingKeys.source)
            let enable = try container.decode(Bool.self, forKey: CodingKeys.enable)
-            self = .media(media: media, enable: enable)
+            self = .media(source: source, enable: enable)
        case "end":
            self = .end
        default:
@@ -224,6 +234,7 @@ enum WCallResponse: Equatable, Decodable {
    case ice(iceCandidates: String)
    case connection(state: ConnectionState)
    case connected(connectionInfo: ConnectionInfo)
+    case peerMedia(source: CallMediaSource, enabled: Bool)
    case ended
    case ok
    case error(message: String)
@@ -238,6 +249,8 @@ enum WCallResponse: Equatable, Decodable {
        case state
        case connectionInfo
        case message
+        case source
+        case enabled
    }

    var respType: String {
@@ -249,6 +262,7 @@ enum WCallResponse: Equatable, Decodable {
            case .ice: return "ice"
            case .connection: return "connection"
            case .connected: return "connected"
+            case .peerMedia: return "peerMedia"
            case .ended: return "ended"
            case .ok: return "ok"
            case .error: return "error"
@@ -283,6 +297,10 @@ enum WCallResponse: Equatable, Decodable {
            case "connected":
                let connectionInfo = try container.decode(ConnectionInfo.self, forKey: CodingKeys.connectionInfo)
                self = .connected(connectionInfo: connectionInfo)
+            case "peerMedia":
+                let source = try container.decode(CallMediaSource.self, forKey: CodingKeys.source)
+                let enabled = try container.decode(Bool.self, forKey: CodingKeys.enabled)
+                self = .peerMedia(source: source, enabled: enabled)
            case "ended":
                self = .ended
            case "ok":
@@ -324,6 +342,10 @@ extension WCallResponse: Encodable {
        case let .connected(connectionInfo):
            try container.encode("connected", forKey: .type)
            try container.encode(connectionInfo, forKey: .connectionInfo)
+        case let .peerMedia(source, enabled):
+            try container.encode("peerMedia", forKey: .type)
+            try container.encode(source, forKey: .source)
+            try container.encode(enabled, forKey: .enabled)
        case .ended:
            try container.encode("ended", forKey: .type)
        case .ok:
@@ -376,7 +398,7 @@ actor WebRTCCommandProcessor {
    func shouldRunCommand(_ client: WebRTCClient, _ c: WCallCommand) -> Bool {
        switch c {
        case .capabilities, .start, .offer, .end: true
-        default: client.activeCall.wrappedValue != nil
+        default: client.activeCall != nil
        }
    }
 }
@@ -23,15 +23,24 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
    struct Call {
        var connection: RTCPeerConnection
        var iceCandidates: IceCandidates
-        var localMedia: CallMediaType
        var localCamera: RTCVideoCapturer?
-        var localVideoSource: RTCVideoSource?
-        var localStream: RTCVideoTrack?
-        var remoteStream: RTCVideoTrack?
-        var device: AVCaptureDevice.Position = .front
+        var localAudioTrack: RTCAudioTrack?
+        var localVideoTrack: RTCVideoTrack?
+        var remoteAudioTrack: RTCAudioTrack?
+        var remoteVideoTrack: RTCVideoTrack?
+        var remoteScreenAudioTrack: RTCAudioTrack?
+        var remoteScreenVideoTrack: RTCVideoTrack?
+        var device: AVCaptureDevice.Position
        var aesKey: String?
        var frameEncryptor: RTCFrameEncryptor?
        var frameDecryptor: RTCFrameDecryptor?
+        var peerHasOldVersion: Bool
+    }
+
+    struct NotConnectedCall {
+        var audioTrack: RTCAudioTrack?
+        var localCameraAndTrack: (RTCVideoCapturer, RTCVideoTrack)?
+        var device: AVCaptureDevice.Position = .front
    }

    actor IceCandidates {
@@ -51,17 +60,20 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
    private let rtcAudioSession =  RTCAudioSession.sharedInstance()
    private let audioQueue = DispatchQueue(label: "chat.simplex.app.audio")
    private var sendCallResponse: (WVAPIMessage) async -> Void
-    var activeCall: Binding<Call?>
+    var activeCall: Call?
+    var notConnectedCall: NotConnectedCall?
    private var localRendererAspectRatio: Binding<CGFloat?>

+    var cameraRenderers: [RTCVideoRenderer] = []
+    var screenRenderers: [RTCVideoRenderer] = []
+
    @available(*, unavailable)
    override init() {
        fatalError("Unimplemented")
    }

-    required init(_ activeCall: Binding<Call?>, _ sendCallResponse: @escaping (WVAPIMessage) async -> Void, _ localRendererAspectRatio: Binding<CGFloat?>) {
+    required init(_ sendCallResponse: @escaping (WVAPIMessage) async -> Void, _ localRendererAspectRatio: Binding<CGFloat?>) {
        self.sendCallResponse = sendCallResponse
-        self.activeCall = activeCall
        self.localRendererAspectRatio = localRendererAspectRatio
        rtcAudioSession.useManualAudio = CallController.useCallKit()
        rtcAudioSession.isAudioEnabled = !CallController.useCallKit()
@@ -78,39 +90,45 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
    func initializeCall(_ iceServers: [WebRTC.RTCIceServer]?, _ mediaType: CallMediaType, _ aesKey: String?, _ relay: Bool?) -> Call {
        let connection = createPeerConnection(iceServers ?? getWebRTCIceServers() ?? defaultIceServers, relay)
        connection.delegate = self
-        createAudioSender(connection)
-        var localStream: RTCVideoTrack? = nil
-        var remoteStream: RTCVideoTrack? = nil
+        let device = notConnectedCall?.device ?? .front
        var localCamera: RTCVideoCapturer? = nil
-        var localVideoSource: RTCVideoSource? = nil
-        if mediaType == .video {
-            (localStream, remoteStream, localCamera, localVideoSource) = createVideoSender(connection)
+        var localAudioTrack: RTCAudioTrack? = nil
+        var localVideoTrack: RTCVideoTrack? = nil
+        if let localCameraAndTrack = notConnectedCall?.localCameraAndTrack {
+            (localCamera, localVideoTrack) = localCameraAndTrack
+        } else if notConnectedCall == nil && mediaType == .video {
+            (localCamera, localVideoTrack) = createVideoTrackAndStartCapture(device)
        }
+        if let audioTrack = notConnectedCall?.audioTrack {
+            localAudioTrack = audioTrack
+        } else if notConnectedCall == nil {
+            localAudioTrack = createAudioTrack()
+        }
+        notConnectedCall?.localCameraAndTrack = nil
+        notConnectedCall?.audioTrack = nil
+
        var frameEncryptor: RTCFrameEncryptor? = nil
        var frameDecryptor: RTCFrameDecryptor? = nil
        if aesKey != nil {
            let encryptor = RTCFrameEncryptor.init(sizeChange: Int32(WebRTCClient.ivTagBytes))
            encryptor.delegate = self
            frameEncryptor = encryptor
-            connection.senders.forEach { $0.setRtcFrameEncryptor(encryptor) }

            let decryptor = RTCFrameDecryptor.init(sizeChange: -Int32(WebRTCClient.ivTagBytes))
            decryptor.delegate = self
            frameDecryptor = decryptor
-            // Has no video receiver in outgoing call if applied here, see [peerConnection(_ connection: RTCPeerConnection, didChange newState]
-            // connection.receivers.forEach { $0.setRtcFrameDecryptor(decryptor) }
        }
        return Call(
            connection: connection,
            iceCandidates: IceCandidates(),
-            localMedia: mediaType,
            localCamera: localCamera,
-            localVideoSource: localVideoSource,
-            localStream: localStream,
-            remoteStream: remoteStream,
+            localAudioTrack: localAudioTrack,
+            localVideoTrack: localVideoTrack,
+            device: device,
            aesKey: aesKey,
            frameEncryptor: frameEncryptor,
-            frameDecryptor: frameDecryptor
+            frameDecryptor: frameDecryptor,
+            peerHasOldVersion: false
        )
    }

@@ -151,18 +169,24 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg

    func sendCallCommand(command: WCallCommand) async {
        var resp: WCallResponse? = nil
-        let pc = activeCall.wrappedValue?.connection
+        let pc = activeCall?.connection
        switch command {
-        case .capabilities:
+        case let .capabilities(media): // outgoing
+            let localCameraAndTrack: (RTCVideoCapturer, RTCVideoTrack)? = media == .video
+            ? createVideoTrackAndStartCapture(.front)
+            : nil
+            notConnectedCall = NotConnectedCall(audioTrack: createAudioTrack(), localCameraAndTrack: localCameraAndTrack, device: .front)
            resp = .capabilities(capabilities: CallCapabilities(encryption: WebRTCClient.enableEncryption))
-        case let .start(media: media, aesKey, iceServers, relay):
+        case let .start(media: media, aesKey, iceServers, relay): // incoming
            logger.debug("starting incoming call - create webrtc session")
-            if activeCall.wrappedValue != nil { endCall() }
+            if activeCall != nil { endCall() }
            let encryption = WebRTCClient.enableEncryption
            let call = initializeCall(iceServers?.toWebRTCIceServers(), media, encryption ? aesKey : nil, relay)
-            activeCall.wrappedValue = call
+            activeCall = call
+            setupLocalTracks(true, call)
            let (offer, error) = await call.connection.offer()
            if let offer = offer {
+                setupEncryptionForLocalTracks(call)
                resp = .offer(
                    offer: compressToBase64(input: encodeJSON(CustomRTCSessionDescription(type: offer.type.toSdpType(), sdp: offer.sdp))),
                    iceCandidates: compressToBase64(input: encodeJSON(await self.getInitialIceCandidates())),
@@ -172,18 +196,24 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
            } else {
                resp = .error(message: "offer error: \(error?.localizedDescription ?? "unknown error")")
            }
-        case let .offer(offer, iceCandidates, media, aesKey, iceServers, relay):
-            if activeCall.wrappedValue != nil {
+        case let .offer(offer, iceCandidates, media, aesKey, iceServers, relay): // outgoing
+            if activeCall != nil {
                resp = .error(message: "accept: call already started")
            } else if !WebRTCClient.enableEncryption && aesKey != nil {
                resp = .error(message: "accept: encryption is not supported")
            } else if let offer: CustomRTCSessionDescription = decodeJSON(decompressFromBase64(input: offer)),
                      let remoteIceCandidates: [RTCIceCandidate] = decodeJSON(decompressFromBase64(input: iceCandidates)) {
                let call = initializeCall(iceServers?.toWebRTCIceServers(), media, WebRTCClient.enableEncryption ? aesKey : nil, relay)
-                activeCall.wrappedValue = call
+                activeCall = call
                let pc = call.connection
                if let type = offer.type, let sdp = offer.sdp {
                    if (try? await pc.setRemoteDescription(RTCSessionDescription(type: type.toWebRTCSdpType(), sdp: sdp))) != nil {
+                        setupLocalTracks(false, call)
+                        setupEncryptionForLocalTracks(call)
+                        pc.transceivers.forEach { transceiver in
+                            transceiver.setDirection(.sendRecv, error: nil)
+                        }
+                        await adaptToOldVersion(pc.transceivers.count <= 2)
                        let (answer, error) = await pc.answer()
                        if let answer = answer {
                            self.addIceCandidates(pc, remoteIceCandidates)
@@ -200,7 +230,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                    }
                }
            }
-        case let .answer(answer, iceCandidates):
+        case let .answer(answer, iceCandidates): // incoming
            if pc == nil {
                resp = .error(message: "answer: call not started")
            } else if pc?.localDescription == nil {
@@ -212,6 +242,9 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
                      let type = answer.type, let sdp = answer.sdp,
                      let pc = pc {
                if (try? await pc.setRemoteDescription(RTCSessionDescription(type: type.toWebRTCSdpType(), sdp: sdp))) != nil {
+                    var currentDirection: RTCRtpTransceiverDirection = .sendOnly
+                    pc.transceivers[2].currentDirection(&currentDirection)
+                    await adaptToOldVersion(currentDirection == .sendOnly)
                    addIceCandidates(pc, remoteIceCandidates)
                    resp = .ok
                } else {
@@ -226,13 +259,11 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
            } else {
                resp = .error(message: "ice: call not started")
            }
-        case let .media(media, enable):
-            if activeCall.wrappedValue == nil {
+        case let .media(source, enable):
+            if activeCall == nil {
                resp = .error(message: "media: call not started")
-            } else if activeCall.wrappedValue?.localMedia == .audio && media == .video {
-                resp = .error(message: "media: no video")
            } else {
-                enableMedia(media, enable)
+                await enableMedia(source, enable)
                resp = .ok
            }
        case .end:
@@ -247,7 +278,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg

    func getInitialIceCandidates() async -> [RTCIceCandidate] {
        await untilIceComplete(timeoutMs: 750, stepMs: 150) {}
-        let candidates = await activeCall.wrappedValue?.iceCandidates.getAndClear() ?? []
+        let candidates = await activeCall?.iceCandidates.getAndClear() ?? []
        logger.debug("WebRTCClient: sending initial ice candidates: \(candidates.count)")
        return candidates
    }
@@ -255,7 +286,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
    func waitForMoreIceCandidates() {
        Task {
            await untilIceComplete(timeoutMs: 12000, stepMs: 1500) {
-                let candidates = await self.activeCall.wrappedValue?.iceCandidates.getAndClear() ?? []
+                let candidates = await self.activeCall?.iceCandidates.getAndClear() ?? []
                if candidates.count > 0 {
                    logger.debug("WebRTCClient: sending more ice candidates: \(candidates.count)")
                    await self.sendIceCandidates(candidates)
@@ -272,25 +303,202 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        )
    }

-    func enableMedia(_ media: CallMediaType, _ enable: Bool) {
-        logger.debug("WebRTCClient: enabling media \(media.rawValue) \(enable)")
-        media == .video ? setVideoEnabled(enable) : setAudioEnabled(enable)
+    func setupMuteUnmuteListener(_ transceiver: RTCRtpTransceiver, _ track: RTCMediaStreamTrack) {
+        // logger.log("Setting up mute/unmute listener in the call without encryption for mid = \(transceiver.mid)")
+        Task {
+            var lastBytesReceived: Int64 = 0
+            // muted initially
+            var mutedSeconds = 4
+            while let call = self.activeCall, transceiver.receiver.track?.readyState == .live {
+                let stats: RTCStatisticsReport = await call.connection.statistics(for: transceiver.receiver)
+                let stat = stats.statistics.values.first(where: { stat in stat.type == "inbound-rtp"})
+                if let stat {
+                    //logger.debug("Stat \(stat.debugDescription)")
+                    let bytes = stat.values["bytesReceived"] as! Int64
+                    if bytes <= lastBytesReceived {
+                        mutedSeconds += 1
+                        if mutedSeconds == 3 {
+                            await MainActor.run {
+                                self.onMediaMuteUnmute(transceiver.mid, true)
+                            }
+                        }
+                    } else {
+                        if mutedSeconds >= 3 {
+                            await MainActor.run {
+                                self.onMediaMuteUnmute(transceiver.mid, false)
+                            }
+                        }
+                        lastBytesReceived = bytes
+                        mutedSeconds = 0
+                    }
+                }
+                try? await Task.sleep(nanoseconds: 1000_000000)
+            }
+        }
    }

-    func addLocalRenderer(_ activeCall: Call, _ renderer: RTCEAGLVideoView) {
-        activeCall.localStream?.add(renderer)
+    @MainActor
+    func onMediaMuteUnmute(_ transceiverMid: String?, _ mute: Bool) {
+        guard let activeCall = ChatModel.shared.activeCall else { return }
+        let source = mediaSourceFromTransceiverMid(transceiverMid)
+        logger.log("Mute/unmute \(source.rawValue) track = \(mute) with mid = \(transceiverMid ?? "nil")")
+        if source == .mic && activeCall.peerMediaSources.mic == mute {
+            activeCall.peerMediaSources.mic = !mute
+        } else if (source == .camera && activeCall.peerMediaSources.camera == mute) {
+            activeCall.peerMediaSources.camera = !mute
+        } else if (source == .screenAudio && activeCall.peerMediaSources.screenAudio == mute) {
+            activeCall.peerMediaSources.screenAudio = !mute
+        } else if (source == .screenVideo && activeCall.peerMediaSources.screenVideo == mute) {
+            activeCall.peerMediaSources.screenVideo = !mute
+        }
+    }
+
+    @MainActor
+    func enableMedia(_ source: CallMediaSource, _ enable: Bool) {
+        logger.debug("WebRTCClient: enabling media \(source.rawValue) \(enable)")
+        source == .camera ? setCameraEnabled(enable) : setAudioEnabled(enable)
+    }
+
+    @MainActor
+    func adaptToOldVersion(_ peerHasOldVersion: Bool) {
+        activeCall?.peerHasOldVersion = peerHasOldVersion
+        if peerHasOldVersion {
+            logger.debug("The peer has an old version. Remote audio track is nil = \(self.activeCall?.remoteAudioTrack == nil), video = \(self.activeCall?.remoteVideoTrack == nil)")
+            onMediaMuteUnmute("0", false)
+            if activeCall?.remoteVideoTrack != nil {
+                onMediaMuteUnmute("1", false)
+            }
+            if ChatModel.shared.activeCall?.localMediaSources.camera == true && ChatModel.shared.activeCall?.peerMediaSources.camera == false {
+                logger.debug("Stopping video track for the old version")
+                activeCall?.connection.senders[1].track = nil
+                ChatModel.shared.activeCall?.localMediaSources.camera = false
+                (activeCall?.localCamera as? RTCCameraVideoCapturer)?.stopCapture()
+                activeCall?.localCamera = nil
+                activeCall?.localVideoTrack = nil
+            }
+        }
+    }
+
+    func addLocalRenderer(_ renderer: RTCEAGLVideoView) {
+        if let activeCall {
+            if let track = activeCall.localVideoTrack {
+                track.add(renderer)
+            }
+        } else if let notConnectedCall {
+            if let track = notConnectedCall.localCameraAndTrack?.1 {
+                track.add(renderer)
+            }
+        }
        // To get width and height of a frame, see videoView(videoView:, didChangeVideoSize)
        renderer.delegate = self
    }

+    func removeLocalRenderer(_ renderer: RTCEAGLVideoView) {
+        if let activeCall {
+            if let track = activeCall.localVideoTrack {
+                track.remove(renderer)
+            }
+        } else if let notConnectedCall {
+            if let track = notConnectedCall.localCameraAndTrack?.1 {
+                track.remove(renderer)
+            }
+        }
+        renderer.delegate = nil
+    }
+
    func videoView(_ videoView: RTCVideoRenderer, didChangeVideoSize size: CGSize) {
        guard size.height > 0 else { return }
        localRendererAspectRatio.wrappedValue = size.width / size.height
    }

+    func setupLocalTracks(_ incomingCall: Bool, _ call: Call) {
+        let pc = call.connection
+        let transceivers = call.connection.transceivers
+        let audioTrack = call.localAudioTrack
+        let videoTrack = call.localVideoTrack
+
+        if incomingCall {
+            let micCameraInit = RTCRtpTransceiverInit()
+            // streamIds required for old versions which adds tracks from stream, not from track property
+            micCameraInit.streamIds = ["micCamera"]
+
+            let screenAudioVideoInit = RTCRtpTransceiverInit()
+            screenAudioVideoInit.streamIds = ["screenAudioVideo"]
+
+            // incoming call, no transceivers yet. But they should be added in order: mic, camera, screen audio, screen video
+            // mid = 0, mic
+            if let audioTrack {
+                pc.addTransceiver(with: audioTrack, init: micCameraInit)
+            } else {
+                pc.addTransceiver(of: .audio, init: micCameraInit)
+            }
+            // mid = 1, camera
+            if let videoTrack {
+                pc.addTransceiver(with: videoTrack, init: micCameraInit)
+            } else {
+                pc.addTransceiver(of: .video, init: micCameraInit)
+            }
+            // mid = 2, screenAudio
+            pc.addTransceiver(of: .audio, init: screenAudioVideoInit)
+            // mid = 3, screenVideo
+            pc.addTransceiver(of: .video, init: screenAudioVideoInit)
+        } else {
+            // new version
+            if transceivers.count > 2 {
+                // Outgoing call. All transceivers are ready. Don't addTrack() because it will create new transceivers, replace existing (nil) tracks
+                transceivers
+                    .first(where: { elem in mediaSourceFromTransceiverMid(elem.mid) == .mic })?
+                    .sender.track = audioTrack
+                transceivers
+                    .first(where: { elem in mediaSourceFromTransceiverMid(elem.mid) == .camera })?
+                    .sender.track = videoTrack
+            } else {
+                // old version, only two transceivers
+                if let audioTrack {
+                    pc.add(audioTrack, streamIds: ["micCamera"])
+                } else {
+                    // it's important to have any track in order to be able to turn it on again (currently it's off)
+                    let sender = pc.add(createAudioTrack(), streamIds: ["micCamera"])
+                    sender?.track = nil
+                }
+                if let videoTrack {
+                    pc.add(videoTrack, streamIds: ["micCamera"])
+                } else {
+                    // it's important to have any track in order to be able to turn it on again (currently it's off)
+                    let localVideoSource = WebRTCClient.factory.videoSource()
+                    let localVideoTrack = WebRTCClient.factory.videoTrack(with: localVideoSource, trackId: "video0")
+                    let sender = pc.add(localVideoTrack, streamIds: ["micCamera"])
+                    sender?.track = nil
+                }
+            }
+        }
+    }
+
+    func mediaSourceFromTransceiverMid(_ mid: String?) -> CallMediaSource {
+        switch mid {
+        case "0":
+            return .mic
+        case "1":
+            return .camera
+        case "2":
+            return .screenAudio
+        case "3":
+            return .screenVideo
+        default:
+            return .unknown
+        }
+    }
+
+    // Should be called after local description set
+    func setupEncryptionForLocalTracks(_ call: Call) {
+        if let encryptor = call.frameEncryptor {
+            call.connection.senders.forEach { $0.setRtcFrameEncryptor(encryptor) }
+        }
+    }
+
    func frameDecryptor(_ decryptor: RTCFrameDecryptor, mediaType: RTCRtpMediaType, withFrame encrypted: Data) -> Data? {
        guard encrypted.count > 0 else { return nil }
-        if var key: [CChar] = activeCall.wrappedValue?.aesKey?.cString(using: .utf8),
+        if var key: [CChar] = activeCall?.aesKey?.cString(using: .utf8),
           let pointer: UnsafeMutableRawPointer = malloc(encrypted.count) {
            memcpy(pointer, (encrypted as NSData).bytes, encrypted.count)
            let isKeyFrame = encrypted[0] & 1 == 0
@@ -304,7 +512,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg

    func frameEncryptor(_ encryptor: RTCFrameEncryptor, mediaType: RTCRtpMediaType, withFrame unencrypted: Data) -> Data? {
        guard unencrypted.count > 0 else { return nil }
-        if var key: [CChar] = activeCall.wrappedValue?.aesKey?.cString(using: .utf8),
+        if var key: [CChar] = activeCall?.aesKey?.cString(using: .utf8),
           let pointer: UnsafeMutableRawPointer = malloc(unencrypted.count + WebRTCClient.ivTagBytes) {
            memcpy(pointer, (unencrypted as NSData).bytes, unencrypted.count)
            let isKeyFrame = unencrypted[0] & 1 == 0
@@ -327,18 +535,42 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        }
    }

-    func addRemoteRenderer(_ activeCall: Call, _ renderer: RTCVideoRenderer) {
-        activeCall.remoteStream?.add(renderer)
+    func addRemoteCameraRenderer(_ renderer: RTCVideoRenderer) {
+        if activeCall?.remoteVideoTrack != nil {
+            activeCall?.remoteVideoTrack?.add(renderer)
+        } else {
+            cameraRenderers.append(renderer)
+        }
    }

-    func removeRemoteRenderer(_ activeCall: Call, _ renderer: RTCVideoRenderer) {
-        activeCall.remoteStream?.remove(renderer)
+    func removeRemoteCameraRenderer(_ renderer: RTCVideoRenderer) {
+        if activeCall?.remoteVideoTrack != nil {
+            activeCall?.remoteVideoTrack?.remove(renderer)
+        } else {
+            cameraRenderers.removeAll(where: { $0.isEqual(renderer) })
+        }
    }

-    func startCaptureLocalVideo(_ activeCall: Call) {
+    func addRemoteScreenRenderer(_ renderer: RTCVideoRenderer) {
+        if activeCall?.remoteScreenVideoTrack != nil {
+            activeCall?.remoteScreenVideoTrack?.add(renderer)
+        } else {
+            screenRenderers.append(renderer)
+        }
+    }
+
+    func removeRemoteScreenRenderer(_ renderer: RTCVideoRenderer) {
+        if activeCall?.remoteScreenVideoTrack != nil {
+            activeCall?.remoteScreenVideoTrack?.remove(renderer)
+        } else {
+            screenRenderers.removeAll(where: { $0.isEqual(renderer) })
+        }
+    }
+
+    func startCaptureLocalVideo(_ device: AVCaptureDevice.Position?, _ capturer: RTCVideoCapturer?) {
 #if targetEnvironment(simulator)
        guard
-            let capturer = activeCall.localCamera as? RTCFileVideoCapturer
+            let capturer = (activeCall?.localCamera ?? notConnectedCall?.localCameraAndTrack?.0) as? RTCFileVideoCapturer
        else {
            logger.error("Unable to work with a file capturer")
            return
@@ -348,10 +580,10 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        capturer.startCapturing(fromFileNamed: "sounds/video.mp4")
 #else
        guard
-            let capturer = activeCall.localCamera as? RTCCameraVideoCapturer,
-            let camera = (RTCCameraVideoCapturer.captureDevices().first { $0.position == activeCall.device })
+            let capturer = capturer as? RTCCameraVideoCapturer,
+            let camera = (RTCCameraVideoCapturer.captureDevices().first { $0.position == device })
        else {
-            logger.error("Unable to find a camera")
+            logger.error("Unable to find a camera or local track")
            return
        }

@@ -377,19 +609,6 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
 #endif
    }

-    private func createAudioSender(_ connection: RTCPeerConnection) {
-        let streamId = "stream"
-        let audioTrack = createAudioTrack()
-        connection.add(audioTrack, streamIds: [streamId])
-    }
-
-    private func createVideoSender(_ connection: RTCPeerConnection) -> (RTCVideoTrack?, RTCVideoTrack?, RTCVideoCapturer?, RTCVideoSource?) {
-        let streamId = "stream"
-        let (localVideoTrack, localCamera, localVideoSource) = createVideoTrack()
-        connection.add(localVideoTrack, streamIds: [streamId])
-        return (localVideoTrack, connection.transceivers.first { $0.mediaType == .video }?.receiver.track as? RTCVideoTrack, localCamera, localVideoSource)
-    }
-
    private func createAudioTrack() -> RTCAudioTrack {
        let audioConstrains = RTCMediaConstraints(mandatoryConstraints: nil, optionalConstraints: nil)
        let audioSource = WebRTCClient.factory.audioSource(with: audioConstrains)
@@ -397,7 +616,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        return audioTrack
    }

-    private func createVideoTrack() -> (RTCVideoTrack, RTCVideoCapturer, RTCVideoSource) {
+    private func createVideoTrackAndStartCapture(_ device: AVCaptureDevice.Position) -> (RTCVideoCapturer, RTCVideoTrack) {
        let localVideoSource = WebRTCClient.factory.videoSource()

        #if targetEnvironment(simulator)
@@ -407,7 +626,8 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
        #endif

        let localVideoTrack = WebRTCClient.factory.videoTrack(with: localVideoSource, trackId: "video0")
-        return (localVideoTrack, localCamera, localVideoSource)
+        startCaptureLocalVideo(device, localCamera)
+        return (localCamera, localVideoTrack)
    }

    func endCall() {
@@ -420,15 +640,16 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
    }

    private func _endCall() {
-        guard let call = activeCall.wrappedValue else { return }
+        (notConnectedCall?.localCameraAndTrack?.0 as? RTCCameraVideoCapturer)?.stopCapture()
+        guard let call = activeCall else { return }
        logger.debug("WebRTCClient: ending the call")
-        activeCall.wrappedValue = nil
-        (call.localCamera as? RTCCameraVideoCapturer)?.stopCapture()
        call.connection.close()
        call.connection.delegate = nil
        call.frameEncryptor?.delegate = nil
        call.frameDecryptor?.delegate = nil
+        (call.localCamera as? RTCCameraVideoCapturer)?.stopCapture()
        audioSessionToDefaults()
+        activeCall = nil
    }

    func untilIceComplete(timeoutMs: UInt64, stepMs: UInt64, action: @escaping () async -> Void) async {
@@ -437,7 +658,7 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
            _ = try? await Task.sleep(nanoseconds: stepMs * 1000000)
            t += stepMs
            await action()
-        } while t < timeoutMs && activeCall.wrappedValue?.connection.iceGatheringState != .complete
+        } while t < timeoutMs && activeCall?.connection.iceGatheringState != .complete
    }
 }

@@ -498,11 +719,40 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
        logger.debug("Connection should negotiate")
    }

+    func peerConnection(_ peerConnection: RTCPeerConnection, didStartReceivingOn transceiver: RTCRtpTransceiver) {
+        if let track = transceiver.receiver.track {
+            DispatchQueue.main.async {
+                // Doesn't work for outgoing video call (audio in video call works ok still, same as incoming call)
+//                if let decryptor = self.activeCall?.frameDecryptor {
+//                    transceiver.receiver.setRtcFrameDecryptor(decryptor)
+//                }
+                let source = self.mediaSourceFromTransceiverMid(transceiver.mid)
+                switch source {
+                case .mic: self.activeCall?.remoteAudioTrack = track as? RTCAudioTrack
+                case .camera:
+                    self.activeCall?.remoteVideoTrack = track as? RTCVideoTrack
+                    self.cameraRenderers.forEach({ renderer in
+                        self.activeCall?.remoteVideoTrack?.add(renderer)
+                    })
+                    self.cameraRenderers.removeAll()
+                case .screenAudio: self.activeCall?.remoteScreenAudioTrack = track as? RTCAudioTrack
+                case .screenVideo:
+                    self.activeCall?.remoteScreenVideoTrack = track as? RTCVideoTrack
+                    self.screenRenderers.forEach({ renderer in
+                        self.activeCall?.remoteScreenVideoTrack?.add(renderer)
+                    })
+                    self.screenRenderers.removeAll()
+                case .unknown: ()
+                }
+            }
+            self.setupMuteUnmuteListener(transceiver, track)
+        }
+    }
+
    func peerConnection(_ connection: RTCPeerConnection, didChange newState: RTCIceConnectionState) {
        debugPrint("Connection new connection state: \(newState.toString() ?? "" + newState.rawValue.description) \(connection.receivers)")

-        guard let call = activeCall.wrappedValue,
-              let connectionStateString = newState.toString(),
+        guard let connectionStateString = newState.toString(),
              let iceConnectionStateString = connection.iceConnectionState.toString(),
              let iceGatheringStateString = connection.iceGatheringState.toString(),
              let signalingStateString = connection.signalingState.toString()
@@ -523,18 +773,14 @@ extension WebRTCClient: RTCPeerConnectionDelegate {

            switch newState {
            case .checking:
-                if let frameDecryptor = activeCall.wrappedValue?.frameDecryptor {
+                if let frameDecryptor = activeCall?.frameDecryptor {
                    connection.receivers.forEach { $0.setRtcFrameDecryptor(frameDecryptor) }
                }
-                let enableSpeaker: Bool
-                switch call.localMedia {
-                case .video: enableSpeaker = true
-                default: enableSpeaker = false
-                }
+                let enableSpeaker: Bool = ChatModel.shared.activeCall?.localMediaSources.hasVideo == true
                setSpeakerEnabledAndConfigureSession(enableSpeaker)
            case .connected: sendConnectedEvent(connection)
            case .disconnected, .failed: endCall()
-            default: do {}
+            default: ()
            }
        }
    }
@@ -546,7 +792,7 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
    func peerConnection(_ connection: RTCPeerConnection, didGenerate candidate: WebRTC.RTCIceCandidate) {
 //        logger.debug("Connection generated candidate \(candidate.debugDescription)")
        Task {
-            await self.activeCall.wrappedValue?.iceCandidates.append(candidate.toCandidate(nil, nil))
+            await self.activeCall?.iceCandidates.append(candidate.toCandidate(nil, nil))
        }
    }

@@ -601,11 +847,42 @@ extension WebRTCClient: RTCPeerConnectionDelegate {
 }

 extension WebRTCClient {
-    func setAudioEnabled(_ enabled: Bool) {
-        setTrackEnabled(RTCAudioTrack.self, enabled)
+    static func isAuthorized(for type: AVMediaType) async -> Bool {
+        let status = AVCaptureDevice.authorizationStatus(for: type)
+        var isAuthorized = status == .authorized
+        if status == .notDetermined {
+            isAuthorized = await AVCaptureDevice.requestAccess(for: type)
+        }
+        return isAuthorized
    }

-    func setSpeakerEnabledAndConfigureSession( _ enabled: Bool) {
+    static func showUnauthorizedAlert(for type: AVMediaType) {
+        if type == .audio {
+            AlertManager.shared.showAlert(Alert(
+                title: Text("No permission to record speech"),
+                message: Text("To record speech please grant permission to use Microphone."),
+                primaryButton: .default(Text("Open Settings")) {
+                    DispatchQueue.main.async {
+                        UIApplication.shared.open(URL(string: UIApplication.openSettingsURLString)!, options: [:], completionHandler: nil)
+                    }
+                },
+                secondaryButton: .cancel()
+            ))
+        } else if type == .video {
+            AlertManager.shared.showAlert(Alert(
+                title: Text("No permission to record video"),
+                message: Text("To record video please grant permission to use Camera."),
+                primaryButton: .default(Text("Open Settings")) {
+                    DispatchQueue.main.async {
+                        UIApplication.shared.open(URL(string: UIApplication.openSettingsURLString)!, options: [:], completionHandler: nil)
+                    }
+                },
+                secondaryButton: .cancel()
+            ))
+        }
+    }
+
+    func setSpeakerEnabledAndConfigureSession( _ enabled: Bool, skipExternalDevice: Bool = false) {
        logger.debug("WebRTCClient: configuring session with speaker enabled \(enabled)")
        audioQueue.async { [weak self] in
            guard let self = self else { return }
@@ -618,7 +895,7 @@ extension WebRTCClient {
                if enabled {
                    try self.rtcAudioSession.setCategory(AVAudioSession.Category.playAndRecord.rawValue, with: [.defaultToSpeaker, .allowBluetooth, .allowAirPlay, .allowBluetoothA2DP])
                    try self.rtcAudioSession.setMode(AVAudioSession.Mode.videoChat.rawValue)
-                    if hasExternalAudioDevice, let preferred = self.rtcAudioSession.session.preferredInputDevice() {
+                    if hasExternalAudioDevice && !skipExternalDevice, let preferred = self.rtcAudioSession.session.preferredInputDevice() {
                        try self.rtcAudioSession.setPreferredInput(preferred)
                    } else {
                        try self.rtcAudioSession.overrideOutputAudioPort(.speaker)
@@ -628,7 +905,7 @@ extension WebRTCClient {
                    try self.rtcAudioSession.setMode(AVAudioSession.Mode.voiceChat.rawValue)
                    try self.rtcAudioSession.overrideOutputAudioPort(.none)
                }
-                if hasExternalAudioDevice {
+                if hasExternalAudioDevice && !skipExternalDevice {
                    logger.debug("WebRTCClient: configuring session with external device available, skip configuring speaker")
                }
                try self.rtcAudioSession.setActive(true)
@@ -659,25 +936,59 @@ extension WebRTCClient {
        }
    }

-    func setVideoEnabled(_ enabled: Bool) {
-        setTrackEnabled(RTCVideoTrack.self, enabled)
+    @MainActor
+    func setAudioEnabled(_ enabled: Bool) {
+        if activeCall != nil {
+            activeCall?.localAudioTrack = enabled ? createAudioTrack() : nil
+            activeCall?.connection.transceivers.first(where: { t in mediaSourceFromTransceiverMid(t.mid) == .mic })?.sender.track = activeCall?.localAudioTrack
+        } else if notConnectedCall != nil {
+            notConnectedCall?.audioTrack = enabled ? createAudioTrack() : nil
+        }
+        ChatModel.shared.activeCall?.localMediaSources.mic = enabled
+    }
+
+    @MainActor
+    func setCameraEnabled(_ enabled: Bool) {
+        if let call = activeCall {
+            if enabled {
+                if call.localVideoTrack == nil {
+                    let device = activeCall?.device ?? notConnectedCall?.device ?? .front
+                    let (camera, track) = createVideoTrackAndStartCapture(device)
+                    activeCall?.localCamera = camera
+                    activeCall?.localVideoTrack = track
+                }
+            } else {
+                (call.localCamera as? RTCCameraVideoCapturer)?.stopCapture()
+                activeCall?.localCamera = nil
+                activeCall?.localVideoTrack = nil
+            }
+            call.connection.transceivers
+                .first(where: { t in mediaSourceFromTransceiverMid(t.mid) == .camera })?
+                .sender.track = activeCall?.localVideoTrack
+            ChatModel.shared.activeCall?.localMediaSources.camera = activeCall?.localVideoTrack != nil
+        } else if let call = notConnectedCall {
+            if enabled {
+                let device = activeCall?.device ?? notConnectedCall?.device ?? .front
+                notConnectedCall?.localCameraAndTrack = createVideoTrackAndStartCapture(device)
+            } else {
+                (call.localCameraAndTrack?.0 as? RTCCameraVideoCapturer)?.stopCapture()
+                notConnectedCall?.localCameraAndTrack = nil
+            }
+            ChatModel.shared.activeCall?.localMediaSources.camera = notConnectedCall?.localCameraAndTrack != nil
+        }
    }

    func flipCamera() {
-        switch activeCall.wrappedValue?.device {
-        case .front: activeCall.wrappedValue?.device = .back
-        case .back: activeCall.wrappedValue?.device = .front
-        default: ()
+        let device = activeCall?.device ?? notConnectedCall?.device
+        if activeCall != nil {
+            activeCall?.device = device == .front ? .back : .front
+        } else {
+            notConnectedCall?.device = device == .front ? .back : .front
        }
-        if let call = activeCall.wrappedValue {
-            startCaptureLocalVideo(call)
-        }
-    }
-
-    private func setTrackEnabled<T: RTCMediaStreamTrack>(_ type: T.Type, _ enabled: Bool) {
-        activeCall.wrappedValue?.connection.transceivers
-        .compactMap { $0.sender.track as? T }
-        .forEach { $0.isEnabled = enabled }
+        startCaptureLocalVideo(
+            activeCall?.device ?? notConnectedCall?.device,
+            (activeCall?.localCamera ?? notConnectedCall?.localCameraAndTrack?.0) as? RTCCameraVideoCapturer
+        )
    }
 }

@@ -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,6 +106,9 @@ 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), revealed: Binding.constant(true), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor(.secondary))
+        CIChatFeatureView(
+            chat: Chat.sampleData,
+            chatItem: ChatItem.getChatFeatureSample(.fullDelete, enabled), feature: ChatFeature.fullDelete, iconColor: enabled.iconColor(.secondary)
+        ).environment(\.revealed, true)
    }
 }
@@ -285,17 +285,18 @@ struct CIFileView_Previews: PreviewProvider {
            file: nil
        )
        Group {
-            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))
+            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)
        }
+        .environment(\.revealed, false)
        .previewLayout(.fixed(width: 360, height: 360))
    }
 }
@@ -46,7 +46,7 @@ struct CIGroupInvitationView: View {
                                    .foregroundColor(inProgress ? theme.colors.secondary : chatIncognito ? .indigo : theme.colors.primary)
                                    .font(.callout)
                                + Text("   ")
-                                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+                                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, colorMode: .transparent, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
                            )
                            .overlay(DetermineWidth())
                        }
@@ -54,7 +54,7 @@ struct CIGroupInvitationView: View {
                        (
                            groupInvitationText()
                            + Text("   ")
-                            + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+                            + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, colorMode: .transparent, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
                        )
                        .overlay(DetermineWidth())
                    }
@@ -165,9 +165,9 @@ struct CIImageView: View {
    private func fileIcon(_ icon: String, _ size: CGFloat, _ padding: CGFloat) -> some View {
        Image(systemName: icon)
            .resizable()
+            .invertedForegroundStyle()
            .aspectRatio(contentMode: .fit)
            .frame(width: size, height: size)
-            .foregroundColor(.white)
            .padding(padding)
    }

@@ -16,7 +16,7 @@ struct CILinkView: View {

    var body: some View {
        VStack(alignment: .center, spacing: 6) {
-            if let uiImage = UIImage(base64Encoded: linkPreview.image) {
+            if let uiImage = imageFromBase64(linkPreview.image) {
                Image(uiImage: uiImage)
                    .resizable()
                    .scaledToFit()
@@ -18,6 +18,7 @@ struct CIMetaView: View {
    var paleMetaColor = Color(UIColor.tertiaryLabel)
    var showStatus = true
    var showEdited = true
+    var invertedMaterial = false

    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false

@@ -25,18 +26,64 @@ struct CIMetaView: View {
        if chatItem.isDeletedContent {
            chatItem.timestampText.font(.caption).foregroundColor(metaColor)
        } else {
-            ciMetaText(
-                chatItem.meta,
-                chatTTL: chat.chatInfo.timedMessagesTTL,
-                encrypted: chatItem.encryptedFile,
-                color: chatItem.meta.itemStatus.sndProgress == .partial
-                    ? paleMetaColor
-                    : metaColor,
-                showStatus: showStatus,
-                showEdited: showEdited,
-                showViaProxy: showSentViaProxy,
-                showTimesamp: showTimestamp
-            )
+            ZStack {
+                ciMetaText(
+                    chatItem.meta,
+                    chatTTL: chat.chatInfo.timedMessagesTTL,
+                    encrypted: chatItem.encryptedFile,
+                    color: metaColor,
+                    paleColor: paleMetaColor,
+                    colorMode: invertedMaterial
+                        ? .invertedMaterial
+                        : .normal,
+                    showStatus: showStatus,
+                    showEdited: showEdited,
+                    showViaProxy: showSentViaProxy,
+                    showTimesamp: showTimestamp
+                ).invertedForegroundStyle(enabled: invertedMaterial)
+                if invertedMaterial {
+                    ciMetaText(
+                        chatItem.meta,
+                        chatTTL: chat.chatInfo.timedMessagesTTL,
+                        encrypted: chatItem.encryptedFile,
+                        colorMode: .normal,
+                        onlyOverrides: true,
+                        showStatus: showStatus,
+                        showEdited: showEdited,
+                        showViaProxy: showSentViaProxy,
+                        showTimesamp: showTimestamp
+                    )
+                }
+            }
+        }
+    }
+}
+
+enum MetaColorMode {
+    // Renders provided colours
+    case normal
+    // Fully transparent meta - used for reserving space
+    case transparent
+    // Renders white on dark backgrounds and black on light ones
+    case invertedMaterial
+
+    func resolve(_ c: Color?) -> Color? {
+        switch self {
+        case .normal: c
+        case .transparent: .clear
+        case .invertedMaterial: nil
+        }
+    }
+
+    func statusSpacer(_ sent: Bool) -> Text {
+        switch self {
+        case .normal, .transparent:
+            Text(
+                sent
+                ? Image("checkmark.wide")
+                : Image(systemName: "circlebadge.fill")
+            ).foregroundColor(.clear)
+        case .invertedMaterial: Text(" ").kerning(13)
        }
    }
 }
@@ -45,47 +92,77 @@ func ciMetaText(
    _ meta: CIMeta,
    chatTTL: Int?,
    encrypted: Bool?,
-    color: Color = .clear,
+    color: Color = .clear, // we use this function to reserve space without rendering meta
+    paleColor: Color? = nil,
    primaryColor: Color = .accentColor,
-    transparent: Bool = false,
+    colorMode: MetaColorMode = .normal,
+    onlyOverrides: Bool = false, // only render colors that differ from base
    showStatus: Bool = true,
    showEdited: Bool = true,
    showViaProxy: Bool,
    showTimesamp: Bool
 ) -> Text {
    var r = Text("")
+    var space: Text? = nil
+    let appendSpace = {
+        if let sp = space {
+            r = r + sp
+            space = nil
+        }
+    }
+    let resolved = colorMode.resolve(color)
    if showEdited, meta.itemEdited {
-        r = r + statusIconText("pencil", color)
+        r = r + statusIconText("pencil", resolved)
    }
    if meta.disappearing {
-        r = r + statusIconText("timer", color).font(.caption2)
+        r = r + statusIconText("timer", resolved).font(.caption2)
        let ttl = meta.itemTimed?.ttl
        if ttl != chatTTL {
-            r = r + Text(shortTimeText(ttl)).foregroundColor(color)
+            r = r + colored(Text(shortTimeText(ttl)), resolved)
        }
-        r = r + Text(" ")
+        space = Text(" ")
    }
    if showViaProxy, meta.sentViaProxy == true {
-        r = r + statusIconText("arrow.forward", color.opacity(0.67)).font(.caption2)
+        appendSpace()
+        r = r + statusIconText("arrow.forward", resolved?.opacity(0.67)).font(.caption2)
    }
    if showStatus {
-        if let (image, statusColor) = meta.itemStatus.statusIcon(color, primaryColor) {
-            r = r + Text(image).foregroundColor(transparent ? .clear : statusColor) + Text(" ")
+        appendSpace()
+        if let (image, statusColor) = meta.itemStatus.statusIcon(color, paleColor ?? color, primaryColor) {
+            let metaColor = if onlyOverrides && statusColor == color {
+                Color.clear
+            } else {
+                colorMode.resolve(statusColor)
+            }
+            r = r + colored(Text(image), metaColor)
        } else if !meta.disappearing {
-            r = r + statusIconText("circlebadge.fill", .clear) + Text(" ")
+            r = r + colorMode.statusSpacer(meta.itemStatus.sent)
        }
+        space = Text(" ")
    }
    if let enc = encrypted {
-        r = r + statusIconText(enc ? "lock" : "lock.open", color) + Text(" ")
+        appendSpace()
+        r = r + statusIconText(enc ? "lock" : "lock.open", resolved)
+        space = Text(" ")
    }
    if showTimesamp {
-        r = r + meta.timestampText.foregroundColor(color)
+        appendSpace()
+        r = r + colored(meta.timestampText, resolved)
    }
    return r.font(.caption)
 }

-private func statusIconText(_ icon: String, _ color: Color) -> Text {
-    Text(Image(systemName: icon)).foregroundColor(color)
+private func statusIconText(_ icon: String, _ color: Color?) -> Text {
+    colored(Text(Image(systemName: icon)), color)
+}
+
+// Applying `foregroundColor(nil)` breaks `.invertedForegroundStyle` modifier
+private func colored(_ t: Text, _ color: Color?) -> Text {
+    if let color {
+        t.foregroundColor(color)
+    } else {
+        t
+    }
 }

 struct CIMetaView_Previews: PreviewProvider {
@@ -48,7 +48,7 @@ struct CIRcvDecryptionError: View {
                if case let .group(groupInfo) = chat.chatInfo,
                   case let .groupRcv(groupMember) = chatItem.chatDir {
                    do {
-                        let (member, stats) = try apiGroupMemberInfo(groupInfo.apiId, groupMember.groupMemberId)
+                        let (member, stats) = try apiGroupMemberInfoSync(groupInfo.apiId, groupMember.groupMemberId)
                        if let s = stats {
                            m.updateGroupMemberConnectionStats(groupInfo, member, s)
                        }
@@ -126,7 +126,7 @@ struct CIRcvDecryptionError: View {
                        .foregroundColor(syncSupported ? theme.colors.primary : theme.colors.secondary)
                        .font(.callout)
                    + Text("   ")
-                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, colorMode: .transparent, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
                )
            }
            .padding(.horizontal, 12)
@@ -145,7 +145,7 @@ struct CIRcvDecryptionError: View {
                    .foregroundColor(.red)
                    .italic()
                + Text("   ")
-                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, colorMode: .transparent, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
            }
            .padding(.horizontal, 12)
            CIMetaView(chat: chat, chatItem: chatItem, metaColor: theme.colors.secondary)
@@ -292,30 +292,22 @@ struct CIVideoView: View {
            .clipShape(Circle())
    }

-    private func durationProgress() -> some View {
-        HStack {
-            Text("\(durationText(videoPlaying ? progress : duration))")
-            .foregroundColor(.white)
-            .font(.caption)
-            .padding(.vertical, 3)
-            .padding(.horizontal, 6)
-            .background(Color.black.opacity(0.35))
-            .cornerRadius(10)
-            .padding([.top, .leading], 6)
-
-            if let file = chatItem.file, !videoPlaying {
-                Text("\(ByteCountFormatter.string(fromByteCount: file.fileSize, countStyle: .binary))")
-                .foregroundColor(.white)
-                .font(.caption)
-                .padding(.vertical, 3)
-                .padding(.horizontal, 6)
-                .background(Color.black.opacity(0.35))
-                .cornerRadius(10)
-                .padding(.top, 6)
-            }
+    private var fileSizeString: String {
+        if let file = chatItem.file, !videoPlaying {
+            "  " + ByteCountFormatter.string(fromByteCount: file.fileSize, countStyle: .binary)
+        } else {
+            ""
        }
    }

+    private func durationProgress() -> some View {
+        Text((durationText(videoPlaying ? progress : duration)) + fileSizeString)
+            .invertedForegroundStyle()
+            .font(.caption)
+            .padding(.vertical, 6)
+            .padding(.horizontal, 12)
+    }
+
    private func imageView(_ img: UIImage) -> some View {
        let w = img.size.width <= img.size.height ? maxWidth * 0.75 : maxWidth
        return ZStack(alignment: .topTrailing) {
@@ -411,9 +403,9 @@ struct CIVideoView: View {
    private func fileIcon(_ icon: String, _ size: CGFloat, _ padding: CGFloat) -> some View {
        Image(systemName: icon)
            .resizable()
+            .invertedForegroundStyle()
            .aspectRatio(contentMode: .fit)
            .frame(width: size, height: size)
-            .foregroundColor(.white)
            .padding(smallView ? 0 : padding)
    }

@@ -428,10 +420,8 @@ struct CIVideoView: View {
    private func progressCircle(_ progress: Int64, _ total: Int64) -> some View {
        Circle()
        .trim(from: 0, to: Double(progress) / Double(total))
-        .stroke(
-            Color(uiColor: .white),
-            style: StrokeStyle(lineWidth: 2)
-        )
+        .stroke(style: StrokeStyle(lineWidth: 2))
+        .invertedForegroundStyle()
        .rotationEffect(.degrees(-90))
        .frame(width: 16, height: 16)
        .padding([.trailing, .top], smallView ? 0 : 11)
@@ -510,10 +510,10 @@ struct CIVoiceView_Previews: PreviewProvider {
                duration: 30,
                allowMenu: Binding.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))
+            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))
        }
        .previewLayout(.fixed(width: 360, height: 360))
    }
@@ -92,12 +92,13 @@ struct FramedCIVoiceView_Previews: PreviewProvider {
            file: CIFile.getSample(fileStatus: .sndComplete)
        )
        Group {
-            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))
+            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)
        }
+        .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,7 +79,10 @@ 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)), revealed: Binding.constant(true))
+            MarkedDeletedItemView(
+                chat: Chat.sampleData,
+                chatItem: ChatItem.getSample(1, .directSnd, .now, "hello", .sndSent(sndProgress: .complete), itemDeleted: .deleted(deletedTs: .now))
+            ).environment(\.revealed, true)
        }
        .previewLayout(.fixed(width: 360, height: 200))
    }
@@ -85,7 +85,7 @@ struct MsgContentView: View {
    }

    private func reserveSpaceForMeta(_ mt: CIMeta) -> Text {
-        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
+        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, colorMode: .transparent, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
    }
 }

@@ -14,12 +14,11 @@ struct ChatItemForwardingView: View {
    @EnvironmentObject var theme: AppTheme
    @Environment(\.dismiss) var dismiss

-    var ci: ChatItem
+    var chatItems: [ChatItem]
    var fromChatInfo: ChatInfo
    @Binding var composeState: ComposeState

    @State private var searchText: String = ""
-    @FocusState private var searchFocused
    @State private var alert: SomeAlert?
    private let chatsToForwardTo = filterChatsToForwardTo(chats: ChatModel.shared.chats)

@@ -46,8 +45,6 @@ struct ChatItemForwardingView: View {
        VStack(alignment: .leading) {
            if !chatsToForwardTo.isEmpty {
                List {
-                    searchFieldView(text: $searchText, focussed: $searchFocused, theme.colors.onBackground, theme.colors.secondary)
-                        .padding(.leading, 2)
                    let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
                    let chats = s == "" ? chatsToForwardTo : chatsToForwardTo.filter { foundChat($0, s) }
                    ForEach(chats) { chat in
@@ -55,6 +52,7 @@ struct ChatItemForwardingView: View {
                            .disabled(chatModel.deletedChats.contains(chat.chatInfo.id))
                    }
                }
+                .searchable(text: $searchText, placement: .navigationBarDrawer(displayMode: .always))
                .modifier(ThemedBackground(grouped: true))
            } else {
                ZStack {
@@ -73,11 +71,14 @@ struct ChatItemForwardingView: View {
    }

    @ViewBuilder private func forwardListChatView(_ chat: Chat) -> some View {
-        let prohibited = chat.prohibitedByPref(
-            hasSimplexLink: hasSimplexLink(ci.content.msgContent?.text),
-            isMediaOrFileAttachment: ci.content.msgContent?.isMediaOrFileAttachment ?? false,
-            isVoice: ci.content.msgContent?.isVoice ?? false
-        )
+        let prohibited = chatItems.map { ci in
+            chat.prohibitedByPref(
+                hasSimplexLink: hasSimplexLink(ci.content.msgContent?.text),
+                isMediaOrFileAttachment: ci.content.msgContent?.isMediaOrFileAttachment ?? false,
+                isVoice: ci.content.msgContent?.isVoice ?? false
+            )
+        }.contains(true)
+
        Button {
            if prohibited {
                alert = SomeAlert(
@@ -93,10 +94,10 @@ struct ChatItemForwardingView: View {
                    composeState = ComposeState(
                        message: composeState.message,
                        preview: composeState.linkPreview != nil ? composeState.preview : .noPreview,
-                        contextItem: .forwardingItem(chatItem: ci, fromChatInfo: fromChatInfo)
+                        contextItem: .forwardingItems(chatItems: chatItems, fromChatInfo: fromChatInfo)
                    )
                } else {
-                    composeState = ComposeState.init(forwardingItem: ci, fromChatInfo: fromChatInfo)
+                    composeState = ComposeState.init(forwardingItems: chatItems, fromChatInfo: fromChatInfo)
                    ItemsModel.shared.loadOpenChat(chat.id)
                }
            }
@@ -123,7 +124,7 @@ struct ChatItemForwardingView: View {

 #Preview {
    ChatItemForwardingView(
-        ci: ChatItem.getSample(1, .directSnd, .now, "hello"),
+        chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello")],
        fromChatInfo: .direct(contact: Contact.sampleData),
        composeState: Binding.constant(ComposeState(message: "hello"))
    ).environmentObject(CurrentColors.toAppTheme())
@@ -0,0 +1,219 @@
+//
+//  ChatItemGroups.swift
+//  SimpleX (iOS)
+//
+//  Created by Diogo Cunha on 11/11/2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import Foundation
+import SwiftUI
+import SimpleXChat
+
+/// Represents an anchor  in a list of chat items, indicating where data is missing and should be loaded.
+///
+/// - Parameters:
+///   - itemId: The unique identifier of the last item in the loaded list before the anchor.
+///     This ID corresponds to an item in the chat history, ordered from older to newer items.
+///     It is typically used when loading items via .around or .initial pagination when loading items
+///   - indexRange: The range of indexes within `reversedChatItems` array that
+///     represents the anchor. The first index in this range is the position of the anchor itself.
+///     For instance, if the array `[0, 1, 2, -100-, 101]` has an anchor at index 3, `indexRange`
+///     would be `3..<5`, indicating the anchor starts at index 3.
+///   - indexRangeInParentItems: The range of indexes in the `ReverseList` or parent UI component
+///     that considers revealed or hidden items, showing where the anchor appears in the visible list.
+///     The first index in this range points to where the anchor starts in the UI.
+struct AnchoredRange {
+    let itemId: Int64
+    let indexRange: Range<Int>
+    let indexRangeInParentItems: Range<Int>
+}
+struct SectionGroups {
+    let sections: [SectionItems]
+    let anchoredRanges: [AnchoredRange]
+}
+
+struct ListItem: Hashable, Equatable {
+    let item: ChatItem
+    let separation: ItemSeparation
+    let prevItemSeparationLargeGap: Bool
+}
+
+class SectionItems: ObservableObject {    
+    var mergeCategory: CIMergeCategory?
+    var items: [ListItem]
+    @Published var revealed: Bool
+    var showAvatar: Set<Int64>
+    var startIndexInParentItems: Int
+
+    init(mergeCategory: CIMergeCategory?, items: [ListItem], revealed: Bool, showAvatar: Set<Int64>, startIndexInParentItems: Int) {
+        self.mergeCategory = mergeCategory
+        self.items = items
+        self.revealed = revealed
+        self.showAvatar = showAvatar
+        self.startIndexInParentItems = startIndexInParentItems
+    }
+
+    func reveal(_ reveal: Bool, revealedItems: inout Set<Int64>) {
+        if reveal {
+            for item in items {
+                revealedItems.insert(item.item.id)
+            }
+        } else {
+            for item in items {
+                revealedItems.remove(item.item.id)
+            }
+        }
+        self.revealed = reveal
+    }
+}
+
+func putIntoGroups(chatItems: [ChatItem], revealedItems: Set<ChatItem.ID>, itemAnchors: Array<ChatItem.ID>) -> SectionGroups {
+    guard !chatItems.isEmpty else { return SectionGroups(sections: [], anchoredRanges: []) }
+
+    var groups: [SectionItems] = []
+    var anchoredRanges: [AnchoredRange] = []
+    var index = 0
+    var unclosedAnchorIndex: Int?
+    var unclosedAnchorIndexInParent: Int?
+    var unclosedAnchorItemId: Int64?
+    var visibleItemIndexInParent = -1
+    var recent: SectionItems?
+
+    while index < chatItems.count {
+        let item = chatItems[index]
+        let next = index + 1 < chatItems.count ? chatItems[index + 1] : nil
+        let category = item.mergeCategory
+        let itemIsAnchor = itemAnchors.contains(item.id)
+
+        let itemSeparation: ItemSeparation
+        let prevItemSeparationLargeGap: Bool
+
+        if let recentSection = recent, index > 0, recentSection.mergeCategory == category, !itemIsAnchor {
+            if recentSection.revealed {
+                let prev = index > 0 ? chatItems[index - 1] : nil
+                itemSeparation = getItemSeparation(item, at: index)
+                let nextForGap = (category != nil && category == prev?.mergeCategory) || index + 1 == chatItems.count ? nil : next
+                prevItemSeparationLargeGap = nextForGap == nil ? false : getItemSeparationLargeGap(item, at: index)
+                visibleItemIndexInParent += 1
+            } else {
+                itemSeparation = getItemSeparation(item, at: index)
+                prevItemSeparationLargeGap = false
+            }
+
+            let listItem = ListItem(item: item, separation: itemSeparation, prevItemSeparationLargeGap: prevItemSeparationLargeGap)
+            recentSection.items.append(listItem)
+            if shouldShowAvatar(current: item, older: next) {
+                recentSection.showAvatar.insert(item.id)
+            }
+        } else {
+            let revealed = item.mergeCategory == nil || revealedItems.contains(item.id)
+            visibleItemIndexInParent += 1
+
+            if revealed {
+                let prev = index > 0 ? chatItems[index - 1] : nil
+                itemSeparation = getItemSeparation(item, at: index)
+                let nextForGap = (category != nil && category == prev?.mergeCategory) || index + 1 == chatItems.count ? nil : next
+                prevItemSeparationLargeGap = nextForGap == nil ? false : getItemSeparationLargeGap(item, at: index)
+            } else {
+                itemSeparation = getItemSeparation(item, at: index)
+                prevItemSeparationLargeGap = false
+            }
+
+            let listItem = ListItem(item: item, separation: itemSeparation, prevItemSeparationLargeGap: prevItemSeparationLargeGap)
+            let newSection = SectionItems(
+                mergeCategory: item.mergeCategory,
+                items: [listItem],
+                revealed: revealed,
+                showAvatar: shouldShowAvatar(current: item, older: next) ? [item.id] : [],
+                startIndexInParentItems: visibleItemIndexInParent
+            )
+            groups.append(newSection)
+            recent = newSection
+        }
+
+        if itemIsAnchor {
+            if let unclosedIndex = unclosedAnchorIndex, let unclosedId = unclosedAnchorItemId, let unclosedIndexInParent = unclosedAnchorIndexInParent {
+                anchoredRanges.append(
+                    AnchoredRange(
+                        itemId: unclosedId,
+                        indexRange: unclosedIndex..<index,
+                        indexRangeInParentItems: unclosedIndexInParent..<visibleItemIndexInParent
+                    )
+                )
+            }
+            unclosedAnchorIndex = index
+            unclosedAnchorIndexInParent = visibleItemIndexInParent
+            unclosedAnchorItemId = item.id
+        } else if index + 1 == chatItems.count, let unclosedIndex = unclosedAnchorIndex, let unclosedId = unclosedAnchorItemId, let unclosedIndexInParent = unclosedAnchorIndexInParent {
+            anchoredRanges.append(
+                AnchoredRange(
+                    itemId: unclosedId,
+                    indexRange: unclosedIndex..<index + 1,
+                    indexRangeInParentItems: unclosedIndexInParent..<visibleItemIndexInParent + 1
+                )
+            )
+        }
+        index += 1
+    }
+    
+    return SectionGroups(sections: groups, anchoredRanges: anchoredRanges)
+}
+
+func getItemSectionItems(sections: Array<SectionItems>, itemId: ChatItem.ID) -> SectionItems? {
+    for sec in sections {
+        if sec.items.firstIndex(where: { $0.item.id == itemId }) != nil {
+            return sec
+        }
+    }
+    return nil
+}
+
+func getIndexInParentItems(sections: Array<SectionItems>, itemId: ChatItem.ID) -> Int {
+    for sec in sections {
+        if let index = sec.items.firstIndex(where: { $0.item.id == itemId }) {
+            return sec.startIndexInParentItems + (sec.revealed ? index : 0)
+        }
+    }
+    return -1
+}
+
+func getNewestItemAtParentIndexOrNull(sections: [SectionItems], parentIndex: Int) -> ChatItem? {
+    for group in sections {
+        let range = group.startIndexInParentItems...(group.startIndexInParentItems + group.items.count - 1)
+        if range.contains(parentIndex) {
+            if group.revealed {
+                return group.items[parentIndex - group.startIndexInParentItems].item
+            } else {
+                return group.items.first?.item
+            }
+        }
+    }
+    return nil
+}
+
+
+private func shouldShowAvatar(current: ChatItem, older: ChatItem?) -> Bool {
+    if case let .groupRcv(currentMember) = current.chatDir {
+        if let older = older, case let .groupRcv(olderMember) = older.chatDir {
+            return olderMember.memberId != currentMember.memberId
+        }
+        return true // Show avatar if there is no older item or if older is not a GroupRcv
+    }
+    return false
+}
+
+private func getItemSeparationLargeGap(_ chatItem: ChatItem, at index: Int?) -> Bool {
+    let im = ItemsModel.shared
+
+    if let index = index, index > 0, index < im.reversedChatItems.count {
+        let nextItem = im.reversedChatItems[index - 1]
+        let sameMemberAndDirection = nextItem.chatDir.sameDirection(chatItem.chatDir)
+        
+        // Return true if they are not the same direction or the time interval is more than 60 seconds.
+        return !sameMemberAndDirection || nextItem.meta.itemTs.timeIntervalSince(chatItem.meta.itemTs) > 60
+    } else {
+        // If there is no next item or it's out of bounds, consider it a large gap.
+        return true
+    }
+}
@@ -14,19 +14,28 @@ 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(
@@ -34,27 +43,25 @@ 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, revealed: $revealed)
+            MarkedDeletedItemView(chat: chat, chatItem: chatItem)
        } 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, revealed: $revealed, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
+                ChatItemContentView(chat: chat, chatItem: chatItem, msgContentView: { Text(ci.text) }) // msgContent is unreachable branch in this case
            } else {
                framedItemView()
            }
@@ -72,7 +79,7 @@ struct ChatItemView: View {
                default: nil
                }
            }
-            .flatMap { UIImage(base64Encoded: $0) }
+            .flatMap { imageFromBase64($0) }
        let adjustedMaxWidth = {
            if let preview, preview.size.width <= preview.size.height {
                maxWidth * 0.75
@@ -84,7 +91,6 @@ struct ChatItemView: View {
            chat: chat,
            chatItem: chatItem,
            preview: preview,
-            revealed: $revealed,
            maxWidth: maxWidth,
            imgWidth: adjustedMaxWidth,
            videoWidth: adjustedMaxWidth,
@@ -96,9 +102,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

@@ -130,7 +136,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, revealed: $revealed, feature: feature, icon: feature.icon, iconColor: theme.colors.secondary)
+            CIChatFeatureView(chat: chat, chatItem: chatItem, 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)
@@ -177,7 +183,7 @@ struct ChatItemContentView<Content: View>: View {
    }

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

    private var mergedGroupEventText: Text? {
@@ -238,16 +244,17 @@ 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"), 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))
+            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)
        }
+        .environment(\.revealed, false)
        .previewLayout(.fixed(width: 360, height: 70))
        .environmentObject(Chat.sampleData)
    }
@@ -265,8 +272,7 @@ 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,
@@ -276,8 +282,7 @@ struct ChatItemView_NonMsgContentDeleted_Previews: PreviewProvider {
                    content: .rcvDecryptionError(msgDecryptError: .ratchetHeader, msgCount: 2),
                    quotedItem: nil,
                    file: nil
-                ),
-                revealed: Binding.constant(true)
+                )
            )
            ChatItemView(
                chat: Chat.sampleData,
@@ -287,8 +292,7 @@ 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,
@@ -298,8 +302,7 @@ 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,
@@ -309,10 +312,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)
    }
@@ -13,6 +13,27 @@ import Combine

 private let memberImageSize: CGFloat = 34

+struct ItemSeparation: Equatable, Hashable {
+    let timestamp: Bool;
+    let largeGap: Bool;
+    let date: Date?
+}
+
+func getItemSeparation(_ chatItem: ChatItem, at i: Int?) -> ItemSeparation {
+    let im = ItemsModel.shared
+    if let i, i > 0 && im.reversedChatItems.count >= i {
+        let nextItem = im.reversedChatItems[i - 1]
+        let largeGap = !nextItem.chatDir.sameDirection(chatItem.chatDir) || nextItem.meta.itemTs.timeIntervalSince(chatItem.meta.itemTs) > 60
+        return ItemSeparation(
+            timestamp: largeGap || formatTimestampMeta(chatItem.meta.itemTs) != formatTimestampMeta(nextItem.meta.itemTs),
+            largeGap: largeGap,
+            date: Calendar.current.isDate(chatItem.meta.itemTs, inSameDayAs: nextItem.meta.itemTs) ? nil : nextItem.meta.itemTs
+        )
+    } else {
+        return ItemSeparation(timestamp: true, largeGap: true, date: nil)
+    }
+}
+
 struct ChatView: View {
    @EnvironmentObject var chatModel: ChatModel
    @ObservedObject var im = ItemsModel.shared
@@ -23,7 +44,6 @@ struct ChatView: View {
    @Environment(\.scenePhase) var scenePhase
    @State @ObservedObject var chat: Chat
    @StateObject private var scrollModel = ReverseListScrollModel()
-    @StateObject private var floatingButtonModel: FloatingButtonModel = .shared
    @State private var showChatInfoSheet: Bool = false
    @State private var showAddMembersSheet: Bool = false
    @State private var composeState = ComposeState()
@@ -33,7 +53,6 @@ struct ChatView: View {
    @State private var connectionCode: String?
    @State private var loadingItems = false
    @State private var firstPage = false
-    @State private var revealedChatItem: ChatItem?
    @State private var searchMode = false
    @State private var searchText: String = ""
    @FocusState private var searchFocussed
@@ -43,9 +62,13 @@ struct ChatView: View {
    @State private var showGroupLinkSheet: Bool = false
    @State private var groupLink: String?
    @State private var groupLinkMemberRole: GroupMemberRole = .member
+    @State private var forwardedChatItems: [ChatItem] = []
    @State private var selectedChatItems: Set<Int64>? = nil
    @State private var showDeleteSelectedMessages: Bool = false
    @State private var allowToDeleteSelectedMessagesForAll: Bool = false
+    @State private var initialChatItem: ChatItem? = nil
+    @State private var revealedItems: Set<ChatItem.ID> = []
+    @State private var anchors: Array<ChatItem.ID> = []

    @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial

@@ -76,8 +99,7 @@ struct ChatView: View {
            VStack(spacing: 0) {
                ZStack(alignment: .bottomTrailing) {
                    chatItemsList()
-                    // TODO: Extract into a separate view, to reduce the scope of `FloatingButtonModel` updates
-                    floatingButtons(unreadBelow: floatingButtonModel.unreadBelow, isNearBottom: floatingButtonModel.isNearBottom)
+                    FloatingButtons(theme: theme, scrollModel: scrollModel, chat: chat)
                }
                connectingText()
                if selectedChatItems == nil {
@@ -100,7 +122,8 @@ struct ChatView: View {
                            if case let .group(groupInfo) = chat.chatInfo {
                                showModerateSelectedMessagesAlert(groupInfo)
                            }
-                        }
+                        },
+                        forwardItems: forwardSelectedMessages
                    )
                }
            }
@@ -137,12 +160,37 @@ struct ChatView: View {
                }
            }
        }
+        // it should be presented on top level in order to prevent a bug in SwiftUI on iOS 16 related to .focused() modifier in AddGroupMembersView's search field
+        .appSheet(isPresented: $showAddMembersSheet) {
+            Group {
+                if case let .group(groupInfo) = cInfo {
+                    AddGroupMembersView(chat: chat, groupInfo: groupInfo)
+                }
+            }
+        }
+        .sheet(isPresented: Binding(
+            get: { !forwardedChatItems.isEmpty },
+            set: { isPresented in
+                if !isPresented {
+                    forwardedChatItems = []
+                    selectedChatItems = nil
+                }
+            }
+        )) {
+            if #available(iOS 16.0, *) {
+                ChatItemForwardingView(chatItems: forwardedChatItems, fromChatInfo: chat.chatInfo, composeState: $composeState)
+                    .presentationDetents([.fraction(0.8)])
+            } else {
+                ChatItemForwardingView(chatItems: forwardedChatItems, fromChatInfo: chat.chatInfo, composeState: $composeState)
+            }
+        }
        .onAppear {
            selectedChatItems = nil
            initChatView()
        }
        .onChange(of: chatModel.chatId) { cId in
            showChatInfoSheet = false
+            firstPage = false
            selectedChatItems = nil
            scrollModel.scrollToBottom()
            stopAudioPlayer()
@@ -156,7 +204,7 @@ struct ChatView: View {
                dismiss()
            }
        }
-        .onChange(of: revealedChatItem) { _ in
+        .onChange(of: revealedItems.count) { _ in
            NotificationCenter.postReverseListNeedsLayout()
        }
        .onChange(of: im.isLoading) { isLoading in
@@ -288,9 +336,6 @@ struct ChatView: View {
                                        }
                                } else {
                                    addMembersButton()
-                                        .appSheet(isPresented: $showAddMembersSheet) {
-                                            AddGroupMembersView(chat: chat, groupInfo: groupInfo)
-                                        }
                                }
                            }
                            Menu {
@@ -341,6 +386,18 @@ struct ChatView: View {
                await markChatUnread(chat, unreadChat: false)
            }
        }
+        if im.reversedChatItems.count == loadItemsPerPage {
+            loadChatItems(chat.chatInfo, .last(count: loadItemsPerPage))
+        }
+
+        ChatView.FloatingButtonModel.shared.totalUnread = chat.chatStats.unreadCount
+        Task {
+            DispatchQueue.main.async {
+                if let firstunreadItem = self.getFirstUnreadItem() {
+                    initialChatItem = firstunreadItem
+                }
+            }
+        }
    }

    private func searchToolbar() -> some View {
@@ -394,9 +451,10 @@ struct ChatView: View {

    private func chatItemsList() -> some View {
        let cInfo = chat.chatInfo
-        let mergedItems = filtered(im.reversedChatItems)
+        let groups = putIntoGroups(chatItems: im.reversedChatItems, revealedItems: self.revealedItems, itemAnchors: self.anchors)
        return GeometryReader { g in
-            ReverseList(items: mergedItems, scrollState: $scrollModel.state) { ci in
+            ReverseList(groups: groups, scrollState: $scrollModel.state, initialChatItem: $initialChatItem) { li in
+                let ci = li.item
                let voiceNoFrame = voiceWithoutFrame(ci)
                let maxWidth = cInfo.chatType == .group
                                ? voiceNoFrame
@@ -411,12 +469,19 @@ struct ChatView: View {
                    maxWidth: maxWidth,
                    composeState: $composeState,
                    selectedMember: $selectedMember,
-                    revealedChatItem: $revealedChatItem,
-                    selectedChatItems: $selectedChatItems
+                    revealedChatItems: $revealedItems,
+                    selectedChatItems: $selectedChatItems,
+                    forwardedChatItems: $forwardedChatItems,
+                    onReveal: { revealState in
+                        if let sec = getItemSectionItems(sections: groups.sections, itemId: ci.id) {
+                            sec.reveal(revealState, revealedItems: &self.revealedItems)
+                        }
+                    }
                )
                .id(ci.id) // Required to trigger `onAppear` on iOS15
-            } loadPage: {
-                loadChatItems(cInfo)
+                
+            } loadPage: { pagination in
+                loadChatItems(cInfo, pagination)
            }
            .opacity(ItemsModel.shared.isLoading ? 0 : 1)
            .padding(.vertical, -InvertedTableView.inset)
@@ -427,7 +492,7 @@ struct ChatView: View {
            .onChange(of: im.itemAdded) { added in
                if added {
                    im.itemAdded = false
-                    if floatingButtonModel.isReallyNearBottom {
+                    if FloatingButtonModel.shared.isReallyNearBottom {
                        scrollModel.scrollToBottom()
                    }
                }
@@ -448,91 +513,196 @@ struct ChatView: View {
            EmptyView()
        }
    }
+    
+    private func getFirstUnreadItem() -> ChatItem? {
+        var maybeItem: ChatItem? = nil
+        for i in stride(from: im.reversedChatItems.count - 1, through: 0, by: -1) {
+            let item = im.reversedChatItems[i]
+            if item.isRcvNew {
+                if item.mergeCategory == nil {
+                    return maybeItem ?? item
+                } else {
+                    maybeItem = item
+                }
+            } else if maybeItem != nil {
+                return maybeItem
+            }
+        }
+        return nil
+    }

    class FloatingButtonModel: ObservableObject {
        static let shared = FloatingButtonModel()
        @Published var unreadBelow: Int = 0
        @Published var isNearBottom: Bool = true
-        var isReallyNearBottom: Bool { scrollOffset.value > 0 && scrollOffset.value < 500 }
-        let visibleItems = PassthroughSubject<[String], Never>()
-        let scrollOffset = CurrentValueSubject<Double, Never>(0)
-        private var bag = Set<AnyCancellable>()
+        @Published var date: Date?
+        @Published var isDateVisible: Bool = false
+        @Published var bottomItemIndex: Int = 0
+        var totalUnread: Int = 0
+        var isReallyNearBottom: Bool = true
+        var hideDateWorkItem: DispatchWorkItem?

-        init() {
-            visibleItems
-                .receive(on: DispatchQueue.global(qos: .background))
-                .map { itemIds in
-                    if let viewId = itemIds.first,
-                       let index = ItemsModel.shared.reversedChatItems.firstIndex(where: { $0.viewId == viewId }) {
-                        ItemsModel.shared.reversedChatItems[..<index].reduce(into: 0) { unread, chatItem in
-                            if chatItem.isRcvNew { unread += 1 }
-                        }
-                    } else { 0 }
+        func updateOnListChange(_ listState: ListState) {
+            let im = ItemsModel.shared
+            let bottomItemIndex =
+                if let id = listState.bottomItemId,
+                   let index = im.reversedChatItems.firstIndex(where: { $0.id == id }) {
+                    index
+                } else {
+                    -1
+                }
+            
+            var unreadBelow =
+                if bottomItemIndex != -1 {
+                 im.reversedChatItems[..<bottomItemIndex].reduce(into: 0) { unread, chatItem in
+                     if chatItem.isRcvNew { unread += 1 }
+                 }
+                } else {
+                    0
+                }
+            let date: Date? =
+                if let topItemDate = listState.topItemDate {
+                    Calendar.current.startOfDay(for: topItemDate)
+                } else {
+                    nil
                }
-                .removeDuplicates()
-                .receive(on: DispatchQueue.main)
-                .assign(to: \.unreadBelow, on: self)
-                .store(in: &bag)

-            scrollOffset
-                .map { $0 < 800 }
-                .removeDuplicates()
-                // Delay the state change until scroll to bottom animation is finished
-                .delay(for: 0.35, scheduler: DispatchQueue.main)
-                .assign(to: \.isNearBottom, on: self)
-                .store(in: &bag)
+            // set the counters and date indicator
+            DispatchQueue.main.async { [weak self] in
+                guard let it = self else { return }
+                it.setDate(visibility: true)
+                it.unreadBelow = unreadBelow
+                it.date = date
+                it.isReallyNearBottom = listState.scrollOffset > 0 && listState.scrollOffset < 500
+                it.bottomItemIndex = bottomItemIndex
+            }
+            
+            // set floating button indication mode
+            let nearBottom = listState.scrollOffset < 800
+            if nearBottom != self.isNearBottom {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) { [weak self] in
+                    self?.isNearBottom = nearBottom
+                }
+            }
+            
+            // hide Date indicator after 1 second of no scrolling
+            hideDateWorkItem?.cancel()
+            let workItem = DispatchWorkItem { [weak self] in
+                guard let it = self else { return }
+                it.setDate(visibility: false)
+                it.hideDateWorkItem = nil
+            }
+            DispatchQueue.main.async { [weak self] in
+                self?.hideDateWorkItem = workItem
+                DispatchQueue.main.asyncAfter(deadline: .now() + 1, execute: workItem)
+            }
        }
+
+        func resetDate() {
+            date = nil
+            isDateVisible = false
+        }
+
+        private func setDate(visibility isVisible: Bool) {
+            if isVisible {
+                if !isNearBottom,
+                   !isDateVisible,
+                   let date, !Calendar.current.isDateInToday(date) {
+                    withAnimation { self.isDateVisible = true }
+                }
+            } else if isDateVisible {
+                withAnimation { self.isDateVisible = false }
+            }
+        }
+
    }

-    private func floatingButtons(unreadBelow: Int, isNearBottom: Bool) -> some View {
-        VStack {
-            let unreadAbove = chat.chatStats.unreadCount - unreadBelow
-            if unreadAbove > 0 {
-                circleButton {
-                    unreadCountText(unreadAbove)
-                        .font(.callout)
-                        .foregroundColor(theme.colors.primary)
+    private struct FloatingButtons: View {
+        let theme: AppTheme
+        let scrollModel: ReverseListScrollModel
+        let chat: Chat
+        @ObservedObject var model = FloatingButtonModel.shared
+
+        var body: some View {
+            ZStack(alignment: .top) {
+                if let date = model.date {
+                     DateSeparator(date: date)
+                         .padding(.vertical, 4).padding(.horizontal, 8)
+                         .background(.thinMaterial)
+                         .clipShape(Capsule())
+                         .opacity(model.isDateVisible ? 1 : 0)
                }
-                .onTapGesture {
-                    scrollModel.scrollToNextPage()
-                }
-                .contextMenu {
-                    Button {
-                        Task {
-                            await markChatRead(chat)
+                VStack {
+                    let unreadAbove = model.totalUnread - model.unreadBelow
+                    if unreadAbove > 0 {
+                        circleButton {
+                            unreadCountText(unreadAbove)
+                                .font(.callout)
+                                .foregroundColor(theme.colors.primary)
                        }
-                    } label: {
-                        Label("Mark read", systemImage: "checkmark")
+                        .onTapGesture {
+                            scrollModel.scrollToNextPage()
+                        }
+                        .contextMenu {
+                            Button {
+                                Task {
+                                    await markChatRead(chat)
+                                }
+                            } label: {
+                                Label("Mark read", systemImage: "checkmark")
+                            }
+                        }
+                    }
+                    Spacer()
+                    if model.unreadBelow > 0 {
+                        circleButton {
+                            unreadCountText(model.unreadBelow)
+                                .font(.callout)
+                                .foregroundColor(theme.colors.primary)
+                        }
+                        .onTapGesture {
+                            scrollModel.scrollToBottom()
+                        }
+                    } else if !model.isNearBottom {
+                        circleButton {
+                            Image(systemName: "chevron.down")
+                                .foregroundColor(theme.colors.primary)
+                        }
+                        .onTapGesture { scrollModel.scrollToBottom() }
                    }
                }
+                .padding()
+                .frame(maxWidth: .infinity, alignment: .trailing)
            }
-            Spacer()
-            if unreadBelow > 0 {
-                circleButton {
-                    unreadCountText(unreadBelow)
-                        .font(.callout)
-                        .foregroundColor(theme.colors.primary)
-                }
-                .onTapGesture {
-                    scrollModel.scrollToBottom()
-                }
-            } else if !isNearBottom {
-                circleButton {
-                    Image(systemName: "chevron.down")
-                        .foregroundColor(theme.colors.primary)
-                }
-                .onTapGesture { scrollModel.scrollToBottom() }
+            .onDisappear(perform: model.resetDate)
+        }
+
+        private func circleButton<Content: View>(_ content: @escaping () -> Content) -> some View {
+            ZStack {
+                Circle()
+                    .foregroundColor(Color(uiColor: .tertiarySystemGroupedBackground))
+                    .frame(width: 44, height: 44)
+                content()
            }
        }
-        .padding()
    }

-    private func circleButton<Content: View>(_ content: @escaping () -> Content) -> some View {
-        ZStack {
-            Circle()
-                .foregroundColor(Color(uiColor: .tertiarySystemGroupedBackground))
-                .frame(width: 44, height: 44)
-            content()
+    private struct DateSeparator: View {
+        let date: Date
+
+        var body: some View {
+            Text(String.localizedStringWithFormat(
+                NSLocalizedString("%@, %@", comment: "format for date separator in chat"),
+                date.formatted(.dateTime.weekday(.abbreviated)),
+                date.formatted(
+                    Calendar.current.isDate(date, equalTo: .now, toGranularity: .year)
+                    ? .dateTime.day().month(.abbreviated)
+                    : .dateTime.day().month(.abbreviated).year()
+                )
+            ))
+            .font(.callout)
+            .fontWeight(.medium)
+            .foregroundStyle(.secondary)
        }
    }

@@ -626,38 +796,243 @@ struct ChatView: View {
        }
    }

-    private func loadChatItems(_ cInfo: ChatInfo) {
+    private func forwardSelectedMessages() {
        Task {
-            if loadingItems || firstPage { return }
-            loadingItems = true
            do {
-                var reversedPage = Array<ChatItem>()
-                var chatItemsAvailable = true
-                // Load additional items until the page is +50 large after merging
-                while chatItemsAvailable && filtered(reversedPage).count < loadItemsPerPage {
-                    let pagination: ChatPagination =
-                        if let lastItem = reversedPage.last ?? im.reversedChatItems.last {
-                            .before(chatItemId: lastItem.id, count: loadItemsPerPage)
-                        } else {
-                            .last(count: loadItemsPerPage)
-                        }
-                    let chatItems = try await apiGetChatItems(
-                        type: cInfo.chatType,
-                        id: cInfo.apiId,
-                        pagination: pagination,
-                        search: searchText
+                if let selectedChatItems {
+                    let (validItems, confirmation) = try await apiPlanForwardChatItems(
+                        type: chat.chatInfo.chatType,
+                        id: chat.chatInfo.apiId,
+                        itemIds: Array(selectedChatItems)
                    )
-                    chatItemsAvailable = !chatItems.isEmpty
-                    reversedPage.append(contentsOf: chatItems.reversed())
-                }
-                await MainActor.run {
-                    if reversedPage.count == 0 {
-                        firstPage = true
+                    if let confirmation {
+                        if validItems.count > 0 {
+                            showAlert(
+                                String.localizedStringWithFormat(
+                                    NSLocalizedString("Forward %d message(s)?", comment: "alert title"),
+                                    validItems.count
+                                ),
+                                message: forwardConfirmationText(confirmation) + "\n" +
+                                    NSLocalizedString("Forward messages without files?", comment: "alert message")
+                            ) {
+                                switch confirmation {
+                                case let .filesNotAccepted(fileIds):
+                                    [forwardAction(validItems), downloadAction(fileIds), cancelAlertAction]
+                                default:
+                                    [forwardAction(validItems), cancelAlertAction]
+                                }
+                            }
+                        } else {
+                            showAlert(
+                                NSLocalizedString("Nothing to forward!", comment: "alert title"),
+                                message: forwardConfirmationText(confirmation)
+                            ) {
+                                switch confirmation {
+                                case let .filesNotAccepted(fileIds):
+                                    [downloadAction(fileIds), cancelAlertAction]
+                                default:
+                                    [okAlertAction]
+                                }
+                            }
+                        }
                    } else {
-                        im.reversedChatItems.append(contentsOf: reversedPage)
+                        await openForwardingSheet(validItems)
                    }
-                    loadingItems = false
                }
+            } catch {
+                logger.error("Plan forward chat items failed: \(error.localizedDescription)")
+            }
+        }
+
+        func forwardConfirmationText(_ fc: ForwardConfirmation) -> String {
+            switch fc {
+            case let .filesNotAccepted(fileIds):
+                String.localizedStringWithFormat(
+                    NSLocalizedString("%d file(s) were not downloaded.", comment: "forward confirmation reason"),
+                    fileIds.count
+                )
+            case let .filesInProgress(filesCount):
+                String.localizedStringWithFormat(
+                    NSLocalizedString("%d file(s) are still being downloaded.", comment: "forward confirmation reason"),
+                    filesCount
+                )
+            case let .filesMissing(filesCount):
+                String.localizedStringWithFormat(
+                    NSLocalizedString("%d file(s) were deleted.", comment: "forward confirmation reason"),
+                    filesCount
+                )
+            case let .filesFailed(filesCount):
+                String.localizedStringWithFormat(
+                    NSLocalizedString("%d file(s) failed to download.", comment: "forward confirmation reason"),
+                    filesCount
+                )
+            }
+        }
+        
+        func forwardAction(_ items: [Int64]) -> UIAlertAction {
+            UIAlertAction(
+                title: NSLocalizedString("Forward messages", comment: "alert action"),
+                style: .default,
+                handler: { _ in Task { await openForwardingSheet(items) } }
+            )
+        }
+
+        func downloadAction(_ fileIds: [Int64]) -> UIAlertAction {
+            UIAlertAction(
+                title: NSLocalizedString("Download files", comment: "alert action"),
+                style: .default,
+                handler: { _ in
+                    Task {
+                        if let user = ChatModel.shared.currentUser {
+                            await receiveFiles(user: user, fileIds: fileIds)
+                        }
+                    }
+                }
+            )
+        }
+
+        func openForwardingSheet(_ items: [Int64]) async {
+            let im = ItemsModel.shared
+            var items = Set(items)
+            var fci = [ChatItem]()
+            for reversedChatItem in im.reversedChatItems {
+                if items.contains(reversedChatItem.id) {
+                    items.remove(reversedChatItem.id)
+                    fci.insert(reversedChatItem, at: 0)
+                }
+                if items.isEmpty { break }
+            }
+            await MainActor.run { forwardedChatItems = fci }
+        }
+    }
+
+    private func loadChatItems(_ cInfo: ChatInfo, _ pagination: ChatPagination = .initial(count: loadItemsPerPage)) {
+        Task {
+            if loadingItems { return }
+            loadingItems = true
+            
+            do {
+                let chatItems = try await apiGetChatItems(
+                    type: cInfo.chatType,
+                    id: cInfo.apiId,
+                    pagination: pagination,
+                    search: searchText
+                )
+                
+                if (cInfo.id != chatModel.chatId) {
+                    await MainActor.run { loadingItems = false }
+                    return
+                }
+                
+                let im = ItemsModel.shared
+                var newItems = im.reversedChatItems
+                
+                switch pagination {
+                case .last:
+                    await MainActor.run {
+                        let newItemIds = Set(chatItems.map { $0.id })
+                        var duplicateFound = false
+                        newItems.removeAll {
+                            let isDuplicate = newItemIds.contains($0.id)
+                            duplicateFound = duplicateFound || isDuplicate
+                            return isDuplicate
+                        }
+                        
+                        if !duplicateFound {
+                            if let existingItem = im.reversedChatItems.first {
+                                anchors = [existingItem.id]
+                            }
+                        }
+                        
+                        newItems.insert(contentsOf: chatItems.reversed(), at: 0)
+                        im.reversedChatItems = newItems
+                        loadingItems = false
+                    }
+                case .initial:
+                    await MainActor.run {
+                        im.reversedChatItems = chatItems.reversed()
+                        anchors = []
+                        loadingItems = false
+                    }
+                case let .after(chatItemId, _):
+                    guard let indexInCurrentItems = im.reversedChatItems.firstIndex(where: { $0.id == chatItemId }) else {
+                        return
+                    }
+                    
+                    let wasSize = newItems.count
+                    let newItemIds = Set(chatItems.map { $0.id })
+                    let indexInAnchors = anchors.firstIndex { $0 == chatItemId }
+                    var anchorAfterChatItem: [Int64] = []
+                    if let indexInAnchors = indexInAnchors, indexInAnchors + 1 <= anchors.count {
+                        anchorAfterChatItem = Array(anchors[indexInAnchors + 1..<anchors.count])
+                    }
+                    var anchorsToRemove = Set<Int64>()
+                    var reachedBottom: Bool = false
+                    
+                    newItems.removeAll { item in
+                        let isDuplicate = newItemIds.contains(item.id)
+                        if indexInAnchors != nil && newItemIds.contains(item.id) {
+                            if anchorAfterChatItem.contains(item.id) {
+                                anchorAfterChatItem.removeAll { $0 == item.id }
+                                anchorsToRemove.insert(item.id)
+                            } else if reachedBottom == false && anchorAfterChatItem.isEmpty {
+                                // We passed all anchors and found a duplicated item below all of them, indicating no more anchors below the loaded items.
+                                reachedBottom = true
+                            }
+                        }
+                        return isDuplicate
+                    }
+                    
+                    let insertAt = indexInCurrentItems - (wasSize - newItems.count)
+                    newItems.insert(contentsOf: chatItems.reversed(), at: insertAt)
+                    
+                    await MainActor.run {
+                        im.reversedChatItems = newItems
+                        var newAnchors = anchors.filter { !anchorsToRemove.contains($0) }
+                        
+                        if reachedBottom {
+                            newAnchors = []
+                        } else {
+                            if let enlargedAnchorIndex = anchors.firstIndex(where: { $0 == chatItemId }) {
+                                // Move the anchor to the end of the loaded items.
+                                newAnchors[enlargedAnchorIndex] = chatItems.last?.id ?? newAnchors[enlargedAnchorIndex]
+                            }
+                        }
+                        
+                        anchors = newAnchors
+                        loadingItems = false
+                    }
+                case let .before(chatItemId, _):
+                    guard let indexInCurrentItems = im.reversedChatItems.firstIndex(where: { $0.id == chatItemId }) else {
+                        return
+                    }
+                    let newItemIds = Set(chatItems.map { $0.id })
+                    newItems.removeAll { newItemIds.contains($0.id) }
+                    newItems.insert(contentsOf: chatItems.reversed(), at: min(indexInCurrentItems + 1, newItems.count))
+                                        
+                    await MainActor.run {
+                        if chatItems.count == 0 || newItems.count == im.reversedChatItems.count  {
+                            firstPage = true
+                        } else {
+                            im.reversedChatItems = newItems
+                        }
+                        anchors = anchors.filter { !newItemIds.contains($0) }
+                        loadingItems = false
+                    }
+                case .around(_, _):
+                    let newItemIds = Set(chatItems.map { $0.id })
+                    newItems.removeAll { newItemIds.contains($0.id) }
+                    newItems.insert(contentsOf: chatItems, at: 0)
+                    
+                    await MainActor.run {
+                        im.reversedChatItems = newItems
+                        if let lastItemId = chatItems.last?.id {
+                            anchors.insert(lastItemId, at: 0)
+                        }
+                        loadingItems = false
+                    }
+                }
+                
            } catch let error {
                logger.error("apiGetChat error: \(responseError(error))")
                await MainActor.run { loadingItems = false }
@@ -679,7 +1054,7 @@ struct ChatView: View {
        let maxWidth: CGFloat
        @Binding var composeState: ComposeState
        @Binding var selectedMember: GMember?
-        @Binding var revealedChatItem: ChatItem?
+        @Binding var revealedChatItems: Set<ChatItem.ID>

        @State private var deletingItem: ChatItem? = nil
        @State private var showDeleteMessage = false
@@ -687,31 +1062,15 @@ struct ChatView: View {
        @State private var showDeleteMessages = false
        @State private var showChatItemInfoSheet: Bool = false
        @State private var chatItemInfo: ChatItemInfo?
-        @State private var showForwardingSheet: Bool = false
        @State private var msgWidth: CGFloat = 0
        
        @Binding var selectedChatItems: Set<Int64>?
+        @Binding var forwardedChatItems: [ChatItem]

        @State private var allowMenu: Bool = true
-
-        var revealed: Bool { chatItem == revealedChatItem }
-
-        typealias ItemSeparation = (timestamp: Bool, largeGap: Bool, date: Date?)
-
-        func getItemSeparation(_ chatItem: ChatItem, at i: Int?) -> ItemSeparation {
-            let im = ItemsModel.shared
-            if let i, i > 0 && im.reversedChatItems.count >= i {
-                let nextItem = im.reversedChatItems[i - 1]
-                let largeGap = !nextItem.chatDir.sameDirection(chatItem.chatDir) || nextItem.meta.itemTs.timeIntervalSince(chatItem.meta.itemTs) > 60
-                return (
-                    timestamp: largeGap || formatTimestampText(chatItem.meta.itemTs) != formatTimestampText(nextItem.meta.itemTs),
-                    largeGap: largeGap,
-                    date: Calendar.current.isDate(chatItem.meta.itemTs, inSameDayAs: nextItem.meta.itemTs) ? nil : nextItem.meta.itemTs
-                )
-            } else {
-                return (timestamp: true, largeGap: true, date: nil)
-            }
-        }
+        @State private var markedRead = false
+        let onReveal: (Bool) -> Void
+        var revealed: Bool { revealedChatItems.contains(chatItem.id) }

        var body: some View {
            let currIndex = m.getChatItemIndex(chatItem)
@@ -719,60 +1078,17 @@ struct ChatView: View {
            let (prevHidden, prevItem) = m.getPrevShownChatItem(currIndex, ciCategory)
            let range = itemsRange(currIndex, prevHidden)
            let timeSeparation = getItemSeparation(chatItem, at: currIndex)
-            let im = ItemsModel.shared
-            Group {
-                if revealed, let range = range {
-                    let items = Array(zip(Array(range), im.reversedChatItems[range]))
-                    VStack(spacing: 0) {
-                        ForEach(items.reversed(), id: \.1.viewId) { (i: Int, ci: ChatItem) in
-                            let prev = i == prevHidden ? prevItem : im.reversedChatItems[i + 1]
-                            chatItemView(ci, nil, prev, getItemSeparation(ci, at: i))
-                                .overlay {
-                                    if let selected = selectedChatItems, ci.canBeDeletedForSelf {
-                                        Color.clear
-                                            .contentShape(Rectangle())
-                                            .onTapGesture {
-                                                let checked = selected.contains(ci.id)
-                                                selectUnselectChatItem(select: !checked, ci)
-                                            }
-                                    }
-                                }
-                        }
-                    }
+            func markAsRead() {
+                if markedRead {
+                    return
                } else {
-                    VStack(spacing: 0) {
-                        chatItemView(chatItem, range, prevItem, timeSeparation)
-                        if let date = timeSeparation.date {
-                            Text(String.localizedStringWithFormat(
-                                NSLocalizedString("%@, %@", comment: "format for date separator in chat"),
-                                date.formatted(.dateTime.weekday(.abbreviated)),
-                                date.formatted(.dateTime.day().month(.abbreviated))
-                            ))
-                            .font(.callout)
-                            .fontWeight(.medium)
-                            .foregroundStyle(.secondary)
-                            .padding(8)
-                        }
-                    }
-                    .overlay {
-                        if let selected = selectedChatItems, chatItem.canBeDeletedForSelf {
-                            Color.clear
-                                .contentShape(Rectangle())
-                                .onTapGesture {
-                                    let checked = selected.contains(chatItem.id)
-                                    selectUnselectChatItem(select: !checked, chatItem)
-                                }
-                        }
-                    }
+                    markedRead = true
                }
-            }
-            .onAppear {
                if let range {
-                    if let items = unreadItems(range) {
+                    let itemIds = unreadItemIds(range)
+                    if !itemIds.isEmpty {
                        waitToMarkRead {
-                            for ci in items {
-                                await apiMarkChatItemRead(chat.chatInfo, ci)
-                            }
+                            await apiMarkChatItemsRead(chat.chatInfo, itemIds)
                        }
                    }
                } else if chatItem.isRcvNew  {
@@ -781,25 +1097,54 @@ struct ChatView: View {
                    }
                }
            }
+            return Group {
+                VStack(spacing: 0) {
+                    chatItemView(chatItem, range, prevItem, timeSeparation)
+                    if let date = timeSeparation.date {
+                        DateSeparator(date: date).padding(8)
+                    }
+                }
+                .overlay {
+                    if let selected = selectedChatItems, chatItem.canBeDeletedForSelf {
+                        Color.clear
+                            .contentShape(Rectangle())
+                            .onTapGesture {
+                                let checked = selected.contains(chatItem.id)
+                                selectUnselectChatItem(select: !checked, chatItem)
+                            }
+                    }
+                }
+            }
+            .onAppear {
+                markAsRead()
+            }
+            .onChange(of: ChatView.FloatingButtonModel.shared.bottomItemIndex) { _ in
+                markAsRead()
+            }
        }
-        
-        private func unreadItems(_ range: ClosedRange<Int>) -> [ChatItem]? {
+
+        private func unreadItemIds(_ range: ClosedRange<Int>) -> [ChatItem.ID] {
            let im = ItemsModel.shared
-            let items = range.compactMap { i in
+            return range.compactMap { i in
                if i >= 0 && i < im.reversedChatItems.count {
                    let ci = im.reversedChatItems[i]
-                    return if ci.isRcvNew { ci } else { nil }
+                    return if ci.isRcvNew { ci.id } else { nil }
                } else {
                    return nil
                }
            }
-            return if items.isEmpty { nil } else { items }
        }
        
        private func waitToMarkRead(_ op: @Sendable @escaping () async -> Void) {
-            DispatchQueue.main.asyncAfter(deadline: .now() + 0.6) {
-                if m.chatId == chat.chatInfo.id {
-                    Task(operation: op)
+            Task {
+                _ = try? await Task.sleep(nanoseconds: 600_000000)
+                let currIndex = m.getChatItemIndex(chatItem)                
+                if let currIndex = currIndex, currIndex >= ChatView.FloatingButtonModel.shared.bottomItemIndex - 3 {
+                    if m.chatId == chat.chatInfo.id {
+                        await op()
+                    }
+                } else {
+                    markedRead = false
                }
            }
        }
@@ -973,11 +1318,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))
+                .modifier(ChatItemClipped(ci, tailVisible: itemSeparation.largeGap && (ci.meta.itemDeleted == nil || revealed)))
                .contextMenu { menu(ci, range, live: composeState.liveMessage != nil) }
                .accessibilityLabel("")
                if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {
@@ -1007,14 +1352,6 @@ struct ChatView: View {
                }) {
                    ChatItemInfoView(ci: ci, chatItemInfo: $chatItemInfo)
                }
-                .sheet(isPresented: $showForwardingSheet) {
-                    if #available(iOS 16.0, *) {
-                        ChatItemForwardingView(ci: ci, fromChatInfo: chat.chatInfo, composeState: $composeState)
-                            .presentationDetents([.fraction(0.8)])
-                    } else {
-                        ChatItemForwardingView(ci: ci, fromChatInfo: chat.chatInfo, composeState: $composeState)
-                    }
-                }
        }

        private func showMemberImage(_ member: GroupMember, _ prevItem: ChatItem?) -> Bool {
@@ -1155,7 +1492,7 @@ struct ChatView: View {

        var forwardButton: Button<some View> {
            Button {
-                showForwardingSheet = true
+                forwardedChatItems = [chatItem]
            } label: {
                Label(
                    NSLocalizedString("Forward", comment: "chat item action"),
@@ -1371,7 +1708,7 @@ struct ChatView: View {
        private func hideButton() -> Button<some View> {
            Button {
                withConditionalAnimation {
-                    revealedChatItem = nil
+                    onReveal(false)
                }
            } label: {
                Label(
@@ -1446,7 +1783,7 @@ struct ChatView: View {
        private func revealButton(_ ci: ChatItem) -> Button<some View> {
            Button {
                withConditionalAnimation {
-                    revealedChatItem = ci
+                    onReveal(true)
                }
            } label: {
                Label(
@@ -1459,7 +1796,7 @@ struct ChatView: View {
        private func expandButton() -> Button<some View> {
            Button {
                withConditionalAnimation {
-                    revealedChatItem = chatItem
+                    onReveal(true)
                }
            } label: {
                Label(
@@ -1472,7 +1809,7 @@ struct ChatView: View {
        private func shrinkButton() -> Button<some View> {
            Button {
                withConditionalAnimation {
-                    revealedChatItem = nil
+                    onReveal(false)
                }
            } label: {
                Label (
@@ -18,7 +18,7 @@ struct ComposeImageView: View {
    var body: some View {
        HStack(alignment: .center, spacing: 8) {
            let imgs: [UIImage] = images.compactMap { image in
-                UIImage(base64Encoded: image)
+                imageFromBase64(image)
            }
            if imgs.count == 0 {
                ProgressView()
@@ -40,7 +40,7 @@ struct ComposeLinkView: View {

    private func linkPreviewView(_ linkPreview: LinkPreview) -> some View {
        HStack(alignment: .center, spacing: 8) {
-            if let uiImage = UIImage(base64Encoded: linkPreview.image) {
+            if let uiImage = imageFromBase64(linkPreview.image) {
                Image(uiImage: uiImage)
                    .resizable()
                    .aspectRatio(contentMode: .fit)
@@ -23,7 +23,7 @@ enum ComposeContextItem {
    case noContextItem
    case quotedItem(chatItem: ChatItem)
    case editingItem(chatItem: ChatItem)
-    case forwardingItem(chatItem: ChatItem, fromChatInfo: ChatInfo)
+    case forwardingItems(chatItems: [ChatItem], fromChatInfo: ChatInfo)
 }

 enum VoiceMessageRecordingState {
@@ -73,10 +73,10 @@ struct ComposeState {
        }
    }

-    init(forwardingItem: ChatItem, fromChatInfo: ChatInfo) {
+    init(forwardingItems: [ChatItem], fromChatInfo: ChatInfo) {
        self.message = ""
        self.preview = .noPreview
-        self.contextItem = .forwardingItem(chatItem: forwardingItem, fromChatInfo: fromChatInfo)
+        self.contextItem = .forwardingItems(chatItems: forwardingItems, fromChatInfo: fromChatInfo)
        self.voiceMessageRecordingState = .noRecording
    }

@@ -112,7 +112,7 @@ struct ComposeState {

    var forwarding: Bool {
        switch contextItem {
-        case .forwardingItem: return true
+        case .forwardingItems: return true
        default: return false
        }
    }
@@ -167,6 +167,13 @@ struct ComposeState {
        }
    }

+    var manyMediaPreviews: Bool {
+        switch preview {
+        case let .mediaPreviews(mediaPreviews): return mediaPreviews.count > 1
+        default: return false
+        }
+    }
+
    var attachmentDisabled: Bool {
        if editing || forwarding || liveMessage != nil || inProgress { return true }
        switch preview {
@@ -280,8 +287,8 @@ struct ComposeView: View {
    // this is a workaround to fire an explicit event in certain cases
    @State private var stopPlayback: Bool = false

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

    var body: some View {
        VStack(spacing: 0) {
@@ -452,7 +459,7 @@ struct ComposeView: View {
            Task {
                var media: [(String, UploadContent)] = []
                for content in selected {
-                    if let img = resizeImageToStrSize(content.uiImage, maxDataSize: 14000) {
+                    if let img = await resizeImageToStrSize(content.uiImage, maxDataSize: 14000) {
                        media.append((img, content))
                        await MainActor.run {
                            composeState = composeState.copy(preview: .mediaPreviews(mediaPreviews: media))
@@ -544,7 +551,7 @@ struct ComposeView: View {
    }

    private func addMediaContent(_ content: UploadContent) async {
-        if let img = resizeImageToStrSize(content.uiImage, maxDataSize: 14000) {
+        if let img = await resizeImageToStrSize(content.uiImage, maxDataSize: 14000) {
            var newMedia: [(String, UploadContent?)] = []
            if case var .mediaPreviews(media) = composeState.preview {
                media.append((img, content))
@@ -687,7 +694,7 @@ struct ComposeView: View {
        case let .quotedItem(chatItem: quotedItem):
            ContextItemView(
                chat: chat,
-                contextItem: quotedItem,
+                contextItems: [quotedItem],
                contextIcon: "arrowshape.turn.up.left",
                cancelContextItem: { composeState = composeState.copy(contextItem: .noContextItem) }
            )
@@ -695,18 +702,17 @@ struct ComposeView: View {
        case let .editingItem(chatItem: editingItem):
            ContextItemView(
                chat: chat,
-                contextItem: editingItem,
+                contextItems: [editingItem],
                contextIcon: "pencil",
                cancelContextItem: { clearState() }
            )
            Divider()
-        case let .forwardingItem(chatItem: forwardedItem, _):
+        case let .forwardingItems(chatItems, _):
            ContextItemView(
                chat: chat,
-                contextItem: forwardedItem,
+                contextItems: chatItems,
                contextIcon: "arrowshape.turn.up.forward",
-                cancelContextItem: { composeState = composeState.copy(contextItem: .noContextItem) },
-                showSender: false
+                cancelContextItem: { composeState = composeState.copy(contextItem: .noContextItem) }
            )
            Divider()
        }
@@ -730,10 +736,11 @@ struct ComposeView: View {
        }
        if chat.chatInfo.contact?.nextSendGrpInv ?? false {
            await sendMemberContactInvitation()
-        } else if case let .forwardingItem(ci, fromChatInfo) = composeState.contextItem {
-            sent = await forwardItem(ci, fromChatInfo, ttl)
+        } else if case let .forwardingItems(chatItems, fromChatInfo) = composeState.contextItem {
+            // Composed text is send as a reply to the last forwarded item
+            sent = await forwardItems(chatItems, fromChatInfo, ttl).last
            if !composeState.message.isEmpty {
-                sent = await send(checkLinkPreview(), quoted: sent?.id, live: false, ttl: ttl)
+                _ = await send(checkLinkPreview(), quoted: sent?.id, live: false, ttl: ttl)
            }
        } else if case let .editingItem(ci) = composeState.contextItem {
            sent = await updateMessage(ci, live: live)
@@ -750,27 +757,28 @@ struct ComposeView: View {
                sent = await send(.text(msgText), quoted: quoted, live: live, ttl: ttl)
            case .linkPreview:
                sent = await send(checkLinkPreview(), quoted: quoted, live: live, ttl: ttl)
-            case let .mediaPreviews(mediaPreviews: media):
-                // TODO batch send: batch media previews
+            case let .mediaPreviews(media):
                let last = media.count - 1
+                var msgs: [ComposedMessage] = []
                if last >= 0 {
                    for i in 0..<last {
-                        if case (_, .video(_, _, _)) = media[i] {
-                            sent = await sendVideo(media[i], ttl: ttl)
-                        } else {
-                            sent = await sendImage(media[i], ttl: ttl)
+                        if i > 0 {
+                            // Sleep to allow `progressByTimeout` update be rendered
+                            try? await Task.sleep(nanoseconds: 100_000000)
+                        }
+                        if let (fileSource, msgContent) = mediaContent(media[i], text: "") {
+                            msgs.append(ComposedMessage(fileSource: fileSource, msgContent: msgContent))
                        }
-                        _ = try? await Task.sleep(nanoseconds: 100_000000)
                    }
-                    if case (_, .video(_, _, _)) = media[last] {
-                        sent = await sendVideo(media[last], text: msgText, quoted: quoted, live: live, ttl: ttl)
-                    } else {
-                        sent = await sendImage(media[last], text: msgText, quoted: quoted, live: live, ttl: ttl)
+                    if let (fileSource, msgContent) = mediaContent(media[last], text: msgText) {
+                        msgs.append(ComposedMessage(fileSource: fileSource, quotedItemId: quoted, msgContent: msgContent))
                    }
                }
-                if sent == nil {
-                    sent = await send(.text(msgText), quoted: quoted, live: live, ttl: ttl)
+                if msgs.isEmpty {
+                    msgs = [ComposedMessage(quotedItemId: quoted, msgContent: .text(msgText))]
                }
+                sent = await send(msgs, live: live, ttl: ttl).last
+
            case let .voicePreview(recordingFileName, duration):
                stopPlayback.toggle()
                let file = voiceCryptoFile(recordingFileName)
@@ -792,6 +800,20 @@ struct ComposeView: View {
        }
        return sent

+        func mediaContent(_ media: (String, UploadContent?), text: String) -> (CryptoFile?, MsgContent)? {
+            let (previewImage, uploadContent) = media
+            return switch uploadContent {
+            case let .simpleImage(image):
+                (saveImage(image), .image(text: text, image: previewImage))
+            case let .animatedImage(image):
+                (saveAnimImage(image), .image(text: text, image: previewImage))
+            case let .video(_, url, duration):
+                (moveTempFileFromURL(url), .video(text: text, image: previewImage, duration: duration))
+            case .none:
+                nil
+            }
+        }
+        
        func sending() async {
            await MainActor.run { composeState.inProgress = true }
        }
@@ -855,23 +877,6 @@ struct ComposeView: View {
            }
        }

-        func sendImage(_ imageData: (String, UploadContent?), text: String = "", quoted: Int64? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
-            let (image, data) = imageData
-            if let data = data, let savedFile = saveAnyImage(data) {
-                return await send(.image(text: text, image: image), quoted: quoted, file: savedFile, live: live, ttl: ttl)
-            }
-            return nil
-        }
-
-        func sendVideo(_ imageData: (String, UploadContent?), text: String = "", quoted: Int64? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
-            let (image, data) = imageData
-            if case let .video(_, url, duration) = data, let savedFile = moveTempFileFromURL(url) {
-                ChatModel.shared.filesToDelete.remove(url)
-                return await send(.video(text: text, image: image, duration: duration), quoted: quoted, file: savedFile, live: live, ttl: ttl)
-            }
-            return nil
-        }
-
        func voiceCryptoFile(_ fileName: String) -> CryptoFile? {
            if !privacyEncryptLocalFilesGroupDefault.get() {
                return CryptoFile.plain(fileName)
@@ -888,17 +893,22 @@ struct ComposeView: View {
        }

        func send(_ mc: MsgContent, quoted: Int64?, file: CryptoFile? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
+            await send(
+                [ComposedMessage(fileSource: file, quotedItemId: quoted, msgContent: mc)],
+                live: live,
+                ttl: ttl
+            ).first
+        }
+
+        func send(_ msgs: [ComposedMessage], live: Bool, ttl: Int?) async -> [ChatItem] {
            if let chatItems = chat.chatInfo.chatType == .local
-                ? await apiCreateChatItems(
-                    noteFolderId: chat.chatInfo.apiId,
-                    composedMessages: [ComposedMessage(fileSource: file, msgContent: mc)]
-                )
+                ? await apiCreateChatItems(noteFolderId: chat.chatInfo.apiId, composedMessages: msgs)
                : await apiSendMessages(
                    type: chat.chatInfo.chatType,
                    id: chat.chatInfo.apiId,
                    live: live,
                    ttl: ttl,
-                    composedMessages: [ComposedMessage(fileSource: file, quotedItemId: quoted, msgContent: mc)]
+                    composedMessages: msgs
                ) {
                await MainActor.run {
                    chatModel.removeLiveDummy(animated: false)
@@ -906,33 +916,43 @@ struct ComposeView: View {
                        chatModel.addChatItem(chat.chatInfo, chatItem)
                    }
                }
-                // UI only supports sending one item at a time
-                return chatItems.first
+                return chatItems
            }
-            if let file = file {
-                removeFile(file.filePath)
+            for msg in msgs {
+                if let file = msg.fileSource {
+                    removeFile(file.filePath)
+                }
            }
-            return nil
+            return []
        }

-        func forwardItem(_ forwardedItem: ChatItem, _ fromChatInfo: ChatInfo, _ ttl: Int?) async -> ChatItem? {
+        func forwardItems(_ forwardedItems: [ChatItem], _ fromChatInfo: ChatInfo, _ ttl: Int?) async -> [ChatItem] {
            if let chatItems = await apiForwardChatItems(
                toChatType: chat.chatInfo.chatType,
                toChatId: chat.chatInfo.apiId,
                fromChatType: fromChatInfo.chatType,
                fromChatId: fromChatInfo.apiId,
-                itemIds: [forwardedItem.id],
+                itemIds: forwardedItems.map { $0.id },
                ttl: ttl
            ) {
                await MainActor.run {
                    for chatItem in chatItems {
                        chatModel.addChatItem(chat.chatInfo, chatItem)
                    }
+                    if forwardedItems.count != chatItems.count {
+                        showAlert(
+                            String.localizedStringWithFormat(
+                                NSLocalizedString("%d messages not forwarded", comment: "alert title"),
+                                forwardedItems.count - chatItems.count
+                            ),
+                            message: NSLocalizedString("Messages were deleted after you selected them.", comment: "alert message")
+                        )
+                    }
                }
-                // TODO batch send: forward multiple messages
-                return chatItems.first
+                return chatItems
+            } else {
+                return []
            }
-            return nil
        }

        func checkLinkPreview() -> MsgContent {
@@ -949,14 +969,6 @@ struct ComposeView: View {
                return .text(msgText)
            }
        }
-
-        func saveAnyImage(_ img: UploadContent) -> CryptoFile? {
-            switch img {
-            case let .simpleImage(image): return saveImage(image)
-            case let .animatedImage(image): return saveAnimImage(image)
-            default: return nil
-            }
-        }
    }

    private func startVoiceMessageRecording() async {
@@ -12,7 +12,7 @@ import SimpleXChat
 struct ContextItemView: View {
    @EnvironmentObject var theme: AppTheme
    @ObservedObject var chat: Chat
-    let contextItem: ChatItem
+    let contextItems: [ChatItem]
    let contextIcon: String
    let cancelContextItem: () -> Void
    var showSender: Bool = true
@@ -24,13 +24,22 @@ struct ContextItemView: View {
                .aspectRatio(contentMode: .fit)
                .frame(width: 16, height: 16)
                .foregroundColor(theme.colors.secondary)
-            if showSender, let sender = contextItem.memberDisplayName {
-                VStack(alignment: .leading, spacing: 4) {
-                    Text(sender).font(.caption).foregroundColor(theme.colors.secondary)
-                    msgContentView(lines: 2)
-                }
+            if let singleItem = contextItems.first, contextItems.count == 1 {
+                if showSender, let sender = singleItem.memberDisplayName {
+                     VStack(alignment: .leading, spacing: 4) {
+                         Text(sender).font(.caption).foregroundColor(theme.colors.secondary)
+                         msgContentView(lines: 2, contextItem: singleItem)
+                     }
+                 } else {
+                     msgContentView(lines: 3, contextItem: singleItem)
+                 }
            } else {
-                msgContentView(lines: 3)
+                Text(
+                    chat.chatInfo.chatType == .local
+                    ? "Saving \(contextItems.count) messages"
+                    : "Forwarding \(contextItems.count) messages"
+                )
+                .italic()
            }
            Spacer()
            Button {
@@ -45,23 +54,32 @@ struct ContextItemView: View {
        .padding(12)
        .frame(minHeight: 54)
        .frame(maxWidth: .infinity)
-        .background(chatItemFrameColor(contextItem, theme))
+        .background(background)
    }

-    private func msgContentView(lines: Int) -> some View {
-        contextMsgPreview()
+    private var background: Color {
+        contextItems.first
+            .map { chatItemFrameColor($0, theme) }
+            ?? Color(uiColor: .tertiarySystemBackground)
+    }
+
+    private func msgContentView(lines: Int, contextItem: ChatItem) -> some View {
+        contextMsgPreview(contextItem)
            .multilineTextAlignment(isRightToLeft(contextItem.text) ? .trailing : .leading)
            .lineLimit(lines)
    }

-    private func contextMsgPreview() -> Text {
+    private func contextMsgPreview(_ contextItem: ChatItem) -> Text {
        return attachment() + messageText(contextItem.text, contextItem.formattedText, nil, preview: true, showSecrets: false, secondaryColor: theme.colors.secondary)

        func attachment() -> Text {
+            let isFileLoaded = if let fileSource = getLoadedFileSource(contextItem.file) {
+                FileManager.default.fileExists(atPath: getAppFilePath(fileSource.filePath).path)
+            } else { false }
            switch contextItem.content.msgContent {
-            case .file: return image("doc.fill")
+            case .file: return isFileLoaded ? image("doc.fill") : Text("")
            case .image: return image("photo")
-            case .voice: return image("play.fill")
+            case .voice: return isFileLoaded ? image("play.fill") : Text("")
            default: return Text("")
            }
        }
@@ -75,6 +93,6 @@ struct ContextItemView: View {
 struct ContextItemView_Previews: PreviewProvider {
    static var previews: some View {
        let contextItem: ChatItem = ChatItem.getSample(1, .directSnd, .now, "hello")
-        return ContextItemView(chat: Chat.sampleData, contextItem: contextItem, contextIcon: "pencil.circle", cancelContextItem: {})
+        return ContextItemView(chat: Chat.sampleData, contextItems: [contextItem], contextIcon: "pencil.circle", cancelContextItem: {})
    }
 }
@@ -40,7 +40,7 @@ struct SendMessageView: View {
    @State private var showCustomTimePicker = false
    @State private var selectedDisappearingMessageTime: Int? = customDisappearingMessageTimeDefault.get()
    @State private var progressByTimeout = false
-    @AppStorage(DEFAULT_LIVE_MESSAGE_ALERT_SHOWN) private var liveMessageAlertShown = false
+    @UserDefault(DEFAULT_LIVE_MESSAGE_ALERT_SHOWN) private var liveMessageAlertShown = false

    var body: some View {
        ZStack {
@@ -227,6 +227,7 @@ struct SendMessageView: View {
           !composeState.editing {
            if case .noContextItem = composeState.contextItem,
               !composeState.voicePreview,
+               !composeState.manyMediaPreviews,
               let send = sendLiveMessage,
               let update = updateLiveMessage {
                Button {
@@ -105,8 +105,10 @@ struct AddGroupMembersViewCommon: View {
                            .padding(.leading, 2)
                        let s = searchText.trimmingCharacters(in: .whitespaces).localizedLowercase
                        let members = s == "" ? membersToAdd : membersToAdd.filter { $0.chatViewName.localizedLowercase.contains(s) }
-                        ForEach(members) { contact in
-                            contactCheckView(contact)
+                        ForEach(members + [dummyContact]) { contact in
+                            if contact.contactId != dummyContact.contactId {
+                                contactCheckView(contact)
+                            }
                        }
                    }
                }
@@ -130,6 +132,14 @@ struct AddGroupMembersViewCommon: View {
        .modifier(ThemedBackground(grouped: true))
    }

+    // Resolves keyboard losing focus bug in iOS16 and iOS17,
+    // when there are no items inside `ForEach(memebers)` loop
+    private let dummyContact: Contact = {
+        var dummy = Contact.sampleData
+        dummy.contactId = -1
+        return dummy
+    }()
+
    private func inviteMembersButton() -> some View {
        Button {
            inviteMembers()
@@ -18,6 +18,7 @@ struct GroupMemberInfoView: View {
    var navigation: Bool = false
    @State private var connectionStats: ConnectionStats? = nil
    @State private var connectionCode: String? = nil
+    @State private var connectionLoaded: Bool = false
    @State private var newRole: GroupMemberRole = .member
    @State private var alert: GroupMemberInfoViewAlert?
    @State private var sheet: PlanAndConnectActionSheet?
@@ -94,129 +95,137 @@ struct GroupMemberInfoView: View {
                    .listRowSeparator(.hidden)
                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))

-                if member.memberActive {
-                    Section {
-                        if let code = connectionCode { verifyCodeButton(code) }
-                        if let connStats = connectionStats,
-                            connStats.ratchetSyncAllowed {
-                            synchronizeConnectionButton()
-                        }
-                        // } else if developerTools {
-                        //     synchronizeConnectionButtonForce()
-                        // }
-                    }
-                }
+                if connectionLoaded {

-                if let contactLink = member.contactLink {
-                    Section {
-                        SimpleXLinkQRCode(uri: contactLink)
-                        Button {
-                            showShareSheet(items: [simplexChatLink(contactLink)])
-                        } label: {
-                            Label("Share address", systemImage: "square.and.arrow.up")
+                    if member.memberActive {
+                        Section {
+                            if let code = connectionCode { verifyCodeButton(code) }
+                            if let connStats = connectionStats,
+                               connStats.ratchetSyncAllowed {
+                                synchronizeConnectionButton()
+                            }
+                            // } else if developerTools {
+                            //     synchronizeConnectionButtonForce()
+                            // }
                        }
-                        if let contactId = member.memberContactId {
-                            if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
+                    }
+
+                    if let contactLink = member.contactLink {
+                        Section {
+                            SimpleXLinkQRCode(uri: contactLink)
+                            Button {
+                                showShareSheet(items: [simplexChatLink(contactLink)])
+                            } label: {
+                                Label("Share address", systemImage: "square.and.arrow.up")
+                            }
+                            if let contactId = member.memberContactId {
+                                if knownDirectChat(contactId) == nil && !groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
+                                    connectViaAddressButton(contactLink)
+                                }
+                            } else {
                                connectViaAddressButton(contactLink)
                            }
-                        } else {
-                            connectViaAddressButton(contactLink)
+                        } header: {
+                            Text("Address")
+                                .foregroundColor(theme.colors.secondary)
+                        } footer: {
+                            Text("You can share this address with your contacts to let them connect with **\(member.displayName)**.")
+                                .foregroundColor(theme.colors.secondary)
                        }
-                    } header: {
-                        Text("Address")
-                            .foregroundColor(theme.colors.secondary)
-                    } footer: {
-                        Text("You can share this address with your contacts to let them connect with **\(member.displayName)**.")
-                            .foregroundColor(theme.colors.secondary)
                    }
-                }

-                Section(header: Text("Member").foregroundColor(theme.colors.secondary)) {
-                    infoRow("Group", groupInfo.displayName)
+                    Section(header: Text("Member").foregroundColor(theme.colors.secondary)) {
+                        infoRow("Group", groupInfo.displayName)

-                    if let roles = member.canChangeRoleTo(groupInfo: groupInfo) {
-                        Picker("Change role", selection: $newRole) {
-                            ForEach(roles) { role in
-                                Text(role.text)
+                        if let roles = member.canChangeRoleTo(groupInfo: groupInfo) {
+                            Picker("Change role", selection: $newRole) {
+                                ForEach(roles) { role in
+                                    Text(role.text)
+                                }
                            }
+                            .frame(height: 36)
+                        } else {
+                            infoRow("Role", member.memberRole.text)
                        }
-                        .frame(height: 36)
-                    } else {
-                        infoRow("Role", member.memberRole.text)
                    }
-                }

-                if let connStats = connectionStats {
-                    Section(header: Text("Servers").foregroundColor(theme.colors.secondary)) {
-                        // TODO network connection status
-                        Button("Change receiving address") {
-                            alert = .switchAddressAlert
-                        }
-                        .disabled(
-                            connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
-                            || connStats.ratchetSyncSendProhibited
-                        )
-                        if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
-                            Button("Abort changing address") {
-                                alert = .abortSwitchAddressAlert
+                    if let connStats = connectionStats {
+                        Section(header: Text("Servers").foregroundColor(theme.colors.secondary)) {
+                            // TODO network connection status
+                            Button("Change receiving address") {
+                                alert = .switchAddressAlert
                            }
                            .disabled(
-                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch }
+                                connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil }
                                || connStats.ratchetSyncSendProhibited
                            )
+                            if connStats.rcvQueuesInfo.contains(where: { $0.rcvSwitchStatus != nil }) {
+                                Button("Abort changing address") {
+                                    alert = .abortSwitchAddressAlert
+                                }
+                                .disabled(
+                                    connStats.rcvQueuesInfo.contains { $0.rcvSwitchStatus != nil && !$0.canAbortSwitch }
+                                    || connStats.ratchetSyncSendProhibited
+                                )
+                            }
+                            smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer }, theme.colors.secondary)
+                            smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer }, theme.colors.secondary)
                        }
-                        smpServers("Receiving via", connStats.rcvQueuesInfo.map { $0.rcvServer }, theme.colors.secondary)
-                        smpServers("Sending via", connStats.sndQueuesInfo.map { $0.sndServer }, theme.colors.secondary)
                    }
-                }

-                if groupInfo.membership.memberRole >= .admin {
-                    adminDestructiveSection(member)
-                } else {
-                    nonAdminBlockSection(member)
-                }
+                    if groupInfo.membership.memberRole >= .admin {
+                        adminDestructiveSection(member)
+                    } else {
+                        nonAdminBlockSection(member)
+                    }

-                if developerTools {
-                    Section(header: Text("For console").foregroundColor(theme.colors.secondary)) {
-                        infoRow("Local name", member.localDisplayName)
-                        infoRow("Database ID", "\(member.groupMemberId)")
-                        if let conn = member.activeConn {
-                            let connLevelDesc = conn.connLevel == 0 ? NSLocalizedString("direct", comment: "connection level description") : String.localizedStringWithFormat(NSLocalizedString("indirect (%d)", comment: "connection level description"), conn.connLevel)
-                            infoRow("Connection", connLevelDesc)
-                        }
-                        Button ("Debug delivery") {
-                            Task {
-                                do {
-                                    let info = queueInfoText(try await apiGroupMemberQueueInfo(groupInfo.apiId, member.groupMemberId))
-                                    await MainActor.run { alert = .queueInfo(info: info) }
-                                } catch let e {
-                                    logger.error("apiContactQueueInfo error: \(responseError(e))")
-                                    let a = getErrorAlert(e, "Error")
-                                    await MainActor.run { alert = .error(title: a.title, error: a.message) }
+                    if developerTools {
+                        Section(header: Text("For console").foregroundColor(theme.colors.secondary)) {
+                            infoRow("Local name", member.localDisplayName)
+                            infoRow("Database ID", "\(member.groupMemberId)")
+                            if let conn = member.activeConn {
+                                let connLevelDesc = conn.connLevel == 0 ? NSLocalizedString("direct", comment: "connection level description") : String.localizedStringWithFormat(NSLocalizedString("indirect (%d)", comment: "connection level description"), conn.connLevel)
+                                infoRow("Connection", connLevelDesc)
+                            }
+                            Button ("Debug delivery") {
+                                Task {
+                                    do {
+                                        let info = queueInfoText(try await apiGroupMemberQueueInfo(groupInfo.apiId, member.groupMemberId))
+                                        await MainActor.run { alert = .queueInfo(info: info) }
+                                    } catch let e {
+                                        logger.error("apiContactQueueInfo error: \(responseError(e))")
+                                        let a = getErrorAlert(e, "Error")
+                                        await MainActor.run { alert = .error(title: a.title, error: a.message) }
+                                    }
                                }
                            }
                        }
                    }
+
                }
            }
            .navigationBarHidden(true)
-            .onAppear {
+            .task {
                if #unavailable(iOS 16) {
                    // this condition prevents re-setting picker
                    if !justOpened { return }
                }
                justOpened = false
-                DispatchQueue.main.async {
-                    newRole = member.memberRole
-                    do {
-                        let (_, stats) = try apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
-                        let (mem, code) = member.memberActive ? try apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
+                newRole = member.memberRole
+                do {
+                    let (_, stats) = try await apiGroupMemberInfo(groupInfo.apiId, member.groupMemberId)
+                    let (mem, code) = member.memberActive ? try await apiGetGroupMemberCode(groupInfo.apiId, member.groupMemberId) : (member, nil)
+                    await MainActor.run {
                        _ = chatModel.upsertGroupMember(groupInfo, mem)
                        connectionStats = stats
                        connectionCode = code
-                    } catch let error {
-                        logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
+                        connectionLoaded = true
                    }
+                } catch let error {
+                    await MainActor.run {
+                        connectionLoaded = true
+                    }
+                    logger.error("apiGroupMemberInfo or apiGetGroupMemberCode error: \(responseError(error))")
                }
            }
            .onChange(of: newRole) { newRole in
@@ -110,10 +110,13 @@ struct GroupProfileView: View {
            }
        }
        .onChange(of: chosenImage) { image in
-            if let image = image {
-                groupProfile.image = resizeImageToStrSize(cropToSquare(image), maxDataSize: 12500)
-            } else {
-                groupProfile.image = nil
+            Task {
+                let resized: String? = if let image {
+                    await resizeImageToStrSize(cropToSquare(image), maxDataSize: 12500)
+                } else {
+                    nil
+                }
+                await MainActor.run { groupProfile.image = resized }
            }
        }
        .onAppear {
@@ -12,14 +12,15 @@ import SimpleXChat

 /// A List, which displays it's items in reverse order - from bottom to top
 struct ReverseList<Content: View>: UIViewControllerRepresentable {
-    let items: Array<ChatItem>
+    let groups: SectionGroups

    @Binding var scrollState: ReverseListScrollModel.State
+    @Binding var initialChatItem: ChatItem?

    /// Closure, that returns user interface for a given item
-    let content: (ChatItem) -> Content
+    let content: (ListItem) -> Content

-    let loadPage: () -> Void
+    let loadPage: (_ pagination: ChatPagination) -> Void

    func makeUIViewController(context: Context) -> Controller {
        Controller(representer: self)
@@ -27,18 +28,18 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {

    func updateUIViewController(_ controller: Controller, context: Context) {
        controller.representer = self
-        if case let .scrollingTo(destination) = scrollState, !items.isEmpty {
+        if case let .scrollingTo(destination) = scrollState, !groups.sections.isEmpty {
            controller.view.layer.removeAllAnimations()
            switch destination {
            case .nextPage:
                controller.scrollToNextPage()
            case let .item(id):
-                controller.scroll(to: items.firstIndex(where: { $0.id == id }), position: .bottom)
+                controller.scroll(to: getIndexInParentItems(sections: groups.sections, itemId: id), position: .bottom)
            case .bottom:
                controller.scroll(to: 0, position: .top)
            }
        } else {
-            controller.update(items: items)
+            controller.update(groups: groups)
        }
    }

@@ -46,10 +47,11 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
    class Controller: UITableViewController {
        private enum Section { case main }
        var representer: ReverseList
-        private var dataSource: UITableViewDiffableDataSource<Section, ChatItem>!
+        private var dataSource: UITableViewDiffableDataSource<Section, ListItem>!
        private var itemCount: Int = 0
        private let updateFloatingButtons = PassthroughSubject<Void, Never>()
        private var bag = Set<AnyCancellable>()
+        private var revealedItems: Array<ListItem> = []

        init(representer: ReverseList) {
            self.representer = representer
@@ -75,11 +77,16 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
            }

            // 3. Configure data source
-            self.dataSource = UITableViewDiffableDataSource<Section, ChatItem>(
+            self.dataSource = UITableViewDiffableDataSource<Section, ListItem>(
                tableView: tableView
            ) { (tableView, indexPath, item) -> UITableViewCell? in
-                if indexPath.item > self.itemCount - 8, self.itemCount > 8 {
-                    self.representer.loadPage()
+                if self.representer.scrollState == .atDestination, self.representer.initialChatItem == nil {
+                    if indexPath.item > self.itemCount - preloadItem,
+                       let item = getNewestItemAtParentIndexOrNull(sections: self.representer.groups.sections, parentIndex: self.itemCount - 1) {
+                        self.representer.loadPage(.before(chatItemId: item.id, count: loadItemsPerPage))
+                    } else if let item = self.getFirstItemAfterPlacholder(indexPath) {
+                        self.representer.loadPage(.after(chatItemId: item.id, count: loadItemsPerPage))
+                    }
                }
                let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseId, for: indexPath)
                if #available(iOS 16.0, *) {
@@ -107,9 +114,14 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
                    name: notificationName,
                    object: nil
                )
+
            updateFloatingButtons
-                .throttle(for: 0.2, scheduler: DispatchQueue.main, latest: true)
-                .sink { self.updateVisibleItems() }
+                .throttle(for: 0.2, scheduler: DispatchQueue.global(qos: .background), latest: true)
+                .sink {
+                    if let listState = DispatchQueue.main.sync(execute: { [weak self] in self?.getListState() }) {
+                        ChatView.FloatingButtonModel.shared.updateOnListChange(listState)
+                    }
+                }
                .store(in: &bag)
        }

@@ -144,6 +156,29 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
            tableView.clipsToBounds = false
            parent?.viewIfLoaded?.clipsToBounds = false
        }
+        
+        override func viewDidLayoutSubviews() {
+            super.viewDidLayoutSubviews()
+            if let cItem = self.representer.initialChatItem {
+                let index = getIndexInParentItems(sections: self.representer.groups.sections, itemId: cItem.id)
+                
+                if index == -1 {
+                    return
+                }
+                let indexPath = IndexPath(row: index, section: 0)
+                if !isVisible(indexPath: indexPath) {
+                    if tableView.numberOfRows(inSection: indexPath.section) > indexPath.row {
+                        let cellRect = tableView.rectForRow(at: indexPath)
+                        tableView.setContentOffset(CGPoint(x: 0, y: cellRect.maxY - tableView.bounds.height), animated: false)
+                    }
+                }
+                Task {
+                    DispatchQueue.main.async {
+                        self.representer.initialChatItem = nil
+                    }
+                }
+            }
+        }

        /// Scrolls up
        func scrollToNextPage() {
@@ -164,6 +199,7 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
            if #available(iOS 16.0, *) {
                animated = true
            }
+
            if let index, tableView.numberOfRows(inSection: 0) != 0 {
                tableView.scrollToRow(
                    at: IndexPath(row: index, section: 0),
@@ -176,18 +212,49 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
                    animated: animated
                )
            }
-            Task { representer.scrollState = .atDestination }
+            
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                Task {
+                    self.representer.scrollState = .atDestination
+                }
+            }
        }

-        func update(items: [ChatItem]) {
-            var snapshot = NSDiffableDataSourceSnapshot<Section, ChatItem>()
+        func update(groups: SectionGroups) {
+            var snapshot = NSDiffableDataSourceSnapshot<Section, ListItem>()
+            revealedItems.removeAll()
+            groups.sections.forEach { sc in
+                if sc.revealed {
+                    revealedItems.append(contentsOf: sc.items)
+                } else if let item = sc.items.first {
+                    revealedItems.append(item)
+                }
+            }
            snapshot.appendSections([.main])
-            snapshot.appendItems(items)
+            snapshot.appendItems(revealedItems, toSection: .main)
            dataSource.defaultRowAnimation = .none
-            dataSource.apply(
-                snapshot,
-                animatingDifferences: itemCount != 0 && abs(items.count - itemCount) == 1
-            )
+            
+            let countDiff = max(0, revealedItems.count - itemCount)
+            if tableView.contentOffset.y == 100, itemCount < revealedItems.count, itemCount > 0 {
+                dataSource.apply(
+                    snapshot,
+                    animatingDifferences: false
+                )
+                
+                tableView.scrollToRow(
+                    at: IndexPath(row: countDiff, section: 0),
+                    at: .top,
+                    animated: false
+                )
+            } else {
+                tableView.beginUpdates()
+                dataSource.apply(
+                    snapshot,
+                    animatingDifferences: false
+                )
+                tableView.endUpdates()
+            }
+
            // Sets content offset on initial load
            if itemCount == 0 {
                tableView.setContentOffset(
@@ -195,7 +262,7 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
                    animated: false
                )
            }
-            itemCount = items.count
+            itemCount = revealedItems.count
            updateFloatingButtons.send()
        }

@@ -203,25 +270,40 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
            updateFloatingButtons.send()
        }

-        private func updateVisibleItems() {
-            let fbm = ChatView.FloatingButtonModel.shared
-            fbm.scrollOffset.send(tableView.contentOffset.y + InvertedTableView.inset)
-            fbm.visibleItems.send(
-                (tableView.indexPathsForVisibleRows ?? [])
-                    .compactMap { indexPath -> String? in
-                        guard let relativeFrame = tableView.superview?.convert(
-                            tableView.rectForRow(at: indexPath),
-                            from: tableView
-                        ) else { return nil }
-                        // Checks that the cell is visible accounting for the added insets
-                        let isVisible =
-                            relativeFrame.maxY > InvertedTableView.inset &&
-                            relativeFrame.minY < tableView.frame.height - InvertedTableView.inset
-                        return indexPath.item < representer.items.count && isVisible
-                        ? representer.items[indexPath.item].viewId
-                        : nil
+        func getListState() -> ListState? {
+            if let visibleRows = tableView.indexPathsForVisibleRows,
+               visibleRows.last?.item ?? 0 < revealedItems.count {
+                let scrollOffset: Double = tableView.contentOffset.y + InvertedTableView.inset
+                
+                let topItemDate: Date? =
+                    if let lastVisible = visibleRows.last(where: { isVisible(indexPath: $0) }) {
+                        revealedItems[lastVisible.item].item.meta.itemTs
+                    } else {
+                        nil
                    }
-            )
+                let bottomItemId: ChatItem.ID? =
+                    if let firstVisible = visibleRows.first(where: { isVisible(indexPath: $0) }) {
+                        revealedItems[firstVisible.item].item.id
+                    } else {
+                        nil
+                    }
+                return (scrollOffset: scrollOffset, topItemDate: topItemDate, bottomItemId: bottomItemId)
+            }
+            return nil
+        }
+        
+        private func isVisible(indexPath: IndexPath) -> Bool {
+            if let relativeFrame = tableView.superview?.convert(
+                tableView.rectForRow(at: indexPath),
+                from: tableView
+            ) {
+                relativeFrame.maxY > InvertedTableView.inset &&
+                relativeFrame.minY < tableView.frame.height - InvertedTableView.inset
+            } else { false }
+        }
+        
+        private func getFirstItemAfterPlacholder(_ indexPath: IndexPath) -> ChatItem? {
+            return nil
        }
    }

@@ -265,6 +347,12 @@ struct ReverseList<Content: View>: UIViewControllerRepresentable {
    }
 }

+typealias ListState = (
+    scrollOffset: Double,
+    topItemDate: Date?,
+    bottomItemId: ChatItem.ID?
+)
+
 /// Manages ``ReverseList`` scrolling
 class ReverseListScrollModel: ObservableObject {
    /// Represents Scroll State of ``ReverseList``
@@ -32,13 +32,17 @@ struct SelectedItemsBottomToolbar: View {
    var deleteItems: (Bool) -> Void
    var moderateItems: () -> Void
    //var shareItems: () -> Void
+    var forwardItems: () -> Void
    @State var deleteEnabled: Bool = false
    @State var deleteForEveryoneEnabled: Bool = false

    @State var canModerate: Bool = false
    @State var moderateEnabled: Bool = false

-    @State var allButtonsDisabled = false
+    @State var forwardEnabled: Bool = false
+
+    @State var deleteCountProhibited = false
+    @State var forwardCountProhibited = false

    var body: some View {
        VStack(spacing: 0) {
@@ -50,10 +54,11 @@ struct SelectedItemsBottomToolbar: View {
                } label: {
                    Image(systemName: "trash")
                        .resizable()
+                        .scaledToFit()
                        .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!deleteEnabled || allButtonsDisabled ? theme.colors.secondary: .red)
+                        .foregroundColor(!deleteEnabled || deleteCountProhibited ? theme.colors.secondary: .red)
                }
-                .disabled(!deleteEnabled || allButtonsDisabled)
+                .disabled(!deleteEnabled || deleteCountProhibited)

                Spacer()
                Button {
@@ -61,24 +66,24 @@ struct SelectedItemsBottomToolbar: View {
                } label: {
                    Image(systemName: "flag")
                        .resizable()
+                        .scaledToFit()
                        .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(!moderateEnabled || allButtonsDisabled ? theme.colors.secondary : .red)
+                        .foregroundColor(!moderateEnabled || deleteCountProhibited ? theme.colors.secondary : .red)
                }
-                .disabled(!moderateEnabled || allButtonsDisabled)
+                .disabled(!moderateEnabled || deleteCountProhibited)
                .opacity(canModerate ? 1 : 0)

-
                Spacer()
                Button {
-                    //shareItems()
+                    forwardItems()
                } label: {
-                    Image(systemName: "square.and.arrow.up")
+                    Image(systemName: "arrowshape.turn.up.forward")
                        .resizable()
+                        .scaledToFit()
                        .frame(width: 20, height: 20, alignment: .center)
-                        .foregroundColor(allButtonsDisabled ? theme.colors.secondary : theme.colors.primary)
+                        .foregroundColor(!forwardEnabled || forwardCountProhibited ? theme.colors.secondary : theme.colors.primary)
                }
-                .disabled(allButtonsDisabled)
-                .opacity(0)
+                .disabled(!forwardEnabled || forwardCountProhibited)
            }
            .frame(maxHeight: .infinity)
            .padding([.leading, .trailing], 12)
@@ -101,20 +106,22 @@ struct SelectedItemsBottomToolbar: View {

    private func recheckItems(_ chatInfo: ChatInfo, _ chatItems: [ChatItem], _ selectedItems: Set<Int64>?) {
        let count = selectedItems?.count ?? 0
-        allButtonsDisabled = count == 0 || count > 20
+        deleteCountProhibited = count == 0 || count > 200
+        forwardCountProhibited = count == 0 || count > 20
        canModerate = possibleToModerate(chatInfo)
        if let selected = selectedItems {
            let me: Bool
            let onlyOwnGroupItems: Bool
-            (deleteEnabled, deleteForEveryoneEnabled, me, onlyOwnGroupItems, selectedChatItems) = chatItems.reduce((true, true, true, true, [])) { (r, ci) in
+            (deleteEnabled, deleteForEveryoneEnabled, me, onlyOwnGroupItems, forwardEnabled, selectedChatItems) = chatItems.reduce((true, true, true, true, true, [])) { (r, ci) in
                if selected.contains(ci.id) {
-                    var (de, dee, me, onlyOwnGroupItems, sel) = r
+                    var (de, dee, me, onlyOwnGroupItems, fe, sel) = r
                    de = de && ci.canBeDeletedForSelf
                    dee = dee && ci.meta.deletable && !ci.localNote
                    onlyOwnGroupItems = onlyOwnGroupItems && ci.chatDir == .groupSnd
                    me = me && ci.content.msgContent != nil && ci.memberToModerate(chatInfo) != nil
+                    fe = fe && ci.content.msgContent != nil && ci.meta.itemDeleted == nil && !ci.isLiveDummy
                    sel.insert(ci.id) // we are collecting new selected items here to account for any changes in chat items list
-                    return (de, dee, me, onlyOwnGroupItems, sel)
+                    return (de, dee, me, onlyOwnGroupItems, fe, sel)
                } else {
                    return r
                }
@@ -10,7 +10,7 @@ import SwiftUI

 struct ChatHelp: View {
    @EnvironmentObject var chatModel: ChatModel
-    @Binding var showSettings: Bool
+    let dismissSettingsSheet: DismissAction

    var body: some View {
        ScrollView { chatHelp() }
@@ -23,7 +23,7 @@ struct ChatHelp: View {
            VStack(alignment: .leading, spacing: 0) {
                Text("To ask any questions and to receive updates:")
                Button("connect to SimpleX Chat developers.") {
-                    showSettings = false
+                    dismissSettingsSheet()
                    DispatchQueue.main.async {
                        UIApplication.shared.open(simplexTeamURL)
                    }
@@ -61,8 +61,9 @@ struct ChatHelp: View {
 }

 struct ChatHelp_Previews: PreviewProvider {
+    @Environment(\.dismiss) static var mockDismiss
+
    static var previews: some View {
-        @State var showSettings = false
-        return ChatHelp(showSettings: $showSettings)
+        ChatHelp(dismissSettingsSheet: mockDismiss)
    }
 }
@@ -9,18 +9,87 @@
 import SwiftUI
 import SimpleXChat

+enum UserPickerSheet: Identifiable {
+    case address
+    case chatPreferences
+    case chatProfiles
+    case currentProfile
+    case useFromDesktop
+    case settings
+
+    var id: Self { self }
+
+    var navigationTitle: LocalizedStringKey {
+        switch self {
+        case .address: "SimpleX address"
+        case .chatPreferences: "Your preferences"
+        case .chatProfiles: "Your chat profiles"
+        case .currentProfile: "Your current profile"
+        case .useFromDesktop: "Connect to desktop"
+        case .settings: "Your settings"
+        }
+    }
+}
+
+struct UserPickerSheetView: View {
+    let sheet: UserPickerSheet
+    @EnvironmentObject var chatModel: ChatModel
+    @State private var loaded = false
+
+    var body: some View {
+        NavigationView {
+            ZStack {
+                if loaded, let currentUser = chatModel.currentUser {
+                    switch sheet {
+                    case .address:
+                        UserAddressView(shareViaProfile: currentUser.addressShared)
+                    case .chatPreferences:
+                        PreferencesView(
+                            profile: currentUser.profile,
+                            preferences: currentUser.fullPreferences,
+                            currentPreferences: currentUser.fullPreferences
+                        )
+                    case .chatProfiles:
+                        UserProfilesView()
+                    case .currentProfile:
+                        UserProfile()
+                    case .useFromDesktop:
+                        ConnectDesktopView()
+                    case .settings:
+                        SettingsView()
+                    }
+                }
+                Color.clear // Required for list background to be rendered during loading
+            }
+            .navigationTitle(sheet.navigationTitle)
+            .navigationBarTitleDisplayMode(.large)
+            .modifier(ThemedBackground(grouped: true))
+        }
+        .overlay {
+            if let la = chatModel.laRequest {
+                LocalAuthView(authRequest: la)
+            }
+        }
+        .task {
+            withAnimation(
+                .easeOut(duration: 0.1),
+                { loaded = true }
+            )
+        }
+    }
+}
+
 struct ChatListView: View {
    @EnvironmentObject var chatModel: ChatModel
    @EnvironmentObject var theme: AppTheme
-    @Binding var showSettings: Bool
+    @Binding var activeUserPickerSheet: UserPickerSheet?
    @State private var searchMode = false
    @FocusState private var searchFocussed
    @State private var searchText = ""
    @State private var searchShowingSimplexLink = false
    @State private var searchChatFilteredBySimplexLink: String? = nil
-    @State private var userPickerVisible = false
-    @State private var showConnectDesktop = false
    @State private var scrollToSearchBar = false
+    @State private var userPickerShown: Bool = false

    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
    @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
@@ -46,21 +115,23 @@ struct ChatListView: View {
                ),
                destination: chatView
            ) { chatListView }
-            if userPickerVisible {
-                Rectangle().fill(.white.opacity(0.001)).onTapGesture {
-                    withAnimation {
-                        userPickerVisible.toggle()
-                    }
+        }
+        .modifier(
+            Sheet(isPresented: $userPickerShown) {
+                UserPicker(userPickerShown: $userPickerShown, activeSheet: $activeUserPickerSheet)
+            }
+        )
+        .appSheet(
+            item: $activeUserPickerSheet,
+            onDismiss: { chatModel.laRequest = nil },
+            content: { UserPickerSheetView(sheet: $0) }
+        )
+        .onChange(of: activeUserPickerSheet) {
+            if $0 != nil {
+                DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
+                    userPickerShown = false
                }
            }
-            UserPicker(
-                showSettings: $showSettings,
-                showConnectDesktop: $showConnectDesktop,
-                userPickerVisible: $userPickerVisible
-            )
-        }
-        .sheet(isPresented: $showConnectDesktop) {
-            ConnectDesktopView()
        }
    }

@@ -73,7 +144,7 @@ struct ChatListView: View {
                .navigationBarHidden(searchMode || oneHandUI)
        }
        .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
-        .onDisappear() { withAnimation { userPickerVisible = false } }
+        .onDisappear() { activeUserPickerSheet = nil }
        .refreshable {
            AlertManager.shared.showAlert(Alert(
                title: Text("Reconnect servers?"),
@@ -164,7 +235,7 @@ struct ChatListView: View {
        let user = chatModel.currentUser ?? User.sampleData
        ZStack(alignment: .topTrailing) {
            ProfileImage(imageStr: user.image, size: 32, color: Color(uiColor: .quaternaryLabel))
-                .padding(.trailing, 4)
+                .padding([.top, .trailing], 3)
            let allRead = chatModel.users
                .filter { u in !u.user.activeUser && !u.user.hidden }
                .allSatisfy { u in u.unreadCount == 0 }
@@ -173,13 +244,7 @@ struct ChatListView: View {
            }
        }
        .onTapGesture {
-            if chatModel.users.filter({ u in u.user.activeUser || !u.user.hidden }).count > 1 {
-                withAnimation {
-                    userPickerVisible.toggle()
-                }
-            } else {
-                showSettings = true
-            }
+            userPickerShown = true
        }
    }

@@ -269,7 +334,7 @@ struct ChatListView: View {
        }
    }

-    private func unreadBadge(_ text: Text? = Text(" "), size: CGFloat = 18) -> some View {
+    private func unreadBadge(size: CGFloat = 18) -> some View {
        Circle()
            .frame(width: size, height: size)
            .foregroundColor(theme.colors.primary)
@@ -374,7 +439,7 @@ struct SubsStatusIndicator: View {
    private func startTask() {
        task = Task {
            while !Task.isCancelled {
-                if AppChatState.shared.value == .active {
+                if AppChatState.shared.value == .active, ChatModel.shared.chatRunning == true {
                    do {
                        let (subs, hasSess) = try await getAgentSubsTotal()
                        await MainActor.run {
@@ -516,6 +581,8 @@ func chatStoppedIcon() -> some View {
 }

 struct ChatListView_Previews: PreviewProvider {
+    @State static var userPickerSheet: UserPickerSheet? = .none
+
    static var previews: some View {
        let chatModel = ChatModel()
        chatModel.updateChats([
@@ -534,9 +601,9 @@ struct ChatListView_Previews: PreviewProvider {

        ])
        return Group {
-            ChatListView(showSettings: Binding.constant(false))
+            ChatListView(activeUserPickerSheet: $userPickerSheet)
                .environmentObject(chatModel)
-            ChatListView(showSettings: Binding.constant(false))
+            ChatListView(activeUserPickerSheet: $userPickerSheet)
                .environmentObject(ChatModel())
        }
    }
@@ -35,11 +35,16 @@ struct ChatPreviewView: View {
            }
            .padding(.leading, 4)

+            let chatTs = if let cItem {
+                cItem.meta.itemTs
+            } else {
+                chat.chatInfo.chatTs
+            }
            VStack(spacing: 0) {
                HStack(alignment: .top) {
                    chatPreviewTitle()
                    Spacer()
-                    (cItem?.timestampText ?? formatTimestampText(chat.chatInfo.chatTs))
+                    (formatTimestampText(chatTs))
                        .font(.subheadline)
                        .frame(minWidth: 60, alignment: .trailing)
                        .foregroundColor(theme.colors.secondary)
@@ -302,7 +307,7 @@ struct ChatPreviewView: View {
        case let .link(_, preview):
            smallContentPreview(size: dynamicMediaSize) {
                ZStack(alignment: .topTrailing) {
-                    Image(uiImage: UIImage(base64Encoded: preview.image) ?? UIImage(systemName: "arrow.up.right")!)
+                    Image(uiImage: imageFromBase64(preview.image) ?? UIImage(systemName: "arrow.up.right")!)
                        .resizable()
                        .aspectRatio(contentMode: .fill)
                        .frame(width: dynamicMediaSize, height: dynamicMediaSize)
@@ -323,12 +328,12 @@ struct ChatPreviewView: View {
            }
        case let .image(_, image):
            smallContentPreview(size: dynamicMediaSize) {
-                CIImageView(chatItem: ci, preview: UIImage(base64Encoded: image), maxWidth: dynamicMediaSize, smallView: true, showFullScreenImage: $showFullscreenGallery)
+                CIImageView(chatItem: ci, preview: imageFromBase64(image), maxWidth: dynamicMediaSize, smallView: true, showFullScreenImage: $showFullscreenGallery)
                    .environmentObject(ReverseListScrollModel())
            }
        case let .video(_,image, duration):
            smallContentPreview(size: dynamicMediaSize) {
-                CIVideoView(chatItem: ci, preview: UIImage(base64Encoded: image), duration: duration, maxWidth: dynamicMediaSize, videoWidth: nil, smallView: true, showFullscreenPlayer: $showFullscreenGallery)
+                CIVideoView(chatItem: ci, preview: imageFromBase64(image), duration: duration, maxWidth: dynamicMediaSize, videoWidth: nil, smallView: true, showFullscreenPlayer: $showFullscreenGallery)
                    .environmentObject(ReverseListScrollModel())
            }
        case let .voice(_, duration):
@@ -407,12 +407,18 @@ struct ServersSummaryView: View {

 struct SubscriptionStatusIndicatorView: View {
    @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
    var subs: SMPServerSubs
    var hasSess: Bool

    var body: some View {
-        let onionHosts = networkUseOnionHostsGroupDefault.get()
-        let (color, variableValue, opacity, _) = subscriptionStatusColorAndPercentage(m.networkInfo.online, onionHosts, subs, hasSess)
+        let (color, variableValue, opacity, _) = subscriptionStatusColorAndPercentage(
+            online: m.networkInfo.online,
+            usesProxy: networkUseOnionHostsGroupDefault.get() != .no || groupDefaults.string(forKey: GROUP_DEFAULT_NETWORK_SOCKS_PROXY) != nil,
+            subs: subs,
+            hasSess: hasSess,
+            primaryColor: theme.colors.primary
+        )
        if #available(iOS 16.0, *) {
            Image(systemName: "dot.radiowaves.up.forward", variableValue: variableValue)
                .foregroundColor(color)
@@ -425,26 +431,32 @@ struct SubscriptionStatusIndicatorView: View {

 struct SubscriptionStatusPercentageView: View {
    @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
    var subs: SMPServerSubs
    var hasSess: Bool

    var body: some View {
-        let onionHosts = networkUseOnionHostsGroupDefault.get()
-        let (_, _, _, statusPercent) = subscriptionStatusColorAndPercentage(m.networkInfo.online, onionHosts, subs, hasSess)
+        let (_, _, _, statusPercent) = subscriptionStatusColorAndPercentage(
+            online: m.networkInfo.online,
+            usesProxy: networkUseOnionHostsGroupDefault.get() != .no || groupDefaults.string(forKey: GROUP_DEFAULT_NETWORK_SOCKS_PROXY) != nil,
+            subs: subs,
+            hasSess: hasSess,
+            primaryColor: theme.colors.primary
+        )
        Text(verbatim: "\(Int(floor(statusPercent * 100)))%")
            .foregroundColor(.secondary)
            .font(.caption)
    }
 }

-func subscriptionStatusColorAndPercentage(_ online: Bool, _ onionHosts: OnionHosts, _ subs: SMPServerSubs, _ hasSess: Bool) -> (Color, Double, Double, Double) {
+func subscriptionStatusColorAndPercentage(online: Bool, usesProxy: Bool, subs: SMPServerSubs, hasSess: Bool, primaryColor: Color) -> (Color, Double, Double, Double) {
    func roundedToQuarter(_ n: Double) -> Double {
        n >= 1 ? 1
        : n <= 0 ? 0
        : (n * 4).rounded() / 4
    }

-    let activeColor: Color = onionHosts == .require ? .indigo : .accentColor
+    let activeColor: Color = usesProxy ? .indigo : primaryColor
    let noConnColorAndPercent: (Color, Double, Double, Double) = (Color(uiColor: .tertiaryLabel), 1, 1, 0)
    let activeSubsRounded = roundedToQuarter(subs.shareOfActive)

@@ -8,179 +8,275 @@ import SimpleXChat

 struct UserPicker: View {
    @EnvironmentObject var m: ChatModel
-    @Environment(\.scenePhase) var scenePhase
    @EnvironmentObject var theme: AppTheme
-    @Binding var showSettings: Bool
-    @Binding var showConnectDesktop: Bool
-    @Binding var userPickerVisible: Bool
-    @State var scrollViewContentSize: CGSize = .zero
-    @State var disableScrolling: Bool = true
-    private let menuButtonHeight: CGFloat = 68
-    @State var chatViewNameWidth: CGFloat = 0
+    @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
+    @Environment(\.scenePhase) private var scenePhase: ScenePhase
+    @Environment(\.colorScheme) private var colorScheme: ColorScheme
+    @Binding var userPickerShown: Bool
+    @Binding var activeSheet: UserPickerSheet?
+    @State private var currentUser: Int64?
+    @State private var switchingProfile = false
+    @State private var frameWidth: CGFloat = 0
+    @State private var resetScroll = ResetScrollAction()

+    // Inset grouped list dimensions
+    private let imageSize: CGFloat = 44
+    private let rowPadding: CGFloat = 16
+    private let rowVerticalPadding: CGFloat = 11
+    private let sectionSpacing: CGFloat = 35
+    private var sectionHorizontalPadding: CGFloat { frameWidth > 375 ? 20 : 16 }
+    private let sectionShape = RoundedRectangle(cornerRadius: 10, style: .continuous)

    var body: some View {
-        VStack {
-            Spacer().frame(height: 1)
+        let otherUsers: [UserInfo] = m.users
+            .filter { u in !u.user.hidden && u.user.userId != m.currentUser?.userId }
+            .sorted(using: KeyPathComparator<UserInfo>(\.user.activeOrder, order: .reverse))
+        let sectionWidth = max(frameWidth - sectionHorizontalPadding * 2, 0)
+        let currentUserWidth = max(frameWidth - sectionHorizontalPadding - rowPadding * 2 - 14 - imageSize, 0)
+        let stopped = m.chatRunning != true
+        VStack(spacing: sectionSpacing) {
+            if let user = m.currentUser {
+                StickyScrollView(resetScroll: $resetScroll) {
+                    HStack(spacing: rowPadding) {
+                        HStack {
+                            ProfileImage(imageStr: user.image, size: imageSize, color: Color(uiColor: .tertiarySystemGroupedBackground))
+                                .padding(.trailing, 6)
+                            profileName(user).lineLimit(1)
+                        }
+                        .padding(rowPadding)
+                        .frame(width: otherUsers.isEmpty ? sectionWidth : currentUserWidth, alignment: .leading)
+                        .modifier(ListRow { activeSheet = .currentProfile })
+                        .clipShape(sectionShape)
+                        .disabled(stopped)
+                        .opacity(stopped ? 0.4 : 1)
+                        ForEach(otherUsers) { u in
+                            userView(u, size: imageSize)
+                                .frame(maxWidth: sectionWidth * 0.618)
+                                .fixedSize()
+                                .disabled(stopped)
+                                .opacity(stopped ? 0.4 : 1)
+                        }
+                    }
+                    .padding(.horizontal, sectionHorizontalPadding)
+                }
+                .frame(height: 2 * rowPadding + imageSize)
+                .padding(.top, sectionSpacing)
+                .overlay(DetermineWidth())
+                .onPreferenceChange(DetermineWidth.Key.self) { frameWidth = $0 }
+            }
            VStack(spacing: 0) {
-                ScrollView {
-                    ScrollViewReader { sp in
-                        let users = m.users
-                                    .filter({ u in u.user.activeUser || !u.user.hidden })
-                                    .sorted { u, _ in u.user.activeUser }
-                        VStack(spacing: 0) {
-                            ForEach(users) { u in
-                                userView(u)
-                                Divider()
-                                if u.user.activeUser { Divider() }
+                openSheetOnTap("qrcode", title: m.userAddress == nil ? "Create SimpleX address" : "Your SimpleX address", sheet: .address, disabled: stopped)
+                openSheetOnTap("switch.2", title: "Chat preferences", sheet: .chatPreferences, disabled: stopped)
+                openSheetOnTap("person.crop.rectangle.stack", title: "Your chat profiles", sheet: .chatProfiles, disabled: stopped)
+                openSheetOnTap("desktopcomputer", title: "Use from desktop", sheet: .useFromDesktop, disabled: stopped)
+                ZStack(alignment: .trailing) {
+                    openSheetOnTap("gearshape", title: "Settings", sheet: .settings, showDivider: false)
+                    Image(systemName: colorScheme == .light ? "sun.max" : "moon.fill")
+                        .resizable()
+                        .scaledToFit()
+                        .symbolRenderingMode(.monochrome)
+                        .foregroundColor(theme.colors.secondary)
+                        .frame(maxWidth: 20, maxHeight: .infinity)
+                        .padding(.horizontal, rowPadding)
+                        .background(Color(.systemBackground).opacity(0.01))
+                        .onTapGesture {
+                            if (colorScheme == .light) {
+                                ThemeManager.applyTheme(systemDarkThemeDefault.get())
+                            } else {
+                                ThemeManager.applyTheme(DefaultTheme.LIGHT.themeName)
                            }
                        }
-                        .overlay {
-                            GeometryReader { geo -> Color in
-                                DispatchQueue.main.async {
-                                    scrollViewContentSize = geo.size
-                                    let scenes = UIApplication.shared.connectedScenes
-                                    if let windowScene = scenes.first as? UIWindowScene {
-                                        let layoutFrame = windowScene.windows[0].safeAreaLayoutGuide.layoutFrame
-                                        disableScrolling = scrollViewContentSize.height + menuButtonHeight + 10 < layoutFrame.height
-                                    }
-                                }
-                                return Color.clear
-                            }
+                        .onLongPressGesture {
+                            ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
                        }
-                        .onChange(of: userPickerVisible) { visible in
-                            if visible, let u = users.first {
-                                sp.scrollTo(u.id)
-                            }
-                        }
-                    }
-                }
-                .simultaneousGesture(DragGesture(minimumDistance: disableScrolling ? 0 : 10000000))
-                .frame(maxHeight: scrollViewContentSize.height)
-
-                menuButton("Use from desktop", icon: "desktopcomputer") {
-                    showConnectDesktop = true
-                    withAnimation {
-                        userPickerVisible.toggle()
-                    }
-                }
-                Divider()
-                menuButton("Settings", icon: "gearshape") {
-                    showSettings = true
-                    withAnimation {
-                        userPickerVisible.toggle()
-                    }
                }
            }
+            .clipShape(sectionShape)
+            .padding(.horizontal, sectionHorizontalPadding)
+            .padding(.bottom, sectionSpacing)
        }
-        .clipShape(RoundedRectangle(cornerRadius: 16))
-        .background(
-            Rectangle()
-                .fill(theme.colors.surface)
-                .cornerRadius(16)
-                .shadow(color: .black.opacity(0.12), radius: 24, x: 0, y: 0)
-        )
-        .onPreferenceChange(DetermineWidth.Key.self) { chatViewNameWidth = $0 }
-        .frame(maxWidth: chatViewNameWidth > 0 ? min(300, chatViewNameWidth + 130) : 300)
-        .padding(8)
-        .opacity(userPickerVisible ? 1.0 : 0.0)
        .onAppear {
-             // This check prevents the call of listUsers after the app is suspended, and the database is closed.
-             if case .active = scenePhase {
-                 Task {
-                     do {
-                         let users = try await listUsersAsync()
-                         await MainActor.run { m.users = users }
-                     } catch {
-                         logger.error("Error loading users \(responseError(error))")
-                     }
-                 }
-             }
-         }
-    }
-
-    private func userView(_ u: UserInfo) -> some View {
-        let user = u.user
-        return Button(action: {
-            if user.activeUser {
-                showSettings = true
-                withAnimation {
-                    userPickerVisible.toggle()
-                }
-            } else {
+            // This check prevents the call of listUsers after the app is suspended, and the database is closed.
+            if case .active = scenePhase {
+                currentUser = m.currentUser?.userId
                Task {
                    do {
-                        try await changeActiveUserAsync_(user.userId, viewPwd: nil)
-                        await MainActor.run { userPickerVisible = false }
-                    } catch {
+                        let users = try await listUsersAsync()
                        await MainActor.run {
-                            AlertManager.shared.showAlertMsg(
-                                title: "Error switching profile!",
-                                message: "Error: \(responseError(error))"
-                            )
+                            m.users = users
+                            currentUser = m.currentUser?.userId
                        }
+                    } catch {
+                        logger.error("Error loading users \(responseError(error))")
                    }
                }
            }
-        }, label: {
-            HStack(spacing: 0) {
-                ProfileImage(imageStr: user.image, size: 44, color: Color(uiColor: .tertiarySystemFill))
-                    .padding(.trailing, 12)
-                Text(user.chatViewName)
-                    .fontWeight(user.activeUser ? .medium : .regular)
-                    .foregroundColor(theme.colors.onBackground)
-                    .overlay(DetermineWidth())
-                Spacer()
-                if user.activeUser {
-                    Image(systemName: "checkmark")
-                } else if u.unreadCount > 0 {
-                    unreadCounter(u.unreadCount, color: user.showNtfs ? theme.colors.primary : theme.colors.secondary)
-                } else if !user.showNtfs {
-                    Image(systemName: "speaker.slash")
+        }
+        .onChange(of: userPickerShown) {
+            if !$0 { resetScroll() }
+        }
+        .modifier(ThemedBackground(grouped: true))
+        .disabled(switchingProfile)
+    }
+
+    private func userView(_ u: UserInfo, size: CGFloat) -> some View {
+        HStack {
+            ZStack(alignment: .topTrailing) {
+                ProfileImage(imageStr: u.user.image, size: size, color: Color(uiColor: .tertiarySystemGroupedBackground))
+                if (u.unreadCount > 0) {
+                    unreadBadge(u).offset(x: 4, y: -4)
                }
            }
-            .padding(.trailing)
-            .padding([.leading, .vertical], 12)
-        })
-        .buttonStyle(PressedButtonStyle(defaultColor: theme.colors.surface, pressedColor: Color(uiColor: .secondarySystemFill)))
-    }
-
-    private func menuButton(_ title: LocalizedStringKey, icon: String, action: @escaping () -> Void) -> some View {
-        Button(action: action) {
-            HStack(spacing: 0) {
-                Text(title)
-                    .overlay(DetermineWidth())
-                Spacer()
-                Image(systemName: icon)
-                    .symbolRenderingMode(.monochrome)
-                    .foregroundColor(theme.colors.secondary)
-            }
-            .padding(.horizontal)
-            .padding(.vertical, 22)
-            .frame(height: menuButtonHeight)
+            .padding(.trailing, 6)
+            Text(u.user.displayName).font(.title2).lineLimit(1)
        }
-        .buttonStyle(PressedButtonStyle(defaultColor: theme.colors.surface, pressedColor: Color(uiColor: .secondarySystemFill)))
+        .padding(rowPadding)
+        .modifier(ListRow {
+            switchingProfile = true
+            Task {
+                do {
+                    try await changeActiveUserAsync_(u.user.userId, viewPwd: nil)
+                    await MainActor.run {
+                        switchingProfile = false
+                        userPickerShown = false
+                    }
+                } catch {
+                    await MainActor.run {
+                        switchingProfile = false
+                        showAlert(
+                            NSLocalizedString("Error switching profile!", comment: "alertTitle"),
+                            message: String.localizedStringWithFormat(NSLocalizedString("Error: %@", comment: "alert message"), responseError(error))
+                        )
+                    }
+                }
+            }
+        })
+        .clipShape(sectionShape)
+    }
+
+    private func openSheetOnTap(_ icon: String, title: LocalizedStringKey, sheet: UserPickerSheet, showDivider: Bool = true, disabled: Bool = false) -> some View {
+        ZStack(alignment: .bottom) {
+            settingsRow(icon, color: theme.colors.secondary) {
+                Text(title).foregroundColor(.primary).opacity(disabled ? 0.4 : 1)
+            }
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .padding(.horizontal, rowPadding)
+            .padding(.vertical, rowVerticalPadding)
+            .modifier(ListRow { activeSheet = sheet })
+            .disabled(disabled)
+            if showDivider {
+                Divider().padding(.leading, 52)
+            }
+        }
+    }
+    
+    private func unreadBadge(_ u: UserInfo) -> some View {
+        let size = dynamicSize(userFont).chatInfoSize
+        return unreadCountText(u.unreadCount)
+            .font(userFont <= .xxxLarge ? .caption  : .caption2)
+            .foregroundColor(.white)
+            .padding(.horizontal, dynamicSize(userFont).unreadPadding)
+            .frame(minWidth: size, minHeight: size)
+            .background(u.user.showNtfs ? theme.colors.primary : theme.colors.secondary)
+            .cornerRadius(dynamicSize(userFont).unreadCorner)
    }
 }

-private func unreadCounter(_ unread: Int, color: Color) -> some View {
-    unreadCountText(unread)
-    .font(.caption)
-    .foregroundColor(.white)
-    .padding(.horizontal, 4)
-    .frame(minWidth: 18, minHeight: 18)
-    .background(color)
-    .cornerRadius(10)
+struct ListRow: ViewModifier {
+    @Environment(\.colorScheme) private var colorScheme: ColorScheme
+    @State private var touchDown = false
+    let action: () -> Void
+
+    func body(content: Content) -> some View {
+        ZStack {
+            elevatedSecondarySystemGroupedBackground
+            Color(.systemGray4).opacity(touchDown ? 1 : 0)
+            content
+            TouchOverlay(touchDown: $touchDown, action: action)
+        }
+    }
+
+    var elevatedSecondarySystemGroupedBackground: Color {
+        switch colorScheme {
+        case .dark: Color(0xFF2C2C2E)
+        default:    Color(0xFFFFFFFF)
+        }
+    }
+
+    struct TouchOverlay: UIViewRepresentable {
+        @Binding var touchDown: Bool
+        let action: () -> Void
+
+        func makeUIView(context: Context) -> TouchView {
+            let touchView = TouchView()
+            let gesture = UILongPressGestureRecognizer(
+                target: touchView,
+                action: #selector(touchView.longPress(gesture:))
+            )
+            gesture.delegate = touchView
+            gesture.minimumPressDuration = 0
+            touchView.addGestureRecognizer(gesture)
+            return touchView
+        }
+
+        func updateUIView(_ touchView: TouchView, context: Context) {
+            touchView.representer = self
+        }
+
+        class TouchView: UIView, UIGestureRecognizerDelegate {
+            var representer: TouchOverlay?
+            private var startLocation: CGPoint?
+            private var task: Task<Void, Never>?
+
+            @objc
+            func longPress(gesture: UILongPressGestureRecognizer) {
+                switch gesture.state {
+                case .began:
+                    startLocation = gesture.location(in: nil)
+                    task = Task {
+                        do {
+                            try await Task.sleep(nanoseconds: 200_000000)
+                            await MainActor.run { representer?.touchDown = true }
+                        } catch { }
+                    }
+                case .ended:
+                    if hitTest(gesture.location(in: self), with: nil) == self {
+                        representer?.action()
+                    }
+                    task?.cancel()
+                    representer?.touchDown = false
+                case .changed:
+                    if let startLocation {
+                        let location = gesture.location(in: nil)
+                        let dx = location.x - startLocation.x
+                        let dy = location.y - startLocation.y
+                        if sqrt(pow(dx, 2) + pow(dy, 2)) > 10 { gesture.state = .failed }
+                    }
+                case .cancelled, .failed:
+                    task?.cancel()
+                    representer?.touchDown = false
+                default: break
+                }
+            }
+
+            func gestureRecognizer(
+                _: UIGestureRecognizer,
+                shouldRecognizeSimultaneouslyWith: UIGestureRecognizer
+            ) -> Bool { true }
+        }
+    }
 }

+
 struct UserPicker_Previews: PreviewProvider {
    static var previews: some View {
+        @State var activeSheet: UserPickerSheet?
+
        let m = ChatModel()
        m.users = [UserInfo.sampleData, UserInfo.sampleData]
        return UserPicker(
-            showSettings: Binding.constant(false),
-            showConnectDesktop: Binding.constant(false),
-            userPickerVisible: Binding.constant(true)
+            userPickerShown: .constant(true),
+            activeSheet: $activeSheet
        )
        .environmentObject(m)
    }
@@ -44,7 +44,7 @@ enum DatabaseAlert: Identifiable {
 struct DatabaseView: View {
    @EnvironmentObject var m: ChatModel
    @EnvironmentObject var theme: AppTheme
-    @Binding var showSettings: Bool
+    let dismissSettingsSheet: DismissAction
    @State private var runChat = false
    @State private var alert: DatabaseAlert? = nil
    @State private var showFileImporter = false
@@ -270,12 +270,12 @@ struct DatabaseView: View {
        case let .archiveImportedWithErrors(errs):
            return Alert(
                title: Text("Chat database imported"),
-                message: Text("Restart the app to use imported chat database") + Text(verbatim: "\n\n") + Text("Some non-fatal errors occurred during import:") + archiveErrorsText(errs)
+                message: Text("Restart the app to use imported chat database") + Text(verbatim: "\n") + Text("Some non-fatal errors occurred during import:") + archiveErrorsText(errs)
            )
        case let .archiveExportedWithErrors(archivePath, errs):
            return Alert(
                title: Text("Chat database exported"),
-                message: Text("You may save the exported archive.") + Text(verbatim: "\n\n") + Text("Some file(s) were not exported:") + archiveErrorsText(errs),
+                message: Text("You may save the exported archive.") + Text(verbatim: "\n") + Text("Some file(s) were not exported:") + archiveErrorsText(errs),
                dismissButton: .default(Text("Continue")) {
                    showShareSheet(items: [archivePath])
                }
@@ -439,7 +439,7 @@ struct DatabaseView: View {

    private func startChat() {
        if m.chatDbChanged {
-            showSettings = false
+            dismissSettingsSheet()
            DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
                resetChatCtrl()
                do {
@@ -533,7 +533,9 @@ func deleteChatAsync() async throws {
 }

 struct DatabaseView_Previews: PreviewProvider {
+    @Environment(\.dismiss) static var mockDismiss
+
    static var previews: some View {
-        DatabaseView(showSettings: Binding.constant(false), chatItemTTL: .none)
+        DatabaseView(dismissSettingsSheet: mockDismiss, chatItemTTL: .none)
    }
 }
@@ -11,6 +11,12 @@ 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 {
@@ -19,11 +25,7 @@ private struct PrivacySensitive: ViewModifier {
    @ObservedObject var appSheetState: AppSheetState = AppSheetState.shared

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

@@ -36,12 +36,7 @@ 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
@@ -0,0 +1,21 @@
+//
+//  Test.swift
+//  SimpleX (iOS)
+//
+//  Created by Levitating Pineapple on 31/08/2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+extension View {
+    @ViewBuilder
+    func invertedForegroundStyle(enabled: Bool = true) -> some View {
+        if enabled {
+            foregroundStyle(Material.ultraThin)
+                .environment(\.colorScheme, .dark)
+                .grayscale(1)
+                .contrast(-20)
+        } else { self }
+    }
+}
@@ -20,7 +20,7 @@ struct ProfileImage: View {
    @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var radius = defaultProfileImageCorner

    var body: some View {
-        if let uiImage = UIImage(base64Encoded: imageStr) {
+        if let uiImage = imageFromBase64(imageStr) {
            clipProfileImage(Image(uiImage: uiImage), size: size, radius: radius, blurred: blurred)
        } else {
            let c = color.asAnotherColorFromSecondaryVariant(theme)
@@ -8,15 +8,63 @@

 import SwiftUI

-func showShareSheet(items: [Any], completed: (() -> Void)? = nil) {
+func getTopViewController() -> UIViewController? {
    let keyWindowScene = UIApplication.shared.connectedScenes.first { $0.activationState == .foregroundActive } as? UIWindowScene
    if let keyWindow = keyWindowScene?.windows.filter(\.isKeyWindow).first,
-       let presentedViewController = keyWindow.rootViewController?.presentedViewController ?? keyWindow.rootViewController {
+       let rootViewController = keyWindow.rootViewController {
+        // Find the top-most presented view controller
+        var topController = rootViewController
+        while let presentedViewController = topController.presentedViewController {
+            topController = presentedViewController
+        }
+        return topController
+    }
+    return nil
+}
+
+func showShareSheet(items: [Any], completed: (() -> Void)? = nil) {
+    if let topController = getTopViewController() {
        let activityViewController = UIActivityViewController(activityItems: items, applicationActivities: nil)
        if let completed = completed {
-            let handler: UIActivityViewController.CompletionWithItemsHandler = { _,_,_,_ in completed() }
-            activityViewController.completionWithItemsHandler = handler
-        }
-        presentedViewController.present(activityViewController, animated: true)
+            activityViewController.completionWithItemsHandler = { _, _, _, _ in
+                completed()
+            }
+        }        
+        topController.present(activityViewController, animated: true)
    }
 }
+
+func showAlert(
+    title: String,
+    message: String? = nil,
+    buttonTitle: String,
+    buttonAction: @escaping () -> Void,
+    cancelButton: Bool
+) -> Void {
+    if let topController = getTopViewController() {
+        let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
+        alert.addAction(UIAlertAction(title: buttonTitle, style: .default) { _ in
+            buttonAction()
+        })
+        if cancelButton {
+            alert.addAction(cancelAlertAction)
+        }
+        topController.present(alert, animated: true)
+    }
+}
+
+func showAlert(
+    _ title: String,
+    message: String? = nil,
+    actions: () -> [UIAlertAction] = { [okAlertAction] }
+) {
+    if let topController = getTopViewController() {
+        let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
+        for action in actions() { alert.addAction(action) }
+        topController.present(alert, animated: true)
+    }
+}
+
+let okAlertAction = UIAlertAction(title: NSLocalizedString("Ok", comment: "alert button"), style: .default)
+
+let cancelAlertAction = UIAlertAction(title: NSLocalizedString("Cancel", comment: "alert button"), style: .cancel)
@@ -0,0 +1,188 @@
+//
+//  SwiftUISheet.swift
+//  SimpleX (iOS)
+//
+//  Created by user on 23/09/2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+private let sheetAnimationDuration: Double = 0.35
+
+// Refrence: https://easings.net/
+private let easeOutCubic = UICubicTimingParameters(
+    controlPoint1: CGPoint(x: 0.215, y: 0.61),
+    controlPoint2: CGPoint(x: 0.355, y: 1)
+)
+
+struct Sheet<SheetContent: View>: ViewModifier {
+    @Binding var isPresented: Bool
+    @ViewBuilder let sheetContent: () -> SheetContent
+
+    func body(content: Content) -> some View {
+        ZStack {
+            content
+            SheetRepresentable(isPresented: $isPresented, content: sheetContent())
+                .allowsHitTesting(isPresented)
+                .ignoresSafeArea()
+        }
+    }
+}
+
+struct SheetRepresentable<Content: View>: UIViewControllerRepresentable {
+    @Binding var isPresented: Bool
+    let content:  Content
+
+    func makeUIViewController(context: Context) -> Controller<Content> {
+        Controller(content: content, representer: self)
+    }
+
+    func updateUIViewController(_ sheetController: Controller<Content>, context: Context) {
+        sheetController.animate(isPresented: isPresented)
+    }
+
+    class Controller<C: View>: UIViewController {
+        let hostingController: UIHostingController<C>
+        private let animator = UIViewPropertyAnimator(
+            duration: sheetAnimationDuration,
+            timingParameters: easeOutCubic
+        )
+        private let representer: SheetRepresentable<C>
+        private var retainedFraction: CGFloat = 0
+        private var sheetHeight: Double { hostingController.view.frame.height }
+        private var task: Task<Void, Never>?
+
+        init(content: C, representer: SheetRepresentable<C>) {
+            self.representer = representer
+            self.hostingController = UIHostingController(rootView: content)
+            super.init(nibName: nil, bundle: nil)
+        }
+
+        @available(*, unavailable)
+        required init?(coder: NSCoder) { fatalError("init(coder:) missing") }
+
+        deinit {
+            animator.stopAnimation(true)
+            animator.finishAnimation(at: .current)
+        }
+
+        func animate(isPresented: Bool) {
+            let alreadyAnimating = animator.isRunning && isPresented != animator.isReversed
+            let sheetFullyDismissed = animator.fractionComplete == (animator.isReversed ? 1 : 0)
+            let sheetFullyPresented = animator.fractionComplete == (animator.isReversed ? 0 : 1)
+
+            if !isPresented && sheetFullyDismissed ||
+                isPresented && sheetFullyPresented ||
+                alreadyAnimating {
+                return
+            }
+
+            animator.pauseAnimation()
+            animator.isReversed = !isPresented
+            animator.continueAnimation(
+                withTimingParameters: isPresented
+                ? easeOutCubic
+                : UICubicTimingParameters(animationCurve: .easeIn),
+                durationFactor: 1 - animator.fractionComplete
+            )
+            handleVisibility()
+        }
+
+        func handleVisibility() {
+            if animator.isReversed {
+                task = Task {
+                    do {
+                        let sleepDuration = UInt64(sheetAnimationDuration * Double(NSEC_PER_SEC))
+                        try await Task.sleep(nanoseconds: sleepDuration)
+                        view.isHidden = true
+                    } catch { }
+                }
+            } else {
+                task?.cancel()
+                task = nil
+                view.isHidden = false
+            }
+        }
+
+        override func viewDidLoad() {
+            view.isHidden = true
+            view.backgroundColor = .clear
+            view.addGestureRecognizer(
+                UITapGestureRecognizer(target: self, action: #selector(tap(gesture:)))
+            )
+            addChild(hostingController)
+            hostingController.didMove(toParent: self)
+            if let sheet = hostingController.view {
+                sheet.isHidden = true
+                sheet.clipsToBounds = true
+                sheet.layer.cornerRadius = 10
+                sheet.layer.maskedCorners = [.layerMaxXMinYCorner, .layerMinXMinYCorner]
+                sheet.addGestureRecognizer(UIPanGestureRecognizer(target: self, action: #selector(pan(gesture:))))
+                sheet.translatesAutoresizingMaskIntoConstraints = false
+                view.addSubview(sheet)
+                NSLayoutConstraint.activate([
+                    hostingController.view.leadingAnchor.constraint(equalTo: view.leadingAnchor),
+                    hostingController.view.trailingAnchor.constraint(equalTo: view.trailingAnchor),
+                    hostingController.view.bottomAnchor.constraint(equalTo: view.bottomAnchor),
+                ])
+            }
+        }
+
+        override func viewDidAppear(_ animated: Bool) {
+            // Ensures animations are only setup once
+            // on some iOS version `viewDidAppear` can get called on each state change.
+            if hostingController.view.isHidden {
+                hostingController.view.transform = CGAffineTransform(translationX: 0, y: self.sheetHeight)
+                hostingController.view.isHidden = false
+                animator.pausesOnCompletion = true
+                animator.addAnimations {
+                    self.hostingController.view.transform = .identity
+                    self.view.backgroundColor = UIColor {
+                        switch $0.userInterfaceStyle {
+                        case .dark: .black.withAlphaComponent(0.290)
+                        default:    .black.withAlphaComponent(0.121)
+                        }
+                    }
+                }
+                animator.startAnimation()
+                animator.pauseAnimation()
+            }
+        }
+
+        @objc
+        func pan(gesture: UIPanGestureRecognizer) {
+            switch gesture.state {
+            case .began:
+                animator.isReversed = false
+                animator.pauseAnimation()
+                retainedFraction = animator.fractionComplete
+            case .changed:
+                animator.fractionComplete = retainedFraction - gesture.translation(in: view).y / sheetHeight
+            case .ended, .cancelled:
+                let velocity = gesture.velocity(in: view).y
+                animator.isReversed = (velocity - (animator.fractionComplete - 0.5) * 100).sign == .plus
+                let defaultVelocity = sheetHeight / sheetAnimationDuration
+                let fractionRemaining = 1 - animator.fractionComplete
+                let durationFactor = min(max(fractionRemaining / (abs(velocity) / defaultVelocity), 0.5), 1)
+                animator.continueAnimation(withTimingParameters: nil, durationFactor: durationFactor * fractionRemaining)
+                handleVisibility()
+                DispatchQueue.main.asyncAfter(deadline: .now() + sheetAnimationDuration) {
+                    self.representer.isPresented = !self.animator.isReversed
+                }
+            default: break
+            }
+        }
+
+        @objc
+        func tap(gesture: UITapGestureRecognizer) {
+            switch gesture.state {
+            case .ended:
+                if gesture.location(in: view).y < view.frame.height - sheetHeight {
+                    representer.isPresented = false
+                }
+            default: break
+            }
+        }
+    }
+}
@@ -0,0 +1,61 @@
+//
+//  StickyScrollView.swift
+//  SimpleX (iOS)
+//
+//  Created by user on 20/09/2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+struct StickyScrollView<Content: View>: UIViewRepresentable {
+    @Binding var resetScroll: ResetScrollAction
+    @ViewBuilder let content: () -> Content
+
+    func makeUIView(context: Context) -> UIScrollView {
+        let hc = context.coordinator.hostingController
+        hc.view.backgroundColor = .clear
+        let sv = UIScrollView()
+        sv.showsHorizontalScrollIndicator = false
+        sv.addSubview(hc.view)
+        sv.delegate = context.coordinator
+        DispatchQueue.main.async {
+            resetScroll = ResetScrollAction { sv.setContentOffset(.zero, animated: false) }
+        }
+        return sv
+    }
+
+    func updateUIView(_ scrollView: UIScrollView, context: Context) {
+        let hc = context.coordinator.hostingController
+        hc.rootView = content()
+        hc.view.frame.size = hc.view.intrinsicContentSize
+        scrollView.contentSize = hc.view.intrinsicContentSize
+    }
+
+    func makeCoordinator() -> Coordinator {
+        Coordinator(content: content())
+    }
+
+    class Coordinator: NSObject, UIScrollViewDelegate {
+        let hostingController: UIHostingController<Content>
+
+        init(content: Content) {
+            self.hostingController = UIHostingController(rootView: content)
+        }
+
+        func scrollViewWillEndDragging(
+            _ scrollView: UIScrollView,
+            withVelocity velocity: CGPoint,
+            targetContentOffset: UnsafeMutablePointer<CGPoint>
+        ) {
+            if targetContentOffset.pointee.x < 32 {
+                targetContentOffset.pointee.x = 0
+            }
+        }
+    }
+}
+
+struct ResetScrollAction {
+    var action = { }
+    func callAsFunction() { action() }
+}
@@ -16,6 +16,7 @@ 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

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

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

-                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)
-                    }
-                }
+                ImportExportThemeSection(showFileImporter: $showFileImporter, perChat: nil, perUser: ChatModel.shared.currentUser?.uiThemes)
            } 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 {
@@ -216,6 +220,7 @@ 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

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

                CustomizeThemeColorsSection(editColor: editColor)

-                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)
-                    }
-                }
+                ImportExportThemeSection(showFileImporter: $showFileImporter, perChat: themeModeOverride, perUser: ChatModel.shared.currentUser?.uiThemes)
            } 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 {
@@ -0,0 +1,62 @@
+//
+//  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) }
+}
@@ -24,6 +24,7 @@ private enum MigrationFromState: Equatable {
 }

 private enum MigrateFromDeviceViewAlert: Identifiable {
+    case finishMigration(_ fileId: Int64, _ ctrl: chat_ctrl)
    case deleteChat(_ title: LocalizedStringKey = "Delete chat profile?", _ text: LocalizedStringKey = "This action cannot be undone - your profile, contacts, messages and files will be irreversibly lost.")
    case startChat(_ title: LocalizedStringKey = "Start chat?", _ text: LocalizedStringKey = "Warning: starting chat on multiple devices is not supported and will cause message delivery failures")

@@ -38,6 +39,7 @@ private enum MigrateFromDeviceViewAlert: Identifiable {

    var id: String {
        switch self {
+        case .finishMigration: return "finishMigration"
        case let .deleteChat(title, text): return "\(title) \(text)"
        case let .startChat(title, text): return "\(title) \(text)"

@@ -56,8 +58,6 @@ private enum MigrateFromDeviceViewAlert: Identifiable {
 struct MigrateFromDevice: View {
    @EnvironmentObject var m: ChatModel
    @EnvironmentObject var theme: AppTheme
-    @Environment(\.dismiss) var dismiss: DismissAction
-    @Binding var showSettings: Bool
    @Binding var showProgressOnSettings: Bool
    @State private var migrationState: MigrationFromState = .chatStopInProgress
    @State private var useKeychain = storeDBPassphraseGroupDefault.get()
@@ -106,9 +106,6 @@ struct MigrateFromDevice: View {
                finishedView(chatDeletion)
            }
        }
-        .modifier(BackButton(label: "Back", disabled: $backDisabled) {
-            dismiss()
-        })
        .onChange(of: migrationState) { state in
            backDisabled = switch migrationState {
            case .chatStopInProgress, .archiving, .linkShown, .finished: true
@@ -138,6 +135,15 @@ struct MigrateFromDevice: View {
        }
        .alert(item: $alert) { alert in
            switch alert {
+            case let .finishMigration(fileId, ctrl):
+                return Alert(
+                    title: Text("Remove archive?"),
+                    message: Text("The uploaded database archive will be permanently removed from the servers."),
+                    primaryButton: .destructive(Text("Continue")) {
+                        finishMigration(fileId, ctrl)
+                    },
+                    secondaryButton: .cancel()
+                )
            case let .startChat(title, text):
                return Alert(
                    title: Text(title),
@@ -171,7 +177,7 @@ struct MigrateFromDevice: View {
            case let .archiveExportedWithErrors(archivePath, errs):
                return Alert(
                    title: Text("Chat database exported"),
-                    message: Text("You may migrate the exported database.") + Text(verbatim: "\n\n") + Text("Some file(s) were not exported:") + archiveErrorsText(errs),
+                    message: Text("You may migrate the exported database.") + Text(verbatim: "\n") + Text("Some file(s) were not exported:") + archiveErrorsText(errs),
                    dismissButton: .default(Text("Continue")) {
                        Task { await uploadArchive(path: archivePath) }
                    }
@@ -318,7 +324,7 @@ struct MigrateFromDevice: View {
                        Text("Cancel migration").foregroundColor(.red)
                    }
                }
-                Button(action: { finishMigration(fileId, ctrl) }) {
+                Button(action: { alert = .finishMigration(fileId, ctrl) }) {
                    settingsRow("checkmark", color: theme.colors.secondary) {
                        Text("Finalize migration").foregroundColor(theme.colors.primary)
                    }
@@ -523,9 +529,15 @@ struct MigrateFromDevice: View {
                        }
                    case let .sndStandaloneFileComplete(_, fileTransferMeta, rcvURIs):
                        let cfg = getNetCfg()
+                        let proxy: NetworkProxy? = if cfg.socksProxy == nil {
+                            nil
+                        } else {
+                            networkProxyDefault.get()
+                        }
                        let data = MigrationFileLinkData.init(
                            networkConfig: MigrationFileLinkData.NetworkConfig(
                                socksProxy: cfg.socksProxy,
+                                networkProxy: proxy,
                                hostMode: cfg.hostMode,
                                requiredHostMode: cfg.requiredHostMode
                            )
@@ -590,7 +602,7 @@ struct MigrateFromDevice: View {
                    } catch let error {
                        fatalError("Error starting chat \(responseError(error))")
                    }
-                    showSettings = false
+                    dismissAllSheets(animated: true)
                }
            } catch let error {
                alert = .error(title: "Error deleting database", error: responseError(error))
@@ -613,9 +625,7 @@ struct MigrateFromDevice: View {
        }
        // Hide settings anyway if chatDbStatus is not ok, probably passphrase needs to be entered
        if dismiss || m.chatDbStatus != .ok {
-            await MainActor.run {
-                showSettings = false
-            }
+            dismissAllSheets(animated: true)
        }
    }

@@ -767,6 +777,6 @@ private class MigrationChatReceiver {

 struct MigrateFromDevice_Previews: PreviewProvider {
    static var previews: some View {
-        MigrateFromDevice(showSettings: Binding.constant(true), showProgressOnSettings: Binding.constant(false))
+        MigrateFromDevice(showProgressOnSettings: Binding.constant(false))
    }
 }
@@ -93,7 +93,6 @@ struct MigrateToDevice: View {
    @EnvironmentObject var m: ChatModel
    @EnvironmentObject var theme: AppTheme
    @Environment(\.dismiss) var dismiss: DismissAction
-    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
    @Binding var migrationState: MigrationToState?
    @State private var useKeychain = storeDBPassphraseGroupDefault.get()
    @State private var alert: MigrateToDeviceViewAlert?
@@ -102,6 +101,7 @@ struct MigrateToDevice: View {
    // Prevent from hiding the view until migration is finished or app deleted
    @State private var backDisabled: Bool = false
    @State private var showQRCodeScanner: Bool = true
+    @State private var pasteboardHasStrings = UIPasteboard.general.hasStrings

    var body: some View {
        VStack {
@@ -197,10 +197,8 @@ struct MigrateToDevice: View {
                        }
                    }
                }
-                if developerTools {
-                    Section(header: Text("Or paste archive link").foregroundColor(theme.colors.secondary)) {
-                        pasteLinkView()
-                    }
+                Section(header: Text("Or paste archive link").foregroundColor(theme.colors.secondary)) {
+                    pasteLinkView()
                }
            }
        }
@@ -218,7 +216,7 @@ struct MigrateToDevice: View {
        } label: {
            Text("Tap to paste link")
        }
-        .disabled(!ChatModel.shared.pasteboardHasStrings)
+        .disabled(!pasteboardHasStrings)
        .frame(maxWidth: .infinity, alignment: .center)
    }

@@ -487,6 +485,9 @@ struct MigrateToDevice: View {
            do {
                if !hasChatCtrl() {
                    chatInitControllerRemovingDatabases()
+                } else if ChatModel.shared.chatRunning == true {
+                    // cannot delete storage if chat is running
+                    try await apiStopChat()
                }
                try await apiDeleteStorage()
                try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
@@ -556,11 +557,22 @@ struct MigrateToDevice: View {
        do {
            try? FileManager.default.removeItem(at: getMigrationTempFilesDirectory())
            MigrationToDeviceState.save(nil)
-            appSettings.importIntoApp()
-            try SimpleX.startChat(refreshInvitations: true)
-            AlertManager.shared.showAlertMsg(title: "Chat migrated!", message: "Finalize migration on another device.")
+            try ObjC.catchException {
+                appSettings.importIntoApp()
+            }
+            do {
+                try SimpleX.startChat(refreshInvitations: true)
+                AlertManager.shared.showAlertMsg(title: "Chat migrated!", message: "Finalize migration on another device.")
+            } catch let error {
+                AlertManager.shared.showAlert(Alert(title: Text("Error starting chat"), message: Text(responseError(error))))
+            }
        } catch let error {
-            AlertManager.shared.showAlert(Alert(title: Text("Error starting chat"), message: Text(responseError(error))))
+            logger.error("Error importing settings: \(error.localizedDescription)")
+            AlertManager.shared.showAlert(
+                Alert(
+                    title: Text("Error migrating settings"),
+                    message: Text ("Some app settings were not migrated.") + Text("\n") + Text(responseError(error)))
+            )
        }
        hideView()
    }
@@ -137,10 +137,13 @@ struct AddGroupView: View {
            createInvalidNameAlert(mkValidName(profile.displayName), $profile.displayName)
        }
        .onChange(of: chosenImage) { image in
-            if let image = image {
-                profile.image = resizeImageToStrSize(cropToSquare(image), maxDataSize: 12500)
-            } else {
-                profile.image = nil
+            Task {
+                let resized: String? = if let image {
+                    await resizeImageToStrSize(cropToSquare(image), maxDataSize: 12500)
+                } else {
+                    nil
+                }
+                await MainActor.run { profile.image = resized }
            }
        }
        .modifier(ThemedBackground(grouped: true))
@@ -14,7 +14,8 @@ enum ContactType: Int {
 }

 struct NewChatMenuButton: View {
-    @EnvironmentObject var chatModel: ChatModel
+    // do not use chatModel here because it prevents showing AddGroupMembersView after group creation and QR code after link creation on iOS 16
+//    @EnvironmentObject var chatModel: ChatModel
    @State private var showNewChatSheet = false
    @State private var alert: SomeAlert? = nil
    @State private var pendingConnection: PendingContactConnection? = nil
@@ -32,7 +33,7 @@ struct NewChatMenuButton: View {
            NewChatSheet(pendingConnection: $pendingConnection)
                .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
                .onDisappear {
-                    alert = cleanupPendingConnection(chatModel: chatModel, contactConnection: pendingConnection)
+                    alert = cleanupPendingConnection(contactConnection: pendingConnection)
                    pendingConnection = nil
                }
        }
@@ -196,7 +197,7 @@ func chatContactType(chat: Chat) -> ContactType {
    case .contactRequest:
        return .request
    case let .direct(contact):
-        if contact.activeConn == nil && contact.profile.contactLink != nil {
+        if contact.activeConn == nil && contact.profile.contactLink != nil && contact.active {
            return .card
        } else if contact.chatDeleted {
            return .chatDeleted
@@ -45,10 +45,10 @@ enum NewChatOption: Identifiable {
    var id: Self { self }
 }

-func cleanupPendingConnection(chatModel: ChatModel, contactConnection: PendingContactConnection?) -> SomeAlert? {
+func cleanupPendingConnection(contactConnection: PendingContactConnection?) -> SomeAlert? {
    var alert: SomeAlert? = nil

-    if !(chatModel.showingInvitation?.connChatUsed ?? true),
+    if !(ChatModel.shared.showingInvitation?.connChatUsed ?? true),
       let conn = contactConnection {
        alert = SomeAlert(
            alert: Alert(
@@ -68,7 +68,7 @@ func cleanupPendingConnection(chatModel: ChatModel, contactConnection: PendingCo
        )
    }
    
-    chatModel.showingInvitation = nil
+    ChatModel.shared.showingInvitation = nil

    return alert
 }
@@ -97,6 +97,11 @@ struct NewChatView: View {
            }
            .pickerStyle(.segmented)
            .padding()
+            .onChange(of: $selection.wrappedValue) { opt in
+                if opt == NewChatOption.connect {
+                    showQRCodeScanner = true
+                }
+            }

            VStack {
                // it seems there's a bug in iOS 15 if several views in switch (or if-else) statement have different transitions
@@ -152,7 +157,7 @@ struct NewChatView: View {
        }
        .onDisappear {
            if !choosingProfile {
-                parentAlert = cleanupPendingConnection(chatModel: m, contactConnection: contactConnection)
+                parentAlert = cleanupPendingConnection(contactConnection: contactConnection)
                contactConnection = nil
            }
        }
@@ -241,7 +246,6 @@ private struct InviteView: View {
    @Binding var choosingProfile: Bool

    @AppStorage(GROUP_DEFAULT_INCOGNITO, store: groupDefaults) private var incognitoDefault = false
-    @State private var showSettings: Bool = false

    var body: some View {
        List {
@@ -585,6 +589,7 @@ private struct ConnectView: View {
    @Binding var pastedLink: String
    @Binding var alert: NewChatViewAlert?
    @State private var sheet: PlanAndConnectActionSheet?
+    @State private var pasteboardHasStrings = UIPasteboard.general.hasStrings

    var body: some View {
        List {
@@ -621,7 +626,7 @@ private struct ConnectView: View {
            } label: {
                Text("Tap to paste link")
            }
-            .disabled(!ChatModel.shared.pasteboardHasStrings)
+            .disabled(!pasteboardHasStrings)
            .frame(maxWidth: .infinity, alignment: .center)
        } else {
            linkTextView(pastedLink)
@@ -692,6 +697,7 @@ struct ScannerInView: View {
                            .frame(maxWidth: .infinity, maxHeight: .infinity)
                            .foregroundColor(Color.clear)
                        switch cameraAuthorizationStatus {
+                        case .authorized, nil: EmptyView()
                        case .restricted: Text("Camera not available")
                        case .denied:  Label("Enable camera access", systemImage: "camera")
                        default: Label("Tap to scan", systemImage: "qrcode")
@@ -711,21 +717,26 @@ struct ScannerInView: View {
                .disabled(cameraAuthorizationStatus == .restricted)
            }
        }
-        .onAppear {
+        .task {
            let status = AVCaptureDevice.authorizationStatus(for: .video)
            cameraAuthorizationStatus = status
            if showQRCodeScanner {
                switch status {
-                case .notDetermined: askCameraAuthorization()
+                case .notDetermined: await askCameraAuthorizationAsync()
                case .restricted: showQRCodeScanner = false
                case .denied: showQRCodeScanner = false
                case .authorized: ()
-                @unknown default: askCameraAuthorization()
+                @unknown default: await askCameraAuthorizationAsync()
                }
            }
        }
    }

+    func askCameraAuthorizationAsync() async {
+        await AVCaptureDevice.requestAccess(for: .video)
+        cameraAuthorizationStatus = AVCaptureDevice.authorizationStatus(for: .video)
+    }
+
    func askCameraAuthorization(_ cb: (() -> Void)? = nil) {
        AVCaptureDevice.requestAccess(for: .video) { allowed in
            cameraAuthorizationStatus = AVCaptureDevice.authorizationStatus(for: .video)
@@ -49,34 +49,34 @@ struct QRCode: View {
        ZStack {
            if let image = image {
                qrCodeImage(image)
-            }
-            GeometryReader { geo in
-                ZStack {
-                    if withLogo {
-                        let w = geo.size.width
-                        Image("icon-light")
-                        .resizable()
-                        .scaledToFit()
-                        .frame(width: w * 0.16, height: w * 0.16)
-                        .frame(width: w * 0.165, height: w * 0.165)
-                        .background(.white)
-                        .clipShape(Circle())
+                GeometryReader { geo in
+                    ZStack {
+                        if withLogo {
+                            let w = geo.size.width
+                            Image("icon-light")
+                            .resizable()
+                            .scaledToFit()
+                            .frame(width: w * 0.16, height: w * 0.16)
+                            .frame(width: w * 0.165, height: w * 0.165)
+                            .background(.white)
+                            .clipShape(Circle())
+                        }
                    }
-                }
-                .onAppear {
-                    makeScreenshotFunc = {
-                        let size = CGSizeMake(1024 / UIScreen.main.scale, 1024 / UIScreen.main.scale)
-                        showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])
-                        onShare?()
+                    .onAppear {
+                        makeScreenshotFunc = {
+                            let size = CGSizeMake(1024 / UIScreen.main.scale, 1024 / UIScreen.main.scale)
+                            showShareSheet(items: [makeScreenshot(geo.frame(in: .local).origin, size)])
+                            onShare?()
+                        }
                    }
+                    .frame(width: geo.size.width, height: geo.size.height)
                }
-                .frame(width: geo.size.width, height: geo.size.height)
+            } else {
+                Color.clear.aspectRatio(1, contentMode: .fit)
            }
        }
        .onTapGesture(perform: makeScreenshotFunc)
-        .onAppear {
-            image = image ?? generateImage(uri, tintColor: tintColor)
-        }
+        .task { image = await generateImage(uri, tintColor: tintColor) }
        .frame(maxWidth: .infinity, maxHeight: .infinity)
    }
 }
@@ -89,7 +89,7 @@ private func qrCodeImage(_ image: UIImage) -> some View {
        .textSelection(.enabled)
 }

-private func generateImage(_ uri: String, tintColor: UIColor) -> UIImage? {
+private func generateImage(_ uri: String, tintColor: UIColor) async -> UIImage? {
    let context = CIContext()
    let filter = CIFilter.qrCodeGenerator()
    filter.message = Data(uri.utf8)
@@ -467,6 +467,39 @@ private let versionDescriptions: [VersionDescription] = [
            )
        ]
    ),
+    VersionDescription(
+        version: "v6.1",
+        post: URL(string: "https://simplex.chat/blog/20241014-simplex-network-v6-1-security-review-better-calls-user-experience.html"),
+        features: [
+            FeatureDescription(
+                icon: "checkmark.shield",
+                title: "Better security ✅",
+                description: "SimpleX protocols reviewed by Trail of Bits."
+            ),
+            FeatureDescription(
+                icon: "video",
+                title: "Better calls",
+                description: "Switch audio and video during the call."
+            ),
+            FeatureDescription(
+                icon: "bolt",
+                title: "Better notifications",
+                description: "Improved delivery, reduced traffic usage.\nMore improvements are coming soon!"
+            ),
+            FeatureDescription(
+                icon: nil,
+                title: "Better user experience",
+                description: nil,
+                subfeatures: [
+                    ("link", "Switch chat profile for 1-time invitations."),
+                    ("message", "Customizable message shape."),
+                    ("calendar", "Better message dates."),
+                    ("arrowshape.turn.up.right", "Forward up to 20 messages at once."),
+                    ("flag", "Delete or moderate up to 200 messages.")
+                ]
+            ),
+        ]
+    ),
 ]

 private let lastVersion = versionDescriptions.last!.version
@@ -14,7 +14,6 @@ struct ConnectDesktopView: View {
    @EnvironmentObject var m: ChatModel
    @EnvironmentObject var theme: AppTheme
    @Environment(\.dismiss) var dismiss: DismissAction
-    var viaSettings = false
    @AppStorage(DEFAULT_DEVICE_NAME_FOR_REMOTE_ACCESS) private var deviceName = UIDevice.current.name
    @AppStorage(DEFAULT_CONFIRM_REMOTE_SESSIONS) private var confirmRemoteSessions = false
    @AppStorage(DEFAULT_CONNECT_REMOTE_VIA_MULTICAST) private var connectRemoteViaMulticast = true
@@ -57,23 +56,6 @@ struct ConnectDesktopView: View {
    }

    var body: some View {
-        if viaSettings {
-            viewBody
-                .modifier(BackButton(label: "Back", disabled: Binding.constant(false)) {
-                    if m.activeRemoteCtrl {
-                        alert = .disconnectDesktop(action: .back)
-                    } else {
-                        dismiss()
-                    }
-                })
-        } else {
-            NavigationView {
-                viewBody
-            }
-        }
-    }
-
-    var viewBody: some View {
        Group {
            let discovery = m.remoteCtrlSession?.discovery
            if discovery == true || (discovery == nil && !showConnectScreen) {
@@ -105,7 +105,12 @@ struct TerminalView: View {
            }
        }
        .navigationViewStyle(.stack)
-        .navigationTitle("Chat console")
+        .toolbar {
+            // Redaction broken for `.navigationTitle` - using a toolbar item instead.
+            ToolbarItem(placement: .principal) {
+                Text("Chat console").font(.headline)
+            }
+        }
        .modifier(ThemedBackground())
    }

@@ -36,6 +36,10 @@ struct AdvancedNetworkSettings: View {
    @State private var showSettingsAlert: NetworkSettingsAlert?
    @State private var onionHosts: OnionHosts = .no
    @State private var showSaveDialog = false
+    @State private var netProxy = networkProxyDefault.get()
+    @State private var currentNetProxy = networkProxyDefault.get()
+    @State private var useNetProxy = false
+    @State private var netProxyAuth = false

    var body: some View {
        VStack {
@@ -102,6 +106,76 @@ struct AdvancedNetworkSettings: View {
                    .foregroundColor(theme.colors.secondary)
                }

+                Section {
+                    Toggle("Use SOCKS proxy", isOn: $useNetProxy)
+                    Group {
+                        TextField("IP address", text: $netProxy.host)
+                        TextField(
+                            "Port",
+                            text: Binding(
+                                get: { netProxy.port > 0 ? "\(netProxy.port)" : "" },
+                                set: { s in
+                                    netProxy.port = if let port = Int(s), port > 0 {
+                                        port
+                                    } else {
+                                        0
+                                    }
+                                }
+                            )
+                        )
+                        Toggle("Proxy requires password", isOn: $netProxyAuth)
+                        if netProxyAuth {
+                            TextField("Username", text: $netProxy.username)
+                            PassphraseField(
+                                key: $netProxy.password,
+                                placeholder: "Password",
+                                valid: NetworkProxy.validCredential(netProxy.password)
+                            )
+                        }
+                    }
+                    .if(!useNetProxy) { $0.foregroundColor(theme.colors.secondary) }
+                    .disabled(!useNetProxy)
+                } header: {
+                    HStack {
+                        Text("SOCKS proxy").foregroundColor(theme.colors.secondary)
+                        if useNetProxy && !netProxy.valid {
+                            Spacer()
+                            Image(systemName: "exclamationmark.circle.fill").foregroundColor(.red)
+                        }
+                    }
+                } footer: {
+                    if netProxyAuth {
+                        Text("Your credentials may be sent unencrypted.")
+                            .foregroundColor(theme.colors.secondary)
+                    } else {
+                        Text("Do not use credentials with proxy.")
+                            .foregroundColor(theme.colors.secondary)
+                    }
+                }
+                .onChange(of: useNetProxy) { useNetProxy in
+                    netCfg.socksProxy = useNetProxy && currentNetProxy.valid
+                        ? currentNetProxy.toProxyString()
+                        : nil
+                    netProxy = currentNetProxy
+                    netProxyAuth = netProxy.username != "" || netProxy.password != ""
+                }
+                .onChange(of: netProxyAuth) { netProxyAuth in
+                    if netProxyAuth {
+                        netProxy.auth = currentNetProxy.auth
+                        netProxy.username = currentNetProxy.username
+                        netProxy.password = currentNetProxy.password
+                    } else {
+                        netProxy.auth = .username
+                        netProxy.username = ""
+                        netProxy.password = ""
+                    }
+                }
+                .onChange(of: netProxy) { netProxy in
+                    netCfg.socksProxy = useNetProxy && netProxy.valid
+                        ? netProxy.toProxyString()
+                        : nil
+                }
+
                Section {
                    Picker("Use .onion hosts", selection: $onionHosts) {
                        ForEach(OnionHosts.values, id: \.self) { Text($0.text) }
@@ -122,11 +196,14 @@ struct AdvancedNetworkSettings: View {
                if developerTools {
                    Section {
                        Picker("Transport isolation", selection: $netCfg.sessionMode) {
-                            ForEach(TransportSessionMode.values, id: \.self) { Text($0.text) }
+                            let modes = TransportSessionMode.values.contains(netCfg.sessionMode)
+                                ? TransportSessionMode.values
+                                : TransportSessionMode.values + [netCfg.sessionMode]
+                            ForEach(modes, id: \.self) { Text($0.text) }
                        }
                        .frame(height: 36)
                    } footer: {
-                        Text(sessionModeInfo(netCfg.sessionMode))
+                        sessionModeInfo(netCfg.sessionMode)
                            .foregroundColor(theme.colors.secondary)
                    }
                }
@@ -156,19 +233,19 @@ struct AdvancedNetworkSettings: View {
                
                Section {
                    Button("Reset to defaults") {
-                        updateNetCfgView(NetCfg.defaults)
+                        updateNetCfgView(NetCfg.defaults, NetworkProxy.def)
                    }
                    .disabled(netCfg == NetCfg.defaults)

                    Button("Set timeouts for proxy/VPN") {
-                        updateNetCfgView(netCfg.withProxyTimeouts)
+                        updateNetCfgView(netCfg.withProxyTimeouts, netProxy)
                    }
                    .disabled(netCfg.hasProxyTimeouts)
                    
                    Button("Save and reconnect") {
                        showSettingsAlert = .update
                    }
-                    .disabled(netCfg == currentNetCfg)
+                    .disabled(netCfg == currentNetCfg || (useNetProxy && !netProxy.valid))
                }
            }
        }
@@ -182,7 +259,8 @@ struct AdvancedNetworkSettings: View {
            if cfgLoaded { return }
            cfgLoaded = true
            currentNetCfg = getNetCfg()
-            updateNetCfgView(currentNetCfg)
+            currentNetProxy = networkProxyDefault.get()
+            updateNetCfgView(currentNetCfg, currentNetProxy)
        }
        .alert(item: $showSettingsAlert) { a in
            switch a {
@@ -206,7 +284,7 @@ struct AdvancedNetworkSettings: View {
            if netCfg == currentNetCfg {
                dismiss()
                cfgLoaded = false
-            } else {
+            } else if !useNetProxy || netProxy.valid {
                showSaveDialog = true
            }
        })
@@ -221,18 +299,26 @@ struct AdvancedNetworkSettings: View {
        }
    }

-    private func updateNetCfgView(_ cfg: NetCfg) {
+    private func updateNetCfgView(_ cfg: NetCfg, _ proxy: NetworkProxy) {
        netCfg = cfg
+        netProxy = proxy
        onionHosts = OnionHosts(netCfg: netCfg)
        enableKeepAlive = netCfg.enableKeepAlive
        keepAliveOpts = netCfg.tcpKeepAlive ?? KeepAliveOpts.defaults
+        useNetProxy = netCfg.socksProxy != nil
+        netProxyAuth = switch netProxy.auth {
+        case .username: netProxy.username != "" || netProxy.password != ""
+        case .isolate: false
+        }
    }

    private func saveNetCfg() -> Bool {
        do {
            try setNetworkConfig(netCfg)
            currentNetCfg = netCfg
-            setNetCfg(netCfg)
+            setNetCfg(netCfg, networkProxy: useNetProxy ? netProxy : nil)
+            currentNetProxy = netProxy
+            networkProxyDefault.set(netProxy)
            return true
        } catch let error {
            let err = responseError(error)
@@ -270,10 +356,13 @@ struct AdvancedNetworkSettings: View {
        }
    }

-    private func sessionModeInfo(_ mode: TransportSessionMode) -> LocalizedStringKey {
-        switch mode {
-        case .user: return "A separate TCP connection will be used **for each chat profile you have in the app**."
-        case .entity: return "A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail."
+    private func sessionModeInfo(_ mode: TransportSessionMode) -> Text {
+        let userMode = Text("A separate TCP connection will be used **for each chat profile you have in the app**.")
+        return switch mode {
+        case .user: userMode
+        case .session: userMode + Text("\n") + Text("New SOCKS credentials will be used every time you start the app.")
+        case .server: userMode + Text("\n") + Text("New SOCKS credentials will be used for each server.")
+        case .entity: Text("A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail.")
        }
    }
    
@@ -19,9 +19,15 @@ extension AppSettings {
                val.hostMode = .publicHost
                val.requiredHostMode = true
            }
-            val.socksProxy = nil
-            setNetCfg(val)
+            if val.socksProxy != nil {
+                val.socksProxy = networkProxy?.toProxyString()
+                setNetCfg(val, networkProxy: networkProxy)
+            } else {
+                val.socksProxy = nil
+                setNetCfg(val, networkProxy: nil)
+            }
        }
+        if let val = networkProxy { networkProxyDefault.set(val) }
        if let val = privacyEncryptLocalFiles { privacyEncryptLocalFilesGroupDefault.set(val) }
        if let val = privacyAskToApproveRelays { privacyAskToApproveRelaysGroupDefault.set(val) }
        if let val = privacyAcceptImages {
@@ -52,10 +58,12 @@ extension AppSettings {
            profileImageCornerRadiusGroupDefault.set(val)
            def.setValue(val, forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS)
        }
-        if let val = uiColorScheme { def.setValue(val, forKey: DEFAULT_CURRENT_THEME) }
-        if let val = uiDarkColorScheme { def.setValue(val, forKey: DEFAULT_SYSTEM_DARK_THEME) }
-        if let val = uiCurrentThemeIds { def.setValue(val, forKey: DEFAULT_CURRENT_THEME_IDS) }
-        if let val = uiThemes { def.setValue(val.skipDuplicates(), forKey: DEFAULT_THEME_OVERRIDES) }
+        if let val = uiChatItemRoundness { def.setValue(val, forKey: DEFAULT_CHAT_ITEM_ROUNDNESS)}
+        if let val = uiChatItemTail { def.setValue(val, forKey: DEFAULT_CHAT_ITEM_TAIL)}
+        if let val = uiColorScheme { currentThemeDefault.set(val) }
+        if let val = uiDarkColorScheme { systemDarkThemeDefault.set(val) }
+        if let val = uiCurrentThemeIds { currentThemeIdsDefault.set(val) }
+        if let val = uiThemes { themeOverridesDefault.set(val.skipDuplicates()) }
        if let val = oneHandUI { groupDefaults.setValue(val, forKey: GROUP_DEFAULT_ONE_HAND_UI) }
    }

@@ -63,6 +71,7 @@ extension AppSettings {
        let def = UserDefaults.standard
        var c = AppSettings.defaults
        c.networkConfig = getNetCfg()
+        c.networkProxy = networkProxyDefault.get()
        c.privacyEncryptLocalFiles = privacyEncryptLocalFilesGroupDefault.get()
        c.privacyAskToApproveRelays = privacyAskToApproveRelaysGroupDefault.get()
        c.privacyAcceptImages = privacyAcceptImagesGroupDefault.get()
@@ -84,6 +93,8 @@ extension AppSettings {
        c.iosCallKitEnabled = callKitEnabledGroupDefault.get()
        c.iosCallKitCallsInRecents = def.bool(forKey: DEFAULT_CALL_KIT_CALLS_IN_RECENTS)
        c.uiProfileImageCornerRadius = def.double(forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS)
+        c.uiChatItemRoundness = def.double(forKey: DEFAULT_CHAT_ITEM_ROUNDNESS)
+        c.uiChatItemTail = def.bool(forKey: DEFAULT_CHAT_ITEM_TAIL)
        c.uiColorScheme = currentThemeDefault.get()
        c.uiDarkColorScheme = systemDarkThemeDefault.get()
        c.uiCurrentThemeIds = currentThemeIdsDefault.get()
@@ -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, revealed: Binding.constant(false))
+                    ChatItemView(chat: Chat.sampleData, chatItem: alice)
                        .modifier(ChatItemClipped(alice, tailVisible: true))
                    Spacer()
                }
                HStack {
                    Spacer()
-                    ChatItemView(chat: Chat.sampleData, chatItem: bob, revealed: Binding.constant(false))
+                    ChatItemView(chat: Chat.sampleData, chatItem: bob)
                        .modifier(ChatItemClipped(bob, tailVisible: true))
                        .frame(alignment: .trailing)
                }
@@ -583,11 +583,14 @@ struct CustomizeThemeView: View {
                }
            }

-            ImportExportThemeSection(perChat: nil, perUser: nil, save: { theme in
+            ImportExportThemeSection(showFileImporter: $showFileImporter, perChat: nil, perUser: nil)
+        }
+        .modifier(
+            ThemeImporter(isPresented: $showFileImporter) { 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)
    }
@@ -595,10 +598,9 @@ 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 {
@@ -626,39 +628,47 @@ struct ImportExportThemeSection: View {
            } label: {
                Text("Import theme").foregroundColor(theme.colors.primary)
            }
-            .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
-                        }
-                        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)")
+        }
+    }
+}
+
+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")
+                        }
+                        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)")
                }
            }
        }
@@ -808,7 +818,7 @@ struct ThemeDestinationPicker: View {
    @Binding var customizeThemeIsOpen: Bool

    var body: some View {
-        let values = [(nil, "All profiles")] + m.users.filter { $0.user.activeUser }.map { ($0.user.userId, $0.user.chatViewName)}
+        let values = [(nil, NSLocalizedString("All profiles", comment: "profile dropdown"))] + m.users.filter { $0.user.activeUser }.map { ($0.user.userId, $0.user.chatViewName)}

        if values.contains(where: { (userId, text) in userId == themeUserDestination?.0 }) {
            Picker("Apply to", selection: $themeUserDest) {
@@ -32,6 +32,17 @@ struct PreferencesView: View {
                .disabled(currentPreferences == preferences)
            }
        }
+        .onDisappear {
+            if currentPreferences != preferences {
+                showAlert(
+                    title: NSLocalizedString("Your chat preferences", comment: "alert title"),
+                    message: NSLocalizedString("Chat preferences were changed.", comment: "alert message"),
+                    buttonTitle: NSLocalizedString("Save", comment: "alert button"),
+                    buttonAction: savePreferences,
+                    cancelButton: true
+                )
+            }
+        }
    }

    private func featureSection(_ feature: ChatFeature, _ allowFeature: Binding<FeatureAllowed>) -> some View {
@@ -75,6 +75,8 @@ let DEFAULT_SYSTEM_DARK_THEME = "systemDarkTheme"
 let DEFAULT_CURRENT_THEME_IDS = "currentThemeIds"
 let DEFAULT_THEME_OVERRIDES = "themeOverrides"

+let DEFAULT_NETWORK_PROXY = "networkProxy"
+
 let ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN = "androidCallOnLockScreen"

 let defaultChatItemRoundness: Double = 0.75
@@ -251,13 +253,14 @@ public class CodableDefault<T: Codable> {
    }
 }

+let networkProxyDefault: CodableDefault<NetworkProxy> = CodableDefault(defaults: UserDefaults.standard, forKey: DEFAULT_NETWORK_PROXY, withDefault: NetworkProxy.def)

 struct SettingsView: View {
    @Environment(\.colorScheme) var colorScheme
+    @Environment(\.dismiss) var dismiss
    @EnvironmentObject var chatModel: ChatModel
    @EnvironmentObject var sceneDelegate: SceneDelegate
    @EnvironmentObject var theme: AppTheme
-    @Binding var showSettings: Bool
    @State private var showProgress: Bool = false

    var body: some View {
@@ -266,71 +269,12 @@ struct SettingsView: View {
            if showProgress {
                progressView()
            }
-            if let la = chatModel.laRequest {
-                LocalAuthView(authRequest: la)
-            }
        }
    }

    @ViewBuilder func settingsView() -> some View {
        let user = chatModel.currentUser
-        NavigationView {
            List {
-                Section(header: Text("You").foregroundColor(theme.colors.secondary)) {
-                    if let user = user {
-                        NavigationLink {
-                            UserProfile()
-                                .navigationTitle("Your current profile")
-                                .modifier(ThemedBackground())
-                        } label: {
-                            ProfilePreview(profileOf: user)
-                                .padding(.leading, -8)
-                        }
-                    }
-
-                    NavigationLink {
-                        UserProfilesView(showSettings: $showSettings)
-                    } label: {
-                        settingsRow("person.crop.rectangle.stack", color: theme.colors.secondary) { Text("Your chat profiles") }
-                    }
-
-
-                    if let user = user {
-                        NavigationLink {
-                            UserAddressView(shareViaProfile: user.addressShared)
-                                .navigationTitle("SimpleX address")
-                                .modifier(ThemedBackground(grouped: true))
-                                .navigationBarTitleDisplayMode(.large)
-                        } label: {
-                            settingsRow("qrcode", color: theme.colors.secondary) { Text("Your SimpleX address") }
-                        }
-
-                        NavigationLink {
-                            PreferencesView(profile: user.profile, preferences: user.fullPreferences, currentPreferences: user.fullPreferences)
-                                .navigationTitle("Your preferences")
-                                .modifier(ThemedBackground(grouped: true))
-                        } label: {
-                            settingsRow("switch.2", color: theme.colors.secondary) { Text("Chat preferences") }
-                        }
-                    }
-
-                    NavigationLink {
-                        ConnectDesktopView(viaSettings: true)
-                    } label: {
-                        settingsRow("desktopcomputer", color: theme.colors.secondary) { Text("Use from desktop") }
-                    }
-
-                    NavigationLink {
-                        MigrateFromDevice(showSettings: $showSettings, showProgressOnSettings: $showProgress)
-                            .navigationTitle("Migrate device")
-                            .modifier(ThemedBackground(grouped: true))
-                            .navigationBarTitleDisplayMode(.large)
-                    } label: {
-                        settingsRow("tray.and.arrow.up", color: theme.colors.secondary) { Text("Migrate to another device") }
-                    }
-                }
-                .disabled(chatModel.chatRunning != true)
-
                Section(header: Text("Settings").foregroundColor(theme.colors.secondary)) {
                    NavigationLink {
                        NotificationsView()
@@ -381,14 +325,29 @@ struct SettingsView: View {
                        }
                        .disabled(chatModel.chatRunning != true)
                    }
-                    
-                    chatDatabaseRow()
                }

+                Section(header: Text("Chat database").foregroundColor(theme.colors.secondary)) {
+                    chatDatabaseRow()
+                    NavigationLink {
+                        MigrateFromDevice(showProgressOnSettings: $showProgress)
+                            .toolbar {
+                                // Redaction broken for `.navigationTitle` - using a toolbar item instead.
+                                ToolbarItem(placement: .principal) {
+                                    Text("Migrate device").font(.headline)
+                                }
+                            }
+                            .modifier(ThemedBackground(grouped: true))
+                            .navigationBarTitleDisplayMode(.large)
+                    } label: {
+                        settingsRow("tray.and.arrow.up", color: theme.colors.secondary) { Text("Migrate to another device") }
+                    }
+                }
+                
                Section(header: Text("Help").foregroundColor(theme.colors.secondary)) {
                    if let user = user {
                        NavigationLink {
-                            ChatHelp(showSettings: $showSettings)
+                            ChatHelp(dismissSettingsSheet: dismiss)
                                .navigationTitle("Welcome \(user.displayName)!")
                                .modifier(ThemedBackground())
                                .frame(maxHeight: .infinity, alignment: .top)
@@ -413,7 +372,7 @@ struct SettingsView: View {
                    }
                    settingsRow("number", color: theme.colors.secondary) {
                        Button("Send questions and ideas") {
-                            showSettings = false
+                            dismiss()
                            DispatchQueue.main.async {
                                UIApplication.shared.open(simplexTeamURL)
                            }
@@ -462,16 +421,15 @@ struct SettingsView: View {
            }
            .navigationTitle("Your settings")
            .modifier(ThemedBackground(grouped: true))
-        }
-        .onDisappear {
-            chatModel.showingTerminal = false
-            chatModel.terminalItems = []
-        }
+            .onDisappear {
+                chatModel.showingTerminal = false
+                chatModel.terminalItems = []
+            }
    }
    
    private func chatDatabaseRow() -> some View {
        NavigationLink {
-            DatabaseView(showSettings: $showSettings, chatItemTTL: chatModel.chatItemTTL)
+            DatabaseView(dismissSettingsSheet: dismiss, chatItemTTL: chatModel.chatItemTTL)
                .navigationTitle("Your chat database")
                .modifier(ThemedBackground(grouped: true))
        } label: {
@@ -549,26 +507,25 @@ struct ProfilePreview: View {
        HStack {
            ProfileImage(imageStr: profileOf.image, size: 44, color: color)
                .padding(.trailing, 6)
-                .padding(.vertical, 6)
-            VStack(alignment: .leading) {
-                Text(profileOf.displayName)
-                    .fontWeight(.bold)
-                    .font(.title2)
-                if profileOf.fullName != "" && profileOf.fullName != profileOf.displayName {
-                    Text(profileOf.fullName)
-                }
-            }
+            profileName(profileOf).lineLimit(1)
        }
    }
 }

+func profileName(_ profileOf: NamedChat) -> Text {
+    var t = Text(profileOf.displayName).fontWeight(.semibold).font(.title2)
+    if profileOf.fullName != "" && profileOf.fullName != profileOf.displayName {
+        t = t + Text(" (" + profileOf.fullName + ")")
+//                        .font(.callout)
+        }
+    return t
+}
+
 struct SettingsView_Previews: PreviewProvider {
    static var previews: some View {
        let chatModel = ChatModel()
        chatModel.currentUser = User.sampleData
-        @State var showSettings = false
-
-        return SettingsView(showSettings: $showSettings)
+        return SettingsView()
            .environmentObject(chatModel)
    }
 }
@@ -14,7 +14,6 @@ struct UserAddressView: View {
    @Environment(\.dismiss) var dismiss: DismissAction
    @EnvironmentObject private var chatModel: ChatModel
    @EnvironmentObject var theme: AppTheme
-    @State var viaCreateLinkView = false
    @State var shareViaProfile = false
    @State private var aas = AutoAcceptState()
    @State private var savedAAS = AutoAcceptState()
@@ -22,7 +21,6 @@ struct UserAddressView: View {
    @State private var showMailView = false
    @State private var mailViewResult: Result<MFMailComposeResult, Error>? = nil
    @State private var alert: UserAddressAlert?
-    @State private var showSaveDialogue = false
    @State private var progressIndicator = false
    @FocusState private var keyboardVisible: Bool

@@ -44,26 +42,19 @@ struct UserAddressView: View {
    
    var body: some View {
        ZStack {
-            if viaCreateLinkView {
-                userAddressScrollView()
-            } else {
-                userAddressScrollView()
-                    .modifier(BackButton(disabled: Binding.constant(false)) {
-                        if savedAAS == aas {
-                            dismiss()
-                        } else {
-                            keyboardVisible = false
-                            showSaveDialogue = true
-                        }
-                    })
-                    .confirmationDialog("Save settings?", isPresented: $showSaveDialogue) {
-                        Button("Save auto-accept settings") {
-                            saveAAS()
-                            dismiss()
-                        }
-                        Button("Exit without saving") { dismiss() }
+            userAddressScrollView()
+                .onDisappear {
+                    if savedAAS != aas {
+                        showAlert(
+                            title: NSLocalizedString("Auto-accept settings", comment: "alert title"),
+                            message: NSLocalizedString("Settings were changed.", comment: "alert message"),
+                            buttonTitle: NSLocalizedString("Save", comment: "alert button"),
+                            buttonAction: saveAAS,
+                            cancelButton: true
+                        )
                    }
-            }
+                }
+
            if progressIndicator {
                ZStack {
                    if chatModel.userAddress != nil {
@@ -342,7 +333,7 @@ struct UserAddressView: View {
            }
        }
    }
-
+    
    private struct AutoAcceptState: Equatable {
        var enable = false
        var incognito = false
@@ -447,6 +438,8 @@ struct UserAddressView_Previews: PreviewProvider {
    static var previews: some View {
        let chatModel = ChatModel()
        chatModel.userAddress = UserContactLink(connReqContact: "https://simplex.chat/contact#/?v=1&smp=smp%3A%2F%2FPQUV2eL0t7OStZOoAsPEV2QYWt4-xilbakvGUGOItUo%3D%40smp6.simplex.im%2FK1rslx-m5bpXVIdMZg9NLUZ_8JBm8xTt%23MCowBQYDK2VuAyEALDeVe-sG8mRY22LsXlPgiwTNs9dbiLrNuA7f3ZMAJ2w%3D")
+
+        
        return Group {
            UserAddressView()
                .environmentObject(chatModel)
@@ -9,7 +9,6 @@ import SimpleXChat
 struct UserProfilesView: View {
    @EnvironmentObject private var m: ChatModel
    @EnvironmentObject private var theme: AppTheme
-    @Binding var showSettings: Bool
    @Environment(\.editMode) private var editMode
    @AppStorage(DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE) private var showHiddenProfilesNotice = true
    @AppStorage(DEFAULT_SHOW_MUTE_PROFILE_ALERT) private var showMuteProfileAlert = true
@@ -96,8 +95,7 @@ struct UserProfilesView: View {
                    } label: {
                        Label("Add profile", systemImage: "plus")
                    }
-                    .frame(height: 44)
-                    .padding(.vertical, 4)
+                    .frame(height: 38)
                }
            } footer: {
                Text("Tap to activate profile.")
@@ -285,7 +283,7 @@ struct UserProfilesView: View {
                    await MainActor.run {
                        onboardingStageDefault.set(.step1_SimpleXInfo)
                        m.onboardingStage = .step1_SimpleXInfo
-                        showSettings = false
+                        dismissAllSheets()
                    }
                }
            } else {
@@ -308,14 +306,14 @@ struct UserProfilesView: View {
            Task {
                do {
                    try await changeActiveUserAsync_(user.userId, viewPwd: userViewPassword(user))
+                    dismissAllSheets()
                } catch {
                    await MainActor.run { alert = .activateUserError(error: responseError(error)) }
                }
            }
        } label: {
            HStack {
-                ProfileImage(imageStr: user.image, size: 44)
-                    .padding(.vertical, 4)
+                ProfileImage(imageStr: user.image, size: 38)
                    .padding(.trailing, 12)
                Text(user.chatViewName)
                Spacer()
@@ -415,6 +413,6 @@ public func correctPassword(_ user: User, _ pwd: String) -> Bool {

 struct UserProfilesView_Previews: PreviewProvider {
    static var previews: some View {
-        UserProfilesView(showSettings: Binding.constant(true))
+        UserProfilesView()
    }
 }
@@ -161,11 +161,31 @@
        <target>%d дни</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
+        <source>%d file(s) are still being downloaded.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
+        <source>%d file(s) failed to download.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
+        <source>%d file(s) were deleted.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
+        <source>%d file(s) were not downloaded.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
      <trans-unit id="%d hours" xml:space="preserve">
        <source>%d hours</source>
        <target>%d часа</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve">
+        <source>%d messages not forwarded</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="%d min" xml:space="preserve">
        <source>%d min</source>
        <target>%d мин.</target>
@@ -717,7 +737,7 @@
      </trans-unit>
      <trans-unit id="All profiles" xml:space="preserve">
        <source>All profiles</source>
-        <note>No comment provided by engineer.</note>
+        <note>profile dropdown</note>
      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
@@ -905,6 +925,10 @@
        <target>Кода за достъп до приложение се заменя с код за самоунищожение.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="App session" xml:space="preserve">
+        <source>App session</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="App version" xml:space="preserve">
        <source>App version</source>
        <target>Версия на приложението</target>
@@ -1007,6 +1031,10 @@
        <target>Автоматично приемане на изображения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Auto-accept settings" xml:space="preserve">
+        <source>Auto-accept settings</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>Назад</target>
@@ -1031,11 +1059,19 @@
        <target>Лош хеш на съобщението</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better calls" xml:space="preserve">
+        <source>Better calls</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
        <source>Better groups</source>
        <target>По-добри групи</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better message dates." xml:space="preserve">
+        <source>Better message dates.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>По-добри съобщения</target>
@@ -1045,6 +1081,18 @@
        <source>Better networking</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better notifications" xml:space="preserve">
+        <source>Better notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better security ✅" xml:space="preserve">
+        <source>Better security ✅</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better user experience" xml:space="preserve">
+        <source>Better user experience</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
        <source>Black</source>
        <note>No comment provided by engineer.</note>
@@ -1171,7 +1219,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>Отказ</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Cancel migration" xml:space="preserve">
        <source>Cancel migration</source>
@@ -1190,7 +1238,7 @@
      <trans-unit id="Cannot receive file" xml:space="preserve">
        <source>Cannot receive file</source>
        <target>Файлът не може да бъде получен</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1314,6 +1362,15 @@
        <target>Чат настройки</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat preferences were changed." xml:space="preserve">
+        <source>Chat preferences were changed.</source>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Chat profile" xml:space="preserve">
+        <source>Chat profile</source>
+        <target>Потребителски профил</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <note>No comment provided by engineer.</note>
@@ -1816,6 +1873,10 @@ This is your own one-time link!</source>
        <target>Персонализирано време</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Customizable message shape." xml:space="preserve">
+        <source>Customizable message shape.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
        <source>Customize theme</source>
        <note>No comment provided by engineer.</note>
@@ -2105,6 +2166,10 @@ This is your own one-time link!</source>
        <target>Изтрий старата база данни?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
+        <source>Delete or moderate up to 200 messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
        <source>Delete pending connection?</source>
        <target>Изтрий предстоящата връзка?</target>
@@ -2342,6 +2407,10 @@ This is your own one-time link!</source>
        <target>Не изпращай история на нови членове.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
+        <source>Do not use credentials with proxy.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>Не създавай адрес</target>
@@ -2365,7 +2434,8 @@ This is your own one-time link!</source>
      <trans-unit id="Download" xml:space="preserve">
        <source>Download</source>
        <target>Изтегли</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Download errors" xml:space="preserve">
        <source>Download errors</source>
@@ -2381,6 +2451,10 @@ This is your own one-time link!</source>
        <target>Свали файл</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Download files" xml:space="preserve">
+        <source>Download files</source>
+        <note>alert action</note>
+      </trans-unit>
      <trans-unit id="Downloaded" xml:space="preserve">
        <source>Downloaded</source>
        <note>No comment provided by engineer.</note>
@@ -2789,6 +2863,10 @@ This is your own one-time link!</source>
        <target>Грешка при зареждане на %@ сървъри</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error migrating settings" xml:space="preserve">
+        <source>Error migrating settings</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error opening chat" xml:space="preserve">
        <source>Error opening chat</source>
        <target>Грешка при отваряне на чата</target>
@@ -2797,7 +2875,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>Грешка при получаване на файл</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Error reconnecting server" xml:space="preserve">
        <source>Error reconnecting server</source>
@@ -2893,7 +2971,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Грешка при смяна на профил!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alertTitle</note>
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
@@ -2938,8 +3016,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Грешка: %@</target>
-        <note>file error text
-   snd error text</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -3023,6 +3100,11 @@ This is your own one-time link!</source>
        <source>File error</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
+        <source>File errors:
+%@</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
        <source>File not found - most likely file was deleted or cancelled.</source>
        <note>file error text</note>
@@ -3153,11 +3235,27 @@ This is your own one-time link!</source>
        <target>Препрати</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
+        <source>Forward %d message(s)?</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
        <target>Препращане и запазване на съобщения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forward messages" xml:space="preserve">
+        <source>Forward messages</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Forward messages without files?" xml:space="preserve">
+        <source>Forward messages without files?</source>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
+        <source>Forward up to 20 messages at once.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
        <source>Forwarded</source>
        <target>Препратено</target>
@@ -3168,6 +3266,10 @@ This is your own one-time link!</source>
        <target>Препратено от</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
+        <source>Forwarding %lld messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
        <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
        <note>No comment provided by engineer.</note>
@@ -3210,11 +3312,6 @@ Error: %2$@</source>
        <target>Пълно име (незадължително)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>Пълно име:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
        <source>Fully decentralized – visible only to members.</source>
        <target>Напълно децентрализирана – видима е само за членовете.</target>
@@ -3458,6 +3555,10 @@ Error: %2$@</source>
        <target>ICE сървъри (по един на ред)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="IP address" xml:space="preserve">
+        <source>IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
        <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
        <target>Ако не можете да се срещнете лично, покажете QR код във видеоразговора или споделете линка.</target>
@@ -3532,6 +3633,11 @@ Error: %2$@</source>
        <target>Импортиране на архив</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
        <source>Improved message delivery</source>
        <target>Подобрена доставка на съобщения</target>
@@ -4139,6 +4245,10 @@ This is your link for group %@!</source>
        <source>Messages sent</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
+        <source>Messages were deleted after you selected them.</source>
+        <note>alert message</note>
+      </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>
@@ -4293,6 +4403,14 @@ This is your link for group %@!</source>
        <target>Нов kод за достъп</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
+        <source>New SOCKS credentials will be used every time you start the app.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
+        <source>New SOCKS credentials will be used for each server.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New chat" xml:space="preserve">
        <source>New chat</source>
        <target>Нов чат</target>
@@ -4409,6 +4527,14 @@ This is your link for group %@!</source>
        <target>Няма мрежова връзка</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No permission to record speech" xml:space="preserve">
+        <source>No permission to record speech</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No permission to record video" xml:space="preserve">
+        <source>No permission to record video</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>Няма разрешение за запис на гласово съобщение</target>
@@ -4428,6 +4554,10 @@ This is your link for group %@!</source>
        <source>Nothing selected</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Nothing to forward!" xml:space="preserve">
+        <source>Nothing to forward!</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Известия</target>
@@ -4460,7 +4590,7 @@ This is your link for group %@!</source>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>Ок</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Old database" xml:space="preserve">
        <source>Old database</source>
@@ -4648,6 +4778,11 @@ Requires compatible VPN.</source>
        <source>Other %@ servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
+        <source>Other file errors:
+%@</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>PING бройка</target>
@@ -4683,6 +4818,10 @@ Requires compatible VPN.</source>
        <target>Кодът за достъп е зададен!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Password" xml:space="preserve">
+        <source>Password</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Password to show" xml:space="preserve">
        <source>Password to show</source>
        <target>Парола за показване</target>
@@ -4827,6 +4966,10 @@ Error: %@</source>
        <target>Полски интерфейс</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Port" xml:space="preserve">
+        <source>Port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
        <source>Possibly, certificate fingerprint in server address is incorrect</source>
        <target>Въжможно е пръстовият отпечатък на сертификата в адреса на сървъра да е неправилен</target>
@@ -4907,16 +5050,6 @@ Error: %@</source>
        <target>Профилни изображения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Име на профила</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Име на профила:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Профилна парола</target>
@@ -5013,6 +5146,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Proxied servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Proxy requires password" xml:space="preserve">
+        <source>Proxy requires password</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Push известия</target>
@@ -5224,6 +5361,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Премахване</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Remove archive?" xml:space="preserve">
+        <source>Remove archive?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Remove image" xml:space="preserve">
        <source>Remove image</source>
        <note>No comment provided by engineer.</note>
@@ -5397,6 +5538,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>SMP server</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="SOCKS proxy" xml:space="preserve">
+        <source>SOCKS proxy</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Safely receive files" xml:space="preserve">
        <source>Safely receive files</source>
        <note>No comment provided by engineer.</note>
@@ -5409,12 +5554,13 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Запази</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Save (and notify contacts)" xml:space="preserve">
        <source>Save (and notify contacts)</source>
        <target>Запази (и уведоми контактите)</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
@@ -5440,11 +5586,6 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Запази архив</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save auto-accept settings" xml:space="preserve">
-        <source>Save auto-accept settings</source>
-        <target>Запази настройките за автоматично приемане</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save group profile" xml:space="preserve">
        <source>Save group profile</source>
        <target>Запази профила на групата</target>
@@ -5480,16 +5621,15 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Запази сървърите?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>Запази настройките?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save welcome message?" xml:space="preserve">
        <source>Save welcome message?</source>
        <target>Запази съобщението при посрещане?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Save your profile?" xml:space="preserve">
+        <source>Save your profile?</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <target>Запазено</target>
@@ -5510,6 +5650,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Запазено съобщение</target>
        <note>message info title</note>
      </trans-unit>
+      <trans-unit id="Saving %lld messages" xml:space="preserve">
+        <source>Saving %lld messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Scale" xml:space="preserve">
        <source>Scale</source>
        <note>No comment provided by engineer.</note>
@@ -5702,7 +5846,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>Подателят отмени прехвърлянето на файла.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
        <source>Sender may have deleted the connection request.</source>
@@ -5794,6 +5938,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Sent via proxy</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Server" xml:space="preserve">
+        <source>Server</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Server address" xml:space="preserve">
        <source>Server address</source>
        <note>No comment provided by engineer.</note>
@@ -5905,6 +6053,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Настройки</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Settings were changed." xml:space="preserve">
+        <source>Settings were changed.</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
        <target>Променете формата на профилните изображения</target>
@@ -6073,6 +6225,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Еднократна покана за SimpleX</target>
        <note>simplex link type</note>
      </trans-unit>
+      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
+        <source>SimpleX protocols reviewed by Trail of Bits.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
        <source>Simplified incognito mode</source>
        <target>Опростен режим инкогнито</target>
@@ -6101,6 +6257,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Soft</source>
        <note>blur media</note>
      </trans-unit>
+      <trans-unit id="Some app settings were not migrated." xml:space="preserve">
+        <source>Some app settings were not migrated.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
        <source>Some file(s) were not exported:</source>
        <note>No comment provided by engineer.</note>
@@ -6233,6 +6393,14 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Подкрепете SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
+        <source>Switch audio and video during the call.</source>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
        <source>System</source>
        <target>Системен</target>
@@ -6459,6 +6627,10 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Текстът, който поставихте, не е SimpleX линк за връзка.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
+        <source>The uploaded database archive will be permanently removed from the servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <note>No comment provided by engineer.</note>
@@ -6582,6 +6754,14 @@ You will be prompted to complete authentication before this feature is enabled.<
 Ще бъдете подканени да извършите идентификация, преди тази функция да бъде активирана.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
+        <source>To record speech please grant permission to use Microphone.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
+        <source>To record video please grant permission to use Camera.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
        <source>To record voice message please grant permission to use Microphone.</source>
        <target>За да запишете гласово съобщение, моля, дайте разрешение за използване на микрофон.</target>
@@ -6730,7 +6910,7 @@ You will be prompted to complete authentication before this feature is enabled.<
      </trans-unit>
      <trans-unit id="Unknown servers!" xml:space="preserve">
        <source>Unknown servers!</source>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
        <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -6840,6 +7020,10 @@ To connect, please ask your contact to create another connection link and check
        <target>Използвай .onion хостове</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
+        <source>Use SOCKS proxy</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
        <source>Use SimpleX Chat servers?</source>
        <target>Използвай сървърите на SimpleX Chat?</target>
@@ -6902,15 +7086,14 @@ To connect, please ask your contact to create another connection link and check
        <source>Use the app with one hand.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="User profile" xml:space="preserve">
-        <source>User profile</source>
-        <target>Потребителски профил</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="User selection" xml:space="preserve">
        <source>User selection</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Username" xml:space="preserve">
+        <source>Username</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
        <source>Using SimpleX Chat servers.</source>
        <target>Използват се сървърите на SimpleX Chat.</target>
@@ -7140,7 +7323,7 @@ To connect, please ask your contact to create another connection link and check
      </trans-unit>
      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Wrong database passphrase" xml:space="preserve">
        <source>Wrong database passphrase</source>
@@ -7164,11 +7347,6 @@ To connect, please ask your contact to create another connection link and check
        <source>XFTP server</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You" xml:space="preserve">
-        <source>You</source>
-        <target>Вие</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
        <source>You **must not** use the same database on two devices.</source>
        <target>**Не трябва** да използвате една и съща база данни на две устройства.</target>
@@ -7511,6 +7689,10 @@ Repeat connection request?</source>
        <target>Вашата чат база данни не е криптирана - задайте парола, за да я криптирате.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat preferences" xml:space="preserve">
+        <source>Your chat preferences</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Вашите чат профили</target>
@@ -7535,6 +7717,10 @@ Repeat connection request?</source>
        <target>Вашите контакти ще останат свързани.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
+        <source>Your credentials may be sent unencrypted.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
        <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
        <target>Вашата текуща чат база данни ще бъде ИЗТРИТА и ЗАМЕНЕНА с импортираната.</target>
@@ -7565,13 +7751,15 @@ Repeat connection request?</source>
        <target>Вашият профил **%@** ще бъде споделен.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
-        <source>Your profile is stored on your device and shared only with your contacts.
-SimpleX servers cannot see your profile.</source>
-        <target>Вашият профил се съхранява на вашето устройство и се споделя само с вашите контакти.
-SimpleX сървърите не могат да видят вашия профил.</target>
+      <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
+        <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
+        <target>Вашият профил се съхранява на вашето устройство и се споделя само с вашите контакти. SimpleX сървърите не могат да видят вашия профил.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
+        <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Вашият профил, контакти и доставени съобщения се съхраняват на вашето устройство.</target>
@@ -158,11 +158,31 @@
        <target>%d dní</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
+        <source>%d file(s) are still being downloaded.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
+        <source>%d file(s) failed to download.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
+        <source>%d file(s) were deleted.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
+        <source>%d file(s) were not downloaded.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
      <trans-unit id="%d hours" xml:space="preserve">
        <source>%d hours</source>
        <target>%d hodin</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve">
+        <source>%d messages not forwarded</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="%d min" xml:space="preserve">
        <source>%d min</source>
        <target>%d minuty</target>
@@ -695,7 +715,7 @@
      </trans-unit>
      <trans-unit id="All profiles" xml:space="preserve">
        <source>All profiles</source>
-        <note>No comment provided by engineer.</note>
+        <note>profile dropdown</note>
      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
@@ -878,6 +898,10 @@
        <target>Přístupový kód aplikace je nahrazen sebedestrukčním přístupovým heslem.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="App session" xml:space="preserve">
+        <source>App session</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="App version" xml:space="preserve">
        <source>App version</source>
        <target>Verze aplikace</target>
@@ -977,6 +1001,10 @@
        <target>Automaticky přijímat obrázky</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Auto-accept settings" xml:space="preserve">
+        <source>Auto-accept settings</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>Zpět</target>
@@ -1000,10 +1028,18 @@
        <target>Špatný hash zprávy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better calls" xml:space="preserve">
+        <source>Better calls</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
        <source>Better groups</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better message dates." xml:space="preserve">
+        <source>Better message dates.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>Lepší zprávy</target>
@@ -1013,6 +1049,18 @@
        <source>Better networking</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better notifications" xml:space="preserve">
+        <source>Better notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better security ✅" xml:space="preserve">
+        <source>Better security ✅</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better user experience" xml:space="preserve">
+        <source>Better user experience</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
        <source>Black</source>
        <note>No comment provided by engineer.</note>
@@ -1131,7 +1179,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>Zrušit</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Cancel migration" xml:space="preserve">
        <source>Cancel migration</source>
@@ -1149,7 +1197,7 @@
      <trans-unit id="Cannot receive file" xml:space="preserve">
        <source>Cannot receive file</source>
        <target>Nelze přijmout soubor</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1270,6 +1318,15 @@
        <target>Předvolby chatu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat preferences were changed." xml:space="preserve">
+        <source>Chat preferences were changed.</source>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Chat profile" xml:space="preserve">
+        <source>Chat profile</source>
+        <target>Profil uživatele</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <note>No comment provided by engineer.</note>
@@ -1746,6 +1803,10 @@ This is your own one-time link!</source>
        <target>Vlastní čas</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Customizable message shape." xml:space="preserve">
+        <source>Customizable message shape.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
        <source>Customize theme</source>
        <note>No comment provided by engineer.</note>
@@ -2032,6 +2093,10 @@ This is your own one-time link!</source>
        <target>Smazat starou databázi?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
+        <source>Delete or moderate up to 200 messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
        <source>Delete pending connection?</source>
        <target>Smazat čekající připojení?</target>
@@ -2263,6 +2328,10 @@ This is your own one-time link!</source>
        <source>Do not send history to new members.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
+        <source>Do not use credentials with proxy.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>Nevytvářet adresu</target>
@@ -2285,7 +2354,8 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Download" xml:space="preserve">
        <source>Download</source>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Download errors" xml:space="preserve">
        <source>Download errors</source>
@@ -2300,6 +2370,10 @@ This is your own one-time link!</source>
        <target>Stáhnout soubor</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Download files" xml:space="preserve">
+        <source>Download files</source>
+        <note>alert action</note>
+      </trans-unit>
      <trans-unit id="Downloaded" xml:space="preserve">
        <source>Downloaded</source>
        <note>No comment provided by engineer.</note>
@@ -2694,6 +2768,10 @@ This is your own one-time link!</source>
        <target>Chyba načítání %@ serverů</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error migrating settings" xml:space="preserve">
+        <source>Error migrating settings</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error opening chat" xml:space="preserve">
        <source>Error opening chat</source>
        <note>No comment provided by engineer.</note>
@@ -2701,7 +2779,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>Chyba při příjmu souboru</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Error reconnecting server" xml:space="preserve">
        <source>Error reconnecting server</source>
@@ -2795,7 +2873,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Chyba při přepínání profilu!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alertTitle</note>
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
@@ -2838,8 +2916,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Chyba: %@</target>
-        <note>file error text
-   snd error text</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2920,6 +2997,11 @@ This is your own one-time link!</source>
        <source>File error</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
+        <source>File errors:
+%@</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
        <source>File not found - most likely file was deleted or cancelled.</source>
        <note>file error text</note>
@@ -3046,10 +3128,26 @@ This is your own one-time link!</source>
        <source>Forward</source>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
+        <source>Forward %d message(s)?</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forward messages" xml:space="preserve">
+        <source>Forward messages</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Forward messages without files?" xml:space="preserve">
+        <source>Forward messages without files?</source>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
+        <source>Forward up to 20 messages at once.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
        <source>Forwarded</source>
        <note>No comment provided by engineer.</note>
@@ -3058,6 +3156,10 @@ This is your own one-time link!</source>
        <source>Forwarded from</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
+        <source>Forwarding %lld messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
        <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
        <note>No comment provided by engineer.</note>
@@ -3099,11 +3201,6 @@ Error: %2$@</source>
        <target>Celé jméno (volitelně)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>Celé jméno:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
        <source>Fully decentralized – visible only to members.</source>
        <note>No comment provided by engineer.</note>
@@ -3341,6 +3438,10 @@ Error: %2$@</source>
        <target>Servery ICE (jeden na řádek)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="IP address" xml:space="preserve">
+        <source>IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
        <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
        <target>Pokud se nemůžete setkat osobně, zobrazte QR kód ve videohovoru nebo sdílejte odkaz.</target>
@@ -3413,6 +3514,11 @@ Error: %2$@</source>
        <source>Importing archive</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
        <source>Improved message delivery</source>
        <note>No comment provided by engineer.</note>
@@ -3995,6 +4101,10 @@ This is your link for group %@!</source>
        <source>Messages sent</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
+        <source>Messages were deleted after you selected them.</source>
+        <note>alert message</note>
+      </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>
        <note>No comment provided by engineer.</note>
@@ -4137,6 +4247,14 @@ This is your link for group %@!</source>
        <target>Nové heslo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
+        <source>New SOCKS credentials will be used every time you start the app.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
+        <source>New SOCKS credentials will be used for each server.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New chat" xml:space="preserve">
        <source>New chat</source>
        <note>No comment provided by engineer.</note>
@@ -4251,6 +4369,14 @@ This is your link for group %@!</source>
        <source>No network connection</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No permission to record speech" xml:space="preserve">
+        <source>No permission to record speech</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No permission to record video" xml:space="preserve">
+        <source>No permission to record video</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>Nemáte oprávnění nahrávat hlasové zprávy</target>
@@ -4269,6 +4395,10 @@ This is your link for group %@!</source>
        <source>Nothing selected</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Nothing to forward!" xml:space="preserve">
+        <source>Nothing to forward!</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Oznámení</target>
@@ -4300,7 +4430,7 @@ This is your link for group %@!</source>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>Ok</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Old database" xml:space="preserve">
        <source>Old database</source>
@@ -4480,6 +4610,11 @@ Vyžaduje povolení sítě VPN.</target>
        <source>Other %@ servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
+        <source>Other file errors:
+%@</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>Počet PING</target>
@@ -4515,6 +4650,10 @@ Vyžaduje povolení sítě VPN.</target>
        <target>Heslo nastaveno!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Password" xml:space="preserve">
+        <source>Password</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Password to show" xml:space="preserve">
        <source>Password to show</source>
        <target>Heslo k zobrazení</target>
@@ -4651,6 +4790,10 @@ Error: %@</source>
        <target>Polské rozhraní</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Port" xml:space="preserve">
+        <source>Port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
        <source>Possibly, certificate fingerprint in server address is incorrect</source>
        <target>Je možné, že otisk certifikátu v adrese serveru je nesprávný</target>
@@ -4729,14 +4872,6 @@ Error: %@</source>
        <source>Profile images</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Heslo profilu</target>
@@ -4832,6 +4967,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Proxied servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Proxy requires password" xml:space="preserve">
+        <source>Proxy requires password</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Nabízená oznámení</target>
@@ -5038,6 +5177,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Odstranit</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Remove archive?" xml:space="preserve">
+        <source>Remove archive?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Remove image" xml:space="preserve">
        <source>Remove image</source>
        <note>No comment provided by engineer.</note>
@@ -5205,6 +5348,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>SMP server</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="SOCKS proxy" xml:space="preserve">
+        <source>SOCKS proxy</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Safely receive files" xml:space="preserve">
        <source>Safely receive files</source>
        <note>No comment provided by engineer.</note>
@@ -5216,12 +5363,13 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Uložit</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Save (and notify contacts)" xml:space="preserve">
        <source>Save (and notify contacts)</source>
        <target>Uložit (a informovat kontakty)</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
@@ -5247,11 +5395,6 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Uložit archiv</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save auto-accept settings" xml:space="preserve">
-        <source>Save auto-accept settings</source>
-        <target>Uložit nastavení automatického přijímání</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save group profile" xml:space="preserve">
        <source>Save group profile</source>
        <target>Uložení profilu skupiny</target>
@@ -5287,16 +5430,15 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Uložit servery?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>Uložit nastavení?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save welcome message?" xml:space="preserve">
        <source>Save welcome message?</source>
        <target>Uložit uvítací zprávu?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Save your profile?" xml:space="preserve">
+        <source>Save your profile?</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <note>No comment provided by engineer.</note>
@@ -5314,6 +5456,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Saved message</source>
        <note>message info title</note>
      </trans-unit>
+      <trans-unit id="Saving %lld messages" xml:space="preserve">
+        <source>Saving %lld messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Scale" xml:space="preserve">
        <source>Scale</source>
        <note>No comment provided by engineer.</note>
@@ -5502,7 +5648,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>Odesílatel zrušil přenos souboru.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
        <source>Sender may have deleted the connection request.</source>
@@ -5594,6 +5740,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Sent via proxy</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Server" xml:space="preserve">
+        <source>Server</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Server address" xml:space="preserve">
        <source>Server address</source>
        <note>No comment provided by engineer.</note>
@@ -5703,6 +5853,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Nastavení</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Settings were changed." xml:space="preserve">
+        <source>Settings were changed.</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
        <note>No comment provided by engineer.</note>
@@ -5866,6 +6020,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Jednorázová pozvánka SimpleX</target>
        <note>simplex link type</note>
      </trans-unit>
+      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
+        <source>SimpleX protocols reviewed by Trail of Bits.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
        <source>Simplified incognito mode</source>
        <target>Zjednodušený inkognito režim</target>
@@ -5894,6 +6052,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Soft</source>
        <note>blur media</note>
      </trans-unit>
+      <trans-unit id="Some app settings were not migrated." xml:space="preserve">
+        <source>Some app settings were not migrated.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
        <source>Some file(s) were not exported:</source>
        <note>No comment provided by engineer.</note>
@@ -6022,6 +6184,14 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Podpořte SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
+        <source>Switch audio and video during the call.</source>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
        <source>System</source>
        <target>Systém</target>
@@ -6243,6 +6413,10 @@ Může se to stát kvůli nějaké chybě, nebo pokud je spojení kompromitován
        <source>The text you pasted is not a SimpleX link.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
+        <source>The uploaded database archive will be permanently removed from the servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <note>No comment provided by engineer.</note>
@@ -6359,6 +6533,14 @@ You will be prompted to complete authentication before this feature is enabled.<
 Před zapnutím této funkce budete vyzváni k dokončení ověření.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
+        <source>To record speech please grant permission to use Microphone.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
+        <source>To record video please grant permission to use Camera.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
        <source>To record voice message please grant permission to use Microphone.</source>
        <target>Chcete-li nahrávat hlasové zprávy, udělte povolení k použití mikrofonu.</target>
@@ -6501,7 +6683,7 @@ Před zapnutím této funkce budete vyzváni k dokončení ověření.</target>
      </trans-unit>
      <trans-unit id="Unknown servers!" xml:space="preserve">
        <source>Unknown servers!</source>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
        <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -6606,6 +6788,10 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <target>Použít hostitele .onion</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
+        <source>Use SOCKS proxy</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
        <source>Use SimpleX Chat servers?</source>
        <target>Používat servery SimpleX Chat?</target>
@@ -6665,15 +6851,14 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <source>Use the app with one hand.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="User profile" xml:space="preserve">
-        <source>User profile</source>
-        <target>Profil uživatele</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="User selection" xml:space="preserve">
        <source>User selection</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Username" xml:space="preserve">
+        <source>Username</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
        <source>Using SimpleX Chat servers.</source>
        <target>Používat servery SimpleX Chat.</target>
@@ -6886,7 +7071,7 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
      </trans-unit>
      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Wrong database passphrase" xml:space="preserve">
        <source>Wrong database passphrase</source>
@@ -6910,11 +7095,6 @@ Chcete-li se připojit, požádejte svůj kontakt o vytvoření dalšího odkazu
        <source>XFTP server</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You" xml:space="preserve">
-        <source>You</source>
-        <target>Vy</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
        <source>You **must not** use the same database on two devices.</source>
        <note>No comment provided by engineer.</note>
@@ -7240,6 +7420,10 @@ Repeat connection request?</source>
        <target>Vaše chat databáze není šifrována – nastavte přístupovou frázi pro její šifrování.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat preferences" xml:space="preserve">
+        <source>Your chat preferences</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Vaše chat profily</target>
@@ -7264,6 +7448,10 @@ Repeat connection request?</source>
        <target>Vaše kontakty zůstanou připojeny.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
+        <source>Your credentials may be sent unencrypted.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
        <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
        <target>Vaše aktuální chat databáze bude ODSTRANĚNA a NAHRAZENA importovanou.</target>
@@ -7293,13 +7481,15 @@ Repeat connection request?</source>
        <target>Váš profil **%@** bude sdílen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
-        <source>Your profile is stored on your device and shared only with your contacts.
-SimpleX servers cannot see your profile.</source>
-        <target>Váš profil je uložen ve vašem zařízení a sdílen pouze s vašimi kontakty.
-Servery SimpleX nevidí váš profil.</target>
+      <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
+        <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
+        <target>Váš profil je uložen ve vašem zařízení a sdílen pouze s vašimi kontakty. Servery SimpleX nevidí váš profil.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
+        <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Váš profil, kontakty a doručené zprávy jsou uloženy ve vašem zařízení.</target>
@@ -139,6 +139,7 @@
      </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">
@@ -161,11 +162,36 @@
        <target>%d Tage</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
+        <source>%d file(s) are still being downloaded.</source>
+        <target>%d Datei(en) wird/werden immer noch heruntergeladen.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
+        <source>%d file(s) failed to download.</source>
+        <target>Bei %d Datei(en) ist das Herunterladen fehlgeschlagen.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
+        <source>%d file(s) were deleted.</source>
+        <target>%d Datei(en) wurde(n) gelöscht.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
+        <source>%d file(s) were not downloaded.</source>
+        <target>%d Datei(en) wurde(n) nicht heruntergeladen.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
      <trans-unit id="%d hours" xml:space="preserve">
        <source>%d hours</source>
        <target>%d Stunden</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve">
+        <source>%d messages not forwarded</source>
+        <target>%d Nachrichten wurden nicht weitergeleitet</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="%d min" xml:space="preserve">
        <source>%d min</source>
        <target>%d min</target>
@@ -727,7 +753,7 @@
      <trans-unit id="All profiles" xml:space="preserve">
        <source>All profiles</source>
        <target>Alle Profile</target>
-        <note>No comment provided by engineer.</note>
+        <note>profile dropdown</note>
      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
@@ -919,6 +945,11 @@
        <target>App-Zugangscode wurde durch den Selbstzerstörungs-Zugangscode ersetzt.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="App session" xml:space="preserve">
+        <source>App session</source>
+        <target>App-Sitzung</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="App version" xml:space="preserve">
        <source>App version</source>
        <target>App Version</target>
@@ -1024,6 +1055,11 @@
        <target>Bilder automatisch akzeptieren</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Auto-accept settings" xml:space="preserve">
+        <source>Auto-accept settings</source>
+        <target>Einstellungen automatisch akzeptieren</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>Zurück</target>
@@ -1049,11 +1085,21 @@
        <target>Ungültiger Nachrichten-Hash</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Better groups</source>
        <target>Bessere Gruppen</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Better messages</source>
        <target>Verbesserungen bei Nachrichten</target>
@@ -1064,6 +1110,21 @@
        <target>Kontrollieren Sie Ihr Netzwerk</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Black</source>
        <target>Schwarz</target>
@@ -1197,7 +1258,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>Abbrechen</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Cancel migration" xml:space="preserve">
        <source>Cancel migration</source>
@@ -1217,7 +1278,7 @@
      <trans-unit id="Cannot receive file" xml:space="preserve">
        <source>Cannot receive file</source>
        <target>Datei kann nicht empfangen werden</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1345,6 +1406,16 @@
        <target>Chat-Präferenzen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat preferences were changed." xml:space="preserve">
+        <source>Chat preferences were changed.</source>
+        <target>Die Chat-Präferenzen wurden geändert.</target>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Chat profile" xml:space="preserve">
+        <source>Chat profile</source>
+        <target>Benutzerprofil</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Chat-Design</target>
@@ -1397,22 +1468,22 @@
      </trans-unit>
      <trans-unit id="Clear" xml:space="preserve">
        <source>Clear</source>
-        <target>Löschen</target>
+        <target>Entfernen</target>
        <note>swipe action</note>
      </trans-unit>
      <trans-unit id="Clear conversation" xml:space="preserve">
        <source>Clear conversation</source>
-        <target>Chatinhalte löschen</target>
+        <target>Chat-Inhalte entfernen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Clear conversation?" xml:space="preserve">
        <source>Clear conversation?</source>
-        <target>Unterhaltung löschen?</target>
+        <target>Chat-Inhalte entfernen?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Clear private notes?" xml:space="preserve">
        <source>Clear private notes?</source>
-        <target>Private Notizen löschen?</target>
+        <target>Private Notizen entfernen?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Clear verification" xml:space="preserve">
@@ -1726,7 +1797,7 @@ Das ist Ihr eigener Einmal-Link!</target>
      </trans-unit>
      <trans-unit id="Conversation deleted!" xml:space="preserve">
        <source>Conversation deleted!</source>
-        <target>Unterhaltung gelöscht!</target>
+        <target>Chat-Inhalte entfernt!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Copy" xml:space="preserve">
@@ -1746,6 +1817,7 @@ Das ist Ihr eigener Einmal-Link!</target>
      </trans-unit>
      <trans-unit id="Corner" xml:space="preserve">
        <source>Corner</source>
+        <target>Abrundung Ecken</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
@@ -1873,6 +1945,11 @@ Das ist Ihr eigener Einmal-Link!</target>
        <target>Zeit anpassen</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Customize theme</source>
        <target>Design anpassen</target>
@@ -2167,6 +2244,11 @@ Das ist Ihr eigener Einmal-Link!</target>
        <target>Alte Datenbank löschen?</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Delete pending connection?</source>
        <target>Ausstehende Verbindung löschen?</target>
@@ -2417,6 +2499,11 @@ Das ist Ihr eigener Einmal-Link!</target>
        <target>Den Nachrichtenverlauf nicht an neue Mitglieder senden.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
+        <source>Do not use credentials with proxy.</source>
+        <target>Verwenden Sie keine Anmeldeinformationen mit einem Proxy.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>Keine Adresse erstellt</target>
@@ -2440,7 +2527,8 @@ Das ist Ihr eigener Einmal-Link!</target>
      <trans-unit id="Download" xml:space="preserve">
        <source>Download</source>
        <target>Herunterladen</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Download errors" xml:space="preserve">
        <source>Download errors</source>
@@ -2457,6 +2545,11 @@ Das ist Ihr eigener Einmal-Link!</target>
        <target>Datei herunterladen</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Download files" xml:space="preserve">
+        <source>Download files</source>
+        <target>Dateien herunterladen</target>
+        <note>alert action</note>
+      </trans-unit>
      <trans-unit id="Downloaded" xml:space="preserve">
        <source>Downloaded</source>
        <target>Heruntergeladen</target>
@@ -2734,6 +2827,7 @@ Das ist Ihr eigener Einmal-Link!</target>
      </trans-unit>
      <trans-unit id="Error changing connection profile" xml:space="preserve">
        <source>Error changing connection profile</source>
+        <target>Fehler beim Wechseln des Verbindungs-Profils</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
@@ -2748,6 +2842,7 @@ Das ist Ihr eigener Einmal-Link!</target>
      </trans-unit>
      <trans-unit id="Error changing to incognito!" xml:space="preserve">
        <source>Error changing to incognito!</source>
+        <target>Fehler beim Wechseln zum Inkognito-Profil!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
@@ -2870,6 +2965,11 @@ Das ist Ihr eigener Einmal-Link!</target>
        <target>Fehler beim Laden von %@ Servern</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error migrating settings" xml:space="preserve">
+        <source>Error migrating settings</source>
+        <target>Fehler beim Migrieren der Einstellungen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error opening chat" xml:space="preserve">
        <source>Error opening chat</source>
        <target>Fehler beim Öffnen des Chats</target>
@@ -2878,7 +2978,7 @@ Das ist Ihr eigener Einmal-Link!</target>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>Fehler beim Empfangen der Datei</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Error reconnecting server" xml:space="preserve">
        <source>Error reconnecting server</source>
@@ -2972,12 +3072,13 @@ Das ist Ihr eigener Einmal-Link!</target>
      </trans-unit>
      <trans-unit id="Error switching profile" xml:space="preserve">
        <source>Error switching profile</source>
+        <target>Fehler beim Wechseln des Profils</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Fehler beim Umschalten des Profils!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alertTitle</note>
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
@@ -3022,8 +3123,7 @@ Das ist Ihr eigener Einmal-Link!</target>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Fehler: %@</target>
-        <note>file error text
-   snd error text</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -3110,6 +3210,13 @@ Das ist Ihr eigener Einmal-Link!</target>
        <target>Datei-Fehler</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
+        <source>File errors:
+%@</source>
+        <target>Datei-Fehler:
+%@</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
        <source>File not found - most likely file was deleted or cancelled.</source>
        <target>Datei nicht gefunden - höchstwahrscheinlich wurde die Datei gelöscht oder der Transfer abgebrochen.</target>
@@ -3245,11 +3352,31 @@ Das ist Ihr eigener Einmal-Link!</target>
        <target>Weiterleiten</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
+        <source>Forward %d message(s)?</source>
+        <target>%d Nachricht(en) weiterleiten?</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
        <target>Nachrichten weiterleiten und speichern</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forward messages" xml:space="preserve">
+        <source>Forward messages</source>
+        <target>Nachrichten weiterleiten</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Forward messages without files?" xml:space="preserve">
+        <source>Forward messages without files?</source>
+        <target>Nachrichten ohne Dateien weiterleiten?</target>
+        <note>alert message</note>
+      </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">
        <source>Forwarded</source>
        <target>Weitergeleitet</target>
@@ -3260,6 +3387,11 @@ Das ist Ihr eigener Einmal-Link!</target>
        <target>Weitergeleitet aus</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
+        <source>Forwarding %lld messages</source>
+        <target>%lld Nachricht(en) wird/werden weitergeleitet</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
        <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
        <target>Weiterleitungsserver %@ konnte sich nicht mit dem Zielserver %@ verbinden. Bitte versuchen Sie es später erneut.</target>
@@ -3309,11 +3441,6 @@ Fehler: %2$@</target>
        <target>Vollständiger Name (optional)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>Vollständiger Name:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
        <source>Fully decentralized – visible only to members.</source>
        <target>Vollständig dezentralisiert – nur für Mitglieder sichtbar.</target>
@@ -3471,7 +3598,7 @@ Fehler: %2$@</target>
      </trans-unit>
      <trans-unit id="Group will be deleted for you - this cannot be undone!" xml:space="preserve">
        <source>Group will be deleted for you - this cannot be undone!</source>
-        <target>Die Gruppe wird für Sie gelöscht. Dies kann nicht rückgängig gemacht werden!</target>
+        <target>Die Gruppe wird nur bei Ihnen gelöscht. Dies kann nicht rückgängig gemacht werden!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Help" xml:space="preserve">
@@ -3559,6 +3686,11 @@ Fehler: %2$@</target>
        <target>ICE-Server (einer pro Zeile)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="IP address" xml:space="preserve">
+        <source>IP address</source>
+        <target>IP-Adresse</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
        <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
        <target>Falls Sie sich nicht persönlich treffen können, zeigen Sie den QR-Code in einem Videoanruf oder teilen Sie den Link.</target>
@@ -3634,6 +3766,13 @@ Fehler: %2$@</target>
        <target>Archiv wird importiert</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <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">
        <source>Improved message delivery</source>
        <target>Verbesserte Zustellung von Nachrichten</target>
@@ -3926,7 +4065,7 @@ Das ist Ihr Link für die Gruppe %@!</target>
      </trans-unit>
      <trans-unit id="Keep conversation" xml:space="preserve">
        <source>Keep conversation</source>
-        <target>Unterhaltung behalten</target>
+        <target>Chat-Inhalte beibehalten</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Keep the app open to use it from desktop" xml:space="preserve">
@@ -4206,6 +4345,7 @@ Das ist Ihr Link für die Gruppe %@!</target>
      </trans-unit>
      <trans-unit id="Message shape" xml:space="preserve">
        <source>Message shape</source>
+        <target>Nachrichten-Form</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4258,6 +4398,11 @@ Das ist Ihr Link für die Gruppe %@!</target>
        <target>Gesendete Nachrichten</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
+        <source>Messages were deleted after you selected them.</source>
+        <target>Die Nachrichten wurden gelöscht, nachdem Sie sie ausgewählt hatten.</target>
+        <note>alert message</note>
+      </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>Nachrichten, Dateien und Anrufe sind durch **Ende-zu-Ende-Verschlüsselung** mit Perfect Forward Secrecy, Ablehnung und Einbruchs-Wiederherstellung geschützt.</target>
@@ -4413,6 +4558,16 @@ Das ist Ihr Link für die Gruppe %@!</target>
        <target>Neuer Zugangscode</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
+        <source>New SOCKS credentials will be used every time you start the app.</source>
+        <target>Jedes Mal wenn Sie die App starten, werden neue SOCKS-Anmeldeinformationen genutzt</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
+        <source>New SOCKS credentials will be used for each server.</source>
+        <target>Für jeden Server werden neue SOCKS-Anmeldeinformationen genutzt</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New chat" xml:space="preserve">
        <source>New chat</source>
        <target>Neuer Chat</target>
@@ -4533,6 +4688,16 @@ Das ist Ihr Link für die Gruppe %@!</target>
        <target>Keine Netzwerkverbindung</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No permission to record speech" xml:space="preserve">
+        <source>No permission to record speech</source>
+        <target>Keine Genehmigung für Sprach-Aufnahmen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No permission to record video" xml:space="preserve">
+        <source>No permission to record video</source>
+        <target>Keine Genehmigung für Video-Aufnahmen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>Keine Berechtigung für das Aufnehmen von Sprachnachrichten</target>
@@ -4553,6 +4718,11 @@ Das ist Ihr Link für die Gruppe %@!</target>
        <target>Nichts ausgewählt</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Nothing to forward!" xml:space="preserve">
+        <source>Nothing to forward!</source>
+        <target>Es gibt nichts zum Weiterleiten!</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Benachrichtigungen</target>
@@ -4585,7 +4755,7 @@ Das ist Ihr Link für die Gruppe %@!</target>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>Ok</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Old database" xml:space="preserve">
        <source>Old database</source>
@@ -4628,7 +4798,7 @@ Dies erfordert die Aktivierung eines VPNs.</target>
      </trans-unit>
      <trans-unit id="Only delete conversation" xml:space="preserve">
        <source>Only delete conversation</source>
-        <target>Nur die Unterhaltung löschen</target>
+        <target>Nur die Chat-Inhalte löschen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only group owners can change group preferences." xml:space="preserve">
@@ -4776,6 +4946,13 @@ Dies erfordert die Aktivierung eines VPNs.</target>
        <target>Andere %@ Server</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
+        <source>Other file errors:
+%@</source>
+        <target>Andere(r) Datei-Fehler:
+%@</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>PING-Zähler</target>
@@ -4811,6 +4988,11 @@ Dies erfordert die Aktivierung eines VPNs.</target>
        <target>Zugangscode eingestellt!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Password" xml:space="preserve">
+        <source>Password</source>
+        <target>Passwort</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Password to show" xml:space="preserve">
        <source>Password to show</source>
        <target>Passwort anzeigen</target>
@@ -4960,6 +5142,11 @@ Fehler: %@</target>
        <target>Polnische Bedienoberfläche</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Port" xml:space="preserve">
+        <source>Port</source>
+        <target>Port</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
        <source>Possibly, certificate fingerprint in server address is incorrect</source>
        <target>Der Fingerabdruck des Zertifikats in der Serveradresse ist wahrscheinlich ungültig</target>
@@ -5045,16 +5232,6 @@ Fehler: %@</target>
        <target>Profil-Bilder</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Profilname</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Profilname:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Passwort für Profil</target>
@@ -5157,6 +5334,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
        <target>Proxy-Server</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Proxy requires password" xml:space="preserve">
+        <source>Proxy requires password</source>
+        <target>Der Proxy benötigt ein Passwort</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Push-Benachrichtigungen</target>
@@ -5179,7 +5361,7 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
      </trans-unit>
      <trans-unit id="Reachable chat toolbar" xml:space="preserve">
        <source>Reachable chat toolbar</source>
-        <target>Erreichbare Chat-Symbolleiste</target>
+        <target>Chat-Symbolleiste unten</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="React…" xml:space="preserve">
@@ -5378,6 +5560,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
        <target>Entfernen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Remove archive?" xml:space="preserve">
+        <source>Remove archive?</source>
+        <target>Archiv entfernen?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Remove image" xml:space="preserve">
        <source>Remove image</source>
        <target>Bild entfernen</target>
@@ -5558,6 +5745,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
        <target>SMP-Server</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="SOCKS proxy" xml:space="preserve">
+        <source>SOCKS proxy</source>
+        <target>SOCKS-Proxy</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Safely receive files" xml:space="preserve">
        <source>Safely receive files</source>
        <target>Dateien sicher empfangen</target>
@@ -5571,12 +5763,13 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Speichern</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Save (and notify contacts)" xml:space="preserve">
        <source>Save (and notify contacts)</source>
        <target>Speichern (und Kontakte benachrichtigen)</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
@@ -5603,11 +5796,6 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
        <target>Archiv speichern</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save auto-accept settings" xml:space="preserve">
-        <source>Save auto-accept settings</source>
-        <target>Einstellungen von "Automatisch akzeptieren" speichern</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save group profile" xml:space="preserve">
        <source>Save group profile</source>
        <target>Gruppenprofil speichern</target>
@@ -5643,16 +5831,16 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
        <target>Alle Server speichern?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>Einstellungen speichern?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save welcome message?" xml:space="preserve">
        <source>Save welcome message?</source>
        <target>Begrüßungsmeldung speichern?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Save your profile?" xml:space="preserve">
+        <source>Save your profile?</source>
+        <target>Ihr Profil speichern?</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <target>Abgespeichert</target>
@@ -5673,6 +5861,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
        <target>Gespeicherte Nachricht</target>
        <note>message info title</note>
      </trans-unit>
+      <trans-unit id="Saving %lld messages" xml:space="preserve">
+        <source>Saving %lld messages</source>
+        <target>Es wird/werden %lld Nachricht(en) gesichert</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Scale" xml:space="preserve">
        <source>Scale</source>
        <target>Skalieren</target>
@@ -5720,7 +5913,7 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
      </trans-unit>
      <trans-unit id="Search or paste SimpleX link" xml:space="preserve">
        <source>Search or paste SimpleX link</source>
-        <target>Suchen oder fügen Sie den SimpleX-Link ein</target>
+        <target>Suchen oder SimpleX-Link einfügen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Secondary" xml:space="preserve">
@@ -5755,6 +5948,7 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
      </trans-unit>
      <trans-unit id="Select chat profile" xml:space="preserve">
        <source>Select chat profile</source>
+        <target>Chat-Profil auswählen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
@@ -5875,7 +6069,7 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>Der Absender hat die Dateiübertragung abgebrochen.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
        <source>Sender may have deleted the connection request.</source>
@@ -5972,6 +6166,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
        <target>Über einen Proxy gesendet</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Server" xml:space="preserve">
+        <source>Server</source>
+        <target>Server</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Server address" xml:space="preserve">
        <source>Server address</source>
        <target>Server-Adresse</target>
@@ -6092,6 +6291,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
        <target>Einstellungen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Settings were changed." xml:space="preserve">
+        <source>Settings were changed.</source>
+        <target>Die Einstellungen wurden geändert.</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
        <target>Form der Profil-Bilder</target>
@@ -6129,6 +6333,7 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
      </trans-unit>
      <trans-unit id="Share profile" xml:space="preserve">
        <source>Share profile</source>
+        <target>Profil teilen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
@@ -6266,6 +6471,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
        <target>SimpleX-Einmal-Einladung</target>
        <note>simplex link type</note>
      </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">
        <source>Simplified incognito mode</source>
        <target>Vereinfachter Inkognito-Modus</target>
@@ -6296,6 +6506,11 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
        <target>Weich</target>
        <note>blur media</note>
      </trans-unit>
+      <trans-unit id="Some app settings were not migrated." xml:space="preserve">
+        <source>Some app settings were not migrated.</source>
+        <target>Einige App-Einstellungen wurden nicht migriert.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
        <source>Some file(s) were not exported:</source>
        <target>Einzelne Datei(en) wurde(n) nicht exportiert:</target>
@@ -6436,6 +6651,16 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
        <target>Unterstützung von SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>System</source>
        <target>System</target>
@@ -6473,6 +6698,7 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
      </trans-unit>
      <trans-unit id="Tail" xml:space="preserve">
        <source>Tail</source>
+        <target>Sprechblasen-Format</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
@@ -6624,7 +6850,7 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
      </trans-unit>
      <trans-unit id="The messages will be deleted for all members." xml:space="preserve">
        <source>The messages will be deleted for all members.</source>
-        <target>Die Nachrichten werden für alle Mitglieder gelöscht werden.</target>
+        <target>Die Nachrichten werden für alle Gruppenmitglieder gelöscht.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The messages will be marked as moderated for all members." xml:space="preserve">
@@ -6667,6 +6893,11 @@ Dies kann passieren, wenn es einen Fehler gegeben hat oder die Verbindung kompro
        <target>Der von Ihnen eingefügte Text ist kein SimpleX-Link.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
+        <source>The uploaded database archive will be permanently removed from the servers.</source>
+        <target>Das hochgeladene Datenbank-Archiv wird dauerhaft von den Servern entfernt.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <target>Design</target>
@@ -6794,6 +7025,16 @@ You will be prompted to complete authentication before this feature is enabled.<
 Sie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funktion aktiviert wird.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
+        <source>To record speech please grant permission to use Microphone.</source>
+        <target>Bitte erteilen Sie für Sprach-Aufnahmen die Genehmigung das Mikrofon zu nutzen.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
+        <source>To record video please grant permission to use Camera.</source>
+        <target>Bitte erteilen Sie für Video-Aufnahmen die Genehmigung die Kamera zu nutzen.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
        <source>To record voice message please grant permission to use Microphone.</source>
        <target>Bitte erlauben Sie die Nutzung des Mikrofons, um Sprachnachrichten aufnehmen zu können.</target>
@@ -6947,7 +7188,7 @@ Sie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funkt
      <trans-unit id="Unknown servers!" xml:space="preserve">
        <source>Unknown servers!</source>
        <target>Unbekannte Server!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
        <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7061,6 +7302,11 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
        <target>Verwende .onion-Hosts</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
+        <source>Use SOCKS proxy</source>
+        <target>SOCKS-Proxy nutzen</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
        <source>Use SimpleX Chat servers?</source>
        <target>Verwenden Sie SimpleX-Chat-Server?</target>
@@ -7123,12 +7369,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
      </trans-unit>
      <trans-unit id="Use the app with one hand." xml:space="preserve">
        <source>Use the app with one hand.</source>
-        <target>Die App mit einer Hand nutzen.</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="User profile" xml:space="preserve">
-        <source>User profile</source>
-        <target>Benutzerprofil</target>
+        <target>Die App mit einer Hand bedienen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="User selection" xml:space="preserve">
@@ -7136,6 +7377,11 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
        <target>Benutzer-Auswahl</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Username" xml:space="preserve">
+        <source>Username</source>
+        <target>Benutzername</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
        <source>Using SimpleX Chat servers.</source>
        <target>Verwendung von SimpleX-Chat-Servern.</target>
@@ -7369,7 +7615,7 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
        <target>Ohne Tor- oder VPN-Nutzung wird Ihre IP-Adresse für diese XFTP-Relais sichtbar sein: %@.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Wrong database passphrase" xml:space="preserve">
        <source>Wrong database passphrase</source>
@@ -7396,11 +7642,6 @@ Bitten Sie Ihren Kontakt darum einen weiteren Verbindungs-Link zu erzeugen, um s
        <target>XFTP-Server</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You" xml:space="preserve">
-        <source>You</source>
-        <target>Profil</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
        <source>You **must not** use the same database on two devices.</source>
        <target>Sie dürfen die selbe Datenbank **nicht** auf zwei Geräten nutzen.</target>
@@ -7555,7 +7796,7 @@ Verbindungsanfrage wiederholen?</target>
      </trans-unit>
      <trans-unit id="You can still view conversation with %@ in the list of chats." xml:space="preserve">
        <source>You can still view conversation with %@ in the list of chats.</source>
-        <target>Sie können in der Chatliste weiterhin die Unterhaltung mit %@ einsehen.</target>
+        <target>Sie können in der Chat-Liste weiterhin die Unterhaltung mit %@ einsehen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can turn on SimpleX Lock via Settings." xml:space="preserve">
@@ -7750,6 +7991,11 @@ Verbindungsanfrage wiederholen?</target>
        <target>Ihre Chat-Datenbank ist nicht verschlüsselt. Bitte legen Sie ein Passwort fest, um sie zu schützen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat preferences" xml:space="preserve">
+        <source>Your chat preferences</source>
+        <target>Ihre Chat-Präferenzen</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Ihre Chat-Profile</target>
@@ -7757,6 +8003,7 @@ Verbindungsanfrage wiederholen?</target>
      </trans-unit>
      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
+        <target>Ihre Verbindung wurde auf %@ verschoben. Während Sie auf das Profil weitergeleitet wurden trat aber ein unerwarteter Fehler auf.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
@@ -7774,6 +8021,11 @@ Verbindungsanfrage wiederholen?</target>
        <target>Ihre Kontakte bleiben weiterhin verbunden.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
+        <source>Your credentials may be sent unencrypted.</source>
+        <target>Ihre Anmeldeinformationen können unverschlüsselt versendet werden.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
        <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
        <target>Ihre aktuelle Chat-Datenbank wird GELÖSCHT und durch die Importierte ERSETZT.</target>
@@ -7804,13 +8056,16 @@ Verbindungsanfrage wiederholen?</target>
        <target>Ihr Profil **%@** wird geteilt.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
-        <source>Your profile is stored on your device and shared only with your contacts.
-SimpleX servers cannot see your profile.</source>
-        <target>Ihr Profil wird auf Ihrem Gerät gespeichert und nur mit Ihren Kontakten geteilt.
-SimpleX-Server können Ihr Profil nicht einsehen.</target>
+      <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
+        <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
+        <target>Ihr Profil wird auf Ihrem Gerät gespeichert und nur mit Ihren Kontakten geteilt. SimpleX-Server können Ihr Profil nicht einsehen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
+        <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
+        <target>Ihr Profil wurde geändert. Wenn Sie es speichern, wird das aktualisierte Profil an alle Ihre Kontakte gesendet.</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Ihr Profil, Ihre Kontakte und zugestellten Nachrichten werden auf Ihrem Gerät gespeichert.</target>
@@ -8248,7 +8503,7 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
      </trans-unit>
      <trans-unit id="expired" xml:space="preserve">
        <source>expired</source>
-        <target>abgelaufen</target>
+        <target>Abgelaufen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="forwarded" xml:space="preserve">
@@ -8480,7 +8735,7 @@ SimpleX-Server können Ihr Profil nicht einsehen.</target>
      </trans-unit>
      <trans-unit id="other" xml:space="preserve">
        <source>other</source>
-        <target>andere</target>
+        <target>Andere</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="other errors" xml:space="preserve">
@@ -4200,7 +4200,7 @@ SimpleX servers cannot see your profile.</source>
      </trans-unit>
      <trans-unit id="## In reply to" xml:space="preserve" approved="no">
        <source>## In reply to</source>
-        <target state="translated">## Ως απαντηση σε</target>
+        <target state="translated">## Ως απάντηση σε</target>
        <note>copied message info</note>
      </trans-unit>
      <trans-unit id="%@ (current)" xml:space="preserve" approved="no">
@@ -162,11 +162,36 @@
        <target>%d days</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
+        <source>%d file(s) are still being downloaded.</source>
+        <target>%d file(s) are still being downloaded.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
+        <source>%d file(s) failed to download.</source>
+        <target>%d file(s) failed to download.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
+        <source>%d file(s) were deleted.</source>
+        <target>%d file(s) were deleted.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
+        <source>%d file(s) were not downloaded.</source>
+        <target>%d file(s) were not downloaded.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
      <trans-unit id="%d hours" xml:space="preserve">
        <source>%d hours</source>
        <target>%d hours</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve">
+        <source>%d messages not forwarded</source>
+        <target>%d messages not forwarded</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="%d min" xml:space="preserve">
        <source>%d min</source>
        <target>%d min</target>
@@ -728,7 +753,7 @@
      <trans-unit id="All profiles" xml:space="preserve">
        <source>All profiles</source>
        <target>All profiles</target>
-        <note>No comment provided by engineer.</note>
+        <note>profile dropdown</note>
      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
@@ -920,6 +945,11 @@
        <target>App passcode is replaced with self-destruct passcode.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="App session" xml:space="preserve">
+        <source>App session</source>
+        <target>App session</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="App version" xml:space="preserve">
        <source>App version</source>
        <target>App version</target>
@@ -1025,6 +1055,11 @@
        <target>Auto-accept images</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Auto-accept settings" xml:space="preserve">
+        <source>Auto-accept settings</source>
+        <target>Auto-accept settings</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>Back</target>
@@ -1050,11 +1085,21 @@
        <target>Bad message hash</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better calls" xml:space="preserve">
+        <source>Better calls</source>
+        <target>Better calls</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
        <source>Better groups</source>
        <target>Better groups</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better message dates." xml:space="preserve">
+        <source>Better message dates.</source>
+        <target>Better message dates.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>Better messages</target>
@@ -1065,6 +1110,21 @@
        <target>Better networking</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better notifications" xml:space="preserve">
+        <source>Better notifications</source>
+        <target>Better notifications</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better security ✅" xml:space="preserve">
+        <source>Better security ✅</source>
+        <target>Better security ✅</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>Better user experience</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
        <source>Black</source>
        <target>Black</target>
@@ -1198,7 +1258,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>Cancel</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Cancel migration" xml:space="preserve">
        <source>Cancel migration</source>
@@ -1218,7 +1278,7 @@
      <trans-unit id="Cannot receive file" xml:space="preserve">
        <source>Cannot receive file</source>
        <target>Cannot receive file</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1346,6 +1406,16 @@
        <target>Chat preferences</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat preferences were changed." xml:space="preserve">
+        <source>Chat preferences were changed.</source>
+        <target>Chat preferences were changed.</target>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Chat profile" xml:space="preserve">
+        <source>Chat profile</source>
+        <target>Chat profile</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Chat theme</target>
@@ -1875,6 +1945,11 @@ This is your own one-time link!</target>
        <target>Custom time</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Customizable message shape." xml:space="preserve">
+        <source>Customizable message shape.</source>
+        <target>Customizable message shape.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
        <source>Customize theme</source>
        <target>Customize theme</target>
@@ -2169,6 +2244,11 @@ This is your own one-time link!</target>
        <target>Delete old database?</target>
        <note>No comment provided by engineer.</note>
      </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>Delete or moderate up to 200 messages.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
        <source>Delete pending connection?</source>
        <target>Delete pending connection?</target>
@@ -2419,6 +2499,11 @@ This is your own one-time link!</target>
        <target>Do not send history to new members.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
+        <source>Do not use credentials with proxy.</source>
+        <target>Do not use credentials with proxy.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>Don't create address</target>
@@ -2442,7 +2527,8 @@ This is your own one-time link!</target>
      <trans-unit id="Download" xml:space="preserve">
        <source>Download</source>
        <target>Download</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Download errors" xml:space="preserve">
        <source>Download errors</source>
@@ -2459,6 +2545,11 @@ This is your own one-time link!</target>
        <target>Download file</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Download files" xml:space="preserve">
+        <source>Download files</source>
+        <target>Download files</target>
+        <note>alert action</note>
+      </trans-unit>
      <trans-unit id="Downloaded" xml:space="preserve">
        <source>Downloaded</source>
        <target>Downloaded</target>
@@ -2874,6 +2965,11 @@ This is your own one-time link!</target>
        <target>Error loading %@ servers</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error migrating settings" xml:space="preserve">
+        <source>Error migrating settings</source>
+        <target>Error migrating settings</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error opening chat" xml:space="preserve">
        <source>Error opening chat</source>
        <target>Error opening chat</target>
@@ -2882,7 +2978,7 @@ This is your own one-time link!</target>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>Error receiving file</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Error reconnecting server" xml:space="preserve">
        <source>Error reconnecting server</source>
@@ -2982,7 +3078,7 @@ This is your own one-time link!</target>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Error switching profile!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alertTitle</note>
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
@@ -3027,8 +3123,7 @@ This is your own one-time link!</target>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Error: %@</target>
-        <note>file error text
-   snd error text</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -3115,6 +3210,13 @@ This is your own one-time link!</target>
        <target>File error</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
+        <source>File errors:
+%@</source>
+        <target>File errors:
+%@</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
        <source>File not found - most likely file was deleted or cancelled.</source>
        <target>File not found - most likely file was deleted or cancelled.</target>
@@ -3250,11 +3352,31 @@ This is your own one-time link!</target>
        <target>Forward</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
+        <source>Forward %d message(s)?</source>
+        <target>Forward %d message(s)?</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
        <target>Forward and save messages</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forward messages" xml:space="preserve">
+        <source>Forward messages</source>
+        <target>Forward messages</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Forward messages without files?" xml:space="preserve">
+        <source>Forward messages without files?</source>
+        <target>Forward messages without files?</target>
+        <note>alert message</note>
+      </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>Forward up to 20 messages at once.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
        <source>Forwarded</source>
        <target>Forwarded</target>
@@ -3265,6 +3387,11 @@ This is your own one-time link!</target>
        <target>Forwarded from</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
+        <source>Forwarding %lld messages</source>
+        <target>Forwarding %lld messages</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
        <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
        <target>Forwarding server %@ failed to connect to destination server %@. Please try later.</target>
@@ -3314,11 +3441,6 @@ Error: %2$@</target>
        <target>Full name (optional)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>Full name:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
        <source>Fully decentralized – visible only to members.</source>
        <target>Fully decentralized – visible only to members.</target>
@@ -3564,6 +3686,11 @@ Error: %2$@</target>
        <target>ICE servers (one per line)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="IP address" xml:space="preserve">
+        <source>IP address</source>
+        <target>IP address</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
        <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
        <target>If you can't meet in person, show QR code in a video call, or share the link.</target>
@@ -3639,6 +3766,13 @@ Error: %2$@</target>
        <target>Importing archive</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <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>Improved delivery, reduced traffic usage.
+More improvements are coming soon!</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
        <source>Improved message delivery</source>
        <target>Improved message delivery</target>
@@ -4264,6 +4398,11 @@ This is your link for group %@!</target>
        <target>Messages sent</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
+        <source>Messages were deleted after you selected them.</source>
+        <target>Messages were deleted after you selected them.</target>
+        <note>alert message</note>
+      </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>Messages, files and calls are protected by **end-to-end encryption** with perfect forward secrecy, repudiation and break-in recovery.</target>
@@ -4419,6 +4558,16 @@ This is your link for group %@!</target>
        <target>New Passcode</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
+        <source>New SOCKS credentials will be used every time you start the app.</source>
+        <target>New SOCKS credentials will be used every time you start the app.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
+        <source>New SOCKS credentials will be used for each server.</source>
+        <target>New SOCKS credentials will be used for each server.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New chat" xml:space="preserve">
        <source>New chat</source>
        <target>New chat</target>
@@ -4539,6 +4688,16 @@ This is your link for group %@!</target>
        <target>No network connection</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No permission to record speech" xml:space="preserve">
+        <source>No permission to record speech</source>
+        <target>No permission to record speech</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No permission to record video" xml:space="preserve">
+        <source>No permission to record video</source>
+        <target>No permission to record video</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>No permission to record voice message</target>
@@ -4559,6 +4718,11 @@ This is your link for group %@!</target>
        <target>Nothing selected</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Nothing to forward!" xml:space="preserve">
+        <source>Nothing to forward!</source>
+        <target>Nothing to forward!</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Notifications</target>
@@ -4591,7 +4755,7 @@ This is your link for group %@!</target>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>Ok</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Old database" xml:space="preserve">
        <source>Old database</source>
@@ -4782,6 +4946,13 @@ Requires compatible VPN.</target>
        <target>Other %@ servers</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
+        <source>Other file errors:
+%@</source>
+        <target>Other file errors:
+%@</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>PING count</target>
@@ -4817,6 +4988,11 @@ Requires compatible VPN.</target>
        <target>Passcode set!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Password" xml:space="preserve">
+        <source>Password</source>
+        <target>Password</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Password to show" xml:space="preserve">
        <source>Password to show</source>
        <target>Password to show</target>
@@ -4966,6 +5142,11 @@ Error: %@</target>
        <target>Polish interface</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Port" xml:space="preserve">
+        <source>Port</source>
+        <target>Port</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
        <source>Possibly, certificate fingerprint in server address is incorrect</source>
        <target>Possibly, certificate fingerprint in server address is incorrect</target>
@@ -5051,16 +5232,6 @@ Error: %@</target>
        <target>Profile images</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Profile name</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Profile name:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Profile password</target>
@@ -5163,6 +5334,11 @@ Enable in *Network &amp; servers* settings.</target>
        <target>Proxied servers</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Proxy requires password" xml:space="preserve">
+        <source>Proxy requires password</source>
+        <target>Proxy requires password</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Push notifications</target>
@@ -5384,6 +5560,11 @@ Enable in *Network &amp; servers* settings.</target>
        <target>Remove</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Remove archive?" xml:space="preserve">
+        <source>Remove archive?</source>
+        <target>Remove archive?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Remove image" xml:space="preserve">
        <source>Remove image</source>
        <target>Remove image</target>
@@ -5564,6 +5745,11 @@ Enable in *Network &amp; servers* settings.</target>
        <target>SMP server</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="SOCKS proxy" xml:space="preserve">
+        <source>SOCKS proxy</source>
+        <target>SOCKS proxy</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Safely receive files" xml:space="preserve">
        <source>Safely receive files</source>
        <target>Safely receive files</target>
@@ -5577,12 +5763,13 @@ Enable in *Network &amp; servers* settings.</target>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Save</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Save (and notify contacts)" xml:space="preserve">
        <source>Save (and notify contacts)</source>
        <target>Save (and notify contacts)</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
@@ -5609,11 +5796,6 @@ Enable in *Network &amp; servers* settings.</target>
        <target>Save archive</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save auto-accept settings" xml:space="preserve">
-        <source>Save auto-accept settings</source>
-        <target>Save auto-accept settings</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save group profile" xml:space="preserve">
        <source>Save group profile</source>
        <target>Save group profile</target>
@@ -5649,16 +5831,16 @@ Enable in *Network &amp; servers* settings.</target>
        <target>Save servers?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>Save settings?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save welcome message?" xml:space="preserve">
        <source>Save welcome message?</source>
        <target>Save welcome message?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Save your profile?" xml:space="preserve">
+        <source>Save your profile?</source>
+        <target>Save your profile?</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <target>Saved</target>
@@ -5679,6 +5861,11 @@ Enable in *Network &amp; servers* settings.</target>
        <target>Saved message</target>
        <note>message info title</note>
      </trans-unit>
+      <trans-unit id="Saving %lld messages" xml:space="preserve">
+        <source>Saving %lld messages</source>
+        <target>Saving %lld messages</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Scale" xml:space="preserve">
        <source>Scale</source>
        <target>Scale</target>
@@ -5882,7 +6069,7 @@ Enable in *Network &amp; servers* settings.</target>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>Sender cancelled file transfer.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
        <source>Sender may have deleted the connection request.</source>
@@ -5979,6 +6166,11 @@ Enable in *Network &amp; servers* settings.</target>
        <target>Sent via proxy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Server" xml:space="preserve">
+        <source>Server</source>
+        <target>Server</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Server address" xml:space="preserve">
        <source>Server address</source>
        <target>Server address</target>
@@ -6099,6 +6291,11 @@ Enable in *Network &amp; servers* settings.</target>
        <target>Settings</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Settings were changed." xml:space="preserve">
+        <source>Settings were changed.</source>
+        <target>Settings were changed.</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
        <target>Shape profile images</target>
@@ -6274,6 +6471,11 @@ Enable in *Network &amp; servers* settings.</target>
        <target>SimpleX one-time invitation</target>
        <note>simplex link type</note>
      </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 protocols reviewed by Trail of Bits.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
        <source>Simplified incognito mode</source>
        <target>Simplified incognito mode</target>
@@ -6304,6 +6506,11 @@ Enable in *Network &amp; servers* settings.</target>
        <target>Soft</target>
        <note>blur media</note>
      </trans-unit>
+      <trans-unit id="Some app settings were not migrated." xml:space="preserve">
+        <source>Some app settings were not migrated.</source>
+        <target>Some app settings were not migrated.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
        <source>Some file(s) were not exported:</source>
        <target>Some file(s) were not exported:</target>
@@ -6444,6 +6651,16 @@ Enable in *Network &amp; servers* settings.</target>
        <target>Support SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </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>Switch audio and video during the call.</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>Switch chat profile for 1-time invitations.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
        <source>System</source>
        <target>System</target>
@@ -6676,6 +6893,11 @@ It can happen because of some bug or when the connection is compromised.</target
        <target>The text you pasted is not a SimpleX link.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
+        <source>The uploaded database archive will be permanently removed from the servers.</source>
+        <target>The uploaded database archive will be permanently removed from the servers.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <target>Themes</target>
@@ -6803,6 +7025,16 @@ You will be prompted to complete authentication before this feature is enabled.<
 You will be prompted to complete authentication before this feature is enabled.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
+        <source>To record speech please grant permission to use Microphone.</source>
+        <target>To record speech please grant permission to use Microphone.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
+        <source>To record video please grant permission to use Camera.</source>
+        <target>To record video please grant permission to use Camera.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
        <source>To record voice message please grant permission to use Microphone.</source>
        <target>To record voice message please grant permission to use Microphone.</target>
@@ -6956,7 +7188,7 @@ You will be prompted to complete authentication before this feature is enabled.<
      <trans-unit id="Unknown servers!" xml:space="preserve">
        <source>Unknown servers!</source>
        <target>Unknown servers!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
        <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7070,6 +7302,11 @@ To connect, please ask your contact to create another connection link and check
        <target>Use .onion hosts</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
+        <source>Use SOCKS proxy</source>
+        <target>Use SOCKS proxy</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
        <source>Use SimpleX Chat servers?</source>
        <target>Use SimpleX Chat servers?</target>
@@ -7135,16 +7372,16 @@ To connect, please ask your contact to create another connection link and check
        <target>Use the app with one hand.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="User profile" xml:space="preserve">
-        <source>User profile</source>
-        <target>User profile</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="User selection" xml:space="preserve">
        <source>User selection</source>
        <target>User selection</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Username" xml:space="preserve">
+        <source>Username</source>
+        <target>Username</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
        <source>Using SimpleX Chat servers.</source>
        <target>Using SimpleX Chat servers.</target>
@@ -7378,7 +7615,7 @@ To connect, please ask your contact to create another connection link and check
      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
        <target>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Wrong database passphrase" xml:space="preserve">
        <source>Wrong database passphrase</source>
@@ -7405,11 +7642,6 @@ To connect, please ask your contact to create another connection link and check
        <target>XFTP server</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You" xml:space="preserve">
-        <source>You</source>
-        <target>You</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
        <source>You **must not** use the same database on two devices.</source>
        <target>You **must not** use the same database on two devices.</target>
@@ -7759,6 +7991,11 @@ Repeat connection request?</target>
        <target>Your chat database is not encrypted - set passphrase to encrypt it.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat preferences" xml:space="preserve">
+        <source>Your chat preferences</source>
+        <target>Your chat preferences</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Your chat profiles</target>
@@ -7784,6 +8021,11 @@ Repeat connection request?</target>
        <target>Your contacts will remain connected.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
+        <source>Your credentials may be sent unencrypted.</source>
+        <target>Your credentials may be sent unencrypted.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
        <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
        <target>Your current chat database will be DELETED and REPLACED with the imported one.</target>
@@ -7814,13 +8056,16 @@ Repeat connection request?</target>
        <target>Your profile **%@** will be shared.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
-        <source>Your profile is stored on your device and shared only with your contacts.
-SimpleX servers cannot see your profile.</source>
-        <target>Your profile is stored on your device and shared only with your contacts.
-SimpleX servers cannot see your profile.</target>
+      <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
+        <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
+        <target>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
+        <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
+        <target>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Your profile, contacts and delivered messages are stored on your device.</target>
@@ -139,6 +139,7 @@
      </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">
@@ -161,11 +162,36 @@
        <target>%d días</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
+        <source>%d file(s) are still being downloaded.</source>
+        <target>%d archivo(s) se está(n) descargando todavía.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
+        <source>%d file(s) failed to download.</source>
+        <target>La descarga ha fallado para %d archivo(s).</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
+        <source>%d file(s) were deleted.</source>
+        <target>%d archivo(s) ha(n) sido eliminado(s).</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
+        <source>%d file(s) were not downloaded.</source>
+        <target>%d archivo(s) no se ha(n) descargado.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
      <trans-unit id="%d hours" xml:space="preserve">
        <source>%d hours</source>
        <target>%d horas</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve">
+        <source>%d messages not forwarded</source>
+        <target>%d mensajes no enviados</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="%d min" xml:space="preserve">
        <source>%d min</source>
        <target>%d minutos</target>
@@ -511,7 +537,7 @@
      </trans-unit>
      <trans-unit id="A new random profile will be shared." xml:space="preserve">
        <source>A new random profile will be shared.</source>
-        <target>Se compartirá un perfil nuevo aleatorio.</target>
+        <target>Compartirás un perfil nuevo aleatorio.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve">
@@ -727,7 +753,7 @@
      <trans-unit id="All profiles" xml:space="preserve">
        <source>All profiles</source>
        <target>Todos los perfiles</target>
-        <note>No comment provided by engineer.</note>
+        <note>profile dropdown</note>
      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
@@ -919,6 +945,11 @@
        <target>El código de acceso será reemplazado por código de autodestrucción.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="App session" xml:space="preserve">
+        <source>App session</source>
+        <target>Sesión de aplicación</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="App version" xml:space="preserve">
        <source>App version</source>
        <target>Versión de la aplicación</target>
@@ -1024,6 +1055,11 @@
        <target>Aceptar imágenes automáticamente</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Auto-accept settings" xml:space="preserve">
+        <source>Auto-accept settings</source>
+        <target>Auto aceptar configuración</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>Volver</target>
@@ -1049,11 +1085,21 @@
        <target>Hash de mensaje incorrecto</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Better groups</source>
        <target>Grupos mejorados</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Better messages</source>
        <target>Mensajes mejorados</target>
@@ -1064,6 +1110,21 @@
        <target>Uso de red mejorado</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Black</source>
        <target>Negro</target>
@@ -1197,7 +1258,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>Cancelar</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Cancel migration" xml:space="preserve">
        <source>Cancel migration</source>
@@ -1217,7 +1278,7 @@
      <trans-unit id="Cannot receive file" xml:space="preserve">
        <source>Cannot receive file</source>
        <target>No se puede recibir el archivo</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1345,6 +1406,16 @@
        <target>Preferencias de Chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat preferences were changed." xml:space="preserve">
+        <source>Chat preferences were changed.</source>
+        <target>Las preferencias del chat han sido modificadas.</target>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Chat profile" xml:space="preserve">
+        <source>Chat profile</source>
+        <target>Perfil de usuario</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Tema de chat</target>
@@ -1497,7 +1568,7 @@
      </trans-unit>
      <trans-unit id="Confirm that you remember database passphrase to migrate it." xml:space="preserve">
        <source>Confirm that you remember database passphrase to migrate it.</source>
-        <target>Para migrar confirma que recuerdas la frase de contraseña de la base de datos.</target>
+        <target>Para migrar la base de datos confirma que recuerdas la frase de contraseña.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Confirm upload" xml:space="preserve">
@@ -1746,6 +1817,7 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Corner" xml:space="preserve">
        <source>Corner</source>
+        <target>Esquina</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
@@ -1873,6 +1945,11 @@ This is your own one-time link!</source>
        <target>Tiempo personalizado</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Customize theme</source>
        <target>Personalizar tema</target>
@@ -1954,7 +2031,7 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Database passphrase is different from saved in the keychain." xml:space="preserve">
        <source>Database passphrase is different from saved in the keychain.</source>
-        <target>La contraseña es distinta a la almacenada en Keychain.</target>
+        <target>La contraseña es diferente a la almacenada en Keychain.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Database passphrase is required to open chat." xml:space="preserve">
@@ -2167,6 +2244,11 @@ This is your own one-time link!</source>
        <target>¿Eliminar base de datos antigua?</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Delete pending connection?</source>
        <target>¿Eliminar conexión pendiente?</target>
@@ -2379,7 +2461,7 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Disconnect desktop?" xml:space="preserve">
        <source>Disconnect desktop?</source>
-        <target>¿Desconectar ordenador?</target>
+        <target>¿Desconectar del ordenador?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Discover and join groups" xml:space="preserve">
@@ -2417,6 +2499,11 @@ This is your own one-time link!</source>
        <target>No se envía el historial a los miembros nuevos.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
+        <source>Do not use credentials with proxy.</source>
+        <target>No uses credenciales con proxy.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>No crear dirección SimpleX</target>
@@ -2429,7 +2516,7 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Don't show again" xml:space="preserve">
        <source>Don't show again</source>
-        <target>No mostrar de nuevo</target>
+        <target>No volver a mostrar</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Downgrade and open chat" xml:space="preserve">
@@ -2440,7 +2527,8 @@ This is your own one-time link!</source>
      <trans-unit id="Download" xml:space="preserve">
        <source>Download</source>
        <target>Descargar</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Download errors" xml:space="preserve">
        <source>Download errors</source>
@@ -2457,6 +2545,11 @@ This is your own one-time link!</source>
        <target>Descargar archivo</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Download files" xml:space="preserve">
+        <source>Download files</source>
+        <target>Descargar archivos</target>
+        <note>alert action</note>
+      </trans-unit>
      <trans-unit id="Downloaded" xml:space="preserve">
        <source>Downloaded</source>
        <target>Descargado</target>
@@ -2734,6 +2827,7 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Error changing connection profile" xml:space="preserve">
        <source>Error changing connection profile</source>
+        <target>Error al cambiar el perfil de conexión</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
@@ -2748,6 +2842,7 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Error changing to incognito!" xml:space="preserve">
        <source>Error changing to incognito!</source>
+        <target>¡Error al cambiar a incógnito!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
@@ -2870,6 +2965,11 @@ This is your own one-time link!</source>
        <target>Error al cargar servidores %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error migrating settings" xml:space="preserve">
+        <source>Error migrating settings</source>
+        <target>Error al migrar la configuración</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error opening chat" xml:space="preserve">
        <source>Error opening chat</source>
        <target>Error al abrir chat</target>
@@ -2878,7 +2978,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>Error al recibir archivo</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Error reconnecting server" xml:space="preserve">
        <source>Error reconnecting server</source>
@@ -2972,12 +3072,13 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Error switching profile" xml:space="preserve">
        <source>Error switching profile</source>
+        <target>Error al cambiar perfil</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>¡Error al cambiar perfil!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alertTitle</note>
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
@@ -3022,8 +3123,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Error: %@</target>
-        <note>file error text
-   snd error text</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -3110,6 +3210,13 @@ This is your own one-time link!</source>
        <target>Error de archivo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
+        <source>File errors:
+%@</source>
+        <target>Error(es) de archivo
+%@</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
        <source>File not found - most likely file was deleted or cancelled.</source>
        <target>Archivo no encontrado, probablemente haya sido borrado o cancelado.</target>
@@ -3245,11 +3352,31 @@ This is your own one-time link!</source>
        <target>Reenviar</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
+        <source>Forward %d message(s)?</source>
+        <target>¿Reenviar %d mensaje(s)?</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
        <target>Reenviar y guardar mensajes</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forward messages" xml:space="preserve">
+        <source>Forward messages</source>
+        <target>Reenviar mensajes</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Forward messages without files?" xml:space="preserve">
+        <source>Forward messages without files?</source>
+        <target>¿Reenviar mensajes sin los archivos?</target>
+        <note>alert message</note>
+      </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">
        <source>Forwarded</source>
        <target>Reenviado</target>
@@ -3260,6 +3387,11 @@ This is your own one-time link!</source>
        <target>Reenviado por</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
+        <source>Forwarding %lld messages</source>
+        <target>Reenviando %lld mensajes</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
        <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
        <target>El servidor de reenvío %@ no ha podido conectarse al servidor de destino %@. Por favor, intentalo más tarde.</target>
@@ -3309,19 +3441,14 @@ Error: %2$@</target>
        <target>Nombre completo (opcional)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>Nombre completo:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
        <source>Fully decentralized – visible only to members.</source>
-        <target>Completamente descentralizado y sólo visible para los miembros.</target>
+        <target>Totalmente descentralizado. Visible sólo para los miembros.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Fully re-implemented - work in background!" xml:space="preserve">
        <source>Fully re-implemented - work in background!</source>
-        <target>Completamente reimplementado: ¡funciona en segundo plano!</target>
+        <target>Totalmente revisado. ¡Funciona en segundo plano!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Further reduced battery usage" xml:space="preserve">
@@ -3559,6 +3686,11 @@ Error: %2$@</target>
        <target>Servidores ICE (uno por línea)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="IP address" xml:space="preserve">
+        <source>IP address</source>
+        <target>Dirección IP</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
        <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
        <target>Si no puedes reunirte en persona, muestra el código QR por videollamada o comparte el enlace.</target>
@@ -3634,6 +3766,13 @@ Error: %2$@</target>
        <target>Importando archivo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <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">
        <source>Improved message delivery</source>
        <target>Entrega de mensajes mejorada</target>
@@ -4036,7 +4175,7 @@ This is your link for group %@!</source>
      </trans-unit>
      <trans-unit id="Local profile data only" xml:space="preserve">
        <source>Local profile data only</source>
-        <target>Sólo datos del perfil local</target>
+        <target>Eliminar sólo el perfil</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Lock after" xml:space="preserve">
@@ -4206,6 +4345,7 @@ This is your link for group %@!</source>
      </trans-unit>
      <trans-unit id="Message shape" xml:space="preserve">
        <source>Message shape</source>
+        <target>Forma del mensaje</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4258,6 +4398,11 @@ This is your link for group %@!</source>
        <target>Mensajes enviados</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
+        <source>Messages were deleted after you selected them.</source>
+        <target>Los mensajes han sido borrados después de seleccionarlos.</target>
+        <note>alert message</note>
+      </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>Los mensajes, archivos y llamadas están protegidos mediante **cifrado de extremo a extremo** con secreto perfecto hacía adelante, repudio y recuperación tras ataque.</target>
@@ -4413,6 +4558,16 @@ This is your link for group %@!</source>
        <target>Código Nuevo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
+        <source>New SOCKS credentials will be used every time you start the app.</source>
+        <target>Se usarán credenciales SOCKS nuevas cada vez que inicies la aplicación.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
+        <source>New SOCKS credentials will be used for each server.</source>
+        <target>Se usarán credenciales SOCKS nuevas por cada servidor.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New chat" xml:space="preserve">
        <source>New chat</source>
        <target>Nuevo chat</target>
@@ -4533,6 +4688,16 @@ This is your link for group %@!</source>
        <target>Sin conexión de red</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No permission to record speech" xml:space="preserve">
+        <source>No permission to record speech</source>
+        <target>Sin permiso para grabación de voz</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No permission to record video" xml:space="preserve">
+        <source>No permission to record video</source>
+        <target>Sin permiso para grabación de vídeo</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>Sin permiso para grabar mensajes de voz</target>
@@ -4553,6 +4718,11 @@ This is your link for group %@!</source>
        <target>Nada seleccionado</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Nothing to forward!" xml:space="preserve">
+        <source>Nothing to forward!</source>
+        <target>¡Nada para reenviar!</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Notificaciones</target>
@@ -4585,7 +4755,7 @@ This is your link for group %@!</source>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>Ok</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Old database" xml:space="preserve">
        <source>Old database</source>
@@ -4776,6 +4946,13 @@ Requiere activación de la VPN.</target>
        <target>Otros servidores %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
+        <source>Other file errors:
+%@</source>
+        <target>Otro(s) error(es) de archivo.
+%@</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>Contador PING</target>
@@ -4811,6 +4988,11 @@ Requiere activación de la VPN.</target>
        <target>¡Código de acceso guardado!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Password" xml:space="preserve">
+        <source>Password</source>
+        <target>Contraseña</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Password to show" xml:space="preserve">
        <source>Password to show</source>
        <target>Contraseña para hacerlo visible</target>
@@ -4960,9 +5142,14 @@ Error: %@</target>
        <target>Interfaz en polaco</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Port" xml:space="preserve">
+        <source>Port</source>
+        <target>Puerto</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
        <source>Possibly, certificate fingerprint in server address is incorrect</source>
-        <target>Posiblemente la huella digital del certificado en la dirección del servidor es incorrecta</target>
+        <target>Posiblemente la huella del certificado en la dirección del servidor es incorrecta</target>
        <note>server test error</note>
      </trans-unit>
      <trans-unit id="Preserve the last message draft, with attachments." xml:space="preserve">
@@ -5032,7 +5219,7 @@ Error: %@</target>
      </trans-unit>
      <trans-unit id="Profile and server connections" xml:space="preserve">
        <source>Profile and server connections</source>
-        <target>Datos del perfil y conexiones</target>
+        <target>Eliminar perfil y conexiones</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Profile image" xml:space="preserve">
@@ -5045,16 +5232,6 @@ Error: %@</target>
        <target>Forma de los perfiles</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Nombre del perfil</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Nombre del perfil:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Contraseña del perfil</target>
@@ -5157,6 +5334,11 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
        <target>Servidores con proxy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Proxy requires password" xml:space="preserve">
+        <source>Proxy requires password</source>
+        <target>El proxy requiere contraseña</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Notificaciones automáticas</target>
@@ -5378,6 +5560,11 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
        <target>Eliminar</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Remove archive?" xml:space="preserve">
+        <source>Remove archive?</source>
+        <target>¿Eliminar archivo?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Remove image" xml:space="preserve">
        <source>Remove image</source>
        <target>Eliminar imagen</target>
@@ -5558,6 +5745,11 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
        <target>Servidor SMP</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="SOCKS proxy" xml:space="preserve">
+        <source>SOCKS proxy</source>
+        <target>Proxy SOCKS</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Safely receive files" xml:space="preserve">
        <source>Safely receive files</source>
        <target>Recibe archivos de forma segura</target>
@@ -5571,12 +5763,13 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Guardar</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Save (and notify contacts)" xml:space="preserve">
        <source>Save (and notify contacts)</source>
        <target>Guardar (y notificar contactos)</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
@@ -5603,11 +5796,6 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
        <target>Guardar archivo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save auto-accept settings" xml:space="preserve">
-        <source>Save auto-accept settings</source>
-        <target>Guardar configuración de auto aceptar</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save group profile" xml:space="preserve">
        <source>Save group profile</source>
        <target>Guardar perfil de grupo</target>
@@ -5643,16 +5831,16 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
        <target>¿Guardar servidores?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>¿Guardar configuración?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save welcome message?" xml:space="preserve">
        <source>Save welcome message?</source>
        <target>¿Guardar mensaje de bienvenida?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Save your profile?" xml:space="preserve">
+        <source>Save your profile?</source>
+        <target>¿Guardar tu perfil?</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <target>Guardado</target>
@@ -5673,6 +5861,11 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
        <target>Mensaje guardado</target>
        <note>message info title</note>
      </trans-unit>
+      <trans-unit id="Saving %lld messages" xml:space="preserve">
+        <source>Saving %lld messages</source>
+        <target>Guardando %lld mensajes</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Scale" xml:space="preserve">
        <source>Scale</source>
        <target>Escala</target>
@@ -5755,6 +5948,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </trans-unit>
      <trans-unit id="Select chat profile" xml:space="preserve">
        <source>Select chat profile</source>
+        <target>Selecciona perfil de chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
@@ -5804,7 +5998,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </trans-unit>
      <trans-unit id="Send direct message to connect" xml:space="preserve">
        <source>Send direct message to connect</source>
-        <target>Envia un mensaje para conectar</target>
+        <target>Envía un mensaje para conectar</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Send disappearing message" xml:space="preserve">
@@ -5875,7 +6069,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>El remitente ha cancelado la transferencia de archivos.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
        <source>Sender may have deleted the connection request.</source>
@@ -5972,6 +6166,11 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
        <target>Mediante proxy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Server" xml:space="preserve">
+        <source>Server</source>
+        <target>Servidor</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Server address" xml:space="preserve">
        <source>Server address</source>
        <target>Dirección del servidor</target>
@@ -5999,7 +6198,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </trans-unit>
      <trans-unit id="Server test failed!" xml:space="preserve">
        <source>Server test failed!</source>
-        <target>¡Error en prueba del servidor!</target>
+        <target>¡Prueba no superada!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Server type" xml:space="preserve">
@@ -6092,6 +6291,11 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
        <target>Configuración</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Settings were changed." xml:space="preserve">
+        <source>Settings were changed.</source>
+        <target>La configuración ha sido modificada.</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
        <target>Dar forma a las imágenes de perfil</target>
@@ -6129,6 +6333,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </trans-unit>
      <trans-unit id="Share profile" xml:space="preserve">
        <source>Share profile</source>
+        <target>Comparte perfil</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
@@ -6266,6 +6471,11 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
        <target>Invitación SimpleX de un uso</target>
        <note>simplex link type</note>
      </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">
        <source>Simplified incognito mode</source>
        <target>Modo incógnito simplificado</target>
@@ -6296,6 +6506,11 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
        <target>Suave</target>
        <note>blur media</note>
      </trans-unit>
+      <trans-unit id="Some app settings were not migrated." xml:space="preserve">
+        <source>Some app settings were not migrated.</source>
+        <target>Algunas configuraciones de la app no han sido migradas.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
        <source>Some file(s) were not exported:</source>
        <target>Algunos archivos no han sido exportados:</target>
@@ -6436,6 +6651,16 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
        <target>Soporte SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>System</source>
        <target>Sistema</target>
@@ -6473,6 +6698,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </trans-unit>
      <trans-unit id="Tail" xml:space="preserve">
        <source>Tail</source>
+        <target>Cola</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
@@ -6522,7 +6748,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </trans-unit>
      <trans-unit id="Test failed at step %@." xml:space="preserve">
        <source>Test failed at step %@.</source>
-        <target>La prueba ha fallado en el paso %@.</target>
+        <target>Prueba no superada en el paso %@.</target>
        <note>server test failure</note>
      </trans-unit>
      <trans-unit id="Test server" xml:space="preserve">
@@ -6537,7 +6763,7 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
      </trans-unit>
      <trans-unit id="Tests failed!" xml:space="preserve">
        <source>Tests failed!</source>
-        <target>¡Pruebas fallidas!</target>
+        <target>¡Pruebas no superadas!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Thank you for installing SimpleX Chat!" xml:space="preserve">
@@ -6667,6 +6893,11 @@ Puede ocurrir por algún bug o cuando la conexión está comprometida.</target>
        <target>El texto pegado no es un enlace SimpleX.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
+        <source>The uploaded database archive will be permanently removed from the servers.</source>
+        <target>El archivo de bases de datos subido será eliminado permanentemente de los servidores.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <target>Temas</target>
@@ -6794,6 +7025,16 @@ You will be prompted to complete authentication before this feature is enabled.<
 Se te pedirá que completes la autenticación antes de activar esta función.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
+        <source>To record speech please grant permission to use Microphone.</source>
+        <target>Para grabación de voz, por favor concede el permiso para usar el micrófono.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
+        <source>To record video please grant permission to use Camera.</source>
+        <target>Para grabación de vídeo, por favor concede el permiso para usar la cámara.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
        <source>To record voice message please grant permission to use Microphone.</source>
        <target>Para grabar el mensaje de voz concede permiso para usar el micrófono.</target>
@@ -6947,7 +7188,7 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
      <trans-unit id="Unknown servers!" xml:space="preserve">
        <source>Unknown servers!</source>
        <target>¡Servidores desconocidos!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
        <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7061,6 +7302,11 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
        <target>Usar hosts .onion</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
+        <source>Use SOCKS proxy</source>
+        <target>Usar proxy SOCKS</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
        <source>Use SimpleX Chat servers?</source>
        <target>¿Usar servidores SimpleX Chat?</target>
@@ -7126,16 +7372,16 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
        <target>Usa la aplicación con una sola mano.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="User profile" xml:space="preserve">
-        <source>User profile</source>
-        <target>Perfil de usuario</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="User selection" xml:space="preserve">
        <source>User selection</source>
        <target>Selección de usuarios</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Username" xml:space="preserve">
+        <source>Username</source>
+        <target>Nombre de usuario</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
        <source>Using SimpleX Chat servers.</source>
        <target>Usar servidores SimpleX Chat.</target>
@@ -7369,7 +7615,7 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
        <target>Sin Tor o VPN, tu dirección IP será visible para estos servidores XFTP: %@.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Wrong database passphrase" xml:space="preserve">
        <source>Wrong database passphrase</source>
@@ -7396,11 +7642,6 @@ Para conectarte pide a tu contacto que cree otro enlace y comprueba la conexión
        <target>Servidor XFTP</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You" xml:space="preserve">
-        <source>You</source>
-        <target>Tú</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
        <source>You **must not** use the same database on two devices.</source>
        <target>**No debes** usar la misma base de datos en dos dispositivos.</target>
@@ -7750,6 +7991,11 @@ Repeat connection request?</source>
        <target>La base de datos no está cifrada - establece una contraseña para cifrarla.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat preferences" xml:space="preserve">
+        <source>Your chat preferences</source>
+        <target>Tus preferencias de chat</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Mis perfiles</target>
@@ -7757,6 +8003,7 @@ Repeat connection request?</source>
      </trans-unit>
      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
+        <target>Tu conexión ha sido trasladada a %@ pero ha ocurrido un error inesperado al redirigirte al perfil.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
@@ -7774,6 +8021,11 @@ Repeat connection request?</source>
        <target>Tus contactos permanecerán conectados.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
+        <source>Your credentials may be sent unencrypted.</source>
+        <target>Tus credenciales podrían ser enviadas sin cifrar.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
        <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
        <target>La base de datos actual será ELIMINADA y SUSTITUIDA por la importada.</target>
@@ -7804,13 +8056,16 @@ Repeat connection request?</source>
        <target>El perfil **%@** será compartido.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
-        <source>Your profile is stored on your device and shared only with your contacts.
-SimpleX servers cannot see your profile.</source>
-        <target>Tu perfil es almacenado en tu dispositivo y solamente se comparte con tus contactos.
-Los servidores SimpleX no pueden ver tu perfil.</target>
+      <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
+        <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
+        <target>Tu perfil es almacenado en tu dispositivo y solamente se comparte con tus contactos. Los servidores SimpleX no pueden ver tu perfil.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
+        <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
+        <target>Tu perfil ha sido modificado. Si lo guardas la actualización será enviada a todos tus contactos.</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Tu perfil, contactos y mensajes se almacenan en tu dispositivo.</target>
@@ -7828,7 +8083,7 @@ Los servidores SimpleX no pueden ver tu perfil.</target>
      </trans-unit>
      <trans-unit id="Your server address" xml:space="preserve">
        <source>Your server address</source>
-        <target>Dirección de tu servidor</target>
+        <target>Dirección del servidor</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Your settings" xml:space="preserve">
@@ -8540,7 +8795,7 @@ Los servidores SimpleX no pueden ver tu perfil.</target>
      </trans-unit>
      <trans-unit id="removed profile picture" xml:space="preserve">
        <source>removed profile picture</source>
-        <target>imagen de perfil eliminada</target>
+        <target>ha eliminado la imagen del perfil</target>
        <note>profile update event chat item</note>
      </trans-unit>
      <trans-unit id="removed you" xml:space="preserve">
@@ -8604,7 +8859,7 @@ last received msg: %2$@</source>
      </trans-unit>
      <trans-unit id="set new profile picture" xml:space="preserve">
        <source>set new profile picture</source>
-        <target>nueva imagen de perfil</target>
+        <target>tiene nueva imagen del perfil</target>
        <note>profile update event chat item</note>
      </trans-unit>
      <trans-unit id="standard end-to-end encryption" xml:space="preserve">
@@ -8952,7 +9207,7 @@ last received msg: %2$@</source>
      </trans-unit>
      <trans-unit id="Database passphrase is different from saved in the keychain." xml:space="preserve">
        <source>Database passphrase is different from saved in the keychain.</source>
-        <target>La contraseña de la base de datos es distinta a la almacenada en keychain.</target>
+        <target>La contraseña de la base de datos es diferente a la almacenada en keychain.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Database passphrase is required to open chat." xml:space="preserve">
@@ -156,11 +156,31 @@
        <target>%d päivää</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
+        <source>%d file(s) are still being downloaded.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
+        <source>%d file(s) failed to download.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
+        <source>%d file(s) were deleted.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
+        <source>%d file(s) were not downloaded.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
      <trans-unit id="%d hours" xml:space="preserve">
        <source>%d hours</source>
        <target>%d tuntia</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve">
+        <source>%d messages not forwarded</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="%d min" xml:space="preserve">
        <source>%d min</source>
        <target>%d min</target>
@@ -690,7 +710,7 @@
      </trans-unit>
      <trans-unit id="All profiles" xml:space="preserve">
        <source>All profiles</source>
-        <note>No comment provided by engineer.</note>
+        <note>profile dropdown</note>
      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
@@ -872,6 +892,10 @@
        <target>Sovelluksen pääsykoodi korvataan itsetuhoutuvalla pääsykoodilla.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="App session" xml:space="preserve">
+        <source>App session</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="App version" xml:space="preserve">
        <source>App version</source>
        <target>Sovellusversio</target>
@@ -971,6 +995,10 @@
        <target>Hyväksy kuvat automaattisesti</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Auto-accept settings" xml:space="preserve">
+        <source>Auto-accept settings</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>Takaisin</target>
@@ -994,10 +1022,18 @@
        <target>Virheellinen viestin tarkiste</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better calls" xml:space="preserve">
+        <source>Better calls</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
        <source>Better groups</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better message dates." xml:space="preserve">
+        <source>Better message dates.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>Parempia viestejä</target>
@@ -1007,6 +1043,18 @@
        <source>Better networking</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better notifications" xml:space="preserve">
+        <source>Better notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better security ✅" xml:space="preserve">
+        <source>Better security ✅</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better user experience" xml:space="preserve">
+        <source>Better user experience</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
        <source>Black</source>
        <note>No comment provided by engineer.</note>
@@ -1124,7 +1172,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>Peruuta</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Cancel migration" xml:space="preserve">
        <source>Cancel migration</source>
@@ -1142,7 +1190,7 @@
      <trans-unit id="Cannot receive file" xml:space="preserve">
        <source>Cannot receive file</source>
        <target>Tiedostoa ei voi vastaanottaa</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1263,6 +1311,15 @@
        <target>Chat-asetukset</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat preferences were changed." xml:space="preserve">
+        <source>Chat preferences were changed.</source>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Chat profile" xml:space="preserve">
+        <source>Chat profile</source>
+        <target>Käyttäjäprofiili</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <note>No comment provided by engineer.</note>
@@ -1739,6 +1796,10 @@ This is your own one-time link!</source>
        <target>Mukautettu aika</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Customizable message shape." xml:space="preserve">
+        <source>Customizable message shape.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
        <source>Customize theme</source>
        <note>No comment provided by engineer.</note>
@@ -2025,6 +2086,10 @@ This is your own one-time link!</source>
        <target>Poista vanha tietokanta?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
+        <source>Delete or moderate up to 200 messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
        <source>Delete pending connection?</source>
        <target>Poistetaanko odottava yhteys?</target>
@@ -2256,6 +2321,10 @@ This is your own one-time link!</source>
        <source>Do not send history to new members.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
+        <source>Do not use credentials with proxy.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>Älä luo osoitetta</target>
@@ -2278,7 +2347,8 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Download" xml:space="preserve">
        <source>Download</source>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Download errors" xml:space="preserve">
        <source>Download errors</source>
@@ -2293,6 +2363,10 @@ This is your own one-time link!</source>
        <target>Lataa tiedosto</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Download files" xml:space="preserve">
+        <source>Download files</source>
+        <note>alert action</note>
+      </trans-unit>
      <trans-unit id="Downloaded" xml:space="preserve">
        <source>Downloaded</source>
        <note>No comment provided by engineer.</note>
@@ -2685,6 +2759,10 @@ This is your own one-time link!</source>
        <target>Virhe %@-palvelimien lataamisessa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error migrating settings" xml:space="preserve">
+        <source>Error migrating settings</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error opening chat" xml:space="preserve">
        <source>Error opening chat</source>
        <note>No comment provided by engineer.</note>
@@ -2692,7 +2770,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>Virhe tiedoston vastaanottamisessa</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Error reconnecting server" xml:space="preserve">
        <source>Error reconnecting server</source>
@@ -2785,7 +2863,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Virhe profiilin vaihdossa!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alertTitle</note>
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
@@ -2828,8 +2906,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Virhe: %@</target>
-        <note>file error text
-   snd error text</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2910,6 +2987,11 @@ This is your own one-time link!</source>
        <source>File error</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
+        <source>File errors:
+%@</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
        <source>File not found - most likely file was deleted or cancelled.</source>
        <note>file error text</note>
@@ -3036,10 +3118,26 @@ This is your own one-time link!</source>
        <source>Forward</source>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
+        <source>Forward %d message(s)?</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forward messages" xml:space="preserve">
+        <source>Forward messages</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Forward messages without files?" xml:space="preserve">
+        <source>Forward messages without files?</source>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
+        <source>Forward up to 20 messages at once.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
        <source>Forwarded</source>
        <note>No comment provided by engineer.</note>
@@ -3048,6 +3146,10 @@ This is your own one-time link!</source>
        <source>Forwarded from</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
+        <source>Forwarding %lld messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
        <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
        <note>No comment provided by engineer.</note>
@@ -3089,11 +3191,6 @@ Error: %2$@</source>
        <target>Koko nimi (valinnainen)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>Koko nimi:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
        <source>Fully decentralized – visible only to members.</source>
        <note>No comment provided by engineer.</note>
@@ -3331,6 +3428,10 @@ Error: %2$@</source>
        <target>ICE-palvelimet (yksi per rivi)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="IP address" xml:space="preserve">
+        <source>IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
        <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
        <target>Jos et voi tavata henkilökohtaisesti, näytä QR-koodi videopuhelussa tai jaa linkki.</target>
@@ -3403,6 +3504,11 @@ Error: %2$@</source>
        <source>Importing archive</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
        <source>Improved message delivery</source>
        <note>No comment provided by engineer.</note>
@@ -3985,6 +4091,10 @@ This is your link for group %@!</source>
        <source>Messages sent</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
+        <source>Messages were deleted after you selected them.</source>
+        <note>alert message</note>
+      </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>
        <note>No comment provided by engineer.</note>
@@ -4127,6 +4237,14 @@ This is your link for group %@!</source>
        <target>Uusi pääsykoodi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
+        <source>New SOCKS credentials will be used every time you start the app.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
+        <source>New SOCKS credentials will be used for each server.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New chat" xml:space="preserve">
        <source>New chat</source>
        <note>No comment provided by engineer.</note>
@@ -4240,6 +4358,14 @@ This is your link for group %@!</source>
        <source>No network connection</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No permission to record speech" xml:space="preserve">
+        <source>No permission to record speech</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No permission to record video" xml:space="preserve">
+        <source>No permission to record video</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>Ei lupaa ääniviestin tallentamiseen</target>
@@ -4258,6 +4384,10 @@ This is your link for group %@!</source>
        <source>Nothing selected</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Nothing to forward!" xml:space="preserve">
+        <source>Nothing to forward!</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Ilmoitukset</target>
@@ -4289,7 +4419,7 @@ This is your link for group %@!</source>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>Ok</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Old database" xml:space="preserve">
        <source>Old database</source>
@@ -4468,6 +4598,11 @@ Edellyttää VPN:n sallimista.</target>
        <source>Other %@ servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
+        <source>Other file errors:
+%@</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>PING-määrä</target>
@@ -4503,6 +4638,10 @@ Edellyttää VPN:n sallimista.</target>
        <target>Pääsykoodi asetettu!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Password" xml:space="preserve">
+        <source>Password</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Password to show" xml:space="preserve">
        <source>Password to show</source>
        <target>Salasana näytettäväksi</target>
@@ -4639,6 +4778,10 @@ Error: %@</source>
        <target>Puolalainen käyttöliittymä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Port" xml:space="preserve">
+        <source>Port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
        <source>Possibly, certificate fingerprint in server address is incorrect</source>
        <target>Palvelimen osoitteen varmenteen sormenjälki on mahdollisesti virheellinen</target>
@@ -4717,14 +4860,6 @@ Error: %@</source>
        <source>Profile images</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Profiilin salasana</target>
@@ -4820,6 +4955,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Proxied servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Proxy requires password" xml:space="preserve">
+        <source>Proxy requires password</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Push-ilmoitukset</target>
@@ -5026,6 +5165,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Poista</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Remove archive?" xml:space="preserve">
+        <source>Remove archive?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Remove image" xml:space="preserve">
        <source>Remove image</source>
        <note>No comment provided by engineer.</note>
@@ -5193,6 +5336,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>SMP server</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="SOCKS proxy" xml:space="preserve">
+        <source>SOCKS proxy</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Safely receive files" xml:space="preserve">
        <source>Safely receive files</source>
        <note>No comment provided by engineer.</note>
@@ -5204,12 +5351,13 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Tallenna</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Save (and notify contacts)" xml:space="preserve">
        <source>Save (and notify contacts)</source>
        <target>Tallenna (ja ilmoita kontakteille)</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
@@ -5235,11 +5383,6 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Tallenna arkisto</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save auto-accept settings" xml:space="preserve">
-        <source>Save auto-accept settings</source>
-        <target>Tallenna automaattisen hyväksynnän asetukset</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save group profile" xml:space="preserve">
        <source>Save group profile</source>
        <target>Tallenna ryhmäprofiili</target>
@@ -5275,16 +5418,15 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Tallenna palvelimet?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>Tallenna asetukset?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save welcome message?" xml:space="preserve">
        <source>Save welcome message?</source>
        <target>Tallenna tervetuloviesti?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Save your profile?" xml:space="preserve">
+        <source>Save your profile?</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <note>No comment provided by engineer.</note>
@@ -5302,6 +5444,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Saved message</source>
        <note>message info title</note>
      </trans-unit>
+      <trans-unit id="Saving %lld messages" xml:space="preserve">
+        <source>Saving %lld messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Scale" xml:space="preserve">
        <source>Scale</source>
        <note>No comment provided by engineer.</note>
@@ -5489,7 +5635,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>Lähettäjä peruutti tiedoston siirron.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
        <source>Sender may have deleted the connection request.</source>
@@ -5581,6 +5727,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Sent via proxy</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Server" xml:space="preserve">
+        <source>Server</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Server address" xml:space="preserve">
        <source>Server address</source>
        <note>No comment provided by engineer.</note>
@@ -5690,6 +5840,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Asetukset</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Settings were changed." xml:space="preserve">
+        <source>Settings were changed.</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
        <note>No comment provided by engineer.</note>
@@ -5853,6 +6007,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SimpleX-kertakutsu</target>
        <note>simplex link type</note>
      </trans-unit>
+      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
+        <source>SimpleX protocols reviewed by Trail of Bits.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
        <source>Simplified incognito mode</source>
        <note>No comment provided by engineer.</note>
@@ -5880,6 +6038,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Soft</source>
        <note>blur media</note>
      </trans-unit>
+      <trans-unit id="Some app settings were not migrated." xml:space="preserve">
+        <source>Some app settings were not migrated.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
        <source>Some file(s) were not exported:</source>
        <note>No comment provided by engineer.</note>
@@ -6008,6 +6170,14 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SimpleX Chat tuki</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
+        <source>Switch audio and video during the call.</source>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
        <source>System</source>
        <target>Järjestelmä</target>
@@ -6229,6 +6399,10 @@ Tämä voi johtua jostain virheestä tai siitä, että yhteys on vaarantunut.</t
        <source>The text you pasted is not a SimpleX link.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
+        <source>The uploaded database archive will be permanently removed from the servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <note>No comment provided by engineer.</note>
@@ -6345,6 +6519,14 @@ You will be prompted to complete authentication before this feature is enabled.<
 Sinua kehotetaan suorittamaan todennus loppuun, ennen kuin tämä ominaisuus otetaan käyttöön.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
+        <source>To record speech please grant permission to use Microphone.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
+        <source>To record video please grant permission to use Camera.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
        <source>To record voice message please grant permission to use Microphone.</source>
        <target>Jos haluat nauhoittaa ääniviestin, anna lupa käyttää mikrofonia.</target>
@@ -6486,7 +6668,7 @@ Sinua kehotetaan suorittamaan todennus loppuun, ennen kuin tämä ominaisuus ote
      </trans-unit>
      <trans-unit id="Unknown servers!" xml:space="preserve">
        <source>Unknown servers!</source>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
        <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -6591,6 +6773,10 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <target>Käytä .onion-isäntiä</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
+        <source>Use SOCKS proxy</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
        <source>Use SimpleX Chat servers?</source>
        <target>Käytä SimpleX Chat palvelimia?</target>
@@ -6650,15 +6836,14 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <source>Use the app with one hand.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="User profile" xml:space="preserve">
-        <source>User profile</source>
-        <target>Käyttäjäprofiili</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="User selection" xml:space="preserve">
        <source>User selection</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Username" xml:space="preserve">
+        <source>Username</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
        <source>Using SimpleX Chat servers.</source>
        <target>Käyttää SimpleX Chat -palvelimia.</target>
@@ -6871,7 +7056,7 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
      </trans-unit>
      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Wrong database passphrase" xml:space="preserve">
        <source>Wrong database passphrase</source>
@@ -6895,11 +7080,6 @@ Jos haluat muodostaa yhteyden, pyydä kontaktiasi luomaan toinen yhteyslinkki ja
        <source>XFTP server</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You" xml:space="preserve">
-        <source>You</source>
-        <target>Sinä</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
        <source>You **must not** use the same database on two devices.</source>
        <note>No comment provided by engineer.</note>
@@ -7225,6 +7405,10 @@ Repeat connection request?</source>
        <target>Keskustelut-tietokantasi ei ole salattu - aseta tunnuslause sen salaamiseksi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat preferences" xml:space="preserve">
+        <source>Your chat preferences</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Keskusteluprofiilisi</target>
@@ -7249,6 +7433,10 @@ Repeat connection request?</source>
        <target>Kontaktisi pysyvät yhdistettyinä.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
+        <source>Your credentials may be sent unencrypted.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
        <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
        <target>Nykyinen keskustelut-tietokantasi poistetaan ja korvataan tuodulla tietokannalla.</target>
@@ -7278,13 +7466,15 @@ Repeat connection request?</source>
        <target>Profiilisi **%@** jaetaan.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
-        <source>Your profile is stored on your device and shared only with your contacts.
-SimpleX servers cannot see your profile.</source>
-        <target>Profiilisi tallennetaan laitteeseesi ja jaetaan vain yhteystietojesi kanssa.
-SimpleX-palvelimet eivät näe profiiliasi.</target>
+      <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
+        <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
+        <target>Profiilisi tallennetaan laitteeseesi ja jaetaan vain yhteystietojesi kanssa. SimpleX-palvelimet eivät näe profiiliasi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
+        <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Profiilisi, kontaktisi ja toimitetut viestit tallennetaan laitteellesi.</target>
@@ -161,11 +161,31 @@
        <target>%d jours</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
+        <source>%d file(s) are still being downloaded.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
+        <source>%d file(s) failed to download.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
+        <source>%d file(s) were deleted.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
+        <source>%d file(s) were not downloaded.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
      <trans-unit id="%d hours" xml:space="preserve">
        <source>%d hours</source>
        <target>%d heures</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve">
+        <source>%d messages not forwarded</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="%d min" xml:space="preserve">
        <source>%d min</source>
        <target>%d min</target>
@@ -727,7 +747,7 @@
      <trans-unit id="All profiles" xml:space="preserve">
        <source>All profiles</source>
        <target>Tous les profiles</target>
-        <note>No comment provided by engineer.</note>
+        <note>profile dropdown</note>
      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
@@ -919,6 +939,10 @@
        <target>Le code d'accès de l'application est remplacé par un code d'autodestruction.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="App session" xml:space="preserve">
+        <source>App session</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="App version" xml:space="preserve">
        <source>App version</source>
        <target>Version de l'app</target>
@@ -1024,6 +1048,10 @@
        <target>Images auto-acceptées</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Auto-accept settings" xml:space="preserve">
+        <source>Auto-accept settings</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>Retour</target>
@@ -1049,11 +1077,19 @@
        <target>Mauvais hash de message</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better calls" xml:space="preserve">
+        <source>Better calls</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
        <source>Better groups</source>
        <target>Des groupes plus performants</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better message dates." xml:space="preserve">
+        <source>Better message dates.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>Meilleurs messages</target>
@@ -1064,6 +1100,18 @@
        <target>Meilleure gestion de réseau</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better notifications" xml:space="preserve">
+        <source>Better notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better security ✅" xml:space="preserve">
+        <source>Better security ✅</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better user experience" xml:space="preserve">
+        <source>Better user experience</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
        <source>Black</source>
        <target>Noir</target>
@@ -1197,7 +1245,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>Annuler</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Cancel migration" xml:space="preserve">
        <source>Cancel migration</source>
@@ -1217,7 +1265,7 @@
      <trans-unit id="Cannot receive file" xml:space="preserve">
        <source>Cannot receive file</source>
        <target>Impossible de recevoir le fichier</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1345,6 +1393,15 @@
        <target>Préférences de chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat preferences were changed." xml:space="preserve">
+        <source>Chat preferences were changed.</source>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Chat profile" xml:space="preserve">
+        <source>Chat profile</source>
+        <target>Profil d'utilisateur</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Thème de chat</target>
@@ -1873,6 +1930,10 @@ Il s'agit de votre propre lien unique !</target>
        <target>Délai personnalisé</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Customizable message shape." xml:space="preserve">
+        <source>Customizable message shape.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
        <source>Customize theme</source>
        <target>Personnaliser le thème</target>
@@ -2167,6 +2228,10 @@ Il s'agit de votre propre lien unique !</target>
        <target>Supprimer l'ancienne base de données ?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
+        <source>Delete or moderate up to 200 messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
        <source>Delete pending connection?</source>
        <target>Supprimer la connexion en attente ?</target>
@@ -2417,6 +2482,10 @@ Il s'agit de votre propre lien unique !</target>
        <target>Ne pas envoyer d'historique aux nouveaux membres.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
+        <source>Do not use credentials with proxy.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>Ne pas créer d'adresse</target>
@@ -2440,7 +2509,8 @@ Il s'agit de votre propre lien unique !</target>
      <trans-unit id="Download" xml:space="preserve">
        <source>Download</source>
        <target>Télécharger</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Download errors" xml:space="preserve">
        <source>Download errors</source>
@@ -2457,6 +2527,10 @@ Il s'agit de votre propre lien unique !</target>
        <target>Télécharger le fichier</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Download files" xml:space="preserve">
+        <source>Download files</source>
+        <note>alert action</note>
+      </trans-unit>
      <trans-unit id="Downloaded" xml:space="preserve">
        <source>Downloaded</source>
        <target>Téléchargé</target>
@@ -2870,6 +2944,10 @@ Il s'agit de votre propre lien unique !</target>
        <target>Erreur lors du chargement des serveurs %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error migrating settings" xml:space="preserve">
+        <source>Error migrating settings</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error opening chat" xml:space="preserve">
        <source>Error opening chat</source>
        <target>Erreur lors de l'ouverture du chat</target>
@@ -2878,7 +2956,7 @@ Il s'agit de votre propre lien unique !</target>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>Erreur lors de la réception du fichier</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Error reconnecting server" xml:space="preserve">
        <source>Error reconnecting server</source>
@@ -2977,7 +3055,7 @@ Il s'agit de votre propre lien unique !</target>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Erreur lors du changement de profil !</target>
-        <note>No comment provided by engineer.</note>
+        <note>alertTitle</note>
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
@@ -3022,8 +3100,7 @@ Il s'agit de votre propre lien unique !</target>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Erreur : %@</target>
-        <note>file error text
-   snd error text</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -3110,6 +3187,11 @@ Il s'agit de votre propre lien unique !</target>
        <target>Erreur de fichier</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
+        <source>File errors:
+%@</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
        <source>File not found - most likely file was deleted or cancelled.</source>
        <target>Fichier introuvable - le fichier a probablement été supprimé ou annulé.</target>
@@ -3245,11 +3327,27 @@ Il s'agit de votre propre lien unique !</target>
        <target>Transférer</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
+        <source>Forward %d message(s)?</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
        <target>Transférer et sauvegarder des messages</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forward messages" xml:space="preserve">
+        <source>Forward messages</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Forward messages without files?" xml:space="preserve">
+        <source>Forward messages without files?</source>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
+        <source>Forward up to 20 messages at once.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
        <source>Forwarded</source>
        <target>Transféré</target>
@@ -3260,6 +3358,10 @@ Il s'agit de votre propre lien unique !</target>
        <target>Transféré depuis</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
+        <source>Forwarding %lld messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
        <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
        <target>Le serveur de redirection %@ n'a pas réussi à se connecter au serveur de destination %@. Veuillez réessayer plus tard.</target>
@@ -3309,11 +3411,6 @@ Erreur : %2$@</target>
        <target>Nom complet (optionnel)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>Nom complet :</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
        <source>Fully decentralized – visible only to members.</source>
        <target>Entièrement décentralisé – visible que par ses membres.</target>
@@ -3559,6 +3656,10 @@ Erreur : %2$@</target>
        <target>Serveurs ICE (un par ligne)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="IP address" xml:space="preserve">
+        <source>IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
        <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
        <target>Si vous ne pouvez pas vous rencontrer en personne, montrez le code QR lors d'un appel vidéo ou partagez le lien.</target>
@@ -3634,6 +3735,11 @@ Erreur : %2$@</target>
        <target>Importation de l'archive</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
        <source>Improved message delivery</source>
        <target>Amélioration de la transmission des messages</target>
@@ -4258,6 +4364,10 @@ Voici votre lien pour le groupe %@ !</target>
        <target>Messages envoyés</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
+        <source>Messages were deleted after you selected them.</source>
+        <note>alert message</note>
+      </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>Les messages, fichiers et appels sont protégés par un chiffrement **de bout en bout** avec une confidentialité persistante, une répudiation et une récupération en cas d'effraction.</target>
@@ -4413,6 +4523,14 @@ Voici votre lien pour le groupe %@ !</target>
        <target>Nouveau code d'accès</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
+        <source>New SOCKS credentials will be used every time you start the app.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
+        <source>New SOCKS credentials will be used for each server.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New chat" xml:space="preserve">
        <source>New chat</source>
        <target>Nouveau chat</target>
@@ -4533,6 +4651,14 @@ Voici votre lien pour le groupe %@ !</target>
        <target>Pas de connexion au réseau</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No permission to record speech" xml:space="preserve">
+        <source>No permission to record speech</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No permission to record video" xml:space="preserve">
+        <source>No permission to record video</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>Pas l'autorisation d'enregistrer un message vocal</target>
@@ -4553,6 +4679,10 @@ Voici votre lien pour le groupe %@ !</target>
        <target>Aucune sélection</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Nothing to forward!" xml:space="preserve">
+        <source>Nothing to forward!</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Notifications</target>
@@ -4585,7 +4715,7 @@ Voici votre lien pour le groupe %@ !</target>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>Ok</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Old database" xml:space="preserve">
        <source>Old database</source>
@@ -4776,6 +4906,11 @@ Nécessite l'activation d'un VPN.</target>
        <target>Autres serveurs %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
+        <source>Other file errors:
+%@</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>Nombre de PING</target>
@@ -4811,6 +4946,10 @@ Nécessite l'activation d'un VPN.</target>
        <target>Code d'accès défini !</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Password" xml:space="preserve">
+        <source>Password</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Password to show" xml:space="preserve">
        <source>Password to show</source>
        <target>Mot de passe à entrer</target>
@@ -4960,6 +5099,10 @@ Erreur : %@</target>
        <target>Interface en polonais</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Port" xml:space="preserve">
+        <source>Port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
        <source>Possibly, certificate fingerprint in server address is incorrect</source>
        <target>Il est possible que l'empreinte du certificat dans l'adresse du serveur soit incorrecte</target>
@@ -5045,16 +5188,6 @@ Erreur : %@</target>
        <target>Images de profil</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Nom du profil</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Nom du profil :</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Mot de passe de profil</target>
@@ -5157,6 +5290,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Serveurs routés via des proxy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Proxy requires password" xml:space="preserve">
+        <source>Proxy requires password</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Notifications push</target>
@@ -5378,6 +5515,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Supprimer</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Remove archive?" xml:space="preserve">
+        <source>Remove archive?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Remove image" xml:space="preserve">
        <source>Remove image</source>
        <target>Enlever l'image</target>
@@ -5558,6 +5699,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Serveur SMP</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="SOCKS proxy" xml:space="preserve">
+        <source>SOCKS proxy</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Safely receive files" xml:space="preserve">
        <source>Safely receive files</source>
        <target>Réception de fichiers en toute sécurité</target>
@@ -5571,12 +5716,13 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Enregistrer</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Save (and notify contacts)" xml:space="preserve">
        <source>Save (and notify contacts)</source>
        <target>Enregistrer (et en informer les contacts)</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
@@ -5603,11 +5749,6 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Enregistrer l'archive</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save auto-accept settings" xml:space="preserve">
-        <source>Save auto-accept settings</source>
-        <target>Enregistrer les paramètres de validation automatique</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save group profile" xml:space="preserve">
        <source>Save group profile</source>
        <target>Enregistrer le profil du groupe</target>
@@ -5643,16 +5784,15 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Enregistrer les serveurs ?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>Enregistrer les paramètres ?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save welcome message?" xml:space="preserve">
        <source>Save welcome message?</source>
        <target>Enregistrer le message d'accueil ?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Save your profile?" xml:space="preserve">
+        <source>Save your profile?</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <target>Enregistré</target>
@@ -5673,6 +5813,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Message enregistré</target>
        <note>message info title</note>
      </trans-unit>
+      <trans-unit id="Saving %lld messages" xml:space="preserve">
+        <source>Saving %lld messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Scale" xml:space="preserve">
        <source>Scale</source>
        <target>Échelle</target>
@@ -5875,7 +6019,7 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>L'expéditeur a annulé le transfert de fichiers.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
        <source>Sender may have deleted the connection request.</source>
@@ -5972,6 +6116,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Envoyé via le proxy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Server" xml:space="preserve">
+        <source>Server</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Server address" xml:space="preserve">
        <source>Server address</source>
        <target>Adresse du serveur</target>
@@ -6092,6 +6240,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Paramètres</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Settings were changed." xml:space="preserve">
+        <source>Settings were changed.</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
        <target>Images de profil modelable</target>
@@ -6266,6 +6418,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Invitation unique SimpleX</target>
        <note>simplex link type</note>
      </trans-unit>
+      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
+        <source>SimpleX protocols reviewed by Trail of Bits.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
        <source>Simplified incognito mode</source>
        <target>Mode incognito simplifié</target>
@@ -6296,6 +6452,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Léger</target>
        <note>blur media</note>
      </trans-unit>
+      <trans-unit id="Some app settings were not migrated." xml:space="preserve">
+        <source>Some app settings were not migrated.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
        <source>Some file(s) were not exported:</source>
        <target>Certains fichiers n'ont pas été exportés :</target>
@@ -6436,6 +6596,14 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Supporter SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
+        <source>Switch audio and video during the call.</source>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
        <source>System</source>
        <target>Système</target>
@@ -6667,6 +6835,10 @@ Cela peut se produire en raison d'un bug ou lorsque la connexion est compromise.
        <target>Le texte collé n'est pas un lien SimpleX.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
+        <source>The uploaded database archive will be permanently removed from the servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <target>Thèmes</target>
@@ -6794,6 +6966,14 @@ You will be prompted to complete authentication before this feature is enabled.<
 Vous serez invité à confirmer l'authentification avant que cette fonction ne soit activée.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
+        <source>To record speech please grant permission to use Microphone.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
+        <source>To record video please grant permission to use Camera.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
        <source>To record voice message please grant permission to use Microphone.</source>
        <target>Pour enregistrer un message vocal, veuillez accorder la permission d'utiliser le microphone.</target>
@@ -6947,7 +7127,7 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
      <trans-unit id="Unknown servers!" xml:space="preserve">
        <source>Unknown servers!</source>
        <target>Serveurs inconnus !</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
        <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7061,6 +7241,10 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
        <target>Utiliser les hôtes .onions</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
+        <source>Use SOCKS proxy</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
        <source>Use SimpleX Chat servers?</source>
        <target>Utiliser les serveurs SimpleX Chat ?</target>
@@ -7126,16 +7310,15 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
        <target>Utiliser l'application d'une main.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="User profile" xml:space="preserve">
-        <source>User profile</source>
-        <target>Profil d'utilisateur</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="User selection" xml:space="preserve">
        <source>User selection</source>
        <target>Sélection de l'utilisateur</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Username" xml:space="preserve">
+        <source>Username</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
        <source>Using SimpleX Chat servers.</source>
        <target>Vous utilisez les serveurs SimpleX.</target>
@@ -7369,7 +7552,7 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
        <target>Sans Tor ni VPN, votre adresse IP sera visible par ces relais XFTP : %@.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Wrong database passphrase" xml:space="preserve">
        <source>Wrong database passphrase</source>
@@ -7396,11 +7579,6 @@ Pour vous connecter, veuillez demander à votre contact de créer un autre lien
        <target>Serveur XFTP</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You" xml:space="preserve">
-        <source>You</source>
-        <target>Vous</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
        <source>You **must not** use the same database on two devices.</source>
        <target>Vous **ne devez pas** utiliser la même base de données sur deux appareils.</target>
@@ -7750,6 +7928,10 @@ Répéter la demande de connexion ?</target>
        <target>Votre base de données de chat n'est pas chiffrée - définisez une phrase secrète.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat preferences" xml:space="preserve">
+        <source>Your chat preferences</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Vos profils de chat</target>
@@ -7774,6 +7956,10 @@ Répéter la demande de connexion ?</target>
        <target>Vos contacts resteront connectés.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
+        <source>Your credentials may be sent unencrypted.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
        <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
        <target>Votre base de données de chat actuelle va être SUPPRIMEE et REMPLACEE par celle importée.</target>
@@ -7804,13 +7990,15 @@ Répéter la demande de connexion ?</target>
        <target>Votre profil **%@** sera partagé.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
-        <source>Your profile is stored on your device and shared only with your contacts.
-SimpleX servers cannot see your profile.</source>
-        <target>Votre profil est stocké sur votre appareil et est seulement partagé avec vos contacts.
-Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
+      <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
+        <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
+        <target>Votre profil est stocké sur votre appareil et est seulement partagé avec vos contacts. Les serveurs SimpleX ne peuvent pas voir votre profil.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
+        <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Votre profil, vos contacts et les messages reçus sont stockés sur votre appareil.</target>
@@ -139,6 +139,7 @@
      </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">
@@ -161,11 +162,36 @@
        <target>%d giorni</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
+        <source>%d file(s) are still being downloaded.</source>
+        <target>%d file è/sono ancora in scaricamento.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
+        <source>%d file(s) failed to download.</source>
+        <target>%d file ha/hanno fallito lo scaricamento.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
+        <source>%d file(s) were deleted.</source>
+        <target>%d file è/sono stato/i eliminato/i.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
+        <source>%d file(s) were not downloaded.</source>
+        <target>%d file non è/sono stato/i scaricato/i.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
      <trans-unit id="%d hours" xml:space="preserve">
        <source>%d hours</source>
        <target>%d ore</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve">
+        <source>%d messages not forwarded</source>
+        <target>%d messaggi non inoltrati</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="%d min" xml:space="preserve">
        <source>%d min</source>
        <target>%d min</target>
@@ -727,7 +753,7 @@
      <trans-unit id="All profiles" xml:space="preserve">
        <source>All profiles</source>
        <target>Tutti gli profili</target>
-        <note>No comment provided by engineer.</note>
+        <note>profile dropdown</note>
      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
@@ -919,6 +945,11 @@
        <target>Il codice di accesso dell'app viene sostituito da un codice di autodistruzione.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="App session" xml:space="preserve">
+        <source>App session</source>
+        <target>Sessione dell'app</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="App version" xml:space="preserve">
        <source>App version</source>
        <target>Versione dell'app</target>
@@ -1024,6 +1055,11 @@
        <target>Auto-accetta immagini</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Auto-accept settings" xml:space="preserve">
+        <source>Auto-accept settings</source>
+        <target>Accetta automaticamente le impostazioni</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>Indietro</target>
@@ -1049,11 +1085,21 @@
        <target>Hash del messaggio errato</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Better groups</source>
        <target>Gruppi migliorati</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Better messages</source>
        <target>Messaggi migliorati</target>
@@ -1064,6 +1110,21 @@
        <target>Rete migliorata</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Black</source>
        <target>Nero</target>
@@ -1197,7 +1258,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>Annulla</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Cancel migration" xml:space="preserve">
        <source>Cancel migration</source>
@@ -1217,7 +1278,7 @@
      <trans-unit id="Cannot receive file" xml:space="preserve">
        <source>Cannot receive file</source>
        <target>Impossibile ricevere il file</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1345,6 +1406,16 @@
        <target>Preferenze della chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat preferences were changed." xml:space="preserve">
+        <source>Chat preferences were changed.</source>
+        <target>Le preferenze della chat sono state cambiate.</target>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Chat profile" xml:space="preserve">
+        <source>Chat profile</source>
+        <target>Profilo utente</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Tema della chat</target>
@@ -1746,6 +1817,7 @@ Questo è il tuo link una tantum!</target>
      </trans-unit>
      <trans-unit id="Corner" xml:space="preserve">
        <source>Corner</source>
+        <target>Angolo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
@@ -1873,6 +1945,11 @@ Questo è il tuo link una tantum!</target>
        <target>Tempo personalizzato</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Customize theme</source>
        <target>Personalizza il tema</target>
@@ -2167,6 +2244,11 @@ Questo è il tuo link una tantum!</target>
        <target>Eliminare il database vecchio?</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Delete pending connection?</source>
        <target>Eliminare la connessione in attesa?</target>
@@ -2417,6 +2499,11 @@ Questo è il tuo link una tantum!</target>
        <target>Non inviare la cronologia ai nuovi membri.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
+        <source>Do not use credentials with proxy.</source>
+        <target>Non usare credenziali con proxy.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>Non creare un indirizzo</target>
@@ -2440,7 +2527,8 @@ Questo è il tuo link una tantum!</target>
      <trans-unit id="Download" xml:space="preserve">
        <source>Download</source>
        <target>Scarica</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Download errors" xml:space="preserve">
        <source>Download errors</source>
@@ -2457,6 +2545,11 @@ Questo è il tuo link una tantum!</target>
        <target>Scarica file</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Download files" xml:space="preserve">
+        <source>Download files</source>
+        <target>Scarica i file</target>
+        <note>alert action</note>
+      </trans-unit>
      <trans-unit id="Downloaded" xml:space="preserve">
        <source>Downloaded</source>
        <target>Scaricato</target>
@@ -2734,6 +2827,7 @@ Questo è il tuo link una tantum!</target>
      </trans-unit>
      <trans-unit id="Error changing connection profile" xml:space="preserve">
        <source>Error changing connection profile</source>
+        <target>Errore nel cambio di profilo di connessione</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
@@ -2748,6 +2842,7 @@ Questo è il tuo link una tantum!</target>
      </trans-unit>
      <trans-unit id="Error changing to incognito!" xml:space="preserve">
        <source>Error changing to incognito!</source>
+        <target>Errore nel passaggio a incognito!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
@@ -2870,6 +2965,11 @@ Questo è il tuo link una tantum!</target>
        <target>Errore nel caricamento dei server %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error migrating settings" xml:space="preserve">
+        <source>Error migrating settings</source>
+        <target>Errore nella migrazione delle impostazioni</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error opening chat" xml:space="preserve">
        <source>Error opening chat</source>
        <target>Errore di apertura della chat</target>
@@ -2878,7 +2978,7 @@ Questo è il tuo link una tantum!</target>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>Errore nella ricezione del file</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Error reconnecting server" xml:space="preserve">
        <source>Error reconnecting server</source>
@@ -2972,12 +3072,13 @@ Questo è il tuo link una tantum!</target>
      </trans-unit>
      <trans-unit id="Error switching profile" xml:space="preserve">
        <source>Error switching profile</source>
+        <target>Errore nel cambio di profilo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Errore nel cambio di profilo!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alertTitle</note>
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
@@ -3022,8 +3123,7 @@ Questo è il tuo link una tantum!</target>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Errore: %@</target>
-        <note>file error text
-   snd error text</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -3110,6 +3210,13 @@ Questo è il tuo link una tantum!</target>
        <target>Errore del file</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
+        <source>File errors:
+%@</source>
+        <target>Errori di file:
+%@</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
        <source>File not found - most likely file was deleted or cancelled.</source>
        <target>File non trovato - probabilmente è stato eliminato o annullato.</target>
@@ -3245,11 +3352,31 @@ Questo è il tuo link una tantum!</target>
        <target>Inoltra</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
+        <source>Forward %d message(s)?</source>
+        <target>Inoltrare %d messaggio/i?</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
        <target>Inoltra e salva i messaggi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forward messages" xml:space="preserve">
+        <source>Forward messages</source>
+        <target>Inoltra i messaggi</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Forward messages without files?" xml:space="preserve">
+        <source>Forward messages without files?</source>
+        <target>Inoltrare i messaggi senza file?</target>
+        <note>alert message</note>
+      </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">
        <source>Forwarded</source>
        <target>Inoltrato</target>
@@ -3260,6 +3387,11 @@ Questo è il tuo link una tantum!</target>
        <target>Inoltrato da</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
+        <source>Forwarding %lld messages</source>
+        <target>Inoltro di %lld messaggi</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
        <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
        <target>Il server di inoltro %@ non è riuscito a connettersi al server di destinazione %@. Riprova più tardi.</target>
@@ -3309,11 +3441,6 @@ Errore: %2$@</target>
        <target>Nome completo (facoltativo)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>Nome completo:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
        <source>Fully decentralized – visible only to members.</source>
        <target>Completamente decentralizzato: visibile solo ai membri.</target>
@@ -3559,6 +3686,11 @@ Errore: %2$@</target>
        <target>Server ICE (uno per riga)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="IP address" xml:space="preserve">
+        <source>IP address</source>
+        <target>Indirizzo IP</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
        <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
        <target>Se non potete incontrarvi di persona, mostra il codice QR in una videochiamata o condividi il link.</target>
@@ -3634,6 +3766,13 @@ Errore: %2$@</target>
        <target>Importazione archivio</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <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">
        <source>Improved message delivery</source>
        <target>Consegna dei messaggi migliorata</target>
@@ -4206,6 +4345,7 @@ Questo è il tuo link per il gruppo %@!</target>
      </trans-unit>
      <trans-unit id="Message shape" xml:space="preserve">
        <source>Message shape</source>
+        <target>Forma del messaggio</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4258,6 +4398,11 @@ Questo è il tuo link per il gruppo %@!</target>
        <target>Messaggi inviati</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
+        <source>Messages were deleted after you selected them.</source>
+        <target>I messaggi sono stati eliminati dopo che li hai selezionati.</target>
+        <note>alert message</note>
+      </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>I messaggi, i file e le chiamate sono protetti da **crittografia end-to-end** con perfect forward secrecy, ripudio e recupero da intrusione.</target>
@@ -4413,6 +4558,16 @@ Questo è il tuo link per il gruppo %@!</target>
        <target>Nuovo codice di accesso</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
+        <source>New SOCKS credentials will be used every time you start the app.</source>
+        <target>Le nuove credenziali SOCKS verranno usate ogni volta che avvii l'app.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
+        <source>New SOCKS credentials will be used for each server.</source>
+        <target>Le nuove credenziali SOCKS verranno usate per ogni server.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New chat" xml:space="preserve">
        <source>New chat</source>
        <target>Nuova chat</target>
@@ -4533,6 +4688,16 @@ Questo è il tuo link per il gruppo %@!</target>
        <target>Nessuna connessione di rete</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No permission to record speech" xml:space="preserve">
+        <source>No permission to record speech</source>
+        <target>Nessuna autorizzazione per registrare l'audio</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No permission to record video" xml:space="preserve">
+        <source>No permission to record video</source>
+        <target>Nessuna autorizzazione per registrare il video</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>Nessuna autorizzazione per registrare messaggi vocali</target>
@@ -4553,6 +4718,11 @@ Questo è il tuo link per il gruppo %@!</target>
        <target>Nessuna selezione</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Nothing to forward!" xml:space="preserve">
+        <source>Nothing to forward!</source>
+        <target>Niente da inoltrare!</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Notifiche</target>
@@ -4585,7 +4755,7 @@ Questo è il tuo link per il gruppo %@!</target>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>Ok</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Old database" xml:space="preserve">
        <source>Old database</source>
@@ -4776,6 +4946,13 @@ Richiede l'attivazione della VPN.</target>
        <target>Altri %@ server</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
+        <source>Other file errors:
+%@</source>
+        <target>Altri errori di file:
+%@</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>Conteggio PING</target>
@@ -4811,6 +4988,11 @@ Richiede l'attivazione della VPN.</target>
        <target>Codice di accesso impostato!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Password" xml:space="preserve">
+        <source>Password</source>
+        <target>Password</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Password to show" xml:space="preserve">
        <source>Password to show</source>
        <target>Password per mostrare</target>
@@ -4960,6 +5142,11 @@ Errore: %@</target>
        <target>Interfaccia polacca</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Port" xml:space="preserve">
+        <source>Port</source>
+        <target>Porta</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
        <source>Possibly, certificate fingerprint in server address is incorrect</source>
        <target>Probabilmente l'impronta del certificato nell'indirizzo del server è sbagliata</target>
@@ -5045,16 +5232,6 @@ Errore: %@</target>
        <target>Immagini del profilo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Nome del profilo</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Nome del profilo:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Password del profilo</target>
@@ -5157,6 +5334,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
        <target>Server via proxy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Proxy requires password" xml:space="preserve">
+        <source>Proxy requires password</source>
+        <target>Il proxy richiede una password</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Notifiche push</target>
@@ -5378,6 +5560,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
        <target>Rimuovi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Remove archive?" xml:space="preserve">
+        <source>Remove archive?</source>
+        <target>Rimuovere l'archivio?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Remove image" xml:space="preserve">
        <source>Remove image</source>
        <target>Rimuovi immagine</target>
@@ -5558,6 +5745,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
        <target>Server SMP</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="SOCKS proxy" xml:space="preserve">
+        <source>SOCKS proxy</source>
+        <target>Proxy SOCKS</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Safely receive files" xml:space="preserve">
        <source>Safely receive files</source>
        <target>Ricevi i file in sicurezza</target>
@@ -5571,12 +5763,13 @@ Attivalo nelle impostazioni *Rete e server*.</target>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Salva</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Save (and notify contacts)" xml:space="preserve">
        <source>Save (and notify contacts)</source>
        <target>Salva (e avvisa i contatti)</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
@@ -5603,11 +5796,6 @@ Attivalo nelle impostazioni *Rete e server*.</target>
        <target>Salva archivio</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save auto-accept settings" xml:space="preserve">
-        <source>Save auto-accept settings</source>
-        <target>Salva le impostazioni di accettazione automatica</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save group profile" xml:space="preserve">
        <source>Save group profile</source>
        <target>Salva il profilo del gruppo</target>
@@ -5643,16 +5831,16 @@ Attivalo nelle impostazioni *Rete e server*.</target>
        <target>Salvare i server?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>Salvare le impostazioni?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save welcome message?" xml:space="preserve">
        <source>Save welcome message?</source>
        <target>Salvare il messaggio di benvenuto?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Save your profile?" xml:space="preserve">
+        <source>Save your profile?</source>
+        <target>Salvare il profilo?</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <target>Salvato</target>
@@ -5673,6 +5861,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
        <target>Messaggio salvato</target>
        <note>message info title</note>
      </trans-unit>
+      <trans-unit id="Saving %lld messages" xml:space="preserve">
+        <source>Saving %lld messages</source>
+        <target>Salvataggio di %lld messaggi</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Scale" xml:space="preserve">
        <source>Scale</source>
        <target>Scala</target>
@@ -5755,6 +5948,7 @@ Attivalo nelle impostazioni *Rete e server*.</target>
      </trans-unit>
      <trans-unit id="Select chat profile" xml:space="preserve">
        <source>Select chat profile</source>
+        <target>Seleziona il profilo di chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
@@ -5875,7 +6069,7 @@ Attivalo nelle impostazioni *Rete e server*.</target>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>Il mittente ha annullato il trasferimento del file.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
        <source>Sender may have deleted the connection request.</source>
@@ -5972,6 +6166,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
        <target>Inviato via proxy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Server" xml:space="preserve">
+        <source>Server</source>
+        <target>Server</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Server address" xml:space="preserve">
        <source>Server address</source>
        <target>Indirizzo server</target>
@@ -6092,6 +6291,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
        <target>Impostazioni</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Settings were changed." xml:space="preserve">
+        <source>Settings were changed.</source>
+        <target>Le impostazioni sono state cambiate.</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
        <target>Forma delle immagini del profilo</target>
@@ -6129,6 +6333,7 @@ Attivalo nelle impostazioni *Rete e server*.</target>
      </trans-unit>
      <trans-unit id="Share profile" xml:space="preserve">
        <source>Share profile</source>
+        <target>Condividi il profilo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
@@ -6266,6 +6471,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
        <target>Invito SimpleX una tantum</target>
        <note>simplex link type</note>
      </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">
        <source>Simplified incognito mode</source>
        <target>Modalità incognito semplificata</target>
@@ -6296,6 +6506,11 @@ Attivalo nelle impostazioni *Rete e server*.</target>
        <target>Leggera</target>
        <note>blur media</note>
      </trans-unit>
+      <trans-unit id="Some app settings were not migrated." xml:space="preserve">
+        <source>Some app settings were not migrated.</source>
+        <target>Alcune impostazioni dell'app non sono state migrate.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
        <source>Some file(s) were not exported:</source>
        <target>Alcuni file non sono stati esportati:</target>
@@ -6436,6 +6651,16 @@ Attivalo nelle impostazioni *Rete e server*.</target>
        <target>Supporta SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>System</source>
        <target>Sistema</target>
@@ -6473,6 +6698,7 @@ Attivalo nelle impostazioni *Rete e server*.</target>
      </trans-unit>
      <trans-unit id="Tail" xml:space="preserve">
        <source>Tail</source>
+        <target>Coda</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
@@ -6667,6 +6893,11 @@ Può accadere a causa di qualche bug o quando la connessione è compromessa.</ta
        <target>Il testo che hai incollato non è un link SimpleX.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
+        <source>The uploaded database archive will be permanently removed from the servers.</source>
+        <target>L'archivio del database caricato verrà rimosso definitivamente dai server.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <target>Temi</target>
@@ -6794,6 +7025,16 @@ You will be prompted to complete authentication before this feature is enabled.<
 Ti verrà chiesto di completare l'autenticazione prima di attivare questa funzionalità.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
+        <source>To record speech please grant permission to use Microphone.</source>
+        <target>Per registrare l'audio, concedi l'autorizzazione di usare il microfono.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
+        <source>To record video please grant permission to use Camera.</source>
+        <target>Per registrare il video, concedi l'autorizzazione di usare la fotocamera.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
        <source>To record voice message please grant permission to use Microphone.</source>
        <target>Per registrare un messaggio vocale, concedi l'autorizzazione all'uso del microfono.</target>
@@ -6947,7 +7188,7 @@ Ti verrà chiesto di completare l'autenticazione prima di attivare questa funzio
      <trans-unit id="Unknown servers!" xml:space="preserve">
        <source>Unknown servers!</source>
        <target>Server sconosciuti!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
        <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7061,6 +7302,11 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
        <target>Usa gli host .onion</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
+        <source>Use SOCKS proxy</source>
+        <target>Usa proxy SOCKS</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
        <source>Use SimpleX Chat servers?</source>
        <target>Usare i server di SimpleX Chat?</target>
@@ -7126,16 +7372,16 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
        <target>Usa l'app con una mano sola.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="User profile" xml:space="preserve">
-        <source>User profile</source>
-        <target>Profilo utente</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="User selection" xml:space="preserve">
        <source>User selection</source>
        <target>Selezione utente</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Username" xml:space="preserve">
+        <source>Username</source>
+        <target>Nome utente</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
        <source>Using SimpleX Chat servers.</source>
        <target>Utilizzo dei server SimpleX Chat.</target>
@@ -7369,7 +7615,7 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
        <target>Senza Tor o VPN, il tuo indirizzo IP sarà visibile a questi relay XFTP: %@.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Wrong database passphrase" xml:space="preserve">
        <source>Wrong database passphrase</source>
@@ -7396,11 +7642,6 @@ Per connetterti, chiedi al tuo contatto di creare un altro link di connessione e
        <target>Server XFTP</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You" xml:space="preserve">
-        <source>You</source>
-        <target>Tu</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
        <source>You **must not** use the same database on two devices.</source>
        <target>**Non devi** usare lo stesso database su due dispositivi.</target>
@@ -7750,6 +7991,11 @@ Ripetere la richiesta di connessione?</target>
        <target>Il tuo database della chat non è crittografato: imposta la password per crittografarlo.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat preferences" xml:space="preserve">
+        <source>Your chat preferences</source>
+        <target>Le tue preferenze della chat</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>I tuoi profili di chat</target>
@@ -7757,6 +8003,7 @@ Ripetere la richiesta di connessione?</target>
      </trans-unit>
      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
+        <target>La tua connessione è stata spostata a %@, ma si è verificato un errore imprevisto durante il reindirizzamento al profilo.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
@@ -7774,6 +8021,11 @@ Ripetere la richiesta di connessione?</target>
        <target>I tuoi contatti resteranno connessi.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
+        <source>Your credentials may be sent unencrypted.</source>
+        <target>Le credenziali potrebbero essere inviate in chiaro.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
        <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
        <target>Il tuo attuale database della chat verrà ELIMINATO e SOSTITUITO con quello importato.</target>
@@ -7804,13 +8056,16 @@ Ripetere la richiesta di connessione?</target>
        <target>Verrà condiviso il tuo profilo **%@**.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
-        <source>Your profile is stored on your device and shared only with your contacts.
-SimpleX servers cannot see your profile.</source>
-        <target>Il tuo profilo è memorizzato sul tuo dispositivo e condiviso solo con i tuoi contatti.
-I server di SimpleX non possono vedere il tuo profilo.</target>
+      <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
+        <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
+        <target>Il tuo profilo è memorizzato sul tuo dispositivo e condiviso solo con i tuoi contatti. I server di SimpleX non possono vedere il tuo profilo.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
+        <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
+        <target>Il tuo profilo è stato cambiato. Se lo salvi, il profilo aggiornato verrà inviato a tutti i tuoi contatti.</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Il tuo profilo, i contatti e i messaggi recapitati sono memorizzati sul tuo dispositivo.</target>
@@ -7988,7 +8243,7 @@ I server di SimpleX non possono vedere il tuo profilo.</target>
      </trans-unit>
      <trans-unit id="changed your role to %@" xml:space="preserve">
        <source>changed your role to %@</source>
-        <target>cambiato il tuo ruolo in %@</target>
+        <target>ha cambiato il tuo ruolo in %@</target>
        <note>rcv group event chat item</note>
      </trans-unit>
      <trans-unit id="changing address for %@…" xml:space="preserve">
@@ -161,11 +161,31 @@
        <target>%d 日</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
+        <source>%d file(s) are still being downloaded.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
+        <source>%d file(s) failed to download.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
+        <source>%d file(s) were deleted.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
+        <source>%d file(s) were not downloaded.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
      <trans-unit id="%d hours" xml:space="preserve">
        <source>%d hours</source>
        <target>%d 時</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve">
+        <source>%d messages not forwarded</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="%d min" xml:space="preserve">
        <source>%d min</source>
        <target>%d 分</target>
@@ -707,7 +727,7 @@
      </trans-unit>
      <trans-unit id="All profiles" xml:space="preserve">
        <source>All profiles</source>
-        <note>No comment provided by engineer.</note>
+        <note>profile dropdown</note>
      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
@@ -895,6 +915,10 @@
        <target>アプリのパスコードは自己破壊パスコードに置き換えられます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="App session" xml:space="preserve">
+        <source>App session</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="App version" xml:space="preserve">
        <source>App version</source>
        <target>アプリのバージョン</target>
@@ -994,6 +1018,10 @@
        <target>画像を自動的に受信</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Auto-accept settings" xml:space="preserve">
+        <source>Auto-accept settings</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>戻る</target>
@@ -1017,10 +1045,18 @@
        <target>メッセージのハッシュ値問題</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better calls" xml:space="preserve">
+        <source>Better calls</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
        <source>Better groups</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better message dates." xml:space="preserve">
+        <source>Better message dates.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>より良いメッセージ</target>
@@ -1030,6 +1066,18 @@
        <source>Better networking</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better notifications" xml:space="preserve">
+        <source>Better notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better security ✅" xml:space="preserve">
+        <source>Better security ✅</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better user experience" xml:space="preserve">
+        <source>Better user experience</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
        <source>Black</source>
        <note>No comment provided by engineer.</note>
@@ -1148,7 +1196,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>中止</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Cancel migration" xml:space="preserve">
        <source>Cancel migration</source>
@@ -1166,7 +1214,7 @@
      <trans-unit id="Cannot receive file" xml:space="preserve">
        <source>Cannot receive file</source>
        <target>ファイル受信ができません</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1287,6 +1335,15 @@
        <target>チャット設定</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat preferences were changed." xml:space="preserve">
+        <source>Chat preferences were changed.</source>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Chat profile" xml:space="preserve">
+        <source>Chat profile</source>
+        <target>ユーザープロフィール</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <note>No comment provided by engineer.</note>
@@ -1763,6 +1820,10 @@ This is your own one-time link!</source>
        <target>カスタム時間</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Customizable message shape." xml:space="preserve">
+        <source>Customizable message shape.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
        <source>Customize theme</source>
        <note>No comment provided by engineer.</note>
@@ -2049,6 +2110,10 @@ This is your own one-time link!</source>
        <target>古いデータベースを削除しますか？</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
+        <source>Delete or moderate up to 200 messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
        <source>Delete pending connection?</source>
        <target>接続待ちの接続を削除しますか？</target>
@@ -2280,6 +2345,10 @@ This is your own one-time link!</source>
        <source>Do not send history to new members.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
+        <source>Do not use credentials with proxy.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>アドレスを作成しないでください</target>
@@ -2302,7 +2371,8 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Download" xml:space="preserve">
        <source>Download</source>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Download errors" xml:space="preserve">
        <source>Download errors</source>
@@ -2317,6 +2387,10 @@ This is your own one-time link!</source>
        <target>ファイルをダウンロード</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Download files" xml:space="preserve">
+        <source>Download files</source>
+        <note>alert action</note>
+      </trans-unit>
      <trans-unit id="Downloaded" xml:space="preserve">
        <source>Downloaded</source>
        <note>No comment provided by engineer.</note>
@@ -2710,6 +2784,10 @@ This is your own one-time link!</source>
        <target>%@ サーバーのロード中にエラーが発生</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error migrating settings" xml:space="preserve">
+        <source>Error migrating settings</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error opening chat" xml:space="preserve">
        <source>Error opening chat</source>
        <note>No comment provided by engineer.</note>
@@ -2717,7 +2795,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>ファイル受信にエラー発生</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Error reconnecting server" xml:space="preserve">
        <source>Error reconnecting server</source>
@@ -2810,7 +2888,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>プロフィール切り替えにエラー発生！</target>
-        <note>No comment provided by engineer.</note>
+        <note>alertTitle</note>
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
@@ -2853,8 +2931,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>エラー : %@</target>
-        <note>file error text
-   snd error text</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2935,6 +3012,11 @@ This is your own one-time link!</source>
        <source>File error</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
+        <source>File errors:
+%@</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
        <source>File not found - most likely file was deleted or cancelled.</source>
        <note>file error text</note>
@@ -3061,10 +3143,26 @@ This is your own one-time link!</source>
        <source>Forward</source>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
+        <source>Forward %d message(s)?</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forward messages" xml:space="preserve">
+        <source>Forward messages</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Forward messages without files?" xml:space="preserve">
+        <source>Forward messages without files?</source>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
+        <source>Forward up to 20 messages at once.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
        <source>Forwarded</source>
        <note>No comment provided by engineer.</note>
@@ -3073,6 +3171,10 @@ This is your own one-time link!</source>
        <source>Forwarded from</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
+        <source>Forwarding %lld messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
        <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
        <note>No comment provided by engineer.</note>
@@ -3114,11 +3216,6 @@ Error: %2$@</source>
        <target>フルネーム (任意)：</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>フルネーム：</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
        <source>Fully decentralized – visible only to members.</source>
        <note>No comment provided by engineer.</note>
@@ -3356,6 +3453,10 @@ Error: %2$@</source>
        <target>ICEサーバ (1行に1サーバ)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="IP address" xml:space="preserve">
+        <source>IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
        <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
        <target>直接会えない場合は、ビデオ通話で QR コードを表示するか、リンクを共有してください。</target>
@@ -3428,6 +3529,11 @@ Error: %2$@</source>
        <source>Importing archive</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
        <source>Improved message delivery</source>
        <note>No comment provided by engineer.</note>
@@ -4009,12 +4115,18 @@ This is your link for group %@!</source>
        <source>Messages sent</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
+        <source>Messages were deleted after you selected them.</source>
+        <note>alert message</note>
+      </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">
@@ -4151,6 +4263,14 @@ This is your link for group %@!</source>
        <target>新しいパスコード</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
+        <source>New SOCKS credentials will be used every time you start the app.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
+        <source>New SOCKS credentials will be used for each server.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New chat" xml:space="preserve">
        <source>New chat</source>
        <note>No comment provided by engineer.</note>
@@ -4265,6 +4385,14 @@ This is your link for group %@!</source>
        <source>No network connection</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No permission to record speech" xml:space="preserve">
+        <source>No permission to record speech</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No permission to record video" xml:space="preserve">
+        <source>No permission to record video</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>音声メッセージを録音する権限がありません</target>
@@ -4283,6 +4411,10 @@ This is your link for group %@!</source>
        <source>Nothing selected</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Nothing to forward!" xml:space="preserve">
+        <source>Nothing to forward!</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>通知</target>
@@ -4314,7 +4446,7 @@ This is your link for group %@!</source>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>OK</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Old database" xml:space="preserve">
        <source>Old database</source>
@@ -4494,6 +4626,11 @@ VPN を有効にする必要があります。</target>
        <source>Other %@ servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
+        <source>Other file errors:
+%@</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>PING回数</target>
@@ -4529,6 +4666,10 @@ VPN を有効にする必要があります。</target>
        <target>パスコードを設定しました！</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Password" xml:space="preserve">
+        <source>Password</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Password to show" xml:space="preserve">
        <source>Password to show</source>
        <target>パスワードを表示する</target>
@@ -4665,6 +4806,10 @@ Error: %@</source>
        <target>ポーランド語UI</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Port" xml:space="preserve">
+        <source>Port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
        <source>Possibly, certificate fingerprint in server address is incorrect</source>
        <target>サーバアドレスの証明証IDが正しくないかもしれません</target>
@@ -4743,14 +4888,6 @@ Error: %@</source>
        <source>Profile images</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>プロフィールのパスワード</target>
@@ -4846,6 +4983,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Proxied servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Proxy requires password" xml:space="preserve">
+        <source>Proxy requires password</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>プッシュ通知</target>
@@ -5051,6 +5192,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>削除</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Remove archive?" xml:space="preserve">
+        <source>Remove archive?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Remove image" xml:space="preserve">
        <source>Remove image</source>
        <note>No comment provided by engineer.</note>
@@ -5218,6 +5363,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>SMP server</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="SOCKS proxy" xml:space="preserve">
+        <source>SOCKS proxy</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Safely receive files" xml:space="preserve">
        <source>Safely receive files</source>
        <note>No comment provided by engineer.</note>
@@ -5229,12 +5378,13 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>保存</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Save (and notify contacts)" xml:space="preserve">
        <source>Save (and notify contacts)</source>
        <target>保存（連絡先に通知）</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
@@ -5260,11 +5410,6 @@ Enable in *Network &amp; servers* settings.</source>
        <target>アーカイブを保存</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save auto-accept settings" xml:space="preserve">
-        <source>Save auto-accept settings</source>
-        <target>自動受け入れ設定を保存する</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save group profile" xml:space="preserve">
        <source>Save group profile</source>
        <target>グループプロフィールの保存</target>
@@ -5300,16 +5445,15 @@ Enable in *Network &amp; servers* settings.</source>
        <target>サーバを保存しますか？</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>設定を保存しますか？</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save welcome message?" xml:space="preserve">
        <source>Save welcome message?</source>
        <target>ウェルカムメッセージを保存しますか？</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Save your profile?" xml:space="preserve">
+        <source>Save your profile?</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <note>No comment provided by engineer.</note>
@@ -5327,6 +5471,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Saved message</source>
        <note>message info title</note>
      </trans-unit>
+      <trans-unit id="Saving %lld messages" xml:space="preserve">
+        <source>Saving %lld messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Scale" xml:space="preserve">
        <source>Scale</source>
        <note>No comment provided by engineer.</note>
@@ -5513,7 +5661,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>送信者がファイル転送をキャンセルしました。</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
        <source>Sender may have deleted the connection request.</source>
@@ -5599,6 +5747,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Sent via proxy</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Server" xml:space="preserve">
+        <source>Server</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Server address" xml:space="preserve">
        <source>Server address</source>
        <note>No comment provided by engineer.</note>
@@ -5708,6 +5860,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>設定</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Settings were changed." xml:space="preserve">
+        <source>Settings were changed.</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
        <note>No comment provided by engineer.</note>
@@ -5871,6 +6027,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SimpleX使い捨て招待リンク</target>
        <note>simplex link type</note>
      </trans-unit>
+      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
+        <source>SimpleX protocols reviewed by Trail of Bits.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
        <source>Simplified incognito mode</source>
        <target>シークレットモードの簡素化</target>
@@ -5899,6 +6059,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Soft</source>
        <note>blur media</note>
      </trans-unit>
+      <trans-unit id="Some app settings were not migrated." xml:space="preserve">
+        <source>Some app settings were not migrated.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
        <source>Some file(s) were not exported:</source>
        <note>No comment provided by engineer.</note>
@@ -6027,6 +6191,14 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Simplex Chatを支援</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
+        <source>Switch audio and video during the call.</source>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
        <source>System</source>
        <target>システム</target>
@@ -6248,6 +6420,10 @@ It can happen because of some bug or when the connection is compromised.</source
        <source>The text you pasted is not a SimpleX link.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
+        <source>The uploaded database archive will be permanently removed from the servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <note>No comment provided by engineer.</note>
@@ -6363,6 +6539,14 @@ You will be prompted to complete authentication before this feature is enabled.<
 オンにするには、認証ステップが行われます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
+        <source>To record speech please grant permission to use Microphone.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
+        <source>To record video please grant permission to use Camera.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
        <source>To record voice message please grant permission to use Microphone.</source>
        <target>音声メッセージを録音する場合は、マイクの使用を許可してください。</target>
@@ -6504,7 +6688,7 @@ You will be prompted to complete authentication before this feature is enabled.<
      </trans-unit>
      <trans-unit id="Unknown servers!" xml:space="preserve">
        <source>Unknown servers!</source>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
        <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -6609,6 +6793,10 @@ To connect, please ask your contact to create another connection link and check
        <target>.onionホストを使う</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
+        <source>Use SOCKS proxy</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
        <source>Use SimpleX Chat servers?</source>
        <target>SimpleX チャット サーバーを使用しますか?</target>
@@ -6668,15 +6856,14 @@ To connect, please ask your contact to create another connection link and check
        <source>Use the app with one hand.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="User profile" xml:space="preserve">
-        <source>User profile</source>
-        <target>ユーザープロフィール</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="User selection" xml:space="preserve">
        <source>User selection</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Username" xml:space="preserve">
+        <source>Username</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
        <source>Using SimpleX Chat servers.</source>
        <target>SimpleX チャット サーバーを使用する。</target>
@@ -6889,7 +7076,7 @@ To connect, please ask your contact to create another connection link and check
      </trans-unit>
      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Wrong database passphrase" xml:space="preserve">
        <source>Wrong database passphrase</source>
@@ -6913,11 +7100,6 @@ To connect, please ask your contact to create another connection link and check
        <source>XFTP server</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You" xml:space="preserve">
-        <source>You</source>
-        <target>あなた</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
        <source>You **must not** use the same database on two devices.</source>
        <note>No comment provided by engineer.</note>
@@ -7243,6 +7425,10 @@ Repeat connection request?</source>
        <target>チャット データベースは暗号化されていません - 暗号化するにはパスフレーズを設定してください。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat preferences" xml:space="preserve">
+        <source>Your chat preferences</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>あなたのチャットプロフィール</target>
@@ -7267,6 +7453,10 @@ Repeat connection request?</source>
        <target>連絡先は接続されたままになります。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
+        <source>Your credentials may be sent unencrypted.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
        <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
        <target>現在のチャット データベースは削除され、インポートされたデータベースに置き換えられます。</target>
@@ -7296,13 +7486,15 @@ Repeat connection request?</source>
        <target>あなたのプロファイル **%@** が共有されます。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
-        <source>Your profile is stored on your device and shared only with your contacts.
-SimpleX servers cannot see your profile.</source>
-        <target>プロフィールはデバイスに保存され、連絡先とのみ共有されます。
-SimpleX サーバーはあなたのプロファイルを参照できません。</target>
+      <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
+        <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
+        <target>プロフィールはデバイスに保存され、連絡先とのみ共有されます。 SimpleX サーバーはあなたのプロファイルを参照できません。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
+        <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>あなたのプロフィール、連絡先、送信したメッセージがご自分の端末に保存されます。</target>
@@ -139,6 +139,7 @@
      </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">
@@ -161,11 +162,36 @@
        <target>%d dni</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
+        <source>%d file(s) are still being downloaded.</source>
+        <target>%d plik(ów) jest dalej pobieranych.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
+        <source>%d file(s) failed to download.</source>
+        <target>%d plik(ów) nie udało się pobrać.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
+        <source>%d file(s) were deleted.</source>
+        <target>%d plik(ów) zostało usuniętych.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
+        <source>%d file(s) were not downloaded.</source>
+        <target>%d plik(ów) nie zostało pobranych.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
      <trans-unit id="%d hours" xml:space="preserve">
        <source>%d hours</source>
        <target>%d godzin</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve">
+        <source>%d messages not forwarded</source>
+        <target>%d wiadomości nie przekazanych</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="%d min" xml:space="preserve">
        <source>%d min</source>
        <target>%d min</target>
@@ -727,7 +753,7 @@
      <trans-unit id="All profiles" xml:space="preserve">
        <source>All profiles</source>
        <target>Wszystkie profile</target>
-        <note>No comment provided by engineer.</note>
+        <note>profile dropdown</note>
      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
@@ -919,6 +945,11 @@
        <target>Pin aplikacji został zastąpiony pinem samozniszczenia.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="App session" xml:space="preserve">
+        <source>App session</source>
+        <target>Sesja aplikacji</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="App version" xml:space="preserve">
        <source>App version</source>
        <target>Wersja aplikacji</target>
@@ -1024,6 +1055,11 @@
        <target>Automatyczne akceptowanie obrazów</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Auto-accept settings" xml:space="preserve">
+        <source>Auto-accept settings</source>
+        <target>Ustawienia automatycznej akceptacji</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>Wstecz</target>
@@ -1049,11 +1085,19 @@
        <target>Zły hash wiadomości</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better calls" xml:space="preserve">
+        <source>Better calls</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
        <source>Better groups</source>
        <target>Lepsze grupy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better message dates." xml:space="preserve">
+        <source>Better message dates.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>Lepsze wiadomości</target>
@@ -1064,6 +1108,18 @@
        <target>Lepsze sieciowanie</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better notifications" xml:space="preserve">
+        <source>Better notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better security ✅" xml:space="preserve">
+        <source>Better security ✅</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better user experience" xml:space="preserve">
+        <source>Better user experience</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
        <source>Black</source>
        <target>Czarny</target>
@@ -1197,7 +1253,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>Anuluj</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Cancel migration" xml:space="preserve">
        <source>Cancel migration</source>
@@ -1217,7 +1273,7 @@
      <trans-unit id="Cannot receive file" xml:space="preserve">
        <source>Cannot receive file</source>
        <target>Nie można odebrać pliku</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1345,6 +1401,16 @@
        <target>Preferencje czatu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat preferences were changed." xml:space="preserve">
+        <source>Chat preferences were changed.</source>
+        <target>Preferencje czatu zostały zmienione.</target>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Chat profile" xml:space="preserve">
+        <source>Chat profile</source>
+        <target>Profil użytkownika</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Motyw czatu</target>
@@ -1746,6 +1812,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Corner" xml:space="preserve">
        <source>Corner</source>
+        <target>Róg</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
@@ -1873,6 +1940,10 @@ To jest twój jednorazowy link!</target>
        <target>Niestandardowy czas</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Customizable message shape." xml:space="preserve">
+        <source>Customizable message shape.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
        <source>Customize theme</source>
        <target>Dostosuj motyw</target>
@@ -2167,6 +2238,10 @@ To jest twój jednorazowy link!</target>
        <target>Usunąć starą bazę danych?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
+        <source>Delete or moderate up to 200 messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
        <source>Delete pending connection?</source>
        <target>Usunąć oczekujące połączenie?</target>
@@ -2417,6 +2492,11 @@ To jest twój jednorazowy link!</target>
        <target>Nie wysyłaj historii do nowych członków.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
+        <source>Do not use credentials with proxy.</source>
+        <target>Nie używaj danych logowania do proxy.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>Nie twórz adresu</target>
@@ -2440,7 +2520,8 @@ To jest twój jednorazowy link!</target>
      <trans-unit id="Download" xml:space="preserve">
        <source>Download</source>
        <target>Pobierz</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Download errors" xml:space="preserve">
        <source>Download errors</source>
@@ -2457,6 +2538,11 @@ To jest twój jednorazowy link!</target>
        <target>Pobierz plik</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Download files" xml:space="preserve">
+        <source>Download files</source>
+        <target>Pobierz pliki</target>
+        <note>alert action</note>
+      </trans-unit>
      <trans-unit id="Downloaded" xml:space="preserve">
        <source>Downloaded</source>
        <target>Pobrane</target>
@@ -2734,6 +2820,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Error changing connection profile" xml:space="preserve">
        <source>Error changing connection profile</source>
+        <target>Błąd zmiany połączenia profilu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
@@ -2748,6 +2835,7 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Error changing to incognito!" xml:space="preserve">
        <source>Error changing to incognito!</source>
+        <target>Błąd zmiany na incognito!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
@@ -2870,6 +2958,11 @@ To jest twój jednorazowy link!</target>
        <target>Błąd ładowania %@ serwerów</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error migrating settings" xml:space="preserve">
+        <source>Error migrating settings</source>
+        <target>Błąd migracji ustawień</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error opening chat" xml:space="preserve">
        <source>Error opening chat</source>
        <target>Błąd otwierania czatu</target>
@@ -2878,7 +2971,7 @@ To jest twój jednorazowy link!</target>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>Błąd odbioru pliku</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Error reconnecting server" xml:space="preserve">
        <source>Error reconnecting server</source>
@@ -2972,12 +3065,13 @@ To jest twój jednorazowy link!</target>
      </trans-unit>
      <trans-unit id="Error switching profile" xml:space="preserve">
        <source>Error switching profile</source>
+        <target>Błąd zmiany profilu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Błąd przełączania profilu!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alertTitle</note>
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
@@ -3022,8 +3116,7 @@ To jest twój jednorazowy link!</target>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Błąd: %@</target>
-        <note>file error text
-   snd error text</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -3110,6 +3203,13 @@ To jest twój jednorazowy link!</target>
        <target>Błąd pliku</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
+        <source>File errors:
+%@</source>
+        <target>Błędy pliku:
+%@</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
        <source>File not found - most likely file was deleted or cancelled.</source>
        <target>Nie odnaleziono pliku - najprawdopodobniej plik został usunięty lub anulowany.</target>
@@ -3245,11 +3345,30 @@ To jest twój jednorazowy link!</target>
        <target>Przekaż dalej</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
+        <source>Forward %d message(s)?</source>
+        <target>Przekazać %d wiadomość(i)?</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
        <target>Przesyłaj dalej i zapisuj wiadomości</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forward messages" xml:space="preserve">
+        <source>Forward messages</source>
+        <target>Przekaż wiadomości</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Forward messages without files?" xml:space="preserve">
+        <source>Forward messages without files?</source>
+        <target>Przekazać wiadomości bez plików?</target>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
+        <source>Forward up to 20 messages at once.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
        <source>Forwarded</source>
        <target>Przekazane dalej</target>
@@ -3260,6 +3379,11 @@ To jest twój jednorazowy link!</target>
        <target>Przekazane dalej od</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
+        <source>Forwarding %lld messages</source>
+        <target>Przekazywanie %lld wiadomości</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
        <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
        <target>Serwer przekazujący %@ nie mógł połączyć się z serwerem docelowym %@. Spróbuj ponownie później.</target>
@@ -3309,11 +3433,6 @@ Błąd: %2$@</target>
        <target>Pełna nazwa (opcjonalna)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>Pełna nazwa:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
        <source>Fully decentralized – visible only to members.</source>
        <target>W pełni zdecentralizowana – widoczna tylko dla członków.</target>
@@ -3559,6 +3678,11 @@ Błąd: %2$@</target>
        <target>Serwery ICE (po jednym na linię)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="IP address" xml:space="preserve">
+        <source>IP address</source>
+        <target>Adres IP</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
        <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
        <target>Jeśli nie możesz spotkać się osobiście, pokaż kod QR w rozmowie wideo lub udostępnij link.</target>
@@ -3634,6 +3758,11 @@ Błąd: %2$@</target>
        <target>Importowanie archiwum</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
        <source>Improved message delivery</source>
        <target>Ulepszona dostawa wiadomości</target>
@@ -4206,6 +4335,7 @@ To jest twój link do grupy %@!</target>
      </trans-unit>
      <trans-unit id="Message shape" xml:space="preserve">
        <source>Message shape</source>
+        <target>Kształt wiadomości</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4258,6 +4388,11 @@ To jest twój link do grupy %@!</target>
        <target>Wysłane wiadomości</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
+        <source>Messages were deleted after you selected them.</source>
+        <target>Wiadomości zostały usunięte po wybraniu ich.</target>
+        <note>alert message</note>
+      </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>Wiadomości, pliki i połączenia są chronione przez **szyfrowanie end-to-end** z doskonałym utajnianiem z wyprzedzeniem i odzyskiem po złamaniu.</target>
@@ -4413,6 +4548,16 @@ To jest twój link do grupy %@!</target>
        <target>Nowy Pin</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
+        <source>New SOCKS credentials will be used every time you start the app.</source>
+        <target>Nowe poświadczenia SOCKS będą używane przy każdym uruchomieniu aplikacji.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
+        <source>New SOCKS credentials will be used for each server.</source>
+        <target>Dla każdego serwera zostaną użyte nowe poświadczenia SOCKS.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New chat" xml:space="preserve">
        <source>New chat</source>
        <target>Nowy czat</target>
@@ -4533,6 +4678,16 @@ To jest twój link do grupy %@!</target>
        <target>Brak połączenia z siecią</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No permission to record speech" xml:space="preserve">
+        <source>No permission to record speech</source>
+        <target>Brak zezwoleń do nagrania rozmowy</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No permission to record video" xml:space="preserve">
+        <source>No permission to record video</source>
+        <target>Brak zezwoleń do nagrania wideo</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>Brak uprawnień do nagrywania wiadomości głosowej</target>
@@ -4553,6 +4708,11 @@ To jest twój link do grupy %@!</target>
        <target>Nic nie jest zaznaczone</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Nothing to forward!" xml:space="preserve">
+        <source>Nothing to forward!</source>
+        <target>Nic do przekazania!</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Powiadomienia</target>
@@ -4585,7 +4745,7 @@ To jest twój link do grupy %@!</target>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>Ok</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Old database" xml:space="preserve">
        <source>Old database</source>
@@ -4776,6 +4936,13 @@ Wymaga włączenia VPN.</target>
        <target>Inne %@ serwery</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
+        <source>Other file errors:
+%@</source>
+        <target>Inne błędy pliku:
+%@</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>Liczba PINGÓW</target>
@@ -4811,6 +4978,11 @@ Wymaga włączenia VPN.</target>
        <target>Pin ustawiony!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Password" xml:space="preserve">
+        <source>Password</source>
+        <target>Hasło</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Password to show" xml:space="preserve">
        <source>Password to show</source>
        <target>Hasło do wyświetlenia</target>
@@ -4960,6 +5132,11 @@ Błąd: %@</target>
        <target>Polski interfejs</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Port" xml:space="preserve">
+        <source>Port</source>
+        <target>Port</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
        <source>Possibly, certificate fingerprint in server address is incorrect</source>
        <target>Możliwe, że odcisk palca certyfikatu w adresie serwera jest nieprawidłowy</target>
@@ -5045,16 +5222,6 @@ Błąd: %@</target>
        <target>Zdjęcia profilowe</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Nazwa profilu</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Nazwa profilu:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Hasło profilu</target>
@@ -5157,6 +5324,11 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Serwery trasowane przez proxy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Proxy requires password" xml:space="preserve">
+        <source>Proxy requires password</source>
+        <target>Proxy wymaga hasła</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Powiadomienia push</target>
@@ -5378,6 +5550,11 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Usuń</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Remove archive?" xml:space="preserve">
+        <source>Remove archive?</source>
+        <target>Usunąć archiwum?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Remove image" xml:space="preserve">
        <source>Remove image</source>
        <target>Usuń obraz</target>
@@ -5558,6 +5735,11 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Serwer SMP</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="SOCKS proxy" xml:space="preserve">
+        <source>SOCKS proxy</source>
+        <target>Proxy SOCKS</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Safely receive files" xml:space="preserve">
        <source>Safely receive files</source>
        <target>Bezpiecznie otrzymuj pliki</target>
@@ -5571,12 +5753,13 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Zapisz</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Save (and notify contacts)" xml:space="preserve">
        <source>Save (and notify contacts)</source>
        <target>Zapisz (i powiadom kontakty)</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
@@ -5603,11 +5786,6 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Zapisz archiwum</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save auto-accept settings" xml:space="preserve">
-        <source>Save auto-accept settings</source>
-        <target>Zapisz ustawienia automatycznej akceptacji</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save group profile" xml:space="preserve">
        <source>Save group profile</source>
        <target>Zapisz profil grupy</target>
@@ -5643,16 +5821,16 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Zapisać serwery?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>Zapisać ustawienia?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save welcome message?" xml:space="preserve">
        <source>Save welcome message?</source>
        <target>Zapisać wiadomość powitalną?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Save your profile?" xml:space="preserve">
+        <source>Save your profile?</source>
+        <target>Zapisać Twój profil?</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <target>Zapisane</target>
@@ -5673,6 +5851,11 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Zachowano wiadomość</target>
        <note>message info title</note>
      </trans-unit>
+      <trans-unit id="Saving %lld messages" xml:space="preserve">
+        <source>Saving %lld messages</source>
+        <target>Zapisywanie %lld wiadomości</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Scale" xml:space="preserve">
        <source>Scale</source>
        <target>Skaluj</target>
@@ -5755,6 +5938,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      </trans-unit>
      <trans-unit id="Select chat profile" xml:space="preserve">
        <source>Select chat profile</source>
+        <target>Wybierz profil czatu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
@@ -5875,7 +6059,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>Nadawca anulował transfer pliku.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
        <source>Sender may have deleted the connection request.</source>
@@ -5972,6 +6156,11 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Wysłano przez proxy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Server" xml:space="preserve">
+        <source>Server</source>
+        <target>Serwer</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Server address" xml:space="preserve">
        <source>Server address</source>
        <target>Adres serwera</target>
@@ -6092,6 +6281,11 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Ustawienia</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Settings were changed." xml:space="preserve">
+        <source>Settings were changed.</source>
+        <target>Ustawienia zostały zmienione.</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
        <target>Kształtuj obrazy profilowe</target>
@@ -6129,6 +6323,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      </trans-unit>
      <trans-unit id="Share profile" xml:space="preserve">
        <source>Share profile</source>
+        <target>Udostępnij profil</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
@@ -6266,6 +6461,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Zaproszenie jednorazowe SimpleX</target>
        <note>simplex link type</note>
      </trans-unit>
+      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
+        <source>SimpleX protocols reviewed by Trail of Bits.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
        <source>Simplified incognito mode</source>
        <target>Uproszczony tryb incognito</target>
@@ -6296,6 +6495,11 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Łagodny</target>
        <note>blur media</note>
      </trans-unit>
+      <trans-unit id="Some app settings were not migrated." xml:space="preserve">
+        <source>Some app settings were not migrated.</source>
+        <target>Niektóre ustawienia aplikacji nie zostały zmigrowane.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
        <source>Some file(s) were not exported:</source>
        <target>Niektóre plik(i) nie zostały wyeksportowane:</target>
@@ -6436,6 +6640,14 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Wspieraj SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
+        <source>Switch audio and video during the call.</source>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
        <source>System</source>
        <target>System</target>
@@ -6473,6 +6685,7 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
      </trans-unit>
      <trans-unit id="Tail" xml:space="preserve">
        <source>Tail</source>
+        <target>Ogon</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
@@ -6667,6 +6880,11 @@ Może się to zdarzyć z powodu jakiegoś błędu lub gdy połączenie jest skom
        <target>Tekst, który wkleiłeś nie jest linkiem SimpleX.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
+        <source>The uploaded database archive will be permanently removed from the servers.</source>
+        <target>Przesłane archiwum bazy danych zostanie trwale usunięte z serwerów.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <target>Motywy</target>
@@ -6794,6 +7012,16 @@ You will be prompted to complete authentication before this feature is enabled.<
 Przed włączeniem tej funkcji zostanie wyświetlony monit uwierzytelniania.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
+        <source>To record speech please grant permission to use Microphone.</source>
+        <target>Aby nagrać rozmowę, proszę zezwolić na użycie Mikrofonu.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
+        <source>To record video please grant permission to use Camera.</source>
+        <target>Aby nagrać wideo, proszę zezwolić na użycie Aparatu.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
        <source>To record voice message please grant permission to use Microphone.</source>
        <target>Aby nagrać wiadomość głosową należy udzielić zgody na użycie Mikrofonu.</target>
@@ -6947,7 +7175,7 @@ Przed włączeniem tej funkcji zostanie wyświetlony monit uwierzytelniania.</ta
      <trans-unit id="Unknown servers!" xml:space="preserve">
        <source>Unknown servers!</source>
        <target>Nieznane serwery!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
        <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7061,6 +7289,11 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
        <target>Użyj hostów .onion</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
+        <source>Use SOCKS proxy</source>
+        <target>Użyj proxy SOCKS</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
        <source>Use SimpleX Chat servers?</source>
        <target>Użyć serwerów SimpleX Chat?</target>
@@ -7126,16 +7359,16 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
        <target>Korzystaj z aplikacji jedną ręką.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="User profile" xml:space="preserve">
-        <source>User profile</source>
-        <target>Profil użytkownika</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="User selection" xml:space="preserve">
        <source>User selection</source>
        <target>Wybór użytkownika</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Username" xml:space="preserve">
+        <source>Username</source>
+        <target>Nazwa użytkownika</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
        <source>Using SimpleX Chat servers.</source>
        <target>Używanie serwerów SimpleX Chat.</target>
@@ -7369,7 +7602,7 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
        <target>Bez Tor lub VPN, Twój adres IP będzie widoczny dla tych przekaźników XFTP: %@.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Wrong database passphrase" xml:space="preserve">
        <source>Wrong database passphrase</source>
@@ -7396,11 +7629,6 @@ Aby się połączyć, poproś Twój kontakt o utworzenie kolejnego linku połąc
        <target>Serwer XFTP</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You" xml:space="preserve">
-        <source>You</source>
-        <target>Ty</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
        <source>You **must not** use the same database on two devices.</source>
        <target>**Nie możesz** używać tej samej bazy na dwóch urządzeniach.</target>
@@ -7750,6 +7978,11 @@ Powtórzyć prośbę połączenia?</target>
        <target>Baza danych czatu nie jest szyfrowana - ustaw hasło, aby ją zaszyfrować.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat preferences" xml:space="preserve">
+        <source>Your chat preferences</source>
+        <target>Twoje preferencje czatu</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Twoje profile czatu</target>
@@ -7757,6 +7990,7 @@ Powtórzyć prośbę połączenia?</target>
      </trans-unit>
      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
+        <target>Twoje połączenie zostało przeniesione do %@, ale podczas przekierowywania do profilu wystąpił nieoczekiwany błąd.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
@@ -7774,6 +8008,11 @@ Powtórzyć prośbę połączenia?</target>
        <target>Twoje kontakty pozostaną połączone.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
+        <source>Your credentials may be sent unencrypted.</source>
+        <target>Twoje poświadczenia mogą zostać wysłane niezaszyfrowane.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
        <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
        <target>Twoja obecna baza danych czatu zostanie usunięta i zastąpiona zaimportowaną.</target>
@@ -7804,13 +8043,16 @@ Powtórzyć prośbę połączenia?</target>
        <target>Twój profil **%@** zostanie udostępniony.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
-        <source>Your profile is stored on your device and shared only with your contacts.
-SimpleX servers cannot see your profile.</source>
-        <target>Twój profil jest przechowywany na urządzeniu i udostępniany tylko Twoim kontaktom.
-Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
+      <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
+        <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
+        <target>Twój profil jest przechowywany na urządzeniu i udostępniany tylko Twoim kontaktom. Serwery SimpleX nie mogą zobaczyć Twojego profilu.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
+        <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
+        <target>Twój profil został zmieniony. Jeśli go zapiszesz, zaktualizowany profil zostanie wysłany do wszystkich kontaktów.</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Twój profil, kontakty i dostarczone wiadomości są przechowywane na Twoim urządzeniu.</target>
@@ -5502,6 +5502,74 @@ Isso pode acontecer por causa de algum bug ou quando a conexão está comprometi
        <source>Archived contacts</source>
        <target state="translated">Contatos arquivados</target>
      </trans-unit>
+      <trans-unit id="Cellular" xml:space="preserve" approved="no">
+        <source>Cellular</source>
+        <target state="translated">Rede móvel</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve" approved="no">
+        <source>%d file(s) failed to download.</source>
+        <target state="translated">%d arquivo(s) falharam ao ser baixados.</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve" approved="no">
+        <source>%d file(s) were deleted.</source>
+        <target state="translated">%d arquivo(s) foram apagados.</target>
+      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve" approved="no">
+        <source>%d messages not forwarded</source>
+        <target state="translated">%d mensagens não encaminhadas</target>
+      </trans-unit>
+      <trans-unit id="Bad desktop address" xml:space="preserve" approved="no">
+        <source>Bad desktop address</source>
+        <target state="translated">Endereço de desktop incorreto</target>
+      </trans-unit>
+      <trans-unit id="Blur for better privacy." xml:space="preserve" approved="no">
+        <source>Blur for better privacy.</source>
+        <target state="translated">Borrar para melhor privacidade.</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve" approved="no">
+        <source>%d file(s) are still being downloaded.</source>
+        <target state="translated">%d arquivo(s) ainda estão sendo baixados.</target>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve" approved="no">
+        <source>%d file(s) were not downloaded.</source>
+        <target state="translated">%d arquivo(s) não foram baixados.</target>
+      </trans-unit>
+      <trans-unit id="Chat colors" xml:space="preserve" approved="no">
+        <source>Chat colors</source>
+        <target state="translated">Cores do chat</target>
+      </trans-unit>
+      <trans-unit id="%lld group events" xml:space="preserve" approved="no">
+        <source>%lld group events</source>
+        <target state="translated">%lld eventos do grupo</target>
+      </trans-unit>
+      <trans-unit id="%lld messages moderated by %@" xml:space="preserve" approved="no">
+        <source>%lld messages moderated by %@</source>
+        <target state="translated">%lld mensagens moderadas por %@</target>
+      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve" approved="no">
+        <source>%1$@, %2$@</source>
+        <target state="translated">%1$@, %2$@</target>
+      </trans-unit>
+      <trans-unit id="%lld new interface languages" xml:space="preserve" approved="no">
+        <source>%lld new interface languages</source>
+        <target state="translated">%lld novos idiomas de interface</target>
+      </trans-unit>
+      <trans-unit id="Better networking" xml:space="preserve" approved="no">
+        <source>Better networking</source>
+        <target state="translated">Melhores redes</target>
+      </trans-unit>
+      <trans-unit id="Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" xml:space="preserve" approved="no">
+        <source>Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</source>
+        <target state="translated">Búlgaro, Finlandês, Tailandês e Ucraniano - obrigado aos usuários e [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</target>
+      </trans-unit>
+      <trans-unit id="Better groups" xml:space="preserve" approved="no">
+        <source>Better groups</source>
+        <target state="translated">Melhores grupos</target>
+      </trans-unit>
+      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve" approved="no">
+        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
+        <target state="translated">Capacidade excedida - o destinatário não recebeu as mensagens enviadas anteriormente.</target>
+      </trans-unit>
    </body>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="pt-BR" datatype="plaintext">
@@ -139,6 +139,7 @@
      </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">
@@ -161,11 +162,36 @@
        <target>%d дней</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
+        <source>%d file(s) are still being downloaded.</source>
+        <target>%d файл(ов) загружаются.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
+        <source>%d file(s) failed to download.</source>
+        <target>%d файл(ов) не удалось загрузить.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
+        <source>%d file(s) were deleted.</source>
+        <target>%d файлов было удалено.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
+        <source>%d file(s) were not downloaded.</source>
+        <target>%d файлов не было загружено.</target>
+        <note>forward confirmation reason</note>
+      </trans-unit>
      <trans-unit id="%d hours" xml:space="preserve">
        <source>%d hours</source>
        <target>%d ч.</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve">
+        <source>%d messages not forwarded</source>
+        <target>%d сообщений не переслано</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="%d min" xml:space="preserve">
        <source>%d min</source>
        <target>%d мин</target>
@@ -727,7 +753,7 @@
      <trans-unit id="All profiles" xml:space="preserve">
        <source>All profiles</source>
        <target>Все профили</target>
-        <note>No comment provided by engineer.</note>
+        <note>profile dropdown</note>
      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
@@ -919,6 +945,11 @@
        <target>Код доступа в приложение будет заменен кодом самоуничтожения.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="App session" xml:space="preserve">
+        <source>App session</source>
+        <target>Сессия приложения</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="App version" xml:space="preserve">
        <source>App version</source>
        <target>Версия приложения</target>
@@ -1024,6 +1055,11 @@
        <target>Автоприем изображений</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Auto-accept settings" xml:space="preserve">
+        <source>Auto-accept settings</source>
+        <target>Настройки автоприема</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>Назад</target>
@@ -1049,11 +1085,21 @@
        <target>Ошибка хэш сообщения</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Better groups</source>
        <target>Улучшенные группы</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Better messages</source>
        <target>Улучшенные сообщения</target>
@@ -1064,6 +1110,21 @@
        <target>Улучшенные сетевые функции</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Black</source>
        <target>Черная</target>
@@ -1197,7 +1258,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>Отменить</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Cancel migration" xml:space="preserve">
        <source>Cancel migration</source>
@@ -1217,7 +1278,7 @@
      <trans-unit id="Cannot receive file" xml:space="preserve">
        <source>Cannot receive file</source>
        <target>Невозможно получить файл</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1345,6 +1406,16 @@
        <target>Предпочтения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat preferences were changed." xml:space="preserve">
+        <source>Chat preferences were changed.</source>
+        <target>Настройки чата были изменены.</target>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Chat profile" xml:space="preserve">
+        <source>Chat profile</source>
+        <target>Профиль чата</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Тема чата</target>
@@ -1746,6 +1817,7 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Corner" xml:space="preserve">
        <source>Corner</source>
+        <target>Угол</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
@@ -1873,6 +1945,11 @@ This is your own one-time link!</source>
        <target>Пользовательское время</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Customize theme</source>
        <target>Настроить тему</target>
@@ -2167,6 +2244,11 @@ This is your own one-time link!</source>
        <target>Удалить предыдущую версию данных?</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>Delete pending connection?</source>
        <target>Удалить ожидаемое соединение?</target>
@@ -2417,6 +2499,11 @@ This is your own one-time link!</source>
        <target>Не отправлять историю новым членам.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
+        <source>Do not use credentials with proxy.</source>
+        <target>Не использовать учетные данные с прокси.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>Не создавать адрес</target>
@@ -2440,7 +2527,8 @@ This is your own one-time link!</source>
      <trans-unit id="Download" xml:space="preserve">
        <source>Download</source>
        <target>Загрузить</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Download errors" xml:space="preserve">
        <source>Download errors</source>
@@ -2457,6 +2545,11 @@ This is your own one-time link!</source>
        <target>Загрузка файла</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Download files" xml:space="preserve">
+        <source>Download files</source>
+        <target>Загрузить файлы</target>
+        <note>alert action</note>
+      </trans-unit>
      <trans-unit id="Downloaded" xml:space="preserve">
        <source>Downloaded</source>
        <target>Принято</target>
@@ -2734,6 +2827,7 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Error changing connection profile" xml:space="preserve">
        <source>Error changing connection profile</source>
+        <target>Ошибка при изменении профиля соединения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
@@ -2748,6 +2842,7 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Error changing to incognito!" xml:space="preserve">
        <source>Error changing to incognito!</source>
+        <target>Ошибка при смене на Инкогнито!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
@@ -2870,6 +2965,11 @@ This is your own one-time link!</source>
        <target>Ошибка загрузки %@ серверов</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error migrating settings" xml:space="preserve">
+        <source>Error migrating settings</source>
+        <target>Ошибка миграции настроек</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error opening chat" xml:space="preserve">
        <source>Error opening chat</source>
        <target>Ошибка доступа к чату</target>
@@ -2878,7 +2978,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>Ошибка при получении файла</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Error reconnecting server" xml:space="preserve">
        <source>Error reconnecting server</source>
@@ -2972,12 +3072,13 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Error switching profile" xml:space="preserve">
        <source>Error switching profile</source>
+        <target>Ошибка переключения профиля</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Ошибка выбора профиля!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alertTitle</note>
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
@@ -3022,8 +3123,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Ошибка: %@</target>
-        <note>file error text
-   snd error text</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -3110,6 +3210,13 @@ This is your own one-time link!</source>
        <target>Ошибка файла</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
+        <source>File errors:
+%@</source>
+        <target>Ошибки файлов:
+%@</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
        <source>File not found - most likely file was deleted or cancelled.</source>
        <target>Файл не найден - скорее всего, файл был удален или отменен.</target>
@@ -3245,11 +3352,31 @@ This is your own one-time link!</source>
        <target>Переслать</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
+        <source>Forward %d message(s)?</source>
+        <target>Переслать %d сообщение(й)?</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
        <target>Переслать и сохранить сообщение</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forward messages" xml:space="preserve">
+        <source>Forward messages</source>
+        <target>Переслать сообщения</target>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Forward messages without files?" xml:space="preserve">
+        <source>Forward messages without files?</source>
+        <target>Переслать сообщения без файлов?</target>
+        <note>alert message</note>
+      </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">
        <source>Forwarded</source>
        <target>Переслано</target>
@@ -3260,6 +3387,11 @@ This is your own one-time link!</source>
        <target>Переслано из</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
+        <source>Forwarding %lld messages</source>
+        <target>Пересылка %lld сообщений</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
        <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
        <target>Пересылающий сервер %@ не смог подключиться к серверу назначения %@. Попробуйте позже.</target>
@@ -3309,11 +3441,6 @@ Error: %2$@</source>
        <target>Полное имя (не обязательно)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>Полное имя:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
        <source>Fully decentralized – visible only to members.</source>
        <target>Группа полностью децентрализована – она видна только членам.</target>
@@ -3559,6 +3686,11 @@ Error: %2$@</source>
        <target>ICE серверы (один на строке)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="IP address" xml:space="preserve">
+        <source>IP address</source>
+        <target>IP адрес</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
        <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
        <target>Если Вы не можете встретиться лично, покажите QR-код во время видеозвонка или поделитесь ссылкой.</target>
@@ -3634,6 +3766,12 @@ Error: %2$@</source>
        <target>Импорт архива</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <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">
        <source>Improved message delivery</source>
        <target>Улучшенная доставка сообщений</target>
@@ -4206,6 +4344,7 @@ This is your link for group %@!</source>
      </trans-unit>
      <trans-unit id="Message shape" xml:space="preserve">
        <source>Message shape</source>
+        <target>Форма сообщений</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
@@ -4258,6 +4397,11 @@ This is your link for group %@!</source>
        <target>Сообщений отправлено</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
+        <source>Messages were deleted after you selected them.</source>
+        <target>Сообщения были удалены после того, как вы их выбрали.</target>
+        <note>alert message</note>
+      </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>Сообщения, файлы и звонки защищены **end-to-end шифрованием** с прямой секретностью (PFS), правдоподобным отрицанием и восстановлением от взлома.</target>
@@ -4413,6 +4557,16 @@ This is your link for group %@!</source>
        <target>Новый Код</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
+        <source>New SOCKS credentials will be used every time you start the app.</source>
+        <target>Новые учетные данные SOCKS будут использоваться при каждом запуске приложения.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
+        <source>New SOCKS credentials will be used for each server.</source>
+        <target>Новые учетные данные SOCKS будут использоваться для каждого сервера.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New chat" xml:space="preserve">
        <source>New chat</source>
        <target>Новый чат</target>
@@ -4533,6 +4687,16 @@ This is your link for group %@!</source>
        <target>Нет интернет-соединения</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No permission to record speech" xml:space="preserve">
+        <source>No permission to record speech</source>
+        <target>Нет разрешения на запись речи</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No permission to record video" xml:space="preserve">
+        <source>No permission to record video</source>
+        <target>Нет разрешения на запись видео</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>Нет разрешения для записи голосового сообщения</target>
@@ -4553,6 +4717,11 @@ This is your link for group %@!</source>
        <target>Ничего не выбрано</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Nothing to forward!" xml:space="preserve">
+        <source>Nothing to forward!</source>
+        <target>Нет сообщений, которые можно переслать!</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Уведомления</target>
@@ -4585,7 +4754,7 @@ This is your link for group %@!</source>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>Ок</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Old database" xml:space="preserve">
        <source>Old database</source>
@@ -4776,6 +4945,13 @@ Requires compatible VPN.</source>
        <target>Другие %@ серверы</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
+        <source>Other file errors:
+%@</source>
+        <target>Другие ошибки файлов:
+%@</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>Количество PING</target>
@@ -4811,6 +4987,11 @@ Requires compatible VPN.</source>
        <target>Код доступа установлен!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Password" xml:space="preserve">
+        <source>Password</source>
+        <target>Пароль</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Password to show" xml:space="preserve">
        <source>Password to show</source>
        <target>Пароль чтобы раскрыть</target>
@@ -4960,6 +5141,11 @@ Error: %@</source>
        <target>Польский интерфейс</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Port" xml:space="preserve">
+        <source>Port</source>
+        <target>Порт</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
        <source>Possibly, certificate fingerprint in server address is incorrect</source>
        <target>Возможно, хэш сертификата в адресе сервера неверный</target>
@@ -5045,16 +5231,6 @@ Error: %@</source>
        <target>Картинки профилей</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Имя профиля</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Имя профиля:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Пароль профиля</target>
@@ -5157,6 +5333,11 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Проксированные серверы</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Proxy requires password" xml:space="preserve">
+        <source>Proxy requires password</source>
+        <target>Прокси требует пароль</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Доставка уведомлений</target>
@@ -5378,6 +5559,11 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Удалить</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Remove archive?" xml:space="preserve">
+        <source>Remove archive?</source>
+        <target>Удалить архив?</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Remove image" xml:space="preserve">
        <source>Remove image</source>
        <target>Удалить изображение</target>
@@ -5558,6 +5744,11 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SMP сервер</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="SOCKS proxy" xml:space="preserve">
+        <source>SOCKS proxy</source>
+        <target>SOCKS прокси</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Safely receive files" xml:space="preserve">
        <source>Safely receive files</source>
        <target>Получайте файлы безопасно</target>
@@ -5571,12 +5762,13 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Сохранить</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Save (and notify contacts)" xml:space="preserve">
        <source>Save (and notify contacts)</source>
        <target>Сохранить (и уведомить контакты)</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
@@ -5603,11 +5795,6 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Сохранить архив</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save auto-accept settings" xml:space="preserve">
-        <source>Save auto-accept settings</source>
-        <target>Сохранить настройки автоприема</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save group profile" xml:space="preserve">
        <source>Save group profile</source>
        <target>Сохранить профиль группы</target>
@@ -5643,16 +5830,16 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Сохранить серверы?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>Сохранить настройки?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save welcome message?" xml:space="preserve">
        <source>Save welcome message?</source>
        <target>Сохранить приветственное сообщение?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Save your profile?" xml:space="preserve">
+        <source>Save your profile?</source>
+        <target>Сохранить ваш профиль?</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <target>Сохранено</target>
@@ -5673,6 +5860,11 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Сохраненное сообщение</target>
        <note>message info title</note>
      </trans-unit>
+      <trans-unit id="Saving %lld messages" xml:space="preserve">
+        <source>Saving %lld messages</source>
+        <target>Сохранение %lld сообщений</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Scale" xml:space="preserve">
        <source>Scale</source>
        <target>Масштаб</target>
@@ -5755,6 +5947,7 @@ Enable in *Network &amp; servers* settings.</source>
      </trans-unit>
      <trans-unit id="Select chat profile" xml:space="preserve">
        <source>Select chat profile</source>
+        <target>Выберите профиль чата</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
@@ -5875,7 +6068,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>Отправитель отменил передачу файла.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
        <source>Sender may have deleted the connection request.</source>
@@ -5972,6 +6165,11 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Отправлено через прокси</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Server" xml:space="preserve">
+        <source>Server</source>
+        <target>Сервер</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Server address" xml:space="preserve">
        <source>Server address</source>
        <target>Адрес сервера</target>
@@ -6092,6 +6290,11 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Настройки</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Settings were changed." xml:space="preserve">
+        <source>Settings were changed.</source>
+        <target>Настройки были изменены.</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
        <target>Форма картинок профилей</target>
@@ -6129,6 +6332,7 @@ Enable in *Network &amp; servers* settings.</source>
      </trans-unit>
      <trans-unit id="Share profile" xml:space="preserve">
        <source>Share profile</source>
+        <target>Поделиться профилем</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
@@ -6266,6 +6470,11 @@ Enable in *Network &amp; servers* settings.</source>
        <target>SimpleX одноразовая ссылка</target>
        <note>simplex link type</note>
      </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">
        <source>Simplified incognito mode</source>
        <target>Упрощенный режим Инкогнито</target>
@@ -6296,6 +6505,11 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Слабое</target>
        <note>blur media</note>
      </trans-unit>
+      <trans-unit id="Some app settings were not migrated." xml:space="preserve">
+        <source>Some app settings were not migrated.</source>
+        <target>Некоторые настройки приложения не были перенесены.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
        <source>Some file(s) were not exported:</source>
        <target>Некоторые файл(ы) не были экспортированы:</target>
@@ -6436,6 +6650,16 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Поддержать SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </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">
        <source>System</source>
        <target>Системная</target>
@@ -6473,6 +6697,7 @@ Enable in *Network &amp; servers* settings.</source>
      </trans-unit>
      <trans-unit id="Tail" xml:space="preserve">
        <source>Tail</source>
+        <target>Хвост</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
@@ -6667,6 +6892,11 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Вставленный текст не является SimpleX-ссылкой.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
+        <source>The uploaded database archive will be permanently removed from the servers.</source>
+        <target>Загруженный архив базы данных будет навсегда удален с серверов.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <target>Темы</target>
@@ -6794,6 +7024,16 @@ You will be prompted to complete authentication before this feature is enabled.<
 Вам будет нужно пройти аутентификацию для включения блокировки.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
+        <source>To record speech please grant permission to use Microphone.</source>
+        <target>Для записи речи, пожалуйста, дайте разрешение на использование микрофона.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
+        <source>To record video please grant permission to use Camera.</source>
+        <target>Для записи видео, пожалуйста, дайте разрешение на использование камеры.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
        <source>To record voice message please grant permission to use Microphone.</source>
        <target>Для записи голосового сообщения, пожалуйста разрешите доступ к микрофону.</target>
@@ -6947,7 +7187,7 @@ You will be prompted to complete authentication before this feature is enabled.<
      <trans-unit id="Unknown servers!" xml:space="preserve">
        <source>Unknown servers!</source>
        <target>Неизвестные серверы!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
        <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7061,6 +7301,11 @@ To connect, please ask your contact to create another connection link and check
        <target>Использовать .onion хосты</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
+        <source>Use SOCKS proxy</source>
+        <target>Использовать SOCKS прокси</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
        <source>Use SimpleX Chat servers?</source>
        <target>Использовать серверы предосталенные SimpleX Chat?</target>
@@ -7126,16 +7371,16 @@ To connect, please ask your contact to create another connection link and check
        <target>Используйте приложение одной рукой.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="User profile" xml:space="preserve">
-        <source>User profile</source>
-        <target>Профиль чата</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="User selection" xml:space="preserve">
        <source>User selection</source>
        <target>Выбор пользователя</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Username" xml:space="preserve">
+        <source>Username</source>
+        <target>Имя пользователя</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
        <source>Using SimpleX Chat servers.</source>
        <target>Используются серверы, предоставленные SimpleX Chat.</target>
@@ -7369,7 +7614,7 @@ To connect, please ask your contact to create another connection link and check
      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
        <target>Без Тора или ВПН, Ваш IP адрес будет доступен этим серверам файлов: %@.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Wrong database passphrase" xml:space="preserve">
        <source>Wrong database passphrase</source>
@@ -7396,11 +7641,6 @@ To connect, please ask your contact to create another connection link and check
        <target>XFTP сервер</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You" xml:space="preserve">
-        <source>You</source>
-        <target>Вы</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
        <source>You **must not** use the same database on two devices.</source>
        <target>Вы **не должны** использовать одну и ту же базу данных на двух устройствах.</target>
@@ -7750,6 +7990,11 @@ Repeat connection request?</source>
        <target>База данных НЕ зашифрована. Установите пароль, чтобы защитить Ваши данные.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat preferences" xml:space="preserve">
+        <source>Your chat preferences</source>
+        <target>Ваши настройки чата</target>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Ваши профили чата</target>
@@ -7757,6 +8002,7 @@ Repeat connection request?</source>
      </trans-unit>
      <trans-unit id="Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile." xml:space="preserve">
        <source>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</source>
+        <target>Соединение было перемещено на %@, но при смене профиля произошла неожиданная ошибка.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Your contact sent a file that is larger than currently supported maximum size (%@)." xml:space="preserve">
@@ -7774,6 +8020,11 @@ Repeat connection request?</source>
        <target>Ваши контакты сохранятся.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
+        <source>Your credentials may be sent unencrypted.</source>
+        <target>Ваши учетные данные могут быть отправлены в незашифрованном виде.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
        <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
        <target>Текущие данные Вашего чата будет УДАЛЕНЫ и ЗАМЕНЕНЫ импортированными.</target>
@@ -7804,13 +8055,16 @@ Repeat connection request?</source>
        <target>Будет отправлен Ваш профиль **%@**.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
-        <source>Your profile is stored on your device and shared only with your contacts.
-SimpleX servers cannot see your profile.</source>
-        <target>Ваш профиль хранится на Вашем устройстве и отправляется только Вашим контактам.
-SimpleX серверы не могут получить доступ к Вашему профилю.</target>
+      <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
+        <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
+        <target>Ваш профиль хранится на Вашем устройстве и отправляется только Вашим контактам. SimpleX серверы не могут получить доступ к Вашему профилю.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
+        <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
+        <target>Ваш профиль был изменен. Если вы сохраните его, обновленный профиль будет отправлен всем вашим контактам.</target>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Ваш профиль, контакты и доставленные сообщения хранятся на Вашем устройстве.</target>
@@ -151,11 +151,31 @@
        <target>%d วัน</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
+        <source>%d file(s) are still being downloaded.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
+        <source>%d file(s) failed to download.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
+        <source>%d file(s) were deleted.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
+        <source>%d file(s) were not downloaded.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
      <trans-unit id="%d hours" xml:space="preserve">
        <source>%d hours</source>
        <target>%d ชั่วโมง</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve">
+        <source>%d messages not forwarded</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="%d min" xml:space="preserve">
        <source>%d min</source>
        <target>%d นาที</target>
@@ -682,7 +702,7 @@
      </trans-unit>
      <trans-unit id="All profiles" xml:space="preserve">
        <source>All profiles</source>
-        <note>No comment provided by engineer.</note>
+        <note>profile dropdown</note>
      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
@@ -864,6 +884,10 @@
        <target>รหัสผ่านแอปจะถูกแทนที่ด้วยรหัสผ่านที่ทำลายตัวเอง</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="App session" xml:space="preserve">
+        <source>App session</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="App version" xml:space="preserve">
        <source>App version</source>
        <target>เวอร์ชันแอป</target>
@@ -963,6 +987,10 @@
        <target>ยอมรับภาพอัตโนมัติ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Auto-accept settings" xml:space="preserve">
+        <source>Auto-accept settings</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>กลับ</target>
@@ -986,10 +1014,18 @@
        <target>แฮชข้อความไม่ดี</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better calls" xml:space="preserve">
+        <source>Better calls</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
        <source>Better groups</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better message dates." xml:space="preserve">
+        <source>Better message dates.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>ข้อความที่ดีขึ้น</target>
@@ -999,6 +1035,18 @@
        <source>Better networking</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better notifications" xml:space="preserve">
+        <source>Better notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better security ✅" xml:space="preserve">
+        <source>Better security ✅</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better user experience" xml:space="preserve">
+        <source>Better user experience</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
        <source>Black</source>
        <note>No comment provided by engineer.</note>
@@ -1116,7 +1164,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>ยกเลิก</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Cancel migration" xml:space="preserve">
        <source>Cancel migration</source>
@@ -1134,7 +1182,7 @@
      <trans-unit id="Cannot receive file" xml:space="preserve">
        <source>Cannot receive file</source>
        <target>ไม่สามารถรับไฟล์ได้</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1255,6 +1303,15 @@
        <target>ค่ากําหนดในการแชท</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat preferences were changed." xml:space="preserve">
+        <source>Chat preferences were changed.</source>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Chat profile" xml:space="preserve">
+        <source>Chat profile</source>
+        <target>โปรไฟล์ผู้ใช้</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <note>No comment provided by engineer.</note>
@@ -1728,6 +1785,10 @@ This is your own one-time link!</source>
        <target>เวลาที่กําหนดเอง</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Customizable message shape." xml:space="preserve">
+        <source>Customizable message shape.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
        <source>Customize theme</source>
        <note>No comment provided by engineer.</note>
@@ -2014,6 +2075,10 @@ This is your own one-time link!</source>
        <target>ลบฐานข้อมูลเก่า?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
+        <source>Delete or moderate up to 200 messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
        <source>Delete pending connection?</source>
        <target>ลบการเชื่อมต่อที่รอดำเนินการหรือไม่?</target>
@@ -2243,6 +2308,10 @@ This is your own one-time link!</source>
        <source>Do not send history to new members.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
+        <source>Do not use credentials with proxy.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>อย่าสร้างที่อยู่</target>
@@ -2265,7 +2334,8 @@ This is your own one-time link!</source>
      </trans-unit>
      <trans-unit id="Download" xml:space="preserve">
        <source>Download</source>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Download errors" xml:space="preserve">
        <source>Download errors</source>
@@ -2280,6 +2350,10 @@ This is your own one-time link!</source>
        <target>ดาวน์โหลดไฟล์</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Download files" xml:space="preserve">
+        <source>Download files</source>
+        <note>alert action</note>
+      </trans-unit>
      <trans-unit id="Downloaded" xml:space="preserve">
        <source>Downloaded</source>
        <note>No comment provided by engineer.</note>
@@ -2670,6 +2744,10 @@ This is your own one-time link!</source>
        <target>โหลดเซิร์ฟเวอร์ %@ ผิดพลาด</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error migrating settings" xml:space="preserve">
+        <source>Error migrating settings</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error opening chat" xml:space="preserve">
        <source>Error opening chat</source>
        <note>No comment provided by engineer.</note>
@@ -2677,7 +2755,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>เกิดข้อผิดพลาดในการรับไฟล์</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Error reconnecting server" xml:space="preserve">
        <source>Error reconnecting server</source>
@@ -2770,7 +2848,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>เกิดข้อผิดพลาดในการเปลี่ยนโปรไฟล์!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alertTitle</note>
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
@@ -2813,8 +2891,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>ข้อผิดพลาด: % @</target>
-        <note>file error text
-   snd error text</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -2895,6 +2972,11 @@ This is your own one-time link!</source>
        <source>File error</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
+        <source>File errors:
+%@</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
        <source>File not found - most likely file was deleted or cancelled.</source>
        <note>file error text</note>
@@ -3021,10 +3103,26 @@ This is your own one-time link!</source>
        <source>Forward</source>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
+        <source>Forward %d message(s)?</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forward messages" xml:space="preserve">
+        <source>Forward messages</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Forward messages without files?" xml:space="preserve">
+        <source>Forward messages without files?</source>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
+        <source>Forward up to 20 messages at once.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
        <source>Forwarded</source>
        <note>No comment provided by engineer.</note>
@@ -3033,6 +3131,10 @@ This is your own one-time link!</source>
        <source>Forwarded from</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
+        <source>Forwarding %lld messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
        <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
        <note>No comment provided by engineer.</note>
@@ -3074,11 +3176,6 @@ Error: %2$@</source>
        <target>ชื่อเต็ม (ไม่บังคับ)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>ชื่อเต็ม:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
        <source>Fully decentralized – visible only to members.</source>
        <note>No comment provided by engineer.</note>
@@ -3316,6 +3413,10 @@ Error: %2$@</source>
        <target>เซิร์ฟเวอร์ ICE (หนึ่งเครื่องต่อสาย)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="IP address" xml:space="preserve">
+        <source>IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
        <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
        <target>หากคุณไม่สามารถพบกันในชีวิตจริงได้ ให้แสดงคิวอาร์โค้ดในวิดีโอคอล หรือแชร์ลิงก์</target>
@@ -3388,6 +3489,11 @@ Error: %2$@</source>
        <source>Importing archive</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
        <source>Improved message delivery</source>
        <note>No comment provided by engineer.</note>
@@ -3968,6 +4074,10 @@ This is your link for group %@!</source>
        <source>Messages sent</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
+        <source>Messages were deleted after you selected them.</source>
+        <note>alert message</note>
+      </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>
        <note>No comment provided by engineer.</note>
@@ -4109,6 +4219,14 @@ This is your link for group %@!</source>
        <target>รหัสผ่านใหม่</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
+        <source>New SOCKS credentials will be used every time you start the app.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
+        <source>New SOCKS credentials will be used for each server.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New chat" xml:space="preserve">
        <source>New chat</source>
        <note>No comment provided by engineer.</note>
@@ -4221,6 +4339,14 @@ This is your link for group %@!</source>
        <source>No network connection</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No permission to record speech" xml:space="preserve">
+        <source>No permission to record speech</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No permission to record video" xml:space="preserve">
+        <source>No permission to record video</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>ไม่อนุญาตให้บันทึกข้อความเสียง</target>
@@ -4239,6 +4365,10 @@ This is your link for group %@!</source>
        <source>Nothing selected</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Nothing to forward!" xml:space="preserve">
+        <source>Nothing to forward!</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>การแจ้งเตือน</target>
@@ -4270,7 +4400,7 @@ This is your link for group %@!</source>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>ตกลง</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Old database" xml:space="preserve">
        <source>Old database</source>
@@ -4447,6 +4577,11 @@ Requires compatible VPN.</source>
        <source>Other %@ servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
+        <source>Other file errors:
+%@</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>จํานวน PING</target>
@@ -4482,6 +4617,10 @@ Requires compatible VPN.</source>
        <target>ตั้งรหัสผ่านเรียบร้อยแล้ว!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Password" xml:space="preserve">
+        <source>Password</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Password to show" xml:space="preserve">
        <source>Password to show</source>
        <target>รหัสผ่านที่จะแสดง</target>
@@ -4618,6 +4757,10 @@ Error: %@</source>
        <target>อินเตอร์เฟซภาษาโปแลนด์</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Port" xml:space="preserve">
+        <source>Port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
        <source>Possibly, certificate fingerprint in server address is incorrect</source>
        <target>อาจเป็นไปได้ว่าลายนิ้วมือของ certificate ในที่อยู่เซิร์ฟเวอร์ไม่ถูกต้อง</target>
@@ -4696,14 +4839,6 @@ Error: %@</source>
        <source>Profile images</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>รหัสผ่านโปรไฟล์</target>
@@ -4799,6 +4934,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Proxied servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Proxy requires password" xml:space="preserve">
+        <source>Proxy requires password</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>การแจ้งเตือนแบบทันที</target>
@@ -5003,6 +5142,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>ลบ</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Remove archive?" xml:space="preserve">
+        <source>Remove archive?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Remove image" xml:space="preserve">
        <source>Remove image</source>
        <note>No comment provided by engineer.</note>
@@ -5170,6 +5313,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>SMP server</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="SOCKS proxy" xml:space="preserve">
+        <source>SOCKS proxy</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Safely receive files" xml:space="preserve">
        <source>Safely receive files</source>
        <note>No comment provided by engineer.</note>
@@ -5181,12 +5328,13 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>บันทึก</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Save (and notify contacts)" xml:space="preserve">
        <source>Save (and notify contacts)</source>
        <target>บันทึก (และแจ้งผู้ติดต่อ)</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
@@ -5212,11 +5360,6 @@ Enable in *Network &amp; servers* settings.</source>
        <target>บันทึกไฟล์เก็บถาวร</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save auto-accept settings" xml:space="preserve">
-        <source>Save auto-accept settings</source>
-        <target>บันทึกการตั้งค่าการยอมรับอัตโนมัติ</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save group profile" xml:space="preserve">
        <source>Save group profile</source>
        <target>บันทึกโปรไฟล์กลุ่ม</target>
@@ -5252,16 +5395,15 @@ Enable in *Network &amp; servers* settings.</source>
        <target>บันทึกเซิร์ฟเวอร์?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>บันทึกการตั้งค่า?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save welcome message?" xml:space="preserve">
        <source>Save welcome message?</source>
        <target>บันทึกข้อความต้อนรับ?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Save your profile?" xml:space="preserve">
+        <source>Save your profile?</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <note>No comment provided by engineer.</note>
@@ -5279,6 +5421,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Saved message</source>
        <note>message info title</note>
      </trans-unit>
+      <trans-unit id="Saving %lld messages" xml:space="preserve">
+        <source>Saving %lld messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Scale" xml:space="preserve">
        <source>Scale</source>
        <note>No comment provided by engineer.</note>
@@ -5466,7 +5612,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>ผู้ส่งยกเลิกการโอนไฟล์</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
        <source>Sender may have deleted the connection request.</source>
@@ -5556,6 +5702,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Sent via proxy</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Server" xml:space="preserve">
+        <source>Server</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Server address" xml:space="preserve">
        <source>Server address</source>
        <note>No comment provided by engineer.</note>
@@ -5665,6 +5815,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>การตั้งค่า</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Settings were changed." xml:space="preserve">
+        <source>Settings were changed.</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
        <note>No comment provided by engineer.</note>
@@ -5827,6 +5981,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>คำเชิญ SimpleX แบบครั้งเดียว</target>
        <note>simplex link type</note>
      </trans-unit>
+      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
+        <source>SimpleX protocols reviewed by Trail of Bits.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
        <source>Simplified incognito mode</source>
        <note>No comment provided by engineer.</note>
@@ -5853,6 +6011,10 @@ Enable in *Network &amp; servers* settings.</source>
        <source>Soft</source>
        <note>blur media</note>
      </trans-unit>
+      <trans-unit id="Some app settings were not migrated." xml:space="preserve">
+        <source>Some app settings were not migrated.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
        <source>Some file(s) were not exported:</source>
        <note>No comment provided by engineer.</note>
@@ -5981,6 +6143,14 @@ Enable in *Network &amp; servers* settings.</source>
        <target>สนับสนุน SimpleX แชท</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
+        <source>Switch audio and video during the call.</source>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
        <source>System</source>
        <target>ระบบ</target>
@@ -6203,6 +6373,10 @@ It can happen because of some bug or when the connection is compromised.</source
        <source>The text you pasted is not a SimpleX link.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
+        <source>The uploaded database archive will be permanently removed from the servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <note>No comment provided by engineer.</note>
@@ -6317,6 +6491,14 @@ You will be prompted to complete authentication before this feature is enabled.<
 คุณจะได้รับแจ้งให้ยืนยันตัวตนให้เสร็จสมบูรณ์ก่อนที่จะเปิดใช้งานคุณลักษณะนี้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
+        <source>To record speech please grant permission to use Microphone.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
+        <source>To record video please grant permission to use Camera.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
        <source>To record voice message please grant permission to use Microphone.</source>
        <target>ในการบันทึกข้อความเสียง โปรดให้สิทธิ์ในการใช้ไมโครโฟน</target>
@@ -6458,7 +6640,7 @@ You will be prompted to complete authentication before this feature is enabled.<
      </trans-unit>
      <trans-unit id="Unknown servers!" xml:space="preserve">
        <source>Unknown servers!</source>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
        <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -6563,6 +6745,10 @@ To connect, please ask your contact to create another connection link and check
        <target>ใช้โฮสต์ .onion</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
+        <source>Use SOCKS proxy</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
        <source>Use SimpleX Chat servers?</source>
        <target>ใช้เซิร์ฟเวอร์ SimpleX Chat ไหม?</target>
@@ -6620,15 +6806,14 @@ To connect, please ask your contact to create another connection link and check
        <source>Use the app with one hand.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="User profile" xml:space="preserve">
-        <source>User profile</source>
-        <target>โปรไฟล์ผู้ใช้</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="User selection" xml:space="preserve">
        <source>User selection</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Username" xml:space="preserve">
+        <source>Username</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
        <source>Using SimpleX Chat servers.</source>
        <target>กำลังใช้เซิร์ฟเวอร์ SimpleX Chat อยู่</target>
@@ -6841,7 +7026,7 @@ To connect, please ask your contact to create another connection link and check
      </trans-unit>
      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Wrong database passphrase" xml:space="preserve">
        <source>Wrong database passphrase</source>
@@ -6865,11 +7050,6 @@ To connect, please ask your contact to create another connection link and check
        <source>XFTP server</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You" xml:space="preserve">
-        <source>You</source>
-        <target>คุณ</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
        <source>You **must not** use the same database on two devices.</source>
        <note>No comment provided by engineer.</note>
@@ -7194,6 +7374,10 @@ Repeat connection request?</source>
        <target>ฐานข้อมูลการแชทของคุณไม่ได้ถูก encrypt - ตั้งรหัสผ่านเพื่อ encrypt</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat preferences" xml:space="preserve">
+        <source>Your chat preferences</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>โปรไฟล์แชทของคุณ</target>
@@ -7218,6 +7402,10 @@ Repeat connection request?</source>
        <target>ผู้ติดต่อของคุณจะยังคงเชื่อมต่ออยู่</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
+        <source>Your credentials may be sent unencrypted.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
        <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
        <target>ฐานข้อมูลแชทปัจจุบันของคุณจะถูกลบและแทนที่ด้วยฐานข้อมูลที่นำเข้า</target>
@@ -7246,13 +7434,15 @@ Repeat connection request?</source>
        <source>Your profile **%@** will be shared.</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
-        <source>Your profile is stored on your device and shared only with your contacts.
-SimpleX servers cannot see your profile.</source>
-        <target>โปรไฟล์ของคุณจะถูกจัดเก็บไว้ในอุปกรณ์ของคุณและแชร์กับผู้ติดต่อของคุณเท่านั้น
-เซิร์ฟเวอร์ SimpleX ไม่สามารถดูโปรไฟล์ของคุณได้</target>
+      <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
+        <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
+        <target>โปรไฟล์ของคุณจะถูกจัดเก็บไว้ในอุปกรณ์ของคุณและแชร์กับผู้ติดต่อของคุณเท่านั้น เซิร์ฟเวอร์ SimpleX ไม่สามารถดูโปรไฟล์ของคุณได้</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
+        <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>โปรไฟล์ รายชื่อผู้ติดต่อ และข้อความที่ส่งของคุณจะถูกจัดเก็บไว้ในอุปกรณ์ของคุณ</target>
@@ -161,11 +161,31 @@
        <target>%d днів</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d file(s) are still being downloaded." xml:space="preserve">
+        <source>%d file(s) are still being downloaded.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) failed to download." xml:space="preserve">
+        <source>%d file(s) failed to download.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were deleted." xml:space="preserve">
+        <source>%d file(s) were deleted.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
+      <trans-unit id="%d file(s) were not downloaded." xml:space="preserve">
+        <source>%d file(s) were not downloaded.</source>
+        <note>forward confirmation reason</note>
+      </trans-unit>
      <trans-unit id="%d hours" xml:space="preserve">
        <source>%d hours</source>
        <target>%d годин</target>
        <note>time interval</note>
      </trans-unit>
+      <trans-unit id="%d messages not forwarded" xml:space="preserve">
+        <source>%d messages not forwarded</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="%d min" xml:space="preserve">
        <source>%d min</source>
        <target>%d хв</target>
@@ -727,7 +747,7 @@
      <trans-unit id="All profiles" xml:space="preserve">
        <source>All profiles</source>
        <target>Всі профілі</target>
-        <note>No comment provided by engineer.</note>
+        <note>profile dropdown</note>
      </trans-unit>
      <trans-unit id="All your contacts will remain connected." xml:space="preserve">
        <source>All your contacts will remain connected.</source>
@@ -919,6 +939,10 @@
        <target>Пароль програми замінено на пароль самознищення.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="App session" xml:space="preserve">
+        <source>App session</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="App version" xml:space="preserve">
        <source>App version</source>
        <target>Версія програми</target>
@@ -1024,6 +1048,10 @@
        <target>Автоматичне прийняття зображень</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Auto-accept settings" xml:space="preserve">
+        <source>Auto-accept settings</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>Назад</target>
@@ -1049,11 +1077,19 @@
        <target>Поганий хеш повідомлення</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better calls" xml:space="preserve">
+        <source>Better calls</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
        <source>Better groups</source>
        <target>Кращі групи</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better message dates." xml:space="preserve">
+        <source>Better message dates.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Better messages" xml:space="preserve">
        <source>Better messages</source>
        <target>Кращі повідомлення</target>
@@ -1064,6 +1100,18 @@
        <target>Краща мережа</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Better notifications" xml:space="preserve">
+        <source>Better notifications</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better security ✅" xml:space="preserve">
+        <source>Better security ✅</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="Better user experience" xml:space="preserve">
+        <source>Better user experience</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Black" xml:space="preserve">
        <source>Black</source>
        <target>Чорний</target>
@@ -1197,7 +1245,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>Скасувати</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Cancel migration" xml:space="preserve">
        <source>Cancel migration</source>
@@ -1217,7 +1265,7 @@
      <trans-unit id="Cannot receive file" xml:space="preserve">
        <source>Cannot receive file</source>
        <target>Не вдається отримати файл</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Capacity exceeded - recipient did not receive previously sent messages." xml:space="preserve">
        <source>Capacity exceeded - recipient did not receive previously sent messages.</source>
@@ -1345,6 +1393,15 @@
        <target>Налаштування чату</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Chat preferences were changed." xml:space="preserve">
+        <source>Chat preferences were changed.</source>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Chat profile" xml:space="preserve">
+        <source>Chat profile</source>
+        <target>Профіль користувача</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Тема чату</target>
@@ -1873,6 +1930,10 @@ This is your own one-time link!</source>
        <target>Індивідуальний час</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Customizable message shape." xml:space="preserve">
+        <source>Customizable message shape.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Customize theme" xml:space="preserve">
        <source>Customize theme</source>
        <target>Налаштувати тему</target>
@@ -2167,6 +2228,10 @@ This is your own one-time link!</source>
        <target>Видалити стару базу даних?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Delete or moderate up to 200 messages." xml:space="preserve">
+        <source>Delete or moderate up to 200 messages.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
        <source>Delete pending connection?</source>
        <target>Видалити очікуване з'єднання?</target>
@@ -2417,6 +2482,10 @@ This is your own one-time link!</source>
        <target>Не надсилайте історію новим користувачам.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Do not use credentials with proxy." xml:space="preserve">
+        <source>Do not use credentials with proxy.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Don't create address" xml:space="preserve">
        <source>Don't create address</source>
        <target>Не створювати адресу</target>
@@ -2440,7 +2509,8 @@ This is your own one-time link!</source>
      <trans-unit id="Download" xml:space="preserve">
        <source>Download</source>
        <target>Завантажити</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Download errors" xml:space="preserve">
        <source>Download errors</source>
@@ -2457,6 +2527,10 @@ This is your own one-time link!</source>
        <target>Завантажити файл</target>
        <note>server test step</note>
      </trans-unit>
+      <trans-unit id="Download files" xml:space="preserve">
+        <source>Download files</source>
+        <note>alert action</note>
+      </trans-unit>
      <trans-unit id="Downloaded" xml:space="preserve">
        <source>Downloaded</source>
        <target>Завантажено</target>
@@ -2870,6 +2944,10 @@ This is your own one-time link!</source>
        <target>Помилка завантаження %@ серверів</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error migrating settings" xml:space="preserve">
+        <source>Error migrating settings</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error opening chat" xml:space="preserve">
        <source>Error opening chat</source>
        <target>Помилка відкриття чату</target>
@@ -2878,7 +2956,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error receiving file" xml:space="preserve">
        <source>Error receiving file</source>
        <target>Помилка отримання файлу</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Error reconnecting server" xml:space="preserve">
        <source>Error reconnecting server</source>
@@ -2977,7 +3055,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Помилка перемикання профілю!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alertTitle</note>
      </trans-unit>
      <trans-unit id="Error synchronizing connection" xml:space="preserve">
        <source>Error synchronizing connection</source>
@@ -3022,8 +3100,7 @@ This is your own one-time link!</source>
      <trans-unit id="Error: %@" xml:space="preserve">
        <source>Error: %@</source>
        <target>Помилка: %@</target>
-        <note>file error text
-   snd error text</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Error: URL is invalid" xml:space="preserve">
        <source>Error: URL is invalid</source>
@@ -3110,6 +3187,11 @@ This is your own one-time link!</source>
        <target>Помилка файлу</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="File errors:&#10;%@" xml:space="preserve">
+        <source>File errors:
+%@</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="File not found - most likely file was deleted or cancelled." xml:space="preserve">
        <source>File not found - most likely file was deleted or cancelled.</source>
        <target>Файл не знайдено - найімовірніше, файл було видалено або скасовано.</target>
@@ -3245,11 +3327,27 @@ This is your own one-time link!</source>
        <target>Пересилання</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Forward %d message(s)?" xml:space="preserve">
+        <source>Forward %d message(s)?</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Forward and save messages" xml:space="preserve">
        <source>Forward and save messages</source>
        <target>Пересилання та збереження повідомлень</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forward messages" xml:space="preserve">
+        <source>Forward messages</source>
+        <note>alert action</note>
+      </trans-unit>
+      <trans-unit id="Forward messages without files?" xml:space="preserve">
+        <source>Forward messages without files?</source>
+        <note>alert message</note>
+      </trans-unit>
+      <trans-unit id="Forward up to 20 messages at once." xml:space="preserve">
+        <source>Forward up to 20 messages at once.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarded" xml:space="preserve">
        <source>Forwarded</source>
        <target>Переслано</target>
@@ -3260,6 +3358,10 @@ This is your own one-time link!</source>
        <target>Переслано з</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Forwarding %lld messages" xml:space="preserve">
+        <source>Forwarding %lld messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Forwarding server %@ failed to connect to destination server %@. Please try later." xml:space="preserve">
        <source>Forwarding server %@ failed to connect to destination server %@. Please try later.</source>
        <target>Серверу переадресації %@ не вдалося з'єднатися з сервером призначення %@. Спробуйте пізніше.</target>
@@ -3309,11 +3411,6 @@ Error: %2$@</source>
        <target>Повне ім'я (необов'язково)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>Повне ім'я:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Fully decentralized – visible only to members." xml:space="preserve">
        <source>Fully decentralized – visible only to members.</source>
        <target>Повністю децентралізована - видима лише для учасників.</target>
@@ -3559,6 +3656,10 @@ Error: %2$@</source>
        <target>Сервери ICE (по одному на лінію)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="IP address" xml:space="preserve">
+        <source>IP address</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="If you can't meet in person, show QR code in a video call, or share the link." xml:space="preserve">
        <source>If you can't meet in person, show QR code in a video call, or share the link.</source>
        <target>Якщо ви не можете зустрітися особисто, покажіть QR-код у відеодзвінку або поділіться посиланням.</target>
@@ -3634,6 +3735,11 @@ Error: %2$@</source>
        <target>Імпорт архіву</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Improved message delivery" xml:space="preserve">
        <source>Improved message delivery</source>
        <target>Покращена доставка повідомлень</target>
@@ -4258,6 +4364,10 @@ This is your link for group %@!</source>
        <target>Надіслані повідомлення</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Messages were deleted after you selected them." xml:space="preserve">
+        <source>Messages were deleted after you selected them.</source>
+        <note>alert message</note>
+      </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>
@@ -4413,6 +4523,14 @@ This is your link for group %@!</source>
        <target>Новий пароль</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used every time you start the app." xml:space="preserve">
+        <source>New SOCKS credentials will be used every time you start the app.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="New SOCKS credentials will be used for each server." xml:space="preserve">
+        <source>New SOCKS credentials will be used for each server.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="New chat" xml:space="preserve">
        <source>New chat</source>
        <target>Новий чат</target>
@@ -4533,6 +4651,14 @@ This is your link for group %@!</source>
        <target>Немає підключення до мережі</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="No permission to record speech" xml:space="preserve">
+        <source>No permission to record speech</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="No permission to record video" xml:space="preserve">
+        <source>No permission to record video</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="No permission to record voice message" xml:space="preserve">
        <source>No permission to record voice message</source>
        <target>Немає дозволу на запис голосового повідомлення</target>
@@ -4553,6 +4679,10 @@ This is your link for group %@!</source>
        <target>Нічого не вибрано</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Nothing to forward!" xml:space="preserve">
+        <source>Nothing to forward!</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
        <source>Notifications</source>
        <target>Сповіщення</target>
@@ -4585,7 +4715,7 @@ This is your link for group %@!</source>
      <trans-unit id="Ok" xml:space="preserve">
        <source>Ok</source>
        <target>Гаразд</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Old database" xml:space="preserve">
        <source>Old database</source>
@@ -4776,6 +4906,11 @@ Requires compatible VPN.</source>
        <target>Інші сервери %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Other file errors:&#10;%@" xml:space="preserve">
+        <source>Other file errors:
+%@</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="PING count" xml:space="preserve">
        <source>PING count</source>
        <target>Кількість PING</target>
@@ -4811,6 +4946,10 @@ Requires compatible VPN.</source>
        <target>Пароль встановлено!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Password" xml:space="preserve">
+        <source>Password</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Password to show" xml:space="preserve">
        <source>Password to show</source>
        <target>Показати пароль</target>
@@ -4960,6 +5099,10 @@ Error: %@</source>
        <target>Польський інтерфейс</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Port" xml:space="preserve">
+        <source>Port</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Possibly, certificate fingerprint in server address is incorrect" xml:space="preserve">
        <source>Possibly, certificate fingerprint in server address is incorrect</source>
        <target>Можливо, в адресі сервера неправильно вказано відбиток сертифіката</target>
@@ -5045,16 +5188,6 @@ Error: %@</source>
        <target>Зображення профілю</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Назва профілю</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Ім'я профілю:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Пароль до профілю</target>
@@ -5157,6 +5290,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Проксі-сервери</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Proxy requires password" xml:space="preserve">
+        <source>Proxy requires password</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Push notifications" xml:space="preserve">
        <source>Push notifications</source>
        <target>Push-повідомлення</target>
@@ -5378,6 +5515,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Видалити</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Remove archive?" xml:space="preserve">
+        <source>Remove archive?</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Remove image" xml:space="preserve">
        <source>Remove image</source>
        <target>Видалити зображення</target>
@@ -5558,6 +5699,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Сервер SMP</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="SOCKS proxy" xml:space="preserve">
+        <source>SOCKS proxy</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Safely receive files" xml:space="preserve">
        <source>Safely receive files</source>
        <target>Безпечне отримання файлів</target>
@@ -5571,12 +5716,13 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Зберегти</target>
-        <note>chat item action</note>
+        <note>alert button
+   chat item action</note>
      </trans-unit>
      <trans-unit id="Save (and notify contacts)" xml:space="preserve">
        <source>Save (and notify contacts)</source>
        <target>Зберегти (і повідомити контактам)</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert button</note>
      </trans-unit>
      <trans-unit id="Save and notify contact" xml:space="preserve">
        <source>Save and notify contact</source>
@@ -5603,11 +5749,6 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Зберегти архів</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save auto-accept settings" xml:space="preserve">
-        <source>Save auto-accept settings</source>
-        <target>Зберегти налаштування автоприйому</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save group profile" xml:space="preserve">
        <source>Save group profile</source>
        <target>Зберегти профіль групи</target>
@@ -5643,16 +5784,15 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Зберегти сервери?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>Зберегти налаштування?</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Save welcome message?" xml:space="preserve">
        <source>Save welcome message?</source>
        <target>Зберегти вітальне повідомлення?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Save your profile?" xml:space="preserve">
+        <source>Save your profile?</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <target>Збережено</target>
@@ -5673,6 +5813,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Збережене повідомлення</target>
        <note>message info title</note>
      </trans-unit>
+      <trans-unit id="Saving %lld messages" xml:space="preserve">
+        <source>Saving %lld messages</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Scale" xml:space="preserve">
        <source>Scale</source>
        <target>Масштаб</target>
@@ -5875,7 +6019,7 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Sender cancelled file transfer." xml:space="preserve">
        <source>Sender cancelled file transfer.</source>
        <target>Відправник скасував передачу файлу.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Sender may have deleted the connection request." xml:space="preserve">
        <source>Sender may have deleted the connection request.</source>
@@ -5972,6 +6116,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Відправлено через проксі</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Server" xml:space="preserve">
+        <source>Server</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Server address" xml:space="preserve">
        <source>Server address</source>
        <target>Адреса сервера</target>
@@ -6092,6 +6240,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Налаштування</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Settings were changed." xml:space="preserve">
+        <source>Settings were changed.</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Shape profile images" xml:space="preserve">
        <source>Shape profile images</source>
        <target>Сформуйте зображення профілю</target>
@@ -6266,6 +6418,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Одноразове запрошення SimpleX</target>
        <note>simplex link type</note>
      </trans-unit>
+      <trans-unit id="SimpleX protocols reviewed by Trail of Bits." xml:space="preserve">
+        <source>SimpleX protocols reviewed by Trail of Bits.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Simplified incognito mode" xml:space="preserve">
        <source>Simplified incognito mode</source>
        <target>Спрощений режим інкогніто</target>
@@ -6296,6 +6452,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>М'який</target>
        <note>blur media</note>
      </trans-unit>
+      <trans-unit id="Some app settings were not migrated." xml:space="preserve">
+        <source>Some app settings were not migrated.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Some file(s) were not exported:" xml:space="preserve">
        <source>Some file(s) were not exported:</source>
        <target>Деякі файли не було експортовано:</target>
@@ -6436,6 +6596,14 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Підтримка чату SimpleX</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Switch audio and video during the call." xml:space="preserve">
+        <source>Switch audio and video during the call.</source>
+        <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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
        <source>System</source>
        <target>Система</target>
@@ -6667,6 +6835,10 @@ It can happen because of some bug or when the connection is compromised.</source
        <target>Текст, який ви вставили, не є посиланням SimpleX.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="The uploaded database archive will be permanently removed from the servers." xml:space="preserve">
+        <source>The uploaded database archive will be permanently removed from the servers.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <target>Теми</target>
@@ -6794,6 +6966,14 @@ You will be prompted to complete authentication before this feature is enabled.<
 Перед увімкненням цієї функції вам буде запропоновано пройти автентифікацію.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="To record speech please grant permission to use Microphone." xml:space="preserve">
+        <source>To record speech please grant permission to use Microphone.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
+      <trans-unit id="To record video please grant permission to use Camera." xml:space="preserve">
+        <source>To record video please grant permission to use Camera.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="To record voice message please grant permission to use Microphone." xml:space="preserve">
        <source>To record voice message please grant permission to use Microphone.</source>
        <target>Щоб записати голосове повідомлення, будь ласка, надайте дозвіл на використання мікрофону.</target>
@@ -6947,7 +7127,7 @@ You will be prompted to complete authentication before this feature is enabled.<
      <trans-unit id="Unknown servers!" xml:space="preserve">
        <source>Unknown servers!</source>
        <target>Невідомі сервери!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
      </trans-unit>
      <trans-unit id="Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." xml:space="preserve">
        <source>Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions.</source>
@@ -7061,6 +7241,10 @@ To connect, please ask your contact to create another connection link and check
        <target>Використовуйте хости .onion</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Use SOCKS proxy" xml:space="preserve">
+        <source>Use SOCKS proxy</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Use SimpleX Chat servers?" xml:space="preserve">
        <source>Use SimpleX Chat servers?</source>
        <target>Використовувати сервери SimpleX Chat?</target>
@@ -7126,16 +7310,15 @@ To connect, please ask your contact to create another connection link and check
        <target>Використовуйте додаток однією рукою.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="User profile" xml:space="preserve">
-        <source>User profile</source>
-        <target>Профіль користувача</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="User selection" xml:space="preserve">
        <source>User selection</source>
        <target>Вибір користувача</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Username" xml:space="preserve">
+        <source>Username</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Using SimpleX Chat servers." xml:space="preserve">
        <source>Using SimpleX Chat servers.</source>
        <target>Використання серверів SimpleX Chat.</target>
@@ -7369,7 +7552,7 @@ To connect, please ask your contact to create another connection link and check
      <trans-unit id="Without Tor or VPN, your IP address will be visible to these XFTP relays: %@." xml:space="preserve">
        <source>Without Tor or VPN, your IP address will be visible to these XFTP relays: %@.</source>
        <target>Без Tor або VPN ваша IP-адреса буде видимою для цих XFTP-ретрансляторів: %@.</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert message</note>
      </trans-unit>
      <trans-unit id="Wrong database passphrase" xml:space="preserve">
        <source>Wrong database passphrase</source>
@@ -7396,11 +7579,6 @@ To connect, please ask your contact to create another connection link and check
        <target>XFTP-сервер</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="You" xml:space="preserve">
-        <source>You</source>
-        <target>Ти</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="You **must not** use the same database on two devices." xml:space="preserve">
        <source>You **must not** use the same database on two devices.</source>
        <target>Ви **не повинні використовувати** одну і ту ж базу даних на двох пристроях.</target>
@@ -7750,6 +7928,10 @@ Repeat connection request?</source>
        <target>Ваша база даних чату не зашифрована - встановіть ключову фразу, щоб зашифрувати її.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your chat preferences" xml:space="preserve">
+        <source>Your chat preferences</source>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Ваші профілі чату</target>
@@ -7774,6 +7956,10 @@ Repeat connection request?</source>
        <target>Ваші контакти залишаться на зв'язку.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your credentials may be sent unencrypted." xml:space="preserve">
+        <source>Your credentials may be sent unencrypted.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Your current chat database will be DELETED and REPLACED with the imported one." xml:space="preserve">
        <source>Your current chat database will be DELETED and REPLACED with the imported one.</source>
        <target>Ваша поточна база даних чату буде ВИДАЛЕНА і ЗАМІНЕНА імпортованою.</target>
@@ -7804,13 +7990,15 @@ Repeat connection request?</source>
        <target>Ваш профіль **%@** буде опублікований.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Your profile is stored on your device and shared only with your contacts.&#10;SimpleX servers cannot see your profile." xml:space="preserve">
-        <source>Your profile is stored on your device and shared only with your contacts.
-SimpleX servers cannot see your profile.</source>
-        <target>Ваш профіль зберігається на вашому пристрої і доступний лише вашим контактам.
-Сервери SimpleX не бачать ваш профіль.</target>
+      <trans-unit id="Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." xml:space="preserve">
+        <source>Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile.</source>
+        <target>Ваш профіль зберігається на вашому пристрої і доступний лише вашим контактам. Сервери SimpleX не бачать ваш профіль.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Your profile was changed. If you save it, the updated profile will be sent to all your contacts." xml:space="preserve">
+        <source>Your profile was changed. If you save it, the updated profile will be sent to all your contacts.</source>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Your profile, contacts and delivered messages are stored on your device." xml:space="preserve">
        <source>Your profile, contacts and delivered messages are stored on your device.</source>
        <target>Ваш профіль, контакти та доставлені повідомлення зберігаються на вашому пристрої.</target>
@@ -26,14 +26,52 @@ enum NSENotification {
    case nse(UNMutableNotificationContent)
    case callkit(RcvCallInvitation)
    case empty
-    case msgInfo(NtfMsgInfo)
+}

-    var isCallInvitation: Bool {
+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? {
        switch self {
-        case let .nse(ntf): ntf.categoryIdentifier == ntfCategoryCallInvitation
-        case .callkit: true
-        case .empty: false
-        case .msgInfo: false
+        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
        }
    }
 }
@@ -43,9 +81,10 @@ enum NSENotification {
 // or when background notification is received.
 class NSEThreads {
    static let shared = NSEThreads()
-    private static let queue = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.notification-threads.lock")
+    static let queue = DispatchQueue(label: "chat.simplex.app.SimpleX-NSE.notification-threads.lock")
    private var allThreads: Set<UUID> = []
-    private var activeThreads: [(UUID, NotificationService)] = []
+    var activeThreads: [(UUID, NotificationService)] = []
+    var droppedNotifications: [(ChatId, NSENotificationData)] = []

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

-    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
-            }
+    func processNotification(_ id: ChatId, _ ntf: NSENotificationData) async -> Void {
+        if let (_, nse) = rcvEntityThread(id),
+           nse.expectedMessages[id]?.shouldProcessNtf ?? false {
+            nse.processReceivedNtf(id, ntf, signalReady: true)
        }
    }

    private func rcvEntityThread(_ id: ChatId) -> (UUID, NotificationService)? {
        NSEThreads.queue.sync {
-            activeThreads.first(where: { (_, nse) in nse.receiveEntityId == id })
+            // 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 })
        }
    }

@@ -106,29 +142,38 @@ 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)?
-    var bestAttemptNtf: NSENotification?
+    // served as notification if no message attempts (msgBestAttemptNtf) could be produced
+    var serviceBestAttemptNtf: 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 notificationInfo: NtfMessages?
-    var receiveEntityId: String?
-    var expectedMessage: String?
-    // return true if the message is taken - it prevents sending it to another NotificationService instance for processing
-    var shouldProcessNtf = false
+    var expectedMessages: Dictionary<String, ExpectedMessage> = [:] // key is receiveEntityId
    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() }
-        setBestAttemptNtf(ntf)
+        setServiceBestAttemptNtf(ntf)
        self.contentHandler = contentHandler
        registerGroupDefaults()
        let appState = appStateGroupDefault.get()
@@ -136,13 +181,11 @@ class NotificationService: UNNotificationServiceExtension {
        switch appState {
        case .stopped:
            setBadgeCount()
-            setBestAttemptNtf(createAppStoppedNtf())
+            setServiceBestAttemptNtf(createAppStoppedNtf(badgeCount))
            deliverBestAttemptNtf()
        case .suspended:
-            setBadgeCount()
            receiveNtfMessages(request, contentHandler)
        case .suspending:
-            setBadgeCount()
            Task {
                let state: AppState = await withCheckedContinuation { cont in
                    appSubscriber = appStateSubscriber { s in
@@ -169,8 +212,9 @@ class NotificationService: UNNotificationServiceExtension {
                    deliverBestAttemptNtf()
                }
            }
-        default:
-            deliverBestAttemptNtf()
+        case .active: contentHandler(UNMutableNotificationContent())
+        case .activating: contentHandler(UNMutableNotificationContent())
+        case .bgRefresh: contentHandler(UNMutableNotificationContent())
        }
    }

@@ -190,62 +234,165 @@ class NotificationService: UNNotificationServiceExtension {
            if let t = threadId { NSEThreads.shared.startThread(t, self) }
            let dbStatus = startChat()
            if case .ok = dbStatus,
-               let ntfInfo = apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo) {
-                logger.debug("NotificationService: receiveNtfMessages: apiGetNtfMessage \(String(describing: ntfInfo.ntfMessage_ == nil ? 0 : 1))")
-                if let connEntity = ntfInfo.connEntity_ {
-                    setBestAttemptNtf(
-                        ntfInfo.ntfsEnabled
-                        ? .nse(createConnectionEventNtf(ntfInfo.user, connEntity))
-                        : .empty
-                    )
-                    if let id = connEntity.id, ntfInfo.msgTs != nil {
-                        notificationInfo = ntfInfo
-                        receiveEntityId = id
-                        expectedMessage = ntfInfo.ntfMessage_.flatMap { $0.msgId }
-                        shouldProcessNtf = true
-                        return
+               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
+                    }
+                    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 {
-                setBestAttemptNtf(createErrorNtf(dbStatus))
+                setServiceBestAttemptNtf(createErrorNtf(dbStatus, badgeCount))
            }
        }
        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)
    }

-    func processReceivedNtf(_ ntf: NSENotification) -> Bool {
-        guard let ntfInfo = notificationInfo, let msgTs = ntfInfo.msgTs else { return false }
-        if !ntfInfo.user.showNotifications {
-            self.setBestAttemptNtf(.empty)
+    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
        }
        if case let .msgInfo(info) = ntf {
-            if info.msgId == expectedMessage {
-                expectedMessage = nil
-                logger.debug("NotificationService processNtf: msgInfo")
+            if info.msgId == expectedMessage.expectedMsgId {
+                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 info.msgTs > msgTs {
-                logger.debug("NotificationService processNtf: unexpected msgInfo, let other instance to process it, stopping this one")
+            } 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()
-                return false
+            } else if (expectedMessages[id]?.allowedGetNextAttempts ?? 0) > 0, let receiveConnId = expectedMessages[id]?.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)")
+                } 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) }
+                    self.deliverBestAttemptNtf()
+                }
            } else {
-                logger.debug("NotificationService processNtf: unknown message, let other instance to process it")
-                return false
-            }
-        } else if ntfInfo.user.showNotifications {
-            logger.debug("NotificationService processNtf: setting best attempt")
-            self.setBestAttemptNtf(ntf)
-            if ntf.isCallInvitation {
+                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 true
+        } 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 false
    }

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

-    func setBestAttemptNtf(_ ntf: UNMutableNotificationContent) {
-        setBestAttemptNtf(.nse(ntf))
-    }
-
-    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
-        }
+    func setServiceBestAttemptNtf(_ ntf: UNMutableNotificationContent) {
+        logger.debug("NotificationService.setServiceBestAttemptNtf")
+        serviceBestAttemptNtf = .nse(ntf)
    }

    private func deliverBestAttemptNtf(urgent: Bool = false) {
-        logger.debug("NotificationService.deliverBestAttemptNtf")
-        // stop processing other messages
-        shouldProcessNtf = 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
+            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)
        }
-        deliverCallkitOrNotification(urgent: urgent, suspend: suspend)
    }

    private func deliverCallkitOrNotification(urgent: Bool, suspend: Bool = false) {
-        if case .callkit = bestAttemptNtf {
+        if useCallKit() && expectedMessages.contains(where: { $0.value.msgBestAttemptNtf?.callInvitation != nil }) {
            logger.debug("NotificationService.deliverCallkitOrNotification: will suspend, callkit")
            if urgent {
                // suspending NSE even though there may be other notifications
@@ -321,19 +463,13 @@ class NotificationService: UNNotificationServiceExtension {
    }

    private func deliverNotification() {
-        if let handler = contentHandler, let ntf = bestAttemptNtf {
+        if let handler = contentHandler, let ntf = prepareNotification() {
            contentHandler = nil
-            bestAttemptNtf = nil
-            let deliver: (UNMutableNotificationContent?) -> Void = { ntf in
-                let useNtf = if let ntf = ntf {
-                    appStateGroupDefault.get().running ? UNMutableNotificationContent() : ntf
-                } else {
-                    UNMutableNotificationContent()
-                }
-                handler(useNtf)
-            }
+            serviceBestAttemptNtf = nil
            switch ntf {
-            case let .nse(content): deliver(content)
+            case let .nse(content):
+                content.badge = badgeCount as NSNumber
+                handler(content)
            case let .callkit(invitation):
                logger.debug("NotificationService reportNewIncomingVoIPPushPayload for \(invitation.contact.id)")
                CXProvider.reportNewIncomingVoIPPushPayload([
@@ -344,13 +480,85 @@ class NotificationService: UNNotificationServiceExtension {
                    "callTs": invitation.callTs.timeIntervalSince1970
                ]) { error in
                    logger.debug("reportNewIncomingVoIPPushPayload result: \(error)")
-                    deliver(error == nil ? nil : createCallInvitationNtf(invitation))
+                    handler(error == nil ? UNMutableNotificationContent() : createCallInvitationNtf(invitation, self.badgeCount))
                }
-            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
+            case .empty:
+                handler(UNMutableNotificationContent()) // used to mute notifications that did not unsubscribe yet
            }
        }
    }
+
+    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
@@ -564,28 +772,25 @@ func chatRecvMsg() async -> ChatResponse? {
 private let isInChina = SKStorefront().countryCode == "CHN"
 private func useCallKit() -> Bool { !isInChina && callKitEnabledGroupDefault.get() }

-func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
+func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotificationData)? {
    logger.debug("NotificationService receivedMsgNtf: \(res.responseType)")
    switch res {
    case let .contactConnected(user, contact, _):
-        return (contact.id, .nse(createContactConnectedNtf(user, contact)))
+        return (contact.id, .contactConnected(user, contact))
 //        case let .contactConnecting(contact):
 //            TODO profile update
    case let .receivedContactRequest(user, contactRequest):
-        return (UserContact(contactRequest: contactRequest).id, .nse(createContactRequestNtf(user, contactRequest)))
+        return (UserContact(contactRequest: contactRequest).id, .contactRequest(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: NSENotification = cInfo.ntfsEnabled ? .nse(createMessageReceivedNtf(user, cInfo, cItem)) : .empty
-            return cItem.showNotification ? (chatItem.chatId, ntf) : nil
+            let ntf: NSENotificationData = (cInfo.ntfsEnabled && cItem.showNotification) ? .messageReceived(user, cInfo, cItem) : .noNtf
+            return (chatItem.chatId, ntf)
        } else {
            return nil
        }
@@ -602,10 +807,7 @@ func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
        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,
-            useCallKit() ? .callkit(invitation) : .nse(createCallInvitationNtf(invitation))
-        )
+        return (invitation.contact.id, .callInvitation(invitation))
    case let .ntfMessage(_, connEntity, ntfMessage):
        return if let id = connEntity.id { (id, .msgInfo(ntfMessage)) } else { nil }
    case .chatSuspended:
@@ -686,15 +888,15 @@ func apiSetEncryptLocalFiles(_ enable: Bool) throws {
    throw r
 }

-func apiGetNtfMessage(nonce: String, encNtfInfo: String) -> NtfMessages? {
+func apiGetNtfConns(nonce: String, encNtfInfo: String) -> [UserNtfConn]? {
    guard apiGetActiveUser() != nil else {
        logger.debug("no active user")
        return nil
    }
-    let r = sendSimpleXCmd(.apiGetNtfMessage(nonce: nonce, encNtfInfo: encNtfInfo))
-    if case let .ntfMessages(user, connEntity_, msgTs, ntfMessage_) = r, let user = user {
-        logger.debug("apiGetNtfMessage response ntfMessages: \(ntfMessage_ == nil ? 0 : 1)")
-        return NtfMessages(user: user, connEntity_: connEntity_, msgTs: msgTs, ntfMessage_: ntfMessage_)
+    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) }
    } else if case let .chatCmdError(_, error) = r {
        logger.debug("apiGetNtfMessage error response: \(String.init(describing: error))")
    } else {
@@ -703,6 +905,36 @@ func apiGetNtfMessage(nonce: String, encNtfInfo: String) -> NtfMessages? {
    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?]? {
+    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
+    }
+    return nil
+}
+
 func apiReceiveFile(fileId: Int64, encrypted: Bool, inline: Bool? = nil) -> AChatItem? {
    let userApprovedRelays = !privacyAskToApproveRelaysGroupDefault.get()
    let r = sendSimpleXCmd(.receiveFile(fileId: fileId, userApprovedRelays: userApprovedRelays, encrypted: encrypted, inline: inline))
@@ -737,13 +969,33 @@ func setNetworkConfig(_ cfg: NetCfg) throws {
    throw r
 }

-struct NtfMessages {
+struct UserNtfConn {
    var user: User
    var connEntity_: ConnectionEntity?
-    var msgTs: Date?
-    var ntfMessage_: NtfMsgInfo?
+    var expectedMsg_: NtfMsgInfo?

-    var ntfsEnabled: Bool {
-        user.showNotifications && (connEntity_?.ntfsEnabled ?? false)
+    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
+        }
    }
 }
@@ -104,7 +104,7 @@ class ShareModel: ObservableObject {
                        // Decode base64 images on background thread
                        let profileImages = chats.reduce(into: Dictionary<ChatInfo.ID, UIImage>()) { dict, chatData in
                            if let profileImage = chatData.chatInfo.image,
-                               let uiImage = UIImage(base64Encoded: profileImage) {
+                               let uiImage = imageFromBase64(profileImage) {
                                dict[chatData.id] = uiImage
                            }
                        }
@@ -320,7 +320,8 @@ class ShareModel: ObservableObject {
                }
                await ch.completeFile()
                if await !ch.isRunning { break }
-            case let .chatItemStatusUpdated(_, ci):
+            case let .chatItemsStatusesUpdated(_, chatItems):
+                guard let ci = chatItems.last else { continue }
                guard isMessage(for: ci) else { continue }
                if let (title, message) = ci.chatItem.meta.itemStatus.statusInfo {
                    // `title` and `message` already localized and interpolated
@@ -416,7 +417,7 @@ fileprivate func getSharedContent(_ ip: NSItemProvider) async -> Result<SharedCo
                   let data = try? Data(contentsOf: url),
                   let image = UIImage(data: data),
                   let cryptoFile = saveFile(data, generateNewFileName("IMG", "gif"), encrypted: privacyEncryptLocalFilesGroupDefault.get()),
-                   let preview = resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE) {
+                   let preview = await resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE) {
                    .success(.image(preview: preview, cryptoFile: cryptoFile))
                } else { .failure(ErrorAlert("Error preparing message")) }

@@ -424,7 +425,7 @@ fileprivate func getSharedContent(_ ip: NSItemProvider) async -> Result<SharedCo
            } else {
                if let image = await staticImage(),
                   let cryptoFile = saveImage(image),
-                   let preview = resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE) {
+                   let preview = await resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE) {
                    .success(.image(preview: preview, cryptoFile: cryptoFile))
                } else { .failure(ErrorAlert("Error preparing message")) }
            }
@@ -434,7 +435,7 @@ fileprivate func getSharedContent(_ ip: NSItemProvider) async -> Result<SharedCo
            if let url = try? await inPlaceUrl(type: type),
               let trancodedUrl = await transcodeVideo(from: url),
               let (image, duration) = AVAsset(url: trancodedUrl).generatePreview(),
-               let preview = resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE),
+               let preview = await resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE),
               let cryptoFile = moveTempFileFromURL(trancodedUrl) {
                try? FileManager.default.removeItem(at: trancodedUrl)
                return .success(.movie(preview: preview, duration: duration, cryptoFile: cryptoFile))
@@ -147,8 +147,8 @@ struct ShareView: View {
        }
    }

-    @ViewBuilder private func imagePreview(_ img: String) -> some View {
-        if let img = UIImage(base64Encoded: img) {
+    @ViewBuilder private func imagePreview(_ imgStr: String) -> some View {
+        if let img = imageFromBase64(imgStr) {
            previewArea {
                Image(uiImage: img)
                    .resizable()
@@ -163,7 +163,7 @@ struct ShareView: View {
    @ViewBuilder private func linkPreview(_ linkPreview: LinkPreview) -> some View {
        previewArea {
            HStack(alignment: .center, spacing: 8) {
-                if let uiImage = UIImage(base64Encoded: linkPreview.image) {
+                if let uiImage = imageFromBase64(linkPreview.image) {
                    Image(uiImage: uiImage)
                        .resizable()
                        .aspectRatio(contentMode: .fit)
--- a/Show More
+++ b/Show More