Merge master

ios: add on on-device translation sheet to chat
desktop: cleanup current invitation when closing new chat sheet by pressing on center modal (#4904 )
2024-12-17 17:20:21 +01:00 · 2024-09-19 11:18:50 +03:00 · 2024-09-19 11:04:46 +03:00 · 2024-09-19 08:14:50 +01:00 · 2024-09-19 08:04:19 +01:00 · 2024-09-19 07:57:37 +01:00
227 changed files with 11128 additions and 4011 deletions
@@ -5,12 +5,22 @@ on:
    branches:
      - master
      - stable
-      - users
    tags:
      - "v*"
      - "!*-fdroid"
      - "!*-armv7a"
  pull_request:
+    paths-ignore:
+      - "apps/ios"
+      - "apps/multiplatform"
+      - "blog"
+      - "docs"
+      - "fastlane"
+      - "images"
+      - "packages"
+      - "website"
+      - "README.md"
+      - "PRIVACY.md"

 jobs:
  prepare-release:
@@ -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/
@@ -300,25 +300,27 @@ What is already implemented:
 1. Instead of user profile identifiers used by all other platforms, even the most private ones, SimpleX uses [pairwise per-queue identifiers](./docs/GLOSSARY.md#pairwise-pseudonymous-identifier) (2 addresses for each unidirectional message queue, with an optional 3rd address for push notifications on iOS, 2 queues in each connection between the users). It makes observing the network graph on the application level more difficult, as for `n` users there can be up to `n * (n-1)` message queues.
 2. [End-to-end encryption](./docs/GLOSSARY.md#end-to-end-encryption) in each message queue using [NaCl cryptobox](https://nacl.cr.yp.to/box.html). This is added to allow redundancy in the future (passing each message via several servers), to avoid having the same ciphertext in different queues (that would only be visible to the attacker if TLS is compromised). The encryption keys used for this encryption are not rotated, instead we are planning to rotate the queues. Curve25519 keys are used for key negotiation.
 3. [Double ratchet](./docs/GLOSSARY.md#double-ratchet-algorithm) end-to-end encryption in each conversation between two users (or group members). This is the same algorithm that is used in Signal and many other messaging apps; it provides OTR messaging with [forward secrecy](./docs/GLOSSARY.md#forward-secrecy) (each message is encrypted by its own ephemeral key) and [break-in recovery](./docs/GLOSSARY.md#post-compromise-security) (the keys are frequently re-negotiated as part of the message exchange). Two pairs of Curve448 keys are used for the initial [key agreement](./docs/GLOSSARY.md#key-agreement-protocol), initiating party passes these keys via the connection link, accepting side - in the header of the confirmation message.
-4. Additional layer of encryption using NaCL cryptobox for the messages delivered from the server to the recipient. This layer avoids having any ciphertext in common between sent and received traffic of the server inside TLS (and there are no identifiers in common as well).
-5. Several levels of [content padding](./docs/GLOSSARY.md#message-padding) to frustrate message size attacks.
-6. All message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
-7. Only TLS 1.2/1.3 are allowed for client-server connections, limited to cryptographic algorithms: CHACHA20POLY1305_SHA256, Ed25519/Ed448, Curve25519/Curve448.
-8. To protect against replay attacks SimpleX servers require [tlsunique channel binding](https://www.rfc-editor.org/rfc/rfc5929.html) as session ID in each client command signed with per-queue ephemeral key.
-9. To protect your IP address all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details.
-10. Local database encryption with passphrase - your contacts, groups and all sent and received messages are stored encrypted. If you used SimpleX Chat before v4.0 you need to enable the encryption via the app settings.
-11. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.
-12. Manual messaging queue rotations to move conversation to another SMP relay.
-13. Sending end-to-end encrypted files using [XFTP protocol](https://simplex.chat/blog/20230301-simplex-file-transfer-protocol.html).
-14. Local files encryption.
+4. [Post-quantum resistant key exchange](./docs/GLOSSARY.md#post-quantum-cryptography) in double ratchet protocol *on every ratchet step*. Read more in [this post](./blog/20240314-simplex-chat-v5-6-quantum-resistance-signal-double-ratchet-algorithm.md) and also see this [publication by Apple]( https://security.apple.com/blog/imessage-pq3/) explaining the need for post-quantum key rotation.
+5. Additional layer of encryption using NaCL cryptobox for the messages delivered from the server to the recipient. This layer avoids having any ciphertext in common between sent and received traffic of the server inside TLS (and there are no identifiers in common as well).
+6. Several levels of [content padding](./docs/GLOSSARY.md#message-padding) to frustrate message size attacks.
+7. All message metadata, including the time when the message was received by the server (rounded to a second) is sent to the recipients inside an encrypted envelope, so even if TLS is compromised it cannot be observed.
+8. Only TLS 1.2/1.3 are allowed for client-server connections, limited to cryptographic algorithms: CHACHA20POLY1305_SHA256, Ed25519/Ed448, Curve25519/Curve448.
+9. To protect against replay attacks SimpleX servers require [tlsunique channel binding](https://www.rfc-editor.org/rfc/rfc5929.html) as session ID in each client command signed with per-queue ephemeral key.
+10. To protect your IP address from unknown messaging relays, and for per-message transport anonymity (compared with Tor/VPN per-connection anonymity), from v6.0 all SimpleX Chat clients use private message routing by default. Read more in [this post](./blog/20240604-simplex-chat-v5.8-private-message-routing-chat-themes.md#private-message-routing).
+11. To protect your IP address from unknown file relays, when SOCKS proxy is not enabled SimpleX Chat clients ask for a confirmation before downloading the files from unknown servers.
+12. To protect your IP address from known servers all SimpleX Chat clients support accessing messaging servers via Tor - see [v3.1 release announcement](./blog/20220808-simplex-chat-v3.1-chat-groups.md) for more details.
+13. Local database encryption with passphrase - your contacts, groups and all sent and received messages are stored encrypted. If you used SimpleX Chat before v4.0 you need to enable the encryption via the app settings.
+14. Transport isolation - different TCP connections and Tor circuits are used for traffic of different user profiles, optionally - for different contacts and group member connections.
+15. Manual messaging queue rotations to move conversation to another SMP relay.
+16. Sending end-to-end encrypted files using [XFTP protocol](https://simplex.chat/blog/20230301-simplex-file-transfer-protocol.html).
+17. Local files encryption.

 We plan to add:

-1. Senders' SMP relays and recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.
-2. Post-quantum resistant key exchange in double ratchet protocol.
-3. Automatic message queue rotation and redundancy. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
-4. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
-5. Reproducible builds – this is the limitation of the development stack, but we will be investing into solving this problem. Users can still build all applications and services from the source code.
+1. Automatic message queue rotation and redundancy. Currently the queues created between two users are used until the queue is manually changed by the user or contact is deleted. We are planning to add automatic queue rotation to make these identifiers temporary and rotate based on some schedule TBC (e.g., every X messages, or every X hours/days).
+2. Message "mixing" - adding latency to message delivery, to protect against traffic correlation by message time.
+3. Reproducible builds – this is the limitation of the development stack, but we will be investing into solving this problem. Users can still build all applications and services from the source code.
+4. Recipients' XFTP relays to reduce traffic and conceal IP addresses from the relays chosen, and potentially controlled, by another party.

 ## For developers

@@ -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)")
@@ -0,0 +1,12 @@
+{
+  "info": {
+    "author": "xcode",
+    "version": 1
+  },
+  "symbols": [
+    {
+      "filename": "checkmark.2.svg",
+      "idiom": "universal"
+    }
+  ]
+}
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="3300px" height="2200px" viewBox="0 0 3300 2200" version="1.1" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>checkmark.2</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="double.checkmark">
+            <g id="Notes">
+                <rect id="artboard" fill="#FFFFFF" fill-rule="nonzero" x="0" y="0" width="3300" height="2200"></rect>
+                <line x1="263" y1="292" x2="3036" y2="292" id="Path" stroke="#000000" stroke-width="0.5"></line>
+                <text id="Weight/Scale-Variations" fill="#000000" fill-rule="nonzero" font-family="Helvetica"
+                    font-size="13" font-weight="normal">
+                    <tspan x="263" y="322">Weight/Scale Variations</tspan>
+                </text>
+                <text id="Ultralight" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="533.711" y="322">Ultralight</tspan>
+                </text>
+                <text id="Thin" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="843.422" y="322">Thin</tspan>
+                </text>
+                <text id="Light" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="1138.63" y="322">Light</tspan>
+                </text>
+                <text id="Regular" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="1426.84" y="322">Regular</tspan>
+                </text>
+                <text id="Medium" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="1723.06" y="322">Medium</tspan>
+                </text>
+                <text id="Semibold" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="2015.77" y="322">Semibold</tspan>
+                </text>
+                <text id="Bold" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="2326.48" y="322">Bold</tspan>
+                </text>
+                <text id="Heavy" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="2618.19" y="322">Heavy</tspan>
+                </text>
+                <text id="Black" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="2917.4" y="322">Black</tspan>
+                </text>
+                <line x1="263" y1="1903" x2="3036" y2="1903" id="Path" stroke="#000000" stroke-width="0.5"></line>
+                <g id="Group" transform="translate(264.3672, 1918.0684)" fill="#000000" fill-rule="nonzero">
+                    <path
+                        d="M7.88088,15.76172 C12.18752,15.76172 15.7715,12.1875 15.7715,7.88086 C15.7715,3.57422 12.17774,0 7.8711,0 C3.57422,0 0,3.57422 0,7.88086 C0,12.1875 3.58398,15.76172 7.88086,15.76172 L7.88088,15.76172 Z M7.88088,14.277344 C4.33596,14.277344 1.50392,11.435544 1.50392,7.880864 C1.50392,4.326184 4.32618,1.484384 7.8711,1.484384 C11.42578,1.484384 14.27734,4.326184 14.27734,7.880864 C14.27734,11.435544 11.43554,14.277344 7.88086,14.277344 L7.88088,14.277344 Z M4.28712,7.880864 C4.28712,8.310552 4.589854,8.60352 5.039074,8.60352 L7.138674,8.60352 L7.138674,10.72266 C7.138674,11.162114 7.431642,11.464848 7.86133,11.464848 C8.310548,11.464848 8.603518,11.162114 8.603518,10.72266 L8.603518,8.60352 L10.722658,8.60352 C11.162112,8.60352 11.464846,8.310552 11.464846,7.880864 C11.464846,7.44141 11.162112,7.138676 10.722658,7.138676 L8.603518,7.138676 L8.603518,5.029296 C8.603518,4.580078 8.31055,4.277342 7.86133,4.277342 C7.431642,4.277342 7.138674,4.580076 7.138674,5.029296 L7.138674,7.138676 L5.039074,7.138676 C4.589856,7.138676 4.28712,7.44141 4.28712,7.880864 Z"
+                        id="Shape"></path>
+                </g>
+                <g id="Group" transform="translate(283.254, 1915.9883)" fill="#000000" fill-rule="nonzero">
+                    <path
+                        d="M9.96094,19.92188 C15.41016,19.92188 19.92188,15.4004 19.92188,9.96094 C19.92188,4.51172 15.4004,0 9.95118,0 C4.51172,0 0,4.51172 0,9.96094 C0,15.4004 4.52148,19.92188 9.96094,19.92188 Z M9.96094,18.261724 C5.35156,18.261724 1.66992,14.570324 1.66992,9.960944 C1.66992,5.351564 5.3418,1.660164 9.95116,1.660164 C14.56052,1.660164 18.2617,5.351564 18.2617,9.960944 C18.2617,14.570324 14.5703,18.261724 9.96092,18.261724 L9.96094,18.261724 Z M5.4297,9.960944 C5.4297,10.43946 5.761732,10.761726 6.259778,10.761726 L9.130878,10.761726 L9.130878,13.642586 C9.130878,14.130868 9.46291,14.472664 9.941424,14.472664 C10.4297,14.472664 10.771502,14.140632 10.771502,13.642586 L10.771502,10.761726 L13.652362,10.761726 C14.140644,10.761726 14.48244,10.43946 14.48244,9.960944 C14.48244,9.472662 14.140644,9.130866 13.652362,9.130866 L10.771502,9.130866 L10.771502,6.259766 C10.771502,5.76172 10.4297,5.419922 9.941424,5.419922 C9.462908,5.419922 9.130878,5.761718 9.130878,6.259766 L9.130878,9.130866 L6.259778,9.130866 C5.761732,9.130866 5.4297,9.472662 5.4297,9.960944 Z"
+                        id="Shape"></path>
+                </g>
+                <g id="Group" transform="translate(307.1798, 1913.2246)" fill="#000000" fill-rule="nonzero">
+                    <path
+                        d="M12.71486,25.43944 C19.67776,25.43944 25.43946,19.67772 25.43946,12.7246 C25.43946,5.7617 19.66798,0 12.70508,0 C5.75196,0 -1.42108547e-15,5.76172 -1.42108547e-15,12.7246 C-1.42108547e-15,19.67772 5.76172,25.43944 12.71484,25.43944 L12.71486,25.43944 Z M12.71486,23.623034 C6.6797,23.623034 1.82618,18.759754 1.82618,12.724594 C1.82618,6.679674 6.66994,1.826154 12.70508,1.826154 C18.75,1.826154 23.61328,6.679674 23.61328,12.724594 C23.61328,18.759754 18.75976,23.623034 12.71484,23.623034 L12.71486,23.623034 Z M6.94338,12.724594 C6.94338,13.242172 7.314474,13.6035 7.861348,13.6035 L11.806668,13.6035 L11.806668,17.55858 C11.806668,18.09569 12.177762,18.476548 12.69534,18.476548 C13.23245,18.476548 13.603544,18.105454 13.603544,17.55858 L13.603544,13.6035 L17.558624,13.6035 C18.095734,13.6035 18.476592,13.242172 18.476592,12.724594 C18.476592,12.177718 18.105498,11.806626 17.558624,11.806626 L13.603544,11.806626 L13.603544,7.861306 C13.603544,7.31443 13.23245,6.933572 12.69534,6.933572 C12.177762,6.933572 11.806668,7.314432 11.806668,7.861306 L11.806668,11.806626 L7.861348,11.806626 C7.314472,11.806626 6.94338,12.17772 6.94338,12.724594 Z"
+                        id="Shape"></path>
+                </g>
+                <text id="Design-Variations" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="263" y="1953">Design Variations</tspan>
+                </text>
+                <text id="Symbols-are-supported-in-up-to-nine-weights-and-three-scales." fill="#000000"
+                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
+                    <tspan x="263" y="1971">Symbols are supported in up to nine weights and three scales.</tspan>
+                </text>
+                <text id="For-optimal-layout-with-text-and-other-symbols,-vertically-align" fill="#000000"
+                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
+                    <tspan x="263" y="1989">For optimal layout with text and other symbols, vertically align</tspan>
+                </text>
+                <text id="symbols-with-the-adjacent-text." fill="#000000" fill-rule="nonzero" font-family="Helvetica"
+                    font-size="13" font-weight="normal">
+                    <tspan x="263" y="2007">symbols with the adjacent text.</tspan>
+                </text>
+                <line x1="776" y1="1919" x2="776" y2="1933" id="Path" stroke="#00AEEF" stroke-width="0.5"></line>
+                <g id="Group" transform="translate(778.4902, 1918.7324)" fill="#000000" fill-rule="nonzero">
+                    <path
+                        d="M0.8203116,14.423832 C1.3378896,14.423832 1.5917956,14.2285116 1.7773436,13.681636 L3.0371096,10.234376 L8.7988296,10.234376 L10.0585956,13.681636 C10.2441424,14.228512 10.4980496,14.423832 11.0058616,14.423832 C11.5234396,14.423832 11.8554716,14.111324 11.8554716,13.623042 C11.8554716,13.4570264 11.8261748,13.300776 11.7480498,13.095698 L7.1679698,0.898438 C6.9433598,0.302734 6.5429698,0 5.9179698,0 C5.3125018,0 4.9023458,0.292968 4.6875018,0.888672 L0.1074218,13.105472 C0.0292968,13.31055 -3.55271368e-16,13.4668 -3.55271368e-16,13.632816 C-3.55271368e-16,14.121098 0.3125,14.423832 0.820312,14.423832 L0.8203116,14.423832 Z M3.5156316,8.750004 L5.8886716,2.177744 L5.9374998,2.177744 L8.3105398,8.750004 L3.5156316,8.750004 Z"
+                        id="Shape"></path>
+                </g>
+                <line x1="792.836" y1="1919" x2="792.836" y2="1933" id="Path" stroke="#00AEEF" stroke-width="0.5">
+                </line>
+                <text id="Margins" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="776" y="1953">Margins</tspan>
+                </text>
+                <text id="Leading-and-trailing-margins-on-the-left-and-right-side-of-each-symbol" fill="#000000"
+                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
+                    <tspan x="776" y="1971">Leading and trailing margins on the left and right side of each symbol
+                    </tspan>
+                </text>
+                <text id="can-be-adjusted-by-modifying-the-x-location-of-the-margin-guidelines." fill="#000000"
+                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
+                    <tspan x="776" y="1989">can be adjusted by modifying the x-location of the margin guidelines.
+                    </tspan>
+                </text>
+                <text id="Modifications-are-automatically-applied-proportionally-to-all" fill="#000000"
+                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
+                    <tspan x="776" y="2007">Modifications are automatically applied proportionally to all</tspan>
+                </text>
+                <text id="scales-and-weights." fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="776" y="2025">scales and weights.</tspan>
+                </text>
+                <g id="Group" transform="translate(1291.2481, 1914.5174)" fill="#000000" fill-rule="nonzero">
+                    <path
+                        d="M0.593687825,20.3477978 L2.29290583,22.0567818 C3.15228183,22.9259218 4.13860983,22.8673278 5.06634583,21.8419378 L15.7597058,10.0548378 L14.7929098,9.07827578 L4.17766983,20.7579558 C3.82610783,21.1583458 3.49407583,21.2560018 3.02532583,20.7872526 L1.85344983,19.6251426 C1.38469983,19.1661586 1.49212183,18.8243606 1.89251223,18.4630326 L13.3671122,7.66225258 L12.3905502,6.69545658 L0.798750225,17.5841366 C-0.187577775,18.5021046 -0.265703775,19.4786686 0.593672225,20.3478166 L0.593687825,20.3477978 Z M7.00970783,2.15443778 C6.58978583,2.56459378 6.56048983,3.14076578 6.79486383,3.53139178 C7.02923983,3.89271978 7.48822383,4.12709578 8.13275383,3.96107978 C9.59759783,3.61928378 11.1210338,3.56068978 12.5468138,4.49818978 L11.9608758,5.95326778 C11.6190798,6.78334578 11.7948602,7.36928378 12.3319698,7.91615778 L14.6268898,10.2306178 C15.1151718,10.7188998 15.5253278,10.7384298 16.0917338,10.6407738 L17.1561878,10.4454614 L17.8202498,11.1192894 L17.7811874,11.6759294 C17.742125,12.1739754 17.869078,12.5548354 18.3573594,13.0333514 L19.1190774,13.7755394 C19.5975934,14.2540554 20.2128274,14.2833514 20.6815774,13.8146018 L23.5917374,10.8946818 C24.0604874,10.4259318 24.0409554,9.83022778 23.5624406,9.35171378 L22.7909566,8.58999578 C22.3124406,8.11147978 21.9413466,7.95522978 21.4628326,7.99429178 L20.8866606,8.04311998 L20.2421286,7.40835398 L20.4862686,6.28530798 C20.6132218,5.71890198 20.4569718,5.27944798 19.8710346,4.69351198 L17.6737746,2.50601198 C14.3339346,-0.814308021 9.90033463,-0.736168021 7.00971463,2.15444998 L7.00970783,2.15443778 Z M8.50384783,2.52553178 C10.9354878,0.748187779 14.2265078,1.05092178 16.4530678,3.27748578 L18.8847078,5.68958578 C19.1190838,5.92396178 19.1581458,6.10950778 19.0897858,6.45130378 L18.7675198,7.93567978 L20.2714258,9.42005578 L21.2577538,9.36146198 C21.5116598,9.35169636 21.5897858,9.3712276 21.7850978,9.56653998 L22.3612698,10.142712 L19.9198698,12.584112 L19.3436978,12.00794 C19.1483854,11.8126276 19.1190878,11.734502 19.1288538,11.47083 L19.1972132,10.494268 L17.7030732,9.00989198 L16.1796352,9.26379798 C15.8573692,9.33215738 15.7108852,9.30286038 15.4667452,9.06848558 L13.4647852,7.06652558 C13.2108792,6.83214958 13.1815812,6.66613558 13.337832,6.29504158 L14.216738,4.20520158 C12.654238,2.75012358 10.622978,2.12512158 8.59173803,2.72082558 C8.43548803,2.75988798 8.37689403,2.63293498 8.50384743,2.52551318 L8.50384783,2.52553178 Z"
+                        id="Shape"></path>
+                </g>
+                <text id="Exporting" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="1289" y="1953">Exporting</tspan>
+                </text>
+                <text id="Symbols-should-be-outlined-when-exporting-to-ensure-the" fill="#000000" fill-rule="nonzero"
+                    font-family="Helvetica" font-size="13" font-weight="normal">
+                    <tspan x="1289" y="1971">Symbols should be outlined when exporting to ensure the</tspan>
+                </text>
+                <text id="design-is-preserved-when-submitting-to-Xcode." fill="#000000" fill-rule="nonzero"
+                    font-family="Helvetica" font-size="13" font-weight="normal">
+                    <tspan x="1289" y="1989">design is preserved when submitting to Xcode.</tspan>
+                </text>
+                <text id="template-version" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="2952" y="1933">Template v.5.0</tspan>
+                </text>
+                <text id="Requires-Xcode-15-or-greater" fill="#000000" fill-rule="nonzero" font-family="Helvetica"
+                    font-size="13" font-weight="normal">
+                    <tspan x="2865" y="1951">Requires Xcode 15 or greater</tspan>
+                </text>
+                <text id="descriptive-name" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="2835" y="1969">Generated from double.checkmark</tspan>
+                </text>
+                <text id="Typeset-at-100.0-points" fill="#000000" fill-rule="nonzero" font-family="Helvetica"
+                    font-size="13" font-weight="normal">
+                    <tspan x="2901" y="1987">Typeset at 100.0 points</tspan>
+                </text>
+                <text id="Small" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="263" y="726">Small</tspan>
+                </text>
+                <text id="Medium" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="263" y="1156">Medium</tspan>
+                </text>
+                <text id="Large" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="263" y="1586">Large</tspan>
+                </text>
+            </g>
+            <g id="Guides" transform="translate(263, 600.785)">
+                <g id="H-reference" transform="translate(76.9937, 24.756)" fill="#27AAE1" fill-rule="nonzero">
+                    <path
+                        d="M0,70.459 L2.644096,70.459 L28.334446,3.3267 L29.036646,3.3267 L29.036646,0 L27.128946,0 L0,70.459 Z M10.694846,45.9791 L45.987846,45.9791 L45.237846,43.7305 L11.444846,43.7305 L10.694846,45.9791 Z M54.125946,70.459 L56.770046,70.459 L29.644546,0 L28.438946,0 L28.438946,3.3267 L54.125946,70.459 Z"
+                        id="Shape"></path>
+                </g>
+                <line x1="0" y1="95.215" x2="2773" y2="95.215" id="Baseline-S" stroke="#27AAE1" stroke-width="0.5">
+                </line>
+                <line x1="0" y1="24.756" x2="2773" y2="24.756" id="Capline-S" stroke="#27AAE1" stroke-width="0.5">
+                </line>
+                <g id="H-reference" transform="translate(76.9937, 454.756)" fill="#27AAE1" fill-rule="nonzero">
+                    <path
+                        d="M0,70.459 L2.644096,70.459 L28.334446,3.3267 L29.036646,3.3267 L29.036646,0 L27.128946,0 L0,70.459 Z M10.694846,45.9791 L45.987846,45.9791 L45.237846,43.7305 L11.444846,43.7305 L10.694846,45.9791 Z M54.125946,70.459 L56.770046,70.459 L29.644546,0 L28.438946,0 L28.438946,3.3267 L54.125946,70.459 Z"
+                        id="Shape"></path>
+                </g>
+                <line x1="0" y1="525.215" x2="2773" y2="525.215" id="Baseline-M" stroke="#27AAE1" stroke-width="0.5">
+                </line>
+                <line x1="0" y1="454.755" x2="2773" y2="454.755" id="Capline-M" stroke="#27AAE1" stroke-width="0.5">
+                </line>
+                <g id="H-reference" transform="translate(76.9937, 884.756)" fill="#27AAE1" fill-rule="nonzero">
+                    <path
+                        d="M0,70.459 L2.644096,70.459 L28.334446,3.3267 L29.036646,3.3267 L29.036646,0 L27.128946,0 L0,70.459 Z M10.694846,45.9791 L45.987846,45.9791 L45.237846,43.7305 L11.444846,43.7305 L10.694846,45.9791 Z M54.125946,70.459 L56.770046,70.459 L29.644546,0 L28.438946,0 L28.438946,3.3267 L54.125946,70.459 Z"
+                        id="Shape"></path>
+                </g>
+                <line x1="0" y1="955.215" x2="2773" y2="955.215" id="Baseline-L" stroke="#27AAE1" stroke-width="0.5">
+                </line>
+                <line x1="0" y1="884.755" x2="2773" y2="884.755" id="Capline-L" stroke="#27AAE1" stroke-width="0.5">
+                </line>
+                <line x1="256.625" y1="1.13686838e-13" x2="256.625" y2="119.336" id="left-margin-Ultralight-S"
+                    stroke="#00AEEF" stroke-width="0.5"></line>
+                <line x1="348.798" y1="1.13686838e-13" x2="348.798" y2="119.336" id="right-margin-Ultralight-S"
+                    stroke="#00AEEF" stroke-width="0.5"></line>
+                <line x1="1143.53" y1="1.13686838e-13" x2="1143.53" y2="119.336" id="left-margin-Regular-S"
+                    stroke="#00AEEF" stroke-width="0.5"></line>
+                <line x1="1257.15" y1="1.13686838e-13" x2="1257.15" y2="119.336" id="right-margin-Regular-S"
+                    stroke="#00AEEF" stroke-width="0.5"></line>
+                <line x1="2622.62" y1="1.13686838e-13" x2="2622.62" y2="119.336" id="left-margin-Black-S"
+                    stroke="#00AEEF" stroke-width="0.5"></line>
+                <line x1="2760.18" y1="1.13686838e-13" x2="2760.18" y2="119.336" id="right-margin-Black-S"
+                    stroke="#00AEEF" stroke-width="0.5"></line>
+            </g>
+            <g id="Symbols" transform="translate(529.3906, 625.2969)" stroke="#000000" stroke-width="0.5">
+                <g id="Black-S" transform="translate(2365.995, 0)">
+                    <path
+                        d="M67.46878,71.191381 C71.17968,71.191381 74.06058,69.873022 76.01368,66.99216 L111.07228,15.2343 C112.43948,13.2324 113.02538,11.1328 113.02538,9.2773 C113.02538,4.0039 108.82618,0 103.35738,0 C99.69528,0 97.30278,1.3183 95.05668,4.834 L67.32228,47.9492 L53.69918,32.6172 C51.79488,30.4687 49.54888,29.4433 46.52148,29.4433 C41.05278,29.4433 37,33.4472 37,38.7695 C37,41.2109 37.63478,43.1152 39.73438,45.459 L59.36328,67.67576 C61.51168,70.117162 64.14848,71.191381 67.46878,71.191381 Z"
+                        id="Path"></path>
+                    <path
+                        d="M9.52148,29.4433 C12.54888,29.4433 14.79488,30.4687 16.69918,32.6172 L30.32228,47.9492 L32.291,44.888 L44.484,58.915 L39.01368,66.99216 C37.1235832,69.780091 34.3645791,71.1046997 30.825305,71.1872572 L30.46878,71.191381 C27.14848,71.191381 24.51168,70.117162 22.36328,67.67576 L2.73438,45.459 C0.63478,43.1152 0,41.2109 0,38.7695 C0,33.4472 4.05278,29.4433 9.52148,29.4433 Z M66.35738,0 C71.82618,0 76.02538,4.0039 76.02538,9.2773 C76.02538,11.1328 75.43948,13.2324 74.07228,15.2343 L61.951,33.129 L49.252,18.52 L58.05668,4.834 C60.2386057,1.41874857 62.5586852,0.0771252245 66.0465687,0.00324899359 Z"
+                        id="Combined-Shape"></path>
+                </g>
+                <g id="Regular-S" transform="translate(886.905, 3.7109)">
+                    <path
+                        d="M55.87888,66.113294 C57.78318,66.113294 59.29688,65.28322 60.37108,63.62306 L95.96678,7.3242 C96.79688,6.0547 97.08988,5.0293 97.08988,4.0039 C97.08988,1.6113 95.52738,0 93.08598,0 C91.32818,0 90.35158,0.586 89.27738,2.2949 L55.68358,56.2012 L38.00778,32.3731 C36.88478,30.8594 35.81058,30.2246 34.19918,30.2246 C31.75778,30.2246 30,31.9336 30,34.375 C30,35.4004 30.43948,36.5234 31.26958,37.5977 L51.24028,63.5254 C52.60738,65.28322 53.97458,66.113294 55.87888,66.113294 Z"
+                        id="Path"></path>
+                    <path
+                        d="M4.19918,30.2246 C5.81058,30.2246 6.88478,30.8594 8.00778,32.3731 L25.68358,56.2012 L30.332,48.741 L35.554,55.426 L30.37108,63.62306 C29.3457073,65.2077582 27.919881,66.0361177 26.1361316,66.1081489 L25.87888,66.113294 C23.97458,66.113294 22.60738,65.28322 21.24028,63.5254 L1.26958,37.5977 C0.43948,36.5234 0,35.4004 0,34.375 C0,31.9336 1.75778,30.2246 4.19918,30.2246 Z M63.08598,0 C65.52738,0 67.08988,1.6113 67.08988,4.0039 C67.08988,5.0293 66.79688,6.0547 65.96678,7.3242 L48.893,34.328 L43.564,27.508 L59.27738,2.2949 C60.3068217,0.657204167 61.2466272,0.0507828125 62.8702602,0.00309092159 Z"
+                        id="Combined-Shape"></path>
+                </g>
+                <g id="Ultralight-S" transform="translate(0, 4.4375)">
+                    <path
+                        d="M36.79298,62.07178 C37.24418,62.07178 37.53178,61.87744 37.78868,61.53417 L76.33598,2.0112 C76.57578,1.6045 76.64168,1.3965 76.64168,1.1885 C76.64168,0.5215 76.12358,0 75.45318,0 C75.01228,0 74.71678,0.1772 74.50538,0.5693 L36.73398,58.97114 L18.24078,37.7768 C17.98048,37.3984 17.67828,37.2177 17.20218,37.2177 C16.48638,37.2177 16,37.7006 16,38.371 C16,38.6699 16.12159,38.9755 16.40678,39.2778 L35.65088,61.52733 C36.01908,61.96826 36.29638,62.07178 36.79298,62.07178 Z"
+                        id="Path"></path>
+                    <path
+                        d="M1.20218,37.2177 C1.67828,37.2177 1.98048,37.3984 2.24078,37.7768 L20.73398,58.97114 L23.078,55.345 L24.636,57.137 L21.78868,61.53417 C21.5603244,61.8392989 21.3077121,62.0267547 20.937503,62.0646445 L20.79298,62.07178 C20.29638,62.07178 20.01908,61.96826 19.65088,61.52733 L0.40678,39.2778 C0.12159,38.9755 0,38.6699 0,38.371 C0,37.7006 0.48638,37.2177 1.20218,37.2177 Z M59.45318,0 C60.12358,0 60.64168,0.5215 60.64168,1.1885 C60.64168,1.3965 60.57578,1.6045 60.33598,2.0112 L32.216,45.432 L30.652,43.634 L58.50538,0.5693 C58.6932911,0.220766667 58.9476516,0.0420308642 59.3115144,0.00661467764 Z"
+                        id="Combined-Shape"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
@@ -0,0 +1,12 @@
+{
+  "info": {
+    "author": "xcode",
+    "version": 1
+  },
+  "symbols": [
+    {
+      "filename": "checkmark.wide.svg",
+      "idiom": "universal"
+    }
+  ]
+}
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="3300px" height="2200px" viewBox="0 0 3300 2200" version="1.1" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>checkmark.wide</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="double.checkmark">
+            <g id="Notes">
+                <rect id="artboard" fill="#FFFFFF" fill-rule="nonzero" x="0" y="0" width="3300" height="2200"></rect>
+                <line x1="263" y1="292" x2="3036" y2="292" id="Path" stroke="#000000" stroke-width="0.5"></line>
+                <text id="Weight/Scale-Variations" fill="#000000" fill-rule="nonzero" font-family="Helvetica"
+                    font-size="13" font-weight="normal">
+                    <tspan x="263" y="322">Weight/Scale Variations</tspan>
+                </text>
+                <text id="Ultralight" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="533.711" y="322">Ultralight</tspan>
+                </text>
+                <text id="Thin" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="843.422" y="322">Thin</tspan>
+                </text>
+                <text id="Light" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="1138.63" y="322">Light</tspan>
+                </text>
+                <text id="Regular" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="1426.84" y="322">Regular</tspan>
+                </text>
+                <text id="Medium" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="1723.06" y="322">Medium</tspan>
+                </text>
+                <text id="Semibold" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="2015.77" y="322">Semibold</tspan>
+                </text>
+                <text id="Bold" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="2326.48" y="322">Bold</tspan>
+                </text>
+                <text id="Heavy" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="2618.19" y="322">Heavy</tspan>
+                </text>
+                <text id="Black" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="2917.4" y="322">Black</tspan>
+                </text>
+                <line x1="263" y1="1903" x2="3036" y2="1903" id="Path" stroke="#000000" stroke-width="0.5"></line>
+                <g id="Group" transform="translate(264.3672, 1918.0684)" fill="#000000" fill-rule="nonzero">
+                    <path
+                        d="M7.88088,15.76172 C12.18752,15.76172 15.7715,12.1875 15.7715,7.88086 C15.7715,3.57422 12.17774,0 7.8711,0 C3.57422,0 0,3.57422 0,7.88086 C0,12.1875 3.58398,15.76172 7.88086,15.76172 L7.88088,15.76172 Z M7.88088,14.277344 C4.33596,14.277344 1.50392,11.435544 1.50392,7.880864 C1.50392,4.326184 4.32618,1.484384 7.8711,1.484384 C11.42578,1.484384 14.27734,4.326184 14.27734,7.880864 C14.27734,11.435544 11.43554,14.277344 7.88086,14.277344 L7.88088,14.277344 Z M4.28712,7.880864 C4.28712,8.310552 4.589854,8.60352 5.039074,8.60352 L7.138674,8.60352 L7.138674,10.72266 C7.138674,11.162114 7.431642,11.464848 7.86133,11.464848 C8.310548,11.464848 8.603518,11.162114 8.603518,10.72266 L8.603518,8.60352 L10.722658,8.60352 C11.162112,8.60352 11.464846,8.310552 11.464846,7.880864 C11.464846,7.44141 11.162112,7.138676 10.722658,7.138676 L8.603518,7.138676 L8.603518,5.029296 C8.603518,4.580078 8.31055,4.277342 7.86133,4.277342 C7.431642,4.277342 7.138674,4.580076 7.138674,5.029296 L7.138674,7.138676 L5.039074,7.138676 C4.589856,7.138676 4.28712,7.44141 4.28712,7.880864 Z"
+                        id="Shape"></path>
+                </g>
+                <g id="Group" transform="translate(283.254, 1915.9883)" fill="#000000" fill-rule="nonzero">
+                    <path
+                        d="M9.96094,19.92188 C15.41016,19.92188 19.92188,15.4004 19.92188,9.96094 C19.92188,4.51172 15.4004,0 9.95118,0 C4.51172,0 0,4.51172 0,9.96094 C0,15.4004 4.52148,19.92188 9.96094,19.92188 Z M9.96094,18.261724 C5.35156,18.261724 1.66992,14.570324 1.66992,9.960944 C1.66992,5.351564 5.3418,1.660164 9.95116,1.660164 C14.56052,1.660164 18.2617,5.351564 18.2617,9.960944 C18.2617,14.570324 14.5703,18.261724 9.96092,18.261724 L9.96094,18.261724 Z M5.4297,9.960944 C5.4297,10.43946 5.761732,10.761726 6.259778,10.761726 L9.130878,10.761726 L9.130878,13.642586 C9.130878,14.130868 9.46291,14.472664 9.941424,14.472664 C10.4297,14.472664 10.771502,14.140632 10.771502,13.642586 L10.771502,10.761726 L13.652362,10.761726 C14.140644,10.761726 14.48244,10.43946 14.48244,9.960944 C14.48244,9.472662 14.140644,9.130866 13.652362,9.130866 L10.771502,9.130866 L10.771502,6.259766 C10.771502,5.76172 10.4297,5.419922 9.941424,5.419922 C9.462908,5.419922 9.130878,5.761718 9.130878,6.259766 L9.130878,9.130866 L6.259778,9.130866 C5.761732,9.130866 5.4297,9.472662 5.4297,9.960944 Z"
+                        id="Shape"></path>
+                </g>
+                <g id="Group" transform="translate(307.1798, 1913.2246)" fill="#000000" fill-rule="nonzero">
+                    <path
+                        d="M12.71486,25.43944 C19.67776,25.43944 25.43946,19.67772 25.43946,12.7246 C25.43946,5.7617 19.66798,0 12.70508,0 C5.75196,0 -1.42108547e-15,5.76172 -1.42108547e-15,12.7246 C-1.42108547e-15,19.67772 5.76172,25.43944 12.71484,25.43944 L12.71486,25.43944 Z M12.71486,23.623034 C6.6797,23.623034 1.82618,18.759754 1.82618,12.724594 C1.82618,6.679674 6.66994,1.826154 12.70508,1.826154 C18.75,1.826154 23.61328,6.679674 23.61328,12.724594 C23.61328,18.759754 18.75976,23.623034 12.71484,23.623034 L12.71486,23.623034 Z M6.94338,12.724594 C6.94338,13.242172 7.314474,13.6035 7.861348,13.6035 L11.806668,13.6035 L11.806668,17.55858 C11.806668,18.09569 12.177762,18.476548 12.69534,18.476548 C13.23245,18.476548 13.603544,18.105454 13.603544,17.55858 L13.603544,13.6035 L17.558624,13.6035 C18.095734,13.6035 18.476592,13.242172 18.476592,12.724594 C18.476592,12.177718 18.105498,11.806626 17.558624,11.806626 L13.603544,11.806626 L13.603544,7.861306 C13.603544,7.31443 13.23245,6.933572 12.69534,6.933572 C12.177762,6.933572 11.806668,7.314432 11.806668,7.861306 L11.806668,11.806626 L7.861348,11.806626 C7.314472,11.806626 6.94338,12.17772 6.94338,12.724594 Z"
+                        id="Shape"></path>
+                </g>
+                <text id="Design-Variations" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="263" y="1953">Design Variations</tspan>
+                </text>
+                <text id="Symbols-are-supported-in-up-to-nine-weights-and-three-scales." fill="#000000"
+                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
+                    <tspan x="263" y="1971">Symbols are supported in up to nine weights and three scales.</tspan>
+                </text>
+                <text id="For-optimal-layout-with-text-and-other-symbols,-vertically-align" fill="#000000"
+                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
+                    <tspan x="263" y="1989">For optimal layout with text and other symbols, vertically align</tspan>
+                </text>
+                <text id="symbols-with-the-adjacent-text." fill="#000000" fill-rule="nonzero" font-family="Helvetica"
+                    font-size="13" font-weight="normal">
+                    <tspan x="263" y="2007">symbols with the adjacent text.</tspan>
+                </text>
+                <line x1="776" y1="1919" x2="776" y2="1933" id="Path" stroke="#00AEEF" stroke-width="0.5"></line>
+                <g id="Group" transform="translate(778.4902, 1918.7324)" fill="#000000" fill-rule="nonzero">
+                    <path
+                        d="M0.8203116,14.423832 C1.3378896,14.423832 1.5917956,14.2285116 1.7773436,13.681636 L3.0371096,10.234376 L8.7988296,10.234376 L10.0585956,13.681636 C10.2441424,14.228512 10.4980496,14.423832 11.0058616,14.423832 C11.5234396,14.423832 11.8554716,14.111324 11.8554716,13.623042 C11.8554716,13.4570264 11.8261748,13.300776 11.7480498,13.095698 L7.1679698,0.898438 C6.9433598,0.302734 6.5429698,0 5.9179698,0 C5.3125018,0 4.9023458,0.292968 4.6875018,0.888672 L0.1074218,13.105472 C0.0292968,13.31055 -3.55271368e-16,13.4668 -3.55271368e-16,13.632816 C-3.55271368e-16,14.121098 0.3125,14.423832 0.820312,14.423832 L0.8203116,14.423832 Z M3.5156316,8.750004 L5.8886716,2.177744 L5.9374998,2.177744 L8.3105398,8.750004 L3.5156316,8.750004 Z"
+                        id="Shape"></path>
+                </g>
+                <line x1="792.836" y1="1919" x2="792.836" y2="1933" id="Path" stroke="#00AEEF" stroke-width="0.5">
+                </line>
+                <text id="Margins" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="776" y="1953">Margins</tspan>
+                </text>
+                <text id="Leading-and-trailing-margins-on-the-left-and-right-side-of-each-symbol" fill="#000000"
+                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
+                    <tspan x="776" y="1971">Leading and trailing margins on the left and right side of each symbol
+                    </tspan>
+                </text>
+                <text id="can-be-adjusted-by-modifying-the-x-location-of-the-margin-guidelines." fill="#000000"
+                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
+                    <tspan x="776" y="1989">can be adjusted by modifying the x-location of the margin guidelines.
+                    </tspan>
+                </text>
+                <text id="Modifications-are-automatically-applied-proportionally-to-all" fill="#000000"
+                    fill-rule="nonzero" font-family="Helvetica" font-size="13" font-weight="normal">
+                    <tspan x="776" y="2007">Modifications are automatically applied proportionally to all</tspan>
+                </text>
+                <text id="scales-and-weights." fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="776" y="2025">scales and weights.</tspan>
+                </text>
+                <g id="Group" transform="translate(1291.2481, 1914.5174)" fill="#000000" fill-rule="nonzero">
+                    <path
+                        d="M0.593687825,20.3477978 L2.29290583,22.0567818 C3.15228183,22.9259218 4.13860983,22.8673278 5.06634583,21.8419378 L15.7597058,10.0548378 L14.7929098,9.07827578 L4.17766983,20.7579558 C3.82610783,21.1583458 3.49407583,21.2560018 3.02532583,20.7872526 L1.85344983,19.6251426 C1.38469983,19.1661586 1.49212183,18.8243606 1.89251223,18.4630326 L13.3671122,7.66225258 L12.3905502,6.69545658 L0.798750225,17.5841366 C-0.187577775,18.5021046 -0.265703775,19.4786686 0.593672225,20.3478166 L0.593687825,20.3477978 Z M7.00970783,2.15443778 C6.58978583,2.56459378 6.56048983,3.14076578 6.79486383,3.53139178 C7.02923983,3.89271978 7.48822383,4.12709578 8.13275383,3.96107978 C9.59759783,3.61928378 11.1210338,3.56068978 12.5468138,4.49818978 L11.9608758,5.95326778 C11.6190798,6.78334578 11.7948602,7.36928378 12.3319698,7.91615778 L14.6268898,10.2306178 C15.1151718,10.7188998 15.5253278,10.7384298 16.0917338,10.6407738 L17.1561878,10.4454614 L17.8202498,11.1192894 L17.7811874,11.6759294 C17.742125,12.1739754 17.869078,12.5548354 18.3573594,13.0333514 L19.1190774,13.7755394 C19.5975934,14.2540554 20.2128274,14.2833514 20.6815774,13.8146018 L23.5917374,10.8946818 C24.0604874,10.4259318 24.0409554,9.83022778 23.5624406,9.35171378 L22.7909566,8.58999578 C22.3124406,8.11147978 21.9413466,7.95522978 21.4628326,7.99429178 L20.8866606,8.04311998 L20.2421286,7.40835398 L20.4862686,6.28530798 C20.6132218,5.71890198 20.4569718,5.27944798 19.8710346,4.69351198 L17.6737746,2.50601198 C14.3339346,-0.814308021 9.90033463,-0.736168021 7.00971463,2.15444998 L7.00970783,2.15443778 Z M8.50384783,2.52553178 C10.9354878,0.748187779 14.2265078,1.05092178 16.4530678,3.27748578 L18.8847078,5.68958578 C19.1190838,5.92396178 19.1581458,6.10950778 19.0897858,6.45130378 L18.7675198,7.93567978 L20.2714258,9.42005578 L21.2577538,9.36146198 C21.5116598,9.35169636 21.5897858,9.3712276 21.7850978,9.56653998 L22.3612698,10.142712 L19.9198698,12.584112 L19.3436978,12.00794 C19.1483854,11.8126276 19.1190878,11.734502 19.1288538,11.47083 L19.1972132,10.494268 L17.7030732,9.00989198 L16.1796352,9.26379798 C15.8573692,9.33215738 15.7108852,9.30286038 15.4667452,9.06848558 L13.4647852,7.06652558 C13.2108792,6.83214958 13.1815812,6.66613558 13.337832,6.29504158 L14.216738,4.20520158 C12.654238,2.75012358 10.622978,2.12512158 8.59173803,2.72082558 C8.43548803,2.75988798 8.37689403,2.63293498 8.50384743,2.52551318 L8.50384783,2.52553178 Z"
+                        id="Shape"></path>
+                </g>
+                <text id="Exporting" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="1289" y="1953">Exporting</tspan>
+                </text>
+                <text id="Symbols-should-be-outlined-when-exporting-to-ensure-the" fill="#000000" fill-rule="nonzero"
+                    font-family="Helvetica" font-size="13" font-weight="normal">
+                    <tspan x="1289" y="1971">Symbols should be outlined when exporting to ensure the</tspan>
+                </text>
+                <text id="design-is-preserved-when-submitting-to-Xcode." fill="#000000" fill-rule="nonzero"
+                    font-family="Helvetica" font-size="13" font-weight="normal">
+                    <tspan x="1289" y="1989">design is preserved when submitting to Xcode.</tspan>
+                </text>
+                <text id="template-version" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="2952" y="1933">Template v.5.0</tspan>
+                </text>
+                <text id="Requires-Xcode-15-or-greater" fill="#000000" fill-rule="nonzero" font-family="Helvetica"
+                    font-size="13" font-weight="normal">
+                    <tspan x="2865" y="1951">Requires Xcode 15 or greater</tspan>
+                </text>
+                <text id="descriptive-name" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="2835" y="1969">Generated from double.checkmark</tspan>
+                </text>
+                <text id="Typeset-at-100.0-points" fill="#000000" fill-rule="nonzero" font-family="Helvetica"
+                    font-size="13" font-weight="normal">
+                    <tspan x="2901" y="1987">Typeset at 100.0 points</tspan>
+                </text>
+                <text id="Small" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="263" y="726">Small</tspan>
+                </text>
+                <text id="Medium" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="263" y="1156">Medium</tspan>
+                </text>
+                <text id="Large" fill="#000000" fill-rule="nonzero" font-family="Helvetica" font-size="13"
+                    font-weight="normal">
+                    <tspan x="263" y="1586">Large</tspan>
+                </text>
+            </g>
+            <g id="Guides" transform="translate(263, 600.785)">
+                <g id="H-reference" transform="translate(76.9937, 24.756)" fill="#27AAE1" fill-rule="nonzero">
+                    <path
+                        d="M0,70.459 L2.644096,70.459 L28.334446,3.3267 L29.036646,3.3267 L29.036646,0 L27.128946,0 L0,70.459 Z M10.694846,45.9791 L45.987846,45.9791 L45.237846,43.7305 L11.444846,43.7305 L10.694846,45.9791 Z M54.125946,70.459 L56.770046,70.459 L29.644546,0 L28.438946,0 L28.438946,3.3267 L54.125946,70.459 Z"
+                        id="Shape"></path>
+                </g>
+                <line x1="0" y1="95.215" x2="2773" y2="95.215" id="Baseline-S" stroke="#27AAE1" stroke-width="0.5">
+                </line>
+                <line x1="0" y1="24.756" x2="2773" y2="24.756" id="Capline-S" stroke="#27AAE1" stroke-width="0.5">
+                </line>
+                <g id="H-reference" transform="translate(76.9937, 454.756)" fill="#27AAE1" fill-rule="nonzero">
+                    <path
+                        d="M0,70.459 L2.644096,70.459 L28.334446,3.3267 L29.036646,3.3267 L29.036646,0 L27.128946,0 L0,70.459 Z M10.694846,45.9791 L45.987846,45.9791 L45.237846,43.7305 L11.444846,43.7305 L10.694846,45.9791 Z M54.125946,70.459 L56.770046,70.459 L29.644546,0 L28.438946,0 L28.438946,3.3267 L54.125946,70.459 Z"
+                        id="Shape"></path>
+                </g>
+                <line x1="0" y1="525.215" x2="2773" y2="525.215" id="Baseline-M" stroke="#27AAE1" stroke-width="0.5">
+                </line>
+                <line x1="0" y1="454.755" x2="2773" y2="454.755" id="Capline-M" stroke="#27AAE1" stroke-width="0.5">
+                </line>
+                <g id="H-reference" transform="translate(76.9937, 884.756)" fill="#27AAE1" fill-rule="nonzero">
+                    <path
+                        d="M0,70.459 L2.644096,70.459 L28.334446,3.3267 L29.036646,3.3267 L29.036646,0 L27.128946,0 L0,70.459 Z M10.694846,45.9791 L45.987846,45.9791 L45.237846,43.7305 L11.444846,43.7305 L10.694846,45.9791 Z M54.125946,70.459 L56.770046,70.459 L29.644546,0 L28.438946,0 L28.438946,3.3267 L54.125946,70.459 Z"
+                        id="Shape"></path>
+                </g>
+                <line x1="0" y1="955.215" x2="2773" y2="955.215" id="Baseline-L" stroke="#27AAE1" stroke-width="0.5">
+                </line>
+                <line x1="0" y1="884.755" x2="2773" y2="884.755" id="Capline-L" stroke="#27AAE1" stroke-width="0.5">
+                </line>
+                <line x1="256.625" y1="1.13686838e-13" x2="256.625" y2="119.336" id="left-margin-Ultralight-S"
+                    stroke="#00AEEF" stroke-width="0.5"></line>
+                <line x1="348.798" y1="1.13686838e-13" x2="348.798" y2="119.336" id="right-margin-Ultralight-S"
+                    stroke="#00AEEF" stroke-width="0.5"></line>
+                <line x1="1143.53" y1="1.13686838e-13" x2="1143.53" y2="119.336" id="left-margin-Regular-S"
+                    stroke="#00AEEF" stroke-width="0.5"></line>
+                <line x1="1257.15" y1="1.13686838e-13" x2="1257.15" y2="119.336" id="right-margin-Regular-S"
+                    stroke="#00AEEF" stroke-width="0.5"></line>
+                <line x1="2622.62" y1="1.13686838e-13" x2="2622.62" y2="119.336" id="left-margin-Black-S"
+                    stroke="#00AEEF" stroke-width="0.5"></line>
+                <line x1="2760.18" y1="1.13686838e-13" x2="2760.18" y2="119.336" id="right-margin-Black-S"
+                    stroke="#00AEEF" stroke-width="0.5"></line>
+            </g>
+            <g id="Symbols" transform="translate(529.3906, 625.2969)" stroke="#000000" stroke-width="0.5">
+                <g id="Black-S" transform="translate(2365.995, 0)">
+                    <path
+                        d="M30.46878,71.191381 C34.17968,71.191381 37.06058,69.873022 39.01368,66.99216 L74.07228,15.2343 C75.43948,13.2324 76.02538,11.1328 76.02538,9.2773 C76.02538,4.0039 71.82618,0 66.35738,0 C62.69528,0 60.30278,1.3183 58.05668,4.834 L30.32228,47.9492 L16.69918,32.6172 C14.79488,30.4687 12.54888,29.4433 9.52148,29.4433 C4.05278,29.4433 0,33.4472 0,38.7695 C0,41.2109 0.63478,43.1152 2.73438,45.459 L22.36328,67.67576 C24.51168,70.117162 27.14848,71.191381 30.46878,71.191381 Z"
+                        id="Path"></path>
+                </g>
+                <g id="Regular-S" transform="translate(886.905, 3.7109)">
+                    <path
+                        d="M25.87888,66.113294 C27.78318,66.113294 29.29688,65.28322 30.37108,63.62306 L65.96678,7.3242 C66.79688,6.0547 67.08988,5.0293 67.08988,4.0039 C67.08988,1.6113 65.52738,0 63.08598,0 C61.32818,0 60.35158,0.586 59.27738,2.2949 L25.68358,56.2012 L8.00778,32.3731 C6.88478,30.8594 5.81058,30.2246 4.19918,30.2246 C1.75778,30.2246 0,31.9336 0,34.375 C0,35.4004 0.43948,36.5234 1.26958,37.5977 L21.24028,63.5254 C22.60738,65.28322 23.97458,66.113294 25.87888,66.113294 Z"
+                        id="Path"></path>
+                </g>
+                <g id="Ultralight-S" transform="translate(0, 4.4375)">
+                    <path
+                        d="M20.79298,62.07178 C21.24418,62.07178 21.53178,61.87744 21.78868,61.53417 L60.33598,2.0112 C60.57578,1.6045 60.64168,1.3965 60.64168,1.1885 C60.64168,0.5215 60.12358,0 59.45318,0 C59.01228,0 58.71678,0.1772 58.50538,0.5693 L20.73398,58.97114 L2.24078,37.7768 C1.98048,37.3984 1.67828,37.2177 1.20218,37.2177 C0.48638,37.2177 0,37.7006 0,38.371 C0,38.6699 0.12159,38.9755 0.40678,39.2778 L19.65088,61.52733 C20.01908,61.96826 20.29638,62.07178 20.79298,62.07178 Z"
+                        id="Path"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
@@ -61,7 +61,7 @@ class ItemsModel: ObservableObject {

    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)
    }
@@ -123,6 +123,14 @@ class NetworkModel: ObservableObject {
    }
 }

+/// ChatItemWithMenu can depend on previous or next item for it's appearance
+/// This dummy model is used to force an update of all chat items,
+/// when they might have changed appearance.
+class ChatItemDummyModel: ObservableObject {
+    static let shared = ChatItemDummyModel()
+    func sendUpdate() { objectWillChange.send() }
+}
+
 final class ChatModel: ObservableObject {
    @Published var onboardingStage: OnboardingStage?
    @Published var setDeliveryReceipts = false
@@ -183,7 +191,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> = [:]
@@ -428,19 +435,17 @@ final class ChatModel: ObservableObject {

    private func _upsertChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) -> Bool {
        if let i = getChatItemIndex(cItem) {
-            withConditionalAnimation {
-                _updateChatItem(at: i, with: cItem)
-            }
+            _updateChatItem(at: i, with: cItem)
+            ChatItemDummyModel.shared.sendUpdate()
            return false
        } else {
-            withConditionalAnimation(itemAnimation()) {
-                var ci = cItem
-                if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
-                    ci.meta.itemStatus = status
-                }
-                im.reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
-                im.itemAdded = true
+            var ci = cItem
+            if let status = chatItemStatuses.removeValue(forKey: ci.id), case .sndNew = ci.meta.itemStatus {
+                ci.meta.itemStatus = status
            }
+            im.reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
+            im.itemAdded = true
+            ChatItemDummyModel.shared.sendUpdate()
            return true
        }

@@ -557,6 +562,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
@@ -573,6 +579,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) {
@@ -591,6 +603,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)
                    }
                }
            }
@@ -620,19 +633,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()
@@ -658,9 +667,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()
        }
    }
@@ -882,35 +892,6 @@ final class ChatModel: ObservableObject {
            _ = upsertGroupMember(groupInfo, updatedMember)
        }
    }
-
-    func unreadChatItemCounts(itemsInView: Set<String>) -> UnreadChatItemCounts {
-        var i = 0
-        var totalBelow = 0
-        var unreadBelow = 0
-        while i < im.reversedChatItems.count - 1 && !itemsInView.contains(im.reversedChatItems[i].viewId) {
-            totalBelow += 1
-            if im.reversedChatItems[i].isRcvNew {
-                unreadBelow += 1
-            }
-            i += 1
-        }
-        return UnreadChatItemCounts(
-            // TODO these thresholds account for the fact that items are still "visible" while
-            // covered by compose area, they should be replaced with the actual height in pixels below the screen.
-            isNearBottom: totalBelow < 15,
-            isReallyNearBottom: totalBelow < 2,
-            unreadBelow: unreadBelow
-        )
-    }
-
-    func topItemInView(itemsInView: Set<String>) -> ChatItem? {
-        let maxIx = im.reversedChatItems.count - 1
-        var i = 0
-        let inView = { itemsInView.contains(self.im.reversedChatItems[$0].viewId) }
-        while i < maxIx && !inView(i) { i += 1 }
-        while i < maxIx && inView(i) { i += 1 }
-        return im.reversedChatItems[min(i - 1, maxIx)]
-    }
 }

 struct ShowingInvitation {
@@ -923,12 +904,6 @@ struct NTFContactRequest {
    var chatId: String
 }

-struct UnreadChatItemCounts: Equatable {
-    var isNearBottom: Bool
-    var isReallyNearBottom: Bool
-    var unreadBelow: Int
-}
-
 final class Chat: ObservableObject, Identifiable, ChatLike {
    @Published var chatInfo: ChatInfo
    @Published var chatItems: [ChatItem]
@@ -357,17 +357,23 @@ func apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64) async throws -
    throw r
 }

-func apiForwardChatItem(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemId: Int64, ttl: Int?) async -> ChatItem? {
-    let cmd: ChatCommand = .apiForwardChatItem(toChatType: toChatType, toChatId: toChatId, fromChatType: fromChatType, fromChatId: fromChatId, itemId: itemId, ttl: ttl)
+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)
 }

-func apiSendMessage(type: ChatType, id: Int64, file: CryptoFile?, quotedItemId: Int64?, msg: MsgContent, live: Bool = false, ttl: Int? = nil) async -> ChatItem? {
-    let cmd: ChatCommand = .apiSendMessage(type: type, id: id, file: file, quotedItemId: quotedItemId, msg: msg, live: live, ttl: ttl)
+func apiSendMessages(type: ChatType, id: Int64, live: Bool = false, ttl: Int? = nil, composedMessages: [ComposedMessage]) async -> [ChatItem]? {
+    let cmd: ChatCommand = .apiSendMessages(type: type, id: id, live: live, ttl: ttl, composedMessages: composedMessages)
    return await processSendMessageCmd(toChatType: type, cmd: cmd)
 }

-private func processSendMessageCmd(toChatType: ChatType, cmd: ChatCommand) async -> ChatItem? {
+private func processSendMessageCmd(toChatType: ChatType, cmd: ChatCommand) async -> [ChatItem]? {
    let chatModel = ChatModel.shared
    let r: ChatResponse
    if toChatType == .direct {
@@ -380,10 +386,13 @@ private func processSendMessageCmd(toChatType: ChatType, cmd: ChatCommand) async
            }
        })
        r = await chatSendCmd(cmd, bgTask: false)
-        if case let .newChatItem(_, aChatItem) = r {
-            cItem = aChatItem.chatItem
-            chatModel.messageDelivery[aChatItem.chatItem.id] = endTask
-            return cItem
+        if case let .newChatItems(_, aChatItems) = r {
+            let cItems = aChatItems.map { $0.chatItem }
+            if let cItemLast = cItems.last {
+                cItem = cItemLast
+                chatModel.messageDelivery[cItemLast.id] = endTask
+            }
+            return cItems
        }
        if let networkErrorAlert = networkErrorAlert(r) {
            AlertManager.shared.showAlert(networkErrorAlert)
@@ -394,18 +403,18 @@ private func processSendMessageCmd(toChatType: ChatType, cmd: ChatCommand) async
        return nil
    } else {
        r = await chatSendCmd(cmd, bgDelay: msgDelay)
-        if case let .newChatItem(_, aChatItem) = r {
-            return aChatItem.chatItem
+        if case let .newChatItems(_, aChatItems) = r {
+            return aChatItems.map { $0.chatItem }
        }
        sendMessageErrorAlert(r)
        return nil
    }
 }

-func apiCreateChatItem(noteFolderId: Int64, file: CryptoFile?, msg: MsgContent) async -> ChatItem? {
-    let r = await chatSendCmd(.apiCreateChatItem(noteFolderId: noteFolderId, file: file, msg: msg))
-    if case let .newChatItem(_, aChatItem) = r { return aChatItem.chatItem }
-    createChatItemErrorAlert(r)
+func apiCreateChatItems(noteFolderId: Int64, composedMessages: [ComposedMessage]) async -> [ChatItem]? {
+    let r = await chatSendCmd(.apiCreateChatItems(noteFolderId: noteFolderId, composedMessages: composedMessages))
+    if case let .newChatItems(_, aChatItems) = r { return aChatItems.map { $0.chatItem } }
+    createChatItemsErrorAlert(r)
    return nil
 }

@@ -417,8 +426,8 @@ private func sendMessageErrorAlert(_ r: ChatResponse) {
    )
 }

-private func createChatItemErrorAlert(_ r: ChatResponse) {
-    logger.error("apiCreateChatItem error: \(String(describing: r))")
+private func createChatItemsErrorAlert(_ r: ChatResponse) {
+    logger.error("apiCreateChatItems error: \(String(describing: r))")
    AlertManager.shared.showAlertMsg(
        title: "Error creating message",
        message: "Error: \(responseError(r))"
@@ -673,6 +682,13 @@ func apiSetConnectionIncognito(connId: Int64, incognito: Bool) async throws -> P
    throw r
 }

+func apiChangeConnectionUser(connId: Int64, userId: Int64) async throws -> PendingContactConnection? {
+    let r = await chatSendCmd(.apiChangeConnectionUser(connId: connId, userId: userId))
+    
+    if case let .connectionUserChanged(_, _, toConnection, _) = r {return toConnection}
+    throw r
+}
+
 func apiConnectPlan(connReq: String) async throws -> ConnectionPlan {
    let userId = try currentUserId("apiConnectPlan")
    let r = await chatSendCmd(.apiConnectPlan(userId: userId, connReq: connReq))
@@ -990,6 +1006,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))
 }
@@ -1025,77 +1045,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: (
+                        NSLocalizedString("Without Tor or VPN, your IP address will be visible to these XFTP relays: \(srvs).", comment: "alert message") +
+                        (otherErrsStr != "" ? "\n\n" + NSLocalizedString("Other file errors:\n\(otherErrsStr)", comment: "alert message") : "")
+                    ),
+                    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: NSLocalizedString("File errors:\n\(otherErrsStr)", comment: "alert message")
                )
            }
        }
    }
-    return nil
 }

 func cancelFile(user: User, fileId: Int64) async {
@@ -1277,11 +1342,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))")
    }
 }

@@ -1775,36 +1852,45 @@ func processReceivedMsg(_ res: ChatResponse) async {
                n.networkStatuses = ns
            }
        }
-    case let .newChatItem(user, aChatItem):
-        let cInfo = aChatItem.chatInfo
-        let cItem = aChatItem.chatItem
-        await MainActor.run {
-            if active(user) {
-                m.addChatItem(cInfo, cItem)
-            } else if cItem.isRcvNew && cInfo.ntfsEnabled {
-                m.increaseUnreadCounter(user: user)
+    case let .newChatItems(user, chatItems):
+        for chatItem in chatItems {
+            let cInfo = chatItem.chatInfo
+            let cItem = chatItem.chatItem
+            await MainActor.run {
+                if active(user) {
+                    m.addChatItem(cInfo, cItem)
+                } else if cItem.isRcvNew && cInfo.ntfsEnabled {
+                    m.increaseUnreadCounter(user: user)
+                }
+            }
+            if let file = cItem.autoReceiveFile() {
+                Task {
+                    await receiveFile(user: user, fileId: file.fileId, auto: true)
+                }
+            }
+            if cItem.showNotification {
+                NtfManager.shared.notifyMessageReceived(user, cInfo, cItem)
            }
        }
-        if let file = cItem.autoReceiveFile() {
-            Task {
-                await receiveFile(user: user, fileId: file.fileId, auto: true)
+    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 cItem.showNotification {
-            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 .sndSent: endTask()
-            case .sndErrorAuth: endTask()
-            case .sndError: endTask()
-            default: ()
+            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):
@@ -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
@@ -214,10 +214,12 @@ 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
            }
@@ -38,6 +38,7 @@ struct IncomingCallView: View {
            }
            HStack {
                ProfilePreview(profileOf: invitation.contact, color: .white)
+                    .padding(.vertical, 6)
                Spacer()

                callButton("Reject", "phone.down.fill", .red) {
@@ -12,6 +12,7 @@ import SimpleXChat
 struct CIGroupInvitationView: View {
    @EnvironmentObject var chatModel: ChatModel
    @EnvironmentObject var theme: AppTheme
+    @Environment(\.showTimestamp) var showTimestamp: Bool
    @ObservedObject var chat: Chat
    var chatItem: ChatItem
    var groupInvitation: CIGroupInvitation
@@ -45,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)
+                                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, colorMode: .transparent, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
                            )
                            .overlay(DetermineWidth())
                        }
@@ -53,7 +54,7 @@ struct CIGroupInvitationView: View {
                        (
                            groupInvitationText()
                            + Text("   ")
-                            + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy)
+                            + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, colorMode: .transparent, showStatus: false, showEdited: false, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
                        )
                        .overlay(DetermineWidth())
                    }
@@ -69,7 +70,7 @@ struct CIGroupInvitationView: View {
        }
        .padding(.horizontal, 12)
        .padding(.vertical, 6)
-        .background(chatItemFrameColor(chatItem, theme))
+        .background { chatItemFrameColor(chatItem, theme).modifier(ChatTailPadding()) }
        .textSelection(.disabled)
        .onPreferenceChange(DetermineWidth.Key.self) { frameWidth = $0 }
        .onChange(of: inProgress) { inProgress in
@@ -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()
@@ -12,11 +12,13 @@ import SimpleXChat
 struct CIMetaView: View {
    @ObservedObject var chat: Chat
    @EnvironmentObject var theme: AppTheme
+    @Environment(\.showTimestamp) var showTimestamp: Bool
    var chatItem: ChatItem
    var metaColor: Color
    var paleMetaColor = Color(UIColor.tertiaryLabel)
    var showStatus = true
    var showEdited = true
+    var invertedMaterial = false

    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false

@@ -24,93 +26,138 @@ struct CIMetaView: View {
        if chatItem.isDeletedContent {
            chatItem.timestampText.font(.caption).foregroundColor(metaColor)
        } else {
-            let meta = chatItem.meta
-            let ttl = chat.chatInfo.timedMessagesTTL
-            let encrypted = chatItem.encryptedFile
-            switch meta.itemStatus {
-            case let .sndSent(sndProgress):
-                switch sndProgress {
-                case .complete: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted,  color: metaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
-                case .partial: ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .sent, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
+            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
+                    )
                }
-            case let .sndRcvd(_, sndProgress):
-                switch sndProgress {
-                case .complete:
-                    ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
-                    }
-                case .partial:
-                    ZStack {
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd1, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
-                        ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: paleMetaColor, sent: .rcvd2, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
-                    }
-                }
-            default:
-                ciMetaText(meta, chatTTL: ttl, encrypted: encrypted, color: metaColor, showStatus: showStatus, showEdited: showEdited, showViaProxy: showSentViaProxy)
            }
        }
    }
 }

-enum SentCheckmark {
-    case sent
-    case rcvd1
-    case rcvd2
+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
+        }
+    }
+
+    var statusSpacer: Text {
+        switch self {
+        case .normal, .transparent: Text(Image(systemName: "circlebadge.fill")).foregroundColor(.clear)
+        case .invertedMaterial: Text(" ").kerning(13)
+        }
+    }
 }

 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,
-    sent: SentCheckmark? = nil,
+    colorMode: MetaColorMode = .normal,
+    onlyOverrides: Bool = false, // only render colors that differ from base
    showStatus: Bool = true,
    showEdited: Bool = true,
-    showViaProxy: Bool
+    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 (icon, statusColor) = meta.statusIcon(color, primaryColor) {
-            let t = Text(Image(systemName: icon)).font(.caption2)
-            let gap = Text("  ").kerning(-1.25)
-            let t1 = t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67))
-            switch sent {
-            case nil: r = r + t1
-            case .sent: r = r + t1 + gap
-            case .rcvd1: r = r + t.foregroundColor(transparent ? .clear : statusColor.opacity(0.67)) + gap
-            case .rcvd2: r = r + gap + t1
+        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 + Text(" ")
+            r = r + colored(Text(image), metaColor)
+            space = Text(" ")
        } else if !meta.disappearing {
-            r = r + statusIconText("circlebadge.fill", .clear) + Text(" ")
+            space = colorMode.statusSpacer + 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 {
+        appendSpace()
+        r = r + colored(meta.timestampText, resolved)
    }
-    r = r + meta.timestampText.foregroundColor(color)
    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 {
@@ -15,6 +15,7 @@ struct CIRcvDecryptionError: View {
    @EnvironmentObject var m: ChatModel
    @EnvironmentObject var theme: AppTheme
    @ObservedObject var chat: Chat
+    @Environment(\.showTimestamp) var showTimestamp: Bool
    var msgDecryptError: MsgDecryptError
    var msgCount: UInt32
    var chatItem: ChatItem
@@ -68,37 +69,40 @@ struct CIRcvDecryptionError: View {
    }

    @ViewBuilder private func viewBody() -> some View {
-        if case let .direct(contact) = chat.chatInfo,
-           let contactStats = contact.activeConn?.connectionStats {
-            if contactStats.ratchetSyncAllowed {
-                decryptionErrorItemFixButton(syncSupported: true) {
-                    alert = .syncAllowedAlert { syncContactConnection(contact) }
+        Group {
+            if case let .direct(contact) = chat.chatInfo,
+               let contactStats = contact.activeConn?.connectionStats {
+                if contactStats.ratchetSyncAllowed {
+                    decryptionErrorItemFixButton(syncSupported: true) {
+                        alert = .syncAllowedAlert { syncContactConnection(contact) }
+                    }
+                } else if !contactStats.ratchetSyncSupported {
+                    decryptionErrorItemFixButton(syncSupported: false) {
+                        alert = .syncNotSupportedContactAlert
+                    }
+                } else {
+                    basicDecryptionErrorItem()
                }
-            } else if !contactStats.ratchetSyncSupported {
-                decryptionErrorItemFixButton(syncSupported: false) {
-                    alert = .syncNotSupportedContactAlert
+            } else if case let .group(groupInfo) = chat.chatInfo,
+                      case let .groupRcv(groupMember) = chatItem.chatDir,
+                      let mem = m.getGroupMember(groupMember.groupMemberId),
+                      let memberStats = mem.wrapped.activeConn?.connectionStats {
+                if memberStats.ratchetSyncAllowed {
+                    decryptionErrorItemFixButton(syncSupported: true) {
+                        alert = .syncAllowedAlert { syncMemberConnection(groupInfo, groupMember) }
+                    }
+                } else if !memberStats.ratchetSyncSupported {
+                    decryptionErrorItemFixButton(syncSupported: false) {
+                        alert = .syncNotSupportedMemberAlert
+                    }
+                } else {
+                    basicDecryptionErrorItem()
                }
            } else {
                basicDecryptionErrorItem()
            }
-        } else if case let .group(groupInfo) = chat.chatInfo,
-                  case let .groupRcv(groupMember) = chatItem.chatDir,
-                  let mem = m.getGroupMember(groupMember.groupMemberId),
-                  let memberStats = mem.wrapped.activeConn?.connectionStats {
-            if memberStats.ratchetSyncAllowed {
-                decryptionErrorItemFixButton(syncSupported: true) {
-                    alert = .syncAllowedAlert { syncMemberConnection(groupInfo, groupMember) }
-                }
-            } else if !memberStats.ratchetSyncSupported {
-                decryptionErrorItemFixButton(syncSupported: false) {
-                    alert = .syncNotSupportedMemberAlert
-                }
-            } else {
-                basicDecryptionErrorItem()
-            }
-        } else {
-            basicDecryptionErrorItem()
        }
+        .background { chatItemFrameColor(chatItem, theme).modifier(ChatTailPadding()) }
    }

    private func basicDecryptionErrorItem() -> some View {
@@ -122,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)
+                    + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, colorMode: .transparent, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
                )
            }
            .padding(.horizontal, 12)
@@ -131,7 +135,6 @@ struct CIRcvDecryptionError: View {
        }
        .onTapGesture(perform: { onClick() })
        .padding(.vertical, 6)
-        .background(Color(uiColor: .tertiarySystemGroupedBackground))
        .textSelection(.disabled)
    }

@@ -142,7 +145,7 @@ struct CIRcvDecryptionError: View {
                    .foregroundColor(.red)
                    .italic()
                + Text("   ")
-                + ciMetaText(chatItem.meta, chatTTL: nil, encrypted: nil, transparent: true, showViaProxy: showSentViaProxy)
+                + 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)
@@ -150,7 +153,6 @@ struct CIRcvDecryptionError: View {
        }
        .onTapGesture(perform: { onClick() })
        .padding(.vertical, 6)
-        .background(Color(uiColor: .tertiarySystemGroupedBackground))
        .textSelection(.disabled)
    }

@@ -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)
@@ -12,7 +12,7 @@ import SimpleXChat
 struct FramedItemView: View {
    @EnvironmentObject var m: ChatModel
    @EnvironmentObject var theme: AppTheme
-    @EnvironmentObject var scrollModel: ReverseListScrollModel<ChatItem>
+    @EnvironmentObject var scrollModel: ReverseListScrollModel
    @ObservedObject var chat: Chat
    var chatItem: ChatItem
    var preview: UIImage?
@@ -64,15 +64,20 @@ struct FramedItemView: View {
                    .overlay(DetermineWidth())
            }

-            if chatItem.content.msgContent != nil {
-                CIMetaView(chat: chat, chatItem: chatItem, metaColor: useWhiteMetaColor ? Color.white : theme.colors.secondary)
-                    .padding(.horizontal, 12)
-                    .padding(.bottom, 6)
-                    .overlay(DetermineWidth())
-                    .accessibilityLabel("")
+            if let content = chatItem.content.msgContent {
+                CIMetaView(
+                    chat: chat,
+                    chatItem: chatItem,
+                    metaColor: theme.colors.secondary,
+                    invertedMaterial: useWhiteMetaColor
+                )
+                .padding(.horizontal, 12)
+                .padding(.bottom, 6)
+                .overlay(DetermineWidth())
+                .accessibilityLabel("")
            }
-        }
-            .background(chatItemFrameColorMaybeImageOrVideo(chatItem, theme))
+        }   
+            .background { chatItemFrameColorMaybeImageOrVideo(chatItem, theme).modifier(ChatTailPadding()) }
            .onPreferenceChange(DetermineWidth.Key.self) { msgWidth = $0 }

        if let (title, text) = chatItem.meta.itemStatus.statusInfo {
@@ -185,7 +190,7 @@ struct FramedItemView: View {
        let v = ZStack(alignment: .topTrailing) {
            switch (qi.content) {
            case let .image(_, image):
-                if let uiImage = UIImage(base64Encoded: image) {
+                if let uiImage = imageFromBase64(image) {
                    ciQuotedMsgView(qi)
                        .padding(.trailing, 70).frame(minWidth: msgWidth, alignment: .leading)
                    Image(uiImage: uiImage)
@@ -197,7 +202,7 @@ struct FramedItemView: View {
                    ciQuotedMsgView(qi)
                }
            case let .video(_, image, _):
-                if let uiImage = UIImage(base64Encoded: image) {
+                if let uiImage = imageFromBase64(image) {
                    ciQuotedMsgView(qi)
                    .padding(.trailing, 70).frame(minWidth: msgWidth, alignment: .leading)
                    Image(uiImage: uiImage)
@@ -13,7 +13,7 @@ import AVKit

 struct FullScreenMediaView: View {
    @EnvironmentObject var m: ChatModel
-    @EnvironmentObject var scrollModel: ReverseListScrollModel<ChatItem>
+    @EnvironmentObject var scrollModel: ReverseListScrollModel
    @State var chatItem: ChatItem
    @State var image: UIImage?
    @State var player: AVPlayer? = nil
@@ -69,7 +69,7 @@ struct CIMsgError: View {
        }
        .padding(.leading, 12)
        .padding(.vertical, 6)
-        .background(Color(uiColor: .tertiarySystemGroupedBackground))
+        .background { chatItemFrameColor(chatItem, theme).modifier(ChatTailPadding()) }
        .textSelection(.disabled)
        .onTapGesture(perform: onTap)
    }
@@ -22,7 +22,7 @@ struct MarkedDeletedItemView: View {
        .foregroundColor(theme.colors.secondary)
        .padding(.horizontal, 12)
        .padding(.vertical, 6)
-        .background(chatItemFrameColor(chatItem, theme))
+        .background { chatItemFrameColor(chatItem, theme).modifier(ChatTailPadding()) }
        .textSelection(.disabled)
    }

@@ -26,6 +26,7 @@ private func typing(_ w: Font.Weight = .light) -> Text {

 struct MsgContentView: View {
    @ObservedObject var chat: Chat
+    @Environment(\.showTimestamp) var showTimestamp: Bool
    @EnvironmentObject var theme: AppTheme
    var text: String
    var formattedText: [FormattedText]? = nil
@@ -84,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)
+        (rightToLeft ? Text("\n") : Text("   ")) + ciMetaText(mt, chatTTL: chat.chatInfo.timedMessagesTTL, encrypted: nil, colorMode: .transparent, showViaProxy: showSentViaProxy, showTimesamp: showTimestamp)
    }
 }

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

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

@@ -73,11 +73,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 +96,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 +126,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())
@@ -450,20 +450,8 @@ struct ChatItemInfoView: View {
                    .foregroundColor(theme.colors.secondary).opacity(0.67)
            }
            let v = Group {
-                let (icon, statusColor) = status.statusIcon(theme.colors.secondary, theme.colors.primary)
-                switch status {
-                case .rcvd:
-                    ZStack(alignment: .trailing) {
-                        Image(systemName: icon)
-                            .foregroundColor(statusColor.opacity(0.67))
-                            .padding(.trailing, 6)
-                        Image(systemName: icon)
-                            .foregroundColor(statusColor.opacity(0.67))
-                    }
-                default:
-                    Image(systemName: icon)
-                        .foregroundColor(statusColor)
-                }
+                let (image, statusColor) = status.statusIcon(theme.colors.secondary, theme.colors.primary)
+                image.foregroundColor(statusColor)
            }

            if let (title, text) = status.statusInfo {
@@ -9,9 +9,21 @@
 import SwiftUI
 import SimpleXChat

+extension EnvironmentValues {
+    struct ShowTimestamp: EnvironmentKey {
+        static let defaultValue: Bool = true
+    }
+
+    var showTimestamp: Bool {
+        get { self[ShowTimestamp.self] }
+        set { self[ShowTimestamp.self] = newValue }
+    }
+}
+
 struct ChatItemView: View {
    @ObservedObject var chat: Chat
    @EnvironmentObject var theme: AppTheme
+    @Environment(\.showTimestamp) var showTimestamp: Bool
    var chatItem: ChatItem
    var maxWidth: CGFloat = .infinity
    @Binding var revealed: Bool
@@ -60,7 +72,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
@@ -22,8 +22,7 @@ struct ChatView: View {
    @Environment(\.presentationMode) var presentationMode
    @Environment(\.scenePhase) var scenePhase
    @State @ObservedObject var chat: Chat
-    @StateObject private var scrollModel = ReverseListScrollModel<ChatItem>()
-    @StateObject private var floatingButtonModel = FloatingButtonModel()
+    @StateObject private var scrollModel = ReverseListScrollModel()
    @State private var showChatInfoSheet: Bool = false
    @State private var showAddMembersSheet: Bool = false
    @State private var composeState = ComposeState()
@@ -43,6 +42,7 @@ 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
@@ -76,7 +76,7 @@ struct ChatView: View {
            VStack(spacing: 0) {
                ZStack(alignment: .bottomTrailing) {
                    chatItemsList()
-                    floatingButtons(counts: floatingButtonModel.unreadChatItemCounts)
+                    FloatingButtons(theme: theme, scrollModel: scrollModel, chat: chat)
                }
                connectingText()
                if selectedChatItems == nil {
@@ -99,7 +99,8 @@ struct ChatView: View {
                            if case let .group(groupInfo) = chat.chatInfo {
                                showModerateSelectedMessagesAlert(groupInfo)
                            }
-                        }
+                        },
+                        forwardItems: forwardSelectedMessages
                    )
                }
            }
@@ -136,6 +137,22 @@ struct ChatView: View {
                }
            }
        }
+        .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()
@@ -340,6 +357,7 @@ struct ChatView: View {
                await markChatUnread(chat, unreadChat: false)
            }
        }
+        ChatView.FloatingButtonModel.shared.totalUnread = chat.chatStats.unreadCount
    }

    private func searchToolbar() -> some View {
@@ -411,14 +429,9 @@ struct ChatView: View {
                    composeState: $composeState,
                    selectedMember: $selectedMember,
                    revealedChatItem: $revealedChatItem,
-                    selectedChatItems: $selectedChatItems
+                    selectedChatItems: $selectedChatItems,
+                    forwardedChatItems: $forwardedChatItems
                )
-                .onAppear {
-                    floatingButtonModel.appeared(viewId: ci.viewId)
-                }
-                .onDisappear {
-                    floatingButtonModel.disappeared(viewId: ci.viewId)
-                }
                .id(ci.id) // Required to trigger `onAppear` on iOS15
            } loadPage: {
                loadChatItems(cInfo)
@@ -429,13 +442,10 @@ struct ChatView: View {
            .onChange(of: searchText) { _ in
                Task { await loadChat(chat: chat, search: searchText) }
            }
-            .onChange(of: im.reversedChatItems) { _ in
-                floatingButtonModel.chatItemsChanged()
-            }
            .onChange(of: im.itemAdded) { added in
                if added {
                    im.itemAdded = false
-                    if floatingButtonModel.unreadChatItemCounts.isReallyNearBottom {
+                    if FloatingButtonModel.shared.isReallyNearBottom {
                        scrollModel.scrollToBottom()
                    }
                }
@@ -458,103 +468,165 @@ struct ChatView: View {
    }

    class FloatingButtonModel: ObservableObject {
-        private enum Event {
-            case appeared(String)
-            case disappeared(String)
-            case chatItemsChanged
-        }
+        static let shared = FloatingButtonModel()
+        @Published var unreadBelow: Int = 0
+        @Published var isNearBottom: Bool = true
+        @Published var date: Date?
+        @Published var isDateVisible: Bool = false
+        var totalUnread: Int = 0
+        var isReallyNearBottom: Bool = true
+        var hideDateWorkItem: DispatchWorkItem?

-        @Published var unreadChatItemCounts: UnreadChatItemCounts
-
-        private let events = PassthroughSubject<Event, Never>()
-        private var bag = Set<AnyCancellable>()
-
-        init() {
-            unreadChatItemCounts = UnreadChatItemCounts(
-                isNearBottom: true,
-                isReallyNearBottom: true,
-                unreadBelow: 0
-            )
-            events
-                .receive(on: DispatchQueue.global(qos: .background))
-                .scan(Set<String>()) { itemsInView, event in
-                    var updated = itemsInView
-                    switch event {
-                    case let .appeared(viewId): updated.insert(viewId)
-                    case let .disappeared(viewId): updated.remove(viewId)
-                    case .chatItemsChanged: ()
-                    }
-                    return updated
+        func updateOnListChange(_ listState: ListState) {
+            let im = ItemsModel.shared
+            let unreadBelow =
+                if let id = listState.bottomItemId,
+                   let index = im.reversedChatItems.firstIndex(where: { $0.id == id })
+                {
+                 im.reversedChatItems[..<index].reduce(into: 0) { unread, chatItem in
+                     if chatItem.isRcvNew { unread += 1 }
+                 }
+                } else {
+                    0
                }
-                .map { ChatModel.shared.unreadChatItemCounts(itemsInView: $0) }
-                .removeDuplicates()
-                .throttle(for: .seconds(0.2), scheduler: DispatchQueue.main, latest: true)
-                .assign(to: \.unreadChatItemCounts, on: self)
-                .store(in: &bag)
+            let date: Date? =
+                if let topItemDate = listState.topItemDate {
+                    Calendar.current.startOfDay(for: topItemDate)
+                } else {
+                    nil
+                }
+
+            // 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
+            }
+            
+            // 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 appeared(viewId: String) {
-            events.send(.appeared(viewId))
+        func resetDate() {
+            date = nil
+            isDateVisible = false
        }

-        func disappeared(viewId: String) {
-            events.send(.disappeared(viewId))
+        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 }
+            }
        }

-        func chatItemsChanged() {
-            events.send(.chatItemsChanged)
-        }
    }

-    private func floatingButtons(counts: UnreadChatItemCounts) -> some View {
-        VStack {
-            let unreadAbove = chat.chatStats.unreadCount - counts.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 counts.unreadBelow > 0 {
-                circleButton {
-                    unreadCountText(counts.unreadBelow)
-                        .font(.callout)
-                        .foregroundColor(theme.colors.primary)
-                }
-                .onTapGesture {
-                    scrollModel.scrollToBottom()
-                }
-            } else if !counts.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(.dateTime.day().month(.abbreviated))
+            ))
+            .font(.callout)
+            .fontWeight(.medium)
+            .foregroundStyle(.secondary)
        }
    }

@@ -648,6 +720,116 @@ struct ChatView: View {
        }
    }

+    private func forwardSelectedMessages() {
+        Task {
+            do {
+                if let selectedChatItems {
+                    let (validItems, confirmation) = try await apiPlanForwardChatItems(
+                        type: chat.chatInfo.chatType,
+                        id: chat.chatInfo.apiId,
+                        itemIds: Array(selectedChatItems)
+                    )
+                    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 {
+                        await openForwardingSheet(validItems)
+                    }
+                }
+            } 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) {
        Task {
            if loadingItems || firstPage { return }
@@ -696,6 +878,7 @@ struct ChatView: View {
        @EnvironmentObject var m: ChatModel
        @EnvironmentObject var theme: AppTheme
        @Binding @ObservedObject var chat: Chat
+        @ObservedObject var dummyModel: ChatItemDummyModel = .shared
        let chatItem: ChatItem
        let maxWidth: CGFloat
        @Binding var composeState: ComposeState
@@ -708,39 +891,67 @@ 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 showTranslationSheet: Bool = false
+        @State private var msgWidth: CGFloat = 0
+        
        @Binding var selectedChatItems: Set<Int64>?
+        @Binding var forwardedChatItems: [ChatItem]

        @State private var allowMenu: Bool = true
+        @State private var markedRead = false

        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 || 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 (timestamp: true, largeGap: true, date: nil)
+            }
+        }
+
        var body: some View {
-            let (currIndex, _) = m.getNextChatItem(chatItem)
+            let currIndex = m.getChatItemIndex(chatItem)
            let ciCategory = chatItem.mergeCategory
            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]))
-                    ForEach(items.reversed(), id: \.1.viewId) { (i, ci) in
-                        let prev = i == prevHidden ? prevItem : im.reversedChatItems[i + 1]
-                        chatItemView(ci, nil, prev)
-                        .overlay {
-                            if let selected = selectedChatItems, ci.canBeDeletedForSelf {
-                                Color.clear
-                                    .contentShape(Rectangle())
-                                    .onTapGesture {
-                                        let checked = selected.contains(ci.id)
-                                        selectUnselectChatItem(select: !checked, ci)
+                    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)
+                                            }
                                    }
-                            }
+                                }
                        }
                    }
                } else {
-                    chatItemView(chatItem, range, prevItem)
+                    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
@@ -754,12 +965,16 @@ struct ChatView: View {
                }
            }
            .onAppear {
+                if markedRead {
+                    return
+                } else {
+                    markedRead = true
+                }
                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  {
@@ -769,29 +984,75 @@ struct ChatView: View {
                }
            }
        }
-        
-        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) {
+            Task {
+                _ = try? await Task.sleep(nanoseconds: 600_000000)
                if m.chatId == chat.chatInfo.id {
-                    Task(operation: op)
+                    await op()
                }
            }
        }
+        

-        @ViewBuilder func chatItemView(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ prevItem: ChatItem?) -> some View {
+        @available(iOS 16.0, *)
+        struct MemberLayout: Layout {
+            let spacing: Double
+            let msgWidth: Double
+
+            private func sizes(subviews: Subviews, proposal: ProposedViewSize) -> (CGSize, CGSize) {
+                assert(subviews.count == 2, "member layout must contain exactly two subviews")
+                let roleSize = subviews[1].sizeThatFits(proposal)
+                let memberSize = subviews[0].sizeThatFits(
+                    ProposedViewSize(
+                        width: (proposal.width ?? msgWidth) - roleSize.width,
+                        height: proposal.height
+                    )
+                )
+                return (memberSize, roleSize)
+            }
+
+            func sizeThatFits(proposal: ProposedViewSize, subviews: Subviews, cache: inout Void) -> CGSize {
+                let (memberSize, roleSize) = sizes(subviews: subviews, proposal: proposal)
+                return CGSize(
+                    width: min(
+                        proposal.width ?? msgWidth,
+                        max(msgWidth, roleSize.width + spacing + memberSize.width)
+                    ),
+                    height: max(memberSize.height, roleSize.height)
+                )
+            }
+
+            func placeSubviews(in bounds: CGRect, proposal: ProposedViewSize, subviews: Subviews, cache: inout Void) {
+                let (memberSize, roleSize) = sizes(subviews: subviews, proposal: proposal)
+                subviews[0].place(
+                    at: CGPoint(x: bounds.minX, y: bounds.midY - memberSize.height / 2),
+                    proposal: ProposedViewSize(memberSize)
+                )
+                subviews[1].place(
+                    at: CGPoint(
+                        x: bounds.minX + max(memberSize.width + spacing, msgWidth - roleSize.width),
+                        y: bounds.midY - roleSize.height / 2
+                    ),
+                    proposal: ProposedViewSize(roleSize)
+                )
+            }
+        }
+
+        @ViewBuilder func chatItemView(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ prevItem: ChatItem?, _ itemSeparation: ItemSeparation) -> some View {
+            let bottomPadding: Double = itemSeparation.largeGap ? 10 : 2
            if case let .groupRcv(member) = ci.chatDir,
               case let .group(groupInfo) = chat.chatInfo {
                let (prevMember, memCount): (GroupMember?, Int) =
@@ -803,24 +1064,49 @@ struct ChatView: View {
                if prevItem == nil || showMemberImage(member, prevItem) || prevMember != nil {
                    VStack(alignment: .leading, spacing: 4) {
                        if ci.content.showMemberName {
-                            let t = if memCount == 1 && member.memberRole > .member {
-                                Text(member.memberRole.text + " ").fontWeight(.semibold) + Text(member.displayName)
-                            } else {
-                                Text(memberNames(member, prevMember, memCount))
+                            Group {
+                                if memCount == 1 && member.memberRole > .member {
+                                    Group {
+                                        if #available(iOS 16.0, *) {
+                                            MemberLayout(spacing: 16, msgWidth: msgWidth) {
+                                                Text(member.chatViewName)
+                                                    .lineLimit(1)
+                                                Text(member.memberRole.text)
+                                                    .fontWeight(.semibold)
+                                                    .lineLimit(1)
+                                                    .padding(.trailing, 8)
+                                            }
+                                        } else {
+                                            HStack(spacing: 16) {
+                                                Text(member.chatViewName)
+                                                    .lineLimit(1)
+                                                Text(member.memberRole.text)
+                                                    .fontWeight(.semibold)
+                                                    .lineLimit(1)
+                                                    .layoutPriority(1)
+                                            }
+                                        }
+                                    }
+                                    .frame(
+                                        maxWidth: maxWidth,
+                                        alignment: chatItem.chatDir.sent ? .trailing : .leading
+                                    )
+                                } else {
+                                    Text(memberNames(member, prevMember, memCount))
+                                        .lineLimit(2)
+                                }
                            }
-                            t
                                .font(.caption)
                                .foregroundStyle(.secondary)
-                                .lineLimit(2)
                                .padding(.leading, memberImageSize + 14 + (selectedChatItems != nil && ci.canBeDeletedForSelf ? 12 + 24 : 0))
-                                .padding(.top, 7)
+                                .padding(.top, 3) // this is in addition to message sequence gap
                        }
                        HStack(alignment: .center, spacing: 0) {
                            if selectedChatItems != nil && ci.canBeDeletedForSelf {
                                SelectedChatItem(ciId: ci.id, selectedChatItems: $selectedChatItems)
                                    .padding(.trailing, 12)
                            }
-                            HStack(alignment: .top, spacing: 8) {
+                            HStack(alignment: .top, spacing: 10) {
                                MemberProfileImage(member, size: memberImageSize, backgroundColor: theme.colors.background)
                                    .onTapGesture {
                                        if let member =  m.getGroupMember(member.groupMemberId) {
@@ -833,11 +1119,12 @@ struct ChatView: View {
                                            }
                                        }
                                    }
-                                chatItemWithMenu(ci, range, maxWidth)
+                                chatItemWithMenu(ci, range, maxWidth, itemSeparation)
+                                    .onPreferenceChange(DetermineWidth.Key.self) { msgWidth = $0 }
                            }
                        }
                    }
-                    .padding(.bottom, 5)
+                    .padding(.bottom, bottomPadding)
                    .padding(.trailing)
                    .padding(.leading, 12)
                } else {
@@ -846,11 +1133,11 @@ struct ChatView: View {
                            SelectedChatItem(ciId: ci.id, selectedChatItems: $selectedChatItems)
                                .padding(.leading, 12)
                        }
-                        chatItemWithMenu(ci, range, maxWidth)
+                        chatItemWithMenu(ci, range, maxWidth, itemSeparation)
                            .padding(.trailing)
-                            .padding(.leading, memberImageSize + 8 + 12)
+                            .padding(.leading, 10 + memberImageSize + 12)
                    }
-                    .padding(.bottom, 5)
+                    .padding(.bottom, bottomPadding)
                }
            } else {
                HStack(alignment: .center, spacing: 0) {
@@ -863,10 +1150,10 @@ struct ChatView: View {
                                .padding(.leading)
                        }
                    }
-                    chatItemWithMenu(ci, range, maxWidth)
+                    chatItemWithMenu(ci, range, maxWidth, itemSeparation)
                        .padding(.horizontal)
                }
-                .padding(.bottom, 5)
+                .padding(.bottom, bottomPadding)
            }
        }

@@ -881,7 +1168,7 @@ struct ChatView: View {
            }
        }

-        @ViewBuilder func chatItemWithMenu(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ maxWidth: CGFloat) -> some View {
+        @ViewBuilder func chatItemWithMenu(_ ci: ChatItem, _ range: ClosedRange<Int>?, _ maxWidth: CGFloat, _ itemSeparation: ItemSeparation) -> some View {
            let alignment: Alignment = ci.chatDir.sent ? .trailing : .leading
            VStack(alignment: alignment.horizontal, spacing: 3) {
                ChatItemView(
@@ -891,7 +1178,8 @@ struct ChatView: View {
                    revealed: .constant(revealed),
                    allowMenu: $allowMenu
                )
-                .modifier(ChatItemClipped(ci))
+                .environment(\.showTimestamp, itemSeparation.timestamp)
+                .modifier(ChatItemClipped(ci, tailVisible: itemSeparation.largeGap))
                .contextMenu { menu(ci, range, live: composeState.liveMessage != nil) }
                .accessibilityLabel("")
                if ci.content.msgContent != nil && (ci.meta.itemDeleted == nil || revealed) && ci.reactions.count > 0 {
@@ -921,12 +1209,9 @@ 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)
+                .sheet(isPresented: $showTranslationSheet) {
+                    if #available(iOS 18.0, *) {
+                        TranslateView(source: ci.text).presentationDetents([.medium, .large])
                    }
                }
        }
@@ -985,6 +1270,9 @@ struct ChatView: View {
                    shareButton(ci)
                    copyButton(ci)
                }
+                if #available(iOS 18.0, *) {
+                    if !ci.text.isEmpty { translateButton(ci) }
+                }
                if let fileSource = fileSource, fileExists {
                    if case .image = ci.content.msgContent, let image = getLoadedImage(ci.file) {
                        if image.imageData != nil {
@@ -1069,7 +1357,7 @@ struct ChatView: View {

        var forwardButton: Button<some View> {
            Button {
-                showForwardingSheet = true
+                forwardedChatItems = [chatItem]
            } label: {
                Label(
                    NSLocalizedString("Forward", comment: "chat item action"),
@@ -1169,6 +1457,14 @@ struct ChatView: View {
            }
        }

+        private func translateButton(_ ci: ChatItem) -> Button<some View> {
+            Button {
+                showTranslationSheet = true
+            } label: {
+                Label("Translate", systemImage: "globe")
+            }
+        }
+
        func saveButton(image: UIImage) -> Button<some View> {
            Button {
                UIImageWriteToSavedPhotosAlbum(image, nil, nil, nil)
@@ -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 {
@@ -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,26 +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):
+            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)
@@ -791,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 }
        }
@@ -854,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)
@@ -887,44 +893,66 @@ struct ComposeView: View {
        }

        func send(_ mc: MsgContent, quoted: Int64?, file: CryptoFile? = nil, live: Bool = false, ttl: Int?) async -> ChatItem? {
-            if let chatItem = chat.chatInfo.chatType == .local
-                ? await apiCreateChatItem(noteFolderId: chat.chatInfo.apiId, file: file, msg: mc)
-                : await apiSendMessage(
+            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: msgs)
+                : await apiSendMessages(
                    type: chat.chatInfo.chatType,
                    id: chat.chatInfo.apiId,
-                    file: file,
-                    quotedItemId: quoted,
-                    msg: mc,
                    live: live,
-                    ttl: ttl
+                    ttl: ttl,
+                    composedMessages: msgs
                ) {
                await MainActor.run {
                    chatModel.removeLiveDummy(animated: false)
-                    chatModel.addChatItem(chat.chatInfo, chatItem)
+                    for chatItem in chatItems {
+                        chatModel.addChatItem(chat.chatInfo, chatItem)
+                    }
                }
-                return chatItem
+                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? {
-            if let chatItem = await apiForwardChatItem(
+        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,
-                itemId: forwardedItem.id,
+                itemIds: forwardedItems.map { $0.id },
                ttl: ttl
            ) {
                await MainActor.run {
-                    chatModel.addChatItem(chat.chatInfo, chatItem)
+                    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")
+                        )
+                    }
                }
-                return chatItem
+                return chatItems
+            } else {
+                return []
            }
-            return nil
        }

        func checkLinkPreview() -> MsgContent {
@@ -941,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: {})
    }
 }
@@ -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 {
@@ -8,15 +8,16 @@

 import SwiftUI
 import Combine
+import SimpleXChat

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

-    @Binding var scrollState: ReverseListScrollModel<Item>.State
+    @Binding var scrollState: ReverseListScrollModel.State

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

    let loadPage: () -> Void

@@ -25,7 +26,9 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
    }

    func updateUIViewController(_ controller: Controller, context: Context) {
+        controller.representer = self
        if case let .scrollingTo(destination) = scrollState, !items.isEmpty {
+            controller.view.layer.removeAllAnimations()
            switch destination {
            case .nextPage:
                controller.scrollToNextPage()
@@ -42,9 +45,10 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
    /// Controller, which hosts SwiftUI cells
    class Controller: UITableViewController {
        private enum Section { case main }
-        private let representer: ReverseList
-        private var dataSource: UITableViewDiffableDataSource<Section, Item>!
+        var representer: ReverseList
+        private var dataSource: UITableViewDiffableDataSource<Section, ChatItem>!
        private var itemCount: Int = 0
+        private let updateFloatingButtons = PassthroughSubject<Void, Never>()
        private var bag = Set<AnyCancellable>()

        init(representer: ReverseList) {
@@ -71,7 +75,7 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
            }

            // 3. Configure data source
-            self.dataSource = UITableViewDiffableDataSource<Section, Item>(
+            self.dataSource = UITableViewDiffableDataSource<Section, ChatItem>(
                tableView: tableView
            ) { (tableView, indexPath, item) -> UITableViewCell? in
                if indexPath.item > self.itemCount - 8, self.itemCount > 8 {
@@ -103,6 +107,15 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
                    name: notificationName,
                    object: nil
                )
+
+            updateFloatingButtons
+                .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)
        }

        @available(*, unavailable)
@@ -171,8 +184,8 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
            Task { representer.scrollState = .atDestination }
        }

-        func update(items: Array<Item>) {
-            var snapshot = NSDiffableDataSourceSnapshot<Section, Item>()
+        func update(items: [ChatItem]) {
+            var snapshot = NSDiffableDataSourceSnapshot<Section, ChatItem>()
            snapshot.appendSections([.main])
            snapshot.appendItems(items)
            dataSource.defaultRowAnimation = .none
@@ -188,6 +201,42 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
                )
            }
            itemCount = items.count
+            updateFloatingButtons.send()
+        }
+
+        override func scrollViewDidScroll(_ scrollView: UIScrollView) {
+            updateFloatingButtons.send()
+        }
+
+        func getListState() -> ListState? {
+            if let visibleRows = tableView.indexPathsForVisibleRows,
+                visibleRows.last?.item ?? 0 < representer.items.count {
+                let scrollOffset: Double = tableView.contentOffset.y + InvertedTableView.inset
+                let topItemDate: Date? =
+                    if let lastVisible = visibleRows.last(where: { isVisible(indexPath: $0) }) {
+                        representer.items[lastVisible.item].meta.itemTs
+                    } else {
+                        nil
+                    }
+                let bottomItemId: ChatItem.ID? =
+                    if let firstVisible = visibleRows.first(where: { isVisible(indexPath: $0) }) {
+                        representer.items[firstVisible.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 }
        }
    }

@@ -231,13 +280,19 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
    }
 }

+typealias ListState = (
+    scrollOffset: Double,
+    topItemDate: Date?,
+    bottomItemId: ChatItem.ID?
+)
+
 /// Manages ``ReverseList`` scrolling
-class ReverseListScrollModel<Item: Identifiable>: ObservableObject {
+class ReverseListScrollModel: ObservableObject {
    /// Represents Scroll State of ``ReverseList``
    enum State: Equatable {
        enum Destination: Equatable {
            case nextPage
-            case item(Item.ID)
+            case item(ChatItem.ID)
            case bottom
        }

@@ -255,7 +310,7 @@ class ReverseListScrollModel<Item: Identifiable>: ObservableObject {
        state = .scrollingTo(.bottom)
    }

-    func scrollToItem(id: Item.ID) {
+    func scrollToItem(id: ChatItem.ID) {
        state = .scrollingTo(.item(id))
    }
 }
@@ -32,12 +32,15 @@ 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 forwardEnabled: Bool = false
+
    @State var allButtonsDisabled = false

    var body: some View {
@@ -50,6 +53,7 @@ struct SelectedItemsBottomToolbar: View {
                } label: {
                    Image(systemName: "trash")
                        .resizable()
+                        .scaledToFit()
                        .frame(width: 20, height: 20, alignment: .center)
                        .foregroundColor(!deleteEnabled || allButtonsDisabled ? theme.colors.secondary: .red)
                }
@@ -61,24 +65,24 @@ struct SelectedItemsBottomToolbar: View {
                } label: {
                    Image(systemName: "flag")
                        .resizable()
+                        .scaledToFit()
                        .frame(width: 20, height: 20, alignment: .center)
                        .foregroundColor(!moderateEnabled || allButtonsDisabled ? theme.colors.secondary : .red)
                }
                .disabled(!moderateEnabled || allButtonsDisabled)
                .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 || allButtonsDisabled ? theme.colors.secondary : theme.colors.primary)
                }
-                .disabled(allButtonsDisabled)
-                .opacity(0)
+                .disabled(!forwardEnabled || allButtonsDisabled)
            }
            .frame(maxHeight: .infinity)
            .padding([.leading, .trailing], 12)
@@ -106,15 +110,16 @@ struct SelectedItemsBottomToolbar: View {
        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
                }
@@ -0,0 +1,73 @@
+//
+//  TranslateView.swift
+//  SimpleX
+//
+//  Created by user on 19/09/2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import Translation
+
+@available(iOS 18.0, *)
+struct TranslateView: View {
+    let source: String
+    @State private var supprtedLanguages = [Locale.Language]()
+    @State private var target: String?
+    @State private var configuration = TranslationSession.Configuration()
+
+    var body: some View {
+        NavigationStack {
+            List {
+                Section {
+                    languagePicker("From", selection: $configuration.source)
+                    Text(source).foregroundStyle(.secondary).lineLimit(1)
+                }
+                Section {
+                    languagePicker("To ", selection: $configuration.target)
+                    if let target {
+                        Text(target)
+                    } else {
+                        ProgressView()
+                    }
+                } footer: {
+                    Text("\(Image(systemName: "info.circle")) Uses on device translation")
+                }
+            }
+            .navigationTitle("Translate")
+        }
+        .task { supprtedLanguages = await LanguageAvailability().supportedLanguages }
+        .translationTask(configuration) { session in
+            do {
+                target = nil
+                let response = try await session.translate(source)
+                await MainActor.run {
+                    configuration.source = response.sourceLanguage
+                    configuration.target = response.targetLanguage
+                    target = response.targetText
+                }
+            } catch {
+                print(error)
+            }
+        }
+    }
+
+    @ViewBuilder
+    private func languagePicker(_ label: String, selection: Binding<Locale.Language?>) -> some View {
+        Picker(label, selection: selection) {
+            Text("Detect language").tag(Optional<Locale.Language>.none)
+            ForEach(supprtedLanguages, id: \.self) { language in
+                Text(title(for: language)).tag(language)
+            }
+        }
+    }
+
+    private func title(for language: Locale.Language) -> String {
+        if let code = language.languageCode,
+           let string = Locale.current.localizedString(forLanguageCode: code.identifier) {
+            string
+        } else {
+            language.minimalIdentifier
+        }
+    }
+}
@@ -9,6 +9,17 @@
 import SwiftUI
 import SimpleXChat

+enum UserPickerSheet: Identifiable {
+    case address
+    case chatPreferences
+    case chatProfiles
+    case currentProfile
+    case useFromDesktop
+    case settings
+
+    var id: Self { self }
+}
+
 struct ChatListView: View {
    @EnvironmentObject var chatModel: ChatModel
    @EnvironmentObject var theme: AppTheme
@@ -18,9 +29,9 @@ struct ChatListView: View {
    @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 activeUserPickerSheet: UserPickerSheet? = nil
+    @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 +57,44 @@ struct ChatListView: View {
                ),
                destination: chatView
            ) { chatListView }
-            if userPickerVisible {
-                Rectangle().fill(.white.opacity(0.001)).onTapGesture {
-                    withAnimation {
-                        userPickerVisible.toggle()
+        }
+        .sheet(isPresented: $userPickerShown) {
+            UserPicker(activeSheet: $activeUserPickerSheet)
+                .sheet(item: $activeUserPickerSheet) { sheet in
+                    if let currentUser = chatModel.currentUser {
+                        switch sheet {
+                        case .address:
+                            NavigationView {
+                                UserAddressView(shareViaProfile: currentUser.addressShared)
+                                    .navigationTitle("SimpleX address")
+                                    .navigationBarTitleDisplayMode(.large)
+                                    .modifier(ThemedBackground(grouped: true))
+                            }
+                        case .chatProfiles:
+                            NavigationView {
+                                UserProfilesView()
+                            }
+                        case .currentProfile:
+                            NavigationView {
+                                UserProfile()
+                                    .navigationTitle("Your current profile")
+                                    .modifier(ThemedBackground(grouped: true))
+                            }
+                        case .chatPreferences:
+                            NavigationView {
+                                PreferencesView(profile: currentUser.profile, preferences: currentUser.fullPreferences, currentPreferences: currentUser.fullPreferences)
+                                    .navigationTitle("Your preferences")
+                                    .navigationBarTitleDisplayMode(.large)
+                                    .modifier(ThemedBackground(grouped: true))
+                            }
+                        case .useFromDesktop:
+                            ConnectDesktopView(viaSettings: false)
+                        case .settings:
+                            SettingsView(showSettings: $showSettings)
+                                .navigationBarTitleDisplayMode(.large)
+                        }
                    }
                }
-            }
-            UserPicker(
-                showSettings: $showSettings,
-                showConnectDesktop: $showConnectDesktop,
-                userPickerVisible: $userPickerVisible
-            )
-        }
-        .sheet(isPresented: $showConnectDesktop) {
-            ConnectDesktopView()
        }
    }

@@ -73,7 +107,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 +198,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 +207,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 +297,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)
@@ -302,7 +302,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,13 +323,13 @@ struct ChatPreviewView: View {
            }
        case let .image(_, image):
            smallContentPreview(size: dynamicMediaSize) {
-                CIImageView(chatItem: ci, preview: UIImage(base64Encoded: image), maxWidth: dynamicMediaSize, smallView: true, showFullScreenImage: $showFullscreenGallery)
-                    .environmentObject(ReverseListScrollModel<ChatItem>())
+                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)
-                    .environmentObject(ReverseListScrollModel<ChatItem>())
+                CIVideoView(chatItem: ci, preview: imageFromBase64(image), duration: duration, maxWidth: dynamicMediaSize, videoWidth: nil, smallView: true, showFullscreenPlayer: $showFullscreenGallery)
+                    .environmentObject(ReverseListScrollModel())
            }
        case let .voice(_, duration):
            smallContentPreviewVoice(size: dynamicMediaSize) {
@@ -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,228 @@ 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
+    @Environment(\.dismiss) private var dismiss: DismissAction
+    @Binding var activeSheet: UserPickerSheet?
+    @State private var switchingProfile = false

    var body: some View {
-        VStack {
-            Spacer().frame(height: 1)
-            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() }
-                            }
-                        }
-                        .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
-                            }
-                        }
-                        .onChange(of: userPickerVisible) { visible in
-                            if visible, let u = users.first {
-                                sp.scrollTo(u.id)
+        if #available(iOS 16.0, *) {
+            let v = viewBody.presentationDetents([.height(420)])
+            if #available(iOS 16.4, *) {
+                v.scrollBounceBehavior(.basedOnSize)
+            } else {
+                v
+            }
+        } else {
+            viewBody
+        }
+    }
+    
+    private var viewBody: some View {
+        let otherUsers = m.users.filter { u in !u.user.hidden && u.user.userId != m.currentUser?.userId }
+        return List {
+            Section(header: Text("You").foregroundColor(theme.colors.secondary)) {
+                if let user = m.currentUser {
+                    openSheetOnTap(label: {
+                        ZStack {
+                            let v = ProfilePreview(profileOf: user)
+                                .foregroundColor(.primary)
+                                .padding(.leading, -8)
+                            if #available(iOS 16.0, *) {
+                                v
+                            } else {
+                                v.padding(.vertical, 4)
                            }
                        }
+                    }) {
+                        activeSheet = .currentProfile
                    }
-                }
-                .simultaneousGesture(DragGesture(minimumDistance: disableScrolling ? 0 : 10000000))
-                .frame(maxHeight: scrollViewContentSize.height)

-                menuButton("Use from desktop", icon: "desktopcomputer") {
-                    showConnectDesktop = true
-                    withAnimation {
-                        userPickerVisible.toggle()
+                    openSheetOnTap(title: m.userAddress == nil ? "Create SimpleX address" : "Your SimpleX address", icon: "qrcode") {
+                        activeSheet = .address
+                    }
+                    
+                    openSheetOnTap(title: "Chat preferences", icon: "switch.2") {
+                        activeSheet = .chatPreferences
                    }
                }
-                Divider()
-                menuButton("Settings", icon: "gearshape") {
-                    showSettings = true
-                    withAnimation {
-                        userPickerVisible.toggle()
+            }
+
+            Section {
+                if otherUsers.isEmpty {
+                    openSheetOnTap(title: "Your chat profiles", icon: "person.crop.rectangle.stack") {
+                        activeSheet = .chatProfiles
+                    }
+                } else {
+                    let v = userPickerRow(otherUsers, size: 44)
+                        .padding(.leading, -11)
+                    if #available(iOS 16.0, *) {
+                        v
+                    } else {
+                        v.padding(.vertical, 4)
+                    }
+                }
+
+                openSheetOnTap(title: "Use from desktop", icon: "desktopcomputer") {
+                    activeSheet = .useFromDesktop
+                }
+
+                ZStack(alignment: .trailing) {
+                    openSheetOnTap(title: "Settings", icon: "gearshape") {
+                        activeSheet = .settings
+                    }
+                    Label {} icon: {
+                        Image(systemName: colorScheme == .light ? "sun.max" : "moon.fill")
+                            .resizable()
+                            .symbolRenderingMode(.monochrome)
+                            .foregroundColor(theme.colors.secondary)
+                            .frame(maxWidth: 20, maxHeight: 20)
+                    }
+                    .onTapGesture {
+                        if (colorScheme == .light) {
+                            ThemeManager.applyTheme(systemDarkThemeDefault.get())
+                        } else {
+                            ThemeManager.applyTheme(DefaultTheme.LIGHT.themeName)
+                        }
+                    }
+                    .onLongPressGesture {
+                        ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
                    }
                }
            }
        }
-        .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)
+        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
        .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 {
                Task {
                    do {
-                        try await changeActiveUserAsync_(user.userId, viewPwd: nil)
-                        await MainActor.run { userPickerVisible = false }
+                        let users = try await listUsersAsync()
+                        await MainActor.run { m.users = users }
                    } catch {
-                        await MainActor.run {
-                            AlertManager.shared.showAlertMsg(
-                                title: "Error switching profile!",
-                                message: "Error: \(responseError(error))"
-                            )
-                        }
+                        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")
+        }
+        .modifier(ThemedBackground(grouped: true))
+        .disabled(switchingProfile)
+    }
+        
+    private func userPickerRow(_ users: [UserInfo], size: CGFloat) -> some View {
+        HStack(spacing: 6) {
+            let s = ScrollView(.horizontal) {
+                HStack(spacing: 27) {
+                    ForEach(users) { u in
+                        if !u.user.hidden && u.user.userId != m.currentUser?.userId {
+                            userView(u, size: size)
+                        }
+                    }
+                }
+                .padding(.leading, 4)
+                .padding(.trailing, 22)
+            }
+            ZStack(alignment: .trailing) {
+                if #available(iOS 16.0, *) {
+                    s.scrollIndicators(.hidden)
+                } else {
+                    s
+                }
+                LinearGradient(
+                    colors: [.clear, .black],
+                    startPoint: .leading,
+                    endPoint: .trailing
+                )
+                .frame(width: size, height: size + 3)
+                .blendMode(.destinationOut)
+                .allowsHitTesting(false)
+            }
+            .compositingGroup()
+            .padding(.top, -3) // to fit unread badge
+            Spacer()
+            Image(systemName: "chevron.right")
+                .foregroundColor(theme.colors.secondary)
+                .padding(.trailing, 4)
+                .onTapGesture {
+                    activeSheet = .chatProfiles
+                }
+        }
+    }
+
+    private func userView(_ u: UserInfo, size: CGFloat) -> some View {
+        ZStack(alignment: .topTrailing) {
+            ProfileImage(imageStr: u.user.image, size: size, color: Color(uiColor: .tertiarySystemGroupedBackground))
+                .padding([.top, .trailing], 3)
+            if (u.unreadCount > 0) {
+                unreadBadge(u)
+            }
+        }
+        .frame(width: size)
+        .onTapGesture {
+            switchingProfile = true
+            Task {
+                do {
+                    try await changeActiveUserAsync_(u.user.userId, viewPwd: nil)
+                    await MainActor.run {
+                        switchingProfile = false
+                        dismiss()
+                    }
+                } catch {
+                    await MainActor.run {
+                        switchingProfile = false
+                        AlertManager.shared.showAlertMsg(
+                            title: "Error switching profile!",
+                            message: "Error: \(responseError(error))"
+                        )
+                    }
                }
            }
-            .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)
+    
+    private func openSheetOnTap(title: LocalizedStringKey, icon: String, action: @escaping () -> Void) -> some View {
+        openSheetOnTap(label: {
+            ZStack(alignment: .leading) {
+                Image(systemName: icon).frame(maxWidth: 24, maxHeight: 24, alignment: .center)
                    .symbolRenderingMode(.monochrome)
                    .foregroundColor(theme.colors.secondary)
+                Text(title)
+                    .foregroundColor(.primary)
+                    .padding(.leading, 36)
            }
-            .padding(.horizontal)
-            .padding(.vertical, 22)
-            .frame(height: menuButtonHeight)
-        }
-        .buttonStyle(PressedButtonStyle(defaultColor: theme.colors.surface, pressedColor: Color(uiColor: .secondarySystemFill)))
+        }, action: action)
+    }
+    
+    private func openSheetOnTap<V: View>(label: () -> V, action: @escaping () -> Void) -> some View {
+        Button(action: action, label: label)
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .contentShape(Rectangle())
+    }
+    
+    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 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)
+            activeSheet: $activeSheet
        )
        .environmentObject(m)
    }
@@ -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])
                }
@@ -14,50 +14,60 @@ import SimpleXChat
 /// Supports [Dynamic Type](https://developer.apple.com/documentation/uikit/uifont/scaling_fonts_automatically)
 /// by retaining pill shape, even when ``ChatItem``'s height is less that twice its corner radius
 struct ChatItemClipped: ViewModifier {
-    struct ClipShape: Shape {
-        let maxCornerRadius: Double
-        
-        func path(in rect: CGRect) -> Path {
-            Path(
-                roundedRect: rect,
-                cornerRadius: min((rect.height / 2), maxCornerRadius), 
-                style: .circular
-            )
-        }
-    }
-    
+    @AppStorage(DEFAULT_CHAT_ITEM_ROUNDNESS) private var roundness = defaultChatItemRoundness
+    @AppStorage(DEFAULT_CHAT_ITEM_TAIL) private var tailEnabled = true
+    private let chatItem: (content: CIContent, chatDir: CIDirection)?
+    private let tailVisible: Bool
+
    init() {
-        clipShape = ClipShape(
-            maxCornerRadius: 18
-        )
+        self.chatItem = nil
+        self.tailVisible = false
+    }
+
+    init(_ ci: ChatItem, tailVisible: Bool) {
+        self.chatItem = (ci.content, ci.chatDir)
+        self.tailVisible = tailVisible
    }
    
-    init(_ chatItem: ChatItem) {
-        clipShape = ClipShape(
-            maxCornerRadius: {
-                switch chatItem.content {
-                case 
-                    .sndMsgContent, 
+    private func shapeStyle() -> ChatItemShape.Style {
+        if let ci = chatItem {
+            switch ci.content {
+            case
+                    .sndMsgContent,
                    .rcvMsgContent,
                    .rcvDecryptionError,
-                    .rcvGroupInvitation,
-                    .sndGroupInvitation,
-                    .sndDeleted, 
+                    .sndDeleted,
                    .rcvDeleted,
                    .rcvIntegrityError,
-                    .sndModerated, 
-                    .rcvModerated, 
+                    .sndModerated,
+                    .rcvModerated,
                    .rcvBlocked,
-                    .invalidJSON: 18
-                default: 8
+                    .invalidJSON:
+                let tail = if let mc = ci.content.msgContent, mc.isImageOrVideo && mc.text.isEmpty {
+                    false
+                } else {
+                    tailVisible
                }
-            }()
-        )
+                return tailEnabled
+                ? .bubble(
+                    padding: ci.chatDir.sent ? .trailing : .leading,
+                    tailVisible: tail
+                )
+                : .roundRect(radius: msgRectMaxRadius)
+            case .rcvGroupInvitation, .sndGroupInvitation:
+                return .roundRect(radius: msgRectMaxRadius)
+            default: return .roundRect(radius: 8)
+            }
+        } else {
+            return .roundRect(radius: msgRectMaxRadius)
+        }
    }
-    
-    private let clipShape: ClipShape
-    
+
    func body(content: Content) -> some View {
+        let clipShape = ChatItemShape(
+            roundness: roundness,
+            style: shapeStyle()
+        )
        content
            .contentShape(.dragPreview, clipShape)
            .contentShape(.contextMenuPreview, clipShape)
@@ -65,4 +75,106 @@ struct ChatItemClipped: ViewModifier {
    }
 }

+struct ChatTailPadding: ViewModifier {
+    func body(content: Content) -> some View {
+        content.padding(.horizontal, -msgTailWidth)
+    }
+}

+private let msgRectMaxRadius: Double = 18
+private let msgBubbleMaxRadius: Double = msgRectMaxRadius * 1.2
+private let msgTailWidth: Double = 9
+private let msgTailMinHeight: Double = msgTailWidth * 1.254 // ~56deg
+private let msgTailMaxHeight: Double = msgTailWidth * 1.732 // 60deg
+
+struct ChatItemShape: Shape {
+    fileprivate enum Style {
+        case bubble(padding: HorizontalEdge, tailVisible: Bool)
+        case roundRect(radius: Double)
+    }
+
+    fileprivate let roundness: Double
+    fileprivate let style: Style
+
+    func path(in rect: CGRect) -> Path {
+        switch style {
+        case let .bubble(padding, tailVisible):
+            let w = rect.width
+            let h = rect.height
+            let rxMax = min(msgBubbleMaxRadius, w / 2)
+            let ryMax = min(msgBubbleMaxRadius, h / 2)
+            let rx = roundness * rxMax
+            let ry = roundness * ryMax
+            let tailHeight = min(msgTailMinHeight + roundness * (msgTailMaxHeight - msgTailMinHeight), h / 2)
+            var path = Path()
+            // top side
+            path.move(to: CGPoint(x: rx, y: 0))
+            path.addLine(to: CGPoint(x: w - rx, y: 0))
+            if roundness > 0 {
+                // top-right corner
+                path.addQuadCurve(to: CGPoint(x: w, y: ry), control: CGPoint(x: w, y: 0))
+            }
+            if rect.height > 2 * ry {
+                // right side
+                path.addLine(to: CGPoint(x: w, y: h - ry))
+            }
+            if roundness > 0 {
+                // bottom-right corner
+                path.addQuadCurve(to: CGPoint(x: w - rx, y: h), control: CGPoint(x: w, y: h))
+            }
+            // bottom side
+            if tailVisible {
+                path.addLine(to: CGPoint(x: -msgTailWidth, y: h))
+                if roundness > 0 {
+                    // bottom-left tail
+                    // distance of control point from touch point, calculated via ratios
+                    let d = tailHeight - msgTailWidth * msgTailWidth / tailHeight
+                    // tail control point
+                    let tc = CGPoint(x: 0, y: h - tailHeight + d * sqrt(roundness))
+                    // bottom-left tail curve
+                    path.addQuadCurve(to: CGPoint(x: 0, y: h - tailHeight), control: tc)
+                } else {
+                    path.addLine(to: CGPoint(x: 0, y: h - tailHeight))
+                }
+                if rect.height > ry + tailHeight {
+                    // left side
+                    path.addLine(to: CGPoint(x: 0, y: ry))
+                }
+            } else {
+                path.addLine(to: CGPoint(x: rx, y: h))
+                path.addQuadCurve(to: CGPoint(x: 0, y: h - ry), control: CGPoint(x: 0 , y: h))
+                if rect.height > 2 * ry {
+                    // left side
+                    path.addLine(to: CGPoint(x: 0, y: ry))
+                }
+            }
+            if roundness > 0 {
+                // top-left corner
+                path.addQuadCurve(to: CGPoint(x: rx, y: 0), control: CGPoint(x: 0, y: 0))
+            }
+            path.closeSubpath()
+            return switch padding {
+            case .leading: path
+            case .trailing: path
+                    .scale(x: -1, y: 1, anchor: .center)
+                    .path(in: rect)
+            }
+        case let .roundRect(radius):
+            return Path(roundedRect: rect, cornerRadius: radius * roundness)
+        }
+    }
+
+    var offset: Double? {
+        switch style {
+        case let .bubble(padding, isTailVisible):
+            if isTailVisible {
+                switch padding {
+                case .leading: -msgTailWidth
+                case .trailing: msgTailWidth
+                }
+            } else { 0 }
+        case .roundRect: 0
+        }
+    }
+
+}
@@ -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)
@@ -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()
    }
@@ -28,7 +28,9 @@ struct AddContactLearnMore: View {
                Text("If you can't meet in person, show QR code in a video call, or share the link.")
                Text("Read more in [User Guide](https://simplex.chat/docs/guide/readme.html#connect-to-friends).")
            }
+            .frame(maxWidth: .infinity, alignment: .leading)
            .listRowBackground(Color.clear)
+            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
        }
        .modifier(ThemedBackground(grouped: true))
    }
@@ -14,9 +14,10 @@ enum ContactType: Int {
 }

 struct NewChatMenuButton: View {
+    @EnvironmentObject var chatModel: ChatModel
    @State private var showNewChatSheet = false
    @State private var alert: SomeAlert? = nil
-    @State private var globalAlert: SomeAlert? = nil
+    @State private var pendingConnection: PendingContactConnection? = nil

    var body: some View {
            Button {
@@ -28,22 +29,14 @@ struct NewChatMenuButton: View {
                .frame(width: 24, height: 24)
        }
        .appSheet(isPresented: $showNewChatSheet) {
-            NewChatSheet(alert: $alert)
+            NewChatSheet(pendingConnection: $pendingConnection)
                .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
-                .alert(item: $alert) { a in
-                    return a.alert
+                .onDisappear {
+                    alert = cleanupPendingConnection(chatModel: chatModel, contactConnection: pendingConnection)
+                    pendingConnection = nil
                }
        }
-        // This is a workaround to show "Keep unused invitation" alert in both following cases:
-        // - on going back from NewChatView to NewChatSheet,
-        // - on dismissing NewChatMenuButton sheet while on NewChatView (skipping NewChatSheet)
-        .onChange(of: alert?.id) { a in
-            if !showNewChatSheet && alert != nil {
-                globalAlert = alert
-                alert = nil
-            }
-        }
-        .alert(item: $globalAlert) { a in
+        .alert(item: $alert) { a in
            return a.alert
        }
    }
@@ -60,7 +53,8 @@ struct NewChatSheet: View {
    @State private var searchText = ""
    @State private var searchShowingSimplexLink = false
    @State private var searchChatFilteredBySimplexLink: String? = nil
-    @Binding var alert: SomeAlert?
+    @State private var alert: SomeAlert?
+    @Binding var pendingConnection: PendingContactConnection?

    // Sheet height management
    @State private var isAddContactActive = false
@@ -78,6 +72,9 @@ struct NewChatSheet: View {
                .navigationBarTitleDisplayMode(.large)
                .navigationBarHidden(searchMode)
                .modifier(ThemedBackground(grouped: true))
+                .alert(item: $alert) { a in
+                    return a.alert
+                }
        }
        if #available(iOS 16.0, *), oneHandUI {
            let sheetHeight: CGFloat = showArchive ? 575 : 500
@@ -112,7 +109,7 @@ struct NewChatSheet: View {
            if (searchText.isEmpty) {
                Section {
                    NavigationLink(isActive: $isAddContactActive) {
-                        NewChatView(selection: .invite, parentAlert: $alert)
+                        NewChatView(selection: .invite, parentAlert: $alert, contactConnection: $pendingConnection)
                            .navigationTitle("New chat")
                            .modifier(ThemedBackground(grouped: true))
                            .navigationBarTitleDisplayMode(.large)
@@ -122,7 +119,7 @@ struct NewChatSheet: View {
                        }
                    }
                    NavigationLink(isActive: $isScanPasteLinkActive) {
-                        NewChatView(selection: .connect, showQRCodeScanner: true, parentAlert: $alert)
+                        NewChatView(selection: .connect, showQRCodeScanner: true, parentAlert: $alert, contactConnection: $pendingConnection)
                            .navigationTitle("New chat")
                            .modifier(ThemedBackground(grouped: true))
                            .navigationBarTitleDisplayMode(.large)
@@ -199,7 +196,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,18 +45,47 @@ enum NewChatOption: Identifiable {
    var id: Self { self }
 }

+func cleanupPendingConnection(chatModel: ChatModel, contactConnection: PendingContactConnection?) -> SomeAlert? {
+    var alert: SomeAlert? = nil
+
+    if !(chatModel.showingInvitation?.connChatUsed ?? true),
+       let conn = contactConnection {
+        alert = SomeAlert(
+            alert: Alert(
+                title: Text("Keep unused invitation?"),
+                message: Text("You can view invitation link again in connection details."),
+                primaryButton: .default(Text("Keep")) {},
+                secondaryButton: .destructive(Text("Delete")) {
+                    Task {
+                        await deleteChat(Chat(
+                            chatInfo: .contactConnection(contactConnection: conn),
+                            chatItems: []
+                        ))
+                    }
+                }
+            ),
+            id: "keepUnusedInvitation"
+        )
+    }
+    
+    chatModel.showingInvitation = nil
+
+    return alert
+}
+
 struct NewChatView: View {
    @EnvironmentObject var m: ChatModel
    @EnvironmentObject var theme: AppTheme
    @State var selection: NewChatOption
    @State var showQRCodeScanner = false
    @State private var invitationUsed: Bool = false
-    @State private var contactConnection: PendingContactConnection? = nil
    @State private var connReqInvitation: String = ""
    @State private var creatingConnReq = false
+    @State var choosingProfile = false
    @State private var pastedLink: String = ""
    @State private var alert: NewChatViewAlert?
    @Binding var parentAlert: SomeAlert?
+    @Binding var contactConnection: PendingContactConnection?

    var body: some View {
        VStack(alignment: .leading) {
@@ -122,26 +151,10 @@ struct NewChatView: View {
            }
        }
        .onDisappear {
-            if !(m.showingInvitation?.connChatUsed ?? true),
-               let conn = contactConnection {
-                parentAlert = SomeAlert(
-                    alert: Alert(
-                        title: Text("Keep unused invitation?"),
-                        message: Text("You can view invitation link again in connection details."),
-                        primaryButton: .default(Text("Keep")) {},
-                        secondaryButton: .destructive(Text("Delete")) {
-                            Task {
-                                await deleteChat(Chat(
-                                    chatInfo: .contactConnection(contactConnection: conn),
-                                    chatItems: []
-                                ))
-                            }
-                        }
-                    ),
-                    id: "keepUnusedInvitation"
-                )
+            if !choosingProfile {
+                parentAlert = cleanupPendingConnection(chatModel: m, contactConnection: contactConnection)
+                contactConnection = nil
            }
-            m.showingInvitation = nil
        }
        .alert(item: $alert) { a in
            switch(a) {
@@ -159,7 +172,8 @@ struct NewChatView: View {
                InviteView(
                    invitationUsed: $invitationUsed,
                    contactConnection: $contactConnection,
-                    connReqInvitation: connReqInvitation
+                    connReqInvitation: $connReqInvitation,
+                    choosingProfile: $choosingProfile
                )
            } else if creatingConnReq {
                creatingLinkProgressView()
@@ -210,13 +224,24 @@ struct NewChatView: View {
    }
 }

+private func incognitoProfileImage() -> some View {
+    Image(systemName: "theatermasks.fill")
+        .resizable()
+        .scaledToFit()
+        .frame(width: 30)
+        .foregroundColor(.indigo)
+}
+
 private struct InviteView: View {
    @EnvironmentObject var chatModel: ChatModel
    @EnvironmentObject var theme: AppTheme
    @Binding var invitationUsed: Bool
    @Binding var contactConnection: PendingContactConnection?
-    var connReqInvitation: String
+    @Binding var connReqInvitation: String
+    @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 {
@@ -226,28 +251,40 @@ private struct InviteView: View {
            .listRowInsets(EdgeInsets(top: 0, leading: 20, bottom: 0, trailing: 10))

            qrCodeView()
-
-            Section {
-                IncognitoToggle(incognitoEnabled: $incognitoDefault)
-            } footer: {
-                sharedProfileInfo(incognitoDefault)
-                    .foregroundColor(theme.colors.secondary)
+            if let selectedProfile = chatModel.currentUser {
+                Section {
+                    NavigationLink {
+                        ActiveProfilePicker(
+                            contactConnection: $contactConnection,
+                            connReqInvitation: $connReqInvitation,
+                            incognitoEnabled: $incognitoDefault,
+                            choosingProfile: $choosingProfile,
+                            selectedProfile: selectedProfile
+                        )
+                    } label: {
+                        HStack {
+                            if incognitoDefault {
+                                incognitoProfileImage()
+                                Text("Incognito")
+                            } else {
+                                ProfileImage(imageStr: chatModel.currentUser?.image, size: 30)
+                                Text(chatModel.currentUser?.chatViewName ?? "")
+                            }
+                        }
+                    }
+                } header: {
+                    Text("Share profile").foregroundColor(theme.colors.secondary)
+                } footer: {
+                     if incognitoDefault {
+                         Text("A new random profile will be shared.")
+                     }
+                }
            }
        }
        .onChange(of: incognitoDefault) { incognito in
-            Task {
-                do {
-                    if let contactConn = contactConnection,
-                       let conn = try await apiSetConnectionIncognito(connId: contactConn.pccConnId, incognito: incognito) {
-                        await MainActor.run {
-                            contactConnection = conn
-                            chatModel.updateContactConnection(conn)
-                        }
-                    }
-                } catch {
-                    logger.error("apiSetConnectionIncognito error: \(responseError(error))")
-                }
-            }
+            setInvitationUsed()
+        }
+        .onChange(of: chatModel.currentUser) { u in
            setInvitationUsed()
        }
    }
@@ -270,6 +307,7 @@ private struct InviteView: View {
    private func qrCodeView() -> some View {
        Section(header: Text("Or show this code").foregroundColor(theme.colors.secondary)) {
            SimpleXLinkQRCode(uri: connReqInvitation, onShare: setInvitationUsed)
+                .id("simplex-qrcode-view-for-\(connReqInvitation)")
                .padding()
                .background(
                    RoundedRectangle(cornerRadius: 12, style: .continuous)
@@ -289,6 +327,257 @@ private struct InviteView: View {
    }
 }

+private enum ProfileSwitchStatus {
+    case switchingUser
+    case switchingIncognito
+    case idle
+}
+
+private struct ActiveProfilePicker: View {
+    @Environment(\.dismiss) var dismiss
+    @EnvironmentObject var chatModel: ChatModel
+    @EnvironmentObject var theme: AppTheme
+    @Binding var contactConnection: PendingContactConnection?
+    @Binding var connReqInvitation: String
+    @Binding var incognitoEnabled: Bool
+    @Binding var choosingProfile: Bool
+    @State private var alert: SomeAlert?
+    @State private var profileSwitchStatus: ProfileSwitchStatus = .idle
+    @State private var switchingProfileByTimeout = false
+    @State private var lastSwitchingProfileByTimeoutCall: Double?
+    @State private var profiles: [User] = []
+    @State private var searchTextOrPassword = ""
+    @State private var showIncognitoSheet = false
+    @State private var incognitoFirst: Bool = false
+    @State var selectedProfile: User
+    var trimmedSearchTextOrPassword: String { searchTextOrPassword.trimmingCharacters(in: .whitespaces)}
+
+    var body: some View {
+        viewBody()
+            .navigationTitle("Select chat profile")
+            .searchable(text: $searchTextOrPassword, placement: .navigationBarDrawer(displayMode: .always))
+            .autocorrectionDisabled(true)
+            .navigationBarTitleDisplayMode(.large)
+            .onAppear {
+                profiles = chatModel.users
+                    .map { $0.user }
+                    .sorted { u, _ in u.activeUser }
+            }
+            .onChange(of: incognitoEnabled) { incognito in
+                if profileSwitchStatus != .switchingIncognito {
+                    return
+                }
+
+                Task {
+                    do {
+                        if let contactConn = contactConnection,
+                           let conn = try await apiSetConnectionIncognito(connId: contactConn.pccConnId, incognito: incognito) {
+                            await MainActor.run {
+                                contactConnection = conn
+                                chatModel.updateContactConnection(conn)
+                                profileSwitchStatus = .idle
+                                dismiss()
+                            }
+                        }
+                    } catch {
+                        profileSwitchStatus = .idle
+                        incognitoEnabled = !incognito
+                        logger.error("apiSetConnectionIncognito error: \(responseError(error))")
+                        let err = getErrorAlert(error, "Error changing to incognito!")
+
+                        alert = SomeAlert(
+                            alert: Alert(
+                                title: Text(err.title),
+                                message: Text(err.message ?? "Error: \(responseError(error))")
+                            ),
+                            id: "setConnectionIncognitoError"
+                        )
+                    }
+                }
+            }
+            .onChange(of: profileSwitchStatus) { sp in
+                if sp != .idle {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
+                        switchingProfileByTimeout = profileSwitchStatus != .idle
+                    }
+                } else {
+                    switchingProfileByTimeout = false
+                }
+            }
+            .onChange(of: selectedProfile) { profile in
+                if (profileSwitchStatus != .switchingUser) {
+                    return
+                }
+                Task {
+                    do {
+                        if let contactConn = contactConnection,
+                           let conn = try await apiChangeConnectionUser(connId: contactConn.pccConnId, userId: profile.userId) {
+                            
+                            await MainActor.run {
+                                contactConnection = conn
+                                connReqInvitation = conn.connReqInv ?? ""
+                                incognitoEnabled = false
+                                chatModel.updateContactConnection(conn)
+                            }
+                            do {
+                                try await changeActiveUserAsync_(profile.userId, viewPwd: profile.hidden ? trimmedSearchTextOrPassword : nil )
+                                await MainActor.run {
+                                    profileSwitchStatus = .idle
+                                    dismiss()
+                                }
+                            } catch {
+                                await MainActor.run {
+                                    profileSwitchStatus = .idle
+                                    alert = SomeAlert(
+                                        alert: Alert(
+                                            title: Text("Error switching profile"),
+                                            message: Text("Your connection was moved to \(profile.chatViewName) but an unexpected error occurred while redirecting you to the profile.")
+                                        ),
+                                        id: "switchingProfileError"
+                                    )
+                                }
+                            }
+                        }
+                    } catch {
+                        await MainActor.run {
+                            profileSwitchStatus = .idle
+                            if let currentUser = chatModel.currentUser {
+                                selectedProfile = currentUser
+                            }
+                            let err = getErrorAlert(error, "Error changing connection profile")
+                            alert = SomeAlert(
+                                alert: Alert(
+                                    title: Text(err.title),
+                                    message: Text(err.message ?? "Error: \(responseError(error))")
+                                ),
+                                id: "changeConnectionUserError"
+                            )
+                        }
+                    }
+                }
+            }
+            .alert(item: $alert) { a in
+                a.alert
+            }
+            .onAppear {
+                incognitoFirst = incognitoEnabled
+                choosingProfile = true
+            }
+            .onDisappear {
+                choosingProfile = false
+            }
+            .sheet(isPresented: $showIncognitoSheet) {
+                IncognitoHelp()
+            }
+    }
+    
+    
+    @ViewBuilder private func viewBody() -> some View {
+        profilePicker()
+            .allowsHitTesting(!switchingProfileByTimeout)
+            .modifier(ThemedBackground(grouped: true))
+            .overlay {
+                if switchingProfileByTimeout {
+                    ProgressView()
+                        .scaleEffect(2)
+                        .frame(maxWidth: .infinity, maxHeight: .infinity)
+                }
+            }
+    }
+    
+    private func filteredProfiles() -> [User] {
+        let s = trimmedSearchTextOrPassword
+        let lower = s.localizedLowercase
+        
+        return profiles.filter { u in
+            if (u.activeUser || !u.hidden) && (s == "" || u.chatViewName.localizedLowercase.contains(lower)) {
+                return true
+            }
+            return correctPassword(u, s)
+        }
+    }
+    
+    @ViewBuilder private func profilerPickerUserOption(_ user: User) -> some View {
+        Button {
+            if selectedProfile == user && incognitoEnabled {
+                incognitoEnabled = false
+                profileSwitchStatus = .switchingIncognito
+            } else if selectedProfile != user {
+                selectedProfile = user
+                profileSwitchStatus = .switchingUser
+            }
+        } label: {
+            HStack {
+                ProfileImage(imageStr: user.image, size: 30)
+                    .padding(.trailing, 2)
+                Text(user.chatViewName)
+                    .foregroundColor(theme.colors.onBackground)
+                    .lineLimit(1)
+                Spacer()
+                if selectedProfile == user, !incognitoEnabled {
+                    Image(systemName: "checkmark")
+                        .resizable().scaledToFit().frame(width: 16)
+                        .foregroundColor(theme.colors.primary)
+                }
+            }
+        }
+    }
+        
+    @ViewBuilder private func profilePicker() -> some View {
+        let incognitoOption = Button {
+            if !incognitoEnabled {
+                incognitoEnabled = true
+                profileSwitchStatus = .switchingIncognito
+            }
+        } label : {
+            HStack {
+                incognitoProfileImage()
+                Text("Incognito")
+                    .foregroundColor(theme.colors.onBackground)
+                Image(systemName: "info.circle")
+                    .foregroundColor(theme.colors.primary)
+                    .font(.system(size: 14))
+                    .onTapGesture {
+                        showIncognitoSheet = true
+                    }
+                Spacer()
+                if incognitoEnabled {
+                    Image(systemName: "checkmark")
+                        .resizable().scaledToFit().frame(width: 16)
+                        .foregroundColor(theme.colors.primary)
+                }
+            }
+        }
+        
+        List {
+            let filteredProfiles = filteredProfiles()
+            let activeProfile = filteredProfiles.first { u in u.activeUser }
+            
+            if let selectedProfile = activeProfile {
+                let otherProfiles = filteredProfiles.filter { u in u.userId != activeProfile?.userId }
+                
+                if incognitoFirst {
+                    incognitoOption
+                    profilerPickerUserOption(selectedProfile)
+                } else {
+                    profilerPickerUserOption(selectedProfile)
+                    incognitoOption
+                }
+                
+                ForEach(otherProfiles) { p in
+                    profilerPickerUserOption(p)
+                }
+            } else {
+                incognitoOption
+                ForEach(filteredProfiles) { p in
+                    profilerPickerUserOption(p)
+                }
+            }
+        }
+        .opacity(switchingProfileByTimeout ? 0.4 : 1)
+    }
+}
+
 private struct ConnectView: View {
    @Environment(\.dismiss) var dismiss: DismissAction
    @EnvironmentObject var theme: AppTheme
@@ -296,6 +585,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 {
@@ -332,7 +622,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)
@@ -975,10 +1265,12 @@ func connReqSentAlert(_ type: ConnReqType) -> Alert {
 struct NewChatView_Previews: PreviewProvider {
    static var previews: some View {
        @State var parentAlert: SomeAlert?
+        @State var contactConnection: PendingContactConnection? = nil

        NewChatView(
            selection: .invite,
-            parentAlert: $parentAlert
+            parentAlert: $parentAlert,
+            contactConnection: $contactConnection
        )
    }
 }
@@ -59,13 +59,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
@@ -160,7 +160,7 @@ struct TerminalView_Previews: PreviewProvider {
        let chatModel = ChatModel()
        chatModel.terminalItems = [
            .resp(.now, ChatResponse.response(type: "contactSubscribed", json: "{}")),
-            .resp(.now, ChatResponse.response(type: "newChatItem", json: "{}"))
+            .resp(.now, ChatResponse.response(type: "newChatItems", json: "{}"))
        ]
        return NavigationView {
            TerminalView()
@@ -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) }
@@ -156,19 +230,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 +256,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 +281,7 @@ struct AdvancedNetworkSettings: View {
            if netCfg == currentNetCfg {
                dismiss()
                cfgLoaded = false
-            } else {
+            } else if !useNetProxy || netProxy.valid {
                showSaveDialog = true
            }
        })
@@ -221,18 +296,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)
@@ -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,10 @@ 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 = 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 +69,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()
@@ -33,6 +33,8 @@ struct AppearanceSettings: View {
    }()
    @State private var darkModeTheme: String = UserDefaults.standard.string(forKey: DEFAULT_SYSTEM_DARK_THEME) ?? DefaultTheme.DARK.themeName
    @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var profileImageCornerRadius = defaultProfileImageCorner
+    @AppStorage(DEFAULT_CHAT_ITEM_ROUNDNESS) private var chatItemRoundness = defaultChatItemRoundness
+    @AppStorage(DEFAULT_CHAT_ITEM_TAIL) private var chatItemTail = true
    @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
    @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial

@@ -179,6 +181,14 @@ struct AppearanceSettings: View {
                    }
                }

+                Section(header: Text("Message shape").foregroundColor(theme.colors.secondary)) {
+                    HStack {
+                        Text("Corner")
+                        Slider(value: $chatItemRoundness, in: 0...1, step: 0.05)
+                    }
+                    Toggle("Tail", isOn: $chatItemTail)
+                }
+
                Section(header: Text("Profile images").foregroundColor(theme.colors.secondary)) {
                    HStack(spacing: 16) {
                        if let img = m.currentUser?.image, img != "" {
@@ -358,20 +368,21 @@ struct ChatThemePreview: View {
                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))
-                        .modifier(ChatItemClipped())
+                        .modifier(ChatItemClipped(alice, tailVisible: true))
                    Spacer()
                }
                HStack {
                    Spacer()
                    ChatItemView(chat: Chat.sampleData, chatItem: bob, revealed: Binding.constant(false))
-                        .modifier(ChatItemClipped())
+                        .modifier(ChatItemClipped(bob, tailVisible: true))
                        .frame(alignment: .trailing)
                }
            } else {
                Rectangle().fill(.clear)
            }
        }
-        .padding(10)
+            .padding(.vertical, 10)
+            .padding(.horizontal, 16)
        .frame(maxWidth: .infinity)

        if let wallpaperType, let wallpaperImage = wallpaperType.image, let backgroundColor, let tintColor {
@@ -26,6 +26,7 @@ struct IncognitoHelp: View {
                Text("Read more in [User Guide](https://simplex.chat/docs/guide/chat-profiles.html#incognito-mode).")
            }
            .listRowBackground(Color.clear)
+            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
        }
        .modifier(ThemedBackground())
    }
@@ -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 {
@@ -47,6 +47,8 @@ let DEFAULT_ACCENT_COLOR_GREEN = "accentColorGreen" // deprecated, only used for
 let DEFAULT_ACCENT_COLOR_BLUE = "accentColorBlue" // deprecated, only used for migration
 let DEFAULT_USER_INTERFACE_STYLE = "userInterfaceStyle" // deprecated, only used for migration
 let DEFAULT_PROFILE_IMAGE_CORNER_RADIUS = "profileImageCornerRadius"
+let DEFAULT_CHAT_ITEM_ROUNDNESS = "chatItemRoundness"
+let DEFAULT_CHAT_ITEM_TAIL = "chatItemTail"
 let DEFAULT_ONE_HAND_UI_CARD_SHOWN = "oneHandUICardShown"
 let DEFAULT_TOOLBAR_MATERIAL = "toolbarMaterial"
 let DEFAULT_CONNECT_VIA_LINK_TAB = "connectViaLinkTab"
@@ -73,8 +75,12 @@ 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
+
 let appDefaults: [String: Any] = [
    DEFAULT_SHOW_LA_NOTICE: false,
    DEFAULT_LA_NOTICE_SHOWN: false,
@@ -98,6 +104,8 @@ let appDefaults: [String: Any] = [
    DEFAULT_DEVELOPER_TOOLS: false,
    DEFAULT_ENCRYPTION_STARTED: false,
    DEFAULT_PROFILE_IMAGE_CORNER_RADIUS: defaultProfileImageCorner,
+    DEFAULT_CHAT_ITEM_ROUNDNESS: defaultChatItemRoundness,
+    DEFAULT_CHAT_ITEM_TAIL: true,
    DEFAULT_ONE_HAND_UI_CARD_SHOWN: false,
    DEFAULT_TOOLBAR_MATERIAL: ToolbarMaterial.defaultMaterial,
    DEFAULT_CONNECT_VIA_LINK_TAB: ConnectViaLinkTab.scan.rawValue,
@@ -245,6 +253,7 @@ 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
@@ -256,7 +265,9 @@ struct SettingsView: View {

    var body: some View {
        ZStack {
-            settingsView()
+            NavigationView {
+                settingsView()
+            }
            if showProgress {
                progressView()
            }
@@ -268,63 +279,7 @@ struct SettingsView: View {

    @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()
@@ -375,10 +330,20 @@ struct SettingsView: View {
                        }
                        .disabled(chatModel.chatRunning != true)
                    }
-                    
-                    chatDatabaseRow()
                }

+                Section(header: Text("Chat database").foregroundColor(theme.colors.secondary)) {
+                    chatDatabaseRow()
+                    NavigationLink {
+                        MigrateFromDevice(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") }
+                    }
+                }
+                
                Section(header: Text("Help").foregroundColor(theme.colors.secondary)) {
                    if let user = user {
                        NavigationLink {
@@ -456,11 +421,10 @@ 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 {
@@ -543,17 +507,18 @@ 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().lineLimit(1)
        }
    }
+    
+    private func profileName() -> 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 {
@@ -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()
@@ -406,8 +404,15 @@ public func chatPasswordHash(_ pwd: String, _ salt: String) -> String {
    return hash
 }

+public func correctPassword(_ user: User, _ pwd: String) -> Bool {
+    if let ph = user.viewPwdHash {
+        return pwd != "" && chatPasswordHash(pwd, ph.salt) == ph.hash
+    }
+    return false
+}
+
 struct UserProfilesView_Previews: PreviewProvider {
    static var previews: some View {
-        UserProfilesView(showSettings: Binding.constant(true))
+        UserProfilesView()
    }
 }
@@ -137,6 +137,10 @@
        <target>%@ иска да се свърже!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve">
+        <source>%1$@, %2$@</source>
+        <note>format for date separator in chat</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
        <target>%@, %@ и %lld членове</target>
@@ -1003,6 +1007,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>
@@ -1167,7 +1175,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>
@@ -1310,6 +1318,10 @@
        <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 theme" xml:space="preserve">
        <source>Chat theme</source>
        <note>No comment provided by engineer.</note>
@@ -1685,6 +1697,10 @@ This is your own one-time link!</source>
        <target>Версия на ядрото: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <target>Поправи име на %@?</target>
@@ -2645,6 +2661,10 @@ This is your own one-time link!</source>
        <target>Грешка при промяна на адреса</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>Грешка при промяна на ролята</target>
@@ -2655,6 +2675,10 @@ This is your own one-time link!</source>
        <target>Грешка при промяна на настройката</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <note>No comment provided by engineer.</note>
@@ -2773,6 +2797,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>
@@ -2870,6 +2898,10 @@ This is your own one-time link!</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>
+        <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>
@@ -3190,11 +3222,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>
@@ -4069,6 +4096,10 @@ This is your link for group %@!</source>
        <source>Message servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <target>Източникът на съобщението остава скрит.</target>
@@ -4883,16 +4914,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>
@@ -5200,6 +5221,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>
@@ -5385,12 +5410,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>
@@ -5416,11 +5442,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>
@@ -5456,16 +5477,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>
@@ -5562,6 +5582,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Избери</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <note>No comment provided by engineer.</note>
@@ -5877,6 +5901,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>
@@ -5911,6 +5939,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Сподели линк</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <target>Сподели този еднократен линк за връзка</target>
@@ -6069,6 +6101,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>
@@ -6235,6 +6271,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>TCP_KEEPINTVL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>Направи снимка</target>
@@ -6423,6 +6463,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>
@@ -7475,11 +7519,19 @@ 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>
        <note>No comment provided by engineer.</note>
      </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>
+        <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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>Вашият контакт изпрати файл, който е по-голям от поддържания в момента максимален размер (%@).</target>
@@ -7525,13 +7577,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>
@@ -135,6 +135,10 @@
        <target>%@ se chce připojit!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve">
+        <source>%1$@, %2$@</source>
+        <note>format for date separator in chat</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
        <note>No comment provided by engineer.</note>
@@ -973,6 +977,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>
@@ -1127,7 +1135,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>
@@ -1266,6 +1274,10 @@
        <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 theme" xml:space="preserve">
        <source>Chat theme</source>
        <note>No comment provided by engineer.</note>
@@ -1623,6 +1635,10 @@ This is your own one-time link!</source>
        <target>Verze jádra: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <note>No comment provided by engineer.</note>
@@ -2552,6 +2568,10 @@ This is your own one-time link!</source>
        <target>Chuba změny adresy</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>Chyba při změně role</target>
@@ -2562,6 +2582,10 @@ This is your own one-time link!</source>
        <target>Chyba změny nastavení</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <note>No comment provided by engineer.</note>
@@ -2678,6 +2702,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>
@@ -2772,6 +2800,10 @@ This is your own one-time link!</source>
        <target>Chyba při zastavení chatu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error switching profile" xml:space="preserve">
+        <source>Error switching profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Chyba při přepínání profilu!</target>
@@ -3079,11 +3111,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>
@@ -3928,6 +3955,10 @@ This is your link for group %@!</source>
        <source>Message servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <note>No comment provided by engineer.</note>
@@ -4705,14 +4736,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>
@@ -5014,6 +5037,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>
@@ -5192,12 +5219,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>
@@ -5223,11 +5251,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>
@@ -5263,16 +5286,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>
@@ -5363,6 +5385,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Vybrat</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <note>No comment provided by engineer.</note>
@@ -5675,6 +5701,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>
@@ -5708,6 +5738,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Sdílet odkaz</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <note>No comment provided by engineer.</note>
@@ -5862,6 +5896,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>
@@ -6024,6 +6062,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>TCP_KEEPINTVL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>Vyfotit</target>
@@ -6207,6 +6249,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>
@@ -7204,11 +7250,19 @@ 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>
        <note>No comment provided by engineer.</note>
      </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>
+        <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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>Kontakt odeslal soubor, který je větší než aktuálně podporovaná maximální velikost (%@).</target>
@@ -7253,13 +7307,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>
@@ -137,6 +137,10 @@
        <target>%@ will sich mit Ihnen verbinden!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve">
+        <source>%1$@, %2$@</source>
+        <note>format for date separator in chat</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
        <target>%@, %@ und %lld Mitglieder</target>
@@ -1020,6 +1024,10 @@
        <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>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>Zurück</target>
@@ -1193,7 +1201,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>
@@ -1341,6 +1349,10 @@
        <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>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Chat-Design</target>
@@ -1393,22 +1405,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">
@@ -1722,7 +1734,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">
@@ -1740,6 +1752,10 @@ Das ist Ihr eigener Einmal-Link!</target>
        <target>Core Version: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <target>Richtiger Name für %@?</target>
@@ -2724,6 +2740,10 @@ Das ist Ihr eigener Einmal-Link!</target>
        <target>Fehler beim Wechseln der Empfängeradresse</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>Fehler beim Ändern der Rolle</target>
@@ -2734,6 +2754,10 @@ Das ist Ihr eigener Einmal-Link!</target>
        <target>Fehler beim Ändern der Einstellung</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <target>Fehler beim Verbinden mit dem Weiterleitungsserver %@. Bitte versuchen Sie es später erneut.</target>
@@ -2854,6 +2878,10 @@ 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>
+        <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>
@@ -2954,6 +2982,10 @@ Das ist Ihr eigener Einmal-Link!</target>
        <target>Fehler beim Beenden des Chats</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error switching profile" xml:space="preserve">
+        <source>Error switching profile</source>
+        <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>
@@ -3289,11 +3321,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>
@@ -3451,7 +3478,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">
@@ -3906,7 +3933,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">
@@ -4184,6 +4211,10 @@ Das ist Ihr Link für die Gruppe %@!</target>
        <target>Nachrichten-Server</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <target>Die Nachrichtenquelle bleibt privat.</target>
@@ -4604,7 +4635,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">
@@ -5021,16 +5052,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>
@@ -5155,7 +5176,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">
@@ -5354,6 +5375,10 @@ 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>
+        <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>
@@ -5547,12 +5572,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>
@@ -5579,11 +5605,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>
@@ -5619,16 +5640,15 @@ 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>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <target>Abgespeichert</target>
@@ -5696,7 +5716,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">
@@ -5729,6 +5749,10 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
        <target>Auswählen</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <target>%lld ausgewählt</target>
@@ -6064,6 +6088,10 @@ 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>
+        <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>
@@ -6099,6 +6127,10 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
        <target>Link teilen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <target>Teilen Sie diesen Einmal-Einladungslink</target>
@@ -6264,6 +6296,10 @@ 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>
+        <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>
@@ -6439,6 +6475,10 @@ Aktivieren Sie es in den *Netzwerk &amp; Server* Einstellungen.</target>
        <target>TCP_KEEPINTVL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>Machen Sie ein Foto</target>
@@ -6588,7 +6628,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">
@@ -6631,6 +6671,10 @@ 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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <target>Design</target>
@@ -7087,7 +7131,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>
+        <target>Die App mit einer Hand bedienen.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="User profile" xml:space="preserve">
@@ -7519,7 +7563,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">
@@ -7714,11 +7758,19 @@ 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>
+        <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>
        <note>No comment provided by engineer.</note>
      </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>
+        <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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>Ihr Kontakt hat eine Datei gesendet, die größer ist als die derzeit unterstützte maximale Größe (%@).</target>
@@ -7764,13 +7816,15 @@ 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>
+        <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>
@@ -137,6 +137,11 @@
        <target>%@ wants to connect!</target>
        <note>notification title</note>
      </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">
        <source>%@, %@ and %lld members</source>
        <target>%@, %@ and %lld members</target>
@@ -1020,6 +1025,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>
@@ -1193,7 +1203,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>
@@ -1341,6 +1351,11 @@
        <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 theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Chat theme</target>
@@ -1740,6 +1755,11 @@ This is your own one-time link!</target>
        <target>Core version: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <target>Corner</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <target>Correct name to %@?</target>
@@ -2724,6 +2744,11 @@ This is your own one-time link!</target>
        <target>Error changing address</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <target>Error changing connection profile</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>Error changing role</target>
@@ -2734,6 +2759,11 @@ This is your own one-time link!</target>
        <target>Error changing setting</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <target>Error changing to 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">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <target>Error connecting to forwarding server %@. Please try later.</target>
@@ -2854,6 +2884,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>
@@ -2954,6 +2989,11 @@ This is your own one-time link!</target>
        <target>Error stopping chat</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 switching profile</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 switching profile!</target>
@@ -3289,11 +3329,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>
@@ -4184,6 +4219,11 @@ This is your link for group %@!</target>
        <target>Message servers</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <target>Message shape</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <target>Message source remains private.</target>
@@ -5021,16 +5061,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>
@@ -5354,6 +5384,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>
@@ -5547,12 +5582,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>
@@ -5579,11 +5615,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>
@@ -5619,16 +5650,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>
@@ -5729,6 +5760,11 @@ Enable in *Network &amp; servers* settings.</target>
        <target>Select</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <target>Select chat profile</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <target>Selected %lld</target>
@@ -6064,6 +6100,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>
@@ -6099,6 +6140,11 @@ Enable in *Network &amp; servers* settings.</target>
        <target>Share link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <target>Share profile</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <target>Share this 1-time invite link</target>
@@ -6264,6 +6310,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>
@@ -6439,6 +6490,11 @@ Enable in *Network &amp; servers* settings.</target>
        <target>TCP_KEEPINTVL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <target>Tail</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>Take picture</target>
@@ -6631,6 +6687,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>
@@ -7714,11 +7775,21 @@ 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>
        <note>No comment provided by engineer.</note>
      </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>Your connection was moved to %@ but an unexpected error occurred while redirecting you to the profile.</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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>Your contact sent a file that is larger than currently supported maximum size (%@).</target>
@@ -7764,13 +7835,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>
@@ -137,6 +137,10 @@
        <target>¡ %@ quiere contactar!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve">
+        <source>%1$@, %2$@</source>
+        <note>format for date separator in chat</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
        <target>%@, %@ y %lld miembro(s) más</target>
@@ -1020,6 +1024,10 @@
        <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>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>Volver</target>
@@ -1193,7 +1201,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>
@@ -1341,6 +1349,10 @@
        <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>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Tema de chat</target>
@@ -1740,6 +1752,10 @@ This is your own one-time link!</source>
        <target>Versión Core: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <target>¿Corregir el nombre a %@?</target>
@@ -2724,6 +2740,10 @@ This is your own one-time link!</source>
        <target>Error al cambiar servidor</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>Error al cambiar rol</target>
@@ -2734,6 +2754,10 @@ This is your own one-time link!</source>
        <target>Error cambiando configuración</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <target>Error al conectar con el servidor de reenvío %@. Por favor, inténtalo más tarde.</target>
@@ -2854,6 +2878,10 @@ 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>
+        <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>
@@ -2954,6 +2982,10 @@ This is your own one-time link!</source>
        <target>Error al parar SimpleX</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error switching profile" xml:space="preserve">
+        <source>Error switching profile</source>
+        <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>
@@ -3289,11 +3321,6 @@ 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>
@@ -4184,6 +4211,10 @@ This is your link for group %@!</source>
        <target>Servidores de mensajes</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <target>El autor del mensaje se mantiene privado.</target>
@@ -5021,16 +5052,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>
@@ -5354,6 +5375,10 @@ 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>
+        <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>
@@ -5547,12 +5572,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>
@@ -5579,11 +5605,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>
@@ -5619,16 +5640,15 @@ 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>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <target>Guardado</target>
@@ -5729,6 +5749,10 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
        <target>Seleccionar</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <target>Seleccionados %lld</target>
@@ -6064,6 +6088,10 @@ 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>
+        <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>
@@ -6099,6 +6127,10 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
        <target>Compartir enlace</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <target>Comparte este enlace de un solo uso</target>
@@ -6264,6 +6296,10 @@ 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>
+        <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>
@@ -6439,6 +6475,10 @@ Actívalo en ajustes de *Servidores y Redes*.</target>
        <target>TCP_KEEPINTVL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>Tomar foto</target>
@@ -6631,6 +6671,10 @@ 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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <target>Temas</target>
@@ -7714,11 +7758,19 @@ 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>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Your chat profiles" xml:space="preserve">
        <source>Your chat profiles</source>
        <target>Mis perfiles</target>
        <note>No comment provided by engineer.</note>
      </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>
+        <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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>El contacto ha enviado un archivo mayor al máximo admitido (%@).</target>
@@ -7764,13 +7816,15 @@ 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>
+        <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>
@@ -133,6 +133,10 @@
        <target>%@ haluaa muodostaa yhteyden!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve">
+        <source>%1$@, %2$@</source>
+        <note>format for date separator in chat</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
        <note>No comment provided by engineer.</note>
@@ -967,6 +971,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>
@@ -1120,7 +1128,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>
@@ -1259,6 +1267,10 @@
        <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 theme" xml:space="preserve">
        <source>Chat theme</source>
        <note>No comment provided by engineer.</note>
@@ -1616,6 +1628,10 @@ This is your own one-time link!</source>
        <target>Ydinversio: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <note>No comment provided by engineer.</note>
@@ -2544,6 +2560,10 @@ This is your own one-time link!</source>
        <target>Virhe osoitteenvaihdossa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>Virhe roolin vaihdossa</target>
@@ -2554,6 +2574,10 @@ This is your own one-time link!</source>
        <target>Virhe asetuksen muuttamisessa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <note>No comment provided by engineer.</note>
@@ -2669,6 +2693,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>
@@ -2762,6 +2790,10 @@ This is your own one-time link!</source>
        <target>Virhe keskustelun lopettamisessa</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error switching profile" xml:space="preserve">
+        <source>Error switching profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Virhe profiilin vaihdossa!</target>
@@ -3069,11 +3101,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>
@@ -3918,6 +3945,10 @@ This is your link for group %@!</source>
        <source>Message servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <note>No comment provided by engineer.</note>
@@ -4693,14 +4724,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>
@@ -5002,6 +5025,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>
@@ -5180,12 +5207,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>
@@ -5211,11 +5239,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>
@@ -5251,16 +5274,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>
@@ -5351,6 +5373,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Valitse</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <note>No comment provided by engineer.</note>
@@ -5662,6 +5688,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>
@@ -5695,6 +5725,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Jaa linkki</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <note>No comment provided by engineer.</note>
@@ -5848,6 +5882,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>
@@ -6010,6 +6048,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>TCP_KEEPINTVL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>Ota kuva</target>
@@ -6193,6 +6235,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>
@@ -7189,11 +7235,19 @@ 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>
        <note>No comment provided by engineer.</note>
      </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>
+        <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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>Yhteyshenkilösi lähetti tiedoston, joka on suurempi kuin tällä hetkellä tuettu enimmäiskoko (%@).</target>
@@ -7238,13 +7292,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>
@@ -137,6 +137,10 @@
        <target>%@ veut se connecter !</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve">
+        <source>%1$@, %2$@</source>
+        <note>format for date separator in chat</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
        <target>%@, %@ et %lld membres</target>
@@ -1020,6 +1024,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>
@@ -1193,7 +1201,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>
@@ -1341,6 +1349,10 @@
        <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 theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Thème de chat</target>
@@ -1740,6 +1752,10 @@ Il s'agit de votre propre lien unique !</target>
        <target>Version du cœur : v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <target>Corriger le nom pour %@ ?</target>
@@ -2724,6 +2740,10 @@ Il s'agit de votre propre lien unique !</target>
        <target>Erreur de changement d'adresse</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>Erreur lors du changement de rôle</target>
@@ -2734,6 +2754,10 @@ Il s'agit de votre propre lien unique !</target>
        <target>Erreur de changement de paramètre</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <target>Erreur de connexion au serveur de redirection %@. Veuillez réessayer plus tard.</target>
@@ -2854,6 +2878,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>
@@ -2954,6 +2982,10 @@ Il s'agit de votre propre lien unique !</target>
        <target>Erreur lors de l'arrêt du chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error switching profile" xml:space="preserve">
+        <source>Error switching profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Erreur lors du changement de profil !</target>
@@ -3289,11 +3321,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>
@@ -4184,6 +4211,10 @@ Voici votre lien pour le groupe %@ !</target>
        <target>Serveurs de messages</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <target>La source du message reste privée.</target>
@@ -5021,16 +5052,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>
@@ -5354,6 +5375,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>
@@ -5547,12 +5572,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>
@@ -5579,11 +5605,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>
@@ -5619,16 +5640,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>
@@ -5729,6 +5749,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Choisir</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <target>%lld sélectionné(s)</target>
@@ -6064,6 +6088,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>
@@ -6099,6 +6127,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>Partager le lien</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <target>Partager ce lien d'invitation unique</target>
@@ -6264,6 +6296,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>
@@ -6439,6 +6475,10 @@ Activez-le dans les paramètres *Réseau et serveurs*.</target>
        <target>TCP_KEEPINTVL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>Prendre une photo</target>
@@ -6631,6 +6671,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>
@@ -7714,11 +7758,19 @@ 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>
        <note>No comment provided by engineer.</note>
      </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>
+        <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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>Votre contact a envoyé un fichier plus grand que la taille maximale supportée actuellement(%@).</target>
@@ -7764,13 +7816,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>
@@ -137,6 +137,10 @@
        <target>%@ kapcsolódni szeretne!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve">
+        <source>%1$@, %2$@</source>
+        <note>format for date separator in chat</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
        <target>%@, %@ és további %lld tag</target>
@@ -423,8 +427,8 @@
        <source>- voice messages up to 5 minutes.
 - custom time to disappear.
 - editing history.</source>
-        <target>- hangüzenetek legfeljebb 5 perces időtartamig.
- egyedi eltűnési időhatár megadása.
+        <target>- 5 perc hosszúságú hangüzenetek.
+- egyedi üzenet-eltűnési időkorlát.
 - előzmények szerkesztése.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
@@ -492,7 +496,7 @@
        <source>&lt;p&gt;Hi!&lt;/p&gt;
 &lt;p&gt;&lt;a href="%@"&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;</source>
        <target>&lt;p&gt;Üdvözlöm!&lt;/p&gt;
-&lt;p&gt;&lt;a href=„%@”&gt;Csatlakozzon hozzám a SimpleX Chaten&lt;/a&gt;&lt;/p&gt;</target>
+&lt;p&gt;&lt;a href=„%@”&gt;Csatlakozzon hozzám a SimpleX Chaten keresztül&lt;/a&gt;&lt;/p&gt;</target>
        <note>email text</note>
      </trans-unit>
      <trans-unit id="A few more things" xml:space="preserve">
@@ -566,7 +570,7 @@
      </trans-unit>
      <trans-unit id="Accept connection request?" xml:space="preserve">
        <source>Accept connection request?</source>
-        <target>Kapcsolódási kérelem elfogadása?</target>
+        <target>Ismerőskérelem elfogadása?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Accept contact request from %@?" xml:space="preserve">
@@ -1020,6 +1024,10 @@
        <target>Képek automatikus elfogadása</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>Vissza</target>
@@ -1042,7 +1050,7 @@
      </trans-unit>
      <trans-unit id="Bad message hash" xml:space="preserve">
        <source>Bad message hash</source>
-        <target>Hibás az üzenet ellenőrzőösszege</target>
+        <target>Hibás az üzenet hasító értéke</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Better groups" xml:space="preserve">
@@ -1193,7 +1201,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>Mégse</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>
@@ -1341,6 +1349,10 @@
        <target>Csevegési beállítások</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 theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Csevegés témája</target>
@@ -1518,7 +1530,7 @@
      </trans-unit>
      <trans-unit id="Connect to desktop" xml:space="preserve">
        <source>Connect to desktop</source>
-        <target>Kapcsolódás számítógéphez</target>
+        <target>Társítás számítógéppel</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect to your friends faster." xml:space="preserve">
@@ -1542,7 +1554,7 @@ Ez az ön SimpleX címe!</target>
        <source>Connect to yourself?
 This is your own one-time link!</source>
        <target>Kapcsolódás saját magához?
-Ez az egyszer használatos hivatkozása!</target>
+Ez az ön egyszer használatos hivatkozása!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connect via contact address" xml:space="preserve">
@@ -1572,7 +1584,7 @@ Ez az egyszer használatos hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Connected desktop" xml:space="preserve">
        <source>Connected desktop</source>
-        <target>Csatlakoztatott számítógép</target>
+        <target>Társított számítógép</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Connected servers" xml:space="preserve">
@@ -1667,7 +1679,7 @@ Ez az egyszer használatos hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Contact already exists" xml:space="preserve">
        <source>Contact already exists</source>
-        <target>Létező ismerős</target>
+        <target>Az ismerős már létezik</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Contact deleted!" xml:space="preserve">
@@ -1740,6 +1752,10 @@ Ez az egyszer használatos hivatkozása!</target>
        <target>Alapverziószám: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <target>Név javítása erre: %@?</target>
@@ -1777,7 +1793,7 @@ Ez az egyszer használatos hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Create group link" xml:space="preserve">
        <source>Create group link</source>
-        <target>Csoportos hivatkozás létrehozása</target>
+        <target>Csoporthivatkozás létrehozása</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Create link" xml:space="preserve">
@@ -1832,7 +1848,7 @@ Ez az egyszer használatos hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Creating archive link" xml:space="preserve">
        <source>Creating archive link</source>
-        <target>Archív hivatkozás létrehozása</target>
+        <target>Archívum hivatkozás létrehozása</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Creating link…" xml:space="preserve">
@@ -2161,7 +2177,7 @@ Ez az egyszer használatos hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Delete pending connection?" xml:space="preserve">
        <source>Delete pending connection?</source>
-        <target>Függő kapcsolatfelvételi kérések törlése?</target>
+        <target>Függőben lévő ismerőskérelem törlése?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Delete profile" xml:space="preserve">
@@ -2471,7 +2487,7 @@ Ez az egyszer használatos hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Duplicate display name!" xml:space="preserve">
        <source>Duplicate display name!</source>
-        <target>Duplikált megjelenítési név!</target>
+        <target>Duplikált megjelenített név!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Duration" xml:space="preserve">
@@ -2716,7 +2732,7 @@ Ez az egyszer használatos hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Error adding member(s)" xml:space="preserve">
        <source>Error adding member(s)</source>
-        <target>Hiba a tag(-ok) hozzáadásakor</target>
+        <target>Hiba a tag(ok) hozzáadásakor</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error changing address" xml:space="preserve">
@@ -2724,6 +2740,10 @@ Ez az egyszer használatos hivatkozása!</target>
        <target>Hiba a cím megváltoztatásakor</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>Hiba a szerepkör megváltoztatásakor</target>
@@ -2734,6 +2754,10 @@ Ez az egyszer használatos hivatkozása!</target>
        <target>Hiba a beállítás megváltoztatásakor</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <target>Hiba a(z) %@ továbbító kiszolgálóhoz való kapcsolódáskor. Próbálja meg később.</target>
@@ -2751,7 +2775,7 @@ Ez az egyszer használatos hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Error creating group link" xml:space="preserve">
        <source>Error creating group link</source>
-        <target>Hiba a csoport hivatkozásának létrehozásakor</target>
+        <target>Hiba a csoporthivatkozás létrehozásakor</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error creating member contact" xml:space="preserve">
@@ -2854,6 +2878,10 @@ Ez az egyszer használatos hivatkozása!</target>
        <target>Hiba a %@ kiszolgálók betöltésekor</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>Hiba a csevegés megnyitásakor</target>
@@ -2954,6 +2982,10 @@ Ez az egyszer használatos hivatkozása!</target>
        <target>Hiba a csevegés megállításakor</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error switching profile" xml:space="preserve">
+        <source>Error switching profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Hiba a profil váltásakor!</target>
@@ -2966,7 +2998,7 @@ Ez az egyszer használatos hivatkozása!</target>
      </trans-unit>
      <trans-unit id="Error updating group link" xml:space="preserve">
        <source>Error updating group link</source>
-        <target>Hiba a csoport hivatkozás frissítésekor</target>
+        <target>Hiba a csoporthivatkozás frissítésekor</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Error updating message" xml:space="preserve">
@@ -3289,11 +3321,6 @@ Hiba: %2$@</target>
        <target>Teljes név (opcionális)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>Teljes név:</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>Teljesen decentralizált - kizárólag tagok számára látható.</target>
@@ -3371,12 +3398,12 @@ Hiba: %2$@</target>
      </trans-unit>
      <trans-unit id="Group link" xml:space="preserve">
        <source>Group link</source>
-        <target>Csoport hivatkozás</target>
+        <target>Csoporthivatkozás</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group links" xml:space="preserve">
        <source>Group links</source>
-        <target>Csoport hivatkozások</target>
+        <target>Csoporthivatkozások</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group members can add message reactions." xml:space="preserve">
@@ -3446,7 +3473,7 @@ Hiba: %2$@</target>
      </trans-unit>
      <trans-unit id="Group will be deleted for all members - this cannot be undone!" xml:space="preserve">
        <source>Group will be deleted for all members - this cannot be undone!</source>
-        <target>Csoport törlésre kerül minden tag számára - ez a művelet nem vonható vissza!</target>
+        <target>A csoport törlésre kerül minden tag számára - ez a művelet nem vonható vissza!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Group will be deleted for you - this cannot be undone!" xml:space="preserve">
@@ -3743,12 +3770,12 @@ Hiba: %2$@</target>
      </trans-unit>
      <trans-unit id="Invalid connection link" xml:space="preserve">
        <source>Invalid connection link</source>
-        <target>Érvénytelen kapcsolati hivatkozás</target>
+        <target>Érvénytelen kapcsolattartási hivatkozás</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Invalid display name!" xml:space="preserve">
        <source>Invalid display name!</source>
-        <target>Érvénytelen megjelenítendő felhaszálónév!</target>
+        <target>Érvénytelen megjelenítendő név!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Invalid link" xml:space="preserve">
@@ -3966,7 +3993,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="Let's talk in SimpleX Chat" xml:space="preserve">
        <source>Let's talk in SimpleX Chat</source>
-        <target>Beszélgessünk a SimpleX Chat-ben</target>
+        <target>Beszélgessünk a SimpleX Chatben</target>
        <note>email subject</note>
      </trans-unit>
      <trans-unit id="Light" xml:space="preserve">
@@ -3981,17 +4008,17 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="Link mobile and desktop apps! 🔗" xml:space="preserve">
        <source>Link mobile and desktop apps! 🔗</source>
-        <target>Társítsa össze a mobil és az asztali alkalmazásokat! 🔗</target>
+        <target>Társítsa össze a mobil és asztali alkalmazásokat! 🔗</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Linked desktop options" xml:space="preserve">
        <source>Linked desktop options</source>
-        <target>Összekapcsolt számítógép beállítások</target>
+        <target>Társított számítógép beállítások</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Linked desktops" xml:space="preserve">
        <source>Linked desktops</source>
-        <target>Összekapcsolt számítógépek</target>
+        <target>Társított számítógépek</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Live message!" xml:space="preserve">
@@ -4056,7 +4083,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="Many people asked: *if SimpleX has no user identifiers, how can it deliver messages?*" xml:space="preserve">
        <source>Many people asked: *if SimpleX has no user identifiers, how can it deliver messages?*</source>
-        <target>Sokan kérdezték: *ha a SimpleX-nek nincsenek felhasználói azonosítói, akkor hogyan tud üzeneteket kézbesíteni?*</target>
+        <target>Sokan kérdezték: *ha a SimpleX Chatnek nincsenek felhasználói azonosítói, akkor hogyan tud üzeneteket kézbesíteni?*</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Mark deleted for everyone" xml:space="preserve">
@@ -4184,6 +4211,10 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
        <target>Üzenetkiszolgálók</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <target>Az üzenet forrása titokban marad.</target>
@@ -4311,12 +4342,12 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="Moderated at" xml:space="preserve">
        <source>Moderated at</source>
-        <target>Moderálva lett ekkor:</target>
+        <target>Moderálva ekkor:</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Moderated at: %@" xml:space="preserve">
        <source>Moderated at: %@</source>
-        <target>Moderálva lett ekkor: %@</target>
+        <target>Moderálva ekkor: %@</target>
        <note>copied message info</note>
      </trans-unit>
      <trans-unit id="More improvements are coming soon!" xml:space="preserve">
@@ -4401,7 +4432,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="New contact request" xml:space="preserve">
        <source>New contact request</source>
-        <target>Új kapcsolattartási kérelem</target>
+        <target>Új ismerőskérelem</target>
        <note>notification</note>
      </trans-unit>
      <trans-unit id="New contact:" xml:space="preserve">
@@ -4461,7 +4492,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="No contacts selected" xml:space="preserve">
        <source>No contacts selected</source>
-        <target>Nem kerültek ismerősök kiválasztásra</target>
+        <target>Nincs kiválasztva ismerős</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="No contacts to add" xml:space="preserve">
@@ -4526,7 +4557,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="Nothing selected" xml:space="preserve">
        <source>Nothing selected</source>
-        <target>Semmi sincs kiválasztva</target>
+        <target>Nincs kiválasztva semmi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Notifications" xml:space="preserve">
@@ -4570,7 +4601,7 @@ Ez az ön hivatkozása a(z) %@ csoporthoz!</target>
      </trans-unit>
      <trans-unit id="Old database archive" xml:space="preserve">
        <source>Old database archive</source>
-        <target>Régi adatbázis archívum</target>
+        <target>Régi adatbázis-archívum</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="One-time invitation link" xml:space="preserve">
@@ -4599,7 +4630,7 @@ VPN engedélyezése szükséges.</target>
      </trans-unit>
      <trans-unit id="Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**." xml:space="preserve">
        <source>Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**.</source>
-        <target>Csak a klienseszközök tárolják a felhasználói profilokat, névjegyeket, csoportokat és a **2 rétegű végponttól-végpontig titkosítással** küldött üzeneteket.</target>
+        <target>Csak a klienseszközök tárolják a felhasználói profilokat, névjegyeket, csoportokat és a **2 rétegű végpontok közötti titkosítással** küldött üzeneteket.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Only delete conversation" xml:space="preserve">
@@ -4734,7 +4765,7 @@ VPN engedélyezése szükséges.</target>
      </trans-unit>
      <trans-unit id="Or securely share this file link" xml:space="preserve">
        <source>Or securely share this file link</source>
-        <target>Vagy a fájl hivítkozásának biztonságos megosztása</target>
+        <target>Vagy ossza meg biztonságosan ezt a fájlhivatkozást</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Or show this code" xml:space="preserve">
@@ -4794,7 +4825,7 @@ VPN engedélyezése szükséges.</target>
      </trans-unit>
      <trans-unit id="Past member %@" xml:space="preserve">
        <source>Past member %@</source>
-        <target>Már nem tag - %@</target>
+        <target>%@ (már nem tag)</target>
        <note>past/unknown group member</note>
      </trans-unit>
      <trans-unit id="Paste desktop address" xml:space="preserve">
@@ -4814,12 +4845,12 @@ VPN engedélyezése szükséges.</target>
      </trans-unit>
      <trans-unit id="Paste the link you received" xml:space="preserve">
        <source>Paste the link you received</source>
-        <target>Fogadott hivatkozás beillesztése</target>
+        <target>Kapott hivatkozás beillesztése</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Pending" xml:space="preserve">
        <source>Pending</source>
-        <target>Függő</target>
+        <target>Függőben</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="People can connect to you only via the links you share." xml:space="preserve">
@@ -4866,7 +4897,7 @@ Minden további problémát osszon meg a fejlesztőkkel.</target>
      </trans-unit>
      <trans-unit id="Please check that you used the correct link or ask your contact to send you another one." xml:space="preserve">
        <source>Please check that you used the correct link or ask your contact to send you another one.</source>
-        <target>Ellenőrizze, hogy a megfelelő hivatkozást használta-e, vagy kérje meg ismerősét, hogy küldjön egy másikat.</target>
+        <target>Ellenőrizze, hogy a megfelelő hivatkozást használta-e, vagy kérje meg az ismerősét, hogy küldjön egy másikat.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Please check your network connection with %@ and try again." xml:space="preserve">
@@ -5021,16 +5052,6 @@ Hiba: %@</target>
        <target>Profilképek</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Profilnév</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Profil neve:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Profiljelszó</target>
@@ -5354,6 +5375,10 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
        <target>Eltávolítás</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>Kép eltávolítása</target>
@@ -5426,7 +5451,7 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
      </trans-unit>
      <trans-unit id="Reset" xml:space="preserve">
        <source>Reset</source>
-        <target>Alaphelyzetbe állítás</target>
+        <target>Visszaállítás</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reset all hints" xml:space="preserve">
@@ -5446,7 +5471,7 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
      </trans-unit>
      <trans-unit id="Reset colors" xml:space="preserve">
        <source>Reset colors</source>
-        <target>Színek alaphelyzetbe állítása</target>
+        <target>Színek visszaállítása</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reset to app theme" xml:space="preserve">
@@ -5456,7 +5481,7 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
      </trans-unit>
      <trans-unit id="Reset to defaults" xml:space="preserve">
        <source>Reset to defaults</source>
-        <target>Alaphelyzetbe állítás</target>
+        <target>Visszaállítás alaphelyzetbe</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Reset to user theme" xml:space="preserve">
@@ -5547,12 +5572,13 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Mentés</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>Mentés (és az ismerősök értesítése)</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>
@@ -5579,11 +5605,6 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
        <target>Archívum mentése</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>Automatikus elfogadási beállítások mentése</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>Csoportprofil elmentése</target>
@@ -5619,16 +5640,15 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
        <target>Kiszolgálók mentése?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>Beállítások mentése?</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>Üdvözlőszöveg mentése?</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>Mentett</target>
@@ -5729,6 +5749,10 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
        <target>Választás</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <target>%lld kiválasztva</target>
@@ -5996,12 +6020,12 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
      </trans-unit>
      <trans-unit id="Servers info" xml:space="preserve">
        <source>Servers info</source>
-        <target>információk a kiszolgálókról</target>
+        <target>Információk a kiszolgálókról</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Servers statistics will be reset - this cannot be undone!" xml:space="preserve">
        <source>Servers statistics will be reset - this cannot be undone!</source>
-        <target>A kiszolgálók statisztikái visszaállnak - ez nem vonható vissza!</target>
+        <target>A kiszolgálók statisztikái visszaállnak - ez a művelet nem vonható vissza!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Session code" xml:space="preserve">
@@ -6064,6 +6088,10 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
        <target>Beállítások</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>Profilkép alakzat</target>
@@ -6099,6 +6127,10 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
        <target>Hivatkozás megosztása</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <target>Egyszer használatos meghívó hivatkozás megosztása</target>
@@ -6211,7 +6243,7 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
      </trans-unit>
      <trans-unit id="SimpleX group link" xml:space="preserve">
        <source>SimpleX group link</source>
-        <target>SimpleX csoport hivatkozás</target>
+        <target>SimpleX csoporthivatkozás</target>
        <note>simplex link type</note>
      </trans-unit>
      <trans-unit id="SimpleX links" xml:space="preserve">
@@ -6264,6 +6296,10 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
        <target>Enyhe</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>Néhány fájl nem került exportálásra:</target>
@@ -6401,7 +6437,7 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
      </trans-unit>
      <trans-unit id="Support SimpleX Chat" xml:space="preserve">
        <source>Support SimpleX Chat</source>
-        <target>Támogassa a SimpleX Chatet</target>
+        <target>SimpleX Chat támogatása</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="System" xml:space="preserve">
@@ -6439,6 +6475,10 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
        <target>TCP_KEEPINTVL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>Kép készítése</target>
@@ -6516,7 +6556,7 @@ Engedélyezze a Beállítások / Hálózat és kiszolgálók menüben.</target>
      </trans-unit>
      <trans-unit id="Thanks to the users – contribute via Weblate!" xml:space="preserve">
        <source>Thanks to the users – contribute via Weblate!</source>
-        <target>Köszönet a felhasználóknak - hozzájárulás a Weblaten!</target>
+        <target>Köszönet a felhasználóknak - hozzájárulás a Weblate-en!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The 1st platform without any user identifiers – private by design." xml:space="preserve">
@@ -6548,12 +6588,12 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
      </trans-unit>
      <trans-unit id="The code you scanned is not a SimpleX link QR code." xml:space="preserve">
        <source>The code you scanned is not a SimpleX link QR code.</source>
-        <target>A beolvasott kód nem egy SimpleX hivatkozás QR-kód.</target>
+        <target>A beolvasott QR-kód nem egy SimpleX QR-kód hivatkozás.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The connection you accepted will be cancelled!" xml:space="preserve">
        <source>The connection you accepted will be cancelled!</source>
-        <target>Az ön által elfogadott kapcsolat vissza lesz vonva!</target>
+        <target>Az ön által elfogadott kérelem vissza lesz vonva!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The contact you shared this link with will NOT be able to connect!" xml:space="preserve">
@@ -6573,7 +6613,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
      </trans-unit>
      <trans-unit id="The hash of the previous message is different." xml:space="preserve">
        <source>The hash of the previous message is different.</source>
-        <target>Az előző üzenet ellenőrzőösszege különbözik.</target>
+        <target>Az előző üzenet hasító értéke különbözik.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="The message will be deleted for all members." xml:space="preserve">
@@ -6631,6 +6671,10 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
        <target>A beillesztett szöveg nem egy SimpleX hivatkozás.</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>Témák</target>
@@ -6678,7 +6722,7 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
      </trans-unit>
      <trans-unit id="This display name is invalid. Please choose another name." xml:space="preserve">
        <source>This display name is invalid. Please choose another name.</source>
-        <target>Ez a megjelenített felhasználónév érvénytelen. Válasszon egy másik nevet.</target>
+        <target>Ez a megjelenített név érvénytelen. Válasszon egy másik nevet.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="This group has over %lld members, delivery receipts are not sent." xml:space="preserve">
@@ -6698,12 +6742,12 @@ Ez valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.</target>
      </trans-unit>
      <trans-unit id="This is your own one-time link!" xml:space="preserve">
        <source>This is your own one-time link!</source>
-        <target>Ez az egyszer használatos hivatkozása!</target>
+        <target>Ez az ön egyszer használatos hivatkozása!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="This link was used with another mobile device, please create a new link on the desktop." xml:space="preserve">
        <source>This link was used with another mobile device, please create a new link on the desktop.</source>
-        <target>Ezt a hivatkozást egy másik mobilleszközön már használták, hozzon létre egy új hivatkozást az asztali számítógépén.</target>
+        <target>Ezt a hivatkozást egy másik mobileszközön már használták, hozzon létre egy új hivatkozást az asztali számítógépén.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="This setting applies to messages in your current chat profile **%@**." xml:space="preserve">
@@ -6810,12 +6854,12 @@ A funkció bekapcsolása előtt a rendszer felszólítja a képernyőzár beáll
      </trans-unit>
      <trans-unit id="Trying to connect to the server used to receive messages from this contact (error: %@)." xml:space="preserve">
        <source>Trying to connect to the server used to receive messages from this contact (error: %@).</source>
-        <target>Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerőstől érkező üzenetek fogadására szolgál (hiba: %@).</target>
+        <target>Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerősétől érkező üzenetek fogadására szolgál (hiba: %@).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Trying to connect to the server used to receive messages from this contact." xml:space="preserve">
        <source>Trying to connect to the server used to receive messages from this contact.</source>
-        <target>Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerőstől érkező üzenetek fogadására szolgál.</target>
+        <target>Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerősétől érkező üzenetek fogadására szolgál.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Turkish interface" xml:space="preserve">
@@ -6921,8 +6965,8 @@ A funkció bekapcsolása előtt a rendszer felszólítja a képernyőzár beáll
      <trans-unit id="Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.&#10;To connect, please ask your contact to create another connection link and check that you have a stable network connection." xml:space="preserve">
        <source>Unless your contact deleted the connection or this link was already used, it might be a bug - please report it.
 To connect, please ask your contact to create another connection link and check that you have a stable network connection.</source>
-        <target>Hacsak az ismerőse nem törölte a kapcsolatot, vagy ez a hivatkozás már használatban volt, lehet hogy ez egy hiba – jelentse a problémát.
-A kapcsolódáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsolati hivatkozást, és ellenőrizze, hogy a hálózati kapcsolat stabil-e.</target>
+        <target>Hacsak az ismerőse nem törölte a kapcsolatot, vagy ez a hivatkozás már használatban volt egyszer, lehet hogy ez egy hiba – jelentse a problémát.
+A kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapcsolattartási hivatkozást, és ellenőrizze, hogy a hálózati kapcsolat stabil-e.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Unlink" xml:space="preserve">
@@ -7047,7 +7091,7 @@ A kapcsolódáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsol
      </trans-unit>
      <trans-unit id="Use from desktop" xml:space="preserve">
        <source>Use from desktop</source>
-        <target>Használat számítógépről</target>
+        <target>Társítás számítógéppel</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Use iOS call interface" xml:space="preserve">
@@ -7387,7 +7431,7 @@ A kapcsolódáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsol
      </trans-unit>
      <trans-unit id="You are already connected to %@." xml:space="preserve">
        <source>You are already connected to %@.</source>
-        <target>Már kapcsolódva van hozzá: %@.</target>
+        <target>Ön már kapcsolódva van ehhez: %@.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You are already connecting to %@." xml:space="preserve">
@@ -7429,7 +7473,7 @@ Csatlakozási kérés megismétlése?</target>
      </trans-unit>
      <trans-unit id="You are connected to the server used to receive messages from this contact." xml:space="preserve">
        <source>You are connected to the server used to receive messages from this contact.</source>
-        <target>Már kapcsolódott ahhoz a kiszolgálóhoz, amely az adott ismerőstől érkező üzenetek fogadására szolgál.</target>
+        <target>Már kapcsolódott ahhoz a kiszolgálóhoz, amely az adott ismerősétől érkező üzenetek fogadására szolgál.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You are invited to group" xml:space="preserve">
@@ -7479,7 +7523,7 @@ Csatlakozási kérés megismétlése?</target>
      </trans-unit>
      <trans-unit id="You can make it visible to your SimpleX contacts via Settings." xml:space="preserve">
        <source>You can make it visible to your SimpleX contacts via Settings.</source>
-        <target>Láthatóvá teheti SimpleX ismerősök számára a Beállításokban.</target>
+        <target>Láthatóvá teheti a SimpleXbeli ismerősei számára a „Beállításokban”.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You can now chat with %@" xml:space="preserve">
@@ -7626,7 +7670,7 @@ Kapcsolódási kérés megismétlése?</target>
      </trans-unit>
      <trans-unit id="You will be connected when group link host's device is online, please wait or check later!" xml:space="preserve">
        <source>You will be connected when group link host's device is online, please wait or check later!</source>
-        <target>Akkor lesz kapcsolódva, amikor a csoportos hivatkozás tulajdonosának eszköze online lesz, várjon, vagy ellenőrizze később!</target>
+        <target>Akkor lesz kapcsolódva, amikor a csoporthivatkozás tulajdonosának eszköze online lesz, várjon, vagy ellenőrizze később!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="You will be connected when your connection request is accepted, please wait or check later!" xml:space="preserve">
@@ -7691,7 +7735,7 @@ Kapcsolódási kérés megismétlése?</target>
      </trans-unit>
      <trans-unit id="Your SimpleX address" xml:space="preserve">
        <source>Your SimpleX address</source>
-        <target>Az ön SimpleX címe</target>
+        <target>Profil SimpleX címe</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Your XFTP servers" xml:space="preserve">
@@ -7714,11 +7758,19 @@ Kapcsolódási kérés megismétlése?</target>
        <target>A csevegési adatbázis nincs titkosítva – adjon meg egy jelmondatot a titkosításhoz.</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>Csevegési profilok</target>
        <note>No comment provided by engineer.</note>
      </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>
+        <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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>Ismerőse olyan fájlt küldött, amely meghaladja a jelenleg támogatott maximális méretet (%@).</target>
@@ -7764,13 +7816,15 @@ Kapcsolódási kérés megismétlése?</target>
        <target>A(z) **%@** nevű profilja megosztásra fog kerülni.</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>Profilja az eszközön van tárolva, és csak az ismerősökkel kerül megosztásra.
-A SimpleX kiszolgálók nem látjhatják profilját.</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>Profilja az eszközön van tárolva, és csak az ismerősökkel kerül megosztásra. A SimpleX kiszolgálók nem látjhatják profilját.</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>Profilja, ismerősei és az elküldött üzenetei az eszközön kerülnek tárolásra.</target>
@@ -7808,7 +7862,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="[Star on GitHub](https://github.com/simplex-chat/simplex-chat)" xml:space="preserve">
        <source>[Star on GitHub](https://github.com/simplex-chat/simplex-chat)</source>
-        <target>[Csillag a GitHubon](https://github.com/simplex-chat/simplex-chat)</target>
+        <target>[Csillagozás a GitHubon](https://github.com/simplex-chat/simplex-chat)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="_italic_" xml:space="preserve">
@@ -7888,7 +7942,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="bad message hash" xml:space="preserve">
        <source>bad message hash</source>
-        <target>hibás az üzenet ellenőrzőösszege</target>
+        <target>hibás az üzenet hasító értéke</target>
        <note>integrity error chat item</note>
      </trans-unit>
      <trans-unit id="blocked" xml:space="preserve">
@@ -7918,7 +7972,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="call error" xml:space="preserve">
        <source>call error</source>
-        <target>hiba a hívásban</target>
+        <target>híváshiba</target>
        <note>call status</note>
      </trans-unit>
      <trans-unit id="call in progress" xml:space="preserve">
@@ -8013,7 +8067,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="connecting call" xml:space="preserve">
        <source>connecting call…</source>
-        <target>hívás kapcsolódik…</target>
+        <target>kapcsolódási hívás…</target>
        <note>call status</note>
      </trans-unit>
      <trans-unit id="connecting…" xml:space="preserve">
@@ -8253,12 +8307,12 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="incognito via group link" xml:space="preserve">
        <source>incognito via group link</source>
-        <target>inkognitó a csoportos hivatkozáson keresztül</target>
+        <target>inkognitó a csoporthivatkozáson keresztül</target>
        <note>chat list item description</note>
      </trans-unit>
      <trans-unit id="incognito via one-time link" xml:space="preserve">
        <source>incognito via one-time link</source>
-        <target>inkognitó az egyszer használatos hivatkozáson keresztül</target>
+        <target>inkognitó egy egyszer használatos hivatkozáson keresztül</target>
        <note>chat list item description</note>
      </trans-unit>
      <trans-unit id="indirect (%d)" xml:space="preserve">
@@ -8308,7 +8362,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="invited via your group link" xml:space="preserve">
        <source>invited via your group link</source>
-        <target>meghíva az ön csoport hivatkozásán keresztül</target>
+        <target>meghíva az ön csoporthivatkozásán keresztül</target>
        <note>rcv group event chat item</note>
      </trans-unit>
      <trans-unit id="italic" xml:space="preserve">
@@ -8328,7 +8382,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="marked deleted" xml:space="preserve">
        <source>marked deleted</source>
-        <target>töröltnek jelölve</target>
+        <target>törlésre jelölve</target>
        <note>marked deleted chat item preview text</note>
      </trans-unit>
      <trans-unit id="member" xml:space="preserve">
@@ -8470,7 +8524,7 @@ A SimpleX kiszolgálók nem látjhatják profilját.</target>
      </trans-unit>
      <trans-unit id="received answer…" xml:space="preserve">
        <source>received answer…</source>
-        <target>fogadott válasz…</target>
+        <target>válasz fogadása…</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="received confirmation…" xml:space="preserve">
@@ -8644,12 +8698,12 @@ utoljára fogadott üzenet: %2$@</target>
      </trans-unit>
      <trans-unit id="via group link" xml:space="preserve">
        <source>via group link</source>
-        <target>csoport hivatkozáson keresztül</target>
+        <target>a csoporthivatkozáson keresztül</target>
        <note>chat list item description</note>
      </trans-unit>
      <trans-unit id="via one-time link" xml:space="preserve">
        <source>via one-time link</source>
-        <target>egyszer használatos hivatkozáson keresztül</target>
+        <target>egy egyszer használatos hivatkozáson keresztül</target>
        <note>chat list item description</note>
      </trans-unit>
      <trans-unit id="via relay" xml:space="preserve">
@@ -8714,7 +8768,7 @@ utoljára fogadott üzenet: %2$@</target>
      </trans-unit>
      <trans-unit id="you blocked %@" xml:space="preserve">
        <source>you blocked %@</source>
-        <target>ön letiltotta %@-t</target>
+        <target>ön letiltotta őt: %@</target>
        <note>snd group event chat item</note>
      </trans-unit>
      <trans-unit id="you changed address" xml:space="preserve">
@@ -137,6 +137,10 @@
        <target>%@ si vuole connettere!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve">
+        <source>%1$@, %2$@</source>
+        <note>format for date separator in chat</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
        <target>%@, %@ e %lld membri</target>
@@ -1020,6 +1024,10 @@
        <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>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>Indietro</target>
@@ -1193,7 +1201,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>
@@ -1341,6 +1349,10 @@
        <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>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Tema della chat</target>
@@ -1740,6 +1752,10 @@ Questo è il tuo link una tantum!</target>
        <target>Versione core: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <target>Correggere il nome a %@?</target>
@@ -2724,6 +2740,10 @@ Questo è il tuo link una tantum!</target>
        <target>Errore nella modifica dell'indirizzo</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>Errore nel cambio di ruolo</target>
@@ -2734,6 +2754,10 @@ Questo è il tuo link una tantum!</target>
        <target>Errore nella modifica dell'impostazione</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <target>Errore di connessione al server di inoltro %@. Riprova più tardi.</target>
@@ -2854,6 +2878,10 @@ 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>
+        <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>
@@ -2954,6 +2982,10 @@ Questo è il tuo link una tantum!</target>
        <target>Errore nell'interruzione della chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error switching profile" xml:space="preserve">
+        <source>Error switching profile</source>
+        <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>
@@ -3289,11 +3321,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>
@@ -4184,6 +4211,10 @@ Questo è il tuo link per il gruppo %@!</target>
        <target>Server dei messaggi</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <target>La fonte del messaggio resta privata.</target>
@@ -5021,16 +5052,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>
@@ -5354,6 +5375,10 @@ 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>
+        <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>
@@ -5547,12 +5572,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>
@@ -5579,11 +5605,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>
@@ -5619,16 +5640,15 @@ 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>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <target>Salvato</target>
@@ -5729,6 +5749,10 @@ Attivalo nelle impostazioni *Rete e server*.</target>
        <target>Seleziona</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <target>%lld selezionato</target>
@@ -6064,6 +6088,10 @@ 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>
+        <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>
@@ -6099,6 +6127,10 @@ Attivalo nelle impostazioni *Rete e server*.</target>
        <target>Condividi link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <target>Condividi questo link di invito una tantum</target>
@@ -6264,6 +6296,10 @@ 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>
+        <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>
@@ -6439,6 +6475,10 @@ Attivalo nelle impostazioni *Rete e server*.</target>
        <target>TCP_KEEPINTVL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>Scatta foto</target>
@@ -6631,6 +6671,10 @@ 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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <target>Temi</target>
@@ -7714,11 +7758,19 @@ 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>
+        <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>
        <note>No comment provided by engineer.</note>
      </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>
+        <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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>Il tuo contatto ha inviato un file più grande della dimensione massima attualmente supportata (%@).</target>
@@ -7764,13 +7816,15 @@ 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>
+        <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>
@@ -137,6 +137,10 @@
        <target>%@ が接続を希望しています!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve">
+        <source>%1$@, %2$@</source>
+        <note>format for date separator in chat</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
        <target>%@や%@など%lld人のメンバー</target>
@@ -990,6 +994,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>
@@ -1144,7 +1152,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>
@@ -1283,6 +1291,10 @@
        <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 theme" xml:space="preserve">
        <source>Chat theme</source>
        <note>No comment provided by engineer.</note>
@@ -1640,6 +1652,10 @@ This is your own one-time link!</source>
        <target>コアのバージョン: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <note>No comment provided by engineer.</note>
@@ -2569,6 +2585,10 @@ This is your own one-time link!</source>
        <target>アドレス変更にエラー発生</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>役割変更にエラー発生</target>
@@ -2579,6 +2599,10 @@ This is your own one-time link!</source>
        <target>設定変更にエラー発生</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <note>No comment provided by engineer.</note>
@@ -2694,6 +2718,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>
@@ -2787,6 +2815,10 @@ This is your own one-time link!</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>
+        <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>
@@ -3094,11 +3126,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>
@@ -3942,6 +3969,10 @@ This is your link for group %@!</source>
        <source>Message servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <note>No comment provided by engineer.</note>
@@ -4719,14 +4750,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>
@@ -5027,6 +5050,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>
@@ -5205,12 +5232,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>
@@ -5236,11 +5264,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>
@@ -5276,16 +5299,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>
@@ -5376,6 +5398,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>選択</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <note>No comment provided by engineer.</note>
@@ -5680,6 +5706,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>
@@ -5713,6 +5743,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>リンクを送る</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <note>No comment provided by engineer.</note>
@@ -5867,6 +5901,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>
@@ -6029,6 +6067,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>TCP_KEEPINTVL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>写真を撮影</target>
@@ -6212,6 +6254,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>
@@ -7207,11 +7253,19 @@ 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>
        <note>No comment provided by engineer.</note>
      </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>
+        <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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>連絡先が現在サポートされている最大サイズ (%@) より大きいファイルを送信しました。</target>
@@ -7256,13 +7310,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>
@@ -137,6 +137,10 @@
        <target>%@ wil verbinding maken!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve">
+        <source>%1$@, %2$@</source>
+        <note>format for date separator in chat</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
        <target>%@, %@ en %lld leden</target>
@@ -1020,6 +1024,10 @@
        <target>Afbeeldingen automatisch accepteren</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>Terug</target>
@@ -1193,7 +1201,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>Annuleren</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>
@@ -1341,6 +1349,10 @@
        <target>Gesprek voorkeuren</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 theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Chat thema</target>
@@ -1740,6 +1752,10 @@ Dit is uw eigen eenmalige link!</target>
        <target>Core versie: v% @</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <target>Juiste naam voor %@?</target>
@@ -2724,6 +2740,10 @@ Dit is uw eigen eenmalige link!</target>
        <target>Fout bij wijzigen van adres</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>Fout bij wisselen van rol</target>
@@ -2734,6 +2754,10 @@ Dit is uw eigen eenmalige link!</target>
        <target>Fout bij wijzigen van instelling</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <target>Fout bij het verbinden met doorstuurserver %@. Probeer het later opnieuw.</target>
@@ -2854,6 +2878,10 @@ Dit is uw eigen eenmalige link!</target>
        <target>Fout bij het laden van %@ 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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error opening chat" xml:space="preserve">
        <source>Error opening chat</source>
        <target>Fout bij het openen van de chat</target>
@@ -2954,6 +2982,10 @@ Dit is uw eigen eenmalige link!</target>
        <target>Fout bij het stoppen van de chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error switching profile" xml:space="preserve">
+        <source>Error switching profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Fout bij wisselen van profiel!</target>
@@ -3289,11 +3321,6 @@ Fout: %2$@</target>
        <target>Volledige naam (optioneel)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>Volledige naam:</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>Volledig gedecentraliseerd – alleen zichtbaar voor leden.</target>
@@ -4184,6 +4211,10 @@ Dit is jouw link voor groep %@!</target>
        <target>Berichtservers</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <target>Berichtbron blijft privé.</target>
@@ -5021,16 +5052,6 @@ Fout: %@</target>
        <target>Profiel afbeeldingen</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Profielnaam</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Profielnaam:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Profiel wachtwoord</target>
@@ -5354,6 +5375,10 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
        <target>Verwijderen</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>Verwijder afbeelding</target>
@@ -5547,12 +5572,13 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Opslaan</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>Bewaar (en informeer contacten)</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>
@@ -5579,11 +5605,6 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
        <target>Bewaar archief</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>Sla instellingen voor automatisch accepteren op</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>Groep profiel opslaan</target>
@@ -5619,16 +5640,15 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
        <target>Servers opslaan?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>Instellingen opslaan?</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>Welkom bericht opslaan?</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>Opgeslagen</target>
@@ -5729,6 +5749,10 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
        <target>Selecteer</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <target>%lld geselecteerd</target>
@@ -6064,6 +6088,10 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
        <target>Instellingen</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>Vorm profiel afbeeldingen</target>
@@ -6099,6 +6127,10 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
        <target>Deel link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <target>Deel deze eenmalige uitnodigingslink</target>
@@ -6264,6 +6296,10 @@ Schakel dit in in *Netwerk en servers*-instellingen.</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>
+        <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>Sommige bestanden zijn niet geëxporteerd:</target>
@@ -6439,6 +6475,10 @@ Schakel dit in in *Netwerk en servers*-instellingen.</target>
        <target>TCP_KEEPINTVL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>Foto nemen</target>
@@ -6631,6 +6671,10 @@ Het kan gebeuren vanwege een bug of wanneer de verbinding is aangetast.</target>
        <target>De tekst die u hebt geplakt is geen 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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <target>Thema's</target>
@@ -7714,11 +7758,19 @@ Verbindingsverzoek herhalen?</target>
        <target>Uw chat database is niet versleuteld, stel een wachtwoord in om deze te versleutelen.</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>Uw chat profielen</target>
        <note>No comment provided by engineer.</note>
      </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>
+        <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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>Uw contact heeft een bestand verzonden dat groter is dan de momenteel ondersteunde maximale grootte (%@).</target>
@@ -7764,13 +7816,15 @@ Verbindingsverzoek herhalen?</target>
        <target>Uw profiel **%@** wordt gedeeld.</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>Uw profiel wordt op uw apparaat opgeslagen en alleen gedeeld met uw contacten.
-SimpleX servers kunnen uw profiel niet zien.</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>Uw profiel wordt op uw apparaat opgeslagen en alleen gedeeld met uw contacten. SimpleX servers kunnen uw profiel niet zien.</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>Uw profiel, contacten en afgeleverde berichten worden op uw apparaat opgeslagen.</target>
@@ -137,6 +137,10 @@
        <target>%@ chce się połączyć!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve">
+        <source>%1$@, %2$@</source>
+        <note>format for date separator in chat</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
        <target>%@, %@ i %lld członków</target>
@@ -1020,6 +1024,10 @@
        <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>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Back" xml:space="preserve">
        <source>Back</source>
        <target>Wstecz</target>
@@ -1193,7 +1201,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>
@@ -1341,6 +1349,10 @@
        <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>
+        <note>alert message</note>
+      </trans-unit>
      <trans-unit id="Chat theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Motyw czatu</target>
@@ -1740,6 +1752,10 @@ To jest twój jednorazowy link!</target>
        <target>Wersja rdzenia: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <target>Poprawić imię na %@?</target>
@@ -2724,6 +2740,10 @@ To jest twój jednorazowy link!</target>
        <target>Błąd zmiany adresu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>Błąd zmiany roli</target>
@@ -2734,6 +2754,10 @@ To jest twój jednorazowy link!</target>
        <target>Błąd zmiany ustawienia</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <target>Błąd połączenia z serwerem przekierowania %@. Spróbuj ponownie później.</target>
@@ -2854,6 +2878,10 @@ 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>
+        <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>
@@ -2954,6 +2982,10 @@ To jest twój jednorazowy link!</target>
        <target>Błąd zatrzymania czatu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error switching profile" xml:space="preserve">
+        <source>Error switching profile</source>
+        <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>
@@ -3289,11 +3321,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>
@@ -4184,6 +4211,10 @@ To jest twój link do grupy %@!</target>
        <target>Serwery wiadomości</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <target>Źródło wiadomości pozostaje prywatne.</target>
@@ -5021,16 +5052,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>
@@ -5354,6 +5375,10 @@ 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>
+        <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>
@@ -5547,12 +5572,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>
@@ -5579,11 +5605,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>
@@ -5619,16 +5640,15 @@ 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>
+        <note>alert title</note>
+      </trans-unit>
      <trans-unit id="Saved" xml:space="preserve">
        <source>Saved</source>
        <target>Zapisane</target>
@@ -5729,6 +5749,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Wybierz</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <target>Zaznaczono %lld</target>
@@ -6064,6 +6088,10 @@ 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>
+        <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>
@@ -6099,6 +6127,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>Udostępnij link</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <target>Udostępnij ten jednorazowy link</target>
@@ -6264,6 +6296,10 @@ 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>
+        <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>
@@ -6439,6 +6475,10 @@ Włącz w ustawianiach *Sieć i serwery* .</target>
        <target>TCP_KEEPINTVL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>Zrób zdjęcie</target>
@@ -6631,6 +6671,10 @@ 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>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Themes" xml:space="preserve">
        <source>Themes</source>
        <target>Motywy</target>
@@ -7714,11 +7758,19 @@ 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>
+        <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>
        <note>No comment provided by engineer.</note>
      </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>
+        <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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>Twój kontakt wysłał plik, który jest większy niż obecnie obsługiwany maksymalny rozmiar (%@).</target>
@@ -7764,13 +7816,15 @@ 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>
+        <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>
@@ -137,6 +137,10 @@
        <target>%@ хочет соединиться!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve">
+        <source>%1$@, %2$@</source>
+        <note>format for date separator in chat</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
        <target>%@, %@ и %lld членов группы</target>
@@ -1020,6 +1024,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>
@@ -1193,7 +1201,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>
@@ -1341,6 +1349,10 @@
        <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 theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Тема чата</target>
@@ -1740,6 +1752,10 @@ This is your own one-time link!</source>
        <target>Версия ядра: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <target>Исправить имя на %@?</target>
@@ -2724,6 +2740,10 @@ This is your own one-time link!</source>
        <target>Ошибка при изменении адреса</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>Ошибка при изменении роли</target>
@@ -2734,6 +2754,10 @@ This is your own one-time link!</source>
        <target>Ошибка при изменении настройки</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <target>Ошибка подключения к пересылающему серверу %@. Попробуйте позже.</target>
@@ -2854,6 +2878,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>
@@ -2954,6 +2982,10 @@ This is your own one-time link!</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>
+        <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>
@@ -3289,11 +3321,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>
@@ -4184,6 +4211,10 @@ This is your link for group %@!</source>
        <target>Серверы сообщений</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <target>Источник сообщения остаётся конфиденциальным.</target>
@@ -5021,16 +5052,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>
@@ -5354,6 +5375,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>
@@ -5547,12 +5572,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>
@@ -5579,11 +5605,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>
@@ -5619,16 +5640,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>
@@ -5729,6 +5749,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Выбрать</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <target>Выбрано %lld</target>
@@ -6064,6 +6088,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>
@@ -6099,6 +6127,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Поделиться ссылкой</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <target>Поделиться одноразовой ссылкой-приглашением</target>
@@ -6264,6 +6296,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>
@@ -6439,6 +6475,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>TCP_KEEPINTVL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>Сделать фото</target>
@@ -6631,6 +6671,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>
@@ -7714,11 +7758,19 @@ 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>
        <note>No comment provided by engineer.</note>
      </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>
+        <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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>Ваш контакт отправил файл, размер которого превышает максимальный размер (%@).</target>
@@ -7764,13 +7816,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>
@@ -129,6 +129,10 @@
        <target>%@ อยากเชื่อมต่อ!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve">
+        <source>%1$@, %2$@</source>
+        <note>format for date separator in chat</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
        <note>No comment provided by engineer.</note>
@@ -959,6 +963,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>
@@ -1112,7 +1120,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>
@@ -1251,6 +1259,10 @@
        <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 theme" xml:space="preserve">
        <source>Chat theme</source>
        <note>No comment provided by engineer.</note>
@@ -1606,6 +1618,10 @@ This is your own one-time link!</source>
        <target>รุ่นหลัก: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <note>No comment provided by engineer.</note>
@@ -2530,6 +2546,10 @@ This is your own one-time link!</source>
        <target>เกิดข้อผิดพลาดในการเปลี่ยนที่อยู่</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>เกิดข้อผิดพลาดในการเปลี่ยนบทบาท</target>
@@ -2540,6 +2560,10 @@ This is your own one-time link!</source>
        <target>เกิดข้อผิดพลาดในการเปลี่ยนการตั้งค่า</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <note>No comment provided by engineer.</note>
@@ -2654,6 +2678,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>
@@ -2747,6 +2775,10 @@ This is your own one-time link!</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>
+        <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>
@@ -3054,11 +3086,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>
@@ -3901,6 +3928,10 @@ This is your link for group %@!</source>
        <source>Message servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <note>No comment provided by engineer.</note>
@@ -4672,14 +4703,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>
@@ -4979,6 +5002,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>
@@ -5157,12 +5184,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>
@@ -5188,11 +5216,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>
@@ -5228,16 +5251,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>
@@ -5328,6 +5350,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>เลือก</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <note>No comment provided by engineer.</note>
@@ -5637,6 +5663,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>
@@ -5670,6 +5700,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>แชร์ลิงก์</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <note>No comment provided by engineer.</note>
@@ -5821,6 +5855,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>
@@ -5983,6 +6021,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>TCP_KEEPINTVL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>ถ่ายภาพ</target>
@@ -6167,6 +6209,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>
@@ -7158,11 +7204,19 @@ 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>
        <note>No comment provided by engineer.</note>
      </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>
+        <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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>ผู้ติดต่อของคุณส่งไฟล์ที่ใหญ่กว่าขนาดสูงสุดที่รองรับในปัจจุบัน (%@)</target>
@@ -7206,13 +7260,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>
@@ -137,6 +137,10 @@
        <target>%@ bağlanmak istiyor!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve">
+        <source>%1$@, %2$@</source>
+        <note>format for date separator in chat</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
        <target>%@, %@ ve %lld üyeleri</target>
@@ -1005,6 +1009,10 @@
        <target>Fotoğrafları otomatik kabul et</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>Geri</target>
@@ -1169,7 +1177,7 @@
      <trans-unit id="Cancel" xml:space="preserve">
        <source>Cancel</source>
        <target>İptal et</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>
@@ -1313,6 +1321,10 @@
        <target>Sohbet tercihleri</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 theme" xml:space="preserve">
        <source>Chat theme</source>
        <note>No comment provided by engineer.</note>
@@ -1689,6 +1701,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
        <target>Çekirdek sürümü: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <target>İsim %@ olarak düzeltilsin mi?</target>
@@ -2653,6 +2669,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
        <target>Adres değiştirilirken hata oluştu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>Rol değiştirilirken hata oluştu</target>
@@ -2663,6 +2683,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
        <target>Ayar değiştirilirken hata oluştu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <note>No comment provided by engineer.</note>
@@ -2781,6 +2805,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
        <target>%@ sunucuları yüklenirken hata oluştu</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>Sohbeti açarken sorun oluştu</target>
@@ -2878,6 +2906,10 @@ Bu senin kendi tek kullanımlık bağlantın!</target>
        <target>Sohbet durdurulurken hata oluştu</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error switching profile" xml:space="preserve">
+        <source>Error switching profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error switching profile!" xml:space="preserve">
        <source>Error switching profile!</source>
        <target>Profil değiştirilirken hata oluştu!</target>
@@ -3203,11 +3235,6 @@ Hata: %2$@</target>
        <target>Bütün isim (opsiyonel)</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Full name:" xml:space="preserve">
-        <source>Full name:</source>
-        <target>Bütün isim:</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>Tamamiyle merkezi olmayan - sadece kişilere görünür.</target>
@@ -4084,6 +4111,10 @@ Bu senin grup için bağlantın %@!</target>
        <source>Message servers</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <target>Mesaj kaynağı gizli kalır.</target>
@@ -4902,16 +4933,6 @@ Hata: %@</target>
        <target>Profil resimleri</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Profile name" xml:space="preserve">
-        <source>Profile name</source>
-        <target>Profil ismi</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
-      <trans-unit id="Profile name:" xml:space="preserve">
-        <source>Profile name:</source>
-        <target>Profil ismi:</target>
-        <note>No comment provided by engineer.</note>
-      </trans-unit>
      <trans-unit id="Profile password" xml:space="preserve">
        <source>Profile password</source>
        <target>Profil parolası</target>
@@ -5222,6 +5243,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Sil</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>
@@ -5408,12 +5433,13 @@ Enable in *Network &amp; servers* settings.</source>
      <trans-unit id="Save" xml:space="preserve">
        <source>Save</source>
        <target>Kaydet</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>Kaydet (ve kişilere bildir)</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>
@@ -5439,11 +5465,6 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Arşivi kaydet</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>Otomatik kabul et ayarlarını kaydet</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>Grup profilini kaydet</target>
@@ -5479,16 +5500,15 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Sunucular kaydedilsin mi?</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Save settings?" xml:space="preserve">
-        <source>Save settings?</source>
-        <target>Ayarlar kaydedilsin mi?</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>Hoşgeldin mesajı kaydedilsin mi?</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>Kaydedildi</target>
@@ -5585,6 +5605,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Seç</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <note>No comment provided by engineer.</note>
@@ -5904,6 +5928,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Ayarlar</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>Profil resimlerini şekillendir</target>
@@ -5938,6 +5966,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Bağlantıyı paylaş</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <target>Bu tek kullanımlık bağlantı davetini paylaş</target>
@@ -6098,6 +6130,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>
@@ -6264,6 +6300,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>TCP_TVLDEKAL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>Fotoğraf çek</target>
@@ -6453,6 +6493,10 @@ Bazı hatalar nedeniyle veya bağlantı tehlikeye girdiğinde meydana gelebilir.
        <target>Yapıştırdığın metin bir SimpleX bağlantısı değildir.</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>
@@ -7512,11 +7556,19 @@ Bağlantı isteği tekrarlansın mı?</target>
        <target>Sohbet veritabanınız şifrelenmemiş - şifrelemek için parola ayarlayı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>Sohbet profillerin</target>
        <note>No comment provided by engineer.</note>
      </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>
+        <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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>Kişiniz şu anda desteklenen maksimum boyuttan (%@) daha büyük bir dosya gönderdi.</target>
@@ -7562,13 +7614,15 @@ Bağlantı isteği tekrarlansın mı?</target>
        <target>Profiliniz **%@** paylaşılacaktır.</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>Profiliniz cihazınızda saklanır ve sadece kişilerinizle paylaşılır.
-SimpleX sunucuları profilinizi göremez.</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>Profiliniz cihazınızda saklanır ve sadece kişilerinizle paylaşılır. SimpleX sunucuları profilinizi göremez.</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>Profiliniz, kişileriniz ve gönderilmiş mesajlar cihazınızda saklanır.</target>
@@ -137,6 +137,10 @@
        <target>%@ хоче підключитися!</target>
        <note>notification title</note>
      </trans-unit>
+      <trans-unit id="%@, %@" xml:space="preserve">
+        <source>%1$@, %2$@</source>
+        <note>format for date separator in chat</note>
+      </trans-unit>
      <trans-unit id="%@, %@ and %lld members" xml:space="preserve">
        <source>%@, %@ and %lld members</source>
        <target>%@, %@ та %lld учасників</target>
@@ -1020,6 +1024,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>
@@ -1193,7 +1201,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>
@@ -1341,6 +1349,10 @@
        <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 theme" xml:space="preserve">
        <source>Chat theme</source>
        <target>Тема чату</target>
@@ -1740,6 +1752,10 @@ This is your own one-time link!</source>
        <target>Основна версія: v%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Corner" xml:space="preserve">
+        <source>Corner</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Correct name to %@?" xml:space="preserve">
        <source>Correct name to %@?</source>
        <target>Виправити ім'я на %@?</target>
@@ -2724,6 +2740,10 @@ This is your own one-time link!</source>
        <target>Помилка зміни адреси</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing connection profile" xml:space="preserve">
+        <source>Error changing connection profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error changing role" xml:space="preserve">
        <source>Error changing role</source>
        <target>Помилка зміни ролі</target>
@@ -2734,6 +2754,10 @@ This is your own one-time link!</source>
        <target>Помилка зміни налаштування</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Error changing to incognito!" xml:space="preserve">
+        <source>Error changing to incognito!</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Error connecting to forwarding server %@. Please try later." xml:space="preserve">
        <source>Error connecting to forwarding server %@. Please try later.</source>
        <target>Помилка підключення до сервера переадресації %@. Спробуйте пізніше.</target>
@@ -2854,6 +2878,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>
@@ -2954,6 +2982,10 @@ This is your own one-time link!</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>
+        <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>
@@ -3289,11 +3321,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>
@@ -4184,6 +4211,10 @@ This is your link for group %@!</source>
        <target>Сервери повідомлень</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Message shape" xml:space="preserve">
+        <source>Message shape</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Message source remains private." xml:space="preserve">
        <source>Message source remains private.</source>
        <target>Джерело повідомлення залишається приватним.</target>
@@ -5021,16 +5052,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>
@@ -5354,6 +5375,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>
@@ -5547,12 +5572,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>
@@ -5579,11 +5605,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>
@@ -5619,16 +5640,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>
@@ -5729,6 +5749,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Виберіть</target>
        <note>chat item action</note>
      </trans-unit>
+      <trans-unit id="Select chat profile" xml:space="preserve">
+        <source>Select chat profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Selected %lld" xml:space="preserve">
        <source>Selected %lld</source>
        <target>Вибрано %lld</target>
@@ -6064,6 +6088,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>
@@ -6099,6 +6127,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>Поділіться посиланням</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Share profile" xml:space="preserve">
+        <source>Share profile</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Share this 1-time invite link" xml:space="preserve">
        <source>Share this 1-time invite link</source>
        <target>Поділіться цим одноразовим посиланням-запрошенням</target>
@@ -6264,6 +6296,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>
@@ -6439,6 +6475,10 @@ Enable in *Network &amp; servers* settings.</source>
        <target>TCP_KEEPINTVL</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Tail" xml:space="preserve">
+        <source>Tail</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
      <trans-unit id="Take picture" xml:space="preserve">
        <source>Take picture</source>
        <target>Сфотографуйте</target>
@@ -6631,6 +6671,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>
@@ -7714,11 +7758,19 @@ 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>
        <note>No comment provided by engineer.</note>
      </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>
+        <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">
        <source>Your contact sent a file that is larger than currently supported maximum size (%@).</source>
        <target>Ваш контакт надіслав файл, розмір якого перевищує підтримуваний на цей момент максимальний розмір (%@).</target>
@@ -7764,13 +7816,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>
@@ -573,17 +573,22 @@ func receivedMsgNtf(_ res: ChatResponse) async -> (String, NSENotification)? {
 //            TODO profile update
    case let .receivedContactRequest(user, contactRequest):
        return (UserContact(contactRequest: contactRequest).id, .nse(createContactRequestNtf(user, contactRequest)))
-    case let .newChatItem(user, aChatItem):
-        let cInfo = aChatItem.chatInfo
-        var cItem = aChatItem.chatItem
-        if !cInfo.ntfsEnabled {
-            ntfBadgeCountGroupDefault.set(max(0, ntfBadgeCountGroupDefault.get() - 1))
+    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
+        } else {
+            return nil
        }
-        if let file = cItem.autoReceiveFile() {
-            cItem = autoReceiveFile(file) ?? cItem
-        }
-        let ntf: NSENotification = cInfo.ntfsEnabled ? .nse(createMessageReceivedNtf(user, cInfo, cItem)) : .empty
-        return cItem.showNotification ? (aChatItem.chatId, ntf) : nil
    case let .rcvFileSndCancelled(_, aChatItem, _):
        cleanupFile(aChatItem)
        return nil
@@ -54,32 +54,30 @@ func apiGetChats(userId: User.ID) throws -> Array<ChatData> {
    throw r
 }

-func apiSendMessage(
+func apiSendMessages(
    chatInfo: ChatInfo,
-    cryptoFile: CryptoFile?,
-    msgContent: MsgContent
-) throws -> AChatItem {
+    composedMessages: [ComposedMessage]
+) throws -> [AChatItem] {
    let r = sendSimpleXCmd(
        chatInfo.chatType == .local
-        ? .apiCreateChatItem(
+        ? .apiCreateChatItems(
            noteFolderId: chatInfo.apiId,
-            file: cryptoFile,
-            msg: msgContent
+            composedMessages: composedMessages
        )
-        : .apiSendMessage(
+        : .apiSendMessages(
            type: chatInfo.chatType,
            id: chatInfo.apiId,
-            file: cryptoFile,
-            quotedItemId: nil,
-            msg: msgContent,
            live: false,
-            ttl: nil
+            ttl: nil,
+            composedMessages: composedMessages
        )
    )
-    if case let .newChatItem(_, chatItem) = r {
-        return chatItem
+    if case let .newChatItems(_, chatItems) = r {
+        return chatItems
    } else {
-        if let filePath = cryptoFile?.filePath { removeFile(filePath) }
+        for composedMessage in composedMessages {
+            if let filePath = composedMessage.fileSource?.filePath { removeFile(filePath) }
+        }
        throw r
    }
 }
@@ -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
                            }
                        }
@@ -141,23 +141,25 @@ class ShareModel: ObservableObject {
                do {
                    SEChatState.shared.set(.sendingMessage)
                    await waitForOtherProcessesToSuspend()
-                    let ci = try apiSendMessage(
+                    let chatItems = try apiSendMessages(
                        chatInfo: selected.chatInfo,
-                        cryptoFile: sharedContent.cryptoFile,
-                        msgContent: sharedContent.msgContent(comment: self.comment)
+                        composedMessages: [ComposedMessage(fileSource: sharedContent.cryptoFile, msgContent: sharedContent.msgContent(comment: self.comment))]
                    )
                    if selected.chatInfo.chatType == .local {
                        completion()
                    } else {
-                        await MainActor.run { self.bottomBar = .loadingBar(progress: 0) }
-                        if let e = await handleEvents(
-                            isGroupChat: ci.chatInfo.chatType == .group,
-                            isWithoutFile: sharedContent.cryptoFile == nil,
-                            chatItemId: ci.chatItem.id
-                        ) {
-                            await MainActor.run { errorAlert = e }
-                        } else {
-                            completion()
+                        // TODO batch send: share multiple items
+                        if let ci = chatItems.first {
+                            await MainActor.run { self.bottomBar = .loadingBar(progress: 0) }
+                            if let e = await handleEvents(
+                                isGroupChat: ci.chatInfo.chatType == .group,
+                                isWithoutFile: sharedContent.cryptoFile == nil,
+                                chatItemId: ci.chatItem.id
+                            ) {
+                                await MainActor.run { errorAlert = e }
+                            } else {
+                                completion()
+                            }
                        }
                    }
                } catch {
@@ -318,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
@@ -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)
@@ -1,7 +1,9 @@
-/* 
-  InfoPlist.strings
-  SimpleX
+/* Bundle display name */
+"CFBundleDisplayName" = "SimpleX SE";
+
+/* Bundle name */
+"CFBundleName" = "SimpleX SE";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "版权所有 © 2024 SimpleX Chat。保留所有权利。";

-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
@@ -1,7 +1,111 @@
-/* 
-  Localizable.strings
-  SimpleX
+/* No comment provided by engineer. */
+"%@" = "%@";
+
+/* No comment provided by engineer. */
+"App is locked!" = "应用程序已锁定！";
+
+/* No comment provided by engineer. */
+"Cancel" = "取消";
+
+/* No comment provided by engineer. */
+"Cannot access keychain to save database password" = "无法访问钥匙串以保存数据库密码";
+
+/* No comment provided by engineer. */
+"Cannot forward message" = "无法转发消息";
+
+/* No comment provided by engineer. */
+"Comment" = "评论";
+
+/* No comment provided by engineer. */
+"Currently maximum supported file size is %@." = "当前支持的最大文件大小为 %@。";
+
+/* No comment provided by engineer. */
+"Database downgrade required" = "需要数据库降级";
+
+/* No comment provided by engineer. */
+"Database encrypted!" = "数据库已加密！";
+
+/* No comment provided by engineer. */
+"Database error" = "数据库错误";
+
+/* No comment provided by engineer. */
+"Database passphrase is different from saved in the keychain." = "数据库密码与保存在钥匙串中的密码不同。";
+
+/* No comment provided by engineer. */
+"Database passphrase is required to open chat." = "需要数据库密码才能打开聊天。";
+
+/* No comment provided by engineer. */
+"Database upgrade required" = "需要升级数据库";
+
+/* No comment provided by engineer. */
+"Error preparing file" = "准备文件时出错";
+
+/* No comment provided by engineer. */
+"Error preparing message" = "准备消息时出错";
+
+/* No comment provided by engineer. */
+"Error: %@" = "错误：%@";
+
+/* No comment provided by engineer. */
+"File error" = "文件错误";
+
+/* No comment provided by engineer. */
+"Incompatible database version" = "不兼容的数据库版本";
+
+/* No comment provided by engineer. */
+"Invalid migration confirmation" = "无效的迁移确认";
+
+/* No comment provided by engineer. */
+"Keychain error" = "钥匙串错误";
+
+/* No comment provided by engineer. */
+"Large file!" = "大文件！";
+
+/* No comment provided by engineer. */
+"No active profile" = "无活动配置文件";
+
+/* No comment provided by engineer. */
+"Ok" = "好的";
+
+/* No comment provided by engineer. */
+"Open the app to downgrade the database." = "打开应用程序以降级数据库。";
+
+/* No comment provided by engineer. */
+"Open the app to upgrade the database." = "打开应用程序以升级数据库。";
+
+/* No comment provided by engineer. */
+"Passphrase" = "密码";
+
+/* No comment provided by engineer. */
+"Please create a profile in the SimpleX app" = "请在 SimpleX 应用程序中创建配置文件";
+
+/* No comment provided by engineer. */
+"Selected chat preferences prohibit this message." = "选定的聊天首选项禁止此消息。";
+
+/* No comment provided by engineer. */
+"Sending a message takes longer than expected." = "发送消息所需的时间比预期的要长。";
+
+/* No comment provided by engineer. */
+"Sending message…" = "正在发送消息…";
+
+/* No comment provided by engineer. */
+"Share" = "共享";
+
+/* No comment provided by engineer. */
+"Slow network?" = "网络速度慢？";
+
+/* No comment provided by engineer. */
+"Unknown database error: %@" = "未知数据库错误： %@";
+
+/* No comment provided by engineer. */
+"Unsupported format" = "不支持的格式";
+
+/* No comment provided by engineer. */
+"Wait" = "等待";
+
+/* No comment provided by engineer. */
+"Wrong database passphrase" = "数据库密码错误";
+
+/* No comment provided by engineer. */
+"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "您可以在 \"隐私与安全\"/\"SimpleX Lock \"设置中允许共享。";

-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
@@ -177,6 +177,8 @@
 		64E972072881BB22008DBC02 /* CIGroupInvitationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64E972062881BB22008DBC02 /* CIGroupInvitationView.swift */; };
 		64EEB0F72C353F1C00972D62 /* ServersSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64EEB0F62C353F1C00972D62 /* ServersSummaryView.swift */; };
 		64F1CC3B28B39D8600CD1FB1 /* IncognitoHelp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */; };
+		8C01E9C12C8EFC33008A4B0A /* objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C01E9C02C8EFC33008A4B0A /* objc.m */; };
+		8C01E9C22C8EFF8F008A4B0A /* objc.h in Headers */ = {isa = PBXBuildFile; fileRef = 8C01E9BF2C8EFBB6008A4B0A /* objc.h */; };
 		8C69FE7D2B8C7D2700267E38 /* AppSettings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C69FE7C2B8C7D2700267E38 /* AppSettings.swift */; };
 		8C74C3E52C1B900600039E77 /* ThemeTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C7E3CE32C0DEAC400BFF63A /* ThemeTypes.swift */; };
 		8C74C3E72C1B901900039E77 /* Color.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C852B072C1086D100BA61E8 /* Color.swift */; };
@@ -194,6 +196,7 @@
 		8CC956EE2BC0041000412A11 /* NetworkObserver.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CC956ED2BC0041000412A11 /* NetworkObserver.swift */; };
 		8CE848A32C5A0FA000D5C7C8 /* SelectableChatItemToolbars.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CE848A22C5A0FA000D5C7C8 /* SelectableChatItemToolbars.swift */; };
 		B76E6C312C5C41D900EC11AA /* ContactListNavLink.swift in Sources */ = {isa = PBXBuildFile; fileRef = B76E6C302C5C41D900EC11AA /* ContactListNavLink.swift */; };
+		CE176F202C87014C00145DBC /* InvertedForegroundStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE176F1F2C87014C00145DBC /* InvertedForegroundStyle.swift */; };
 		CE1EB0E42C459A660099D896 /* ShareAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE1EB0E32C459A660099D896 /* ShareAPI.swift */; };
 		CE2AD9CE2C452A4D00E844E3 /* ChatUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE2AD9CD2C452A4D00E844E3 /* ChatUtils.swift */; };
 		CE3097FB2C4C0C9F00180898 /* ErrorAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE3097FA2C4C0C9F00180898 /* ErrorAlert.swift */; };
@@ -201,6 +204,7 @@
 		CE38A29C2C3FCD72005ED185 /* SwiftyGif in Frameworks */ = {isa = PBXBuildFile; productRef = CE38A29B2C3FCD72005ED185 /* SwiftyGif */; };
 		CE75480A2C622630009579B7 /* SwipeLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE7548092C622630009579B7 /* SwipeLabel.swift */; };
 		CE984D4B2C36C5D500E3AEFF /* ChatItemClipShape.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE984D4A2C36C5D500E3AEFF /* ChatItemClipShape.swift */; };
+		CEA034032C9C0F1800B587E7 /* TranslateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEA034022C9C0F1800B587E7 /* TranslateView.swift */; };
 		CEDE70222C48FD9500233B1F /* SEChatState.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEDE70212C48FD9500233B1F /* SEChatState.swift */; };
 		CEE723AA2C3BD3D70009AE93 /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE723A92C3BD3D70009AE93 /* ShareViewController.swift */; };
 		CEE723B12C3BD3D70009AE93 /* SimpleX SE.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = CEE723A72C3BD3D70009AE93 /* SimpleX SE.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -214,11 +218,11 @@
 		D77B92DC2952372200A5A1CC /* SwiftyGif in Frameworks */ = {isa = PBXBuildFile; productRef = D77B92DB2952372200A5A1CC /* SwiftyGif */; };
 		D7F0E33929964E7E0068AF69 /* LZString in Frameworks */ = {isa = PBXBuildFile; productRef = D7F0E33829964E7E0068AF69 /* LZString */; };
 		E51CC1E62C62085600DB91FE /* OneHandUICard.swift in Sources */ = {isa = PBXBuildFile; fileRef = E51CC1E52C62085600DB91FE /* OneHandUICard.swift */; };
-		E5BD844D2C8220D0008C24D1 /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5BD84482C8220D0008C24D1 /* libffi.a */; };
-		E5BD844E2C8220D0008C24D1 /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5BD84492C8220D0008C24D1 /* libgmpxx.a */; };
-		E5BD844F2C8220D0008C24D1 /* libHSsimplex-chat-6.0.4.0-2x1D8vVukGZOGJwEVzeob-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5BD844A2C8220D0008C24D1 /* libHSsimplex-chat-6.0.4.0-2x1D8vVukGZOGJwEVzeob-ghc9.6.3.a */; };
-		E5BD84502C8220D0008C24D1 /* libHSsimplex-chat-6.0.4.0-2x1D8vVukGZOGJwEVzeob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5BD844B2C8220D0008C24D1 /* libHSsimplex-chat-6.0.4.0-2x1D8vVukGZOGJwEVzeob.a */; };
-		E5BD84512C8220D0008C24D1 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E5BD844C2C8220D0008C24D1 /* libgmp.a */; };
+		E55128E72C9AD063001D165C /* libHSsimplex-chat-6.1.0.2-ItgztLmvKyzFsOmChHMkFt.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E55128E22C9AD063001D165C /* libHSsimplex-chat-6.1.0.2-ItgztLmvKyzFsOmChHMkFt.a */; };
+		E55128E82C9AD063001D165C /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E55128E32C9AD063001D165C /* libgmp.a */; };
+		E55128E92C9AD063001D165C /* libHSsimplex-chat-6.1.0.2-ItgztLmvKyzFsOmChHMkFt-ghc9.6.3.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E55128E42C9AD063001D165C /* libHSsimplex-chat-6.1.0.2-ItgztLmvKyzFsOmChHMkFt-ghc9.6.3.a */; };
+		E55128EA2C9AD063001D165C /* libgmpxx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E55128E52C9AD063001D165C /* libgmpxx.a */; };
+		E55128EB2C9AD063001D165C /* libffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E55128E62C9AD063001D165C /* libffi.a */; };
 		E5DCF8DB2C56FAC1007928CC /* SimpleXChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; };
 		E5DCF9712C590272007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF96F2C590272007928CC /* Localizable.strings */; };
 		E5DCF9842C5902CE007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF9822C5902CE007928CC /* Localizable.strings */; };
@@ -516,6 +520,8 @@
 		64E972062881BB22008DBC02 /* CIGroupInvitationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CIGroupInvitationView.swift; sourceTree = "<group>"; };
 		64EEB0F62C353F1C00972D62 /* ServersSummaryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ServersSummaryView.swift; sourceTree = "<group>"; };
 		64F1CC3A28B39D8600CD1FB1 /* IncognitoHelp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IncognitoHelp.swift; sourceTree = "<group>"; };
+		8C01E9BF2C8EFBB6008A4B0A /* objc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = objc.h; sourceTree = "<group>"; };
+		8C01E9C02C8EFC33008A4B0A /* objc.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = objc.m; sourceTree = "<group>"; };
 		8C69FE7C2B8C7D2700267E38 /* AppSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppSettings.swift; sourceTree = "<group>"; };
 		8C74C3EB2C1B92A900039E77 /* Theme.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Theme.swift; sourceTree = "<group>"; };
 		8C74C3ED2C1B942300039E77 /* ChatWallpaper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatWallpaper.swift; sourceTree = "<group>"; };
@@ -532,11 +538,13 @@
 		8CC956ED2BC0041000412A11 /* NetworkObserver.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkObserver.swift; sourceTree = "<group>"; };
 		8CE848A22C5A0FA000D5C7C8 /* SelectableChatItemToolbars.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectableChatItemToolbars.swift; sourceTree = "<group>"; };
 		B76E6C302C5C41D900EC11AA /* ContactListNavLink.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContactListNavLink.swift; sourceTree = "<group>"; };
+		CE176F1F2C87014C00145DBC /* InvertedForegroundStyle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvertedForegroundStyle.swift; sourceTree = "<group>"; };
 		CE1EB0E32C459A660099D896 /* ShareAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareAPI.swift; sourceTree = "<group>"; };
 		CE2AD9CD2C452A4D00E844E3 /* ChatUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatUtils.swift; sourceTree = "<group>"; };
 		CE3097FA2C4C0C9F00180898 /* ErrorAlert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorAlert.swift; sourceTree = "<group>"; };
 		CE7548092C622630009579B7 /* SwipeLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwipeLabel.swift; sourceTree = "<group>"; };
 		CE984D4A2C36C5D500E3AEFF /* ChatItemClipShape.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatItemClipShape.swift; sourceTree = "<group>"; };
+		CEA034022C9C0F1800B587E7 /* TranslateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TranslateView.swift; sourceTree = "<group>"; };
 		CEDE70212C48FD9500233B1F /* SEChatState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SEChatState.swift; sourceTree = "<group>"; };
 		CEE723A72C3BD3D70009AE93 /* SimpleX SE.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = "SimpleX SE.appex"; sourceTree = BUILT_PRODUCTS_DIR; };
 		CEE723A92C3BD3D70009AE93 /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = "<group>"; };
@@ -550,11 +558,11 @@
 		D741547929AF90B00022400A /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/PushKit.framework; sourceTree = DEVELOPER_DIR; };
 		D7AA2C3429A936B400737B40 /* MediaEncryption.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; name = MediaEncryption.playground; path = Shared/MediaEncryption.playground; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		E51CC1E52C62085600DB91FE /* OneHandUICard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneHandUICard.swift; sourceTree = "<group>"; };
-		E5BD84482C8220D0008C24D1 /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
-		E5BD84492C8220D0008C24D1 /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
-		E5BD844A2C8220D0008C24D1 /* libHSsimplex-chat-6.0.4.0-2x1D8vVukGZOGJwEVzeob-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.4.0-2x1D8vVukGZOGJwEVzeob-ghc9.6.3.a"; sourceTree = "<group>"; };
-		E5BD844B2C8220D0008C24D1 /* libHSsimplex-chat-6.0.4.0-2x1D8vVukGZOGJwEVzeob.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.0.4.0-2x1D8vVukGZOGJwEVzeob.a"; sourceTree = "<group>"; };
-		E5BD844C2C8220D0008C24D1 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		E55128E22C9AD063001D165C /* libHSsimplex-chat-6.1.0.2-ItgztLmvKyzFsOmChHMkFt.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.1.0.2-ItgztLmvKyzFsOmChHMkFt.a"; sourceTree = "<group>"; };
+		E55128E32C9AD063001D165C /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmp.a; sourceTree = "<group>"; };
+		E55128E42C9AD063001D165C /* libHSsimplex-chat-6.1.0.2-ItgztLmvKyzFsOmChHMkFt-ghc9.6.3.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libHSsimplex-chat-6.1.0.2-ItgztLmvKyzFsOmChHMkFt-ghc9.6.3.a"; sourceTree = "<group>"; };
+		E55128E52C9AD063001D165C /* libgmpxx.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libgmpxx.a; sourceTree = "<group>"; };
+		E55128E62C9AD063001D165C /* libffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libffi.a; sourceTree = "<group>"; };
 		E5DCF9702C590272007928CC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E5DCF9722C590274007928CC /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E5DCF9732C590275007928CC /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -645,14 +653,14 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				E55128E72C9AD063001D165C /* libHSsimplex-chat-6.1.0.2-ItgztLmvKyzFsOmChHMkFt.a in Frameworks */,
+				E55128E82C9AD063001D165C /* libgmp.a in Frameworks */,
 				5CE2BA93284534B000EC33A6 /* libiconv.tbd in Frameworks */,
-				E5BD844E2C8220D0008C24D1 /* libgmpxx.a in Frameworks */,
-				E5BD84512C8220D0008C24D1 /* libgmp.a in Frameworks */,
+				E55128EB2C9AD063001D165C /* libffi.a in Frameworks */,
 				5CE2BA94284534BB00EC33A6 /* libz.tbd in Frameworks */,
+				E55128E92C9AD063001D165C /* libHSsimplex-chat-6.1.0.2-ItgztLmvKyzFsOmChHMkFt-ghc9.6.3.a in Frameworks */,
 				CE38A29C2C3FCD72005ED185 /* SwiftyGif in Frameworks */,
-				E5BD84502C8220D0008C24D1 /* libHSsimplex-chat-6.0.4.0-2x1D8vVukGZOGJwEVzeob.a in Frameworks */,
-				E5BD844D2C8220D0008C24D1 /* libffi.a in Frameworks */,
-				E5BD844F2C8220D0008C24D1 /* libHSsimplex-chat-6.0.4.0-2x1D8vVukGZOGJwEVzeob-ghc9.6.3.a in Frameworks */,
+				E55128EA2C9AD063001D165C /* libgmpxx.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -721,6 +729,7 @@
 				5CBE6C132944CC12002D9531 /* ScanCodeView.swift */,
 				64C06EB42A0A4A7C00792D4D /* ChatItemInfoView.swift */,
 				648679AA2BC96A74006456E7 /* ChatItemForwardingView.swift */,
+				CEA034022C9C0F1800B587E7 /* TranslateView.swift */,
 				8CE848A22C5A0FA000D5C7C8 /* SelectableChatItemToolbars.swift */,
 			);
 			path = Chat;
@@ -729,11 +738,11 @@
 		5C764E5C279C70B7000C6508 /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				E5BD84482C8220D0008C24D1 /* libffi.a */,
-				E5BD844C2C8220D0008C24D1 /* libgmp.a */,
-				E5BD84492C8220D0008C24D1 /* libgmpxx.a */,
-				E5BD844A2C8220D0008C24D1 /* libHSsimplex-chat-6.0.4.0-2x1D8vVukGZOGJwEVzeob-ghc9.6.3.a */,
-				E5BD844B2C8220D0008C24D1 /* libHSsimplex-chat-6.0.4.0-2x1D8vVukGZOGJwEVzeob.a */,
+				E55128E62C9AD063001D165C /* libffi.a */,
+				E55128E32C9AD063001D165C /* libgmp.a */,
+				E55128E52C9AD063001D165C /* libgmpxx.a */,
+				E55128E42C9AD063001D165C /* libHSsimplex-chat-6.1.0.2-ItgztLmvKyzFsOmChHMkFt-ghc9.6.3.a */,
+				E55128E22C9AD063001D165C /* libHSsimplex-chat-6.1.0.2-ItgztLmvKyzFsOmChHMkFt.a */,
 			);
 			path = Libraries;
 			sourceTree = "<group>";
@@ -789,6 +798,7 @@
 				8C9BC2642C240D5100875A27 /* ThemeModeEditor.swift */,
 				CE984D4A2C36C5D500E3AEFF /* ChatItemClipShape.swift */,
 				CE7548092C622630009579B7 /* SwipeLabel.swift */,
+				CE176F1F2C87014C00145DBC /* InvertedForegroundStyle.swift */,
 			);
 			path = Helpers;
 			sourceTree = "<group>";
@@ -976,6 +986,8 @@
 				5CE2BA96284537A800EC33A6 /* dummy.m */,
 				5CD67B8D2B0E858A00C510B1 /* hs_init.h */,
 				5CD67B8E2B0E858A00C510B1 /* hs_init.c */,
+				8C01E9BF2C8EFBB6008A4B0A /* objc.h */,
+				8C01E9C02C8EFC33008A4B0A /* objc.m */,
 			);
 			path = SimpleXChat;
 			sourceTree = "<group>";
@@ -1113,6 +1125,7 @@
 			files = (
 				5CE2BA77284530BF00EC33A6 /* SimpleXChat.h in Headers */,
 				5CD67B8F2B0E858A00C510B1 /* hs_init.h in Headers */,
+				8C01E9C22C8EFF8F008A4B0A /* objc.h in Headers */,
 				5CE2BA952845354B00EC33A6 /* SimpleX.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1383,6 +1396,7 @@
 				5CB634A829E437960066AD6B /* PasscodeEntry.swift in Sources */,
 				5CFA59C42860BC6200863A68 /* MigrateToAppGroupView.swift in Sources */,
 				648010AB281ADD15009009B9 /* CIFileView.swift in Sources */,
+				CEA034032C9C0F1800B587E7 /* TranslateView.swift in Sources */,
 				644EFFE2292D089800525D5B /* FramedCIVoiceView.swift in Sources */,
 				5C4B3B0A285FB130003915F2 /* DatabaseView.swift in Sources */,
 				5CB2084F28DA4B4800D024EC /* RTCServers.swift in Sources */,
@@ -1489,6 +1503,7 @@
 				5C9CC7A928C532AB00BEF955 /* DatabaseErrorView.swift in Sources */,
 				5C1A4C1E27A715B700EAD5AD /* ChatItemView.swift in Sources */,
 				64AA1C6927EE10C800AC7277 /* ContextItemView.swift in Sources */,
+				CE176F202C87014C00145DBC /* InvertedForegroundStyle.swift in Sources */,
 				5CEBD7482A5F115D00665FE2 /* SetDeliveryReceiptsView.swift in Sources */,
 				5C9C2DA7289957AE00CC63B1 /* AdvancedNetworkSettings.swift in Sources */,
 				5CADE79A29211BB900072E13 /* PreferencesView.swift in Sources */,
@@ -1539,6 +1554,7 @@
 				8C74C3E72C1B901900039E77 /* Color.swift in Sources */,
 				5CD67B902B0E858A00C510B1 /* hs_init.c in Sources */,
 				5CE2BA91284533A300EC33A6 /* Notifications.swift in Sources */,
+				8C01E9C12C8EFC33008A4B0A /* objc.m in Sources */,
 				5CE2BA79284530CC00EC33A6 /* SimpleXChat.docc in Sources */,
 				5CE2BA90284533A300EC33A6 /* JSON.swift in Sources */,
 				5CE2BA8B284533A300EC33A6 /* ChatTypes.swift in Sources */,
@@ -1879,7 +1895,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 236;
+				CURRENT_PROJECT_VERSION = 237;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1904,7 +1920,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES_THIN;
-				MARKETING_VERSION = 6.0.4;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1928,7 +1944,7 @@
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_ENTITLEMENTS = "SimpleX (iOS).entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 236;
+				CURRENT_PROJECT_VERSION = 237;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
@@ -1953,7 +1969,7 @@
 					"@executable_path/Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.4;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.app;
 				PRODUCT_NAME = SimpleX;
 				SDKROOT = iphoneos;
@@ -1969,11 +1985,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 236;
+				CURRENT_PROJECT_VERSION = 237;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.0.4;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -1989,11 +2005,11 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 236;
+				CURRENT_PROJECT_VERSION = 237;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				GENERATE_INFOPLIST_FILE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 15.0;
-				MARKETING_VERSION = 6.0.4;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.Tests-iOS";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2014,7 +2030,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 236;
+				CURRENT_PROJECT_VERSION = 237;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				GCC_OPTIMIZATION_LEVEL = s;
@@ -2029,7 +2045,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.4;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2051,7 +2067,7 @@
 				CODE_SIGN_ENTITLEMENTS = "SimpleX NSE/SimpleX NSE.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 236;
+				CURRENT_PROJECT_VERSION = 237;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_BITCODE = NO;
 				ENABLE_CODE_COVERAGE = NO;
@@ -2066,7 +2082,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.4;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-NSE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2088,7 +2104,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 236;
+				CURRENT_PROJECT_VERSION = 237;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2114,7 +2130,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.4;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2139,7 +2155,7 @@
 				CLANG_TIDY_BUGPRONE_REDUNDANT_BRANCH_CONDITION = YES;
 				CLANG_TIDY_MISC_REDUNDANT_EXPRESSION = YES;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 236;
+				CURRENT_PROJECT_VERSION = 237;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -2165,7 +2181,7 @@
 					"$(PROJECT_DIR)/Libraries/sim",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 6.0.4;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = chat.simplex.SimpleXChat;
 				PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
 				SDKROOT = iphoneos;
@@ -2190,7 +2206,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 236;
+				CURRENT_PROJECT_VERSION = 237;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2205,7 +2221,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.0.4;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -2224,7 +2240,7 @@
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
 				CODE_SIGN_ENTITLEMENTS = "SimpleX SE/SimpleX SE.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 236;
+				CURRENT_PROJECT_VERSION = 237;
 				DEVELOPMENT_TEAM = 5NN7GUYB6T;
 				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu17;
@@ -2239,7 +2255,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
-				MARKETING_VERSION = 6.0.4;
+				MARKETING_VERSION = 6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "chat.simplex.app.SimpleX-SE";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = iphoneos;
@@ -177,14 +177,66 @@ public func fromCString(_ c: UnsafeMutablePointer<CChar>) -> String {
    return s
 }

+// TODO: Remove after XCode 16 crash has been resolved/merged
+class ThreadExecutor<ResultType> {
+    private var stackSize: Int
+    private var qos: QualityOfService
+
+    /// Initialize by specifying the stack size
+    init(stackSize: Int, qos: QualityOfService) {
+        self.stackSize = stackSize
+        self.qos = qos
+    }
+
+    /// Execute a closure synchronously on a separate thread and return the result
+    func executeSync(_ task: @escaping () throws -> ResultType) throws -> ResultType {
+        // Initialize the semaphore (initially locked)
+        let semaphore = DispatchSemaphore(value: 0)
+        var result: Result<ResultType, Error>?
+
+        // Initialize the thread
+        let thread = Thread {
+            do {
+                let taskResult = try task()
+                result = .success(taskResult)
+            } catch {
+                result = .failure(error)
+            }
+            // Release the semaphore when the task is completed
+            semaphore.signal()
+        }
+
+        thread.stackSize = stackSize
+        thread.qualityOfService = qos
+
+        thread.start()
+
+        // Wait until the thread completes
+        semaphore.wait()
+
+        // Return the result
+        switch result! {
+        case .success(let result):
+            return result
+        case .failure(let error):
+            throw error
+        }
+    }
+}
+
 public func chatResponse(_ s: String) -> ChatResponse {
    let d = s.data(using: .utf8)!
    // TODO is there a way to do it without copying the data? e.g:
    //    let p = UnsafeMutableRawPointer.init(mutating: UnsafeRawPointer(cjson))
    //    let d = Data.init(bytesNoCopy: p, count: strlen(cjson), deallocator: .free)
    do {
-        let r = try jsonDecoder.decode(APIResponse.self, from: d)
-        return r.resp
+        let executor = ThreadExecutor<APIResponse>(
+            stackSize: 2*1024*1024, // 2MiB
+            qos: Thread.current.qualityOfService // inherit priority
+        )
+        return try executor.executeSync {
+            try jsonDecoder.decode(APIResponse.self, from: d)
+        }.resp
    } catch {
        logger.error("chatResponse jsonDecoder.decode error: \(error.localizedDescription)")
    }
@@ -8,6 +8,7 @@

 import Foundation
 import SwiftUI
+import Network

 public let jsonDecoder = getJSONDecoder()
 public let jsonEncoder = getJSONEncoder()
@@ -42,13 +43,14 @@ public enum ChatCommand {
    case apiGetChats(userId: Int64)
    case apiGetChat(type: ChatType, id: Int64, pagination: ChatPagination, search: String)
    case apiGetChatItemInfo(type: ChatType, id: Int64, itemId: Int64)
-    case apiSendMessage(type: ChatType, id: Int64, file: CryptoFile?, quotedItemId: Int64?, msg: MsgContent, live: Bool, ttl: Int?)
-    case apiCreateChatItem(noteFolderId: Int64, file: CryptoFile?, msg: MsgContent)
+    case apiSendMessages(type: ChatType, id: Int64, live: Bool, ttl: Int?, composedMessages: [ComposedMessage])
+    case apiCreateChatItems(noteFolderId: Int64, composedMessages: [ComposedMessage])
    case apiUpdateChatItem(type: ChatType, id: Int64, itemId: Int64, msg: MsgContent, live: Bool)
    case apiDeleteChatItem(type: ChatType, id: Int64, itemIds: [Int64], mode: CIDeleteMode)
    case apiDeleteMemberChatItem(groupId: Int64, itemIds: [Int64])
    case apiChatItemReaction(type: ChatType, id: Int64, itemId: Int64, add: Bool, reaction: MsgReaction)
-    case apiForwardChatItem(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemId: Int64, ttl: Int?)
+    case apiPlanForwardChatItems(toChatType: ChatType, toChatId: Int64, itemIds: [Int64])
+    case apiForwardChatItems(toChatType: ChatType, toChatId: Int64, fromChatType: ChatType, fromChatId: Int64, itemIds: [Int64], ttl: Int?)
    case apiGetNtfToken
    case apiRegisterToken(token: DeviceToken, notificationMode: NotificationsMode)
    case apiVerifyToken(token: DeviceToken, nonce: String, code: String)
@@ -97,6 +99,7 @@ public enum ChatCommand {
    case apiVerifyGroupMember(groupId: Int64, groupMemberId: Int64, connectionCode: String?)
    case apiAddContact(userId: Int64, incognito: Bool)
    case apiSetConnectionIncognito(connId: Int64, incognito: Bool)
+    case apiChangeConnectionUser(connId: Int64, userId: Int64)
    case apiConnectPlan(userId: Int64, connReq: String)
    case apiConnect(userId: Int64, incognito: Bool, connReq: String)
    case apiConnectContactViaAddress(userId: Int64, incognito: Bool, contactId: Int64)
@@ -128,6 +131,7 @@ public enum ChatCommand {
    // WebRTC calls /
    case apiGetNetworkStatuses
    case apiChatRead(type: ChatType, id: Int64, itemRange: (Int64, Int64))
+    case apiChatItemsRead(type: ChatType, id: Int64, itemIds: [Int64])
    case apiChatUnread(type: ChatType, id: Int64, unreadChat: Bool)
    case receiveFile(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool?, inline: Bool?)
    case setFileToReceive(fileId: Int64, userApprovedRelays: Bool, encrypted: Bool?)
@@ -190,20 +194,21 @@ public enum ChatCommand {
            case let .apiGetChat(type, id, pagination, search): return "/_get chat \(ref(type, id)) \(pagination.cmdString)" +
                (search == "" ? "" : " search=\(search)")
            case let .apiGetChatItemInfo(type, id, itemId): return "/_get item info \(ref(type, id)) \(itemId)"
-            case let .apiSendMessage(type, id, file, quotedItemId, mc, live, ttl):
-                let msg = encodeJSON(ComposedMessage(fileSource: file, quotedItemId: quotedItemId, msgContent: mc))
+            case let .apiSendMessages(type, id, live, ttl, composedMessages):
+                let msgs = encodeJSON(composedMessages)
                let ttlStr = ttl != nil ? "\(ttl!)" : "default"
-                return "/_send \(ref(type, id)) live=\(onOff(live)) ttl=\(ttlStr) json \(msg)"
-            case let .apiCreateChatItem(noteFolderId, file, mc):
-                let msg = encodeJSON(ComposedMessage(fileSource: file, msgContent: mc))
-                return "/_create *\(noteFolderId) json \(msg)"
+                return "/_send \(ref(type, id)) live=\(onOff(live)) ttl=\(ttlStr) json \(msgs)"
+            case let .apiCreateChatItems(noteFolderId, composedMessages):
+                let msgs = encodeJSON(composedMessages)
+                return "/_create *\(noteFolderId) json \(msgs)"
            case let .apiUpdateChatItem(type, id, itemId, mc, live): return "/_update item \(ref(type, id)) \(itemId) live=\(onOff(live)) \(mc.cmdString)"
            case let .apiDeleteChatItem(type, id, itemIds, mode): return "/_delete item \(ref(type, id)) \(itemIds.map({ "\($0)" }).joined(separator: ",")) \(mode.rawValue)"
            case let .apiDeleteMemberChatItem(groupId, itemIds): return "/_delete member item #\(groupId) \(itemIds.map({ "\($0)" }).joined(separator: ","))"
            case let .apiChatItemReaction(type, id, itemId, add, reaction): return "/_reaction \(ref(type, id)) \(itemId) \(onOff(add)) \(encodeJSON(reaction))"
-            case let .apiForwardChatItem(toChatType, toChatId, fromChatType, fromChatId, itemId, ttl):
+            case let .apiPlanForwardChatItems(type, id, itemIds): return "/_forward plan \(ref(type, id)) \(itemIds.map({ "\($0)" }).joined(separator: ","))"
+            case let .apiForwardChatItems(toChatType, toChatId, fromChatType, fromChatId, itemIds, ttl):
                let ttlStr = ttl != nil ? "\(ttl!)" : "default"
-                return "/_forward \(ref(toChatType, toChatId)) \(ref(fromChatType, fromChatId)) \(itemId) ttl=\(ttlStr)"
+                return "/_forward \(ref(toChatType, toChatId)) \(ref(fromChatType, fromChatId)) \(itemIds.map({ "\($0)" }).joined(separator: ",")) ttl=\(ttlStr)"
            case .apiGetNtfToken: return "/_ntf get "
            case let .apiRegisterToken(token, notificationMode): return "/_ntf register \(token.cmdString) \(notificationMode.rawValue)"
            case let .apiVerifyToken(token, nonce, code): return "/_ntf verify \(token.cmdString) \(nonce) \(code)"
@@ -262,6 +267,7 @@ public enum ChatCommand {
            case let .apiVerifyGroupMember(groupId, groupMemberId, .none): return "/_verify code #\(groupId) \(groupMemberId)"
            case let .apiAddContact(userId, incognito): return "/_connect \(userId) incognito=\(onOff(incognito))"
            case let .apiSetConnectionIncognito(connId, incognito): return "/_set incognito :\(connId) \(onOff(incognito))"
+            case let .apiChangeConnectionUser(connId, userId): return "/_set conn user :\(connId) \(userId)"
            case let .apiConnectPlan(userId, connReq): return "/_connect plan \(userId) \(connReq)"
            case let .apiConnect(userId, incognito, connReq): return "/_connect \(userId) incognito=\(onOff(incognito)) \(connReq)"
            case let .apiConnectContactViaAddress(userId, incognito, contactId): return "/_connect contact \(userId) incognito=\(onOff(incognito)) \(contactId)"
@@ -291,6 +297,7 @@ public enum ChatCommand {
            case let .apiCallStatus(contact, callStatus): return "/_call status @\(contact.apiId) \(callStatus.rawValue)"
            case .apiGetNetworkStatuses: return "/_network_statuses"
            case let .apiChatRead(type, id, itemRange: (from, to)): return "/_read chat \(ref(type, id)) from=\(from) to=\(to)"
+            case let .apiChatItemsRead(type, id, itemIds): return "/_read chat items \(ref(type, id)) \(joinedIds(itemIds))"
            case let .apiChatUnread(type, id, unreadChat): return "/_unread chat \(ref(type, id)) \(onOff(unreadChat))"
            case let .receiveFile(fileId, userApprovedRelays, encrypt, inline): return "/freceive \(fileId)\(onOffParam("approved_relays", userApprovedRelays))\(onOffParam("encrypt", encrypt))\(onOffParam("inline", inline))"
            case let .setFileToReceive(fileId, userApprovedRelays, encrypt): return "/_set_file_to_receive \(fileId)\(onOffParam("approved_relays", userApprovedRelays))\(onOffParam("encrypt", encrypt))"
@@ -347,14 +354,15 @@ public enum ChatCommand {
            case .apiGetChats: return "apiGetChats"
            case .apiGetChat: return "apiGetChat"
            case .apiGetChatItemInfo: return "apiGetChatItemInfo"
-            case .apiSendMessage: return "apiSendMessage"
-            case .apiCreateChatItem: return "apiCreateChatItem"
+            case .apiSendMessages: return "apiSendMessages"
+            case .apiCreateChatItems: return "apiCreateChatItems"
            case .apiUpdateChatItem: return "apiUpdateChatItem"
            case .apiDeleteChatItem: return "apiDeleteChatItem"
            case .apiConnectContactViaAddress: return "apiConnectContactViaAddress"
            case .apiDeleteMemberChatItem: return "apiDeleteMemberChatItem"
            case .apiChatItemReaction: return "apiChatItemReaction"
-            case .apiForwardChatItem: return "apiForwardChatItem"
+            case .apiPlanForwardChatItems: return "apiPlanForwardChatItems"
+            case .apiForwardChatItems: return "apiForwardChatItems"
            case .apiGetNtfToken: return "apiGetNtfToken"
            case .apiRegisterToken: return "apiRegisterToken"
            case .apiVerifyToken: return "apiVerifyToken"
@@ -403,6 +411,7 @@ public enum ChatCommand {
            case .apiVerifyGroupMember: return "apiVerifyGroupMember"
            case .apiAddContact: return "apiAddContact"
            case .apiSetConnectionIncognito: return "apiSetConnectionIncognito"
+            case .apiChangeConnectionUser: return "apiChangeConnectionUser"
            case .apiConnectPlan: return "apiConnectPlan"
            case .apiConnect: return "apiConnect"
            case .apiDeleteChat: return "apiDeleteChat"
@@ -431,6 +440,7 @@ public enum ChatCommand {
            case .apiCallStatus: return "apiCallStatus"
            case .apiGetNetworkStatuses: return "apiGetNetworkStatuses"
            case .apiChatRead: return "apiChatRead"
+            case .apiChatItemsRead: return "apiChatItemsRead"
            case .apiChatUnread: return "apiChatUnread"
            case .receiveFile: return "receiveFile"
            case .setFileToReceive: return "setFileToReceive"
@@ -459,6 +469,10 @@ public enum ChatCommand {
        "\(type.rawValue)\(id)"
    }

+    func joinedIds(_ ids: [Int64]) -> String {
+        ids.map { "\($0)" }.joined(separator: ",")
+    }
+    
    func protoServersStr(_ servers: [ServerCfg]) -> String {
        encodeJSON(ProtoServersConfig(servers: servers))
    }
@@ -555,6 +569,7 @@ public enum ChatResponse: Decodable, Error {
    case connectionVerified(user: UserRef, verified: Bool, expectedCode: String)
    case invitation(user: UserRef, connReqInvitation: String, connection: PendingContactConnection)
    case connectionIncognitoUpdated(user: UserRef, toConnection: PendingContactConnection)
+    case connectionUserChanged(user: UserRef, fromConnection: PendingContactConnection, toConnection: PendingContactConnection, newUser: UserRef)
    case connectionPlan(user: UserRef, connectionPlan: ConnectionPlan)
    case sentConfirmation(user: UserRef, connection: PendingContactConnection)
    case sentInvitation(user: UserRef, connection: PendingContactConnection)
@@ -588,8 +603,9 @@ public enum ChatResponse: Decodable, Error {
    case memberSubErrors(user: UserRef, memberSubErrors: [MemberSubError])
    case groupEmpty(user: UserRef, groupInfo: GroupInfo)
    case userContactLinkSubscribed
-    case newChatItem(user: UserRef, chatItem: AChatItem)
-    case chatItemStatusUpdated(user: UserRef, chatItem: AChatItem)
+    case newChatItems(user: UserRef, chatItems: [AChatItem])
+    case forwardPlan(user: UserRef, chatItemIds: [Int64], forwardConfirmation: ForwardConfirmation?)
+    case chatItemsStatusesUpdated(user: UserRef, chatItems: [AChatItem])
    case chatItemUpdated(user: UserRef, chatItem: AChatItem)
    case chatItemNotChanged(user: UserRef, chatItem: AChatItem)
    case chatItemReaction(user: UserRef, added: Bool, reaction: ACIReaction)
@@ -725,6 +741,7 @@ public enum ChatResponse: Decodable, Error {
            case .connectionVerified: return "connectionVerified"
            case .invitation: return "invitation"
            case .connectionIncognitoUpdated: return "connectionIncognitoUpdated"
+            case .connectionUserChanged: return "connectionUserChanged"
            case .connectionPlan: return "connectionPlan"
            case .sentConfirmation: return "sentConfirmation"
            case .sentInvitation: return "sentInvitation"
@@ -758,8 +775,9 @@ public enum ChatResponse: Decodable, Error {
            case .memberSubErrors: return "memberSubErrors"
            case .groupEmpty: return "groupEmpty"
            case .userContactLinkSubscribed: return "userContactLinkSubscribed"
-            case .newChatItem: return "newChatItem"
-            case .chatItemStatusUpdated: return "chatItemStatusUpdated"
+            case .newChatItems: return "newChatItems"
+            case .forwardPlan: return "forwardPlan"
+            case .chatItemsStatusesUpdated: return "chatItemsStatusesUpdated"
            case .chatItemUpdated: return "chatItemUpdated"
            case .chatItemNotChanged: return "chatItemNotChanged"
            case .chatItemReaction: return "chatItemReaction"
@@ -893,6 +911,7 @@ public enum ChatResponse: Decodable, Error {
            case let .connectionVerified(u, verified, expectedCode): return withUser(u, "verified: \(verified)\nconnectionCode: \(expectedCode)")
            case let .invitation(u, connReqInvitation, connection): return withUser(u, "connReqInvitation: \(connReqInvitation)\nconnection: \(connection)")
            case let .connectionIncognitoUpdated(u, toConnection): return withUser(u, String(describing: toConnection))
+            case let .connectionUserChanged(u, fromConnection, toConnection, newUser): return withUser(u, "fromConnection: \(String(describing: fromConnection))\ntoConnection: \(String(describing: toConnection))\newUserId: \(String(describing: newUser.userId))")
            case let .connectionPlan(u, connectionPlan): return withUser(u, String(describing: connectionPlan))
            case let .sentConfirmation(u, connection): return withUser(u, String(describing: connection))
            case let .sentInvitation(u, connection): return withUser(u, String(describing: connection))
@@ -926,8 +945,13 @@ public enum ChatResponse: Decodable, Error {
            case let .memberSubErrors(u, memberSubErrors): return withUser(u, String(describing: memberSubErrors))
            case let .groupEmpty(u, groupInfo): return withUser(u, String(describing: groupInfo))
            case .userContactLinkSubscribed: return noDetails
-            case let .newChatItem(u, chatItem): return withUser(u, String(describing: chatItem))
-            case let .chatItemStatusUpdated(u, chatItem): return withUser(u, String(describing: chatItem))
+            case let .newChatItems(u, chatItems):
+                let itemsString = chatItems.map { chatItem in String(describing: chatItem) }.joined(separator: "\n")
+                return withUser(u, itemsString)
+            case let .forwardPlan(u, chatItemIds, forwardConfirmation): return withUser(u, "items: \(chatItemIds) forwardConfirmation: \(String(describing: forwardConfirmation))")
+            case let .chatItemsStatusesUpdated(u, chatItems):
+                let itemsString = chatItems.map { chatItem in String(describing: chatItem) }.joined(separator: "\n")
+                return withUser(u, itemsString)
            case let .chatItemUpdated(u, chatItem): return withUser(u, String(describing: chatItem))
            case let .chatItemNotChanged(u, chatItem): return withUser(u, String(describing: chatItem))
            case let .chatItemReaction(u, added, reaction): return withUser(u, "added: \(added)\n\(String(describing: reaction))")
@@ -1113,10 +1137,16 @@ public enum ChatPagination {
    }
 }

-struct ComposedMessage: Encodable {
-    var fileSource: CryptoFile?
+public struct ComposedMessage: Encodable {
+    public var fileSource: CryptoFile?
    var quotedItemId: Int64?
-    var msgContent: MsgContent
+    public var msgContent: MsgContent
+
+    public init(fileSource: CryptoFile? = nil, quotedItemId: Int64? = nil, msgContent: MsgContent) {
+        self.fileSource = fileSource
+        self.quotedItemId = quotedItemId
+        self.msgContent = msgContent
+    }
 }

 public struct ArchiveConfig: Encodable {
@@ -1476,6 +1506,63 @@ public struct KeepAliveOpts: Codable, Equatable {
    public static let defaults: KeepAliveOpts = KeepAliveOpts(keepIdle: 30, keepIntvl: 15, keepCnt: 4)
 }

+public struct NetworkProxy: Equatable, Codable {
+    public var host: String = ""
+    public var port: Int = 0
+    public var auth: NetworkProxyAuth = .username
+    public var username: String = ""
+    public var password: String = ""
+
+    public static var def: NetworkProxy {
+        NetworkProxy()
+    }
+    
+    public var valid: Bool {
+        let hostOk = switch NWEndpoint.Host(host) {
+        case .ipv4: true
+        case .ipv6: true
+        default: false
+        }
+        return hostOk &&
+                port > 0 && port <= 65535 &&
+                NetworkProxy.validCredential(username) && NetworkProxy.validCredential(password)
+    }
+    
+    public static func validCredential(_ s: String) -> Bool {
+        !s.contains(":") && !s.contains("@")
+    }
+
+    public func toProxyString() -> String? {
+        if !valid { return nil }
+        var res = ""
+        switch auth {
+        case .username:
+            let usernameTrimmed = username.trimmingCharacters(in: .whitespaces)
+            let passwordTrimmed = password.trimmingCharacters(in: .whitespaces)
+            if usernameTrimmed != "" || passwordTrimmed != "" {
+                res += usernameTrimmed + ":" + passwordTrimmed + "@"
+            } else {
+                res += "@"
+            }
+        case .isolate: ()
+        }
+        if host != "" {
+            if host.contains(":") {
+                res += "[\(host.trimmingCharacters(in: [" ", "[", "]"]))]"
+            } else {
+                res += host.trimmingCharacters(in: .whitespaces)
+            }
+        }
+        res += ":\(port)"
+        return res
+    }
+}
+
+public enum NetworkProxyAuth: String, Codable {
+    case username
+    case isolate
+}
+
 public enum NetworkStatus: Decodable, Equatable {
    case unknown
    case connected
@@ -1514,6 +1601,13 @@ public enum NetworkStatus: Decodable, Equatable {
    }
 }

+public enum ForwardConfirmation: Decodable, Hashable {
+    case filesNotAccepted(fileIds: [Int64])
+    case filesInProgress(filesCount: Int)
+    case filesMissing(filesCount: Int)
+    case filesFailed(filesCount: Int)
+}
+
 public struct ConnNetworkStatus: Decodable {
    public var agentConnId: String
    public var networkStatus: NetworkStatus
@@ -1842,7 +1936,6 @@ public enum ChatErrorType: Decodable, Hashable {
    case inlineFileProhibited(fileId: Int64)
    case invalidQuote
    case invalidForward
-    case forwardNoFile
    case invalidChatItemUpdate
    case invalidChatItemDelete
    case hasCurrentCall
@@ -1857,6 +1950,7 @@ public enum ChatErrorType: Decodable, Hashable {
    case agentCommandError(message: String)
    case invalidFileDescription(message: String)
    case connectionIncognitoChangeProhibited
+    case connectionUserChangeProhibited
    case peerChatVRangeIncompatible
    case internalError(message: String)
    case exception(message: String)
@@ -2099,11 +2193,13 @@ public struct MigrationFileLinkData: Codable {

    public struct NetworkConfig: Codable {
        let socksProxy: String?
+        let networkProxy: NetworkProxy?
        let hostMode: HostMode?
        let requiredHostMode: Bool?

-        public init(socksProxy: String?, hostMode: HostMode?, requiredHostMode: Bool?) {
+        public init(socksProxy: String?, networkProxy: NetworkProxy?, hostMode: HostMode?, requiredHostMode: Bool?) {
            self.socksProxy = socksProxy
+            self.networkProxy = networkProxy
            self.hostMode = hostMode
            self.requiredHostMode = requiredHostMode
        }
@@ -2112,6 +2208,7 @@ public struct MigrationFileLinkData: Codable {
            return if let hostMode, let requiredHostMode {
                NetworkConfig(
                    socksProxy: nil,
+                    networkProxy: nil,
                    hostMode: hostMode == .onionViaSocks ? .onionHost : hostMode,
                    requiredHostMode: requiredHostMode
                )
@@ -2131,6 +2228,7 @@ public struct MigrationFileLinkData: Codable {

 public struct AppSettings: Codable, Equatable {
    public var networkConfig: NetCfg? = nil
+    public var networkProxy: NetworkProxy? = nil
    public var privacyEncryptLocalFiles: Bool? = nil
    public var privacyAskToApproveRelays: Bool? = nil
    public var privacyAcceptImages: Bool? = nil
@@ -2162,6 +2260,7 @@ public struct AppSettings: Codable, Equatable {
        var empty = AppSettings()
        let def = AppSettings.defaults
        if networkConfig != def.networkConfig { empty.networkConfig = networkConfig }
+        if networkProxy != def.networkProxy { empty.networkProxy = networkProxy }
        if privacyEncryptLocalFiles != def.privacyEncryptLocalFiles { empty.privacyEncryptLocalFiles = privacyEncryptLocalFiles }
        if privacyAskToApproveRelays != def.privacyAskToApproveRelays { empty.privacyAskToApproveRelays = privacyAskToApproveRelays }
        if privacyAcceptImages != def.privacyAcceptImages { empty.privacyAcceptImages = privacyAcceptImages }
@@ -2194,6 +2293,7 @@ public struct AppSettings: Codable, Equatable {
    public static var defaults: AppSettings {
        AppSettings (
            networkConfig: NetCfg.defaults,
+            networkProxy: NetworkProxy.def,
            privacyEncryptLocalFiles: true,
            privacyAskToApproveRelays: true,
            privacyAcceptImages: true,
@@ -35,6 +35,7 @@ public let GROUP_DEFAULT_PRIVACY_ASK_TO_APPROVE_RELAYS = "privacyAskToApproveRel
 // replaces DEFAULT_PROFILE_IMAGE_CORNER_RADIUS
 public let GROUP_DEFAULT_PROFILE_IMAGE_CORNER_RADIUS = "profileImageCornerRadius"
 let GROUP_DEFAULT_NTF_BADGE_COUNT = "ntgBadgeCount"
+public let GROUP_DEFAULT_NETWORK_SOCKS_PROXY = "networkSocksProxy"
 let GROUP_DEFAULT_NETWORK_USE_ONION_HOSTS = "networkUseOnionHosts"
 let GROUP_DEFAULT_NETWORK_SESSION_MODE = "networkSessionMode"
 let GROUP_DEFAULT_NETWORK_SMP_PROXY_MODE = "networkSMPProxyMode"
@@ -327,6 +328,7 @@ public class Default<T> {
 }

 public func getNetCfg() -> NetCfg {
+    let socksProxy = groupDefaults.string(forKey: GROUP_DEFAULT_NETWORK_SOCKS_PROXY)
    let onionHosts = networkUseOnionHostsGroupDefault.get()
    let (hostMode, requiredHostMode) = onionHosts.hostMode
    let sessionMode = networkSessionModeGroupDefault.get()
@@ -349,6 +351,7 @@ public func getNetCfg() -> NetCfg {
        tcpKeepAlive = nil
    }
    return NetCfg(
+        socksProxy: socksProxy,
        hostMode: hostMode,
        requiredHostMode: requiredHostMode,
        sessionMode: sessionMode,
@@ -365,11 +368,13 @@ public func getNetCfg() -> NetCfg {
    )
 }

-public func setNetCfg(_ cfg: NetCfg) {
+public func setNetCfg(_ cfg: NetCfg, networkProxy: NetworkProxy?) {
    networkUseOnionHostsGroupDefault.set(OnionHosts(netCfg: cfg))
    networkSessionModeGroupDefault.set(cfg.sessionMode)
    networkSMPProxyModeGroupDefault.set(cfg.smpProxyMode)
    networkSMPProxyFallbackGroupDefault.set(cfg.smpProxyFallback)
+    let socksProxy = networkProxy?.toProxyString()
+    groupDefaults.set(socksProxy, forKey: GROUP_DEFAULT_NETWORK_SOCKS_PROXY)
    groupDefaults.set(cfg.tcpConnectTimeout, forKey: GROUP_DEFAULT_NETWORK_TCP_CONNECT_TIMEOUT)
    groupDefaults.set(cfg.tcpTimeout, forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT)
    groupDefaults.set(cfg.tcpTimeoutPerKb, forKey: GROUP_DEFAULT_NETWORK_TCP_TIMEOUT_PER_KB)
@@ -2688,6 +2688,13 @@ public enum CIDirection: Decodable, Hashable {
            }
        }
    }
+    
+    public func sameDirection(_ dir: CIDirection) -> Bool {
+        switch (self, dir) {
+        case let (.groupRcv(m1), .groupRcv(m2)): m1.groupMemberId == m2.groupMemberId
+        default: sent == dir.sent
+        }
+    }
 }

 public struct CIMeta: Decodable, Hashable {
@@ -2706,7 +2713,7 @@ public struct CIMeta: Decodable, Hashable {
    public var deletable: Bool
    public var editable: Bool

-    public var timestampText: Text { get { formatTimestampText(itemTs) } }
+    public var timestampText: Text { Text(formatTimestampMeta(itemTs)) }
    public var recent: Bool { updatedAt + 10 > .now }
    public var isLive: Bool { itemLive == true }
    public var disappearing: Bool { !isRcvNew && itemTimed?.deleteAt != nil }
@@ -2716,10 +2723,6 @@ public struct CIMeta: Decodable, Hashable {
        return false
    }

-    public func statusIcon(_ metaColor: Color/* = .secondary*/, _ primaryColor: Color = .accentColor) -> (String, Color)? {
-        itemStatus.statusIcon(metaColor, primaryColor)
-    }
-
    public static func getSample(_ id: Int64, _ ts: Date, _ text: String, _ status: CIStatus = .sndNew, itemDeleted: CIDeleted? = nil, itemEdited: Bool = false, itemLive: Bool = false, deletable: Bool = true, editable: Bool = true) -> CIMeta {
        CIMeta(
            itemId: id,
@@ -2762,7 +2765,11 @@ let msgTimeFormat = Date.FormatStyle.dateTime.hour().minute()
 let msgDateFormat = Date.FormatStyle.dateTime.day(.twoDigits).month(.twoDigits)

 public func formatTimestampText(_ date: Date) -> Text {
-    return Text(date, format: recent(date) ? msgTimeFormat : msgDateFormat)
+    Text(verbatim: date.formatted(recent(date) ? msgTimeFormat : msgDateFormat))
+}
+
+public func formatTimestampMeta(_ date: Date) -> String {
+    date.formatted(date: .omitted, time: .shortened)
 }

 private func recent(_ date: Date) -> Bool {
@@ -2805,21 +2812,22 @@ public enum CIStatus: Decodable, Hashable {
        }
    }

-    public func statusIcon(_ metaColor: Color/* = .secondary*/, _ primaryColor: Color = .accentColor) -> (String, Color)? {
+    public func statusIcon(_ metaColor: Color, _ paleMetaColor: Color, _ primaryColor: Color = .accentColor) -> (Image, Color)? {
        switch self {
-        case .sndNew: return nil
-        case .sndSent: return ("checkmark", metaColor)
-        case let .sndRcvd(msgRcptStatus, _):
+        case .sndNew: nil
+        case let .sndSent(sndProgress):
+            (Image("checkmark.wide"),  sndProgress == .partial ? paleMetaColor : metaColor)
+        case let .sndRcvd(msgRcptStatus, sndProgress):
            switch msgRcptStatus {
-            case .ok: return ("checkmark", metaColor)
-            case .badMsgHash: return ("checkmark", .red)
+            case .ok: (Image("checkmark.2"), sndProgress == .partial ? paleMetaColor : metaColor)
+            case .badMsgHash: (Image("checkmark.2"), .red)
            }
-        case .sndErrorAuth: return ("multiply", .red)
-        case .sndError: return ("multiply", .red)
-        case .sndWarning: return ("exclamationmark.triangle.fill", .orange)
-        case .rcvNew: return ("circlebadge.fill", primaryColor)
-        case .rcvRead: return nil
-        case .invalid: return ("questionmark", metaColor)
+        case .sndErrorAuth: (Image(systemName: "multiply"), .red)
+        case .sndError: (Image(systemName: "multiply"), .red)
+        case .sndWarning: (Image(systemName: "exclamationmark.triangle.fill"), .orange)
+        case .rcvNew: (Image(systemName: "circlebadge.fill"), primaryColor)
+        case .rcvRead: nil
+        case .invalid: (Image(systemName: "questionmark"), metaColor)
        }
    }

@@ -2848,6 +2856,13 @@ public enum CIStatus: Decodable, Hashable {
            )
        }
    }
+
+    public var isSndRcvd: Bool {
+        switch self {
+        case .sndRcvd: return true
+        default: return false
+        }
+    }
 }

 public enum SndError: Decodable, Hashable {
@@ -2914,20 +2929,20 @@ public enum GroupSndStatus: Decodable, Hashable {
    case warning(agentError: SndError)
    case invalid(text: String)

-    public func statusIcon(_ metaColor: Color/* = .secondary*/, _ primaryColor: Color = .accentColor) -> (String, Color) {
+    public func statusIcon(_ metaColor: Color, _ primaryColor: Color = .accentColor) -> (Image, Color) {
        switch self {
-        case .new: return ("ellipsis", metaColor)
-        case .forwarded: return ("chevron.forward.2", metaColor)
-        case .inactive: return ("person.badge.minus", metaColor)
-        case .sent: return ("checkmark", metaColor)
+        case .new: (Image(systemName: "ellipsis"), metaColor)
+        case .forwarded: (Image(systemName: "chevron.forward.2"), metaColor)
+        case .inactive: (Image(systemName: "person.badge.minus"), metaColor)
+        case .sent: (Image("checkmark.wide"), metaColor)
        case let .rcvd(msgRcptStatus):
            switch msgRcptStatus {
-            case .ok: return ("checkmark", metaColor)
-            case .badMsgHash: return ("checkmark", .red)
+            case .ok: (Image("checkmark.2"), metaColor)
+            case .badMsgHash: (Image("checkmark.2"), .red)
            }
-        case .error: return ("multiply", .red)
-        case .warning: return ("exclamationmark.triangle.fill", .orange)
-        case .invalid: return ("questionmark", metaColor)
+        case .error: (Image(systemName: "multiply"), .red)
+        case .warning: (Image(systemName: "exclamationmark.triangle.fill"), .orange)
+        case .invalid: (Image(systemName: "questionmark"), metaColor)
        }
    }

@@ -3144,6 +3159,13 @@ public enum CIContent: Decodable, ItemContent, Hashable {
        default: return false
        }
    }
+
+    public var isSndCall: Bool {
+        switch self {
+        case .sndCall: return true
+        default: return false
+        }
+    }
 }

 public enum MsgDecryptError: String, Decodable, Hashable {
@@ -383,16 +383,34 @@ extension UIImage {
        }
        return self
    }
+}

-    public convenience init?(base64Encoded: String?) {
-        if let base64Encoded, let data = Data(base64Encoded: dropImagePrefix(base64Encoded)) {
-            self.init(data: data)
+public func imageFromBase64(_ base64Encoded: String?) -> UIImage? {
+    if let base64Encoded {
+        if let img = imageCache.object(forKey: base64Encoded as NSString) {
+            return img
+        } else if let data = Data(base64Encoded: dropImagePrefix(base64Encoded)),
+            let img = UIImage(data: data) {
+            imageCacheQueue.async {
+                imageCache.setObject(img, forKey: base64Encoded as NSString)
+            }
+            return img
        } else {
            return nil
        }
+    } else {
+        return nil
    }
 }

+private let imageCacheQueue = DispatchQueue.global(qos: .background)
+
+private var imageCache: NSCache<NSString, UIImage> = {
+    var cache = NSCache<NSString, UIImage>()
+    cache.countLimit = 1000
+    return cache
+}()
+
 public func getLinkPreview(url: URL, cb: @escaping (LinkPreview?) -> Void) {
    logger.debug("getLinkMetadata: fetching URL preview")
    LPMetadataProvider().startFetchingMetadata(for: url){ metadata, error in
@@ -10,6 +10,7 @@
 #define SimpleX_h

 #include "hs_init.h"
+#include "objc.h"

 extern void hs_init(int argc, char **argv[]);

@@ -0,0 +1,20 @@
+//
+//  objc.h
+//  SimpleX (iOS)
+//
+//  Created by Stanislav Dmitrenko on 09.09.2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+#ifndef objc_h
+#define objc_h
+
+#import <Foundation/Foundation.h>
+
+@interface ObjC : NSObject
+
+ (BOOL)catchException:(void(^)(void))tryBlock error:(__autoreleasing NSError **)error;
+
+@end
+
+#endif /* objc_h */
@@ -0,0 +1,25 @@
+//
+//  objc.m
+//  SimpleXChat
+//
+//  Created by Stanislav Dmitrenko on 09.09.2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+#import "objc.h"
+
+@implementation ObjC
+
+// https://stackoverflow.com/a/36454808
+ (BOOL)catchException:(void(^)(void))tryBlock error:(__autoreleasing NSError **)error {
+    @try {
+        tryBlock();
+        return YES;
+    }
+    @catch (NSException *exception) {
+        *error = [[NSError alloc] initWithDomain: exception.name code: 0 userInfo: exception.userInfo];
+        return NO;
+    }
+}
+
+@end
@@ -697,7 +697,7 @@
 /* No comment provided by engineer. */
 "Can't invite contacts!" = "Не може да поканят контактите!";

-/* No comment provided by engineer. */
+/* alert button */
 "Cancel" = "Отказ";

 /* No comment provided by engineer. */
@@ -1897,9 +1897,6 @@
 /* No comment provided by engineer. */
 "Full name (optional)" = "Пълно име (незадължително)";

-/* No comment provided by engineer. */
-"Full name:" = "Пълно име:";
-
 /* No comment provided by engineer. */
 "Fully decentralized – visible only to members." = "Напълно децентрализирана – видима е само за членовете.";

@@ -2940,12 +2937,6 @@
 /* No comment provided by engineer. */
 "Profile images" = "Профилни изображения";

-/* No comment provided by engineer. */
-"Profile name" = "Име на профила";
-
-/* No comment provided by engineer. */
-"Profile name:" = "Име на профила:";
-
 /* No comment provided by engineer. */
 "Profile password" = "Профилна парола";

@@ -3211,10 +3202,11 @@
 /* No comment provided by engineer. */
 "Safer groups" = "По-безопасни групи";

-/* chat item action */
+/* alert button
+   chat item action */
 "Save" = "Запази";

-/* No comment provided by engineer. */
+/* alert button */
 "Save (and notify contacts)" = "Запази (и уведоми контактите)";

 /* No comment provided by engineer. */
@@ -3229,9 +3221,6 @@
 /* No comment provided by engineer. */
 "Save archive" = "Запази архив";

-/* No comment provided by engineer. */
-"Save auto-accept settings" = "Запази настройките за автоматично приемане";
-
 /* No comment provided by engineer. */
 "Save group profile" = "Запази профила на групата";

@@ -3253,9 +3242,6 @@
 /* No comment provided by engineer. */
 "Save servers?" = "Запази сървърите?";

-/* No comment provided by engineer. */
-"Save settings?" = "Запази настройките?";
-
 /* No comment provided by engineer. */
 "Save welcome message?" = "Запази съобщението при посрещане?";

@@ -4430,7 +4416,7 @@
 "Your profile **%@** will be shared." = "Вашият профил **%@** ще бъде споделен.";

 /* No comment provided by engineer. */
-"Your profile is stored on your device and shared only with your contacts.\nSimpleX servers cannot see your profile." = "Вашият профил се съхранява на вашето устройство и се споделя само с вашите контакти.\nSimpleX сървърите не могат да видят вашия профил.";
+"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Вашият профил се съхранява на вашето устройство и се споделя само с вашите контакти. SimpleX сървърите не могат да видят вашия профил.";

 /* No comment provided by engineer. */
 "Your profile, contacts and delivered messages are stored on your device." = "Вашият профил, контакти и доставени съобщения се съхраняват на вашето устройство.";
@@ -562,7 +562,7 @@
 /* No comment provided by engineer. */
 "Can't invite contacts!" = "Nelze pozvat kontakty!";

-/* No comment provided by engineer. */
+/* alert button */
 "Cancel" = "Zrušit";

 /* feature offered item */
@@ -1543,9 +1543,6 @@
 /* No comment provided by engineer. */
 "Full name (optional)" = "Celé jméno (volitelně)";

-/* No comment provided by engineer. */
-"Full name:" = "Celé jméno:";
-
 /* No comment provided by engineer. */
 "Fully re-implemented - work in background!" = "Plně přepracováno, prácuje na pozadí!";

@@ -2602,10 +2599,11 @@
 /* No comment provided by engineer. */
 "Run chat" = "Spustit chat";

-/* chat item action */
+/* alert button
+   chat item action */
 "Save" = "Uložit";

-/* No comment provided by engineer. */
+/* alert button */
 "Save (and notify contacts)" = "Uložit (a informovat kontakty)";

 /* No comment provided by engineer. */
@@ -2620,9 +2618,6 @@
 /* No comment provided by engineer. */
 "Save archive" = "Uložit archiv";

-/* No comment provided by engineer. */
-"Save auto-accept settings" = "Uložit nastavení automatického přijímání";
-
 /* No comment provided by engineer. */
 "Save group profile" = "Uložení profilu skupiny";

@@ -2644,9 +2639,6 @@
 /* No comment provided by engineer. */
 "Save servers?" = "Uložit servery?";

-/* No comment provided by engineer. */
-"Save settings?" = "Uložit nastavení?";
-
 /* No comment provided by engineer. */
 "Save welcome message?" = "Uložit uvítací zprávu?";

@@ -3554,7 +3546,7 @@
 "Your profile **%@** will be shared." = "Váš profil **%@** bude sdílen.";

 /* No comment provided by engineer. */
-"Your profile is stored on your device and shared only with your contacts.\nSimpleX servers cannot see your profile." = "Váš profil je uložen ve vašem zařízení a sdílen pouze s vašimi kontakty.\nServery SimpleX nevidí váš profil.";
+"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Váš profil je uložen ve vašem zařízení a sdílen pouze s vašimi kontakty. Servery SimpleX nevidí váš profil.";

 /* No comment provided by engineer. */
 "Your profile, contacts and delivered messages are stored on your device." = "Váš profil, kontakty a doručené zprávy jsou uloženy ve vašem zařízení.";
@@ -781,7 +781,7 @@
 /* No comment provided by engineer. */
 "Can't message member" = "Mitglied kann nicht benachrichtigt werden";

-/* No comment provided by engineer. */
+/* alert button */
 "Cancel" = "Abbrechen";

 /* No comment provided by engineer. */
@@ -921,16 +921,16 @@
 "Chunks uploaded" = "Daten-Pakete hochgeladen";

 /* swipe action */
-"Clear" = "Löschen";
+"Clear" = "Entfernen";

 /* No comment provided by engineer. */
-"Clear conversation" = "Chatinhalte löschen";
+"Clear conversation" = "Chat-Inhalte entfernen";

 /* No comment provided by engineer. */
-"Clear conversation?" = "Unterhaltung löschen?";
+"Clear conversation?" = "Chat-Inhalte entfernen?";

 /* No comment provided by engineer. */
-"Clear private notes?" = "Private Notizen löschen?";
+"Clear private notes?" = "Private Notizen entfernen?";

 /* No comment provided by engineer. */
 "Clear verification" = "Überprüfung zurücknehmen";
@@ -1167,7 +1167,7 @@
 "Continue" = "Weiter";

 /* No comment provided by engineer. */
-"Conversation deleted!" = "Unterhaltung gelöscht!";
+"Conversation deleted!" = "Chat-Inhalte entfernt!";

 /* No comment provided by engineer. */
 "Copy" = "Kopieren";
@@ -2203,9 +2203,6 @@
 /* No comment provided by engineer. */
 "Full name (optional)" = "Vollständiger Name (optional)";

-/* No comment provided by engineer. */
-"Full name:" = "Vollständiger Name:";
-
 /* No comment provided by engineer. */
 "Fully decentralized – visible only to members." = "Vollständig dezentralisiert – nur für Mitglieder sichtbar.";

@@ -2306,7 +2303,7 @@
 "Group will be deleted for all members - this cannot be undone!" = "Die Gruppe wird für alle Mitglieder gelöscht. Dies kann nicht rückgängig gemacht werden!";

 /* No comment provided by engineer. */
-"Group will be deleted for you - this cannot be undone!" = "Die Gruppe wird für Sie gelöscht. Dies kann nicht rückgängig gemacht werden!";
+"Group will be deleted for you - this cannot be undone!" = "Die Gruppe wird nur bei Ihnen gelöscht. Dies kann nicht rückgängig gemacht werden!";

 /* No comment provided by engineer. */
 "Help" = "Hilfe";
@@ -2630,7 +2627,7 @@
 "Keep" = "Behalten";

 /* No comment provided by engineer. */
-"Keep conversation" = "Unterhaltung behalten";
+"Keep conversation" = "Chat-Inhalte beibehalten";

 /* No comment provided by engineer. */
 "Keep the app open to use it from desktop" = "Die App muss geöffnet bleiben, um sie vom Desktop aus nutzen zu können";
@@ -3115,7 +3112,7 @@
 "Only client devices store user profiles, contacts, groups, and messages sent with **2-layer end-to-end encryption**." = "Nur die Endgeräte speichern die Benutzerprofile, Kontakte, Gruppen und Nachrichten, welche über eine **2-Schichten Ende-zu-Ende-Verschlüsselung** gesendet werden.";

 /* No comment provided by engineer. */
-"Only delete conversation" = "Nur die Unterhaltung löschen";
+"Only delete conversation" = "Nur die Chat-Inhalte löschen";

 /* No comment provided by engineer. */
 "Only group owners can change group preferences." = "Gruppen-Präferenzen können nur von Gruppen-Eigentümern geändert werden.";
@@ -3378,12 +3375,6 @@
 /* No comment provided by engineer. */
 "Profile images" = "Profil-Bilder";

-/* No comment provided by engineer. */
-"Profile name" = "Profilname";
-
-/* No comment provided by engineer. */
-"Profile name:" = "Profilname:";
-
 /* No comment provided by engineer. */
 "Profile password" = "Passwort für Profil";

@@ -3460,7 +3451,7 @@
 "Rate the app" = "Bewerten Sie die App";

 /* No comment provided by engineer. */
-"Reachable chat toolbar" = "Erreichbare Chat-Symbolleiste";
+"Reachable chat toolbar" = "Chat-Symbolleiste unten";

 /* chat item menu */
 "React…" = "Reagiere…";
@@ -3715,10 +3706,11 @@
 /* No comment provided by engineer. */
 "Safer groups" = "Sicherere Gruppen";

-/* chat item action */
+/* alert button
+   chat item action */
 "Save" = "Speichern";

-/* No comment provided by engineer. */
+/* alert button */
 "Save (and notify contacts)" = "Speichern (und Kontakte benachrichtigen)";

 /* No comment provided by engineer. */
@@ -3736,9 +3728,6 @@
 /* No comment provided by engineer. */
 "Save archive" = "Archiv speichern";

-/* No comment provided by engineer. */
-"Save auto-accept settings" = "Einstellungen von \"Automatisch akzeptieren\" speichern";
-
 /* No comment provided by engineer. */
 "Save group profile" = "Gruppenprofil speichern";

@@ -3760,9 +3749,6 @@
 /* No comment provided by engineer. */
 "Save servers?" = "Alle Server speichern?";

-/* No comment provided by engineer. */
-"Save settings?" = "Einstellungen speichern?";
-
 /* No comment provided by engineer. */
 "Save welcome message?" = "Begrüßungsmeldung speichern?";

@@ -3815,7 +3801,7 @@
 "Search bar accepts invitation links." = "In der Suchleiste werden nun auch Einladungslinks akzeptiert.";

 /* No comment provided by engineer. */
-"Search or paste SimpleX link" = "Suchen oder fügen Sie den SimpleX-Link ein";
+"Search or paste SimpleX link" = "Suchen oder SimpleX-Link einfügen";

 /* network option */
 "sec" = "sek";
@@ -4385,7 +4371,7 @@
 "The message will be marked as moderated for all members." = "Diese Nachricht wird für alle Mitglieder als moderiert gekennzeichnet.";

 /* No comment provided by engineer. */
-"The messages will be deleted for all members." = "Die Nachrichten werden für alle Mitglieder gelöscht werden.";
+"The messages will be deleted for all members." = "Die Nachrichten werden für alle Gruppenmitglieder gelöscht.";

 /* No comment provided by engineer. */
 "The messages will be marked as moderated for all members." = "Die Nachrichten werden für alle Mitglieder als moderiert gekennzeichnet werden.";
@@ -4709,7 +4695,7 @@
 "Use the app while in the call." = "Die App kann während eines Anrufs genutzt werden.";

 /* No comment provided by engineer. */
-"Use the app with one hand." = "Die App mit einer Hand nutzen.";
+"Use the app with one hand." = "Die App mit einer Hand bedienen.";

 /* No comment provided by engineer. */
 "User profile" = "Benutzerprofil";
@@ -5021,7 +5007,7 @@
 "You can start chat via app Settings / Database or by restarting the app" = "Sie können den Chat über die App-Einstellungen / Datenbank oder durch Neustart der App starten";

 /* No comment provided by engineer. */
-"You can still view conversation with %@ in the list of chats." = "Sie können in der Chatliste weiterhin die Unterhaltung mit %@ einsehen.";
+"You can still view conversation with %@ in the list of chats." = "Sie können in der Chat-Liste weiterhin die Unterhaltung mit %@ einsehen.";

 /* No comment provided by engineer. */
 "You can turn on SimpleX Lock via Settings." = "Sie können die SimpleX-Sperre über die Einstellungen aktivieren.";
@@ -5189,7 +5175,7 @@
 "Your profile **%@** will be shared." = "Ihr Profil **%@** wird geteilt.";

 /* No comment provided by engineer. */
-"Your profile is stored on your device and shared only with your contacts.\nSimpleX servers cannot see your profile." = "Ihr Profil wird auf Ihrem Gerät gespeichert und nur mit Ihren Kontakten geteilt.\nSimpleX-Server können Ihr Profil nicht einsehen.";
+"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Ihr Profil wird auf Ihrem Gerät gespeichert und nur mit Ihren Kontakten geteilt. SimpleX-Server können Ihr Profil nicht einsehen.";

 /* No comment provided by engineer. */
 "Your profile, contacts and delivered messages are stored on your device." = "Ihr Profil, Ihre Kontakte und zugestellten Nachrichten werden auf Ihrem Gerät gespeichert.";
@@ -781,7 +781,7 @@
 /* No comment provided by engineer. */
 "Can't message member" = "No se pueden enviar mensajes al miembro";

-/* No comment provided by engineer. */
+/* alert button */
 "Cancel" = "Cancelar";

 /* No comment provided by engineer. */
@@ -2203,9 +2203,6 @@
 /* No comment provided by engineer. */
 "Full name (optional)" = "Nombre completo (opcional)";

-/* No comment provided by engineer. */
-"Full name:" = "Nombre completo:";
-
 /* No comment provided by engineer. */
 "Fully decentralized – visible only to members." = "Completamente descentralizado y sólo visible para los miembros.";

@@ -3378,12 +3375,6 @@
 /* No comment provided by engineer. */
 "Profile images" = "Forma de los perfiles";

-/* No comment provided by engineer. */
-"Profile name" = "Nombre del perfil";
-
-/* No comment provided by engineer. */
-"Profile name:" = "Nombre del perfil:";
-
 /* No comment provided by engineer. */
 "Profile password" = "Contraseña del perfil";

@@ -3715,10 +3706,11 @@
 /* No comment provided by engineer. */
 "Safer groups" = "Grupos más seguros";

-/* chat item action */
+/* alert button
+   chat item action */
 "Save" = "Guardar";

-/* No comment provided by engineer. */
+/* alert button */
 "Save (and notify contacts)" = "Guardar (y notificar contactos)";

 /* No comment provided by engineer. */
@@ -3736,9 +3728,6 @@
 /* No comment provided by engineer. */
 "Save archive" = "Guardar archivo";

-/* No comment provided by engineer. */
-"Save auto-accept settings" = "Guardar configuración de auto aceptar";
-
 /* No comment provided by engineer. */
 "Save group profile" = "Guardar perfil de grupo";

@@ -3760,9 +3749,6 @@
 /* No comment provided by engineer. */
 "Save servers?" = "¿Guardar servidores?";

-/* No comment provided by engineer. */
-"Save settings?" = "¿Guardar configuración?";
-
 /* No comment provided by engineer. */
 "Save welcome message?" = "¿Guardar mensaje de bienvenida?";

@@ -5189,7 +5175,7 @@
 "Your profile **%@** will be shared." = "El perfil **%@** será compartido.";

 /* No comment provided by engineer. */
-"Your profile is stored on your device and shared only with your contacts.\nSimpleX servers cannot see your profile." = "Tu perfil es almacenado en tu dispositivo y solamente se comparte con tus contactos.\nLos servidores SimpleX no pueden ver tu perfil.";
+"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Tu perfil es almacenado en tu dispositivo y solamente se comparte con tus contactos. Los servidores SimpleX no pueden ver tu perfil.";

 /* No comment provided by engineer. */
 "Your profile, contacts and delivered messages are stored on your device." = "Tu perfil, contactos y mensajes se almacenan en tu dispositivo.";
@@ -547,7 +547,7 @@
 /* No comment provided by engineer. */
 "Can't invite contacts!" = "Kontakteja ei voi kutsua!";

-/* No comment provided by engineer. */
+/* alert button */
 "Cancel" = "Peruuta";

 /* feature offered item */
@@ -1519,9 +1519,6 @@
 /* No comment provided by engineer. */
 "Full name (optional)" = "Koko nimi (valinnainen)";

-/* No comment provided by engineer. */
-"Full name:" = "Koko nimi:";
-
 /* No comment provided by engineer. */
 "Fully re-implemented - work in background!" = "Täysin uudistettu - toimii taustalla!";

@@ -2572,10 +2569,11 @@
 /* No comment provided by engineer. */
 "Run chat" = "Käynnistä chat";

-/* chat item action */
+/* alert button
+   chat item action */
 "Save" = "Tallenna";

-/* No comment provided by engineer. */
+/* alert button */
 "Save (and notify contacts)" = "Tallenna (ja ilmoita kontakteille)";

 /* No comment provided by engineer. */
@@ -2590,9 +2588,6 @@
 /* No comment provided by engineer. */
 "Save archive" = "Tallenna arkisto";

-/* No comment provided by engineer. */
-"Save auto-accept settings" = "Tallenna automaattisen hyväksynnän asetukset";
-
 /* No comment provided by engineer. */
 "Save group profile" = "Tallenna ryhmäprofiili";

@@ -2614,9 +2609,6 @@
 /* No comment provided by engineer. */
 "Save servers?" = "Tallenna palvelimet?";

-/* No comment provided by engineer. */
-"Save settings?" = "Tallenna asetukset?";
-
 /* No comment provided by engineer. */
 "Save welcome message?" = "Tallenna tervetuloviesti?";

@@ -3512,7 +3504,7 @@
 "Your profile **%@** will be shared." = "Profiilisi **%@** jaetaan.";

 /* No comment provided by engineer. */
-"Your profile is stored on your device and shared only with your contacts.\nSimpleX servers cannot see your profile." = "Profiilisi tallennetaan laitteeseesi ja jaetaan vain yhteystietojesi kanssa.\nSimpleX-palvelimet eivät näe profiiliasi.";
+"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Profiilisi tallennetaan laitteeseesi ja jaetaan vain yhteystietojesi kanssa. SimpleX-palvelimet eivät näe profiiliasi.";

 /* No comment provided by engineer. */
 "Your profile, contacts and delivered messages are stored on your device." = "Profiilisi, kontaktisi ja toimitetut viestit tallennetaan laitteellesi.";
@@ -781,7 +781,7 @@
 /* No comment provided by engineer. */
 "Can't message member" = "Impossible d'envoyer un message à ce membre";

-/* No comment provided by engineer. */
+/* alert button */
 "Cancel" = "Annuler";

 /* No comment provided by engineer. */
@@ -2203,9 +2203,6 @@
 /* No comment provided by engineer. */
 "Full name (optional)" = "Nom complet (optionnel)";

-/* No comment provided by engineer. */
-"Full name:" = "Nom complet :";
-
 /* No comment provided by engineer. */
 "Fully decentralized – visible only to members." = "Entièrement décentralisé – visible que par ses membres.";

@@ -3378,12 +3375,6 @@
 /* No comment provided by engineer. */
 "Profile images" = "Images de profil";

-/* No comment provided by engineer. */
-"Profile name" = "Nom du profil";
-
-/* No comment provided by engineer. */
-"Profile name:" = "Nom du profil :";
-
 /* No comment provided by engineer. */
 "Profile password" = "Mot de passe de profil";

@@ -3715,10 +3706,11 @@
 /* No comment provided by engineer. */
 "Safer groups" = "Groupes plus sûrs";

-/* chat item action */
+/* alert button
+   chat item action */
 "Save" = "Enregistrer";

-/* No comment provided by engineer. */
+/* alert button */
 "Save (and notify contacts)" = "Enregistrer (et en informer les contacts)";

 /* No comment provided by engineer. */
@@ -3736,9 +3728,6 @@
 /* No comment provided by engineer. */
 "Save archive" = "Enregistrer l'archive";

-/* No comment provided by engineer. */
-"Save auto-accept settings" = "Enregistrer les paramètres de validation automatique";
-
 /* No comment provided by engineer. */
 "Save group profile" = "Enregistrer le profil du groupe";

@@ -3760,9 +3749,6 @@
 /* No comment provided by engineer. */
 "Save servers?" = "Enregistrer les serveurs ?";

-/* No comment provided by engineer. */
-"Save settings?" = "Enregistrer les paramètres ?";
-
 /* No comment provided by engineer. */
 "Save welcome message?" = "Enregistrer le message d'accueil ?";

@@ -5189,7 +5175,7 @@
 "Your profile **%@** will be shared." = "Votre profil **%@** sera partagé.";

 /* No comment provided by engineer. */
-"Your profile is stored on your device and shared only with your contacts.\nSimpleX servers cannot see your profile." = "Votre profil est stocké sur votre appareil et est seulement partagé avec vos contacts.\nLes serveurs SimpleX ne peuvent pas voir votre profil.";
+"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Votre profil est stocké sur votre appareil et est seulement partagé avec vos contacts. Les serveurs SimpleX ne peuvent pas voir votre profil.";

 /* No comment provided by engineer. */
 "Your profile, contacts and delivered messages are stored on your device." = "Votre profil, vos contacts et les messages reçus sont stockés sur votre appareil.";
@@ -29,7 +29,7 @@
 "- optionally notify deleted contacts.\n- profile names with spaces.\n- and more!" = "- opcionális értesítés a törölt kapcsolatokról.\n- profilnevek szóközökkel.\n- és még sok más!";

 /* No comment provided by engineer. */
-"- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- hangüzenetek legfeljebb 5 perces időtartamig.\n- egyedi eltűnési időhatár megadása.\n- előzmények szerkesztése.";
+"- voice messages up to 5 minutes.\n- custom time to disappear.\n- editing history." = "- 5 perc hosszúságú hangüzenetek.\n- egyedi üzenet-eltűnési időkorlát.\n- előzmények szerkesztése.";

 /* No comment provided by engineer. */
 ", " = ", ";
@@ -62,7 +62,7 @@
 "[Send us email](mailto:chat@simplex.chat)" = "[Küldjön nekünk e-mailt](mailto:chat@simplex.chat)";

 /* No comment provided by engineer. */
-"[Star on GitHub](https://github.com/simplex-chat/simplex-chat)" = "[Csillag a GitHubon](https://github.com/simplex-chat/simplex-chat)";
+"[Star on GitHub](https://github.com/simplex-chat/simplex-chat)" = "[Csillagozás a GitHubon](https://github.com/simplex-chat/simplex-chat)";

 /* No comment provided by engineer. */
 "**Add contact**: to create a new invitation link, or connect via a link you received." = "**Ismerős hozzáadása**: új meghívó hivatkozás létrehozásához, vagy egy kapott hivatkozáson keresztül történő kapcsolódáshoz.";
@@ -263,7 +263,7 @@
 "`a + b`" = "a + b";

 /* email text */
-"<p>Hi!</p>\n<p><a href=\"%@\">Connect to me via SimpleX Chat</a></p>" = "<p>Üdvözlöm!</p>\n<p><a href=„%@”>Csatlakozzon hozzám a SimpleX Chaten</a></p>";
+"<p>Hi!</p>\n<p><a href=\"%@\">Connect to me via SimpleX Chat</a></p>" = "<p>Üdvözlöm!</p>\n<p><a href=„%@”>Csatlakozzon hozzám a SimpleX Chaten keresztül</a></p>";

 /* No comment provided by engineer. */
 "~strike~" = "\\~áthúzott~";
@@ -343,7 +343,7 @@
 "Accept" = "Elfogadás";

 /* No comment provided by engineer. */
-"Accept connection request?" = "Kapcsolódási kérelem elfogadása?";
+"Accept connection request?" = "Ismerőskérelem elfogadása?";

 /* notification body */
 "Accept contact request from %@?" = "Elfogadja %@ kapcsolat kérését?";
@@ -659,10 +659,10 @@
 "Bad desktop address" = "Hibás számítógép cím";

 /* integrity error chat item */
-"bad message hash" = "hibás az üzenet ellenőrzőösszege";
+"bad message hash" = "hibás az üzenet hasító értéke";

 /* No comment provided by engineer. */
-"Bad message hash" = "Hibás az üzenet ellenőrzőösszege";
+"Bad message hash" = "Hibás az üzenet hasító értéke";

 /* integrity error chat item */
 "bad message ID" = "téves üzenet ID";
@@ -749,7 +749,7 @@
 "Call already ended!" = "A hívás már befejeződött!";

 /* call status */
-"call error" = "hiba a hívásban";
+"call error" = "híváshiba";

 /* call status */
 "call in progress" = "hívás folyamatban";
@@ -781,7 +781,7 @@
 /* No comment provided by engineer. */
 "Can't message member" = "Nem lehet üzenetet küldeni a tagnak";

-/* No comment provided by engineer. */
+/* alert button */
 "Cancel" = "Mégse";

 /* No comment provided by engineer. */
@@ -1002,7 +1002,7 @@
 "Connect incognito" = "Kapcsolódás inkognitóban";

 /* No comment provided by engineer. */
-"Connect to desktop" = "Kapcsolódás számítógéphez";
+"Connect to desktop" = "Társítás számítógéppel";

 /* No comment provided by engineer. */
 "connect to SimpleX Chat developers." = "Kapcsolódás a SimpleX Chat fejlesztőkhöz.";
@@ -1014,7 +1014,7 @@
 "Connect to yourself?" = "Kapcsolódás saját magához?";

 /* No comment provided by engineer. */
-"Connect to yourself?\nThis is your own one-time link!" = "Kapcsolódás saját magához?\nEz az egyszer használatos hivatkozása!";
+"Connect to yourself?\nThis is your own one-time link!" = "Kapcsolódás saját magához?\nEz az ön egyszer használatos hivatkozása!";

 /* No comment provided by engineer. */
 "Connect to yourself?\nThis is your own SimpleX address!" = "Kapcsolódás saját magához?\nEz az ön SimpleX címe!";
@@ -1038,7 +1038,7 @@
 "Connected" = "Kapcsolódva";

 /* No comment provided by engineer. */
-"Connected desktop" = "Csatlakoztatott számítógép";
+"Connected desktop" = "Társított számítógép";

 /* rcv group event chat item */
 "connected directly" = "közvetlenül kapcsolódva";
@@ -1068,7 +1068,7 @@
 "connecting (introduction invitation)" = "kapcsolódás (bemutatkozó meghívó)";

 /* call status */
-"connecting call" = "hívás kapcsolódik…";
+"connecting call" = "kapcsolódási hívás…";

 /* No comment provided by engineer. */
 "Connecting server…" = "Kapcsolódás a kiszolgálóhoz…";
@@ -1128,7 +1128,7 @@
 "Contact allows" = "Ismerős engedélyezi";

 /* No comment provided by engineer. */
-"Contact already exists" = "Létező ismerős";
+"Contact already exists" = "Az ismerős már létezik";

 /* No comment provided by engineer. */
 "Contact deleted!" = "Ismerős törölve!";
@@ -1197,7 +1197,7 @@
 "Create group" = "Csoport létrehozása";

 /* No comment provided by engineer. */
-"Create group link" = "Csoportos hivatkozás létrehozása";
+"Create group link" = "Csoporthivatkozás létrehozása";

 /* No comment provided by engineer. */
 "Create link" = "Hivatkozás létrehozása";
@@ -1233,7 +1233,7 @@
 "Created on %@" = "Létrehozva %@";

 /* No comment provided by engineer. */
-"Creating archive link" = "Archív hivatkozás létrehozása";
+"Creating archive link" = "Archívum hivatkozás létrehozása";

 /* No comment provided by engineer. */
 "Creating link…" = "Hivatkozás létrehozása…";
@@ -1450,7 +1450,7 @@
 "Delete old database?" = "Régi adatbázis törlése?";

 /* No comment provided by engineer. */
-"Delete pending connection?" = "Függő kapcsolatfelvételi kérések törlése?";
+"Delete pending connection?" = "Függőben lévő ismerőskérelem törlése?";

 /* No comment provided by engineer. */
 "Delete profile" = "Profil törlése";
@@ -1654,7 +1654,7 @@
 "Downloading link details" = "Letöltési hivatkozás részletei";

 /* No comment provided by engineer. */
-"Duplicate display name!" = "Duplikált megjelenítési név!";
+"Duplicate display name!" = "Duplikált megjelenített név!";

 /* integrity error chat item */
 "duplicate message" = "duplikált üzenet";
@@ -1852,7 +1852,7 @@
 "Error accessing database file" = "Hiba az adatbázisfájl elérésekor";

 /* No comment provided by engineer. */
-"Error adding member(s)" = "Hiba a tag(-ok) hozzáadásakor";
+"Error adding member(s)" = "Hiba a tag(ok) hozzáadásakor";

 /* No comment provided by engineer. */
 "Error changing address" = "Hiba a cím megváltoztatásakor";
@@ -1873,7 +1873,7 @@
 "Error creating group" = "Hiba a csoport létrehozásakor";

 /* No comment provided by engineer. */
-"Error creating group link" = "Hiba a csoport hivatkozásának létrehozásakor";
+"Error creating group link" = "Hiba a csoporthivatkozás létrehozásakor";

 /* No comment provided by engineer. */
 "Error creating member contact" = "Hiba az ismerőssel történő kapcsolat létrehozásában";
@@ -2002,7 +2002,7 @@
 "Error synchronizing connection" = "Hiba a kapcsolat szinkronizálása közben";

 /* No comment provided by engineer. */
-"Error updating group link" = "Hiba a csoport hivatkozás frissítésekor";
+"Error updating group link" = "Hiba a csoporthivatkozás frissítésekor";

 /* No comment provided by engineer. */
 "Error updating message" = "Hiba az üzenet frissítésekor";
@@ -2203,9 +2203,6 @@
 /* No comment provided by engineer. */
 "Full name (optional)" = "Teljes név (opcionális)";

-/* No comment provided by engineer. */
-"Full name:" = "Teljes név:";
-
 /* No comment provided by engineer. */
 "Fully decentralized – visible only to members." = "Teljesen decentralizált - kizárólag tagok számára látható.";

@@ -2255,10 +2252,10 @@
 "Group invitation is no longer valid, it was removed by sender." = "A csoport meghívó már nem érvényes, a küldője törölte.";

 /* No comment provided by engineer. */
-"Group link" = "Csoport hivatkozás";
+"Group link" = "Csoporthivatkozás";

 /* No comment provided by engineer. */
-"Group links" = "Csoport hivatkozások";
+"Group links" = "Csoporthivatkozások";

 /* No comment provided by engineer. */
 "Group members can add message reactions." = "Csoporttagok üzenetreakciókat adhatnak hozzá.";
@@ -2303,7 +2300,7 @@
 "Group welcome message" = "Csoport üdvözlő üzenete";

 /* No comment provided by engineer. */
-"Group will be deleted for all members - this cannot be undone!" = "Csoport törlésre kerül minden tag számára - ez a művelet nem vonható vissza!";
+"Group will be deleted for all members - this cannot be undone!" = "A csoport törlésre kerül minden tag számára - ez a művelet nem vonható vissza!";

 /* No comment provided by engineer. */
 "Group will be deleted for you - this cannot be undone!" = "A csoport törlésre kerül az ön számára - ez a művelet nem vonható vissza!";
@@ -2444,10 +2441,10 @@
 "incognito via contact address link" = "inkognitó a kapcsolattartási hivatkozáson keresztül";

 /* chat list item description */
-"incognito via group link" = "inkognitó a csoportos hivatkozáson keresztül";
+"incognito via group link" = "inkognitó a csoporthivatkozáson keresztül";

 /* chat list item description */
-"incognito via one-time link" = "inkognitó az egyszer használatos hivatkozáson keresztül";
+"incognito via one-time link" = "inkognitó egy egyszer használatos hivatkozáson keresztül";

 /* notification */
 "Incoming audio call" = "Bejövő hanghívás";
@@ -2501,13 +2498,13 @@
 "invalid chat data" = "érvénytelen csevegés adat";

 /* No comment provided by engineer. */
-"Invalid connection link" = "Érvénytelen kapcsolati hivatkozás";
+"Invalid connection link" = "Érvénytelen kapcsolattartási hivatkozás";

 /* invalid chat item */
 "invalid data" = "érvénytelen adat";

 /* No comment provided by engineer. */
-"Invalid display name!" = "Érvénytelen megjelenítendő felhaszálónév!";
+"Invalid display name!" = "Érvénytelen megjelenítendő név!";

 /* No comment provided by engineer. */
 "Invalid link" = "Érvénytelen hivatkozás";
@@ -2558,7 +2555,7 @@
 "invited to connect" = "meghívta, hogy csatlakozzon";

 /* rcv group event chat item */
-"invited via your group link" = "meghíva az ön csoport hivatkozásán keresztül";
+"invited via your group link" = "meghíva az ön csoporthivatkozásán keresztül";

 /* No comment provided by engineer. */
 "iOS Keychain is used to securely store passphrase - it allows receiving push notifications." = "Az iOS kulcstartó a jelmondat biztonságos tárolására szolgál - lehetővé teszi a push-értesítések fogadását.";
@@ -2666,7 +2663,7 @@
 "left" = "elhagyta a csoportot";

 /* email subject */
-"Let's talk in SimpleX Chat" = "Beszélgessünk a SimpleX Chat-ben";
+"Let's talk in SimpleX Chat" = "Beszélgessünk a SimpleX Chatben";

 /* No comment provided by engineer. */
 "Light" = "Világos";
@@ -2675,13 +2672,13 @@
 "Limitations" = "Korlátozások";

 /* No comment provided by engineer. */
-"Link mobile and desktop apps! 🔗" = "Társítsa össze a mobil és az asztali alkalmazásokat! 🔗";
+"Link mobile and desktop apps! 🔗" = "Társítsa össze a mobil és asztali alkalmazásokat! 🔗";

 /* No comment provided by engineer. */
-"Linked desktop options" = "Összekapcsolt számítógép beállítások";
+"Linked desktop options" = "Társított számítógép beállítások";

 /* No comment provided by engineer. */
-"Linked desktops" = "Összekapcsolt számítógépek";
+"Linked desktops" = "Társított számítógépek";

 /* No comment provided by engineer. */
 "LIVE" = "ÉLŐ";
@@ -2723,7 +2720,7 @@
 "Make sure WebRTC ICE server addresses are in correct format, line separated and are not duplicated." = "Győződjön meg arról, hogy a WebRTC ICE-kiszolgáló címei megfelelő formátumúak, sorszeparáltak és nincsenek duplikálva.";

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

 /* No comment provided by engineer. */
 "Mark deleted for everyone" = "Jelölje meg mindenki számára töröltként";
@@ -2738,7 +2735,7 @@
 "Markdown in messages" = "Markdown az üzenetekben";

 /* marked deleted chat item preview text */
-"marked deleted" = "töröltnek jelölve";
+"marked deleted" = "törlésre jelölve";

 /* No comment provided by engineer. */
 "Max 30 seconds, received instantly." = "Max. 30 másodperc, azonnal érkezett.";
@@ -2903,10 +2900,10 @@
 "moderated" = "moderált";

 /* No comment provided by engineer. */
-"Moderated at" = "Moderálva lett ekkor:";
+"Moderated at" = "Moderálva ekkor:";

 /* copied message info */
-"Moderated at: %@" = "Moderálva lett ekkor: %@";
+"Moderated at: %@" = "Moderálva ekkor: %@";

 /* marked deleted chat item preview text */
 "moderated by %@" = "moderálva lett %@ által";
@@ -2966,7 +2963,7 @@
 "New chat experience 🎉" = "Új csevegési élmény 🎉";

 /* notification */
-"New contact request" = "Új kapcsolattartási kérelem";
+"New contact request" = "Új ismerőskérelem";

 /* notification */
 "New contact:" = "Új kapcsolat:";
@@ -3011,7 +3008,7 @@
 "No app password" = "Nincs alkalmazás jelszó";

 /* No comment provided by engineer. */
-"No contacts selected" = "Nem kerültek ismerősök kiválasztásra";
+"No contacts selected" = "Nincs kiválasztva ismerős";

 /* No comment provided by engineer. */
 "No contacts to add" = "Nincs hozzáadandó ismerős";
@@ -3056,7 +3053,7 @@
 "Not compatible!" = "Nem kompatibilis!";

 /* No comment provided by engineer. */
-"Nothing selected" = "Semmi sincs kiválasztva";
+"Nothing selected" = "Nincs kiválasztva semmi";

 /* No comment provided by engineer. */
 "Notifications" = "Értesítések";
@@ -3094,7 +3091,7 @@
 "Old database" = "Régi adatbázis";

 /* No comment provided by engineer. */
-"Old database archive" = "Régi adatbázis archívum";
+"Old database archive" = "Régi adatbázis-archívum";

 /* group pref value */
 "on" = "bekapcsolva";
@@ -3112,7 +3109,7 @@
 "Onion hosts will not be used." = "Onion kiszolgálók nem lesznek használva.";

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

 /* No comment provided by engineer. */
 "Only delete conversation" = "Csak a beszélgetés törlése";
@@ -3193,7 +3190,7 @@
 "Or scan QR code" = "Vagy QR-kód beolvasása";

 /* No comment provided by engineer. */
-"Or securely share this file link" = "Vagy a fájl hivítkozásának biztonságos megosztása";
+"Or securely share this file link" = "Vagy ossza meg biztonságosan ezt a fájlhivatkozást";

 /* No comment provided by engineer. */
 "Or show this code" = "Vagy mutassa meg ezt a kódot";
@@ -3235,7 +3232,7 @@
 "Password to show" = "Jelszó megjelenítése";

 /* past/unknown group member */
-"Past member %@" = "Már nem tag - %@";
+"Past member %@" = "%@ (már nem tag)";

 /* No comment provided by engineer. */
 "Paste desktop address" = "Számítógép címének beillesztése";
@@ -3247,13 +3244,13 @@
 "Paste link to connect!" = "Hivatkozás beillesztése a kapcsolódáshoz!";

 /* No comment provided by engineer. */
-"Paste the link you received" = "Fogadott hivatkozás beillesztése";
+"Paste the link you received" = "Kapott hivatkozás beillesztése";

 /* No comment provided by engineer. */
 "peer-to-peer" = "ponttól-pontig";

 /* No comment provided by engineer. */
-"Pending" = "Függő";
+"Pending" = "Függőben";

 /* No comment provided by engineer. */
 "People can connect to you only via the links you share." = "Az emberek csak az ön által megosztott hivatkozáson keresztül kapcsolódhatnak.";
@@ -3286,7 +3283,7 @@
 "Please check that mobile and desktop are connected to the same local network, and that desktop firewall allows the connection.\nPlease share any other issues with the developers." = "Ellenőrizze, hogy a mobil és az asztali számítógép ugyanahhoz a helyi hálózathoz csatlakozik-e, valamint az asztali számítógép tűzfalában engedélyezve van-e a kapcsolat.\nMinden további problémát osszon meg a fejlesztőkkel.";

 /* No comment provided by engineer. */
-"Please check that you used the correct link or ask your contact to send you another one." = "Ellenőrizze, hogy a megfelelő hivatkozást használta-e, vagy kérje meg ismerősét, hogy küldjön egy másikat.";
+"Please check that you used the correct link or ask your contact to send you another one." = "Ellenőrizze, hogy a megfelelő hivatkozást használta-e, vagy kérje meg az ismerősét, hogy küldjön egy másikat.";

 /* No comment provided by engineer. */
 "Please check your network connection with %@ and try again." = "Ellenőrizze hálózati kapcsolatát a(z) %@ segítségével, és próbálja újra.";
@@ -3378,12 +3375,6 @@
 /* No comment provided by engineer. */
 "Profile images" = "Profilképek";

-/* No comment provided by engineer. */
-"Profile name" = "Profilnév";
-
-/* No comment provided by engineer. */
-"Profile name:" = "Profil neve:";
-
 /* No comment provided by engineer. */
 "Profile password" = "Profiljelszó";

@@ -3493,7 +3484,7 @@
 "Receive errors" = "Üzenetfogadási hibák";

 /* No comment provided by engineer. */
-"received answer…" = "fogadott válasz…";
+"received answer…" = "válasz fogadása…";

 /* No comment provided by engineer. */
 "Received at" = "Fogadva ekkor:";
@@ -3647,7 +3638,7 @@
 "Required" = "Szükséges";

 /* No comment provided by engineer. */
-"Reset" = "Alaphelyzetbe állítás";
+"Reset" = "Visszaállítás";

 /* No comment provided by engineer. */
 "Reset all hints" = "Tippek visszaállítása";
@@ -3659,13 +3650,13 @@
 "Reset all statistics?" = "Minden statisztika visszaállítása?";

 /* No comment provided by engineer. */
-"Reset colors" = "Színek alaphelyzetbe állítása";
+"Reset colors" = "Színek visszaállítása";

 /* No comment provided by engineer. */
 "Reset to app theme" = "Alkalmazás témájának visszaállítása";

 /* No comment provided by engineer. */
-"Reset to defaults" = "Alaphelyzetbe állítás";
+"Reset to defaults" = "Visszaállítás alaphelyzetbe";

 /* No comment provided by engineer. */
 "Reset to user theme" = "Felhasználó által létrehozott téma visszaállítása";
@@ -3715,10 +3706,11 @@
 /* No comment provided by engineer. */
 "Safer groups" = "Biztonságosabb csoportok";

-/* chat item action */
+/* alert button
+   chat item action */
 "Save" = "Mentés";

-/* No comment provided by engineer. */
+/* alert button */
 "Save (and notify contacts)" = "Mentés (és az ismerősök értesítése)";

 /* No comment provided by engineer. */
@@ -3736,9 +3728,6 @@
 /* No comment provided by engineer. */
 "Save archive" = "Archívum mentése";

-/* No comment provided by engineer. */
-"Save auto-accept settings" = "Automatikus elfogadási beállítások mentése";
-
 /* No comment provided by engineer. */
 "Save group profile" = "Csoportprofil elmentése";

@@ -3760,9 +3749,6 @@
 /* No comment provided by engineer. */
 "Save servers?" = "Kiszolgálók mentése?";

-/* No comment provided by engineer. */
-"Save settings?" = "Beállítások mentése?";
-
 /* No comment provided by engineer. */
 "Save welcome message?" = "Üdvözlőszöveg mentése?";

@@ -4013,10 +3999,10 @@
 "Servers" = "Kiszolgálók";

 /* No comment provided by engineer. */
-"Servers info" = "információk a kiszolgálókról";
+"Servers info" = "Információk a kiszolgálókról";

 /* No comment provided by engineer. */
-"Servers statistics will be reset - this cannot be undone!" = "A kiszolgálók statisztikái visszaállnak - ez nem vonható vissza!";
+"Servers statistics will be reset - this cannot be undone!" = "A kiszolgálók statisztikái visszaállnak - ez a művelet nem vonható vissza!";

 /* No comment provided by engineer. */
 "Session code" = "Munkamenet kód";
@@ -4136,7 +4122,7 @@
 "SimpleX encrypted message or connection event" = "SimpleX titkosított üzenet vagy kapcsolati esemény";

 /* simplex link type */
-"SimpleX group link" = "SimpleX csoport hivatkozás";
+"SimpleX group link" = "SimpleX csoporthivatkozás";

 /* chat feature */
 "SimpleX links" = "SimpleX hivatkozások";
@@ -4274,7 +4260,7 @@
 "Subscriptions ignored" = "Elutasított feliratkozások";

 /* No comment provided by engineer. */
-"Support SimpleX Chat" = "Támogassa a SimpleX Chatet";
+"Support SimpleX Chat" = "SimpleX Chat támogatása";

 /* No comment provided by engineer. */
 "System" = "Rendszer";
@@ -4343,7 +4329,7 @@
 "Thanks to the users – [contribute via Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" = "Köszönet a felhasználóknak – [hozzájárulás a Weblate-en keresztül](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!";

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

 /* No comment provided by engineer. */
 "The 1st platform without any user identifiers – private by design." = "Az első csevegési rendszer bármiféle felhasználó azonosító nélkül - privátra lett tervezre.";
@@ -4358,10 +4344,10 @@
 "The attempt to change database passphrase was not completed." = "Az adatbázis jelmondatának megváltoztatására tett kísérlet nem fejeződött be.";

 /* No comment provided by engineer. */
-"The code you scanned is not a SimpleX link QR code." = "A beolvasott kód nem egy SimpleX hivatkozás QR-kód.";
+"The code you scanned is not a SimpleX link QR code." = "A beolvasott QR-kód nem egy SimpleX QR-kód hivatkozás.";

 /* No comment provided by engineer. */
-"The connection you accepted will be cancelled!" = "Az ön által elfogadott kapcsolat vissza lesz vonva!";
+"The connection you accepted will be cancelled!" = "Az ön által elfogadott kérelem vissza lesz vonva!";

 /* No comment provided by engineer. */
 "The contact you shared this link with will NOT be able to connect!" = "Ismerőse, akivel megosztotta ezt a hivatkozást, NEM fog tudni kapcsolódni!";
@@ -4373,7 +4359,7 @@
 "The encryption is working and the new encryption agreement is not required. It may result in connection errors!" = "A titkosítás működik, és új titkosítási egyezményre nincs szükség. Ez kapcsolati hibákat eredményezhet!";

 /* No comment provided by engineer. */
-"The hash of the previous message is different." = "Az előző üzenet ellenőrzőösszege különbözik.";
+"The hash of the previous message is different." = "Az előző üzenet hasító értéke különbözik.";

 /* No comment provided by engineer. */
 "The ID of the next message is incorrect (less or equal to the previous).\nIt can happen because of some bug or when the connection is compromised." = "A következő üzenet azonosítója hibás (kisebb vagy egyenlő az előzővel).\nEz valamilyen hiba, vagy sérült kapcsolat esetén fordulhat elő.";
@@ -4442,7 +4428,7 @@
 "This device name" = "Ennek az eszköznek a neve";

 /* No comment provided by engineer. */
-"This display name is invalid. Please choose another name." = "Ez a megjelenített felhasználónév érvénytelen. Válasszon egy másik nevet.";
+"This display name is invalid. Please choose another name." = "Ez a megjelenített név érvénytelen. Válasszon egy másik nevet.";

 /* No comment provided by engineer. */
 "This group has over %lld members, delivery receipts are not sent." = "Ennek a csoportnak több mint %lld tagja van, a kézbesítési jelentések nem kerülnek elküldésre.";
@@ -4451,13 +4437,13 @@
 "This group no longer exists." = "Ez a csoport már nem létezik.";

 /* No comment provided by engineer. */
-"This is your own one-time link!" = "Ez az egyszer használatos hivatkozása!";
+"This is your own one-time link!" = "Ez az ön egyszer használatos hivatkozása!";

 /* No comment provided by engineer. */
 "This is your own SimpleX address!" = "Ez az ön SimpleX címe!";

 /* No comment provided by engineer. */
-"This link was used with another mobile device, please create a new link on the desktop." = "Ezt a hivatkozást egy másik mobilleszközön már használták, hozzon létre egy új hivatkozást az asztali számítógépén.";
+"This link was used with another mobile device, please create a new link on the desktop." = "Ezt a hivatkozást egy másik mobileszközön már használták, hozzon létre egy új hivatkozást az asztali számítógépén.";

 /* No comment provided by engineer. */
 "This setting applies to messages in your current chat profile **%@**." = "Ez a beállítás a jelenlegi **%@** profiljában lévő üzenetekre érvényes.";
@@ -4520,10 +4506,10 @@
 "Transport sessions" = "Munkamenetek átvitele";

 /* No comment provided by engineer. */
-"Trying to connect to the server used to receive messages from this contact (error: %@)." = "Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerőstől érkező üzenetek fogadására szolgál (hiba: %@).";
+"Trying to connect to the server used to receive messages from this contact (error: %@)." = "Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerősétől érkező üzenetek fogadására szolgál (hiba: %@).";

 /* No comment provided by engineer. */
-"Trying to connect to the server used to receive messages from this contact." = "Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerőstől érkező üzenetek fogadására szolgál.";
+"Trying to connect to the server used to receive messages from this contact." = "Kapcsolódási kísérlet ahhoz a kiszolgálóhoz, amely az adott ismerősétől érkező üzenetek fogadására szolgál.";

 /* No comment provided by engineer. */
 "Turkish interface" = "Török kezelőfelület";
@@ -4598,7 +4584,7 @@
 "Unless you use iOS call interface, enable Do Not Disturb mode to avoid interruptions." = "Hacsak nem az iOS hívási felületét használja, engedélyezze a Ne zavarjanak módot a megszakítások elkerülése érdekében.";

 /* No comment provided by engineer. */
-"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." = "Hacsak az ismerőse nem törölte a kapcsolatot, vagy ez a hivatkozás már használatban volt, lehet hogy ez egy hiba – jelentse a problémát.\nA kapcsolódáshoz kérje meg ismerősét, hogy hozzon létre egy másik kapcsolati hivatkozást, és ellenőrizze, hogy a hálózati kapcsolat stabil-e.";
+"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." = "Hacsak az ismerőse nem törölte a kapcsolatot, vagy ez a hivatkozás már használatban volt egyszer, lehet hogy ez egy hiba – jelentse a problémát.\nA kapcsolódáshoz kérje meg az ismerősét, hogy hozzon létre egy másik kapcsolattartási hivatkozást, és ellenőrizze, hogy a hálózati kapcsolat stabil-e.";

 /* No comment provided by engineer. */
 "Unlink" = "Szétkapcsolás";
@@ -4682,7 +4668,7 @@
 "Use for new connections" = "Alkalmazás új kapcsolatokhoz";

 /* No comment provided by engineer. */
-"Use from desktop" = "Használat számítógépről";
+"Use from desktop" = "Társítás számítógéppel";

 /* No comment provided by engineer. */
 "Use iOS call interface" = "Az iOS hívófelület használata";
@@ -4754,10 +4740,10 @@
 "via contact address link" = "kapcsolattartási cím-hivatkozáson keresztül";

 /* chat list item description */
-"via group link" = "csoport hivatkozáson keresztül";
+"via group link" = "a csoporthivatkozáson keresztül";

 /* chat list item description */
-"via one-time link" = "egyszer használatos hivatkozáson keresztül";
+"via one-time link" = "egy egyszer használatos hivatkozáson keresztül";

 /* No comment provided by engineer. */
 "via relay" = "átjátszón keresztül";
@@ -4934,7 +4920,7 @@
 "You already have a chat profile with the same display name. Please choose another name." = "Már van egy csevegési profil ugyanezzel a megjelenített névvel. Válasszon egy másik nevet.";

 /* No comment provided by engineer. */
-"You are already connected to %@." = "Már kapcsolódva van hozzá: %@.";
+"You are already connected to %@." = "Ön már kapcsolódva van ehhez: %@.";

 /* No comment provided by engineer. */
 "You are already connecting to %@." = "Már folyamatban van a kapcsolódás ehhez: %@.";
@@ -4958,7 +4944,7 @@
 "You are already joining the group!\nRepeat join request?" = "Csatlakozás folyamatban!\nCsatlakozási kérés megismétlése?";

 /* No comment provided by engineer. */
-"You are connected to the server used to receive messages from this contact." = "Már kapcsolódott ahhoz a kiszolgálóhoz, amely az adott ismerőstől érkező üzenetek fogadására szolgál.";
+"You are connected to the server used to receive messages from this contact." = "Már kapcsolódott ahhoz a kiszolgálóhoz, amely az adott ismerősétől érkező üzenetek fogadására szolgál.";

 /* No comment provided by engineer. */
 "you are invited to group" = "meghívást kapott a csoportba";
@@ -4973,7 +4959,7 @@
 "you are observer" = "megfigyelő szerep";

 /* snd group event chat item */
-"you blocked %@" = "ön letiltotta %@-t";
+"you blocked %@" = "ön letiltotta őt: %@";

 /* No comment provided by engineer. */
 "You can accept calls from lock screen, without device and app authentication." = "Hívásokat fogadhat a lezárási képernyőről, eszköz- és alkalmazáshitelesítés nélkül.";
@@ -4997,7 +4983,7 @@
 "You can hide or mute a user profile - swipe it to the right." = "Elrejtheti vagy lenémíthatja a felhasználó profiljait - csúsztassa jobbra a profilt.";

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

 /* notification body */
 "You can now chat with %@" = "Mostantól küldhet üzeneteket %@ számára";
@@ -5111,7 +5097,7 @@
 "You will be connected to group when the group host's device is online, please wait or check later!" = "Akkor lesz kapcsolódva a csoporthoz, amikor a csoport tulajdonosának eszköze online lesz, várjon, vagy ellenőrizze később!";

 /* No comment provided by engineer. */
-"You will be connected when group link host's device is online, please wait or check later!" = "Akkor lesz kapcsolódva, amikor a csoportos hivatkozás tulajdonosának eszköze online lesz, várjon, vagy ellenőrizze később!";
+"You will be connected when group link host's device is online, please wait or check later!" = "Akkor lesz kapcsolódva, amikor a csoporthivatkozás tulajdonosának eszköze online lesz, várjon, vagy ellenőrizze később!";

 /* No comment provided by engineer. */
 "You will be connected when your connection request is accepted, please wait or check later!" = "Akkor lesz kapcsolódva, ha a kapcsolódási kérelme elfogadásra kerül, várjon, vagy ellenőrizze később!";
@@ -5189,7 +5175,7 @@
 "Your profile **%@** will be shared." = "A(z) **%@** nevű profilja megosztásra fog kerülni.";

 /* No comment provided by engineer. */
-"Your profile is stored on your device and shared only with your contacts.\nSimpleX servers cannot see your profile." = "Profilja az eszközön van tárolva, és csak az ismerősökkel kerül megosztásra.\nA SimpleX kiszolgálók nem látjhatják profilját.";
+"Your profile is stored on your device and shared only with your contacts. SimpleX servers cannot see your profile." = "Profilja az eszközön van tárolva, és csak az ismerősökkel kerül megosztásra. A SimpleX kiszolgálók nem látjhatják profilját.";

 /* No comment provided by engineer. */
 "Your profile, contacts and delivered messages are stored on your device." = "Profilja, ismerősei és az elküldött üzenetei az eszközön kerülnek tárolásra.";
@@ -5207,7 +5193,7 @@
 "Your settings" = "Beállítások";

 /* No comment provided by engineer. */
-"Your SimpleX address" = "Az ön SimpleX címe";
+"Your SimpleX address" = "Profil SimpleX címe";

 /* No comment provided by engineer. */
 "Your SMP servers" = "SMP kiszolgálók";
--- a/Show More
+++ b/Show More