6.0.2: ios 234, android 234, desktop 63

ui: translations (#4740 )
* Translated using Weblate (Italian) Currently translated at 100.0% (2032 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/it/ * Translated using Weblate (Italian) Currently translated at 100.0% (1785 of 1785 strings) Translation: SimpleX Chat/SimpleX Chat iOS Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/it/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 64.6% (1314 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 62.8% (1121 of 1785 strings) Translation: SimpleX Chat/SimpleX Chat iOS Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/zh_Hant/ * Translated using Weblate (Spanish) Currently translated at 100.0% (2032 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/es/ * Translated using Weblate (Dutch) Currently translated at 100.0% (2032 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/nl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (1785 of 1785 strings) Translation: SimpleX Chat/SimpleX Chat iOS Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/nl/ * Translated using Weblate (Vietnamese) Currently translated at 33.5% (682 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/vi/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 81.6% (1659 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 81.6% (1659 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/zh_Hant/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 62.8% (1121 of 1785 strings) Translation: SimpleX Chat/SimpleX Chat iOS Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/zh_Hant/ * Translated using Weblate (Spanish) Currently translated at 100.0% (2032 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (1785 of 1785 strings) Translation: SimpleX Chat/SimpleX Chat iOS Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/es/ * Translated using Weblate (Portuguese (Brazil)) Currently translated at 49.6% (887 of 1785 strings) Translation: SimpleX Chat/SimpleX Chat iOS Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/pt_BR/ * Translated using Weblate (Polish) Currently translated at 99.9% (2031 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (1785 of 1785 strings) Translation: SimpleX Chat/SimpleX Chat iOS Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/pl/ * Translated using Weblate (Indonesian) Currently translated at 5.3% (108 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/id/ * Translated using Weblate (Vietnamese) Currently translated at 34.2% (696 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/vi/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 85.4% (1736 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/zh_Hant/ * Translated using Weblate (Ukrainian) Currently translated at 100.0% (1785 of 1785 strings) Translation: SimpleX Chat/SimpleX Chat iOS Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/uk/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 86.8% (1764 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/zh_Hant/ * Translated using Weblate (Czech) Currently translated at 88.6% (1801 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/cs/ * Translated using Weblate (Indonesian) Currently translated at 5.8% (118 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/id/ * Update translation files Updated by "Remove blank strings" hook in Weblate. Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/ * Translated using Weblate (Vietnamese) Currently translated at 34.4% (701 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/vi/ * Translated using Weblate (Vietnamese) Currently translated at 34.9% (710 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/vi/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (2032 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (1785 of 1785 strings) Translation: SimpleX Chat/SimpleX Chat iOS Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/hu/ * Translated using Weblate (Arabic) Currently translated at 100.0% (2032 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/ar/ * Translated using Weblate (Vietnamese) Currently translated at 35.6% (725 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/vi/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (2032 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (1785 of 1785 strings) Translation: SimpleX Chat/SimpleX Chat iOS Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (2032 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/hu/ * Translated using Weblate (Hungarian) Currently translated at 100.0% (1785 of 1785 strings) Translation: SimpleX Chat/SimpleX Chat iOS Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/hu/ * Translated using Weblate (Spanish) Currently translated at 100.0% (2032 of 2032 strings) Translation: SimpleX Chat/SimpleX Chat Android Translate-URL: https://hosted.weblate.org/projects/simplex-chat/android/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (1785 of 1785 strings) Translation: SimpleX Chat/SimpleX Chat iOS Translate-URL: https://hosted.weblate.org/projects/simplex-chat/ios/es/ * process localizations * ru * ru export * hu --------- Co-authored-by: Random <random-r@users.noreply.hosted.weblate.org> Co-authored-by: kumo <cloud_029@icloud.com> Co-authored-by: No name <CertainBot@users.noreply.hosted.weblate.org> Co-authored-by: M1K4 <oomikaoo@gmail.com> Co-authored-by: tuananh-ng <158744840+tuananh-ng@users.noreply.github.com> Co-authored-by: Jiaa <jorden2895@gmail.com> Co-authored-by: axmfs <axmfs@proton.me> Co-authored-by: B.O.S.S <BxOxSxS@protonmail.com> Co-authored-by: billy appetie <billy_appetie@users.noreply.hosted.weblate.org> Co-authored-by: Max <Prototypem95@users.noreply.hosted.weblate.org> Co-authored-by: Reza Almanda <rezaalmanda27@gmail.com> Co-authored-by: Hosted Weblate <hosted@weblate.org> Co-authored-by: summoner001 <summoner@vivaldi.net> Co-authored-by: jonnysemon <jonnysemon@users.noreply.hosted.weblate.org>
2024-12-17 17:20:21 +01:00 · 2024-08-22 12:22:28 +01:00 · 2024-08-22 11:40:54 +01:00 · 2024-08-22 08:34:17 +01:00 · 2024-08-21 22:43:24 +01:00 · 2024-08-21 22:05:50 +01:00
502 changed files with 24386 additions and 16313 deletions
@@ -18,7 +18,7 @@
 2. ↔️ [Connect to the team](#connect-to-the-team), [join user groups](#join-user-groups) and [follow our updates](#follow-our-updates).
 3. 🤝 [Make a private connection](#make-a-private-connection) with a friend.
 4. 🔤 [Help translating SimpleX Chat](#help-translating-simplex-chat).
-5. ⚡️ [Contribute](#contribute) and [help us with donations](#help-us-with-donations).
+5. ⚡️ [Contribute](#contribute) and [support us with donations](#please-support-us-with-your-donations).

 [Learn more about SimpleX Chat](#contents).

@@ -150,7 +150,7 @@ We would love to have you join the development! You can help us with:
 - contributing to SimpleX Chat knowledge-base.
 - developing features - please connect to us via chat so we can help you get started.

-## Help us with donations
+## Please support us with your donations

 Huge thank you to everybody who donated to SimpleX Chat!

@@ -233,6 +233,8 @@ You can use SimpleX with your own servers and still communicate with people usin

 Recent and important updates:

+[Aug 14, 2024. SimpleX network: the investment from Jack Dorsey and Asymmetric, v6.0 released with the new user experience and private message routing](./blog/20240814-simplex-chat-vision-funding-v6-private-routing-new-user-experience.md)
+
 [Jun 4, 2024. SimpleX network: private message routing, v5.8 released with IP address protection and chat themes](./blog/20240604-simplex-chat-v5.8-private-message-routing-chat-themes.md)

 [Apr 26, 2024. SimpleX network: legally binding transparency, v5.7 released with better calls and messages.](./blog/20240426-simplex-legally-binding-transparency-v5-7-better-user-experience.md)
@@ -15,31 +15,12 @@ class AppDelegate: NSObject, UIApplicationDelegate {
    func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
        logger.debug("AppDelegate: didFinishLaunchingWithOptions")
        application.registerForRemoteNotifications()
-        if #available(iOS 17.0, *) { trackKeyboard() }
        NotificationCenter.default.addObserver(self, selector: #selector(pasteboardChanged), name: UIPasteboard.changedNotification, object: nil)
        removePasscodesIfReinstalled()
        prepareForLaunch()
        return true
    }

-    @available(iOS 17.0, *)
-    private func trackKeyboard() {
-        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil)
-    }
-
-    @available(iOS 17.0, *)
-    @objc func keyboardWillShow(_ notification: Notification) {
-        if let keyboardFrame: NSValue = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? NSValue {
-            ChatModel.shared.keyboardHeight = keyboardFrame.cgRectValue.height
-        }
-    }
-
-    @available(iOS 17.0, *)
-    @objc func keyboardWillHide(_ notification: Notification) {
-        ChatModel.shared.keyboardHeight = 0
-    }
-
    @objc func pasteboardChanged() {
        ChatModel.shared.pasteboardHasStrings = UIPasteboard.general.hasStrings
    }
@@ -36,7 +36,7 @@ struct ContentView: View {
    @State private var waitingForOrPassedAuth = true
    @State private var chatListActionSheet: ChatListActionSheet? = nil

-    private let callTopPadding: CGFloat = 50
+    private let callTopPadding: CGFloat = 40

    private enum ChatListActionSheet: Identifiable {
        case planAndConnectSheet(sheet: PlanAndConnectActionSheet)
@@ -151,12 +151,12 @@ struct ContentView: View {
            }
        }
        .onAppear {
-            reactOnDarkThemeChanges()
+            reactOnDarkThemeChanges(systemInDarkThemeCurrently)
        }
        .onChange(of: colorScheme) { scheme in
            // It's needed to update UI colors when iOS wants to make screenshot after going to background,
            // so when a user changes his global theme from dark to light or back, the app will adapt to it
-            reactOnDarkThemeChanges()
+            reactOnDarkThemeChanges(scheme == .dark)
        }
        .onChange(of: theme.name) { _ in
            ThemeManager.adjustWindowStyle()
@@ -207,7 +207,7 @@ struct ContentView: View {
            CallDuration(call: call)
        }
        .padding(.horizontal)
-        .frame(height: callTopPadding - 10)
+        .frame(height: callTopPadding)
        .background(Color(uiColor: UIColor(red: 47/255, green: 208/255, blue: 88/255, alpha: 1)))
        .onTapGesture {
            chatModel.activeCallViewIsCollapsed = false
@@ -50,12 +50,77 @@ class ItemsModel: ObservableObject {
    var reversedChatItems: [ChatItem] = [] {
        willSet { publisher.send() }
    }
+    var itemAdded = false {
+        willSet { publisher.send() }
+    }
+    
+    // Publishes directly to `objectWillChange` publisher,
+    // this will cause reversedChatItems to be rendered without throttling
+    @Published var isLoading = false
+    @Published var showLoadingProgress = false
+
    init() {
        publisher
            .throttle(for: 0.25, scheduler: DispatchQueue.main, latest: true)
            .sink { self.objectWillChange.send() }
            .store(in: &bag)
    }
+
+    func loadOpenChat(_ chatId: ChatId, willNavigate: @escaping () -> Void = {}) {
+        let navigationTimeout = Task {
+            do {
+                try await Task.sleep(nanoseconds: 250_000000)
+                await MainActor.run {
+                    willNavigate()
+                    ChatModel.shared.chatId = chatId
+                }
+            } catch {}
+        }
+        let progressTimeout = Task {
+            do {
+                try await Task.sleep(nanoseconds: 1500_000000)
+                await MainActor.run { showLoadingProgress = true }
+            } catch {}
+        }
+        Task {
+            if let chat = ChatModel.shared.getChat(chatId) {
+                await MainActor.run { self.isLoading = true }
+//                try? await Task.sleep(nanoseconds: 5000_000000)
+                await loadChat(chat: chat)
+                navigationTimeout.cancel()
+                progressTimeout.cancel()
+                await MainActor.run {
+                    self.isLoading = false
+                    self.showLoadingProgress = false
+                    willNavigate()
+                    ChatModel.shared.chatId = chatId
+                }
+            }
+        }
+    }
+}
+
+class NetworkModel: ObservableObject {
+    // map of connections network statuses, key is agent connection id
+    @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
+
+    static let shared = NetworkModel()
+
+    private init() { }
+
+    func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] = status
+        }
+    }
+
+    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
+        if let conn = contact.activeConn {
+            networkStatuses[conn.agentConnId] ?? .unknown
+        } else {
+            .unknown
+        }
+    }
 }

 final class ChatModel: ObservableObject {
@@ -78,10 +143,8 @@ final class ChatModel: ObservableObject {
    @Published var contentViewAccessAuthenticated: Bool = false
    @Published var laRequest: LocalAuthRequest?
    // list of chat "previews"
-    @Published var chats: [Chat] = []
+    @Published private(set) var chats: [Chat] = []
    @Published var deletedChats: Set<String> = []
-    // map of connections network statuses, key is agent connection id
-    @Published var networkStatuses: Dictionary<String, NetworkStatus> = [:]
    // current chat
    @Published var chatId: String?
    var chatItemStatuses: Dictionary<Int64, CIStatus> = [:]
@@ -120,8 +183,6 @@ final class ChatModel: ObservableObject {
    @Published var stopPreviousRecPlay: URL? = nil // coordinates currently playing source
    @Published var draft: ComposeState?
    @Published var draftChatId: String?
-    // tracks keyboard height via subscription in AppDelegate
-    @Published var keyboardHeight: CGFloat = 0
    @Published var pasteboardHasStrings: Bool = UIPasteboard.general.hasStrings
    @Published var networkInfo = UserNetworkInfo(networkType: .other, online: true)

@@ -228,10 +289,17 @@ final class ChatModel: ObservableObject {
        chats.firstIndex(where: { $0.id == id })
    }

-    func addChat(_ chat: Chat, at position: Int = 0) {
-        withAnimation {
-            chats.insert(chat, at: position)
+    func addChat(_ chat: Chat) {
+        if chatId == nil {
+            withAnimation { addChat_(chat, at: 0) }
+        } else {
+            addChat_(chat, at: 0)
        }
+        popChatCollector.throttlePopChat(chat.chatInfo.id, currentPosition: 0)
+    }
+
+    func addChat_(_ chat: Chat, at position: Int = 0) {
+        chats.insert(chat, at: position)
    }

    func updateChatInfo(_ cInfo: ChatInfo) {
@@ -289,26 +357,10 @@ final class ChatModel: ObservableObject {
        }
    }

-    func updateChats(with newChats: [ChatData]) {
-        for i in 0..<newChats.count {
-            let c = newChats[i]
-            if let j = getChatIndex(c.id)   {
-                let chat = chats[j]
-                chat.chatInfo = c.chatInfo
-                chat.chatItems = c.chatItems
-                chat.chatStats = c.chatStats
-                if i != j {
-                    if chatId != c.chatInfo.id  {
-                        popChat_(j, to: i)
-                    }  else if i == 0 {
-                        chatToTop = c.chatInfo.id
-                    }
-                }
-            } else {
-                addChat(Chat(c), at: i)
-            }
-        }
+    func updateChats(_ newChats: [ChatData]) {
+        chats = newChats.map { Chat($0) }
        NtfManager.shared.setNtfBadgeCount(totalUnreadCountForAllUsers())
+        popChatCollector.clear()
    }

 //    func addGroup(_ group: SimpleXChat.Group) {
@@ -316,6 +368,12 @@ final class ChatModel: ObservableObject {
 //    }

    func addChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
+        // mark chat non deleted
+        if case let .direct(contact) = cInfo, contact.chatDeleted {
+            var updatedContact = contact
+            updatedContact.chatDeleted = false
+            updateContact(updatedContact)
+        }
        // update previews
        if let i = getChatIndex(cInfo.id) {
            chats[i].chatItems = switch cInfo {
@@ -333,18 +391,9 @@ final class ChatModel: ObservableObject {
                [cItem]
            }
            if case .rcvNew = cItem.meta.itemStatus {
-                chats[i].chatStats.unreadCount = chats[i].chatStats.unreadCount + 1
-                increaseUnreadCounter(user: currentUser!)
-            }
-            if i > 0 {
-                if chatId == nil {
-                    withAnimation { popChat_(i) }
-                } else if chatId == cInfo.id  {
-                    chatToTop = cInfo.id
-                } else {
-                    popChat_(i)
-                }
+                unreadCollector.changeUnreadCounter(cInfo.id, by: 1)
            }
+            popChatCollector.throttlePopChat(cInfo.id, currentPosition: i)
        } else {
            addChat(Chat(chatInfo: cInfo, chatItems: [cItem]))
        }
@@ -390,6 +439,7 @@ final class ChatModel: ObservableObject {
                    ci.meta.itemStatus = status
                }
                im.reversedChatItems.insert(ci, at: hasLiveDummy ? 1 : 0)
+                im.itemAdded = true
            }
            return true
        }
@@ -422,8 +472,8 @@ final class ChatModel: ObservableObject {
    }

    func removeChatItem(_ cInfo: ChatInfo, _ cItem: ChatItem) {
-        if cItem.isRcvNew, let chatIndex = getChatIndex(cInfo.id) {
-            decreaseUnreadCounter(chatIndex)
+        if cItem.isRcvNew {
+            unreadCollector.changeUnreadCounter(cInfo.id, by: -1)
        }
        // update previews
        if let chat = getChat(cInfo.id) {
@@ -484,6 +534,7 @@ final class ChatModel: ObservableObject {
        let cItem = ChatItem.liveDummy(chatInfo.chatType)
        withAnimation {
            im.reversedChatItems.insert(cItem, at: 0)
+            im.itemAdded = true
        }
        return cItem
    }
@@ -572,14 +623,13 @@ final class ChatModel: ObservableObject {
    func markChatItemRead(_ cInfo: ChatInfo, _ cItem: ChatItem) async {
        if chatId == cInfo.id,
           let itemIndex = getChatItemIndex(cItem),
-           let chatIndex = getChatIndex(cInfo.id),
           im.reversedChatItems[itemIndex].isRcvNew {
            await MainActor.run {
                withTransaction(Transaction()) {
                    // update current chat
                    markChatItemRead_(itemIndex)
                    // update preview
-                    unreadCollector.decreaseUnreadCounter(chatIndex)
+                    unreadCollector.changeUnreadCounter(cInfo.id, by: -1)
                }
            }
        }
@@ -588,26 +638,92 @@ final class ChatModel: ObservableObject {
    private let unreadCollector = UnreadCollector()

    class UnreadCollector {
-        private let subject = PassthroughSubject<Int, Never>()
+        private let subject = PassthroughSubject<Void, Never>()
        private var bag = Set<AnyCancellable>()
-        private var dictionary = Dictionary<Int, Int>()
+        private var unreadCounts: [ChatId: Int] = [:]

        init() {
            subject
                .debounce(for: 1, scheduler: DispatchQueue.main)
-                .sink { _ in
-                    self.dictionary.forEach { key, value in
-                        ChatModel.shared.decreaseUnreadCounter(key, by: value)
+                .sink {
+                    let m = ChatModel.shared
+                    for (chatId, count) in self.unreadCounts {
+                        if let i = m.getChatIndex(chatId) {
+                            m.changeUnreadCounter(i, by: count)
+                        }
                    }
-                    self.dictionary = Dictionary<Int, Int>()
+                    self.unreadCounts = [:]
                }
                .store(in: &bag)
        }
+
+        func changeUnreadCounter(_ chatId: ChatId, by count: Int) {
+            DispatchQueue.main.async {
+                self.unreadCounts[chatId] = (self.unreadCounts[chatId] ?? 0) + count
+            }
+            subject.send()
+        }
+    }
+
+    let popChatCollector = PopChatCollector()
+    
+    class PopChatCollector {
+        private let subject = PassthroughSubject<Void, Never>()
+        private var bag = Set<AnyCancellable>()
+        private var chatsToPop: [ChatId: Date] = [:]
+        private let popTsComparator = KeyPathComparator<Chat>(\.popTs, order: .reverse)
+
+        init() {
+            subject
+                .throttle(for: 2, scheduler: DispatchQueue.main, latest: true)
+                .sink { self.popCollectedChats() }
+                .store(in: &bag)
+        }
        
-        // Only call from main thread
-        func decreaseUnreadCounter(_ chatIndex: Int) {
-            dictionary[chatIndex] = (dictionary[chatIndex] ?? 0) + 1
-            subject.send(chatIndex)
+        func throttlePopChat(_ chatId: ChatId, currentPosition: Int) {
+            let m = ChatModel.shared
+            if currentPosition > 0 && m.chatId == chatId {
+                m.chatToTop = chatId
+            }
+            if currentPosition > 0 || !chatsToPop.isEmpty {
+                chatsToPop[chatId] = Date.now
+                subject.send()
+            }
+        }
+        
+        func clear() {
+            chatsToPop = [:]
+        }
+
+        func popCollectedChats() {
+            let m = ChatModel.shared
+            var ixs: IndexSet = []
+            var chs: [Chat] = []
+            // collect chats that received updates
+            for (chatId, popTs) in self.chatsToPop {
+                // Currently opened chat is excluded, removing it from the list would navigate out of it
+                // It will be popped to top later when user exits from the list.
+                if m.chatId != chatId, let i = m.getChatIndex(chatId) {
+                    ixs.insert(i)
+                    let ch = m.chats[i]
+                    ch.popTs = popTs
+                    chs.append(ch)
+                }
+            }
+
+            let removeInsert = {
+                m.chats.remove(atOffsets: ixs)
+                // sort chats by pop timestamp in descending order
+                m.chats.insert(contentsOf: chs.sorted(using: self.popTsComparator), at: 0)
+            }
+
+            if m.chatId == nil {
+                withAnimation { removeInsert() }
+            } else {
+                removeInsert()
+            }
+
+            self.chatsToPop = [:]
        }
    }

@@ -622,25 +738,24 @@ final class ChatModel: ObservableObject {
        }
    }

-    func decreaseUnreadCounter(_ chatIndex: Int, by count: Int = 1) {
-        chats[chatIndex].chatStats.unreadCount = chats[chatIndex].chatStats.unreadCount - count
-        decreaseUnreadCounter(user: currentUser!, by: count)
+    func changeUnreadCounter(_ chatIndex: Int, by count: Int) {
+        chats[chatIndex].chatStats.unreadCount = chats[chatIndex].chatStats.unreadCount + count
+        changeUnreadCounter(user: currentUser!, by: count)
    }

    func increaseUnreadCounter(user: any UserLike) {
        changeUnreadCounter(user: user, by: 1)
-        NtfManager.shared.incNtfBadgeCount()
    }

    func decreaseUnreadCounter(user: any UserLike, by: Int = 1) {
        changeUnreadCounter(user: user, by: -by)
-        NtfManager.shared.decNtfBadgeCount(by: by)
    }

    private func changeUnreadCounter(user: any UserLike, by: Int) {
        if let i = users.firstIndex(where: { $0.user.userId == user.userId }) {
            users[i].unreadCount += by
        }
+        NtfManager.shared.changeNtfBadgeCount(by: by)
    }

    func totalUnreadCountForAllUsers() -> Int {
@@ -706,6 +821,7 @@ final class ChatModel: ObservableObject {

    func popChat(_ id: String) {
        if let i = getChatIndex(id) {
+            // no animation here, for it not to look like it just moved when leaving the chat
            popChat_(i)
        }
    }
@@ -778,7 +894,13 @@ final class ChatModel: ObservableObject {
            }
            i += 1
        }
-        return UnreadChatItemCounts(isNearBottom: totalBelow < 16, unreadBelow: unreadBelow)
+        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? {
@@ -789,20 +911,6 @@ final class ChatModel: ObservableObject {
        while i < maxIx && inView(i) { i += 1 }
        return im.reversedChatItems[min(i - 1, maxIx)]
    }
-
-    func setContactNetworkStatus(_ contact: Contact, _ status: NetworkStatus) {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] = status
-        }
-    }
-
-    func contactNetworkStatus(_ contact: Contact) -> NetworkStatus {
-        if let conn = contact.activeConn {
-            networkStatuses[conn.agentConnId] ?? .unknown
-        } else {
-            .unknown
-        }
-    }
 }

 struct ShowingInvitation {
@@ -817,6 +925,7 @@ struct NTFContactRequest {

 struct UnreadChatItemCounts: Equatable {
    var isNearBottom: Bool
+    var isReallyNearBottom: Bool
    var unreadBelow: Int
 }

@@ -825,6 +934,7 @@ final class Chat: ObservableObject, Identifiable, ChatLike {
    @Published var chatItems: [ChatItem]
    @Published var chatStats: ChatStats
    var created = Date.now
+    fileprivate var popTs: Date?

    init(_ cData: ChatData) {
        self.chatInfo = cData.chatInfo
@@ -57,7 +57,9 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
                chatModel.ntfCallInvitationAction = (chatId, ntfAction)
            }
        } else {
-            chatModel.chatId = content.targetContentIdentifier
+            if let chatId = content.targetContentIdentifier {
+                ItemsModel.shared.loadOpenChat(chatId)
+            }
        }
        handler()
    }
@@ -238,12 +240,8 @@ class NtfManager: NSObject, UNUserNotificationCenterDelegate, ObservableObject {
        ntfBadgeCountGroupDefault.set(count)
    }

-    func decNtfBadgeCount(by count: Int = 1) {
-        setNtfBadgeCount(max(0, UIApplication.shared.applicationIconBadgeNumber - count))
-    }
-
-    func incNtfBadgeCount(by count: Int = 1) {
-        setNtfBadgeCount(UIApplication.shared.applicationIconBadgeNumber + count)
+    func changeNtfBadgeCount(by count: Int = 1) {
+        setNtfBadgeCount(max(0, UIApplication.shared.applicationIconBadgeNumber + count))
    }

    private func addNotification(_ content: UNMutableNotificationContent) {
@@ -112,9 +112,9 @@ func chatSendCmdSync(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? =
    return resp
 }

-func chatSendCmd(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, _ ctrl: chat_ctrl? = nil) async -> ChatResponse {
+func chatSendCmd(_ cmd: ChatCommand, bgTask: Bool = true, bgDelay: Double? = nil, _ ctrl: chat_ctrl? = nil, log: Bool = true) async -> ChatResponse {
    await withCheckedContinuation { cont in
-        cont.resume(returning: chatSendCmdSync(cmd, bgTask: bgTask, bgDelay: bgDelay, ctrl))
+        cont.resume(returning: chatSendCmdSync(cmd, bgTask: bgTask, bgDelay: bgDelay, ctrl, log: log))
    }
 }

@@ -137,8 +137,8 @@ func apiGetActiveUser(ctrl: chat_ctrl? = nil) throws -> User? {
    }
 }

-func apiCreateActiveUser(_ p: Profile?, sameServers: Bool = false, pastTimestamp: Bool = false, ctrl: chat_ctrl? = nil) throws -> User {
-    let r = chatSendCmdSync(.createActiveUser(profile: p, sameServers: sameServers, pastTimestamp: pastTimestamp), ctrl)
+func apiCreateActiveUser(_ p: Profile?, pastTimestamp: Bool = false, ctrl: chat_ctrl? = nil) throws -> User {
+    let r = chatSendCmdSync(.createActiveUser(profile: p, pastTimestamp: pastTimestamp), ctrl)
    if case let .activeUser(user) = r { return user }
    throw r
 }
@@ -279,8 +279,10 @@ func apiGetAppSettings(settings: AppSettings) throws -> AppSettings {
    throw r
 }

-func apiExportArchive(config: ArchiveConfig) async throws {
-    try await sendCommandOkResp(.apiExportArchive(config: config))
+func apiExportArchive(config: ArchiveConfig) async throws -> [ArchiveError] {
+    let r = await chatSendCmd(.apiExportArchive(config: config))
+    if case let .archiveExported(archiveErrors) = r { return archiveErrors }
+    throw r
 }

 func apiImportArchive(config: ArchiveConfig) async throws -> [ArchiveError] {
@@ -318,8 +320,8 @@ private func apiChatsResponse(_ r: ChatResponse) throws -> [ChatData] {

 let loadItemsPerPage = 50

-func apiGetChat(type: ChatType, id: Int64, search: String = "") throws -> Chat {
-    let r = chatSendCmdSync(.apiGetChat(type: type, id: id, pagination: .last(count: loadItemsPerPage), search: search))
+func apiGetChat(type: ChatType, id: Int64, search: String = "") async throws -> Chat {
+    let r = await chatSendCmd(.apiGetChat(type: type, id: id, pagination: .last(count: loadItemsPerPage), search: search))
    if case let .apiChat(_, chat) = r { return Chat.init(chat) }
    throw r
 }
@@ -330,16 +332,20 @@ func apiGetChatItems(type: ChatType, id: Int64, pagination: ChatPagination, sear
    throw r
 }

-func loadChat(chat: Chat, search: String = "") {
+func loadChat(chat: Chat, search: String = "", clearItems: Bool = true) async {
    do {
        let cInfo = chat.chatInfo
        let m = ChatModel.shared
        let im = ItemsModel.shared
        m.chatItemStatuses = [:]
-        im.reversedChatItems = []
-        let chat = try apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
-        m.updateChatInfo(chat.chatInfo)
-        im.reversedChatItems = chat.chatItems.reversed()
+        if clearItems {
+            await MainActor.run { im.reversedChatItems = [] }
+        }
+        let chat = try await apiGetChat(type: cInfo.chatType, id: cInfo.apiId, search: search)
+        await MainActor.run {
+            im.reversedChatItems = chat.chatItems.reversed()
+            m.updateChatInfo(chat.chatInfo)
+        }
    } catch let error {
        logger.error("loadChat error: \(responseError(error))")
    }
@@ -699,7 +705,7 @@ func apiConnect_(incognito: Bool, connReq: String) async -> ((ConnReqType, Pendi
        return ((.contact, connection), nil)
    case let .contactAlreadyExists(_, contact):
        if let c = m.getContactChat(contact.contactId) {
-            await MainActor.run { m.chatId = c.id }
+            ItemsModel.shared.loadOpenChat(c.id)
        }
        let alert = contactAlreadyExistsAlert(contact)
        return (nil, alert)
@@ -759,22 +765,38 @@ func apiConnectContactViaAddress(incognito: Bool, contactId: Int64) async -> (Co
    return (nil, alert)
 }

-func apiDeleteChat(type: ChatType, id: Int64, notify: Bool? = nil) async throws {
+func apiDeleteChat(type: ChatType, id: Int64, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async throws {
    let chatId = type.rawValue + id.description
    DispatchQueue.main.async { ChatModel.shared.deletedChats.insert(chatId) }
    defer { DispatchQueue.main.async { ChatModel.shared.deletedChats.remove(chatId) } }
-    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, notify: notify), bgTask: false)
+    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, chatDeleteMode: chatDeleteMode), bgTask: false)
    if case .direct = type, case .contactDeleted = r { return }
    if case .contactConnection = type, case .contactConnectionDeleted = r { return }
    if case .group = type, case .groupDeletedUser = r { return }
    throw r
 }

-func deleteChat(_ chat: Chat, notify: Bool? = nil) async {
+func apiDeleteContact(id: Int64, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async throws -> Contact {
+    let type: ChatType = .direct
+    let chatId = type.rawValue + id.description
+    if case .full = chatDeleteMode {
+        DispatchQueue.main.async { ChatModel.shared.deletedChats.insert(chatId) }
+    }
+    defer {
+        if case .full = chatDeleteMode {
+            DispatchQueue.main.async { ChatModel.shared.deletedChats.remove(chatId) }
+        }
+    }
+    let r = await chatSendCmd(.apiDeleteChat(type: type, id: id, chatDeleteMode: chatDeleteMode), bgTask: false)
+    if case let .contactDeleted(_, contact) = r { return contact }
+    throw r
+}
+
+func deleteChat(_ chat: Chat, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async {
    do {
        let cInfo = chat.chatInfo
-        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId, notify: notify)
-        DispatchQueue.main.async { ChatModel.shared.removeChat(cInfo.id) }
+        try await apiDeleteChat(type: cInfo.chatType, id: cInfo.apiId, chatDeleteMode: chatDeleteMode)
+        await MainActor.run { ChatModel.shared.removeChat(cInfo.id) }
    } catch let error {
        logger.error("deleteChat apiDeleteChat error: \(responseError(error))")
        AlertManager.shared.showAlertMsg(
@@ -784,6 +806,39 @@ func deleteChat(_ chat: Chat, notify: Bool? = nil) async {
    }
 }

+func deleteContactChat(_ chat: Chat, chatDeleteMode: ChatDeleteMode = .full(notify: true)) async -> Alert? {
+    do {
+        let cInfo = chat.chatInfo
+        let ct = try await apiDeleteContact(id: cInfo.apiId, chatDeleteMode: chatDeleteMode)
+        await MainActor.run {
+            switch chatDeleteMode {
+            case .full:
+                ChatModel.shared.removeChat(cInfo.id)
+            case .entity:
+                ChatModel.shared.removeChat(cInfo.id)
+                ChatModel.shared.addChat(Chat(
+                    chatInfo: .direct(contact: ct),
+                    chatItems: chat.chatItems
+                ))
+            case .messages:
+                ChatModel.shared.removeChat(cInfo.id)
+                ChatModel.shared.addChat(Chat(
+                    chatInfo: .direct(contact: ct),
+                    chatItems: []
+                ))
+            }
+        }
+    } catch let error {
+        logger.error("deleteContactChat apiDeleteContact error: \(responseError(error))")
+        return mkAlert(
+            title: "Error deleting chat!",
+            message: "Error: \(responseError(error))"
+        )
+    }
+    return nil
+}
+
+
 func apiClearChat(type: ChatType, id: Int64) async throws -> ChatInfo {
    let r = await chatSendCmd(.apiClearChat(type: type, id: id), bgTask: false)
    if case let .chatCleared(_, updatedChatInfo) = r { return updatedChatInfo }
@@ -1112,9 +1167,16 @@ func networkErrorAlert(_ r: ChatResponse) -> Alert? {
 func acceptContactRequest(incognito: Bool, contactRequest: UserContactRequest) async {
    if let contact = await apiAcceptContactRequest(incognito: incognito, contactReqId: contactRequest.apiId) {
        let chat = Chat(chatInfo: ChatInfo.direct(contact: contact), chatItems: [])
-        DispatchQueue.main.async {
+        await MainActor.run {
            ChatModel.shared.replaceChat(contactRequest.id, chat)
-            ChatModel.shared.setContactNetworkStatus(contact, .connected)
+            NetworkModel.shared.setContactNetworkStatus(contact, .connected)
+        }
+        if contact.sndReady {
+            DispatchQueue.main.async {
+                dismissAllSheets(animated: true) {
+                    ItemsModel.shared.loadOpenChat(chat.id)
+                }
+            }
        }
    }
 }
@@ -1156,12 +1218,18 @@ func apiEndCall(_ contact: Contact) async throws {
    try await sendCommandOkResp(.apiEndCall(contact: contact))
 }

-func apiGetCallInvitations() throws -> [RcvCallInvitation] {
+func apiGetCallInvitationsSync() throws -> [RcvCallInvitation] {
    let r = chatSendCmdSync(.apiGetCallInvitations)
    if case let .callInvitations(invs) = r { return invs }
    throw r
 }

+func apiGetCallInvitations() async throws -> [RcvCallInvitation] {
+    let r = await chatSendCmd(.apiGetCallInvitations)
+    if case let .callInvitations(invs) = r { return invs }
+    throw r
+}
+
 func apiCallStatus(_ contact: Contact, _ status: String) async throws {
    if let callStatus = WebRTCCallStatus.init(rawValue: status) {
        try await sendCommandOkResp(.apiCallStatus(contact: contact, callStatus: callStatus))
@@ -1358,9 +1426,9 @@ func apiGetVersion() throws -> CoreVersionInfo {
    throw r
 }

-func getAgentSubsTotal() throws -> (SMPServerSubs, Bool) {
+func getAgentSubsTotal() async throws -> (SMPServerSubs, Bool) {
    let userId = try currentUserId("getAgentSubsTotal")
-    let r = chatSendCmdSync(.getAgentSubsTotal(userId: userId), log: false)
+    let r = await chatSendCmd(.getAgentSubsTotal(userId: userId), log: false)
    if case let .agentSubsTotal(_, subsTotal, hasSession) = r { return (subsTotal, hasSession) }
    logger.error("getAgentSubsTotal error: \(String(describing: r))")
    throw r
@@ -1455,7 +1523,7 @@ func startChat(refreshInvitations: Bool = true) throws {
        try getUserChatData()
        NtfManager.shared.setNtfBadgeCount(m.totalUnreadCountForAllUsers())
        if (refreshInvitations) {
-            try refreshCallInvitations()
+            Task { try await refreshCallInvitations() }
        }
        (m.savedToken, m.tokenStatus, m.notificationMode, m.notificationServer) = apiGetNtfToken()
        _ = try apiStartChat()
@@ -1529,7 +1597,7 @@ func getUserChatData() throws {
    m.userAddress = try apiGetUserAddress()
    m.chatItemTTL = try getChatItemTTL()
    let chats = try apiGetChats()
-    m.chats = chats.map { Chat.init($0) }
+    m.updateChats(chats)
 }

 private func getUserChatDataAsync() async throws {
@@ -1541,12 +1609,12 @@ private func getUserChatDataAsync() async throws {
        await MainActor.run {
            m.userAddress = userAddress
            m.chatItemTTL = chatItemTTL
-            m.chats = chats.map { Chat.init($0) }
+            m.updateChats(chats)
        }
    } else {
        await MainActor.run {
            m.userAddress = nil
-            m.chats = []
+            m.updateChats([])
        }
    }
 }
@@ -1596,6 +1664,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
        await TerminalItems.shared.add(.resp(.now, res))
    }
    let m = ChatModel.shared
+    let n = NetworkModel.shared
    logger.debug("processReceivedMsg: \(res.responseType)")
    switch res {
    case let .contactDeletedByContact(user, contact):
@@ -1618,7 +1687,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
            NtfManager.shared.notifyContactConnected(user, contact)
        }
        await MainActor.run {
-            m.setContactNetworkStatus(contact, .connected)
+            n.setContactNetworkStatus(contact, .connected)
        }
    case let .contactConnecting(user, contact):
        if active(user) && contact.directOrUsed {
@@ -1641,7 +1710,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
            }
        }
        await MainActor.run {
-            m.setContactNetworkStatus(contact, .connected)
+            n.setContactNetworkStatus(contact, .connected)
        }
    case let .receivedContactRequest(user, contactRequest):
        if active(user) {
@@ -1675,7 +1744,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
        if active(user) && m.hasChat(mergedContact.id) {
            await MainActor.run {
                if m.chatId == mergedContact.id {
-                    m.chatId = intoContact.id
+                    ItemsModel.shared.loadOpenChat(mergedContact.id)
                }
                m.removeChat(mergedContact.id)
            }
@@ -1683,27 +1752,27 @@ func processReceivedMsg(_ res: ChatResponse) async {
    case let .networkStatus(status, connections):
        // dispatch queue to synchronize access
        networkStatusesLock.sync {
-            var ns = m.networkStatuses
+            var ns = n.networkStatuses
            // slow loop is on the background thread
            for cId in connections {
                ns[cId] = status
            }
            // fast model update is on the main thread
            DispatchQueue.main.sync {
-                m.networkStatuses = ns
+                n.networkStatuses = ns
            }
        }
    case let .networkStatuses(_, statuses): ()
        // dispatch queue to synchronize access
        networkStatusesLock.sync {
-            var ns = m.networkStatuses
+            var ns = n.networkStatuses
            // slow loop is on the background thread
            for s in statuses {
                ns[s.agentConnId] = s.networkStatus
            }
            // fast model update is on the main thread
            DispatchQueue.main.sync {
-                m.networkStatuses = ns
+                n.networkStatuses = ns
            }
        }
    case let .newChatItem(user, aChatItem):
@@ -1844,7 +1913,7 @@ func processReceivedMsg(_ res: ChatResponse) async {
        }
        if let contact = memberContact {
            await MainActor.run {
-                m.setContactNetworkStatus(contact, .connected)
+                n.setContactNetworkStatus(contact, .connected)
            }
        }
    case let .groupUpdated(user, toGroup):
@@ -2025,6 +2094,8 @@ func processReceivedMsg(_ res: ChatResponse) async {
                m.remoteCtrlSession = nil
                dismissAllSheets() {
                    switch rcStopReason {
+                    case .disconnected:
+                        ()
                    case .connectionFailed(.errorAgent(.RCP(.identity))):
                        AlertManager.shared.showAlertMsg(
                            title: "Connection with desktop stopped",
@@ -2067,12 +2138,13 @@ func processReceivedMsg(_ res: ChatResponse) async {

 func switchToLocalSession() {
    let m = ChatModel.shared
+    let n = NetworkModel.shared
    m.remoteCtrlSession = nil
    do {
        m.users = try listUsers()
        try getUserChatData()
        let statuses = (try apiGetNetworkStatuses()).map { s in (s.agentConnId, s.networkStatus) }
-        m.networkStatuses = Dictionary(uniqueKeysWithValues: statuses)
+        n.networkStatuses = Dictionary(uniqueKeysWithValues: statuses)
    } catch let error {
        logger.debug("error updating chat data: \(responseError(error))")
    }
@@ -2095,23 +2167,30 @@ func chatItemSimpleUpdate(_ user: any UserLike, _ aChatItem: AChatItem) async {
    }
 }

-func refreshCallInvitations() throws {
+func refreshCallInvitations() async throws {
    let m = ChatModel.shared
-    let callInvitations = try justRefreshCallInvitations()
-    if let (chatId, ntfAction) = m.ntfCallInvitationAction,
-       let invitation = m.callInvitations.removeValue(forKey: chatId) {
-        m.ntfCallInvitationAction = nil
-        CallController.shared.callAction(invitation: invitation, action: ntfAction)
-    } else if let invitation = callInvitations.last(where: { $0.user.showNotifications }) {
-        activateCall(invitation)
+    let callInvitations = try await apiGetCallInvitations()
+    await MainActor.run {
+        m.callInvitations = callsByChat(callInvitations)
+        if let (chatId, ntfAction) = m.ntfCallInvitationAction,
+           let invitation = m.callInvitations.removeValue(forKey: chatId) {
+            m.ntfCallInvitationAction = nil
+            CallController.shared.callAction(invitation: invitation, action: ntfAction)
+        } else if let invitation = callInvitations.last(where: { $0.user.showNotifications }) {
+            activateCall(invitation)
+        }
    }
 }

-func justRefreshCallInvitations() throws -> [RcvCallInvitation] {
-    let m = ChatModel.shared
-    let callInvitations = try apiGetCallInvitations()
-    m.callInvitations = callInvitations.reduce(into: [ChatId: RcvCallInvitation]()) { result, inv in result[inv.contact.id] = inv }
-    return callInvitations
+func justRefreshCallInvitations() throws {
+    let callInvitations = try apiGetCallInvitationsSync()
+    ChatModel.shared.callInvitations = callsByChat(callInvitations)
+}
+
+private func callsByChat(_ callInvitations: [RcvCallInvitation]) -> [ChatId: RcvCallInvitation] {
+    callInvitations.reduce(into: [ChatId: RcvCallInvitation]()) {
+        result, inv in result[inv.contact.id] = inv
+    }
 }

 func activateCall(_ callInvitation: RcvCallInvitation) {
@@ -58,6 +58,7 @@ struct SimpleXApp: App {
                }
                .onChange(of: scenePhase) { phase in
                    logger.debug("scenePhase was \(String(describing: scenePhase)), now \(String(describing: phase))")
+                    AppSheetState.shared.scenePhaseActive = phase == .active
                    switch (phase) {
                    case .background:
                        // --- authentication
@@ -82,9 +83,11 @@ struct SimpleXApp: App {
                        if appState != .stopped {
                            startChatAndActivate {
                                if appState.inactive && chatModel.chatRunning == true {
-                                    updateChats()
-                                    if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
-                                        updateCallInvitations()
+                                    Task {
+                                        await updateChats()
+                                        if !chatModel.showCallView && !CallController.shared.hasActiveCalls() {
+                                            await updateCallInvitations()
+                                        }
                                    }
                                }
                            }
@@ -129,16 +132,16 @@ struct SimpleXApp: App {
        }
    }

-    private func updateChats() {
+    private func updateChats() async {
        do {
-            let chats = try apiGetChats()
-            chatModel.updateChats(with: chats)
+            let chats = try await apiGetChatsAsync()
+            await MainActor.run { chatModel.updateChats(chats) }
            if let id = chatModel.chatId,
               let chat = chatModel.getChat(id) {
-                loadChat(chat: chat)
+                Task { await loadChat(chat: chat, clearItems: false) }
            }
            if let ncr = chatModel.ntfContactRequest {
-                chatModel.ntfContactRequest = nil
+                await MainActor.run { chatModel.ntfContactRequest = nil }
                if case let .contactRequest(contactRequest) = chatModel.getChat(ncr.chatId)?.chatInfo {
                    Task { await acceptContactRequest(incognito: ncr.incognito, contactRequest: contactRequest) }
                }
@@ -148,9 +151,9 @@ struct SimpleXApp: App {
        }
    }

-    private func updateCallInvitations() {
+    private func updateCallInvitations() async {
        do {
-            try refreshCallInvitations()
+            try await refreshCallInvitations()
        } catch let error {
            logger.error("apiGetCallInvitations: cannot update call invitations \(responseError(error))")
        }
@@ -91,8 +91,8 @@ var systemInDarkThemeCurrently: Bool {
    return UITraitCollection.current.userInterfaceStyle == .dark
 }

-func reactOnDarkThemeChanges() {
-    if currentThemeDefault.get() == DefaultTheme.SYSTEM_THEME_NAME && CurrentColors.colors.isLight == systemInDarkThemeCurrently {
+func reactOnDarkThemeChanges(_ inDarkNow: Bool) {
+    if currentThemeDefault.get() == DefaultTheme.SYSTEM_THEME_NAME && CurrentColors.colors.isLight == inDarkNow {
        // Change active colors from light to dark and back based on system theme
        ThemeManager.applyTheme(DefaultTheme.SYSTEM_THEME_NAME)
    }
@@ -53,7 +53,7 @@ class ThemeManager {
            return perUserTheme
        }
        let defaultTheme = defaultActiveTheme(appSettingsTheme)
-        return ThemeModeOverride(mode: CurrentColors.base.mode, colors: defaultTheme?.colors ?? ThemeColors(), wallpaper: defaultTheme?.wallpaper)
+        return ThemeModeOverride(mode: CurrentColors.base.mode, colors: defaultTheme?.colors ?? ThemeColors(), wallpaper: defaultTheme?.wallpaper ?? ThemeWallpaper.from(PresetWallpaper.school.toType(CurrentColors.base), nil, nil))
    }

    static func currentColors(_ themeOverridesForType: WallpaperType?, _ perChatTheme: ThemeModeOverride?, _ perUserTheme: ThemeModeOverrides?, _ appSettingsTheme: [ThemeOverrides]) -> ActiveTheme {
@@ -186,7 +186,7 @@ class CallController: NSObject, CXProviderDelegate, PKPushRegistryDelegate, Obse
        logger.debug("CallController: started chat")
        self.shouldSuspendChat = true
        // There are no invitations in the model, as it was processed by NSE
-        _ = try? justRefreshCallInvitations()
+        try? justRefreshCallInvitations()
        logger.debug("CallController: updated call invitations chat")
        // logger.debug("CallController justRefreshCallInvitations: \(String(describing: m.callInvitations))")
        // Extract the call information from the push notification payload
@@ -411,6 +411,15 @@ final class WebRTCClient: NSObject, RTCVideoViewDelegate, RTCFrameEncryptorDeleg
    }

    func endCall() {
+        if #available(iOS 16.0, *) {
+            _endCall()
+        } else {
+            // Fixes `connection.close()` getting locked up in iOS15
+            DispatchQueue.global(qos: .utility).async { self._endCall() }
+        }
+    }
+
+    private func _endCall() {
        guard let call = activeCall.wrappedValue else { return }
        logger.debug("WebRTCClient: ending the call")
        activeCall.wrappedValue = nil
@@ -92,19 +92,23 @@ struct ChatInfoView: View {
    @EnvironmentObject var chatModel: ChatModel
    @EnvironmentObject var theme: AppTheme
    @Environment(\.dismiss) var dismiss: DismissAction
+    @ObservedObject var networkModel = NetworkModel.shared
    @ObservedObject var chat: Chat
    @State var contact: Contact
-    @Binding var connectionStats: ConnectionStats?
-    @Binding var customUserProfile: Profile?
    @State var localAlias: String
-    @Binding var connectionCode: String?
+    var onSearch: () -> Void
+    @State private var connectionStats: ConnectionStats? = nil
+    @State private var customUserProfile: Profile? = nil
+    @State private var connectionCode: String? = nil
    @FocusState private var aliasTextFieldFocused: Bool
    @State private var alert: ChatInfoViewAlert? = nil
-    @State private var showDeleteContactActionSheet = false
+    @State private var actionSheet: SomeActionSheet? = nil
+    @State private var sheet: SomeSheet<AnyView>? = nil
+    @State private var showConnectContactViaAddressDialog = false
    @State private var sendReceipts = SendReceipts.userDefault(true)
    @State private var sendReceiptsUserDefault = true
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
-
+    
    enum ChatInfoViewAlert: Identifiable {
        case clearChatAlert
        case networkStatusAlert
@@ -112,6 +116,7 @@ struct ChatInfoView: View {
        case abortSwitchAddressAlert
        case syncConnectionForceAlert
        case queueInfo(info: String)
+        case someAlert(alert: SomeAlert)
        case error(title: LocalizedStringKey, error: LocalizedStringKey?)

        var id: String {
@@ -122,11 +127,12 @@ struct ChatInfoView: View {
            case .abortSwitchAddressAlert: return "abortSwitchAddressAlert"
            case .syncConnectionForceAlert: return "syncConnectionForceAlert"
            case let .queueInfo(info): return "queueInfo \(info)"
+            case let .someAlert(alert): return "chatInfoSomeAlert \(alert.id)"
            case let .error(title, _): return "error \(title)"
            }
        }
    }
-
+    
    var body: some View {
        NavigationView {
            List {
@@ -136,12 +142,29 @@ struct ChatInfoView: View {
                    .onTapGesture {
                        aliasTextFieldFocused = false
                    }
-
+                
                Group {
                    localAliasTextEdit()
                }
                .listRowBackground(Color.clear)
                .listRowSeparator(.hidden)
+                .padding(.bottom, 18)
+                
+                GeometryReader { g in
+                    HStack(alignment: .center, spacing: 8) {
+                        let buttonWidth = g.size.width / 4
+                        searchButton(width: buttonWidth)
+                        AudioCallButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
+                        VideoButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
+                        muteButton(width: buttonWidth)
+                    }
+                }
+                .padding(.trailing)
+                .frame(maxWidth: .infinity)
+                .frame(height: infoViewActionButtonHeight)
+                .listRowBackground(Color.clear)
+                .listRowSeparator(.hidden)
+                .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 8))

                if let customUserProfile = customUserProfile {
                    Section(header: Text("Incognito").foregroundColor(theme.colors.secondary)) {
@@ -153,7 +176,7 @@ struct ChatInfoView: View {
                        }
                    }
                }
-
+                
                Section {
                    Group {
                        if let code = connectionCode { verifyCodeButton(code) }
@@ -173,14 +196,18 @@ struct ChatInfoView: View {
                    } label: {
                        Label("Chat theme", systemImage: "photo")
                    }
+                    //                    } else if developerTools {
+                    //                        synchronizeConnectionButtonForce()
+                    //                    }
                }
-
+                .disabled(!contact.ready || !contact.active)
+                
                if let conn = contact.activeConn {
                    Section {
                        infoRow(Text(String("E2E encryption")), conn.connPQEnabled ? "Quantum resistant" : "Standard")
                    }
                }
-
+                
                if let contactLink = contact.contactLink {
                    Section {
                        SimpleXLinkQRCode(uri: contactLink)
@@ -197,7 +224,7 @@ struct ChatInfoView: View {
                            .foregroundColor(theme.colors.secondary)
                    }
                }
-
+                
                if contact.ready && contact.active {
                    Section(header: Text("Servers").foregroundColor(theme.colors.secondary)) {
                        networkStatusRow()
@@ -226,12 +253,12 @@ struct ChatInfoView: View {
                        }
                    }
                }
-
+                
                Section {
                    clearChatButton()
                    deleteContactButton()
                }
-
+                
                if developerTools {
                    Section(header: Text("For console").foregroundColor(theme.colors.secondary)) {
                        infoRow("Local name", chat.chatInfo.localDisplayName)
@@ -260,6 +287,24 @@ struct ChatInfoView: View {
                sendReceiptsUserDefault = currentUser.sendRcptsContacts
            }
            sendReceipts = SendReceipts.fromBool(contact.chatSettings.sendRcpts, userDefault: sendReceiptsUserDefault)
+            
+            
+            Task {
+                do {
+                    let (stats, profile) = try await apiContactInfo(chat.chatInfo.apiId)
+                    let (ct, code) = try await apiGetContactCode(chat.chatInfo.apiId)
+                    await MainActor.run {
+                        connectionStats = stats
+                        customUserProfile = profile
+                        connectionCode = code
+                        if contact.activeConn?.connectionCode != ct.activeConn?.connectionCode {
+                            chat.chatInfo = .direct(contact: ct)
+                        }
+                    }
+                } catch let error {
+                    logger.error("apiContactInfo or apiGetContactCode error: \(responseError(error))")
+                }
+            }
        }
        .alert(item: $alert) { alertItem in
            switch(alertItem) {
@@ -269,37 +314,26 @@ struct ChatInfoView: View {
            case .abortSwitchAddressAlert: return abortSwitchAddressAlert(abortSwitchContactAddress)
            case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncContactConnection(force: true) })
            case let .queueInfo(info): return queueInfoAlert(info)
+            case let .someAlert(a): return a.alert
            case let .error(title, error): return mkAlert(title: title, message: error)
            }
        }
-        .actionSheet(isPresented: $showDeleteContactActionSheet) {
-            if contact.sndReady && contact.active {
-                return ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete and notify contact")) { deleteContact(notify: true) },
-                        .destructive(Text("Delete")) { deleteContact(notify: false) },
-                        .cancel()
-                    ]
-                )
+        .actionSheet(item: $actionSheet) { $0.actionSheet }
+        .sheet(item: $sheet) { 
+            if #available(iOS 16.0, *) {
+                $0.content
+                    .presentationDetents([.fraction(0.4)])
            } else {
-                return ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete")) { deleteContact() },
-                        .cancel()
-                    ]
-                )
+                $0.content
            }
        }
    }
-
+    
    private func contactInfoHeader() -> some View {
-        VStack {
+        VStack(spacing: 8) {
            let cInfo = chat.chatInfo
            ChatInfoImage(chat: chat, size: 192, color: Color(uiColor: .tertiarySystemFill))
-                .padding(.top, 12)
-                .padding()
+                .padding(.vertical, 12)
            if contact.verified {
                (
                    Text(Image(systemName: "checkmark.shield"))
@@ -328,7 +362,7 @@ struct ChatInfoView: View {
        }
        .frame(maxWidth: .infinity, alignment: .center)
    }
-
+    
    private func localAliasTextEdit() -> some View {
        TextField("Set contact name…", text: $localAlias)
            .disableAutocorrection(true)
@@ -345,7 +379,7 @@ struct ChatInfoView: View {
            .multilineTextAlignment(.center)
            .foregroundColor(theme.colors.secondary)
    }
-
+    
    private func setContactAlias() {
        Task {
            do {
@@ -360,6 +394,25 @@ struct ChatInfoView: View {
        }
    }

+    private func searchButton(width: CGFloat) -> some View {
+        InfoViewButton(image: "magnifyingglass", title: "search", width: width) {
+            dismiss()
+            onSearch()
+        }
+        .disabled(!contact.ready || chat.chatItems.isEmpty)
+    }
+
+    private func muteButton(width: CGFloat) -> some View {
+        InfoViewButton(
+            image: chat.chatInfo.ntfsEnabled ? "speaker.slash.fill" : "speaker.wave.2.fill",
+            title: chat.chatInfo.ntfsEnabled ? "mute" : "unmute",
+            width: width
+        ) {
+            toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
+        }
+        .disabled(!contact.ready || !contact.active)
+    }
+
    private func verifyCodeButton(_ code: String) -> some View {
        NavigationLink {
            VerifyCodeView(
@@ -389,7 +442,7 @@ struct ChatInfoView: View {
            )
        }
    }
-
+    
    private func contactPreferencesButton() -> some View {
        NavigationLink {
            ContactPreferencesView(
@@ -404,7 +457,7 @@ struct ChatInfoView: View {
            Label("Contact preferences", systemImage: "switch.2")
        }
    }
-
+    
    private func sendReceiptsOption() -> some View {
        Picker(selection: $sendReceipts) {
            ForEach([.yes, .no, .userDefault(sendReceiptsUserDefault)]) { (opt: SendReceipts) in
@@ -418,13 +471,13 @@ struct ChatInfoView: View {
            setSendReceipts()
        }
    }
-
+    
    private func setSendReceipts() {
        var chatSettings = chat.chatInfo.chatSettings ?? ChatSettings.defaults
        chatSettings.sendRcpts = sendReceipts.bool()
        updateChatSettings(chat, chatSettings: chatSettings)
    }
-
+    
    private func synchronizeConnectionButton() -> some View {
        Button {
            syncContactConnection(force: false)
@@ -433,7 +486,7 @@ struct ChatInfoView: View {
                .foregroundColor(.orange)
        }
    }
-
+    
    private func synchronizeConnectionButtonForce() -> some View {
        Button {
            alert = .syncConnectionForceAlert
@@ -442,7 +495,7 @@ struct ChatInfoView: View {
                .foregroundColor(.red)
        }
    }
-
+    
    private func networkStatusRow() -> some View {
        HStack {
            Text("Network status")
@@ -450,28 +503,35 @@ struct ChatInfoView: View {
                .foregroundColor(theme.colors.primary)
                .font(.system(size: 14))
            Spacer()
-            Text(chatModel.contactNetworkStatus(contact).statusString)
+            Text(networkModel.contactNetworkStatus(contact).statusString)
                .foregroundColor(theme.colors.secondary)
            serverImage()
        }
    }
-
+    
    private func serverImage() -> some View {
-        let status = chatModel.contactNetworkStatus(contact)
+        let status = networkModel.contactNetworkStatus(contact)
        return Image(systemName: status.imageName)
            .foregroundColor(status == .connected ? .green : theme.colors.secondary)
            .font(.system(size: 12))
    }
-
+    
    private func deleteContactButton() -> some View {
        Button(role: .destructive) {
-            showDeleteContactActionSheet = true
+            deleteContactDialog(
+                chat,
+                contact,
+                dismissToChatList: true,
+                showAlert: { alert = .someAlert(alert: $0) },
+                showActionSheet: { actionSheet = $0 },
+                showSheetContent: { sheet = $0 }
+            )
        } label: {
-            Label("Delete contact", systemImage: "trash")
+            Label("Delete contact", systemImage: "person.badge.minus")
                .foregroundColor(Color.red)
        }
    }
-
+    
    private func clearChatButton() -> some View {
        Button() {
            alert = .clearChatAlert
@@ -480,26 +540,7 @@ struct ChatInfoView: View {
                .foregroundColor(Color.orange)
        }
    }
-
-    private func deleteContact(notify: Bool? = nil) {
-        Task {
-            do {
-                try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId, notify: notify)
-                await MainActor.run {
-                    dismiss()
-                    chatModel.chatId = nil
-                    chatModel.removeChat(chat.chatInfo.id)
-                }
-            } catch let error {
-                logger.error("deleteContactAlert apiDeleteChat error: \(responseError(error))")
-                let a = getErrorAlert(error, "Error deleting contact")
-                await MainActor.run {
-                    alert = .error(title: a.title, error: a.message)
-                }
-            }
-        }
-    }
-
+    
    private func clearChatAlert() -> Alert {
        Alert(
            title: Text("Clear conversation?"),
@@ -513,14 +554,14 @@ struct ChatInfoView: View {
            secondaryButton: .cancel()
        )
    }
-
+    
    private func networkStatusAlert() -> Alert {
        Alert(
            title: Text("Network status"),
-            message: Text(chatModel.contactNetworkStatus(contact).statusExplanation)
+            message: Text(networkModel.contactNetworkStatus(contact).statusExplanation)
        )
    }
-
+    
    private func switchContactAddress() {
        Task {
            do {
@@ -539,7 +580,7 @@ struct ChatInfoView: View {
            }
        }
    }
-
+    
    private func abortSwitchContactAddress() {
        Task {
            do {
@@ -557,7 +598,7 @@ struct ChatInfoView: View {
            }
        }
    }
-
+    
    private func syncContactConnection(force: Bool) {
        Task {
            do {
@@ -578,6 +619,160 @@ struct ChatInfoView: View {
    }
 }

+struct AudioCallButton: View {
+    var chat: Chat
+    var contact: Contact
+    var width: CGFloat
+    var showAlert: (SomeAlert) -> Void
+
+    var body: some View {
+        CallButton(
+            chat: chat,
+            contact: contact,
+            image: "phone.fill",
+            title: "call",
+            mediaType: .audio,
+            width: width,
+            showAlert: showAlert
+        )
+    }
+}
+
+struct VideoButton: View {
+    var chat: Chat
+    var contact: Contact
+    var width: CGFloat
+    var showAlert: (SomeAlert) -> Void
+
+    var body: some View {
+        CallButton(
+            chat: chat,
+            contact: contact,
+            image: "video.fill",
+            title: "video",
+            mediaType: .video,
+            width: width,
+            showAlert: showAlert
+        )
+    }
+}
+
+private struct CallButton: View {
+    var chat: Chat
+    var contact: Contact
+    var image: String
+    var title: LocalizedStringKey
+    var mediaType: CallMediaType
+    var width: CGFloat
+    var showAlert: (SomeAlert) -> Void
+
+    var body: some View {
+        let canCall = contact.ready && contact.active && chat.chatInfo.featureEnabled(.calls) && ChatModel.shared.activeCall == nil
+
+        InfoViewButton(image: image, title: title, disabledLook: !canCall, width: width) {
+            if canCall {
+                if CallController.useCallKit() {
+                    CallController.shared.startCall(contact, mediaType)
+                } else {
+                    // When CallKit is not used, colorscheme will be changed and it will be visible if not hiding sheets first
+                    dismissAllSheets(animated: true) {
+                        CallController.shared.startCall(contact, mediaType)
+                    }
+                }
+            } else if contact.nextSendGrpInv {
+                showAlert(SomeAlert(
+                    alert: mkAlert(
+                        title: "Can't call contact",
+                        message: "Send message to enable calls."
+                    ),
+                    id: "can't call contact, send message"
+                ))
+            } else if !contact.active {
+                showAlert(SomeAlert(
+                    alert: mkAlert(
+                        title: "Can't call contact",
+                        message: "Contact is deleted."
+                    ),
+                    id: "can't call contact, contact deleted"
+                ))
+            } else if !contact.ready {
+                showAlert(SomeAlert(
+                    alert: mkAlert(
+                        title: "Can't call contact",
+                        message: "Connecting to contact, please wait or check later!"
+                    ),
+                    id: "can't call contact, contact not ready"
+                ))
+            } else if !chat.chatInfo.featureEnabled(.calls) {
+                switch chat.chatInfo.showEnableCallsAlert {
+                case .userEnable:
+                    showAlert(SomeAlert(
+                        alert: Alert(
+                            title: Text("Allow calls?"),
+                            message: Text("You need to allow your contact to call to be able to call them."),
+                            primaryButton: .default(Text("Allow")) {
+                                allowFeatureToContact(contact, .calls)
+                            },
+                            secondaryButton: .cancel()
+                        ),
+                        id: "allow calls"
+                    ))
+                case .askContact:
+                    showAlert(SomeAlert(
+                        alert: mkAlert(
+                            title: "Calls prohibited!",
+                            message: "Please ask your contact to enable calls."
+                        ),
+                        id: "calls prohibited, ask contact"
+                    ))
+                case .other:
+                    showAlert(SomeAlert(
+                        alert: mkAlert(
+                            title: "Calls prohibited!",
+                            message: "Please check yours and your contact preferences."
+                        )
+                        , id: "calls prohibited, other"
+                    ))
+                }
+            } else {
+                showAlert(SomeAlert(
+                    alert: mkAlert(title: "Can't call contact"),
+                    id: "can't call contact"
+                ))
+            }
+        }
+        .disabled(ChatModel.shared.activeCall != nil)
+    }
+}
+
+let infoViewActionButtonHeight: CGFloat = 60
+
+struct InfoViewButton: View {
+    var image: String
+    var title: LocalizedStringKey
+    var disabledLook: Bool = false
+    var width: CGFloat
+    var action: () -> Void
+
+    var body: some View {
+        VStack(spacing: 4) {
+            Image(systemName: image)
+                .resizable()
+                .scaledToFit()
+                .frame(width: 20, height: 20)
+            Text(title)
+                .font(.caption)
+        }
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
+        .foregroundColor(.accentColor)
+        .background(Color(.secondarySystemGroupedBackground))
+        .cornerRadius(10.0)
+        .frame(width: width, height: infoViewActionButtonHeight)
+        .disabled(disabledLook)
+        .onTapGesture(perform: action)
+    }
+}
+
 struct ChatWallpaperEditorSheet: View {
    @Environment(\.dismiss) var dismiss
    @EnvironmentObject var theme: AppTheme
@@ -763,15 +958,222 @@ func queueInfoAlert(_ info: String) -> Alert {
    )
 }

+func deleteContactDialog(
+    _ chat: Chat,
+    _ contact: Contact,
+    dismissToChatList: Bool,
+    showAlert: @escaping (SomeAlert) -> Void,
+    showActionSheet: @escaping (SomeActionSheet) -> Void,
+    showSheetContent: @escaping (SomeSheet<AnyView>) -> Void
+) {
+    if contact.sndReady && contact.active && !contact.chatDeleted {
+        deleteContactOrConversationDialog(chat, contact, dismissToChatList, showAlert, showActionSheet, showSheetContent)
+    } else if contact.sndReady && contact.active && contact.chatDeleted {
+        deleteContactWithoutConversation(chat, contact, dismissToChatList, showAlert, showActionSheet)
+    } else { // !(contact.sndReady && contact.active)
+        deleteNotReadyContact(chat, contact, dismissToChatList, showAlert, showActionSheet)
+    }
+}
+
+private func deleteContactOrConversationDialog(
+    _ chat: Chat,
+    _ contact: Contact,
+    _ dismissToChatList: Bool,
+    _ showAlert: @escaping (SomeAlert) -> Void,
+    _ showActionSheet: @escaping (SomeActionSheet) -> Void,
+    _ showSheetContent: @escaping (SomeSheet<AnyView>) -> Void
+) {
+    showActionSheet(SomeActionSheet(
+        actionSheet: ActionSheet(
+            title: Text("Delete contact?"),
+            buttons: [
+                .destructive(Text("Only delete conversation")) {
+                    deleteContactMaybeErrorAlert(chat, contact, chatDeleteMode: .messages, dismissToChatList, showAlert)
+                },
+                .destructive(Text("Delete contact")) {
+                    showSheetContent(SomeSheet(
+                        content: { AnyView(
+                            DeleteActiveContactDialog(
+                                chat: chat,
+                                contact: contact,
+                                dismissToChatList: dismissToChatList,
+                                showAlert: showAlert
+                            )
+                        ) },
+                        id: "DeleteActiveContactDialog"
+                    ))
+                },
+                .cancel()
+            ]
+        ),
+        id: "deleteContactOrConversationDialog"
+    ))
+}
+
+private func deleteContactMaybeErrorAlert(
+    _ chat: Chat,
+    _ contact: Contact,
+    chatDeleteMode: ChatDeleteMode,
+    _ dismissToChatList: Bool,
+    _ showAlert: @escaping (SomeAlert) -> Void
+) {
+    Task {
+        let alert_ = await deleteContactChat(chat, chatDeleteMode: chatDeleteMode)
+        if let alert = alert_ {
+            showAlert(SomeAlert(alert: alert, id: "deleteContactMaybeErrorAlert, error"))
+        } else {
+            if dismissToChatList {
+                await MainActor.run {
+                    ChatModel.shared.chatId = nil
+                }
+                DispatchQueue.main.async {
+                    dismissAllSheets(animated: true) {
+                        if case .messages = chatDeleteMode, showDeleteConversationNoticeDefault.get() {
+                            AlertManager.shared.showAlert(deleteConversationNotice(contact))
+                        } else if chatDeleteMode.isEntity, showDeleteContactNoticeDefault.get() {
+                            AlertManager.shared.showAlert(deleteContactNotice(contact))
+                        }
+                    }
+                }
+            } else {
+                if case .messages = chatDeleteMode, showDeleteConversationNoticeDefault.get() {
+                    showAlert(SomeAlert(alert: deleteConversationNotice(contact), id: "deleteContactMaybeErrorAlert, deleteConversationNotice"))
+                } else if chatDeleteMode.isEntity, showDeleteContactNoticeDefault.get() {
+                    showAlert(SomeAlert(alert: deleteContactNotice(contact), id: "deleteContactMaybeErrorAlert, deleteContactNotice"))
+                }
+            }
+        }
+    }
+}
+
+private func deleteConversationNotice(_ contact: Contact) -> Alert {
+    return Alert(
+        title: Text("Conversation deleted!"),
+        message: Text("You can send messages to \(contact.displayName) from Archived contacts."),
+        primaryButton: .default(Text("Don't show again")) {
+            showDeleteConversationNoticeDefault.set(false)
+        },
+        secondaryButton: .default(Text("Ok"))
+    )
+}
+
+private func deleteContactNotice(_ contact: Contact) -> Alert {
+    return Alert(
+        title: Text("Contact deleted!"),
+        message: Text("You can still view conversation with \(contact.displayName) in the list of chats."),
+        primaryButton: .default(Text("Don't show again")) {
+            showDeleteContactNoticeDefault.set(false)
+        },
+        secondaryButton: .default(Text("Ok"))
+    )
+}
+
+enum ContactDeleteMode {
+    case full
+    case entity
+
+    public func toChatDeleteMode(notify: Bool) -> ChatDeleteMode {
+        switch self {
+        case .full: .full(notify: notify)
+        case .entity: .entity(notify: notify)
+        }
+    }
+}
+
+struct DeleteActiveContactDialog: View {
+    @Environment(\.dismiss) var dismiss
+    @EnvironmentObject var theme: AppTheme
+    var chat: Chat
+    var contact: Contact
+    var dismissToChatList: Bool
+    var showAlert: (SomeAlert) -> Void
+    @State private var keepConversation = false
+
+    var body: some View {
+        NavigationView {
+            List {
+                Section {
+                    Toggle("Keep conversation", isOn: $keepConversation)
+
+                    Button(role: .destructive) {
+                        dismiss()
+                        deleteContactMaybeErrorAlert(chat, contact, chatDeleteMode: contactDeleteMode.toChatDeleteMode(notify: false), dismissToChatList, showAlert)
+                    } label: {
+                        Text("Delete without notification")
+                    }
+
+                    Button(role: .destructive) {
+                        dismiss()
+                        deleteContactMaybeErrorAlert(chat, contact, chatDeleteMode: contactDeleteMode.toChatDeleteMode(notify: true), dismissToChatList, showAlert)
+                    } label: {
+                        Text("Delete and notify contact")
+                    }
+                } footer: {
+                    Text("Contact will be deleted - this cannot be undone!")
+                        .foregroundColor(theme.colors.secondary)
+                }
+            }
+            .modifier(ThemedBackground(grouped: true))
+        }
+    }
+
+    var contactDeleteMode: ContactDeleteMode {
+        keepConversation ? .entity : .full
+    }
+}
+
+private func deleteContactWithoutConversation(
+    _ chat: Chat,
+    _ contact: Contact,
+    _ dismissToChatList: Bool,
+    _ showAlert: @escaping (SomeAlert) -> Void,
+    _ showActionSheet: @escaping (SomeActionSheet) -> Void
+) {
+    showActionSheet(SomeActionSheet(
+        actionSheet: ActionSheet(
+            title: Text("Confirm contact deletion?"),
+            buttons: [
+                .destructive(Text("Delete and notify contact")) {
+                    deleteContactMaybeErrorAlert(chat, contact, chatDeleteMode: .full(notify: true), dismissToChatList, showAlert)
+                },
+                .destructive(Text("Delete without notification")) {
+                    deleteContactMaybeErrorAlert(chat, contact, chatDeleteMode: .full(notify: false), dismissToChatList, showAlert)
+                },
+                .cancel()
+            ]
+        ),
+        id: "deleteContactWithoutConversation"
+    ))
+}
+
+private func deleteNotReadyContact(
+    _ chat: Chat,
+    _ contact: Contact,
+    _ dismissToChatList: Bool,
+    _ showAlert: @escaping (SomeAlert) -> Void,
+    _ showActionSheet: @escaping (SomeActionSheet) -> Void
+) {
+    showActionSheet(SomeActionSheet(
+        actionSheet: ActionSheet(
+            title: Text("Confirm contact deletion?"),
+            buttons: [
+                .destructive(Text("Confirm")) {
+                    deleteContactMaybeErrorAlert(chat, contact, chatDeleteMode: .full(notify: false), dismissToChatList, showAlert)
+                },
+                .cancel()
+            ]
+        ),
+        id: "deleteNotReadyContact"
+    ))
+}
+
 struct ChatInfoView_Previews: PreviewProvider {
    static var previews: some View {
        ChatInfoView(
            chat: Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: []),
            contact: Contact.sampleData,
-            connectionStats: Binding.constant(nil),
-            customUserProfile: Binding.constant(nil),
            localAlias: "",
-            connectionCode: Binding.constant(nil)
+            onSearch: {}
        )
    }
 }
@@ -294,7 +294,6 @@ struct FramedItemView: View {
        .padding(.horizontal, 12)
        .overlay(DetermineWidth())
        .frame(minWidth: 0, alignment: .leading)
-        .textSelection(.enabled)

        if let mediaWidth = maxMediaWidth(), mediaWidth < maxWidth {
            v.frame(maxWidth: mediaWidth, alignment: .leading)
@@ -97,7 +97,7 @@ struct ChatItemForwardingView: View {
                    )
                } else {
                    composeState = ComposeState.init(forwardingItem: ci, fromChatInfo: fromChatInfo)
-                    chatModel.chatId = chat.id
+                    ItemsModel.shared.loadOpenChat(chat.id)
                }
            }
        } label: {
@@ -351,7 +351,7 @@ struct ChatItemInfoView: View {
            Button {
                Task {
                    await MainActor.run {
-                        chatModel.chatId = forwardedFromItem.chatInfo.id
+                        ItemsModel.shared.loadOpenChat(forwardedFromItem.chatInfo.id)
                        dismiss()
                    }
                }
@@ -440,7 +440,7 @@ struct ChatItemInfoView: View {

    private func memberDeliveryStatusView(_ member: GroupMember, _ status: GroupSndStatus, _ sentViaProxy: Bool?) -> some View {
        HStack{
-            ProfileImage(imageStr: member.image, size: 30)
+            MemberProfileImage(member, size: 30)
                .padding(.trailing, 2)
            Text(member.chatViewName)
                .lineLimit(1)
@@ -47,65 +47,69 @@ struct ChatView: View {
    @State private var showDeleteSelectedMessages: Bool = false
    @State private var allowToDeleteSelectedMessagesForAll: Bool = false

+    @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial
+
    var body: some View {
        if #available(iOS 16.0, *) {
-            let v = viewBody
-            .scrollDismissesKeyboard(.immediately)
-            .keyboardPadding()
-            if (searchMode) {
-                v.toolbarBackground(.thinMaterial, for: .navigationBar)
-            } else {
-                v.toolbarBackground(.visible, for: .navigationBar)
-            }
+            viewBody
+                .scrollDismissesKeyboard(.immediately)
+                .toolbarBackground(.hidden, for: .navigationBar)
        } else {
            viewBody
        }
    }

+    @ViewBuilder
    private var viewBody: some View {
        let cInfo = chat.chatInfo
-        return VStack(spacing: 0) {
-            if searchMode {
-                searchToolbar()
+        ZStack {
+            let wallpaperImage = theme.wallpaper.type.image
+            let wallpaperType = theme.wallpaper.type
+            let backgroundColor = theme.wallpaper.background ?? wallpaperType.defaultBackgroundColor(theme.base, theme.colors.background)
+            let tintColor = theme.wallpaper.tint ?? wallpaperType.defaultTintColor(theme.base)
+            Color.clear.ignoresSafeArea(.all)
+                .if(wallpaperImage != nil) { view in
+                    view.modifier(
+                        ChatViewBackground(image: wallpaperImage!, imageType: wallpaperType, background: backgroundColor, tint: tintColor)
+                    )
+            }
+            VStack(spacing: 0) {
+                ZStack(alignment: .bottomTrailing) {
+                    chatItemsList()
+                    floatingButtons(counts: floatingButtonModel.unreadChatItemCounts)
+                }
+                connectingText()
+                if selectedChatItems == nil {
+                    ComposeView(
+                        chat: chat,
+                        composeState: $composeState,
+                        keyboardVisible: $keyboardVisible
+                    )
+                    .disabled(!cInfo.sendMsgEnabled)
+                } else {
+                    SelectedItemsBottomToolbar(
+                        chatItems: ItemsModel.shared.reversedChatItems,
+                        selectedChatItems: $selectedChatItems,
+                        chatInfo: chat.chatInfo,
+                        deleteItems: { forAll in
+                            allowToDeleteSelectedMessagesForAll = forAll
+                            showDeleteSelectedMessages = true
+                        },
+                        moderateItems: {
+                            if case let .group(groupInfo) = chat.chatInfo {
+                                showModerateSelectedMessagesAlert(groupInfo)
+                            }
+                        }
+                    )
+                }
+            }
+        }
+        .safeAreaInset(edge: .top) {
+            VStack(spacing: .zero) {
+                if searchMode { searchToolbar() }
                Divider()
            }
-            ZStack(alignment: .bottomTrailing) {
-                let wallpaperImage = theme.wallpaper.type.image
-                let wallpaperType = theme.wallpaper.type
-                let backgroundColor = theme.wallpaper.background ?? wallpaperType.defaultBackgroundColor(theme.base, theme.colors.background)
-                let tintColor = theme.wallpaper.tint ?? wallpaperType.defaultTintColor(theme.base)
-                chatItemsList()
-                    .if(wallpaperImage != nil) { view in
-                        view.modifier(
-                            ChatViewBackground(image: wallpaperImage!, imageType: wallpaperType, background: backgroundColor, tint: tintColor)
-                        )
-                }
-                floatingButtons(counts: floatingButtonModel.unreadChatItemCounts)
-            }
-            connectingText()
-            if selectedChatItems == nil {
-                ComposeView(
-                    chat: chat,
-                    composeState: $composeState,
-                    keyboardVisible: $keyboardVisible
-                )
-                .disabled(!cInfo.sendMsgEnabled)
-            } else {
-                SelectedItemsBottomToolbar(
-                    chatItems: ItemsModel.shared.reversedChatItems,
-                    selectedChatItems: $selectedChatItems,
-                    chatInfo: chat.chatInfo,
-                    deleteItems: { forAll in
-                        allowToDeleteSelectedMessagesForAll = forAll
-                        showDeleteSelectedMessages = true
-                    },
-                    moderateItems: {
-                        if case let .group(groupInfo) = chat.chatInfo {
-                            showModerateSelectedMessagesAlert(groupInfo)
-                        }
-                    }
-                )
-            }
+            .background(ToolbarMaterial.material(toolbarMaterial))
        }
        .navigationTitle(cInfo.chatViewName)
        .background(theme.colors.background)
@@ -125,16 +129,23 @@ struct ChatView: View {
                }
            }
        }
+        .appSheet(item: $selectedMember) { member in
+            Group {
+                if case let .group(groupInfo) = chat.chatInfo {
+                    GroupMemberInfoView(groupInfo: groupInfo, groupMember: member, navigation: true)
+                }
+            }
+        }
        .onAppear {
-            loadChat(chat: chat)
-            initChatView()
            selectedChatItems = nil
+            initChatView()
        }
        .onChange(of: chatModel.chatId) { cId in
            showChatInfoSheet = false
+            selectedChatItems = nil
+            scrollModel.scrollToBottom()
            stopAudioPlayer()
            if let cId {
-                selectedChatItems = nil
                if let c = chatModel.getChat(cId) {
                    chat = c
                }
@@ -147,8 +158,10 @@ struct ChatView: View {
        .onChange(of: revealedChatItem) { _ in
            NotificationCenter.postReverseListNeedsLayout()
        }
-        .onChange(of: im.reversedChatItems) { reversedChatItems in
-            if reversedChatItems.count <= loadItemsPerPage && filtered(reversedChatItems).count < 10 {
+        .onChange(of: im.isLoading) { isLoading in
+            if !isLoading,
+               im.reversedChatItems.count <= loadItemsPerPage,
+               filtered(im.reversedChatItems).count < 10 {
                loadChatItems(chat.chatInfo)
            }
        }
@@ -157,7 +170,6 @@ struct ChatView: View {
            VideoPlayerView.players.removeAll()
            stopAudioPlayer()
            if chatModel.chatId == cInfo.id && !presentationMode.wrappedValue.isPresented {
-                chatModel.chatId = nil
                DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
                    if chatModel.chatId == nil {
                        chatModel.chatItemStatuses = [:]
@@ -179,32 +191,18 @@ struct ChatView: View {
                } else if case let .direct(contact) = cInfo {
                    Button {
                        Task {
-                            do {
-                                let (stats, profile) = try await apiContactInfo(chat.chatInfo.apiId)
-                                let (ct, code) = try await apiGetContactCode(chat.chatInfo.apiId)
-                                await MainActor.run {
-                                    connectionStats = stats
-                                    customUserProfile = profile
-                                    connectionCode = code
-                                    if contact.activeConn?.connectionCode != ct.activeConn?.connectionCode {
-                                        chat.chatInfo = .direct(contact: ct)
-                                    }
-                                }
-                            } catch let error {
-                                logger.error("apiContactInfo or apiGetContactCode error: \(responseError(error))")
-                            }
-                            await MainActor.run { showChatInfoSheet = true }
+                            showChatInfoSheet = true
                        }
                    } label: {
                        ChatInfoToolbar(chat: chat)
                    }
-                    .appSheet(isPresented: $showChatInfoSheet, onDismiss: {
-                        connectionStats = nil
-                        customUserProfile = nil
-                        connectionCode = nil
-                        theme = buildTheme()
-                    }) {
-                        ChatInfoView(chat: chat, contact: contact, connectionStats: $connectionStats, customUserProfile: $customUserProfile, localAlias: chat.chatInfo.localAlias, connectionCode: $connectionCode)
+                    .appSheet(isPresented: $showChatInfoSheet, onDismiss: { theme = buildTheme() }) {
+                        ChatInfoView(
+                            chat: chat,
+                            contact: contact,
+                            localAlias: chat.chatInfo.localAlias,
+                            onSearch: { focusSearch() }
+                        )
                    }
                } else if case let .group(groupInfo) = cInfo {
                    Button {
@@ -222,7 +220,8 @@ struct ChatView: View {
                                    chat.chatInfo = .group(groupInfo: gInfo)
                                    chat.created = Date.now
                                }
-                            )
+                            ),
+                            onSearch: { focusSearch() }
                        )
                    }
                } else if case .local = cInfo {
@@ -230,6 +229,7 @@ struct ChatView: View {
                }
            }
            ToolbarItem(placement: .navigationBarTrailing) {
+                let isLoading = im.isLoading && im.showLoadingProgress
                if selectedChatItems != nil {
                    Button {
                        withAnimation {
@@ -252,19 +252,23 @@ struct ChatView: View {
                                }
                            }
                            Menu {
-                                if callsPrefEnabled && chatModel.activeCall == nil {
-                                    Button {
-                                        CallController.shared.startCall(contact, .video)
-                                    } label: {
-                                        Label("Video call", systemImage: "video")
+                                if !isLoading {
+                                    if callsPrefEnabled && chatModel.activeCall == nil {
+                                        Button {
+                                            CallController.shared.startCall(contact, .video)
+                                        } label: {
+                                            Label("Video call", systemImage: "video")
+                                        }
+                                        .disabled(!contact.ready || !contact.active)
                                    }
-                                    .disabled(!contact.ready || !contact.active)
+                                    searchButton()
+                                    ToggleNtfsButton(chat: chat)
+                                        .disabled(!contact.ready || !contact.active)
                                }
-                                searchButton()
-                                ToggleNtfsButton(chat: chat)
-                                    .disabled(!contact.ready || !contact.active)
                            } label: {
                                Image(systemName: "ellipsis")
+                                    .tint(isLoading ? Color.clear : nil)
+                                    .overlay { if isLoading { ProgressView() } }
                            }
                        }
                    case let .group(groupInfo):
@@ -289,10 +293,14 @@ struct ChatView: View {
                                }
                            }
                            Menu {
-                                searchButton()
-                                ToggleNtfsButton(chat: chat)
+                                if !isLoading {
+                                    searchButton()
+                                    ToggleNtfsButton(chat: chat)
+                                }
                            } label: {
                                Image(systemName: "ellipsis")
+                                    .tint(isLoading ? Color.clear : nil)
+                                    .overlay { if isLoading { ProgressView() } }
                            }
                        }
                    case .local:
@@ -358,14 +366,11 @@ struct ChatView: View {
                searchText = ""
                searchMode = false
                searchFocussed = false
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
-                    loadChat(chat: chat)
-                }
+                Task { await loadChat(chat: chat) }
            }
        }
        .padding(.horizontal)
        .padding(.vertical, 8)
-        .background(.thinMaterial)
    }
    
    private func voiceWithoutFrame(_ ci: ChatItem) -> Bool {
@@ -376,7 +381,7 @@ struct ChatView: View {
        reversedChatItems
            .enumerated()
            .filter { (index, chatItem) in
-                if let mergeCategory = chatItem.mergeCategory, index > .zero {
+                if let mergeCategory = chatItem.mergeCategory, index > 0 {
                    mergeCategory != reversedChatItems[index - 1].mergeCategory
                } else {
                    true
@@ -399,31 +404,42 @@ struct ChatView: View {
                                : voiceNoFrame
                                    ? (g.size.width - 32)
                                    : (g.size.width - 32) * 0.84
-                return chatItemView(ci, maxWidth)
-                    .onAppear {
-                        floatingButtonModel.appeared(viewId: ci.viewId)
-                    }
-                    .onDisappear {
-                        floatingButtonModel.disappeared(viewId: ci.viewId)
-                    }
-                    .id(ci.id) // Required to trigger `onAppear` on iOS15
+                return ChatItemWithMenu(
+                    chat: $chat,
+                    chatItem: ci,
+                    maxWidth: maxWidth,
+                    composeState: $composeState,
+                    selectedMember: $selectedMember,
+                    revealedChatItem: $revealedChatItem,
+                    selectedChatItems: $selectedChatItems
+                )
+                .onAppear {
+                    floatingButtonModel.appeared(viewId: ci.viewId)
+                }
+                .onDisappear {
+                    floatingButtonModel.disappeared(viewId: ci.viewId)
+                }
+                .id(ci.id) // Required to trigger `onAppear` on iOS15
            } loadPage: {
                loadChatItems(cInfo)
            }
-                .onTapGesture { hideKeyboard() }
-                .onChange(of: searchText) { _ in
-                    loadChat(chat: chat, search: searchText)
-                }
-                .onChange(of: chatModel.chatId) { chatId in
-                    if let chatId, let c = chatModel.getChat(chatId) {
-                        chat = c
-                        showChatInfoSheet = false
-                        loadChat(chat: c)
+            .opacity(ItemsModel.shared.isLoading ? 0 : 1)
+            .padding(.vertical, -InvertedTableView.inset)
+            .onTapGesture { hideKeyboard() }
+            .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 {
+                        scrollModel.scrollToBottom()
                    }
                }
-                .onChange(of: im.reversedChatItems) { _ in
-                    floatingButtonModel.chatItemsChanged()
-                }
+            }
        }
    }

@@ -456,19 +472,19 @@ struct ChatView: View {
        init() {
            unreadChatItemCounts = UnreadChatItemCounts(
                isNearBottom: true,
-                unreadBelow: .zero
+                isReallyNearBottom: true,
+                unreadBelow: 0
            )
            events
                .receive(on: DispatchQueue.global(qos: .background))
                .scan(Set<String>()) { itemsInView, event in
-                    return switch event {
-                    case let .appeared(viewId):
-                        itemsInView.union([viewId])
-                    case let .disappeared(viewId):
-                        itemsInView.subtracting([viewId])
-                    case .chatItemsChanged:
-                        itemsInView
+                    var updated = itemsInView
+                    switch event {
+                    case let .appeared(viewId): updated.insert(viewId)
+                    case let .disappeared(viewId): updated.remove(viewId)
+                    case .chatItemsChanged: ()
                    }
+                    return updated
                }
                .map { ChatModel.shared.unreadChatItemCounts(itemsInView: $0) }
                .removeDuplicates()
@@ -564,14 +580,18 @@ struct ChatView: View {

    private func searchButton() -> some View {
        Button {
-            searchMode = true
-            searchFocussed = true
-            searchText = ""
+            focusSearch()
        } label: {
            Label("Search", systemImage: "magnifyingglass")
        }
    }

+    private func focusSearch() {
+        searchMode = true
+        searchFocussed = true
+        searchText = ""
+    }
+
    private func addMembersButton() -> some View {
        Button {
            if case let .group(gInfo) = chat.chatInfo {
@@ -672,22 +692,10 @@ struct ChatView: View {
        VoiceItemState.chatView = [:]
    }

-    @ViewBuilder private func chatItemView(_ ci: ChatItem, _ maxWidth: CGFloat) -> some View {
-        ChatItemWithMenu(
-            chat: chat,
-            chatItem: ci,
-            maxWidth: maxWidth,
-            composeState: $composeState,
-            selectedMember: $selectedMember,
-            revealedChatItem: $revealedChatItem,
-            selectedChatItems: $selectedChatItems
-        )
-    }
-
    private struct ChatItemWithMenu: View {
        @EnvironmentObject var m: ChatModel
        @EnvironmentObject var theme: AppTheme
-        @ObservedObject var chat: Chat
+        @Binding @ObservedObject var chat: Chat
        let chatItem: ChatItem
        let maxWidth: CGFloat
        @Binding var composeState: ComposeState
@@ -717,7 +725,7 @@ struct ChatView: View {
            Group {
                if revealed, let range = range {
                    let items = Array(zip(Array(range), im.reversedChatItems[range]))
-                    ForEach(items, id: \.1.viewId) { (i, ci) in
+                    ForEach(items.reversed(), id: \.1.viewId) { (i, ci) in
                        let prev = i == prevHidden ? prevItem : im.reversedChatItems[i + 1]
                        chatItemView(ci, nil, prev)
                        .overlay {
@@ -813,10 +821,10 @@ struct ChatView: View {
                                    .padding(.trailing, 12)
                            }
                            HStack(alignment: .top, spacing: 8) {
-                                ProfileImage(imageStr: member.memberProfile.image, size: memberImageSize, backgroundColor: theme.colors.background)
+                                MemberProfileImage(member, size: memberImageSize, backgroundColor: theme.colors.background)
                                    .onTapGesture {
-                                        if m.membersLoaded {
-                                            selectedMember = m.getGroupMember(member.groupMemberId)
+                                        if let member =  m.getGroupMember(member.groupMemberId) {
+                                            selectedMember = member
                                        } else {
                                            Task {
                                                await m.loadGroupMembers(groupInfo) {
@@ -825,9 +833,6 @@ struct ChatView: View {
                                            }
                                        }
                                    }
-                                    .appSheet(item: $selectedMember) { member in
-                                        GroupMemberInfoView(groupInfo: groupInfo, groupMember: member, navigation: true)
-                                    }
                                chatItemWithMenu(ci, range, maxWidth)
                            }
                        }
@@ -1098,7 +1103,7 @@ struct ChatView: View {
        }

        func reactions(from: Int? = nil, till: Int? = nil) -> some View {
-            ForEach(availableReactions[(from ?? .zero)..<(till ?? availableReactions.count)]) { reaction in
+            ForEach(availableReactions[(from ?? 0)..<(till ?? availableReactions.count)]) { reaction in
                Button(reaction.text) {
                    setReaction(chatItem, add: true, reaction: reaction)
                }
@@ -55,7 +55,7 @@ struct ComposeLinkView: View {
                    .foregroundColor(theme.colors.secondary)
            }
            .padding(.vertical, 5)
-            .frame(maxWidth: .infinity, minHeight: 60, maxHeight: 60)
+            .frame(maxWidth: .infinity, minHeight: 60)
        }
    }
 }
@@ -281,6 +281,7 @@ struct ComposeView: View {
    @State private var stopPlayback: Bool = false

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

    var body: some View {
        VStack(spacing: 0) {
@@ -381,7 +382,11 @@ struct ComposeView: View {
                }
            }
        }
-        .background(.thinMaterial)
+        .background {
+            Color.clear
+                .overlay(ToolbarMaterial.material(toolbarMaterial))
+                .ignoresSafeArea(.all, edges: .bottom)
+        }
        .onChange(of: composeState.message) { msg in
            if composeState.linkPreviewAllowed {
                if msg.count > 0 {
@@ -47,14 +47,13 @@ struct AddGroupMembersViewCommon: View {

    var body: some View {
        if creatingGroup {
-            NavigationView {
-                addGroupMembersView()
-                    .toolbar {
-                        ToolbarItem(placement: .navigationBarTrailing) {
-                            Button ("Skip") { addedMembersCb(selectedContacts) }
-                        }
+            addGroupMembersView()
+                .navigationBarBackButtonHidden()
+                .toolbar {
+                    ToolbarItem(placement: .navigationBarTrailing) {
+                        Button ("Skip") { addedMembersCb(selectedContacts) }
                    }
-            }
+                }
        } else {
            addGroupMembersView()
        }
@@ -17,10 +17,12 @@ struct GroupChatInfoView: View {
    @Environment(\.dismiss) var dismiss: DismissAction
    @ObservedObject var chat: Chat
    @Binding var groupInfo: GroupInfo
+    var onSearch: () -> Void
    @State private var alert: GroupChatInfoViewAlert? = nil
    @State private var groupLink: String?
    @State private var groupLinkMemberRole: GroupMemberRole = .member
-    @State private var showAddMembersSheet: Bool = false
+    @State private var groupLinkNavLinkActive: Bool = false
+    @State private var addMembersNavLinkActive: Bool = false
    @State private var connectionStats: ConnectionStats?
    @State private var connectionCode: String?
    @State private var sendReceipts = SendReceipts.userDefault(true)
@@ -68,6 +70,15 @@ struct GroupChatInfoView: View {
            List {
                groupInfoHeader()
                    .listRowBackground(Color.clear)
+                    .padding(.bottom, 18)
+
+                infoActionButtons()
+                    .padding(.horizontal)
+                    .frame(maxWidth: .infinity)
+                    .frame(height: infoViewActionButtonHeight)
+                    .listRowBackground(Color.clear)
+                    .listRowSeparator(.hidden)
+                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))

                Section {
                    if groupInfo.canEdit {
@@ -174,7 +185,6 @@ struct GroupChatInfoView: View {
                logger.error("GroupChatInfoView apiGetGroupLink: \(responseError(error))")
            }
        }
-         .keyboardPadding()
    }

    private func groupInfoHeader() -> some View {
@@ -198,24 +208,95 @@ struct GroupChatInfoView: View {
        .frame(maxWidth: .infinity, alignment: .center)
    }

+    func infoActionButtons() -> some View {
+        GeometryReader { g in
+            let buttonWidth = g.size.width / 4
+            HStack(alignment: .center, spacing: 8) {
+                searchButton(width: buttonWidth)
+                if groupInfo.canAddMembers {
+                    addMembersActionButton(width: buttonWidth)
+                }
+                muteButton(width: buttonWidth)
+            }
+            .frame(maxWidth: .infinity, alignment: .center)
+        }
+    }
+
+    private func searchButton(width: CGFloat) -> some View {
+        InfoViewButton(image: "magnifyingglass", title: "search", width: width) {
+            dismiss()
+            onSearch()
+        }
+        .disabled(!groupInfo.ready || chat.chatItems.isEmpty)
+    }
+
+    @ViewBuilder private func addMembersActionButton(width: CGFloat) -> some View {
+        if chat.chatInfo.incognito {
+            ZStack {
+                InfoViewButton(image: "link.badge.plus", title: "invite", width: width) {
+                    groupLinkNavLinkActive = true
+                }
+
+                NavigationLink(isActive: $groupLinkNavLinkActive) {
+                    groupLinkDestinationView()
+                } label: {
+                    EmptyView()
+                }
+                .frame(width: 1, height: 1)
+                .hidden()
+            }
+            .disabled(!groupInfo.ready)
+        } else {
+            ZStack {
+                InfoViewButton(image: "person.fill.badge.plus", title: "invite", width: width) {
+                    addMembersNavLinkActive = true
+                }
+
+                NavigationLink(isActive: $addMembersNavLinkActive) {
+                    addMembersDestinationView()
+                } label: {
+                    EmptyView()
+                }
+                .frame(width: 1, height: 1)
+                .hidden()
+            }
+            .disabled(!groupInfo.ready)
+        }
+    }
+
+    private func muteButton(width: CGFloat) -> some View {
+        InfoViewButton(
+            image: chat.chatInfo.ntfsEnabled ? "speaker.slash.fill" : "speaker.wave.2.fill",
+            title: chat.chatInfo.ntfsEnabled ? "mute" : "unmute",
+            width: width
+        ) {
+            toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
+        }
+        .disabled(!groupInfo.ready)
+    }
+
    private func addMembersButton() -> some View {
        NavigationLink {
-            AddGroupMembersView(chat: chat, groupInfo: groupInfo)
-                .onAppear {
-                    searchFocussed = false
-                    Task {
-                        let groupMembers = await apiListMembers(groupInfo.groupId)
-                        await MainActor.run {
-                            chatModel.groupMembers = groupMembers.map { GMember.init($0) }
-                            chatModel.populateGroupMembersIndexes()
-                        }
-                    }
-                }
+            addMembersDestinationView()
        } label: {
            Label("Invite members", systemImage: "plus")
        }
    }

+    private func addMembersDestinationView() -> some View {
+        AddGroupMembersView(chat: chat, groupInfo: groupInfo)
+            .onAppear {
+                searchFocussed = false
+                Task {
+                    let groupMembers = await apiListMembers(groupInfo.groupId)
+                    await MainActor.run {
+                        chatModel.groupMembers = groupMembers.map { GMember.init($0) }
+                        chatModel.populateGroupMembersIndexes()
+                    }
+                }
+            }
+    }
+
    private struct MemberRowView: View {
        var groupInfo: GroupInfo
        @ObservedObject var groupMember: GMember
@@ -226,7 +307,7 @@ struct GroupChatInfoView: View {
        var body: some View {
            let member = groupMember.wrapped
            let v = HStack{
-                ProfileImage(imageStr: member.image, size: 38)
+                MemberProfileImage(member, size: 38)
                    .padding(.trailing, 2)
                // TODO server connection status
                VStack(alignment: .leading) {
@@ -352,16 +433,7 @@ struct GroupChatInfoView: View {

    private func groupLinkButton() -> some View {
        NavigationLink {
-            GroupLinkView(
-                groupId: groupInfo.groupId,
-                groupLink: $groupLink,
-                groupLinkMemberRole: $groupLinkMemberRole,
-                showTitle: false,
-                creatingGroup: false
-            )
-            .navigationBarTitle("Group link")
-            .modifier(ThemedBackground(grouped: true))
-            .navigationBarTitleDisplayMode(.large)
+            groupLinkDestinationView()
        } label: {
            if groupLink == nil {
                Label("Create group link", systemImage: "link.badge.plus")
@@ -371,6 +443,19 @@ struct GroupChatInfoView: View {
        }
    }

+    private func groupLinkDestinationView() -> some View {
+        GroupLinkView(
+            groupId: groupInfo.groupId,
+            groupLink: $groupLink,
+            groupLinkMemberRole: $groupLinkMemberRole,
+            showTitle: false,
+            creatingGroup: false
+        )
+        .navigationBarTitle("Group link")
+        .modifier(ThemedBackground(grouped: true))
+        .navigationBarTitleDisplayMode(.large)
+    }
+
    private func editGroupButton() -> some View {
        NavigationLink {
            GroupProfileView(
@@ -577,7 +662,8 @@ struct GroupChatInfoView_Previews: PreviewProvider {
    static var previews: some View {
        GroupChatInfoView(
            chat: Chat(chatInfo: ChatInfo.sampleData.group, chatItems: []),
-            groupInfo: Binding.constant(GroupInfo.sampleData)
+            groupInfo: Binding.constant(GroupInfo.sampleData),
+            onSearch: {}
        )
    }
 }
@@ -34,14 +34,13 @@ struct GroupLinkView: View {

    var body: some View {
        if creatingGroup {
-            NavigationView {
-                groupLinkView()
-                    .toolbar {
-                        ToolbarItem(placement: .navigationBarTrailing) {
-                            Button ("Continue") { linkCreatedCb?() }
-                        }
+            groupLinkView()
+                .navigationBarBackButtonHidden()
+                .toolbar {
+                    ToolbarItem(placement: .navigationBarTrailing) {
+                        Button ("Continue") { linkCreatedCb?() }
                    }
-            }
+                }
        } else {
            groupLinkView()
        }
@@ -37,6 +37,7 @@ struct GroupMemberInfoView: View {
        case syncConnectionForceAlert
        case planAndConnectAlert(alert: PlanAndConnectAlert)
        case queueInfo(info: String)
+        case someAlert(alert: SomeAlert)
        case error(title: LocalizedStringKey, error: LocalizedStringKey?)

        var id: String {
@@ -52,6 +53,7 @@ struct GroupMemberInfoView: View {
            case .syncConnectionForceAlert: return "syncConnectionForceAlert"
            case let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
            case let .queueInfo(info): return "queueInfo \(info)"
+            case let .someAlert(alert): return "someAlert \(alert.id)"
            case let .error(title, _): return "error \(title)"
            }
        }
@@ -65,10 +67,11 @@ struct GroupMemberInfoView: View {
        }
    }

-    private func knownDirectChat(_ contactId: Int64) -> Chat? {
+    private func knownDirectChat(_ contactId: Int64) -> (Chat, Contact)? {
        if let chat = chatModel.getContactChat(contactId),
-           chat.chatInfo.contact?.directOrUsed == true {
-            return chat
+           let contact = chat.chatInfo.contact,
+           contact.directOrUsed == true {
+            return (chat, contact)
        } else {
            return nil
        }
@@ -80,21 +83,22 @@ struct GroupMemberInfoView: View {
            List {
                groupMemberInfoHeader(member)
                    .listRowBackground(Color.clear)
+                    .listRowSeparator(.hidden)
+                    .padding(.bottom, 18)
+
+                infoActionButtons(member)
+                    .padding(.horizontal)
+                    .frame(maxWidth: .infinity)
+                    .frame(height: infoViewActionButtonHeight)
+                    .listRowBackground(Color.clear)
+                    .listRowSeparator(.hidden)
+                    .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))

                if member.memberActive {
                    Section {
-                        if let contactId = member.memberContactId, let chat = knownDirectChat(contactId) {
-                            knownDirectChatButton(chat)
-                        } else if groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
-                            if let contactId = member.memberContactId {
-                                newDirectChatButton(contactId)
-                            } else if member.activeConn?.peerChatVRange.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) ?? false {
-                                createMemberContactButton()
-                            }
-                        }
                        if let code = connectionCode { verifyCodeButton(code) }
                        if let connStats = connectionStats,
-                           connStats.ratchetSyncAllowed {
+                            connStats.ratchetSyncAllowed {
                            synchronizeConnectionButton()
                        }
                        // } else if developerTools {
@@ -237,6 +241,7 @@ struct GroupMemberInfoView: View {
                case .syncConnectionForceAlert: return syncConnectionForceAlert({ syncMemberConnection(force: true) })
                case let .planAndConnectAlert(alert): return planAndConnectAlert(alert, dismiss: true)
                case let .queueInfo(info): return queueInfoAlert(info)
+                case let .someAlert(a): return a.alert
                case let .error(title, error): return mkAlert(title: title, message: error)
                }
            }
@@ -249,6 +254,57 @@ struct GroupMemberInfoView: View {
        .modifier(ThemedBackground(grouped: true))
    }

+    func infoActionButtons(_ member: GroupMember) -> some View {
+        GeometryReader { g in
+            let buttonWidth = g.size.width / 4
+            HStack(alignment: .center, spacing: 8) {
+                if let contactId = member.memberContactId, let (chat, contact) = knownDirectChat(contactId) {
+                    knownDirectChatButton(chat, width: buttonWidth)
+                    AudioCallButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
+                    VideoButton(chat: chat, contact: contact, width: buttonWidth) { alert = .someAlert(alert: $0) }
+                } else if groupInfo.fullGroupPreferences.directMessages.on(for: groupInfo.membership) {
+                    if let contactId = member.memberContactId {
+                        newDirectChatButton(contactId, width: buttonWidth)
+                    } else if member.activeConn?.peerChatVRange.isCompatibleRange(CREATE_MEMBER_CONTACT_VRANGE) ?? false {
+                        createMemberContactButton(width: buttonWidth)
+                    }
+                    InfoViewButton(image: "phone.fill", title: "call", disabledLook: true, width: buttonWidth) { showSendMessageToEnableCallsAlert()
+                    }
+                    InfoViewButton(image: "video.fill", title: "video", disabledLook: true, width: buttonWidth) { showSendMessageToEnableCallsAlert()
+                    }
+                } else { // no known contact chat && directMessages are off
+                    InfoViewButton(image: "message.fill", title: "message", disabledLook: true, width: buttonWidth) { showDirectMessagesProhibitedAlert("Can't message member")
+                    }
+                    InfoViewButton(image: "phone.fill", title: "call", disabledLook: true, width: buttonWidth) { showDirectMessagesProhibitedAlert("Can't call member")
+                    }
+                    InfoViewButton(image: "video.fill", title: "video", disabledLook: true, width: buttonWidth) { showDirectMessagesProhibitedAlert("Can't call member")
+                    }
+                }
+            }
+            .frame(maxWidth: .infinity, alignment: .center)
+        }
+    }
+
+    func showSendMessageToEnableCallsAlert() {
+        alert = .someAlert(alert: SomeAlert(
+            alert: mkAlert(
+                title: "Can't call member",
+                message: "Send message to enable calls."
+            ),
+            id: "can't call member, send message"
+        ))
+    }
+
+    func showDirectMessagesProhibitedAlert(_ title: LocalizedStringKey) {
+        alert = .someAlert(alert: SomeAlert(
+            alert: mkAlert(
+                title: title,
+                message: "Direct messages between members are prohibited in this group."
+            ),
+            id: "can't message member, direct messages prohibited"
+        ))
+    }
+
    func connectViaAddressButton(_ contactLink: String) -> some View {
        Button {
            planAndConnect(
@@ -263,36 +319,32 @@ struct GroupMemberInfoView: View {
        }
    }

-    func knownDirectChatButton(_ chat: Chat) -> some View {
-        Button {
-            dismissAllSheets(animated: true)
-            DispatchQueue.main.async {
-                chatModel.chatId = chat.id
-            }
-        } label: {
-            Label("Send direct message", systemImage: "message")
-        }
-    }
-
-    func newDirectChatButton(_ contactId: Int64) -> some View {
-        Button {
-            do {
-                let chat = try apiGetChat(type: .direct, id: contactId)
-                chatModel.addChat(chat)
+    func knownDirectChatButton(_ chat: Chat, width: CGFloat) -> some View {
+        InfoViewButton(image: "message.fill", title: "message", width: width) {
+            ItemsModel.shared.loadOpenChat(chat.id) {
                dismissAllSheets(animated: true)
-                DispatchQueue.main.async {
-                    chatModel.chatId = chat.id
-                }
-            } catch let error {
-                logger.error("openDirectChatButton apiGetChat error: \(responseError(error))")
            }
-        } label: {
-            Label("Send direct message", systemImage: "message")
        }
    }

-    func createMemberContactButton() -> some View {
-        Button {
+    func newDirectChatButton(_ contactId: Int64, width: CGFloat) -> some View {
+        InfoViewButton(image: "message.fill", title: "message", width: width) {
+            Task {
+                do {
+                    let chat = try await apiGetChat(type: .direct, id: contactId)
+                    chatModel.addChat(chat)
+                    ItemsModel.shared.loadOpenChat(chat.id) {
+                        dismissAllSheets(animated: true)
+                    }
+                } catch let error {
+                    logger.error("openDirectChatButton apiGetChat error: \(responseError(error))")
+                }
+            }
+        }
+    }
+
+    func createMemberContactButton(width: CGFloat) -> some View {
+        InfoViewButton(image: "message.fill", title: "message", width: width) {
            progressIndicator = true
            Task {
                do {
@@ -300,9 +352,10 @@ struct GroupMemberInfoView: View {
                    await MainActor.run {
                        progressIndicator = false
                        chatModel.addChat(Chat(chatInfo: .direct(contact: memberContact)))
-                        dismissAllSheets(animated: true)
-                        chatModel.chatId = memberContact.id
-                        chatModel.setContactNetworkStatus(memberContact, .connected)
+                        ItemsModel.shared.loadOpenChat(memberContact.id) {
+                            dismissAllSheets(animated: true)
+                        }
+                        NetworkModel.shared.setContactNetworkStatus(memberContact, .connected)
                    }
                } catch let error {
                    logger.error("createMemberContactButton apiCreateMemberContact error: \(responseError(error))")
@@ -313,14 +366,12 @@ struct GroupMemberInfoView: View {
                    }
                }
            }
-        } label: {
-            Label("Send direct message", systemImage: "message")
        }
    }

    private func groupMemberInfoHeader(_ mem: GroupMember) -> some View {
        VStack {
-            ProfileImage(imageStr: mem.image, size: 192, color: Color(uiColor: .tertiarySystemFill))
+            MemberProfileImage(mem, size: 192, color: Color(uiColor: .tertiarySystemFill))
                .padding(.top, 12)
                .padding()
            if mem.verified {
@@ -582,6 +633,21 @@ struct GroupMemberInfoView: View {
    }
 }

+func MemberProfileImage(
+    _ mem: GroupMember,
+    size: CGFloat,
+    color: Color = Color(uiColor: .tertiarySystemGroupedBackground),
+    backgroundColor: Color? = nil
+) -> some View {
+    ProfileImage(
+        imageStr: mem.image,
+        size: size,
+        color: color,
+        backgroundColor: backgroundColor,
+        blurred: mem.blocked
+    )
+}
+
 func blockMemberAlert(_ gInfo: GroupInfo, _ mem: GroupMember) -> Alert {
    Alert(
        title: Text("Block member?"),
@@ -11,7 +11,6 @@ import Combine

 /// 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>

    @Binding var scrollState: ReverseListScrollModel<Item>.State
@@ -33,7 +32,7 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
            case let .item(id):
                controller.scroll(to: items.firstIndex(where: { $0.id == id }), position: .bottom)
            case .bottom:
-                controller.scroll(to: .zero, position: .top)
+                controller.scroll(to: 0, position: .top)
            }
        } else {
            controller.update(items: items)
@@ -45,7 +44,7 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
        private enum Section { case main }
        private let representer: ReverseList
        private var dataSource: UITableViewDiffableDataSource<Section, Item>!
-        private var itemCount: Int = .zero
+        private var itemCount: Int = 0
        private var bag = Set<AnyCancellable>()

        init(representer: ReverseList) {
@@ -53,6 +52,7 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
            super.init(style: .plain)

            // 1. Style
+            tableView = InvertedTableView()
            tableView.separatorStyle = .none
            tableView.transform = .verticalFlip
            tableView.backgroundColor = .clear
@@ -80,7 +80,7 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
                let cell = tableView.dequeueReusableCell(withIdentifier: cellReuseId, for: indexPath)
                if #available(iOS 16.0, *) {
                    cell.contentConfiguration = UIHostingConfiguration { self.representer.content(item) }
-                        .margins(.all, .zero)
+                        .margins(.all, 0)
                        .minSize(height: 1) // Passing zero will result in system default of 44 points being used
                } else {
                    if let cell = cell as? HostingCell<Content> {
@@ -132,6 +132,11 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
            NotificationCenter.default.post(name: .chatViewWillBeginScrolling, object: nil)
        }

+        override func viewDidAppear(_ animated: Bool) {
+            tableView.clipsToBounds = false
+            parent?.viewIfLoaded?.clipsToBounds = false
+        }
+
        /// Scrolls up
        func scrollToNextPage() {
            tableView.setContentOffset(
@@ -147,18 +152,23 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
        /// Scrolls to Item at index path
        /// - Parameter indexPath: Item to scroll to - will scroll to beginning of the list, if `nil`
        func scroll(to index: Int?, position: UITableView.ScrollPosition) {
-            if let index {
-                var animated = false
-                if #available(iOS 16.0, *) {
-                    animated = true
-                }
+            var animated = false
+            if #available(iOS 16.0, *) {
+                animated = true
+            }
+            if let index, tableView.numberOfRows(inSection: 0) != 0 {
                tableView.scrollToRow(
-                    at: IndexPath(row: index, section: .zero),
+                    at: IndexPath(row: index, section: 0),
                    at: position,
                    animated: animated
                )
-                Task { representer.scrollState = .atDestination }
+            } else {
+                tableView.setContentOffset(
+                    CGPoint(x: .zero, y: -InvertedTableView.inset),
+                    animated: animated
+                )
            }
+            Task { representer.scrollState = .atDestination }
        }

        func update(items: Array<Item>) {
@@ -168,8 +178,15 @@ struct ReverseList<Item: Identifiable & Hashable & Sendable, Content: View>: UIV
            dataSource.defaultRowAnimation = .none
            dataSource.apply(
                snapshot,
-                animatingDifferences: itemCount != .zero && abs(items.count - itemCount) == 1
+                animatingDifferences: itemCount != 0 && abs(items.count - itemCount) == 1
            )
+            // Sets content offset on initial load
+            if itemCount == 0 {
+                tableView.setContentOffset(
+                    CGPoint(x: 0, y: -InvertedTableView.inset),
+                    animated: false
+                )
+            }
            itemCount = items.count
        }
    }
@@ -272,3 +289,28 @@ func withConditionalAnimation<Result>(
        try body()
    }
 }
+
+class InvertedTableView: UITableView {
+    static let inset = CGFloat(100)
+
+    static let insets = UIEdgeInsets(
+        top: inset,
+        left: .zero,
+        bottom: inset,
+        right: .zero
+    )
+
+    override var contentInsetAdjustmentBehavior: UIScrollView.ContentInsetAdjustmentBehavior {
+        get { .never }
+        set { }
+    }
+
+    override var contentInset: UIEdgeInsets {
+        get { Self.insets }
+        set { }
+    }
+
+    override var adjustedContentInset: UIEdgeInsets {
+        Self.insets
+    }
+}
@@ -104,19 +104,22 @@ struct SelectedItemsBottomToolbar: View {
        allButtonsDisabled = count == 0 || count > 20
        canModerate = possibleToModerate(chatInfo)
        if let selected = selectedItems {
-            (deleteEnabled, deleteForEveryoneEnabled, moderateEnabled, _, selectedChatItems) = chatItems.reduce((true, true, true, true, [])) { (r, ci) in
+            let me: Bool
+            let onlyOwnGroupItems: Bool
+            (deleteEnabled, deleteForEveryoneEnabled, me, onlyOwnGroupItems, selectedChatItems) = chatItems.reduce((true, true, true, true, [])) { (r, ci) in
                if selected.contains(ci.id) {
                    var (de, dee, me, onlyOwnGroupItems, sel) = r
                    de = de && ci.canBeDeletedForSelf
                    dee = dee && ci.meta.deletable && !ci.localNote
                    onlyOwnGroupItems = onlyOwnGroupItems && ci.chatDir == .groupSnd
-                    me = me && !onlyOwnGroupItems && ci.content.msgContent != nil && ci.memberToModerate(chatInfo) != nil
+                    me = me && ci.content.msgContent != nil && ci.memberToModerate(chatInfo) != nil
                    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)
                } else {
                    return r
                }
            }
+            moderateEnabled = me && !onlyOwnGroupItems
        }
    }

@@ -11,7 +11,6 @@ import SwiftUI
 struct ChatHelp: View {
    @EnvironmentObject var chatModel: ChatModel
    @Binding var showSettings: Bool
-    @State private var newChatMenuOption: NewChatMenuOption? = nil

    var body: some View {
        ScrollView { chatHelp() }
@@ -39,7 +38,7 @@ struct ChatHelp: View {

                HStack(spacing: 8) {
                    Text("Tap button ")
-                    NewChatMenuButton(newChatMenuOption: $newChatMenuOption)
+                    NewChatMenuButton()
                    Text("above, then choose:")
                }

@@ -44,17 +44,20 @@ struct ChatListNavLink: View {
    @EnvironmentObject var chatModel: ChatModel
    @EnvironmentObject var theme: AppTheme
    @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
+    @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = false
    @ObservedObject var chat: Chat
    @State private var showContactRequestDialog = false
    @State private var showJoinGroupDialog = false
    @State private var showContactConnectionInfo = false
    @State private var showInvalidJSON = false
-    @State private var showDeleteContactActionSheet = false
+    @State private var alert: SomeAlert? = nil
+    @State private var actionSheet: SomeActionSheet? = nil
+    @State private var sheet: SomeSheet<AnyView>? = nil
    @State private var showConnectContactViaAddressDialog = false
    @State private var inProgress = false
    @State private var progressByTimeout = false

-    var dynamicRowHeight: CGFloat { dynamicSizes[userFont]?.rowHeight ?? 80 }
+    var dynamicRowHeight: CGFloat { dynamicSize(userFont).rowHeight }

    var body: some View {
        Group {
@@ -83,17 +86,24 @@ struct ChatListNavLink: View {
            }
        }
    }
-
+    
    @ViewBuilder private func contactNavLink(_ contact: Contact) -> some View {
        Group {
-            if contact.activeConn == nil && contact.profile.contactLink != nil {
+            if contact.activeConn == nil && contact.profile.contactLink != nil && contact.active {
                ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false))
                    .frame(height: dynamicRowHeight)
                    .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                        Button {
-                            showDeleteContactActionSheet = true
+                            deleteContactDialog(
+                                chat,
+                                contact,
+                                dismissToChatList: false,
+                                showAlert: { alert = $0 },
+                                showActionSheet: { actionSheet = $0 },
+                                showSheetContent: { sheet = $0 }
+                            )
                        } label: {
-                            Label("Delete", systemImage: "trash")
+                            deleteLabel
                        }
                        .tint(.red)
                    }
@@ -104,51 +114,44 @@ struct ChatListNavLink: View {
                    }
            } else {
                NavLinkPlain(
-                    tag: chat.chatInfo.id,
+                    chatId: chat.chatInfo.id,
                    selection: $chatModel.chatId,
                    label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) }
                )
                .swipeActions(edge: .leading, allowsFullSwipe: true) {
                    markReadButton()
                    toggleFavoriteButton()
-                    ToggleNtfsButton(chat: chat)
+                    toggleNtfsButton(chat: chat)
                }
                .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                    if !chat.chatItems.isEmpty {
                        clearChatButton()
                    }
                    Button {
-                        if contact.sndReady || !contact.active {
-                            showDeleteContactActionSheet = true
-                        } else {
-                            AlertManager.shared.showAlert(deletePendingContactAlert(chat, contact))
-                        }
+                        deleteContactDialog(
+                            chat,
+                            contact,
+                            dismissToChatList: false,
+                            showAlert: { alert = $0 },
+                            showActionSheet: { actionSheet = $0 },
+                            showSheetContent: { sheet = $0 }
+                        )
                    } label: {
-                        Label("Delete", systemImage: "trash")
+                        deleteLabel
                    }
                    .tint(.red)
                }
                .frame(height: dynamicRowHeight)
            }
        }
-        .actionSheet(isPresented: $showDeleteContactActionSheet) {
-            if contact.sndReady && contact.active {
-                return ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete and notify contact")) { Task { await deleteChat(chat, notify: true) } },
-                        .destructive(Text("Delete")) { Task { await deleteChat(chat, notify: false) } },
-                        .cancel()
-                    ]
-                )
+        .alert(item: $alert) { $0.alert }
+        .actionSheet(item: $actionSheet) { $0.actionSheet }
+        .sheet(item: $sheet) {
+            if #available(iOS 16.0, *) {
+                $0.content
+                    .presentationDetents([.fraction(0.4)])
            } else {
-                return ActionSheet(
-                    title: Text("Delete contact?\nThis cannot be undone!"),
-                    buttons: [
-                        .destructive(Text("Delete")) { Task { await deleteChat(chat) } },
-                        .cancel()
-                    ]
-                )
+                $0.content
            }
        }
    }
@@ -191,7 +194,7 @@ struct ChatListNavLink: View {
                }
        default:
            NavLinkPlain(
-                tag: chat.chatInfo.id,
+                chatId: chat.chatInfo.id,
                selection: $chatModel.chatId,
                label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
                disabled: !groupInfo.ready
@@ -200,7 +203,7 @@ struct ChatListNavLink: View {
            .swipeActions(edge: .leading, allowsFullSwipe: true) {
                markReadButton()
                toggleFavoriteButton()
-                ToggleNtfsButton(chat: chat)
+                toggleNtfsButton(chat: chat)
            }
            .swipeActions(edge: .trailing, allowsFullSwipe: true) {
                if !chat.chatItems.isEmpty {
@@ -218,7 +221,7 @@ struct ChatListNavLink: View {

    @ViewBuilder private func noteFolderNavLink(_ noteFolder: NoteFolder) -> some View {
        NavLinkPlain(
-            tag: chat.chatInfo.id,
+            chatId: chat.chatInfo.id,
            selection: $chatModel.chatId,
            label: { ChatPreviewView(chat: chat, progressByTimeout: Binding.constant(false)) },
            disabled: !noteFolder.ready
@@ -241,7 +244,7 @@ struct ChatListNavLink: View {
                await MainActor.run { inProgress = false }
            }
        } label: {
-            Label("Join", systemImage: chat.chatInfo.incognito ? "theatermasks" : "ipad.and.arrow.forward")
+            SwipeLabel(NSLocalizedString("Join", comment: "swipe action"), systemImage: chat.chatInfo.incognito ? "theatermasks" : "ipad.and.arrow.forward", inverted: oneHandUI)
        }
        .tint(chat.chatInfo.incognito ? .indigo : theme.colors.primary)
    }
@@ -251,14 +254,14 @@ struct ChatListNavLink: View {
            Button {
                Task { await markChatRead(chat) }
            } label: {
-                Label("Read", systemImage: "checkmark")
+                SwipeLabel(NSLocalizedString("Read", comment: "swipe action"), systemImage: "checkmark", inverted: oneHandUI)
            }
            .tint(theme.colors.primary)
        } else {
            Button {
                Task { await markChatUnread(chat) }
            } label: {
-                Label("Unread", systemImage: "circlebadge.fill")
+                SwipeLabel(NSLocalizedString("Unread", comment: "swipe action"), systemImage: "circlebadge.fill", inverted: oneHandUI)
            }
            .tint(theme.colors.primary)
        }
@@ -270,24 +273,36 @@ struct ChatListNavLink: View {
            Button {
                toggleChatFavorite(chat, favorite: false)
            } label: {
-                Label("Unfav.", systemImage: "star.slash")
+                SwipeLabel(NSLocalizedString("Unfav.", comment: "swipe action"), systemImage: "star.slash.fill", inverted: oneHandUI)
            }
            .tint(.green)
        } else {
            Button {
                toggleChatFavorite(chat, favorite: true)
            } label: {
-                Label("Favorite", systemImage: "star.fill")
+                SwipeLabel(NSLocalizedString("Favorite", comment: "swipe action"), systemImage: "star.fill", inverted: oneHandUI)
            }
            .tint(.green)
        }
    }

+    @ViewBuilder private func toggleNtfsButton(chat: Chat) -> some View {
+        Button {
+            toggleNotifications(chat, enableNtfs: !chat.chatInfo.ntfsEnabled)
+        } label: {
+            if chat.chatInfo.ntfsEnabled {
+                SwipeLabel(NSLocalizedString("Mute", comment: "swipe action"), systemImage: "speaker.slash.fill", inverted: oneHandUI)
+            } else {
+                SwipeLabel(NSLocalizedString("Unmute", comment: "swipe action"), systemImage: "speaker.wave.2.fill", inverted: oneHandUI)
+            }
+        }
+    }
+
    private func clearChatButton() -> some View {
        Button {
            AlertManager.shared.showAlert(clearChatAlert())
        } label: {
-            Label("Clear", systemImage: "gobackward")
+            SwipeLabel(NSLocalizedString("Clear", comment: "swipe action"), systemImage: "gobackward", inverted: oneHandUI)
        }
        .tint(Color.orange)
    }
@@ -296,7 +311,7 @@ struct ChatListNavLink: View {
        Button {
            AlertManager.shared.showAlert(clearNoteFolderAlert())
        } label: {
-            Label("Clear", systemImage: "gobackward")
+            SwipeLabel(NSLocalizedString("Clear", comment: "swipe action"), systemImage: "gobackward", inverted: oneHandUI)
        }
        .tint(Color.orange)
    }
@@ -305,7 +320,7 @@ struct ChatListNavLink: View {
        Button {
            AlertManager.shared.showAlert(leaveGroupAlert(groupInfo))
        } label: {
-            Label("Leave", systemImage: "rectangle.portrait.and.arrow.right")
+            SwipeLabel(NSLocalizedString("Leave", comment: "swipe action"), systemImage: "rectangle.portrait.and.arrow.right.fill", inverted: oneHandUI)
        }
        .tint(Color.yellow)
    }
@@ -314,7 +329,7 @@ struct ChatListNavLink: View {
        Button {
            AlertManager.shared.showAlert(deleteGroupAlert(groupInfo))
        } label: {
-            Label("Delete", systemImage: "trash")
+            deleteLabel
        }
        .tint(.red)
    }
@@ -324,22 +339,23 @@ struct ChatListNavLink: View {
        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
            Button {
                Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) }
-            } label: { Label("Accept", systemImage: "checkmark") }
+            } label: { SwipeLabel(NSLocalizedString("Accept", comment: "swipe action"), systemImage: "checkmark", inverted: oneHandUI) }
                .tint(theme.colors.primary)
            Button {
                Task { await acceptContactRequest(incognito: true, contactRequest: contactRequest) }
            } label: {
-                Label("Accept incognito", systemImage: "theatermasks")
+                SwipeLabel(NSLocalizedString("Accept incognito", comment: "swipe action"), systemImage: "theatermasks.fill", inverted: oneHandUI)
            }
            .tint(.indigo)
            Button {
                AlertManager.shared.showAlert(rejectContactRequestAlert(contactRequest))
            } label: {
-                Label("Reject", systemImage: "multiply")
+                SwipeLabel(NSLocalizedString("Reject", comment: "swipe action"), systemImage: "multiply.fill", inverted: oneHandUI)
            }
            .tint(.red)
        }
        .frame(height: dynamicRowHeight)
+        .contentShape(Rectangle())
        .onTapGesture { showContactRequestDialog = true }
        .confirmationDialog("Accept connection request?", isPresented: $showContactRequestDialog, titleVisibility: .visible) {
            Button("Accept") { Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) } }
@@ -356,14 +372,14 @@ struct ChatListNavLink: View {
                    AlertManager.shared.showAlertMsg(title: a.title, message: a.message)
                })
            } label: {
-                Label("Delete", systemImage: "trash")
+                deleteLabel
            }
            .tint(.red)

            Button {
                showContactConnectionInfo = true
            } label: {
-                Label("Name", systemImage: "pencil")
+                SwipeLabel(NSLocalizedString("Name", comment: "swipe action"), systemImage: "pencil", inverted: oneHandUI)
            }
            .tint(theme.colors.primary)
        }
@@ -377,11 +393,16 @@ struct ChatListNavLink: View {
                }
            }
        }
+        .contentShape(Rectangle())
        .onTapGesture {
            showContactConnectionInfo = true
        }
    }

+    private var deleteLabel: some View {
+        SwipeLabel(NSLocalizedString("Delete", comment: "swipe action"), systemImage: "trash.fill", inverted: oneHandUI)
+    }
+
    private func deleteGroupAlert(_ groupInfo: GroupInfo) -> Alert {
        Alert(
            title: Text("Delete group?"),
@@ -430,28 +451,6 @@ struct ChatListNavLink: View {
        )
    }

-    private func rejectContactRequestAlert(_ contactRequest: UserContactRequest) -> Alert {
-        Alert(
-            title: Text("Reject contact request"),
-            message: Text("The sender will NOT be notified"),
-            primaryButton: .destructive(Text("Reject")) {
-                Task { await rejectContactRequest(contactRequest) }
-            },
-            secondaryButton: .cancel()
-        )
-    }
-
-    private func pendingContactAlert(_ chat: Chat, _ contact: Contact) -> Alert {
-        Alert(
-            title: Text("Contact is not connected yet!"),
-            message: Text("Your contact needs to be online for the connection to complete.\nYou can cancel this connection and remove the contact (and try later with a new link)."),
-            primaryButton: .cancel(),
-            secondaryButton: .destructive(Text("Delete Contact")) {
-                removePendingContact(chat, contact)
-            }
-        )
-    }
-
    private func groupInvitationAcceptedAlert() -> Alert {
        Alert(
            title: Text("Joining group"),
@@ -459,30 +458,6 @@ struct ChatListNavLink: View {
        )
    }

-    private func deletePendingContactAlert(_ chat: Chat, _ contact: Contact) -> Alert {
-        Alert(
-            title: Text("Delete pending connection"),
-            message: Text("Your contact needs to be online for the connection to complete.\nYou can cancel this connection and remove the contact (and try later with a new link)."),
-            primaryButton: .destructive(Text("Delete")) {
-                removePendingContact(chat, contact)
-            },
-            secondaryButton: .cancel()
-        )
-    }
-
-    private func removePendingContact(_ chat: Chat, _ contact: Contact) {
-        Task {
-            do {
-                try await apiDeleteChat(type: chat.chatInfo.chatType, id: chat.chatInfo.apiId)
-                DispatchQueue.main.async {
-                    chatModel.removeChat(contact.id)
-                }
-            } catch let error {
-                logger.error("ChatListNavLink.removePendingContact apiDeleteChat error: \(responseError(error))")
-            }
-        }
-    }
-
    private func invalidJSONPreview(_ json: String) -> some View {
        Text("invalid chat data")
            .foregroundColor(.red)
@@ -497,16 +472,26 @@ struct ChatListNavLink: View {

    private func connectContactViaAddress_(_ contact: Contact, _ incognito: Bool) {
        Task {
-            let ok = await connectContactViaAddress(contact.contactId, incognito)
+            let ok = await connectContactViaAddress(contact.contactId, incognito, showAlert: { AlertManager.shared.showAlert($0) })
            if ok {
-                await MainActor.run {
-                    chatModel.chatId = contact.id
-                }
+                ItemsModel.shared.loadOpenChat(contact.id)
+                AlertManager.shared.showAlert(connReqSentAlert(.contact))
            }
        }
    }
 }

+func rejectContactRequestAlert(_ contactRequest: UserContactRequest) -> Alert {
+    Alert(
+        title: Text("Reject contact request"),
+        message: Text("The sender will NOT be notified"),
+        primaryButton: .destructive(Text("Reject")) {
+            Task { await rejectContactRequest(contactRequest) }
+        },
+        secondaryButton: .cancel()
+    )
+}
+
 func deleteContactConnectionAlert(_ contactConnection: PendingContactConnection, showError: @escaping (ErrorAlert) -> Void, success: @escaping () -> Void = {}) -> Alert {
    Alert(
        title: Text("Delete pending connection?"),
@@ -533,15 +518,14 @@ func deleteContactConnectionAlert(_ contactConnection: PendingContactConnection,
    )
 }

-func connectContactViaAddress(_ contactId: Int64, _ incognito: Bool) async -> Bool {
+func connectContactViaAddress(_ contactId: Int64, _ incognito: Bool, showAlert: (Alert) -> Void) async -> Bool {
    let (contact, alert) = await apiConnectContactViaAddress(incognito: incognito, contactId: contactId)
    if let alert = alert {
-        AlertManager.shared.showAlert(alert)
+        showAlert(alert)
        return false
    } else if let contact = contact {
        await MainActor.run {
            ChatModel.shared.updateContact(contact)
-            AlertManager.shared.showAlert(connReqSentAlert(.contact))
        }
        return true
    }
@@ -18,11 +18,14 @@ struct ChatListView: View {
    @State private var searchText = ""
    @State private var searchShowingSimplexLink = false
    @State private var searchChatFilteredBySimplexLink: String? = nil
-    @State private var newChatMenuOption: NewChatMenuOption? = nil
    @State private var userPickerVisible = false
    @State private var showConnectDesktop = false
+    @State private var scrollToSearchBar = false

    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
+    @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
+    @AppStorage(DEFAULT_ONE_HAND_UI_CARD_SHOWN) private var oneHandUICardShown = false
+    @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial

    var body: some View {
        if #available(iOS 16.0, *) {
@@ -33,21 +36,16 @@ struct ChatListView: View {
    }

    private var viewBody: some View {
-        ZStack(alignment: .topLeading) {
+        ZStack(alignment: oneHandUI ? .bottomLeading : .topLeading) {
            NavStackCompat(
                isActive: Binding(
                    get: { chatModel.chatId != nil },
-                    set: { _ in }
+                    set: { active in
+                        if !active { chatModel.chatId = nil }
+                    }
                ),
                destination: chatView
-            ) {
-                VStack {
-                    if chatModel.chats.isEmpty {
-                        onboardingButtons()
-                    }
-                    chatListView
-                }
-            }
+            ) { chatListView }
            if userPickerVisible {
                Rectangle().fill(.white.opacity(0.001)).onTapGesture {
                    withAnimation {
@@ -67,9 +65,14 @@ struct ChatListView: View {
    }

    private var chatListView: some View {
-        VStack {
+        let tm = ToolbarMaterial.material(toolbarMaterial)
+        return withToolbar(tm) {
            chatList
+                .background(theme.colors.background)
+                .navigationBarTitleDisplayMode(.inline)
+                .navigationBarHidden(searchMode || oneHandUI)
        }
+        .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
        .onDisappear() { withAnimation { userPickerVisible = false } }
        .refreshable {
            AlertManager.shared.showAlert(Alert(
@@ -87,55 +90,111 @@ struct ChatListView: View {
                secondaryButton: .cancel()
            ))
        }
-        .listStyle(.plain)
-        .background(theme.colors.background)
-        .navigationBarTitleDisplayMode(.inline)
-        .navigationBarHidden(searchMode)
-        .toolbar {
-            ToolbarItem(placement: .navigationBarLeading) {
-                let user = chatModel.currentUser ?? User.sampleData
-                ZStack(alignment: .topTrailing) {
-                    ProfileImage(imageStr: user.image, size: 32, color: Color(uiColor: .quaternaryLabel))
-                        .padding(.trailing, 4)
-                    let allRead = chatModel.users
-                        .filter { u in !u.user.activeUser && !u.user.hidden }
-                        .allSatisfy { u in u.unreadCount == 0 }
-                    if !allRead {
-                        unreadBadge(size: 12)
-                    }
-                }
-                .onTapGesture {
-                    if chatModel.users.filter({ u in u.user.activeUser || !u.user.hidden }).count > 1 {
-                        withAnimation {
-                            userPickerVisible.toggle()
-                        }
-                    } else {
-                        showSettings = true
-                    }
-                }
+        .safeAreaInset(edge: .top) {
+            if oneHandUI { Divider().background(tm) }
+        }
+        .safeAreaInset(edge: .bottom) {
+            if oneHandUI {
+                Divider().padding(.bottom, Self.hasHomeIndicator ? 0 : 8).background(tm)
            }
-            ToolbarItem(placement: .principal) {
-                HStack(spacing: 4) {
-                    Text("Chats")
-                        .font(.headline)
-                    SubsStatusIndicator()
-                }
-                .frame(maxWidth: .infinity, alignment: .center)
+        }
+    }
+
+    static var hasHomeIndicator: Bool = {
+        if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
+           let window = windowScene.windows.first {
+            window.safeAreaInsets.bottom > 0
+        } else { false }
+    }()
+
+    @ViewBuilder func withToolbar(_ material: Material, content: () -> some View) -> some View {
+        if #available(iOS 16.0, *) {
+            if oneHandUI {
+                content()
+                    .toolbarBackground(.hidden, for: .bottomBar)
+                    .toolbar { bottomToolbar }
+            } else {
+                content()
+                    .toolbarBackground(.automatic, for: .navigationBar)
+                    .toolbarBackground(material)
+                    .toolbar { topToolbar }
            }
-            ToolbarItem(placement: .navigationBarTrailing) {
-                switch chatModel.chatRunning {
-                case .some(true): NewChatMenuButton(newChatMenuOption: $newChatMenuOption)
-                case .some(false): chatStoppedIcon()
-                case .none: EmptyView()
-                }
+        } else {
+            if oneHandUI {
+                content().toolbar { bottomToolbarGroup }
+            } else {
+                content().toolbar { topToolbar }
            }
        }
    }

+    @ToolbarContentBuilder var topToolbar: some ToolbarContent {
+        ToolbarItem(placement: .topBarLeading) { leadingToolbarItem }
+        ToolbarItem(placement: .principal) { SubsStatusIndicator() }
+        ToolbarItem(placement: .topBarTrailing) { trailingToolbarItem }
+    }
+
+    @ToolbarContentBuilder var bottomToolbar: some ToolbarContent {
+        let padding: Double = Self.hasHomeIndicator ? 0 : 14
+        ToolbarItem(placement: .bottomBar) {
+            HStack {
+                leadingToolbarItem.padding(.bottom, padding)
+                Spacer()
+                SubsStatusIndicator().padding(.bottom, padding)
+                Spacer()
+                trailingToolbarItem.padding(.bottom, padding)
+            }
+            .contentShape(Rectangle())
+            .onTapGesture { scrollToSearchBar = true }
+        }
+    }
+
+    @ToolbarContentBuilder var bottomToolbarGroup: some ToolbarContent {
+        let padding: Double = Self.hasHomeIndicator ? 0 : 14
+        ToolbarItemGroup(placement: .bottomBar) {
+            leadingToolbarItem.padding(.bottom, padding)
+            Spacer()
+            SubsStatusIndicator().padding(.bottom, padding)
+            Spacer()
+            trailingToolbarItem.padding(.bottom, padding)
+        }
+    }
+
+    @ViewBuilder var leadingToolbarItem: some View {
+        let user = chatModel.currentUser ?? User.sampleData
+        ZStack(alignment: .topTrailing) {
+            ProfileImage(imageStr: user.image, size: 32, color: Color(uiColor: .quaternaryLabel))
+                .padding(.trailing, 4)
+            let allRead = chatModel.users
+                .filter { u in !u.user.activeUser && !u.user.hidden }
+                .allSatisfy { u in u.unreadCount == 0 }
+            if !allRead {
+                unreadBadge(size: 12)
+            }
+        }
+        .onTapGesture {
+            if chatModel.users.filter({ u in u.user.activeUser || !u.user.hidden }).count > 1 {
+                withAnimation {
+                    userPickerVisible.toggle()
+                }
+            } else {
+                showSettings = true
+            }
+        }
+    }
+
+    @ViewBuilder var trailingToolbarItem: some View {
+        switch chatModel.chatRunning {
+        case .some(true): NewChatMenuButton()
+        case .some(false): chatStoppedIcon()
+        case .none: EmptyView()
+        }
+    }
+
    @ViewBuilder private var chatList: some View {
        let cs = filteredChats()
        ZStack {
-            VStack {
+            ScrollViewReader { scrollProxy in
                List {
                    if !chatModel.chats.isEmpty {
                        ChatListSearchBar(
@@ -145,31 +204,67 @@ struct ChatListView: View {
                            searchShowingSimplexLink: $searchShowingSimplexLink,
                            searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink
                        )
+                        .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
                        .listRowSeparator(.hidden)
                        .listRowBackground(Color.clear)
                        .frame(maxWidth: .infinity)
+                        .padding(.top, oneHandUI ? 8 : 0)
+                        .id("searchBar")
                    }
-                    ForEach(cs, id: \.viewId) { chat in
-                        ChatListNavLink(chat: chat)
-                            .padding(.trailing, -16)
-                            .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(chat.chatInfo.id))
+                    if !oneHandUICardShown {
+                        OneHandUICard()
+                            .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
+                            .listRowSeparator(.hidden)
                            .listRowBackground(Color.clear)
                    }
-                    .offset(x: -8)
+                    if #available(iOS 16.0, *) {
+                        ForEach(cs, id: \.viewId) { chat in
+                            ChatListNavLink(chat: chat)
+                                .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
+                                .padding(.trailing, -16)
+                                .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(chat.chatInfo.id))
+                                .listRowBackground(Color.clear)
+                        }
+                        .offset(x: -8)
+                    } else {
+                        ForEach(cs, id: \.viewId) { chat in
+                            VStack(spacing: .zero) {
+                                Divider()
+                                    .padding(.leading, 16)
+                                ChatListNavLink(chat: chat)
+                                    .padding(.horizontal, 8)
+                                    .padding(.vertical, 6)
+                            }
+                            .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
+                            .listRowSeparator(.hidden)
+                            .listRowInsets(EdgeInsets())
+                            .background { theme.colors.background } // Hides default list selection colour
+                            .disabled(chatModel.chatRunning != true || chatModel.deletedChats.contains(chat.chatInfo.id))
+                        }
+                    }
                }
-            }
-            .onChange(of: chatModel.chatId) { _ in
-                if chatModel.chatId == nil, let chatId = chatModel.chatToTop {
-                    chatModel.chatToTop = nil
-                    chatModel.popChat(chatId)
+                .listStyle(.plain)
+                .onChange(of: chatModel.chatId) { currentChatId in
+                    if let chatId = chatModel.chatToTop, currentChatId != chatId {
+                        chatModel.chatToTop = nil
+                        chatModel.popChat(chatId)
+                    }
+                    stopAudioPlayer()
+                }
+                .onChange(of: chatModel.currentUser?.userId) { _ in
+                    stopAudioPlayer()
+                }
+                .onChange(of: scrollToSearchBar) { scrollToSearchBar in
+                    if scrollToSearchBar {
+                        Task { self.scrollToSearchBar = false }
+                        withAnimation { scrollProxy.scrollTo("searchBar") }
+                    }
                }
-                stopAudioPlayer()
-            }
-            .onChange(of: chatModel.currentUser?.userId) { _ in
-                stopAudioPlayer()
            }
            if cs.isEmpty && !chatModel.chats.isEmpty {
-                Text("No filtered chats").foregroundColor(theme.colors.secondary)
+                Text("No filtered chats")
+                    .scaleEffect(x: 1, y: oneHandUI ? -1 : 1, anchor: .center)
+                    .foregroundColor(.secondary)
            }
        }
    }
@@ -180,42 +275,6 @@ struct ChatListView: View {
            .foregroundColor(theme.colors.primary)
    }

-    private func onboardingButtons() -> some View {
-        VStack(alignment: .trailing, spacing: 0) {
-            Path { p in
-                p.move(to: CGPoint(x: 8, y: 0))
-                p.addLine(to: CGPoint(x: 16, y: 10))
-                p.addLine(to: CGPoint(x: 0, y: 10))
-                p.addLine(to: CGPoint(x: 8, y: 0))
-            }
-            .fill(theme.colors.primary)
-            .frame(width: 20, height: 10)
-            .padding(.trailing, 12)
-
-            connectButton("Tap to start a new chat") {
-                newChatMenuOption = .newContact
-            }
-
-            Spacer()
-            Text("You have no chats")
-                .foregroundColor(theme.colors.secondary)
-                .frame(maxWidth: .infinity)
-        }
-        .padding(.trailing, 6)
-        .frame(maxHeight: .infinity)
-    }
-
-    private func connectButton(_ label: LocalizedStringKey, action: @escaping () -> Void) -> some View {
-        Button(action: action) {
-            Text(label)
-                .padding(.vertical, 10)
-                .padding(.horizontal, 20)
-        }
-        .background(theme.colors.primary)
-        .foregroundColor(.white)
-        .clipShape(RoundedRectangle(cornerRadius: 16))
-    }
-
    @ViewBuilder private func chatView() -> some View {
        if let chatId = chatModel.chatId, let chat = chatModel.getChat(chatId) {
            ChatView(chat: chat)
@@ -233,16 +292,20 @@ struct ChatListView: View {
        } else {
            let s = searchString()
            return s == "" && !showUnreadAndFavorites
-            ? chatModel.chats
+            ? chatModel.chats.filter { chat in
+                !chat.chatInfo.chatDeleted && chatContactType(chat: chat) != ContactType.card
+            }
            : chatModel.chats.filter { chat in
                let cInfo = chat.chatInfo
                switch cInfo {
                case let .direct(contact):
-                    return s == ""
-                    ? filtered(chat)
-                    : (viewNameContains(cInfo, s) ||
-                       contact.profile.displayName.localizedLowercase.contains(s) ||
-                       contact.fullName.localizedLowercase.contains(s))
+                    return !contact.chatDeleted && chatContactType(chat: chat) != ContactType.card && (
+                        s == ""
+                        ? filtered(chat)
+                        : (viewNameContains(cInfo, s) ||
+                           contact.profile.displayName.localizedLowercase.contains(s) ||
+                           contact.fullName.localizedLowercase.contains(s))
+                    )
                case let .group(gInfo):
                    return s == ""
                    ? (filtered(chat) || gInfo.membership.memberStatus == .memInvited)
@@ -278,7 +341,7 @@ struct ChatListView: View {
 struct SubsStatusIndicator: View {
    @State private var subs: SMPServerSubs = SMPServerSubs.newSMPServerSubs
    @State private var hasSess: Bool = false
-    @State private var timer: Timer? = nil
+    @State private var task: Task<Void, Never>?
    @State private var showServersSummary = false

    @AppStorage(DEFAULT_SHOW_SUBSCRIPTION_PERCENTAGE) private var showSubscriptionPercentage = false
@@ -288,42 +351,48 @@ struct SubsStatusIndicator: View {
            showServersSummary = true
        } label: {
            HStack(spacing: 4) {
+                Text("Chats").foregroundStyle(Color.primary).fixedSize().font(.headline)
                SubscriptionStatusIndicatorView(subs: subs, hasSess: hasSess)
                if showSubscriptionPercentage {
                    SubscriptionStatusPercentageView(subs: subs, hasSess: hasSess)
                }
            }
        }
+        .disabled(ChatModel.shared.chatRunning != true)
        .onAppear {
-            startTimer()
+            startTask()
        }
        .onDisappear {
-            stopTimer()
+            stopTask()
        }
-        .sheet(isPresented: $showServersSummary) {
+        .appSheet(isPresented: $showServersSummary) {
            ServersSummaryView()
+                .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
        }
    }

-    private func startTimer() {
-        timer = Timer.scheduledTimer(withTimeInterval: 1.0, repeats: true) { _ in
-            if AppChatState.shared.value == .active {
-                getSubsTotal()
+    private func startTask() {
+        task = Task {
+            while !Task.isCancelled {
+                if AppChatState.shared.value == .active {
+                    do {
+                        let (subs, hasSess) = try await getAgentSubsTotal()
+                        await MainActor.run {
+                            self.subs = subs
+                            self.hasSess = hasSess
+                        }
+                    } catch let error {
+                        logger.error("getSubsTotal error: \(responseError(error))")
+                    }
+                }
+                try? await Task.sleep(nanoseconds: 1_000_000_000) // Sleep for 1 second
            }
        }
    }

-    func stopTimer() {
-        timer?.invalidate()
-        timer = nil
-    }
-
-    private func getSubsTotal() {
-        do {
-            (subs, hasSess) = try getAgentSubsTotal()
-        } catch let error {
-            logger.error("getSubsTotal error: \(responseError(error))")
-        }
+    func stopTask() {
+        task?.cancel()
+        task = nil
    }
 }

@@ -373,7 +442,6 @@ struct ChatListSearchBar: View {
                    toggleFilterButton()
                }
            }
-            Divider()
        }
        .onChange(of: searchFocussed) { sf in
            withAnimation { searchMode = sf }
@@ -450,21 +518,21 @@ func chatStoppedIcon() -> some View {
 struct ChatListView_Previews: PreviewProvider {
    static var previews: some View {
        let chatModel = ChatModel()
-        chatModel.chats = [
-            Chat(
+        chatModel.updateChats([
+            ChatData(
                chatInfo: ChatInfo.sampleData.direct,
                chatItems: [ChatItem.getSample(1, .directSnd, .now, "hello")]
            ),
-            Chat(
+            ChatData(
                chatInfo: ChatInfo.sampleData.group,
                chatItems: [ChatItem.getSample(1, .directSnd, .now, "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.")]
            ),
-            Chat(
+            ChatData(
                chatInfo: ChatInfo.sampleData.contactRequest,
                chatItems: []
            )

-        ]
+        ])
        return Group {
            ChatListView(showSettings: Binding.constant(false))
                .environmentObject(chatModel)
@@ -275,7 +275,7 @@ struct ChatPreviewView: View {
        } else {
            switch (chat.chatInfo) {
            case let .direct(contact):
-                if contact.activeConn == nil && contact.profile.contactLink != nil {
+                if contact.activeConn == nil && contact.profile.contactLink != nil && contact.active {
                    chatPreviewInfoText("Tap to Connect")
                        .foregroundColor(theme.colors.primary)
                } else if !contact.sndReady && contact.activeConn != nil {
@@ -376,17 +376,7 @@ struct ChatPreviewView: View {
        switch chat.chatInfo {
        case let .direct(contact):
            if contact.active && contact.activeConn != nil {
-                switch (chatModel.contactNetworkStatus(contact)) {
-                case .connected: incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
-                case .error:
-                    Image(systemName: "exclamationmark.circle")
-                        .resizable()
-                        .scaledToFit()
-                        .frame(width: dynamicChatInfoSize, height: dynamicChatInfoSize)
-                        .foregroundColor(theme.colors.secondary)
-                default:
-                    ProgressView()
-                }
+                NetworkStatusView(contact: contact, size: size)
            } else {
                incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
            }
@@ -400,6 +390,30 @@ struct ChatPreviewView: View {
            incognitoIcon(chat.chatInfo.incognito, theme.colors.secondary, size: size)
        }
    }
+
+    struct NetworkStatusView: View {
+        @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
+        @EnvironmentObject var theme: AppTheme
+        @ObservedObject var networkModel = NetworkModel.shared
+
+        let contact: Contact
+        let size: CGFloat
+
+        var body: some View {
+            let dynamicChatInfoSize = dynamicSize(userFont).chatInfoSize
+            switch (networkModel.contactNetworkStatus(contact)) {
+            case .connected: incognitoIcon(contact.contactConnIncognito, theme.colors.secondary, size: size)
+            case .error:
+                Image(systemName: "exclamationmark.circle")
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: dynamicChatInfoSize, height: dynamicChatInfoSize)
+                    .foregroundColor(theme.colors.secondary)
+            default:
+                ProgressView()
+            }
+        }
+    }
 }

@ViewBuilder func incognitoIcon(_ incognito: Bool, _ secondaryColor: Color, size: CGFloat) -> some View {
@@ -16,7 +16,6 @@ struct ContactConnectionView: View {
    @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
    @State private var localAlias = ""
    @FocusState private var aliasTextFieldFocused: Bool
-    @State private var showContactConnectionInfo = false

    var body: some View {
        if case let .contactConnection(conn) = chat.chatInfo {
@@ -32,7 +31,6 @@ struct ContactConnectionView: View {
                    .scaledToFill()
                    .frame(width: 48, height: 48)
                    .foregroundColor(Color(uiColor: .tertiarySystemGroupedBackground).asAnotherColorFromSecondaryVariant(theme))
-                    .onTapGesture { showContactConnectionInfo = true }
            }
            .frame(width: 63, height: 63)
            .padding(.leading, 4)
@@ -72,9 +70,6 @@ struct ContactConnectionView: View {
                Spacer()
            }
            .frame(maxHeight: .infinity)
-            .appSheet(isPresented: $showContactConnectionInfo) {
-                ContactConnectionInfo(contactConnection: contactConnection)
-            }
        }
    }
 }
@@ -0,0 +1,52 @@
+//
+//  OneHandUICard.swift
+//  SimpleX (iOS)
+//
+//  Created by EP on 06/08/2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct OneHandUICard: View {
+    @EnvironmentObject var theme: AppTheme
+    @Environment(\.dynamicTypeSize) private var userFont: DynamicTypeSize
+    @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
+    @AppStorage(DEFAULT_ONE_HAND_UI_CARD_SHOWN) private var oneHandUICardShown = false
+    @State private var showOneHandUIAlert = false
+
+    var body: some View {
+        ZStack(alignment: .topTrailing) {
+            VStack(alignment: .leading, spacing: 8) {
+                Text("Toggle chat list:").font(.title3)
+                Toggle("Reachable chat toolbar", isOn: $oneHandUI)
+            }
+            Image(systemName: "multiply")
+                .foregroundColor(theme.colors.secondary)
+                .onTapGesture {
+                    showOneHandUIAlert = true
+                }
+        }
+        .padding()
+        .background(theme.appColors.sentMessage)
+        .cornerRadius(12)
+        .frame(height: dynamicSize(userFont).rowHeight)
+        .padding(.vertical, 12)
+        .alert(isPresented: $showOneHandUIAlert) {
+            Alert(
+                title: Text("Reachable chat toolbar"),
+                message: Text("You can change it in Appearance settings."),
+                dismissButton: .default(Text("Ok")) {
+                    withAnimation {
+                        oneHandUICardShown = true
+                    }
+                }
+            )
+        }
+    }
+}
+
+#Preview {
+    OneHandUICard()
+}
@@ -448,19 +448,23 @@ func subscriptionStatusColorAndPercentage(_ online: Bool, _ onionHosts: OnionHos
    let noConnColorAndPercent: (Color, Double, Double, Double) = (Color(uiColor: .tertiaryLabel), 1, 1, 0)
    let activeSubsRounded = roundedToQuarter(subs.shareOfActive)

-    return online && subs.total > 0
-    ? (
-        subs.ssActive == 0
-        ? (
-            hasSess ? (activeColor, activeSubsRounded, subs.shareOfActive, subs.shareOfActive) : noConnColorAndPercent
+    return !online
+    ? noConnColorAndPercent
+    : (
+        subs.total == 0 && !hasSess
+        ? (activeColor, 0, 0.33, 0) // On freshly installed app (without chats) and on app start
+        : (
+            subs.ssActive == 0
+            ? (
+                hasSess ? (activeColor, activeSubsRounded, subs.shareOfActive, subs.shareOfActive) : noConnColorAndPercent
+            )
+            : ( // ssActive > 0
+                hasSess
+                ? (activeColor, activeSubsRounded, subs.shareOfActive, subs.shareOfActive)
+                : (.orange, activeSubsRounded, subs.shareOfActive, subs.shareOfActive) // This would mean implementation error
+              )
        )
-        : ( // ssActive > 0
-            hasSess
-            ? (activeColor, activeSubsRounded, subs.shareOfActive, subs.shareOfActive)
-            : (.orange, activeSubsRounded, subs.shareOfActive, subs.shareOfActive) // This would mean implementation error
-          )
    )
-    : noConnColorAndPercent
 }

 struct SMPServerSummaryView: View {
@@ -85,15 +85,18 @@ struct UserPicker: View {
        .padding(8)
        .opacity(userPickerVisible ? 1.0 : 0.0)
        .onAppear {
-            do {
-                // This check prevents the call of listUsers after the app is suspended, and the database is closed.
-                if case .active = scenePhase {
-                    m.users = try listUsers()
-                }
-            } catch let error {
-                logger.error("Error loading users \(responseError(error))")
-            }
-        }
+             // 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 {
@@ -0,0 +1,267 @@
+//
+//  ContactListNavLink.swift
+//  SimpleX (iOS)
+//
+//  Created by Diogo Cunha on 01/08/2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+struct ContactListNavLink: View {
+    @EnvironmentObject var theme: AppTheme
+    @ObservedObject var chat: Chat
+    var showDeletedChatIcon: Bool
+    @State private var alert: SomeAlert? = nil
+    @State private var actionSheet: SomeActionSheet? = nil
+    @State private var sheet: SomeSheet<AnyView>? = nil
+    @State private var showConnectContactViaAddressDialog = false
+    @State private var showContactRequestDialog = false
+
+    var body: some View {
+        let contactType = chatContactType(chat: chat)
+
+        Group {
+            switch (chat.chatInfo) {
+            case let .direct(contact):
+                switch contactType {
+                case .recent:
+                    recentContactNavLink(contact)
+                case .chatDeleted:
+                    deletedChatNavLink(contact)
+                case .card:
+                    contactCardNavLink(contact)
+                default:
+                    EmptyView()
+                }
+            case let .contactRequest(contactRequest):
+                contactRequestNavLink(contactRequest)
+            default:
+                EmptyView()
+            }
+        }
+        .alert(item: $alert) { $0.alert }
+        .actionSheet(item: $actionSheet) { $0.actionSheet }
+        .sheet(item: $sheet) {
+            if #available(iOS 16.0, *) {
+                $0.content
+                    .presentationDetents([.fraction(0.4)])
+            } else {
+                $0.content
+            }
+        }
+    }
+
+    func recentContactNavLink(_ contact: Contact) -> some View {
+        Button {
+            dismissAllSheets(animated: true) {
+                ItemsModel.shared.loadOpenChat(contact.id)
+            }
+        } label: {
+            contactPreview(contact, titleColor: theme.colors.onBackground)
+        }
+        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+            Button {
+                deleteContactDialog(
+                    chat,
+                    contact,
+                    dismissToChatList: false,
+                    showAlert: { alert = $0 },
+                    showActionSheet: { actionSheet = $0 },
+                    showSheetContent: { sheet = $0 }
+                )
+            } label: {
+                Label("Delete", systemImage: "trash")
+            }
+            .tint(.red)
+        }
+    }
+
+    func deletedChatNavLink(_ contact: Contact) -> some View {
+        Button {
+            Task {
+                await MainActor.run {
+                    dismissAllSheets(animated: true) {
+                        ItemsModel.shared.loadOpenChat(contact.id)
+                    }
+                }
+            }
+        } label: {
+            contactPreview(contact, titleColor: theme.colors.onBackground)
+        }
+        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+            Button {
+                deleteContactDialog(
+                    chat,
+                    contact,
+                    dismissToChatList: false,
+                    showAlert: { alert = $0 },
+                    showActionSheet: { actionSheet = $0 },
+                    showSheetContent: { sheet = $0 }
+                )
+            } label: {
+                Label("Delete", systemImage: "trash")
+            }
+            .tint(.red)
+        }
+    }
+
+    func contactPreview(_ contact: Contact, titleColor: Color) -> some View {
+        HStack{
+            ProfileImage(imageStr: contact.image, size: 30)
+
+            previewTitle(contact, titleColor: titleColor)
+
+            Spacer()
+
+            HStack {
+                if showDeletedChatIcon && contact.chatDeleted {
+                    Image(systemName: "archivebox")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 18, height: 18)
+                        .foregroundColor(.secondary.opacity(0.65))
+                } else if chat.chatInfo.chatSettings?.favorite ?? false {
+                    Image(systemName: "star.fill")
+                        .resizable()
+                        .scaledToFill()
+                        .frame(width: 18, height: 18)
+                        .foregroundColor(.secondary.opacity(0.65))
+                }
+                if contact.contactConnIncognito {
+                    Image(systemName: "theatermasks")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 22, height: 22)
+                        .foregroundColor(.secondary)
+                }
+            }
+        }
+    }
+
+    @ViewBuilder private func previewTitle(_ contact: Contact, titleColor: Color) -> some View {
+        let t = Text(chat.chatInfo.chatViewName).foregroundColor(titleColor)
+        (
+            contact.verified == true
+            ? verifiedIcon + t
+            : t
+        )
+        .lineLimit(1)
+    }
+
+    private var verifiedIcon: Text {
+        (Text(Image(systemName: "checkmark.shield")) + Text(" "))
+            .foregroundColor(.secondary)
+            .baselineOffset(1)
+            .kerning(-2)
+    }
+
+    func contactCardNavLink(_ contact: Contact) -> some View {
+        Button {
+            showConnectContactViaAddressDialog = true
+        } label: {
+            contactCardPreview(contact)
+        }
+        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+            Button {
+                deleteContactDialog(
+                    chat,
+                    contact,
+                    dismissToChatList: false,
+                    showAlert: { alert = $0 },
+                    showActionSheet: { actionSheet = $0 },
+                    showSheetContent: { sheet = $0 }
+                )
+            } label: {
+                Label("Delete", systemImage: "trash")
+            }
+            .tint(.red)
+        }
+        .confirmationDialog("Connect with \(contact.chatViewName)", isPresented: $showConnectContactViaAddressDialog, titleVisibility: .visible) {
+            Button("Use current profile") { connectContactViaAddress_(contact, false) }
+            Button("Use new incognito profile") { connectContactViaAddress_(contact, true) }
+        }
+    }
+
+    private func connectContactViaAddress_(_ contact: Contact, _ incognito: Bool) {
+        Task {
+            let ok = await connectContactViaAddress(contact.contactId, incognito, showAlert: { alert = SomeAlert(alert: $0, id: "ContactListNavLink connectContactViaAddress") })
+            if ok {
+                ItemsModel.shared.loadOpenChat(contact.id)
+                DispatchQueue.main.async {
+                    dismissAllSheets(animated: true) {
+                        AlertManager.shared.showAlert(connReqSentAlert(.contact))
+                    }
+                }
+            }
+        }
+    }
+
+    func contactCardPreview(_ contact: Contact) -> some View {
+        HStack{
+            ProfileImage(imageStr: contact.image, size: 30)
+
+            Text(chat.chatInfo.chatViewName)
+                .foregroundColor(.accentColor)
+                .lineLimit(1)
+
+            Spacer()
+
+            Image(systemName: "envelope")
+                .resizable()
+                .scaledToFill()
+                .frame(width: 14, height: 14)
+                .foregroundColor(.accentColor)
+        }
+    }
+
+    func contactRequestNavLink(_ contactRequest: UserContactRequest) -> some View {
+        Button {
+            showContactRequestDialog = true
+        } label: {
+            contactRequestPreview(contactRequest)
+        }
+        .swipeActions(edge: .trailing, allowsFullSwipe: true) {
+            Button {
+                Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) }
+            } label: { Label("Accept", systemImage: "checkmark") }
+                .tint(theme.colors.primary)
+            Button {
+                Task { await acceptContactRequest(incognito: true, contactRequest: contactRequest) }
+            } label: {
+                Label("Accept incognito", systemImage: "theatermasks")
+            }
+            .tint(.indigo)
+            Button {
+                alert = SomeAlert(alert: rejectContactRequestAlert(contactRequest), id: "rejectContactRequestAlert")
+            } label: {
+                Label("Reject", systemImage: "multiply")
+            }
+            .tint(.red)
+        }
+        .confirmationDialog("Accept connection request?", isPresented: $showContactRequestDialog, titleVisibility: .visible) {
+            Button("Accept") { Task { await acceptContactRequest(incognito: false, contactRequest: contactRequest) } }
+            Button("Accept incognito") { Task { await acceptContactRequest(incognito: true, contactRequest: contactRequest) } }
+            Button("Reject (sender NOT notified)", role: .destructive) { Task { await rejectContactRequest(contactRequest) } }
+        }
+    }
+
+    func contactRequestPreview(_ contactRequest: UserContactRequest) -> some View {
+        HStack{
+            ProfileImage(imageStr: contactRequest.image, size: 30)
+
+            Text(chat.chatInfo.chatViewName)
+                .foregroundColor(.accentColor)
+                .lineLimit(1)
+
+            Spacer()
+
+            Image(systemName: "checkmark")
+                .resizable()
+                .scaledToFill()
+                .frame(width: 14, height: 14)
+                .foregroundColor(.accentColor)
+        }
+    }
+}
@@ -15,6 +15,7 @@ enum DatabaseAlert: Identifiable {
    case importArchive
    case archiveImported
    case archiveImportedWithErrors(archiveErrors: [ArchiveError])
+    case archiveExportedWithErrors(archivePath: URL, archiveErrors: [ArchiveError])
    case deleteChat
    case chatDeleted
    case deleteLegacyDatabase
@@ -29,6 +30,7 @@ enum DatabaseAlert: Identifiable {
        case .importArchive: return "importArchive"
        case .archiveImported: return "archiveImported"
        case .archiveImportedWithErrors: return "archiveImportedWithErrors"
+        case .archiveExportedWithErrors: return "archiveExportedWithErrors"
        case .deleteChat: return "deleteChat"
        case .chatDeleted: return "chatDeleted"
        case .deleteLegacyDatabase: return "deleteLegacyDatabase"
@@ -265,10 +267,18 @@ struct DatabaseView: View {
                title: Text("Chat database imported"),
                message: Text("Restart the app to use imported chat database")
            )
-        case .archiveImportedWithErrors:
+        case let .archiveImportedWithErrors(errs):
            return Alert(
                title: Text("Chat database imported"),
-                message: Text("Restart the app to use imported chat database") + Text("\n") + Text("Some non-fatal errors occurred during import - you may see Chat console for more details.")
+                message: Text("Restart the app to use imported chat database") + Text(verbatim: "\n\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),
+                dismissButton: .default(Text("Continue")) {
+                    showShareSheet(items: [archivePath])
+                }
            )
        case .deleteChat:
            return Alert(
@@ -349,9 +359,16 @@ struct DatabaseView: View {
        progressIndicator = true
        Task {
            do {
-                let archivePath = try await exportChatArchive()
-                showShareSheet(items: [archivePath])
-                await MainActor.run { progressIndicator = false }
+                let (archivePath, archiveErrors) = try await exportChatArchive()
+                if archiveErrors.isEmpty {
+                    showShareSheet(items: [archivePath])
+                    await MainActor.run { progressIndicator = false }
+                } else {
+                    await MainActor.run {
+                        alert = .archiveExportedWithErrors(archivePath: archivePath, archiveErrors: archiveErrors)
+                        progressIndicator = false
+                    }
+                }
            } catch let error {
                await MainActor.run {
                    alert = .error(title: "Error exporting chat database", error: responseError(error))
@@ -474,7 +491,7 @@ struct DatabaseView: View {
        appFilesCountAndSize = directoryFileCountAndSize(getAppFilesDirectory())
        do {
            let chats = try apiGetChats()
-            m.updateChats(with: chats)
+            m.updateChats(chats)
        } catch let error {
            logger.error("apiGetChats: cannot update chats \(responseError(error))")
        }
@@ -486,6 +503,17 @@ struct DatabaseView: View {
    }
 }

+func archiveErrorsText(_ errs: [ArchiveError]) -> Text {
+    return Text("\n" + errs.map(showArchiveError).joined(separator: "\n"))
+    
+    func showArchiveError(_ err: ArchiveError) -> String {
+        switch err {
+        case let .import(importError): importError
+        case let .fileError(file, fileError): "\(file): \(fileError)"
+        }
+    }
+}
+
 func stopChatAsync() async throws {
    try await apiStopChat()
    ChatReceiver.shared.stop()
@@ -190,7 +190,7 @@ struct MigrateToAppGroupView: View {
            do {
                try apiSaveAppSettings(settings: AppSettings.current.prepareForExport())
                try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
-                try await apiExportArchive(config: config)
+                _ = try await apiExportArchive(config: config)
                await MainActor.run { setV3DBMigration(.exported) }
            } catch let error {
                await MainActor.run {
@@ -222,7 +222,7 @@ struct MigrateToAppGroupView: View {
    }
 }

-func exportChatArchive(_ storagePath: URL? = nil) async throws -> URL {
+func exportChatArchive(_ storagePath: URL? = nil) async throws -> (URL, [ArchiveError]) {
    let archiveTime = Date.now
    let ts = archiveTime.ISO8601Format(Date.ISO8601FormatStyle(timeSeparator: .omitted))
    let archiveName = "simplex-chat.\(ts).zip"
@@ -233,13 +233,13 @@ func exportChatArchive(_ storagePath: URL? = nil) async throws -> URL {
        try apiSaveAppSettings(settings: AppSettings.current.prepareForExport())
    }
    try? FileManager.default.createDirectory(at: getWallpaperDirectory(), withIntermediateDirectories: true)
-    try await apiExportArchive(config: config)
+    let errs = try await apiExportArchive(config: config)
    if storagePath == nil {
        deleteOldArchive()
        UserDefaults.standard.set(archiveName, forKey: DEFAULT_CHAT_ARCHIVE_NAME)
        chatArchiveTimeDefault.set(archiveTime)
    }
-    return archivePath
+    return (archivePath, errs)
 }

 func deleteOldArchive() {
@@ -8,41 +8,21 @@

 import SwiftUI

-private struct SheetIsPresented<C>: ViewModifier where C: View {
-    var isPresented: Binding<Bool>
-    var onDismiss: (() -> Void)?
-    var sheetContent: () -> C
-    @Environment(\.scenePhase) var scenePhase
-
-    func body(content: Content) -> some View {
-        content.sheet(isPresented: isPresented, onDismiss: onDismiss) {
-            sheetContent().modifier(PrivacySensitive())
-        }
-    }
-}
-
-private struct SheetForItem<T, C>: ViewModifier where T: Identifiable, C: View {
-    var item: Binding<T?>
-    var onDismiss: (() -> Void)?
-    var sheetContent: (T) -> C
-    @Environment(\.scenePhase) var scenePhase
-
-    func body(content: Content) -> some View {
-        content.sheet(item: item, onDismiss: onDismiss) { it in
-            sheetContent(it).modifier(PrivacySensitive())
-        }
-    }
+class AppSheetState: ObservableObject {
+    static let shared = AppSheetState()
+    @Published var scenePhaseActive: Bool = false
 }

 private struct PrivacySensitive: ViewModifier {
    @AppStorage(DEFAULT_PRIVACY_PROTECT_SCREEN) private var protectScreen = false
-    @Environment(\.scenePhase) var scenePhase
+    // Screen protection doesn't work for appSheet on iOS 16 if @Environment(\.scenePhase) is used instead of global state
+    @ObservedObject var appSheetState: AppSheetState = AppSheetState.shared

    func body(content: Content) -> some View {
-        if case .active = scenePhase {
+        if !protectScreen {
            content
        } else {
-            content.privacySensitive(protectScreen).redacted(reason: .privacy)
+            content.privacySensitive(!appSheetState.scenePhaseActive).redacted(reason: .privacy)
        }
    }
 }
@@ -53,7 +33,9 @@ extension View {
        onDismiss: (() -> Void)? = nil,
        content: @escaping () -> Content
    ) -> some View where Content: View {
-        modifier(SheetIsPresented(isPresented: isPresented, onDismiss: onDismiss, sheetContent: content))
+        sheet(isPresented: isPresented, onDismiss: onDismiss) {
+            content().modifier(PrivacySensitive())
+        }
    }

    func appSheet<T, Content>(
@@ -61,6 +43,8 @@ extension View {
        onDismiss: (() -> Void)? = nil,
        content: @escaping (T) -> Content
    ) -> some View where T: Identifiable, Content: View {
-        modifier(SheetForItem(item: item, onDismiss: onDismiss, sheetContent: content))
+        sheet(item: item, onDismiss: onDismiss) { it in
+            content(it).modifier(PrivacySensitive())
+        }
    }
 }
@@ -11,13 +11,22 @@ import SwiftUI
 import SimpleXChat

 struct ChatViewBackground: ViewModifier {
-    @EnvironmentObject var theme: AppTheme
+    @Environment(\.colorScheme) var colorScheme
    var image: Image
    var imageType: WallpaperType
    var background: Color
    var tint: Color

    func body(content: Content) -> some View {
+        // Workaround a problem (SwiftUI bug?) when wallpaper is not updated when user changes global theme in iOS settings from dark to light and vice versa
+        if colorScheme == .light {
+            back(content)
+        } else {
+            back(content)
+        }
+    }
+
+    func back(_ content: Content) -> some View {
        content.background(
            Canvas { context, size in
                var image = context.resolve(image)
@@ -81,7 +90,7 @@ struct ChatViewBackground: ViewModifier {
                case WallpaperType.empty: ()
                }
            }
-        )
+        ).ignoresSafeArea(.all)
    }
 }

@@ -91,7 +100,7 @@ extension PresetWallpaper {
            scale
        } else if let type = ChatModel.shared.currentUser?.uiThemes?.preferredMode(base.mode == DefaultThemeMode.dark)?.wallpaper?.toAppWallpaper().type, type.sameType(WallpaperType.preset(filename, nil)) {
            type.scale
-        } else if let scale = themeOverridesDefault.get().first(where: { $0.wallpaper != nil && $0.wallpaper!.preset == filename })?.wallpaper?.scale {
+        } else if let scale = themeOverridesDefault.get().first(where: { $0.wallpaper != nil && $0.wallpaper!.preset == filename && $0.base == base })?.wallpaper?.scale {
            scale
        } else {
            Float(1.0)
@@ -1,21 +0,0 @@
-//
-//  KeyboardPadding.swift
-//  SimpleX (iOS)
-//
-//  Created by Evgeny on 10/07/2023.
-//  Copyright © 2023 SimpleX Chat. All rights reserved.
-//
-
-import SwiftUI
-
-extension View {
-    @ViewBuilder func keyboardPadding() -> some View {
-        if #available(iOS 17.0, *) {
-            GeometryReader { g in
-                self.padding(.bottom, max(0, ChatModel.shared.keyboardHeight - g.safeAreaInsets.bottom))
-            }
-        } else {
-            self
-        }
-    }
-}
@@ -7,16 +7,17 @@
 //

 import SwiftUI
+import SimpleXChat

-struct NavLinkPlain<V: Hashable, Label: View>: View {
-    @State var tag: V
-    @Binding var selection: V?
+struct NavLinkPlain<Label: View>: View {
+    let chatId: ChatId
+    @Binding var selection: ChatId?
    @ViewBuilder var label: () -> Label
    var disabled = false

    var body: some View {
        ZStack {
-            Button("") { DispatchQueue.main.async { selection = tag } }
+            Button("") { ItemsModel.shared.loadOpenChat(chatId) }
                .disabled(disabled)
            label()
        }
@@ -17,7 +17,9 @@ struct NavStackCompat <C: View, D: View>: View {
        if #available(iOS 16, *) {
            NavigationStack(path: Binding(
                get: { isActive.wrappedValue ? [true] : [] },
-                set: { _ in }
+                set: { path in
+                    if path.isEmpty { isActive.wrappedValue = false }
+                }
            )) {
                ZStack {
                    NavigationLink(value: true) { EmptyView() }
@@ -16,11 +16,12 @@ struct ProfileImage: View {
    var size: CGFloat
    var color = Color(uiColor: .tertiarySystemGroupedBackground)
    var backgroundColor: Color? = nil
+    var blurred = false
    @AppStorage(DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) private var radius = defaultProfileImageCorner

    var body: some View {
        if let uiImage = UIImage(base64Encoded: imageStr) {
-            clipProfileImage(Image(uiImage: uiImage), size: size, radius: radius)
+            clipProfileImage(Image(uiImage: uiImage), size: size, radius: radius, blurred: blurred)
        } else {
            let c = color.asAnotherColorFromSecondaryVariant(theme)
            Image(systemName: iconName)
@@ -0,0 +1,80 @@
+//
+//  SwipeLabel.swift
+//  SimpleX (iOS)
+//
+//  Created by Levitating Pineapple on 06/08/2024.
+//  Copyright © 2024 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+
+struct SwipeLabel: View {
+    private let text: String
+    private let systemImage: String
+    private let inverted: Bool
+
+    init(_ text: String, systemImage: String, inverted: Bool) {
+        self.text = text
+        self.systemImage = systemImage
+        self.inverted = inverted
+    }
+
+    var body: some View {
+        if inverted {
+            Image(
+                uiImage: SwipeActionView(
+                    systemName: systemImage,
+                    text: text
+                ).snapshot(inverted: inverted)
+            )
+        } else {
+            Label(text, systemImage: systemImage)
+        }
+    }
+
+    private class SwipeActionView: UIView {
+        private let imageView = UIImageView()
+        private let label = UILabel()
+        private let fontSize: CGFloat
+
+        init(systemName: String, text: String) {
+            fontSize = UIFontDescriptor.preferredFontDescriptor(withTextStyle: .subheadline).pointSize
+            super.init(frame: CGRect(x: 0, y: 0, width: 64, height: 32 + fontSize))
+            imageView.image = UIImage(systemName: systemName)
+            imageView.contentMode = .scaleAspectFit
+            label.text = text
+            label.textAlignment = .center
+            label.font = UIFont.systemFont(ofSize: fontSize, weight: .medium)
+            addSubview(imageView)
+            addSubview(label)
+        }
+
+        override func layoutSubviews() {
+            imageView.frame = CGRect(
+                x: 20,
+                y: 0,
+                width: 24,
+                height: 24
+            )
+            label.frame = CGRect(
+                x: 0,
+                y: 32,
+                width: 64,
+                height: fontSize
+            )
+        }
+
+        @available(*, unavailable)
+        required init?(coder: NSCoder) { fatalError("not implemented") }
+
+        func snapshot(inverted: Bool) -> UIImage {
+            UIGraphicsImageRenderer(bounds: bounds).image { context in
+                if inverted {
+                    context.cgContext.scaleBy(x: 1, y: -1)
+                    context.cgContext.translateBy(x: 0, y: -bounds.height)
+                }
+                layer.render(in: context.cgContext)
+            }.withRenderingMode(.alwaysTemplate)
+        }
+    }
+}
@@ -9,8 +9,8 @@
 import SwiftUI

 extension View {
-    @ViewBuilder func `if`<Content: View>(_ condition: @autoclosure () -> Bool, transform: (Self) -> Content) -> some View {
-        if condition() {
+    @ViewBuilder func `if`<Content: View>(_ condition: Bool, transform: (Self) -> Content) -> some View {
+        if condition {
            transform(self)
        } else {
            self
@@ -65,7 +65,7 @@ struct LocalAuthView: View {
                // Clear sensitive data on screen just in case app fails to hide its views while new database is created
                m.chatId = nil
                ItemsModel.shared.reversedChatItems = []
-                m.chats = []
+                m.updateChats([])
                m.users = []
                _ = kcAppPassword.set(password)
                _ = kcSelfDestructPassword.remove()
@@ -32,6 +32,7 @@ private enum MigrateFromDeviceViewAlert: Identifiable {
    case keychainError(_ title: LocalizedStringKey = "Keychain error")
    case databaseError(_ title: LocalizedStringKey = "Database error", message: String)
    case unknownError(_ title: LocalizedStringKey = "Unknown error", message: String)
+    case archiveExportedWithErrors(archivePath: URL, archiveErrors: [ArchiveError])

    case error(title: LocalizedStringKey, error: String = "")

@@ -45,6 +46,7 @@ private enum MigrateFromDeviceViewAlert: Identifiable {
        case .keychainError: return "keychainError"
        case let .databaseError(title, message): return "\(title) \(message)"
        case let .unknownError(title, message): return "\(title) \(message)"
+        case let .archiveExportedWithErrors(path, _): return "archiveExportedWithErrors \(path)"

        case let .error(title, _): return "error \(title)"
        }
@@ -166,6 +168,14 @@ struct MigrateFromDevice: View {
                return Alert(title: Text(title), message: Text(message))
            case let .unknownError(title, message):
                return Alert(title: Text(title), message: Text(message))
+            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),
+                    dismissButton: .default(Text("Continue")) {
+                        Task { await uploadArchive(path: archivePath) }
+                    }
+                )
            case let .error(title, error):
                return Alert(title: Text(title), message: Text(error))
            }
@@ -449,15 +459,12 @@ struct MigrateFromDevice: View {
        Task {
            do {
                try? FileManager.default.createDirectory(at: getMigrationTempFilesDirectory(), withIntermediateDirectories: true)
-                let archivePath = try await exportChatArchive(getMigrationTempFilesDirectory())
-                if let attrs = try? FileManager.default.attributesOfItem(atPath: archivePath.path),
-                    let totalBytes = attrs[.size] as? Int64 {
-                    await MainActor.run {
-                        migrationState = .uploadProgress(uploadedBytes: 0, totalBytes: totalBytes, fileId: 0, archivePath: archivePath, ctrl: nil)
-                    }
+                let (archivePath, errs) = try await exportChatArchive(getMigrationTempFilesDirectory())
+                if errs.isEmpty {
+                    await uploadArchive(path: archivePath)
                } else {
                    await MainActor.run {
-                        alert = .error(title: "Exported file doesn't exist")
+                        alert = .archiveExportedWithErrors(archivePath: archivePath, archiveErrors: errs)
                        migrationState = .uploadConfirmation
                    }
                }
@@ -469,6 +476,20 @@ struct MigrateFromDevice: View {
            }
        }
    }
+    
+    private func uploadArchive(path archivePath: URL) async {
+        if let attrs = try? FileManager.default.attributesOfItem(atPath: archivePath.path),
+            let totalBytes = attrs[.size] as? Int64 {
+            await MainActor.run {
+                migrationState = .uploadProgress(uploadedBytes: 0, totalBytes: totalBytes, fileId: 0, archivePath: archivePath, ctrl: nil)
+            }
+        } else {
+            await MainActor.run {
+                alert = .error(title: "Exported file doesn't exist")
+                migrationState = .uploadConfirmation
+            }
+        }
+    }

    private func initTemporaryDatabase() -> (chat_ctrl, User)? {
        let (status, ctrl) = chatInitTemporaryDatabase(url: tempDatabaseUrl)
@@ -30,7 +30,7 @@ struct AddContactLearnMore: View {
            }
            .listRowBackground(Color.clear)
        }
-        .modifier(ThemedBackground())
+        .modifier(ThemedBackground(grouped: true))
    }
 }

@@ -35,40 +35,37 @@ struct AddGroupView: View {
                    creatingGroup: true,
                    showFooterCounter: false
                ) { _ in
-                    dismiss()
                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                        m.chatId = groupInfo.id
+                        dismissAllSheets(animated: true) {
+                            ItemsModel.shared.loadOpenChat(groupInfo.id)
+                        }
                    }
                }
+                .navigationBarTitleDisplayMode(.inline)
            } else {
                GroupLinkView(
                    groupId: groupInfo.groupId,
                    groupLink: $groupLink,
                    groupLinkMemberRole: $groupLinkMemberRole,
-                    showTitle: true,
+                    showTitle: false,
                    creatingGroup: true
                ) {
-                    dismiss()
                    DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
-                        m.chatId = groupInfo.id
+                        dismissAllSheets(animated: true) {
+                            ItemsModel.shared.loadOpenChat(groupInfo.id)
+                        }
                    }
                }
+                .navigationBarTitle("Group link")
            }
        } else {
-            createGroupView().keyboardPadding()
+            createGroupView()
        }
    }

    func createGroupView() -> some View {
        List {
            Group {
-                Text("Create secret group")
-                    .font(.largeTitle)
-                    .bold()
-                    .fixedSize(horizontal: false, vertical: true)
-                    .padding(.bottom, 24)
-                    .onTapGesture(perform: hideKeyboard)
-
                ZStack(alignment: .center) {
                    ZStack(alignment: .topTrailing) {
                        ProfileImage(imageStr: profile.image, size: 128)
@@ -204,13 +201,14 @@ struct AddGroupView: View {
                chat = c
            }
        } catch {
-            dismiss()
-            AlertManager.shared.showAlert(
-                Alert(
-                    title: Text("Error creating group"),
-                    message: Text(responseError(error))
+            dismissAllSheets(animated: true) {
+                AlertManager.shared.showAlert(
+                    Alert(
+                        title: Text("Error creating group"),
+                        message: Text(responseError(error))
+                    )
                )
-            )
+            }
        }
    }

@@ -7,53 +7,499 @@
 //

 import SwiftUI
+import SimpleXChat

-enum NewChatMenuOption: Identifiable {
-    case newContact
-    case scanPaste
-    case newGroup
-
-    var id: Self { self }
+enum ContactType: Int {
+    case card, request, recent, chatDeleted, unlisted
 }

 struct NewChatMenuButton: View {
-    @Binding var newChatMenuOption: NewChatMenuOption?
+    @State private var showNewChatSheet = false
+    @State private var alert: SomeAlert? = nil
+    @State private var globalAlert: SomeAlert? = nil

    var body: some View {
-        Menu {
            Button {
-                newChatMenuOption = .newContact
-            } label: {
-                Text("Add contact")
-            }
-            Button {
-                newChatMenuOption = .scanPaste
-            } label: {
-                Text("Scan / Paste link")
-            }
-            Button {
-                newChatMenuOption = .newGroup
-            } label: {
-                Text("Create group")
-            }
+            showNewChatSheet = true
        } label: {
            Image(systemName: "square.and.pencil")
                .resizable()
                .scaledToFit()
                .frame(width: 24, height: 24)
        }
-        .sheet(item: $newChatMenuOption) { opt in
-            switch opt {
-            case .newContact: NewChatView(selection: .invite)
-            case .scanPaste: NewChatView(selection: .connect, showQRCodeScanner: true)
-            case .newGroup: AddGroupView()
+        .appSheet(isPresented: $showNewChatSheet) {
+            NewChatSheet(alert: $alert)
+                .environment(\EnvironmentValues.refresh as! WritableKeyPath<EnvironmentValues, RefreshAction?>, nil)
+                .alert(item: $alert) { a in
+                    return a.alert
+                }
+        }
+        // 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
+            return a.alert
+        }
    }
 }

-#Preview {
-    NewChatMenuButton(
-        newChatMenuOption: Binding.constant(nil)
-    )
+private var indent: CGFloat = 36
+
+struct NewChatSheet: View {
+    @EnvironmentObject var theme: AppTheme
+    @State private var baseContactTypes: [ContactType] = [.card, .request, .recent]
+    @EnvironmentObject var chatModel: ChatModel
+    @State private var searchMode = false
+    @FocusState var searchFocussed: Bool
+    @State private var searchText = ""
+    @State private var searchShowingSimplexLink = false
+    @State private var searchChatFilteredBySimplexLink: String? = nil
+    @Binding var alert: SomeAlert?
+
+    // Sheet height management
+    @State private var isAddContactActive = false
+    @State private var isScanPasteLinkActive = false
+    @State private var isLargeSheet = false
+    @State private var allowSmallSheet = true
+
+    @AppStorage(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
+
+    var body: some View {
+        let showArchive = !filterContactTypes(chats: chatModel.chats, contactTypes: [.chatDeleted]).isEmpty
+        let v = NavigationView {
+            viewBody(showArchive)
+                .navigationTitle("New message")
+                .navigationBarTitleDisplayMode(.large)
+                .navigationBarHidden(searchMode)
+                .modifier(ThemedBackground(grouped: true))
+        }
+        if #available(iOS 16.0, *), oneHandUI {
+            let sheetHeight: CGFloat = showArchive ? 575 : 500
+            v.presentationDetents(
+                allowSmallSheet ? [.height(sheetHeight), .large] : [.large],
+                selection: Binding(
+                    get: { isLargeSheet || !allowSmallSheet ? .large : .height(sheetHeight) },
+                    set: { isLargeSheet = $0 == .large }
+                )
+            )
+        } else {
+            v
+        }
+    }
+
+    @ViewBuilder private func viewBody(_ showArchive: Bool) -> some View {
+        List {
+            HStack {
+                ContactsListSearchBar(
+                    searchMode: $searchMode,
+                    searchFocussed: $searchFocussed,
+                    searchText: $searchText,
+                    searchShowingSimplexLink: $searchShowingSimplexLink,
+                    searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink
+                )
+                .frame(maxWidth: .infinity)
+            }
+            .listRowSeparator(.hidden)
+            .listRowBackground(Color.clear)
+            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+
+            if (searchText.isEmpty) {
+                Section {
+                    NavigationLink(isActive: $isAddContactActive) {
+                        NewChatView(selection: .invite, parentAlert: $alert)
+                            .navigationTitle("New chat")
+                            .modifier(ThemedBackground(grouped: true))
+                            .navigationBarTitleDisplayMode(.large)
+                    } label: {
+                        navigateOnTap(Label("Add contact", systemImage: "link.badge.plus")) {
+                            isAddContactActive = true
+                        }
+                    }
+                    NavigationLink(isActive: $isScanPasteLinkActive) {
+                        NewChatView(selection: .connect, showQRCodeScanner: true, parentAlert: $alert)
+                            .navigationTitle("New chat")
+                            .modifier(ThemedBackground(grouped: true))
+                            .navigationBarTitleDisplayMode(.large)
+                    } label: {
+                        navigateOnTap(Label("Scan / Paste link", systemImage: "qrcode")) {
+                            isScanPasteLinkActive = true
+                        }
+                    }
+                    NavigationLink {
+                        AddGroupView()
+                            .navigationTitle("Create secret group")
+                            .modifier(ThemedBackground(grouped: true))
+                            .navigationBarTitleDisplayMode(.large)
+                    } label: {
+                        Label("Create group", systemImage: "person.2.circle.fill")
+                    }
+                }
+                
+                if (showArchive) {
+                    Section {
+                        NavigationLink {
+                            DeletedChats()
+                        } label: {
+                            newChatActionButton("archivebox", color: theme.colors.secondary) { Text("Archived contacts") }
+                        }
+                    }
+                }
+            }
+            
+            ContactsList(
+                baseContactTypes: $baseContactTypes,
+                searchMode: $searchMode,
+                searchText: $searchText,
+                header: "Your Contacts",
+                searchFocussed: $searchFocussed,
+                searchShowingSimplexLink: $searchShowingSimplexLink,
+                searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink,
+                showDeletedChatIcon: true
+            )
+        }
+    }
+    
+    /// Extends label's tap area to match `.insetGrouped` list row insets
+    private func navigateOnTap<L: View>(_ label: L, setActive: @escaping () -> Void) -> some View {
+        label
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .padding(.leading, 16).padding(.vertical, 8).padding(.trailing, 32)
+            .contentShape(Rectangle())
+            .onTapGesture {
+                isLargeSheet = true
+                DispatchQueue.main.async {
+                    allowSmallSheet = false
+                    setActive()
+                }
+            }
+            .padding(.leading, -16).padding(.vertical, -8).padding(.trailing, -32)
+    }
+
+    func newChatActionButton<Content : View>(_ icon: String, color: Color/* = .secondary*/, content: @escaping () -> Content) -> some View {
+        ZStack(alignment: .leading) {
+            Image(systemName: icon)
+                .resizable()
+                .scaledToFit()
+                .frame(maxWidth: 24, maxHeight: 24, alignment: .center)
+                .symbolRenderingMode(.monochrome)
+                .foregroundColor(color)
+            content().foregroundColor(theme.colors.onBackground).padding(.leading, indent)
+        }
+    }
+}
+
+func chatContactType(chat: Chat) -> ContactType {
+    switch chat.chatInfo {
+    case .contactRequest:
+        return .request
+    case let .direct(contact):
+        if contact.activeConn == nil && contact.profile.contactLink != nil {
+            return .card
+        } else if contact.chatDeleted {
+            return .chatDeleted
+        } else if contact.contactStatus == .active {
+            return .recent
+        } else {
+            return .unlisted
+        }
+    default:
+        return .unlisted
+    }
+}
+
+private func filterContactTypes(chats: [Chat], contactTypes: [ContactType]) -> [Chat] {
+    return chats.filter { chat in
+        contactTypes.contains(chatContactType(chat: chat))
+    }
+}
+
+struct ContactsList: View {
+    @EnvironmentObject var theme: AppTheme
+    @EnvironmentObject var chatModel: ChatModel
+    @Binding var baseContactTypes: [ContactType]
+    @Binding var searchMode: Bool
+    @Binding var searchText: String
+    var header: String? = nil
+    @FocusState.Binding var searchFocussed: Bool
+    @Binding var searchShowingSimplexLink: Bool
+    @Binding var searchChatFilteredBySimplexLink: String?
+    var showDeletedChatIcon: Bool
+    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
+    
+    var body: some View {
+        let contactTypes = contactTypesSearchTargets(baseContactTypes: baseContactTypes, searchEmpty: searchText.isEmpty)
+        let contactChats = filterContactTypes(chats: chatModel.chats, contactTypes: contactTypes)
+        let filteredContactChats = filteredContactChats(
+            showUnreadAndFavorites: showUnreadAndFavorites,
+            searchShowingSimplexLink: searchShowingSimplexLink,
+            searchChatFilteredBySimplexLink: searchChatFilteredBySimplexLink,
+            searchText: searchText,
+            contactChats: contactChats
+        )
+        
+        if !filteredContactChats.isEmpty {
+            Section(header: Group {
+                if let header = header {
+                    Text(header)
+                        .textCase(.uppercase)
+                        .foregroundColor(theme.colors.secondary)
+                    }
+                }
+            ) {
+                ForEach(filteredContactChats, id: \.viewId) { chat in
+                    ContactListNavLink(chat: chat, showDeletedChatIcon: showDeletedChatIcon)
+                        .disabled(chatModel.chatRunning != true)
+                }
+            }
+        }
+        
+        if filteredContactChats.isEmpty && !contactChats.isEmpty {
+            noResultSection(text: "No filtered contacts")
+        } else if contactChats.isEmpty {
+            noResultSection(text: "No contacts")
+        }
+    }
+    
+    @ViewBuilder private func noResultSection(text: String) -> some View {
+        Section {
+            Text(text)
+                .foregroundColor(theme.colors.secondary)
+                .frame(maxWidth: .infinity, alignment: .center)
+
+        }
+        .listRowSeparator(.hidden)
+        .listRowBackground(Color.clear)
+        .listRowInsets(EdgeInsets(top: 7, leading: 0, bottom: 7, trailing: 0))
+    }
+    
+    private func contactTypesSearchTargets(baseContactTypes: [ContactType], searchEmpty: Bool) -> [ContactType] {
+        if baseContactTypes.contains(.chatDeleted) || searchEmpty {
+            return baseContactTypes
+        } else {
+            return baseContactTypes + [.chatDeleted]
+        }
+    }
+    
+    private func chatsByTypeComparator(chat1: Chat, chat2: Chat) -> Bool {
+        let chat1Type = chatContactType(chat: chat1)
+        let chat2Type = chatContactType(chat: chat2)
+
+        if chat1Type.rawValue < chat2Type.rawValue {
+            return true
+        } else if chat1Type.rawValue > chat2Type.rawValue {
+            return false
+        } else {
+            return chat2.chatInfo.chatTs < chat1.chatInfo.chatTs
+        }
+    }
+        
+    private func filterChat(chat: Chat, searchText: String, showUnreadAndFavorites: Bool) -> Bool {
+        var meetsPredicate = true
+        let s = searchText.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+        let cInfo = chat.chatInfo
+
+        if !searchText.isEmpty {
+            if (!cInfo.chatViewName.lowercased().contains(searchText.lowercased())) {
+                if case let .direct(contact) = cInfo {
+                    meetsPredicate = contact.profile.displayName.lowercased().contains(s) || contact.fullName.lowercased().contains(s)
+                } else {
+                    meetsPredicate = false
+                }
+            }
+        }
+
+        if showUnreadAndFavorites {
+            meetsPredicate = meetsPredicate && (cInfo.chatSettings?.favorite ?? false)
+        }
+
+        return meetsPredicate
+    }
+    
+    func filteredContactChats(
+        showUnreadAndFavorites: Bool,
+        searchShowingSimplexLink: Bool,
+        searchChatFilteredBySimplexLink: String?,
+        searchText: String,
+        contactChats: [Chat]
+    ) -> [Chat] {
+        let linkChatId = searchChatFilteredBySimplexLink
+        let s = searchShowingSimplexLink ? "" : searchText.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
+
+        let filteredChats: [Chat]
+
+        if let linkChatId = linkChatId {
+            filteredChats = contactChats.filter { $0.id == linkChatId }
+        } else {
+            filteredChats = contactChats.filter { chat in
+                filterChat(chat: chat, searchText: s, showUnreadAndFavorites: showUnreadAndFavorites)
+            }
+        }
+
+        return filteredChats.sorted(by: chatsByTypeComparator)
+    }
+}
+
+struct ContactsListSearchBar: View {
+    @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
+    @Binding var searchMode: Bool
+    @FocusState.Binding var searchFocussed: Bool
+    @Binding var searchText: String
+    @Binding var searchShowingSimplexLink: Bool
+    @Binding var searchChatFilteredBySimplexLink: String?
+    @State private var ignoreSearchTextChange = false
+    @State private var alert: PlanAndConnectAlert?
+    @State private var sheet: PlanAndConnectActionSheet?
+    @AppStorage(DEFAULT_SHOW_UNREAD_AND_FAVORITES) private var showUnreadAndFavorites = false
+
+    var body: some View {
+        HStack(spacing: 12) {
+            HStack(spacing: 4) {
+                Spacer()
+                    .frame(width: 8)
+                Image(systemName: "magnifyingglass")
+                    .resizable()
+                    .scaledToFit()
+                    .frame(width: 16, height: 16)
+                TextField("Search or paste SimpleX link", text: $searchText)
+                    .foregroundColor(searchShowingSimplexLink ? theme.colors.secondary : theme.colors.onBackground)
+                    .disabled(searchShowingSimplexLink)
+                    .focused($searchFocussed)
+                    .frame(maxWidth: .infinity)
+                if !searchText.isEmpty {
+                    Image(systemName: "xmark.circle.fill")
+                        .resizable()
+                        .scaledToFit()
+                        .frame(width: 16, height: 16)
+                        .onTapGesture {
+                            searchText = ""
+                        }
+                }
+            }
+            .padding(EdgeInsets(top: 7, leading: 7, bottom: 7, trailing: 7))
+            .foregroundColor(theme.colors.secondary)
+            .background(Color(uiColor: .secondarySystemGroupedBackground))
+            .cornerRadius(10.0)
+
+            if searchFocussed {
+                Text("Cancel")
+                    .foregroundColor(theme.colors.primary)
+                    .onTapGesture {
+                        searchText = ""
+                        searchFocussed = false
+                    }
+            } else if m.chats.count > 0 {
+                toggleFilterButton()
+            }
+        }
+        .padding(.top, 24)
+        .onChange(of: searchFocussed) { sf in
+            withAnimation { searchMode = sf }
+        }
+        .onChange(of: searchText) { t in
+            if ignoreSearchTextChange {
+                ignoreSearchTextChange = false
+            } else {
+                if let link = strHasSingleSimplexLink(t.trimmingCharacters(in: .whitespaces)) { // if SimpleX link is pasted, show connection dialogue
+                    searchFocussed = false
+                    if case let .simplexLink(linkType, _, smpHosts) = link.format {
+                        ignoreSearchTextChange = true
+                        searchText = simplexLinkText(linkType, smpHosts)
+                    }
+                    searchShowingSimplexLink = true
+                    searchChatFilteredBySimplexLink = nil
+                    connect(link.text)
+                } else {
+                    if t != "" { // if some other text is pasted, enter search mode
+                        searchFocussed = true
+                    }
+                    searchShowingSimplexLink = false
+                    searchChatFilteredBySimplexLink = nil
+                }
+            }
+        }
+        .alert(item: $alert) { a in
+            planAndConnectAlert(a, dismiss: true, cleanup: { searchText = "" })
+        }
+        .actionSheet(item: $sheet) { s in
+            planAndConnectActionSheet(s, dismiss: true, cleanup: { searchText = "" })
+        }
+    }
+
+    private func toggleFilterButton() -> some View {
+        ZStack {
+            Color.clear
+                .frame(width: 22, height: 22)
+            Image(systemName: showUnreadAndFavorites ? "line.3.horizontal.decrease.circle.fill" : "line.3.horizontal.decrease")
+                .resizable()
+                .scaledToFit()
+                .foregroundColor(showUnreadAndFavorites ? theme.colors.primary : theme.colors.secondary)
+                .frame(width: showUnreadAndFavorites ? 22 : 16, height: showUnreadAndFavorites ? 22 : 16)
+                .onTapGesture {
+                    showUnreadAndFavorites = !showUnreadAndFavorites
+                }
+        }
+    }
+
+    private func connect(_ link: String) {
+        planAndConnect(
+            link,
+            showAlert: { alert = $0 },
+            showActionSheet: { sheet = $0 },
+            dismiss: true,
+            incognito: nil,
+            filterKnownContact: { searchChatFilteredBySimplexLink = $0.id }
+        )
+    }
+}
+
+
+struct DeletedChats: View {
+    @State private var baseContactTypes: [ContactType] = [.chatDeleted]
+    @State private var searchMode = false
+    @FocusState var searchFocussed: Bool
+    @State private var searchText = ""
+    @State private var searchShowingSimplexLink = false
+    @State private var searchChatFilteredBySimplexLink: String? = nil
+    
+    var body: some View {
+        List {
+            ContactsListSearchBar(
+                searchMode: $searchMode,
+                searchFocussed: $searchFocussed,
+                searchText: $searchText,
+                searchShowingSimplexLink: $searchShowingSimplexLink,
+                searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink
+            )
+            .listRowSeparator(.hidden)
+            .listRowBackground(Color.clear)
+            .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 0, trailing: 0))
+            .frame(maxWidth: .infinity)
+            
+            ContactsList(
+                baseContactTypes: $baseContactTypes,
+                searchMode: $searchMode,
+                searchText: $searchText,
+                searchFocussed: $searchFocussed,
+                searchShowingSimplexLink: $searchShowingSimplexLink,
+                searchChatFilteredBySimplexLink: $searchChatFilteredBySimplexLink,
+                showDeletedChatIcon: false
+            )
+        }
+        .navigationTitle("Archived contacts")
+        .navigationBarTitleDisplayMode(.large)
+        .navigationBarHidden(searchMode)
+        .modifier(ThemedBackground(grouped: true))
+
+    }
+}
+
+#Preview {
+    NewChatMenuButton()
 }
@@ -17,10 +17,19 @@ struct SomeAlert: Identifiable {
    var id: String
 }

+struct SomeActionSheet: Identifiable {
+    var actionSheet: ActionSheet
+    var id: String
+}
+
+struct SomeSheet<Content: View>: Identifiable {
+    @ViewBuilder var content: Content
+    var id: String
+}
+
 private enum NewChatViewAlert: Identifiable {
    case planAndConnectAlert(alert: PlanAndConnectAlert)
    case newChatSomeAlert(alert: SomeAlert)
-
    var id: String {
        switch self {
        case let .planAndConnectAlert(alert): return "planAndConnectAlert \(alert.id)"
@@ -47,22 +56,10 @@ struct NewChatView: View {
    @State private var creatingConnReq = false
    @State private var pastedLink: String = ""
    @State private var alert: NewChatViewAlert?
+    @Binding var parentAlert: SomeAlert?

    var body: some View {
        VStack(alignment: .leading) {
-            HStack {
-                Text("New chat")
-                    .font(.largeTitle)
-                    .bold()
-                    .fixedSize(horizontal: false, vertical: true)
-                Spacer()
-                InfoSheetButton {
-                    AddContactLearnMore(showTitle: true)
-                }
-            }
-            .padding()
-            .padding(.top)
-
            Picker("New chat", selection: $selection) {
                Label("Add contact", systemImage: "link")
                    .tag(NewChatOption.invite)
@@ -88,6 +85,7 @@ struct NewChatView: View {
                }
            }
            .frame(maxWidth: .infinity, maxHeight: .infinity)
+            .modifier(ThemedBackground(grouped: true))
            .background(
                // Rectangle is needed for swipe gesture to work on mostly empty views (creatingLinkProgressView and retryButton)
                Rectangle()
@@ -110,6 +108,13 @@ struct NewChatView: View {
                }
            )
        }
+        .toolbar {
+            ToolbarItem(placement: .navigationBarTrailing) {
+                InfoSheetButton {
+                    AddContactLearnMore(showTitle: true)
+                }
+            }
+        }
        .modifier(ThemedBackground(grouped: true))
        .onChange(of: invitationUsed) { used in
            if used && !(m.showingInvitation?.connChatUsed ?? true) {
@@ -119,19 +124,22 @@ struct NewChatView: View {
        .onDisappear {
            if !(m.showingInvitation?.connChatUsed ?? true),
               let conn = contactConnection {
-                AlertManager.shared.showAlert(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: []
-                            ))
+                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"
+                )
            }
            m.showingInvitation = nil
        }
@@ -837,7 +845,10 @@ private func connectContactViaAddress_(_ contact: Contact, dismiss: Bool, incogn
                dismissAllSheets(animated: true)
            }
        }
-        _ = await connectContactViaAddress(contact.contactId, incognito)
+        let ok = await connectContactViaAddress(contact.contactId, incognito, showAlert: { AlertManager.shared.showAlert($0) })
+        if ok {
+            AlertManager.shared.showAlert(connReqSentAlert(.contact))
+        }
        cleanup?()
    }
 }
@@ -887,11 +898,11 @@ func openKnownContact(_ contact: Contact, dismiss: Bool, showAlreadyExistsAlert:
            DispatchQueue.main.async {
                if dismiss {
                    dismissAllSheets(animated: true) {
-                        m.chatId = c.id
+                        ItemsModel.shared.loadOpenChat(c.id)
                        showAlreadyExistsAlert?()
                    }
                } else {
-                    m.chatId = c.id
+                    ItemsModel.shared.loadOpenChat(c.id)
                    showAlreadyExistsAlert?()
                }
            }
@@ -906,11 +917,11 @@ func openKnownGroup(_ groupInfo: GroupInfo, dismiss: Bool, showAlreadyExistsAler
            DispatchQueue.main.async {
                if dismiss {
                    dismissAllSheets(animated: true) {
-                        m.chatId = g.id
+                        ItemsModel.shared.loadOpenChat(g.id)
                        showAlreadyExistsAlert?()
                    }
                } else {
-                    m.chatId = g.id
+                    ItemsModel.shared.loadOpenChat(g.id)
                    showAlreadyExistsAlert?()
                }
            }
@@ -961,8 +972,13 @@ func connReqSentAlert(_ type: ConnReqType) -> Alert {
    )
 }

-#Preview {
-    NewChatView(
-        selection: .invite
-    )
+struct NewChatView_Previews: PreviewProvider {
+    static var previews: some View {
+        @State var parentAlert: SomeAlert?
+
+        NewChatView(
+            selection: .invite,
+            parentAlert: $parentAlert
+        )
+    }
 }
@@ -77,7 +77,6 @@ struct CreateProfile: View {
                focusDisplayName = true
            }
        }
-        .keyboardPadding()
    }
 }

@@ -128,7 +127,6 @@ struct CreateFirstProfile: View {
        }
        .padding()
        .frame(maxWidth: .infinity, alignment: .leading)
-        .keyboardPadding()
    }

    func onboardingButtons() -> some View {
@@ -15,9 +15,10 @@ private struct VersionDescription {
 }

 private struct FeatureDescription {
-    var icon: String
+    var icon: String?
    var title: LocalizedStringKey
-    var description: LocalizedStringKey
+    var description: LocalizedStringKey?
+    var subfeatures: [(icon: String, description: LocalizedStringKey)] = []
 }

 private let versionDescriptions: [VersionDescription] = [
@@ -428,6 +429,44 @@ private let versionDescriptions: [VersionDescription] = [
            )
        ]
    ),
+    VersionDescription(
+        version: "v6.0",
+        post: URL(string: "https://simplex.chat/blog/20240814-simplex-chat-vision-funding-v6-private-routing-new-user-experience.html"),
+        features: [
+            FeatureDescription(
+                icon: nil,
+                title: "New chat experience 🎉",
+                description: nil,
+                subfeatures: [
+                    ("link.badge.plus", "Connect to your friends faster."),
+                    ("archivebox", "Archive contacts to chat later."),
+                    ("trash", "Delete up to 20 messages at once."),
+                    ("platter.filled.bottom.and.arrow.down.iphone", "Use the app with one hand."),
+                    ("paintpalette", "Color chats with the new themes."),
+                ]
+            ),
+            FeatureDescription(
+                icon: nil,
+                title: "New media options",
+                description: nil,
+                subfeatures: [
+                    ("square.and.arrow.up", "Share from other apps."),
+                    ("play.circle", "Play from the chat list."),
+                    ("circle.filled.pattern.diagonalline.rectangle", "Blur for better privacy.")
+                ]
+            ),
+            FeatureDescription(
+                icon: "arrow.forward",
+                title: "Private message routing 🚀",
+                description: "It protects your IP address and connections."
+            ),
+            FeatureDescription(
+                icon: "network",
+                title: "Better networking",
+                description: "Connection and servers status."
+            )
+        ]
+    ),
 ]

 private let lastVersion = versionDescriptions.last!.version
@@ -453,35 +492,37 @@ struct WhatsNewView: View {
        VStack {
            TabView(selection: $currentVersion) {
                ForEach(Array(versionDescriptions.enumerated()), id: \.0) { (i, v) in
-                    VStack(alignment: .leading, spacing: 16) {
-                        Text("New in \(v.version)")
-                            .font(.title)
-                            .foregroundColor(theme.colors.secondary)
-                            .frame(maxWidth: .infinity)
-                            .padding(.vertical)
-                        ForEach(v.features, id: \.icon) { f in
-                            featureDescription(f.icon, f.title, f.description)
-                                .padding(.bottom, 8)
-                        }
-                        if let post = v.post {
-                            Link(destination: post) {
-                                HStack {
-                                    Text("Read more")
-                                    Image(systemName: "arrow.up.right.circle")
+                    ScrollView {
+                        VStack(alignment: .leading, spacing: 16) {
+                            Text("New in \(v.version)")
+                                .font(.title)
+                                .foregroundColor(theme.colors.secondary)
+                                .frame(maxWidth: .infinity)
+                                .padding(.vertical)
+                            ForEach(v.features, id: \.title) { f in
+                                featureDescription(f)
+                                    .padding(.bottom, 8)
+                            }
+                            if let post = v.post {
+                                Link(destination: post) {
+                                    HStack {
+                                        Text("Read more")
+                                        Image(systemName: "arrow.up.right.circle")
+                                    }
                                }
                            }
-                        }
-                        if !viaSettings {
-                            Spacer()
-                            Button("Ok") {
-                                dismiss()
+                            if !viaSettings {
+                                Spacer()
+                                Button("Ok") {
+                                    dismiss()
+                                }
+                                .font(.title3)
+                                .frame(maxWidth: .infinity, alignment: .center)
+                                Spacer()
                            }
-                            .font(.title3)
-                            .frame(maxWidth: .infinity, alignment: .center)
-                            Spacer()
                        }
+                        .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
                    }
-                    .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .topLeading)
                    .tag(i)
                }
            }
@@ -495,18 +536,37 @@ struct WhatsNewView: View {
        }
    }

-    private func featureDescription(_ icon: String, _ title: LocalizedStringKey, _ description: LocalizedStringKey) -> some View {
+    private func featureDescription(_ f: FeatureDescription) -> some View {
        VStack(alignment: .leading, spacing: 4) {
-            HStack(alignment: .center, spacing: 4) {
-                Image(systemName: icon)
-                    .symbolRenderingMode(.monochrome)
-                    .foregroundColor(theme.colors.secondary)
-                    .frame(minWidth: 30, alignment: .center)
-                Text(title).font(.title3).bold()
+            if let icon = f.icon {
+                HStack(alignment: .center, spacing: 4) {
+                    Image(systemName: icon)
+                        .symbolRenderingMode(.monochrome)
+                        .foregroundColor(theme.colors.secondary)
+                        .frame(minWidth: 30, alignment: .center)
+                    Text(f.title).font(.title3).bold()
+                }
+            } else {
+                Text(f.title).font(.title3).bold()
+            }
+            if let d = f.description {
+                Text(d)
+                    .multilineTextAlignment(.leading)
+                    .lineLimit(10)
+            }
+            if f.subfeatures.count > 0 {
+                ForEach(f.subfeatures, id: \.icon) { s in
+                    HStack(alignment: .center, spacing: 4) {
+                        Image(systemName: s.icon)
+                            .symbolRenderingMode(.monochrome)
+                            .foregroundColor(theme.colors.secondary)
+                            .frame(minWidth: 30, alignment: .center)
+                        Text(s.description)
+                            .multilineTextAlignment(.leading)
+                            .lineLimit(3)
+                    }
+                }
            }
-            Text(description)
-                .multilineTextAlignment(.leading)
-                .lineLimit(10)
        }
    }

@@ -24,34 +24,114 @@ enum NetworkSettingsAlert: Identifiable {
 }

 struct AdvancedNetworkSettings: View {
+    @Environment(\.dismiss) var dismiss: DismissAction
    @EnvironmentObject var theme: AppTheme
+    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
+    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
    @State private var netCfg = NetCfg.defaults
    @State private var currentNetCfg = NetCfg.defaults
    @State private var cfgLoaded = false
    @State private var enableKeepAlive = true
    @State private var keepAliveOpts = KeepAliveOpts.defaults
    @State private var showSettingsAlert: NetworkSettingsAlert?
+    @State private var onionHosts: OnionHosts = .no
+    @State private var showSaveDialog = false

    var body: some View {
        VStack {
            List {
                Section {
-                    Button {
-                        updateNetCfgView(NetCfg.defaults)
-                        showSettingsAlert = .update
+                    NavigationLink {
+                        List {
+                            Section {
+                                SelectionListView(list: SMPProxyMode.values, selection: $netCfg.smpProxyMode) { mode in
+                                    netCfg.smpProxyMode = mode
+                                }
+                            } footer: {
+                                Text(proxyModeInfo(netCfg.smpProxyMode))
+                                    .font(.callout)
+                                    .foregroundColor(theme.colors.secondary)
+                            }
+                        }
+                        .navigationTitle("Private routing")
+                        .modifier(ThemedBackground(grouped: true))
+                        .navigationBarTitleDisplayMode(.inline)
                    } label: {
-                        Text("Reset to defaults")
+                        HStack {
+                            Text("Private routing")
+                            Spacer()
+                            Text(netCfg.smpProxyMode.label)
+                        }
                    }
-                    .disabled(currentNetCfg == NetCfg.defaults)
-
-                    Button {
-                        updateNetCfgView(NetCfg.proxyDefaults)
-                        showSettingsAlert = .update
+                    
+                    NavigationLink {
+                        List {
+                            Section {
+                                SelectionListView(list: SMPProxyFallback.values, selection: $netCfg.smpProxyFallback) { mode in
+                                    netCfg.smpProxyFallback = mode
+                                }
+                                .disabled(netCfg.smpProxyMode == .never)
+                            } footer: {
+                                Text(proxyFallbackInfo(netCfg.smpProxyFallback))
+                                    .font(.callout)
+                                    .foregroundColor(theme.colors.secondary)
+                            }
+                        }
+                        .navigationTitle("Allow downgrade")
+                        .modifier(ThemedBackground(grouped: true))
+                        .navigationBarTitleDisplayMode(.inline)
                    } label: {
-                        Text("Set timeouts for proxy/VPN")
+                        HStack {
+                            Text("Allow downgrade")
+                            Spacer()
+                            Text(netCfg.smpProxyFallback.label)
+                        }
                    }
-                    .disabled(currentNetCfg == NetCfg.proxyDefaults)

+                    Toggle("Show message status", isOn: $showSentViaProxy)
+                } header: {
+                    Text("Private message routing")
+                        .foregroundColor(theme.colors.secondary)
+                } footer: {
+                    VStack(alignment: .leading) {
+                        Text("To protect your IP address, private routing uses your SMP servers to deliver messages.")
+                        if showSentViaProxy {
+                            Text("Show → on messages sent via private routing.")
+                        }
+                    }
+                    .foregroundColor(theme.colors.secondary)
+                }
+
+                Section {
+                    Picker("Use .onion hosts", selection: $onionHosts) {
+                        ForEach(OnionHosts.values, id: \.self) { Text($0.text) }
+                    }
+                    .frame(height: 36)
+                } footer: {
+                    Text(onionHostsInfo(onionHosts))
+                        .foregroundColor(theme.colors.secondary)
+                }
+                .onChange(of: onionHosts) { hosts in
+                    if hosts != OnionHosts(netCfg: currentNetCfg) {
+                        let (hostMode, requiredHostMode) = hosts.hostMode
+                        netCfg.hostMode = hostMode
+                        netCfg.requiredHostMode = requiredHostMode
+                    }
+                }
+                
+                if developerTools {
+                    Section {
+                        Picker("Transport isolation", selection: $netCfg.sessionMode) {
+                            ForEach(TransportSessionMode.values, id: \.self) { Text($0.text) }
+                        }
+                        .frame(height: 36)
+                    } footer: {
+                        Text(sessionModeInfo(netCfg.sessionMode))
+                            .foregroundColor(theme.colors.secondary)
+                    }
+                }
+
+                Section("TCP connection") {
                    timeoutSettingPicker("TCP connection timeout", selection: $netCfg.tcpConnectTimeout, values: [10_000000, 15_000000, 20_000000, 30_000000, 45_000000, 60_000000, 90_000000], label: secondsLabel)
                    timeoutSettingPicker("Protocol timeout", selection: $netCfg.tcpTimeout, values: [5_000000, 7_000000, 10_000000, 15_000000, 20_000000, 30_000000], label: secondsLabel)
                    timeoutSettingPicker("Protocol timeout per KB", selection: $netCfg.tcpTimeoutPerKb, values: [2_500, 5_000, 10_000, 15_000, 20_000, 30_000], label: secondsLabel)
@@ -72,24 +152,21 @@ struct AdvancedNetworkSettings: View {
                        }
                        .foregroundColor(theme.colors.secondary)
                    }
-                } header: {
-                        Text("")
-                        .foregroundColor(theme.colors.secondary)
-                } footer: {
-                    HStack {
-                        Button {
-                            updateNetCfgView(currentNetCfg)
-                        } label: {
-                            Label("Revert", systemImage: "arrow.counterclockwise").font(.callout)
-                        }
+                }
+                
+                Section {
+                    Button("Reset to defaults") {
+                        updateNetCfgView(NetCfg.defaults)
+                    }
+                    .disabled(netCfg == NetCfg.defaults)

-                        Spacer()
-
-                        Button {
-                            showSettingsAlert = .update
-                        } label: {
-                            Label("Save", systemImage: "checkmark").font(.callout)
-                        }
+                    Button("Set timeouts for proxy/VPN") {
+                        updateNetCfgView(netCfg.withProxyTimeouts)
+                    }
+                    .disabled(netCfg.hasProxyTimeouts)
+                    
+                    Button("Save and reconnect") {
+                        showSettingsAlert = .update
                    }
                    .disabled(netCfg == currentNetCfg)
                }
@@ -111,10 +188,10 @@ struct AdvancedNetworkSettings: View {
            switch a {
            case .update:
                return Alert(
-                    title: Text("Update network settings?"),
+                    title: Text("Update settings?"),
                    message: Text("Updating settings will re-connect the client to all servers."),
                    primaryButton: .default(Text("Ok")) {
-                        saveNetCfg()
+                        _ = saveNetCfg()
                    },
                    secondaryButton: .cancel()
                )
@@ -125,23 +202,43 @@ struct AdvancedNetworkSettings: View {
                )
            }
        }
+        .modifier(BackButton(disabled: Binding.constant(false)) {
+            if netCfg == currentNetCfg {
+                dismiss()
+                cfgLoaded = false
+            } else {
+                showSaveDialog = true
+            }
+        })
+        .confirmationDialog("Update network settings?", isPresented: $showSaveDialog, titleVisibility: .visible) {
+            Button("Save and reconnect") {
+                if saveNetCfg() {
+                    dismiss()
+                    cfgLoaded = false
+                }
+            }
+            Button("Exit without saving") { dismiss() }
+        }
    }

    private func updateNetCfgView(_ cfg: NetCfg) {
        netCfg = cfg
+        onionHosts = OnionHosts(netCfg: netCfg)
        enableKeepAlive = netCfg.enableKeepAlive
        keepAliveOpts = netCfg.tcpKeepAlive ?? KeepAliveOpts.defaults
    }

-    private func saveNetCfg() {
+    private func saveNetCfg() -> Bool {
        do {
            try setNetworkConfig(netCfg)
            currentNetCfg = netCfg
            setNetCfg(netCfg)
+            return true
        } catch let error {
            let err = responseError(error)
            showSettingsAlert = .error(err: err)
            logger.error("\(err)")
+            return false
        }
    }

@@ -164,6 +261,38 @@ struct AdvancedNetworkSettings: View {
        }
        .frame(height: 36)
    }
+    
+    private func onionHostsInfo(_ hosts: OnionHosts) -> LocalizedStringKey {
+        switch hosts {
+        case .no: return "Onion hosts will not be used."
+        case .prefer: return "Onion hosts will be used when available.\nRequires compatible VPN."
+        case .require: return "Onion hosts will be **required** for connection.\nRequires compatible VPN."
+        }
+    }
+
+    private func sessionModeInfo(_ mode: TransportSessionMode) -> LocalizedStringKey {
+        switch mode {
+        case .user: return "A separate TCP connection will be used **for each chat profile you have in the app**."
+        case .entity: return "A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail."
+        }
+    }
+    
+    private func proxyModeInfo(_ mode: SMPProxyMode) -> LocalizedStringKey {
+        switch mode {
+        case .always: return "Always use private routing."
+        case .unknown: return "Use private routing with unknown servers."
+        case .unprotected: return "Use private routing with unknown servers when IP address is not protected."
+        case .never: return "Do NOT use private routing."
+        }
+    }
+    
+    private func proxyFallbackInfo(_ proxyFallback: SMPProxyFallback) -> LocalizedStringKey {
+        switch proxyFallback {
+        case .allow: return "Send messages directly when your or destination server does not support private routing."
+        case .allowProtected: return "Send messages directly when IP address is protected and your or destination server does not support private routing."
+        case .prohibit: return "Do NOT send messages directly, even if your or destination server does not support private routing."
+        }
+    }
 }

 struct AdvancedNetworkSettings_Previews: PreviewProvider {
@@ -28,7 +28,10 @@ extension AppSettings {
            privacyAcceptImagesGroupDefault.set(val)
            def.setValue(val, forKey: DEFAULT_PRIVACY_ACCEPT_IMAGES)
        }
-        if let val = privacyLinkPreviews { def.setValue(val, forKey: DEFAULT_PRIVACY_LINK_PREVIEWS) }
+        if let val = privacyLinkPreviews {
+            privacyLinkPreviewsGroupDefault.set(val)
+            def.setValue(val, forKey: DEFAULT_PRIVACY_LINK_PREVIEWS)
+        }
        if let val = privacyShowChatPreviews { def.setValue(val, forKey: DEFAULT_PRIVACY_SHOW_CHAT_PREVIEWS) }
        if let val = privacySaveLastDraft { def.setValue(val, forKey: DEFAULT_PRIVACY_SAVE_LAST_DRAFT) }
        if let val = privacyProtectScreen { def.setValue(val, forKey: DEFAULT_PRIVACY_PROTECT_SCREEN) }
@@ -45,11 +48,15 @@ extension AppSettings {
        if let val = androidCallOnLockScreen { def.setValue(val.rawValue, forKey: ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN) }
        if let val = iosCallKitEnabled { callKitEnabledGroupDefault.set(val) }
        if let val = iosCallKitCallsInRecents { def.setValue(val, forKey: DEFAULT_CALL_KIT_CALLS_IN_RECENTS) }
-        if let val = uiProfileImageCornerRadius { def.setValue(val, forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS) }
+        if let val = uiProfileImageCornerRadius {
+            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 = oneHandUI { groupDefaults.setValue(val, forKey: GROUP_DEFAULT_ONE_HAND_UI) }
    }

    public static var current: AppSettings {
@@ -81,6 +88,7 @@ extension AppSettings {
        c.uiDarkColorScheme = systemDarkThemeDefault.get()
        c.uiCurrentThemeIds = currentThemeIdsDefault.get()
        c.uiThemes = themeOverridesDefault.get()
+        c.oneHandUI = groupDefaults.bool(forKey: GROUP_DEFAULT_ONE_HAND_UI)
        return c
    }
 }
@@ -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(GROUP_DEFAULT_ONE_HAND_UI, store: groupDefaults) private var oneHandUI = true
+    @AppStorage(DEFAULT_TOOLBAR_MATERIAL) private var toolbarMaterial = ToolbarMaterial.defaultMaterial

    @State var themeUserDestination: (Int64, ThemeModeOverrides?)? = {
        if let currentUser = ChatModel.shared.currentUser, let uiThemes = currentUser.uiThemes, uiThemes.preferredMode(!CurrentColors.colors.isLight) != nil {
@@ -62,6 +64,16 @@ struct AppearanceSettings: View {
                    }
                }

+                Section("Chat list") {
+                    Toggle("Reachable chat toolbar", isOn: $oneHandUI)
+                    Picker("Toolbar opacity", selection: $toolbarMaterial) {
+                        ForEach(ToolbarMaterial.allCases, id: \.rawValue) { tm in
+                            Text(tm.text).tag(tm.rawValue)
+                        }
+                    }
+                    .frame(height: 36)
+                }
+                
                Section {
                    ThemeDestinationPicker(themeUserDestination: $themeUserDestination, themeUserDest: themeUserDestination?.0, customizeThemeIsOpen: $customizeThemeIsOpen)

@@ -291,6 +303,43 @@ struct AppearanceSettings: View {
    }
 }

+enum ToolbarMaterial: String, CaseIterable {
+    case bar
+    case ultraThin
+    case thin
+    case regular
+    case thick
+    case ultraThick
+
+    static func material(_ s: String) -> Material {
+        ToolbarMaterial(rawValue: s)?.material ?? Material.bar
+    }
+
+    static let defaultMaterial: String = ToolbarMaterial.regular.rawValue
+
+    var material: Material {
+        switch self {
+        case .bar: .bar
+        case .ultraThin: .ultraThin
+        case .thin: .thin
+        case .regular: .regular
+        case .thick: .thick
+        case .ultraThick: .ultraThick
+        }
+    }
+    
+    var text: String {
+        switch self {
+        case .bar: "System"
+        case .ultraThin: "Ultra thin"
+        case .thin: "Thin"
+        case .regular: "Regular"
+        case .thick: "Thick"
+        case .ultraThick: "Ultra thick"
+        }
+    }
+}
+
 struct ChatThemePreview: View {
    @EnvironmentObject var theme: AppTheme
    var base: DefaultTheme
@@ -13,6 +13,8 @@ struct DeveloperView: View {
    @EnvironmentObject var theme: AppTheme
    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
    @AppStorage(GROUP_DEFAULT_CONFIRM_DB_UPGRADES, store: groupDefaults) private var confirmDatabaseUpgrades = false
+    @State private var hintsUnchanged = hintDefaultsUnchanged()
+
    @Environment(\.colorScheme) var colorScheme

    var body: some View {
@@ -33,8 +35,9 @@ struct DeveloperView: View {
                    } label: {
                        settingsRow("terminal", color: theme.colors.secondary) { Text("Chat console") }
                    }
-                    settingsRow("internaldrive", color: theme.colors.secondary) {
-                        Toggle("Confirm database upgrades", isOn: $confirmDatabaseUpgrades)
+                    settingsRow("lightbulb.max", color: theme.colors.secondary) {
+                        Button("Reset all hints", action: resetHintDefaults)
+                        .disabled(hintsUnchanged)
                    }
                    settingsRow("chevron.left.forwardslash.chevron.right", color: theme.colors.secondary) {
                        Toggle("Show developer options", isOn: $developerTools)
@@ -45,9 +48,34 @@ struct DeveloperView: View {
                    ((developerTools ? Text("Show:") : Text("Hide:")) + Text(" ") + Text("Database IDs and Transport isolation option."))
                        .foregroundColor(theme.colors.secondary)
                }
+                
+                if developerTools {
+                    Section {
+                        settingsRow("internaldrive", color: theme.colors.secondary) {
+                            Toggle("Confirm database upgrades", isOn: $confirmDatabaseUpgrades)
+                        }
+                    } header: {
+                        Text("Developer options")
+                    }
+                }
            }
        }
    }
+    
+    private func resetHintDefaults() {
+        for def in hintDefaults {
+            if let val = appDefaults[def] as? Bool {
+                UserDefaults.standard.set(val, forKey: def)
+            }
+        }
+        hintsUnchanged = true
+    }
+}
+
+private func hintDefaultsUnchanged() -> Bool {
+    hintDefaults.allSatisfy { def in
+        appDefaults[def] as? Bool == UserDefaults.standard.bool(forKey: def)
+    }
 }

 struct DeveloperView_Previews: PreviewProvider {
@@ -10,18 +10,10 @@ import SwiftUI
 import SimpleXChat

 private enum NetworkAlert: Identifiable {
-    case updateOnionHosts(hosts: OnionHosts)
-    case updateSessionMode(mode: TransportSessionMode)
-    case updateSMPProxyMode(proxyMode: SMPProxyMode)
-    case updateSMPProxyFallback(proxyFallback: SMPProxyFallback)
    case error(err: String)

    var id: String {
        switch self {
-        case let .updateOnionHosts(hosts): return "updateOnionHosts \(hosts)"
-        case let .updateSessionMode(mode): return "updateSessionMode \(mode)"
-        case let .updateSMPProxyMode(proxyMode): return "updateSMPProxyMode \(proxyMode)"
-        case let .updateSMPProxyFallback(proxyFallback): return "updateSMPProxyFallback \(proxyFallback)"
        case let .error(err): return "error \(err)"
        }
    }
@@ -30,16 +22,6 @@ private enum NetworkAlert: Identifiable {
 struct NetworkAndServers: View {
    @EnvironmentObject var m: ChatModel
    @EnvironmentObject var theme: AppTheme
-    @AppStorage(DEFAULT_DEVELOPER_TOOLS) private var developerTools = false
-    @AppStorage(DEFAULT_SHOW_SENT_VIA_RPOXY) private var showSentViaProxy = false
-    @State private var cfgLoaded = false
-    @State private var currentNetCfg = NetCfg.defaults
-    @State private var netCfg = NetCfg.defaults
-    @State private var onionHosts: OnionHosts = .no
-    @State private var sessionMode: TransportSessionMode = .user
-    @State private var proxyMode: SMPProxyMode = .never
-    @State private var proxyFallback: SMPProxyFallback = .allow
-    @State private var alert: NetworkAlert?

    var body: some View {
        VStack {
@@ -50,7 +32,7 @@ struct NetworkAndServers: View {
                            .navigationTitle("Your SMP servers")
                            .modifier(ThemedBackground(grouped: true))
                    } label: {
-                        Text("SMP servers")
+                        Text("Message servers")
                    }

                    NavigationLink {
@@ -58,24 +40,12 @@ struct NetworkAndServers: View {
                            .navigationTitle("Your XFTP servers")
                            .modifier(ThemedBackground(grouped: true))
                    } label: {
-                        Text("XFTP servers")
-                    }
-
-                    Picker("Use .onion hosts", selection: $onionHosts) {
-                        ForEach(OnionHosts.values, id: \.self) { Text($0.text) }
-                    }
-                    .frame(height: 36)
-
-                    if developerTools {
-                        Picker("Transport isolation", selection: $sessionMode) {
-                            ForEach(TransportSessionMode.values, id: \.self) { Text($0.text) }
-                        }
-                        .frame(height: 36)
+                        Text("Media & file servers")
                    }

                    NavigationLink {
                        AdvancedNetworkSettings()
-                            .navigationTitle("Network settings")
+                            .navigationTitle("Advanced settings")
                            .modifier(ThemedBackground(grouped: true))
                    } label: {
                        Text("Advanced network settings")
@@ -83,35 +53,6 @@ struct NetworkAndServers: View {
                } header: {
                    Text("Messages & files")
                        .foregroundColor(theme.colors.secondary)
-                } footer: {
-                    Text("Using .onion hosts requires compatible VPN provider.")
-                        .foregroundColor(theme.colors.secondary)
-                }
-
-                Section {
-                    Picker("Private routing", selection: $proxyMode) {
-                        ForEach(SMPProxyMode.values, id: \.self) { Text($0.text) }
-                    }
-                    .frame(height: 36)
-
-                    Picker("Allow downgrade", selection: $proxyFallback) {
-                        ForEach(SMPProxyFallback.values, id: \.self) { Text($0.text) }
-                    }
-                    .disabled(proxyMode == .never)
-                    .frame(height: 36)
-
-                    Toggle("Show message status", isOn: $showSentViaProxy)
-                } header: {
-                    Text("Private message routing")
-                        .foregroundColor(theme.colors.secondary)
-                } footer: {
-                    VStack(alignment: .leading) {
-                        Text("To protect your IP address, private routing uses your SMP servers to deliver messages.")
-                        if showSentViaProxy {
-                            Text("Show → on messages sent via private routing.")
-                        }
-                    }
-                    .foregroundColor(theme.colors.secondary)
                }

                Section(header: Text("Calls").foregroundColor(theme.colors.secondary)) {
@@ -133,147 +74,6 @@ struct NetworkAndServers: View {
                }
            }
        }
-        .onAppear {
-            if cfgLoaded { return }
-            cfgLoaded = true
-            currentNetCfg = getNetCfg()
-            resetNetCfgView()
-        }
-        .onChange(of: onionHosts) { hosts in
-            if hosts != OnionHosts(netCfg: currentNetCfg) {
-                alert = .updateOnionHosts(hosts: hosts)
-            }
-        }
-        .onChange(of: sessionMode) { mode in
-            if mode != netCfg.sessionMode {
-                alert = .updateSessionMode(mode: mode)
-            }
-        }
-        .onChange(of: proxyMode) { mode in
-            if mode != netCfg.smpProxyMode {
-                alert = .updateSMPProxyMode(proxyMode: mode)
-            }
-        }
-        .onChange(of: proxyFallback) { fallbackMode in
-            if fallbackMode != netCfg.smpProxyFallback {
-                alert = .updateSMPProxyFallback(proxyFallback: fallbackMode)
-            }
-        }
-        .alert(item: $alert) { a in
-            switch a {
-            case let .updateOnionHosts(hosts):
-                return Alert(
-                    title: Text("Update .onion hosts setting?"),
-                    message: Text(onionHostsInfo(hosts)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
-                    primaryButton: .default(Text("Ok")) {
-                        let (hostMode, requiredHostMode) = hosts.hostMode
-                        netCfg.hostMode = hostMode
-                        netCfg.requiredHostMode = requiredHostMode
-                        saveNetCfg()
-                    },
-                    secondaryButton: .cancel() {
-                        resetNetCfgView()
-                    }
-                )
-            case let .updateSessionMode(mode):
-                return Alert(
-                    title: Text("Update transport isolation mode?"),
-                    message: Text(sessionModeInfo(mode)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
-                    primaryButton: .default(Text("Ok")) {
-                        netCfg.sessionMode = mode
-                        saveNetCfg()
-                    },
-                    secondaryButton: .cancel() {
-                        resetNetCfgView()
-                    }
-                )
-            case let .updateSMPProxyMode(proxyMode):
-                return Alert(
-                    title: Text("Message routing mode"),
-                    message: Text(proxyModeInfo(proxyMode)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
-                    primaryButton: .default(Text("Ok")) {
-                        netCfg.smpProxyMode = proxyMode
-                        saveNetCfg()
-                    },
-                    secondaryButton: .cancel() {
-                        resetNetCfgView()
-                    }
-                )
-            case let .updateSMPProxyFallback(proxyFallback):
-                return Alert(
-                    title: Text("Message routing fallback"),
-                    message: Text(proxyFallbackInfo(proxyFallback)) + Text("\n") + Text("Updating this setting will re-connect the client to all servers."),
-                    primaryButton: .default(Text("Ok")) {
-                        netCfg.smpProxyFallback = proxyFallback
-                        saveNetCfg()
-                    },
-                    secondaryButton: .cancel() {
-                        resetNetCfgView()
-                    }
-                )
-            case let .error(err):
-                return Alert(
-                    title: Text("Error updating settings"),
-                    message: Text(err)
-                )
-            }
-        }
-    }
-
-    private func saveNetCfg() {
-        do {
-            let def = netCfg.hostMode == .onionHost ? NetCfg.proxyDefaults : NetCfg.defaults
-            netCfg.tcpConnectTimeout = def.tcpConnectTimeout
-            netCfg.tcpTimeout = def.tcpTimeout
-            try setNetworkConfig(netCfg)
-            currentNetCfg = netCfg
-            setNetCfg(netCfg)
-        } catch let error {
-            let err = responseError(error)
-            resetNetCfgView()
-            alert = .error(err: err)
-            logger.error("\(err)")
-        }
-    }
-
-    private func resetNetCfgView() {
-        netCfg = currentNetCfg
-        onionHosts = OnionHosts(netCfg: netCfg)
-        sessionMode = netCfg.sessionMode
-        proxyMode = netCfg.smpProxyMode
-        proxyFallback = netCfg.smpProxyFallback
-    }
-
-    private func onionHostsInfo(_ hosts: OnionHosts) -> LocalizedStringKey {
-        switch hosts {
-        case .no: return "Onion hosts will not be used."
-        case .prefer: return "Onion hosts will be used when available. Requires enabling VPN."
-        case .require: return "Onion hosts will be required for connection. Requires enabling VPN."
-        }
-    }
-
-    private func sessionModeInfo(_ mode: TransportSessionMode) -> LocalizedStringKey {
-        switch mode {
-        case .user: return "A separate TCP connection will be used **for each chat profile you have in the app**."
-        case .entity: return "A separate TCP connection will be used **for each contact and group member**.\n**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail."
-        }
-    }
-    
-    private func proxyModeInfo(_ mode: SMPProxyMode) -> LocalizedStringKey {
-        switch mode {
-        case .always: return "Always use private routing."
-        case .unknown: return "Use private routing with unknown servers."
-        case .unprotected: return "Use private routing with unknown servers when IP address is not protected."
-        case .never: return "Do NOT use private routing."
-        }
-    }
-
-    private func proxyFallbackInfo(_ proxyFallback: SMPProxyFallback) -> LocalizedStringKey {
-        switch proxyFallback {
-        case .allow: return "Send messages directly when your or destination server does not support private routing."
-        case .allowProtected: return "Send messages directly when IP address is protected and your or destination server does not support private routing."
-        case .prohibit: return "Do NOT send messages directly, even if your or destination server does not support private routing."
-        }
    }
 }

@@ -117,7 +117,7 @@ struct PrivacySettings: View {
                                privacyAcceptImagesGroupDefault.set($0)
                            }
                    }
-                    settingsRow("circle.rectangle.filled.pattern.diagonalline", color: theme.colors.secondary) {
+                    settingsRow("circle.filled.pattern.diagonalline.rectangle", color: theme.colors.secondary) {
                        Picker("Blur media", selection: $privacyMediaBlurRadius) {
                            let values = [0, 12, 24, 48] + ([0, 12, 24, 48].contains(privacyMediaBlurRadius) ? [] : [privacyMediaBlurRadius])
                            ForEach(values, id: \.self) { radius in
@@ -470,7 +470,7 @@ struct SimplexLockView: View {
            }
        }
        .onChange(of: performLA) { performLAToggle in
-            performLAGroupDefault.set(performLAToggle)
+            appLocalAuthEnabledGroupDefault.set(performLAToggle)
            prefLANoticeShown = true
            if performLAToggleReset {
                performLAToggleReset = false
@@ -130,7 +130,7 @@ struct ProtocolServersView: View {
                showSaveDialog = true
            }
        })
-        .confirmationDialog("Save servers?", isPresented: $showSaveDialog) {
+        .confirmationDialog("Save servers?", isPresented: $showSaveDialog, titleVisibility: .visible) {
            Button("Save") {
                saveServers()
                dismiss()
@@ -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_ONE_HAND_UI_CARD_SHOWN = "oneHandUICardShown"
+let DEFAULT_TOOLBAR_MATERIAL = "toolbarMaterial"
 let DEFAULT_CONNECT_VIA_LINK_TAB = "connectViaLinkTab"
 let DEFAULT_LIVE_MESSAGE_ALERT_SHOWN = "liveMessageAlertShown"
 let DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE = "showHiddenProfilesNotice"
@@ -61,6 +63,8 @@ let DEFAULT_DEVICE_NAME_FOR_REMOTE_ACCESS = "deviceNameForRemoteAccess"
 let DEFAULT_CONFIRM_REMOTE_SESSIONS = "confirmRemoteSessions"
 let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST = "connectRemoteViaMulticast"
 let DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO = "connectRemoteViaMulticastAuto"
+let DEFAULT_SHOW_DELETE_CONVERSATION_NOTICE = "showDeleteConversationNotice"
+let DEFAULT_SHOW_DELETE_CONTACT_NOTICE = "showDeleteContactNotice"
 let DEFAULT_SHOW_SENT_VIA_RPOXY = "showSentViaProxy"
 let DEFAULT_SHOW_SUBSCRIPTION_PERCENTAGE = "showSubscriptionPercentage"

@@ -94,6 +98,8 @@ let appDefaults: [String: Any] = [
    DEFAULT_DEVELOPER_TOOLS: false,
    DEFAULT_ENCRYPTION_STARTED: false,
    DEFAULT_PROFILE_IMAGE_CORNER_RADIUS: defaultProfileImageCorner,
+    DEFAULT_ONE_HAND_UI_CARD_SHOWN: false,
+    DEFAULT_TOOLBAR_MATERIAL: ToolbarMaterial.defaultMaterial,
    DEFAULT_CONNECT_VIA_LINK_TAB: ConnectViaLinkTab.scan.rawValue,
    DEFAULT_LIVE_MESSAGE_ALERT_SHOWN: false,
    DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE: true,
@@ -104,6 +110,8 @@ let appDefaults: [String: Any] = [
    DEFAULT_CONFIRM_REMOTE_SESSIONS: false,
    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST: true,
    DEFAULT_CONNECT_REMOTE_VIA_MULTICAST_AUTO: true,
+    DEFAULT_SHOW_DELETE_CONVERSATION_NOTICE: true,
+    DEFAULT_SHOW_DELETE_CONTACT_NOTICE: true,
    DEFAULT_SHOW_SENT_VIA_RPOXY: false,
    DEFAULT_SHOW_SUBSCRIPTION_PERCENTAGE: false,
    ANDROID_DEFAULT_CALL_ON_LOCK_SCREEN: AppSettingsLockScreenCalls.show.rawValue,
@@ -114,6 +122,18 @@ let appDefaults: [String: Any] = [
    DEFAULT_CURRENT_THEME_IDS: "{}"
 ]

+// only Bool defaults can be used here,
+// or hintDefaultsUnchanged and resetHintDefaults need to be changed
+let hintDefaults = [
+    DEFAULT_LA_NOTICE_SHOWN,
+    DEFAULT_ONE_HAND_UI_CARD_SHOWN,
+    DEFAULT_LIVE_MESSAGE_ALERT_SHOWN,
+    DEFAULT_SHOW_HIDDEN_PROFILES_NOTICE,
+    DEFAULT_SHOW_MUTE_PROFILE_ALERT,
+    DEFAULT_SHOW_DELETE_CONVERSATION_NOTICE,
+    DEFAULT_SHOW_DELETE_CONTACT_NOTICE
+]
+
 // not used anymore
 enum ConnectViaLinkTab: String {
    case scan
@@ -158,6 +178,9 @@ let onboardingStageDefault = EnumDefault<OnboardingStage>(defaults: UserDefaults

 let customDisappearingMessageTimeDefault = IntDefault(defaults: UserDefaults.standard, forKey: DEFAULT_CUSTOM_DISAPPEARING_MESSAGE_TIME)

+let showDeleteConversationNoticeDefault = BoolDefault(defaults: UserDefaults.standard, forKey: DEFAULT_SHOW_DELETE_CONVERSATION_NOTICE)
+let showDeleteContactNoticeDefault = BoolDefault(defaults: UserDefaults.standard, forKey: DEFAULT_SHOW_DELETE_CONTACT_NOTICE)
+
 let currentThemeDefault = StringDefault(defaults: UserDefaults.standard, forKey: DEFAULT_CURRENT_THEME, withDefault: DefaultTheme.SYSTEM_THEME_NAME)
 let systemDarkThemeDefault = StringDefault(defaults: UserDefaults.standard, forKey: DEFAULT_SYSTEM_DARK_THEME, withDefault: DefaultTheme.DARK.themeName)
 let currentThemeIdsDefault = CodableDefault<[String: String]>(defaults: UserDefaults.standard, forKey: DEFAULT_CURRENT_THEME_IDS, withDefault: [:] )
@@ -165,7 +188,7 @@ let themeOverridesDefault: CodableDefault<[ThemeOverrides]> = CodableDefault(def

 func setGroupDefaults() {
    privacyAcceptImagesGroupDefault.set(UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_ACCEPT_IMAGES))
-    performLAGroupDefault.set(UserDefaults.standard.bool(forKey: DEFAULT_PERFORM_LA))
+    appLocalAuthEnabledGroupDefault.set(UserDefaults.standard.bool(forKey: DEFAULT_PERFORM_LA))
    privacyLinkPreviewsGroupDefault.set(UserDefaults.standard.bool(forKey: DEFAULT_PRIVACY_LINK_PREVIEWS))
    profileImageCornerRadiusGroupDefault.set(UserDefaults.standard.double(forKey: DEFAULT_PROFILE_IMAGE_CORNER_RADIUS))
 }
@@ -39,7 +39,7 @@
      </trans-unit>
      <trans-unit id="!1 colored!" xml:space="preserve" approved="no">
        <source>!1 colored!</source>
-        <target state="translated">! 1 ملون!</target>
+        <target state="translated">! 1 مُلوَّن!</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="#secret#" xml:space="preserve" approved="no">
@@ -69,7 +69,7 @@
      </trans-unit>
      <trans-unit id="%@ is not verified" xml:space="preserve" approved="no">
        <source>%@ is not verified</source>
-        <target state="translated">%@ لم يتم التحقق منها</target>
+        <target state="translated">%@ لم يتم التحقق منه</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%@ is verified" xml:space="preserve" approved="no">
@@ -107,8 +107,9 @@
        <target state="translated">%d ثانية</target>
        <note>message ttl</note>
      </trans-unit>
-      <trans-unit id="%d skipped message(s)" xml:space="preserve">
+      <trans-unit id="%d skipped message(s)" xml:space="preserve" approved="no">
        <source>%d skipped message(s)</source>
+        <target state="translated">%d الرسائل المتخطية</target>
        <note>integrity error chat item</note>
      </trans-unit>
      <trans-unit id="%lld" xml:space="preserve" approved="no">
@@ -121,12 +122,14 @@
        <target state="needs-translation">%lld %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%lld contact(s) selected" xml:space="preserve">
+      <trans-unit id="%lld contact(s) selected" xml:space="preserve" approved="no">
        <source>%lld contact(s) selected</source>
+        <target state="translated">%lld تم اختيار جهات الاتصال</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%lld file(s) with total size of %@" xml:space="preserve">
+      <trans-unit id="%lld file(s) with total size of %@" xml:space="preserve" approved="no">
        <source>%lld file(s) with total size of %@</source>
+        <target state="translated">%lld الملفات ذات الحجم الإجمالي %@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%lld members" xml:space="preserve" approved="no">
@@ -134,8 +137,9 @@
        <target state="translated">%lld أعضاء</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="%lld second(s)" xml:space="preserve">
+      <trans-unit id="%lld second(s)" xml:space="preserve" approved="no">
        <source>%lld second(s)</source>
+        <target state="translated">%lld ثوانى</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="%lldd" xml:space="preserve" approved="no">
@@ -185,7 +189,7 @@
      </trans-unit>
      <trans-unit id="**Add new contact**: to create your one-time QR Code for your contact." xml:space="preserve" approved="no">
        <source>**Add new contact**: to create your one-time QR Code or link for your contact.</source>
-        <target state="translated">** إضافة جهة اتصال جديدة **: لإنشاء رمز QR لمرة واحدة أو رابط جهة الاتصال الخاصة بك.</target>
+        <target state="translated">** إضافة جهة اتصال جديدة **: لإنشاء رمز QR لمرة واحدة أو رابط جهة الاتصال الخاصة بكم.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**Create link / QR code** for your contact to use." xml:space="preserve" approved="no">
@@ -195,12 +199,12 @@
      </trans-unit>
      <trans-unit id="**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have." xml:space="preserve" approved="no">
        <source>**More private**: check new messages every 20 minutes. Device token is shared with SimpleX Chat server, but not how many contacts or messages you have.</source>
-        <target state="translated">** المزيد من الخصوصية **: تحقق من الرسائل الجديدة كل 20 دقيقة. تتم مشاركة رمز الجهاز مع خادم SimpleX Chat ، ولكن ليس عدد جهات الاتصال أو الرسائل لديك.</target>
+        <target state="translated">** المزيد من الخصوصية **: تحققوا من الرسائل الجديدة كل 20 دقيقة. تتم مشاركة رمز الجهاز مع خادم SimpleX Chat ، ولكن ليس عدد جهات الاتصال أو الرسائل لديكم.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**Most private**: do not use SimpleX Chat notifications server, check messages periodically in the background (depends on how often you use the app)." xml:space="preserve" approved="no">
        <source>**Most private**: do not use SimpleX Chat notifications server, check messages periodically in the background (depends on how often you use the app).</source>
-        <target state="translated">** الأكثر خصوصية **: لا تستخدم خادم إشعارات SimpleX Chat ، وتحقق من الرسائل بشكل دوري في الخلفية (يعتمد على عدد مرات استخدامك للتطبيق).</target>
+        <target state="translated">** الأكثر خصوصية **: لا تستخدم خادم إشعارات SimpleX Chat ، وتحقق من الرسائل بشكل دوري في الخلفية (يعتمد على عدد مرات استخدامكم للتطبيق).</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**Paste received link** or open it in the browser and tap **Open in mobile app**." xml:space="preserve" approved="no">
@@ -210,7 +214,7 @@
      </trans-unit>
      <trans-unit id="**Please note**: you will NOT be able to recover or change passphrase if you lose it." xml:space="preserve" approved="no">
        <source>**Please note**: you will NOT be able to recover or change passphrase if you lose it.</source>
-        <target state="translated">** يرجى ملاحظة **: لن تتمكن من استعادة أو تغيير عبارة المرور إذا فقدتها.</target>
+        <target state="translated">** يرجى ملاحظة **: لن تتمكنوا من استعادة أو تغيير عبارة المرور إذا فقدتموها.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="**Recommended**: device token and notifications are sent to SimpleX Chat notification server, but not the message content, size or who it is from." xml:space="preserve" approved="no">
@@ -305,7 +309,7 @@
      </trans-unit>
      <trans-unit id="A separate TCP connection will be used **for each chat profile you have in the app**." xml:space="preserve" approved="no">
        <source>A separate TCP connection will be used **for each chat profile you have in the app**.</source>
-        <target state="translated">سيتم استخدام اتصال TCP منفصل ** لكل ملف تعريف دردشة لديك في التطبيق **.</target>
+        <target state="translated">سيتم استخدام اتصال TCP منفصل ** لكل ملف تعريف دردشة لديكم في التطبيق **.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="A separate TCP connection will be used **for each contact and group member**.&#10;**Please note**: if you have many connections, your battery and traffic consumption can be substantially higher and some connections may fail." xml:space="preserve" approved="no">
@@ -355,24 +359,29 @@
        <source>Accept requests</source>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add preset servers" xml:space="preserve">
+      <trans-unit id="Add preset servers" xml:space="preserve" approved="no">
        <source>Add preset servers</source>
+        <target state="translated">إضافة خوادم محددة مسبقا</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add profile" xml:space="preserve">
+      <trans-unit id="Add profile" xml:space="preserve" approved="no">
        <source>Add profile</source>
+        <target state="translated">إضافة الملف الشخصي</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add servers by scanning QR codes." xml:space="preserve">
+      <trans-unit id="Add servers by scanning QR codes." xml:space="preserve" approved="no">
        <source>Add servers by scanning QR codes.</source>
+        <target state="translated">إضافة خوادم عن طريق مسح رموز QR.</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add server" xml:space="preserve">
+      <trans-unit id="Add server" xml:space="preserve" approved="no">
        <source>Add server</source>
+        <target state="translated">أضف الخادم</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
-      <trans-unit id="Add to another device" xml:space="preserve">
+      <trans-unit id="Add to another device" xml:space="preserve" approved="no">
        <source>Add to another device</source>
+        <target state="translated">أضف إلى جهاز آخر</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Admins can create the links to join groups." xml:space="preserve">
@@ -3667,7 +3676,7 @@ SimpleX servers cannot see your profile.</source>
      </trans-unit>
      <trans-unit id="## In reply to" xml:space="preserve" approved="no">
        <source>## In reply to</source>
-        <target state="translated">## ردًا على</target>
+        <target state="translated">## ردًّا على</target>
        <note>copied message info</note>
      </trans-unit>
      <trans-unit id="%@ and %@ connected" xml:space="preserve" approved="no">
@@ -3675,6 +3684,208 @@ SimpleX servers cannot see your profile.</source>
        <target state="translated">%@ و %@ متصل</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ downloaded" xml:space="preserve" approved="no">
+        <source>%@ downloaded</source>
+        <target state="translated">%@ تم التنزيل</target>
+      </trans-unit>
+      <trans-unit id="%@ and %@" xml:space="preserve" approved="no">
+        <source>%@ and %@</source>
+        <target state="translated">%@ و %@</target>
+      </trans-unit>
+      <trans-unit id="%@ connected" xml:space="preserve" approved="no">
+        <source>%@ connected</source>
+        <target state="translated">%@ متصل</target>
+      </trans-unit>
+      <trans-unit id="%lld minutes" xml:space="preserve" approved="no">
+        <source>%lld minutes</source>
+        <target state="translated">%lld دقائق</target>
+      </trans-unit>
+      <trans-unit id="%@, %@ and %lld members" xml:space="preserve" approved="no">
+        <source>%@, %@ and %lld members</source>
+        <target state="translated">%@, %@ و %lld أعضاء</target>
+      </trans-unit>
+      <trans-unit id="%d weeks" xml:space="preserve" approved="no">
+        <source>%d weeks</source>
+        <target state="translated">%d أسابيع</target>
+      </trans-unit>
+      <trans-unit id="%@ uploaded" xml:space="preserve" approved="no">
+        <source>%@ uploaded</source>
+        <target state="translated">%@ تم الرفع</target>
+      </trans-unit>
+      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve" approved="no">
+        <source>%@, %@ and %lld other members connected</source>
+        <target state="translated">%@, %@ و %lld أعضاء آخرين متصلين</target>
+      </trans-unit>
+      <trans-unit id="%lld seconds" xml:space="preserve" approved="no">
+        <source>%lld seconds</source>
+        <target state="translated">%lld ثواني</target>
+      </trans-unit>
+      <trans-unit id="%u messages failed to decrypt." xml:space="preserve" approved="no">
+        <source>%u messages failed to decrypt.</source>
+        <target state="translated">%u فشلت عملية فك تشفير الرسائل.</target>
+      </trans-unit>
+      <trans-unit id="%lld messages marked deleted" xml:space="preserve" approved="no">
+        <source>%lld messages marked deleted</source>
+        <target state="translated">%lld الرسائل معلمه بالحذف</target>
+      </trans-unit>
+      <trans-unit id="%lld messages moderated by %@" xml:space="preserve" approved="no">
+        <source>%lld messages moderated by %@</source>
+        <target state="translated">%lld رسائل تمت إدارتها بواسطة %@</target>
+      </trans-unit>
+      <trans-unit id="%lld new interface languages" xml:space="preserve" approved="no">
+        <source>%lld new interface languages</source>
+        <target state="translated">%lld لغات واجهة جديدة</target>
+      </trans-unit>
+      <trans-unit id="%lld group events" xml:space="preserve" approved="no">
+        <source>%lld group events</source>
+        <target state="translated">%lld أحداث المجموعة</target>
+      </trans-unit>
+      <trans-unit id="%lld messages blocked by admin" xml:space="preserve" approved="no">
+        <source>%lld messages blocked by admin</source>
+        <target state="translated">%lld رسائل محظورة بواسطه المسؤول</target>
+      </trans-unit>
+      <trans-unit id="%lld messages blocked" xml:space="preserve" approved="no">
+        <source>%lld messages blocked</source>
+        <target state="translated">%lld رسائل تم حظرها</target>
+      </trans-unit>
+      <trans-unit id="%u messages skipped." xml:space="preserve" approved="no">
+        <source>%u messages skipped.</source>
+        <target state="translated">%u تم تخطي الرسائل.</target>
+      </trans-unit>
+      <trans-unit id="**Add contact**: to create a new invitation link, or connect via a link you received." xml:space="preserve" approved="no">
+        <source>**Add contact**: to create a new invitation link, or connect via a link you received.</source>
+        <target state="translated">**إضافة جهة اتصال**: لإنشاء رابط دعوة جديد، أو الاتصال عبر الرابط الذي تلقيتوهم.</target>
+      </trans-unit>
+      <trans-unit id="**Create group**: to create a new group." xml:space="preserve" approved="no">
+        <source>**Create group**: to create a new group.</source>
+        <target state="translated">**إنشاء مجموعة**: لإنشاء مجموعة جديدة.</target>
+      </trans-unit>
+      <trans-unit id="(this device v%@)" xml:space="preserve" approved="no">
+        <source>(this device v%@)</source>
+        <target state="translated">(هذا الجهاز v%@)</target>
+      </trans-unit>
+      <trans-unit id="(new)" xml:space="preserve" approved="no">
+        <source>(new)</source>
+        <target state="translated">(جديد)</target>
+      </trans-unit>
+      <trans-unit id="**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection." xml:space="preserve" approved="no">
+        <source>**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection.</source>
+        <target state="translated">**يرجى الملاحظة**: سيؤدي استخدام نفس قاعدة البيانات على جهازين إلى كسر فك تشفير الرسائل من اتصالاتكم كحماية أمنية.</target>
+      </trans-unit>
+      <trans-unit id="A new random profile will be shared." xml:space="preserve" approved="no">
+        <source>A new random profile will be shared.</source>
+        <target state="translated">سيتم مشاركة ملف تعريفي عشوائي جديد.</target>
+      </trans-unit>
+      <trans-unit id="30 seconds" xml:space="preserve" approved="no">
+        <source>30 seconds</source>
+        <target state="translated">30 ثانيه</target>
+      </trans-unit>
+      <trans-unit id="- more stable message delivery.&#10;- a bit better groups.&#10;- and more!" xml:space="preserve" approved="no">
+        <source>- more stable message delivery.
+- a bit better groups.
+- and more!</source>
+        <target state="translated">- تسليم رسائل أكثر استقرارًا.
+- مجموعات أفضل قليلاً.
+- والمزيد!</target>
+      </trans-unit>
+      <trans-unit id="0 sec" xml:space="preserve" approved="no">
+        <source>0 sec</source>
+        <target state="translated">0 ثانيه</target>
+      </trans-unit>
+      <trans-unit id="1 minute" xml:space="preserve" approved="no">
+        <source>1 minute</source>
+        <target state="translated">1 دقيقة</target>
+      </trans-unit>
+      <trans-unit id="5 minutes" xml:space="preserve" approved="no">
+        <source>5 minutes</source>
+        <target state="translated">5 دقائق</target>
+      </trans-unit>
+      <trans-unit id="&lt;p&gt;Hi!&lt;/p&gt;&#10;&lt;p&gt;&lt;a href=&quot;%@&quot;&gt;Connect to me via SimpleX Chat&lt;/a&gt;&lt;/p&gt;" xml:space="preserve" approved="no">
+        <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 state="translated">&lt;p&gt;مرحبا!&lt;/p&gt;
+&lt;p&gt;&lt;a href="%@"&gt;أتصل بى من خلال SimpleX Chat&lt;/a&gt;&lt;/p&gt;</target>
+      </trans-unit>
+      <trans-unit id="0s" xml:space="preserve" approved="no">
+        <source>0s</source>
+        <target state="translated">0 ث</target>
+      </trans-unit>
+      <trans-unit id="A few more things" xml:space="preserve" approved="no">
+        <source>A few more things</source>
+        <target state="translated">بعض الأشياء الأخرى</target>
+      </trans-unit>
+      <trans-unit id="- connect to [directory service](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!&#10;- delivery receipts (up to 20 members).&#10;- faster and more stable." xml:space="preserve" approved="no">
+        <source>- connect to [directory service](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!
+- delivery receipts (up to 20 members).
+- faster and more stable.</source>
+        <target state="translated">- أتصل بـ [directory service](simplex:/contact#/?v=1-4&amp;smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FeXSPwqTkKyDO3px4fLf1wx3MvPdjdLW3%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEAaiv6MkMH44L2TcYrt_CsX3ZvM11WgbMEUn0hkIKTOho%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion) (BETA)!
+- delivery receipts (up to 20 members).
+- أسرع و أكثر اسْتِقْرارًا.</target>
+      </trans-unit>
+      <trans-unit id="**Warning**: the archive will be removed." xml:space="preserve" approved="no">
+        <source>**Warning**: the archive will be removed.</source>
+        <target state="translated">**تحذير**: سيتم إزالة الأرشيف.</target>
+      </trans-unit>
+      <trans-unit id="- optionally notify deleted contacts.&#10;- profile names with spaces.&#10;- and more!" xml:space="preserve" approved="no">
+        <source>- optionally notify deleted contacts.
+- profile names with spaces.
+- and more!</source>
+        <target state="translated">- إخطار جهات الاتصال المحذوفة بشكل اختياري.
+- أسماء الملفات الشخصية مع المسافات.
+- والمزيد!</target>
+      </trans-unit>
+      <trans-unit id="- voice messages up to 5 minutes.&#10;- custom time to disappear.&#10;- editing history." xml:space="preserve" approved="no">
+        <source>- voice messages up to 5 minutes.
+- custom time to disappear.
+- editing history.</source>
+        <target state="translated">- رسائل صوتية تصل مدتها إلى 5 دقائق.
+- وقت مخصص للاختفاء.
+- تعديل السجل.</target>
+      </trans-unit>
+      <trans-unit id="Add welcome message" xml:space="preserve" approved="no">
+        <source>Add welcome message</source>
+        <target state="translated">إضافة رسالة ترحيب</target>
+      </trans-unit>
+      <trans-unit id="Abort changing address?" xml:space="preserve" approved="no">
+        <source>Abort changing address?</source>
+        <target state="translated">هل تريد إلغاء تغيير العنوان؟</target>
+      </trans-unit>
+      <trans-unit id="Add contact" xml:space="preserve" approved="no">
+        <source>Add contact</source>
+        <target state="translated">إضافة جهة اتصال</target>
+      </trans-unit>
+      <trans-unit id="Abort" xml:space="preserve" approved="no">
+        <source>Abort</source>
+        <target state="translated">إحباط</target>
+      </trans-unit>
+      <trans-unit id="About SimpleX address" xml:space="preserve" approved="no">
+        <source>About SimpleX address</source>
+        <target state="translated">حول عنوان SimpleX</target>
+      </trans-unit>
+      <trans-unit id="Accept connection request?" xml:space="preserve" approved="no">
+        <source>Accept connection request?</source>
+        <target state="translated">قبول طلب الاتصال؟</target>
+      </trans-unit>
+      <trans-unit id="Acknowledged" xml:space="preserve" approved="no">
+        <source>Acknowledged</source>
+        <target state="translated">معترف به</target>
+      </trans-unit>
+      <trans-unit id="Acknowledgement errors" xml:space="preserve" approved="no">
+        <source>Acknowledgement errors</source>
+        <target state="translated">أخطاء الإقرار</target>
+      </trans-unit>
+      <trans-unit id="Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts." xml:space="preserve" approved="no">
+        <source>Add address to your profile, so that your contacts can share it with other people. Profile update will be sent to your contacts.</source>
+        <target state="translated">أضف عنوانًا إلى ملفكم الشخصي، حتى تتمكن جهات الاتصال الخاصة بكم من مشاركته مع أشخاص اخرين. سيتم إرسال تحديث الملف الشخصي إلى جهات الاتصال الخاصة بكم.</target>
+      </trans-unit>
+      <trans-unit id="Abort changing address" xml:space="preserve" approved="no">
+        <source>Abort changing address</source>
+        <target state="translated">إحباط تغيير العنوان</target>
+      </trans-unit>
+      <trans-unit id="Active connections" xml:space="preserve" approved="no">
+        <source>Active connections</source>
+        <target state="translated">اتصالات نشطة</target>
+      </trans-unit>
    </body>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="ar" datatype="plaintext">
@@ -5316,6 +5316,278 @@ SimpleX servers cannot see your profile.</source>
        <target state="translated">%@ ו-%@</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="Connect automatically" xml:space="preserve" approved="no">
+        <source>Connect automatically</source>
+        <target state="translated">התבר אוטומטי</target>
+      </trans-unit>
+      <trans-unit id="Create profile" xml:space="preserve" approved="no">
+        <source>Create profile</source>
+        <target state="translated">צור פרופיל</target>
+      </trans-unit>
+      <trans-unit id="Created at: %@" xml:space="preserve" approved="no">
+        <source>Created at: %@</source>
+        <target state="translated">נוצר ב:%@</target>
+      </trans-unit>
+      <trans-unit id="Desktop devices" xml:space="preserve" approved="no">
+        <source>Desktop devices</source>
+        <target state="translated">מכשירי מחשב</target>
+      </trans-unit>
+      <trans-unit id="Discover via local network" xml:space="preserve" approved="no">
+        <source>Discover via local network</source>
+        <target state="translated">גלה באמצעות הרשת המקומית</target>
+      </trans-unit>
+      <trans-unit id="Forward" xml:space="preserve" approved="no">
+        <source>Forward</source>
+        <target state="translated">העבר</target>
+      </trans-unit>
+      <trans-unit id="Group already exists" xml:space="preserve" approved="no">
+        <source>Group already exists</source>
+        <target state="translated">קבוצה כבר קיימת</target>
+      </trans-unit>
+      <trans-unit id="Connected to desktop" xml:space="preserve" approved="no">
+        <source>Connected to desktop</source>
+        <target state="translated">מחובר למחשב</target>
+      </trans-unit>
+      <trans-unit id="Group already exists!" xml:space="preserve" approved="no">
+        <source>Group already exists!</source>
+        <target state="translated">קבוצה כבר קיימת!</target>
+      </trans-unit>
+      <trans-unit id="Confirm upload" xml:space="preserve" approved="no">
+        <source>Confirm upload</source>
+        <target state="translated">אשר ההעלאה</target>
+      </trans-unit>
+      <trans-unit id="Block for all" xml:space="preserve" approved="no">
+        <source>Block for all</source>
+        <target state="translated">חסום לכולם</target>
+      </trans-unit>
+      <trans-unit id="Blocked by admin" xml:space="preserve" approved="no">
+        <source>Blocked by admin</source>
+        <target state="translated">נחסם ע"י מנהל</target>
+      </trans-unit>
+      <trans-unit id="Block member for all?" xml:space="preserve" approved="no">
+        <source>Block member for all?</source>
+        <target state="translated">לחסום את החבר לכולם?</target>
+      </trans-unit>
+      <trans-unit id="Camera not available" xml:space="preserve" approved="no">
+        <source>Camera not available</source>
+        <target state="translated">מצלמה לא זמינה</target>
+      </trans-unit>
+      <trans-unit id="Connect to desktop" xml:space="preserve" approved="no">
+        <source>Connect to desktop</source>
+        <target state="translated">חבר למחשב</target>
+      </trans-unit>
+      <trans-unit id="Created at" xml:space="preserve" approved="no">
+        <source>Created at</source>
+        <target state="translated">נוצר ב</target>
+      </trans-unit>
+      <trans-unit id="(new)" xml:space="preserve" approved="no">
+        <source>(new)</source>
+        <target state="translated">(חדש)</target>
+      </trans-unit>
+      <trans-unit id="Block member" xml:space="preserve" approved="no">
+        <source>Block member</source>
+        <target state="translated">חבר חסום</target>
+      </trans-unit>
+      <trans-unit id="Block member?" xml:space="preserve" approved="no">
+        <source>Block member?</source>
+        <target state="translated">לחסום חבר?</target>
+      </trans-unit>
+      <trans-unit id="Creating link…" xml:space="preserve" approved="no">
+        <source>Creating link…</source>
+        <target state="translated">יוצר קישור…</target>
+      </trans-unit>
+      <trans-unit id="Files" xml:space="preserve" approved="no">
+        <source>Files</source>
+        <target state="translated">קבצים</target>
+      </trans-unit>
+      <trans-unit id="Disabled" xml:space="preserve" approved="no">
+        <source>Disabled</source>
+        <target state="translated">מושבת</target>
+      </trans-unit>
+      <trans-unit id="Enter passphrase" xml:space="preserve" approved="no">
+        <source>Enter passphrase</source>
+        <target state="translated">הכנס סיסמא</target>
+      </trans-unit>
+      <trans-unit id="Apply" xml:space="preserve" approved="no">
+        <source>Apply</source>
+        <target state="translated">החל</target>
+      </trans-unit>
+      <trans-unit id="Apply to" xml:space="preserve" approved="no">
+        <source>Apply to</source>
+        <target state="translated">החל ל</target>
+      </trans-unit>
+      <trans-unit id="Background" xml:space="preserve" approved="no">
+        <source>Background</source>
+        <target state="translated">ברקע</target>
+      </trans-unit>
+      <trans-unit id="Black" xml:space="preserve" approved="no">
+        <source>Black</source>
+        <target state="translated">שחור</target>
+      </trans-unit>
+      <trans-unit id="Blur media" xml:space="preserve" approved="no">
+        <source>Blur media</source>
+        <target state="translated">טשטש מדיה</target>
+      </trans-unit>
+      <trans-unit id="Chat theme" xml:space="preserve" approved="no">
+        <source>Chat theme</source>
+        <target state="translated">צבע ערכת נושא</target>
+      </trans-unit>
+      <trans-unit id="Completed" xml:space="preserve" approved="no">
+        <source>Completed</source>
+        <target state="translated">הושלם</target>
+      </trans-unit>
+      <trans-unit id="Connected" xml:space="preserve" approved="no">
+        <source>Connected</source>
+        <target state="translated">מחובר</target>
+      </trans-unit>
+      <trans-unit id="Connection notifications" xml:space="preserve" approved="no">
+        <source>Connection notifications</source>
+        <target state="translated">התראות חיבור</target>
+      </trans-unit>
+      <trans-unit id="Connections" xml:space="preserve" approved="no">
+        <source>Connections</source>
+        <target state="translated">חיבורים</target>
+      </trans-unit>
+      <trans-unit id="Current profile" xml:space="preserve" approved="no">
+        <source>Current profile</source>
+        <target state="translated">פרופיל נוכחי</target>
+      </trans-unit>
+      <trans-unit id="Disconnect desktop?" xml:space="preserve" approved="no">
+        <source>Disconnect desktop?</source>
+        <target state="translated">להתנתק מהמחשב?</target>
+      </trans-unit>
+      <trans-unit id="Discover and join groups" xml:space="preserve" approved="no">
+        <source>Discover and join groups</source>
+        <target state="translated">גלה והצטרף לקבוצות</target>
+      </trans-unit>
+      <trans-unit id="Enabled" xml:space="preserve" approved="no">
+        <source>Enabled</source>
+        <target state="translated">מופעל</target>
+      </trans-unit>
+      <trans-unit id="Error opening chat" xml:space="preserve" approved="no">
+        <source>Error opening chat</source>
+        <target state="translated">שגיאה בפתיחת הצ'אט</target>
+      </trans-unit>
+      <trans-unit id="Good morning!" xml:space="preserve" approved="no">
+        <source>Good morning!</source>
+        <target state="translated">בוקר טוב!</target>
+      </trans-unit>
+      <trans-unit id="Connect to yourself?&#10;This is your own SimpleX address!" xml:space="preserve" approved="no">
+        <source>Connect to yourself?
+This is your own SimpleX address!</source>
+        <target state="translated">להתחבר אליך?
+זו כתובת הSimpleX שלך!</target>
+      </trans-unit>
+      <trans-unit id="Connect to yourself?" xml:space="preserve" approved="no">
+        <source>Connect to yourself?</source>
+        <target state="translated">להתחבר אליך?</target>
+      </trans-unit>
+      <trans-unit id="Connect to yourself?&#10;This is your own one-time link!" xml:space="preserve" approved="no">
+        <source>Connect to yourself?
+This is your own one-time link!</source>
+        <target state="translated">להתחבר אליך?
+זו כתובת ההזמנה החד-פעמי שלך!</target>
+      </trans-unit>
+      <trans-unit id="Connected desktop" xml:space="preserve" approved="no">
+        <source>Connected desktop</source>
+        <target state="translated">מחשב מחובר</target>
+      </trans-unit>
+      <trans-unit id="Connected servers" xml:space="preserve" approved="no">
+        <source>Connected servers</source>
+        <target state="translated">שרתים מחוברים</target>
+      </trans-unit>
+      <trans-unit id="Enter group name…" xml:space="preserve" approved="no">
+        <source>Enter group name…</source>
+        <target state="translated">הכנס שם לקבוצה…</target>
+      </trans-unit>
+      <trans-unit id="Enter this device name…" xml:space="preserve" approved="no">
+        <source>Enter this device name…</source>
+        <target state="translated">הכנס שם למכשיר הזה…</target>
+      </trans-unit>
+      <trans-unit id="Enter your name…" xml:space="preserve" approved="no">
+        <source>Enter your name…</source>
+        <target state="translated">הכנס את השם שלך…</target>
+      </trans-unit>
+      <trans-unit id="Error decrypting file" xml:space="preserve" approved="no">
+        <source>Error decrypting file</source>
+        <target state="translated">שגיאה בפענוח הקובץ</target>
+      </trans-unit>
+      <trans-unit id="Errors" xml:space="preserve" approved="no">
+        <source>Errors</source>
+        <target state="translated">שגיאות</target>
+      </trans-unit>
+      <trans-unit id="File status" xml:space="preserve" approved="no">
+        <source>File status</source>
+        <target state="translated">מצב הקובץ</target>
+      </trans-unit>
+      <trans-unit id="Connecting" xml:space="preserve" approved="no">
+        <source>Connecting</source>
+        <target state="translated">מתחבר</target>
+      </trans-unit>
+      <trans-unit id="Connecting to desktop" xml:space="preserve" approved="no">
+        <source>Connecting to desktop</source>
+        <target state="translated">מתחבר למחשב</target>
+      </trans-unit>
+      <trans-unit id="Deleted" xml:space="preserve" approved="no">
+        <source>Deleted</source>
+        <target state="translated">נמחק</target>
+      </trans-unit>
+      <trans-unit id="Deletion errors" xml:space="preserve" approved="no">
+        <source>Deletion errors</source>
+        <target state="translated">שגיאות במחיקה</target>
+      </trans-unit>
+      <trans-unit id="Details" xml:space="preserve" approved="no">
+        <source>Details</source>
+        <target state="translated">פרטים</target>
+      </trans-unit>
+      <trans-unit id="Forwarded" xml:space="preserve" approved="no">
+        <source>Forwarded</source>
+        <target state="translated">הועבר</target>
+      </trans-unit>
+      <trans-unit id="Found desktop" xml:space="preserve" approved="no">
+        <source>Found desktop</source>
+        <target state="translated">נמצא מחשב</target>
+      </trans-unit>
+      <trans-unit id="Good afternoon!" xml:space="preserve" approved="no">
+        <source>Good afternoon!</source>
+        <target state="translated">אחר צהריים טובים!</target>
+      </trans-unit>
+      <trans-unit id="Desktop address" xml:space="preserve" approved="no">
+        <source>Desktop address</source>
+        <target state="translated">כתובת מחשב</target>
+      </trans-unit>
+      <trans-unit id="Forwarded from" xml:space="preserve" approved="no">
+        <source>Forwarded from</source>
+        <target state="translated">הועבר מ</target>
+      </trans-unit>
+      <trans-unit id="History is not sent to new members." xml:space="preserve" approved="no">
+        <source>History is not sent to new members.</source>
+        <target state="translated">היסטוריה לא נשלחת לחברים חדשים.</target>
+      </trans-unit>
+      <trans-unit id="Created" xml:space="preserve" approved="no">
+        <source>Created</source>
+        <target state="translated">נוצר</target>
+      </trans-unit>
+      <trans-unit id="Copy error" xml:space="preserve" approved="no">
+        <source>Copy error</source>
+        <target state="translated">שגיאת העתקה</target>
+      </trans-unit>
+      <trans-unit id="Create group" xml:space="preserve" approved="no">
+        <source>Create group</source>
+        <target state="translated">צור קבוצה</target>
+      </trans-unit>
+      <trans-unit id="Enabled for" xml:space="preserve" approved="no">
+        <source>Enabled for</source>
+        <target state="translated">מופעל עבור</target>
+      </trans-unit>
+      <trans-unit id="Error creating message" xml:space="preserve" approved="no">
+        <source>Error creating message</source>
+        <target state="translated">שגיאה ביצירת הודעה</target>
+      </trans-unit>
+      <trans-unit id="File error" xml:space="preserve" approved="no">
+        <source>File error</source>
+        <target state="translated">שגיאה בקובץ</target>
+      </trans-unit>
    </body>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="he" datatype="plaintext">
@@ -5234,6 +5234,274 @@ Isso pode acontecer por causa de algum bug ou quando a conexão está comprometi
        <target state="translated">%1$@ em %2$@:</target>
        <note>copied message info, &lt;sender&gt; at &lt;time&gt;</note>
      </trans-unit>
+      <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">Permitir que seus contatos deletem mensagens enviadas de maneira irreversível. (24 horas)</target>
+      </trans-unit>
+      <trans-unit id="%@ downloaded" xml:space="preserve" approved="no">
+        <source>%@ downloaded</source>
+        <target state="translated">baixado</target>
+      </trans-unit>
+      <trans-unit id="%@ uploaded" xml:space="preserve" approved="no">
+        <source>%@ uploaded</source>
+        <target state="translated">transferido</target>
+      </trans-unit>
+      <trans-unit id="A new random profile will be shared." xml:space="preserve" approved="no">
+        <source>A new random profile will be shared.</source>
+        <target state="translated">Um novo perfil aleatório será compartilhado.</target>
+      </trans-unit>
+      <trans-unit id="Camera not available" xml:space="preserve" approved="no">
+        <source>Camera not available</source>
+        <target state="translated">Câmera indisponível</target>
+      </trans-unit>
+      <trans-unit id="Admins can block a member for all." xml:space="preserve" approved="no">
+        <source>Admins can block a member for all.</source>
+        <target state="translated">Administradores podem bloquear um membro para todos.</target>
+      </trans-unit>
+      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Allow to irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">Permitir que mensagens enviadas sejam deletadas de maneira irreversível. (24 horas)</target>
+      </trans-unit>
+      <trans-unit id="Apply" xml:space="preserve" approved="no">
+        <source>Apply</source>
+        <target state="translated">Aplicar</target>
+      </trans-unit>
+      <trans-unit id="Accent" xml:space="preserve" approved="no">
+        <source>Accent</source>
+        <target state="translated">Esquema</target>
+      </trans-unit>
+      <trans-unit id="Accept connection request?" xml:space="preserve" approved="no">
+        <source>Accept connection request?</source>
+        <target state="translated">Aceitar solicitação de conexão?</target>
+      </trans-unit>
+      <trans-unit id="Active connections" xml:space="preserve" approved="no">
+        <source>Active connections</source>
+        <target state="translated">Conexões ativas</target>
+      </trans-unit>
+      <trans-unit id="Add contact" xml:space="preserve" approved="no">
+        <source>Add contact</source>
+        <target state="translated">Adicionar contato</target>
+      </trans-unit>
+      <trans-unit id="Additional accent" xml:space="preserve" approved="no">
+        <source>Additional accent</source>
+        <target state="translated">Esquema adicional</target>
+      </trans-unit>
+      <trans-unit id="All new messages from %@ will be hidden!" xml:space="preserve" approved="no">
+        <source>All new messages from %@ will be hidden!</source>
+        <target state="translated">Todas as novas mensagens de %@ serão ocultas!</target>
+      </trans-unit>
+      <trans-unit id="All profiles" xml:space="preserve" approved="no">
+        <source>All profiles</source>
+        <target state="translated">Todos perfis</target>
+      </trans-unit>
+      <trans-unit id="Allow calls?" xml:space="preserve" approved="no">
+        <source>Allow calls?</source>
+        <target state="translated">Permitir chamadas?</target>
+      </trans-unit>
+      <trans-unit id="Archive contacts to chat later." xml:space="preserve" approved="no">
+        <source>Archive contacts to chat later.</source>
+        <target state="translated">Arquivar contatos para conversar depois.</target>
+      </trans-unit>
+      <trans-unit id="Blur media" xml:space="preserve" approved="no">
+        <source>Blur media</source>
+        <target state="translated">Censurar mídia</target>
+      </trans-unit>
+      <trans-unit id="Calls prohibited!" xml:space="preserve" approved="no">
+        <source>Calls prohibited!</source>
+        <target state="translated">Chamadas proibidas!</target>
+      </trans-unit>
+      <trans-unit id="Can't call contact" xml:space="preserve" approved="no">
+        <source>Can't call contact</source>
+        <target state="translated">Não foi possível ligar para o contato</target>
+      </trans-unit>
+      <trans-unit id="%lld messages marked deleted" xml:space="preserve" approved="no">
+        <source>%lld messages marked deleted</source>
+        <target state="translated">mensagens deletadas</target>
+      </trans-unit>
+      <trans-unit id="0 sec" xml:space="preserve" approved="no">
+        <source>0 sec</source>
+        <target state="translated">0 seg</target>
+      </trans-unit>
+      <trans-unit id="%lld messages blocked" xml:space="preserve" approved="no">
+        <source>%lld messages blocked</source>
+        <target state="translated">mensagens bloqueadas</target>
+      </trans-unit>
+      <trans-unit id="%lld messages blocked by admin" xml:space="preserve" approved="no">
+        <source>%lld messages blocked by admin</source>
+        <target state="translated">mensagens bloqueadas pelo administrador</target>
+      </trans-unit>
+      <trans-unit id="**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection." xml:space="preserve" approved="no">
+        <source>**Please note**: using the same database on two devices will break the decryption of messages from your connections, as a security protection.</source>
+        <target state="translated">**Nota**: usar o mesmo banco de dados em dois dispositivos irá quebrar a desencriptação das mensagens de suas conexões como uma medida de segurança.</target>
+      </trans-unit>
+      <trans-unit id="- more stable message delivery.&#10;- a bit better groups.&#10;- and more!" xml:space="preserve" approved="no">
+        <source>- more stable message delivery.
+- a bit better groups.
+- and more!</source>
+        <target state="translated">- entrega de mensagens mais estável.
+- grupos melhorados.
+- e muito mais!</target>
+      </trans-unit>
+      <trans-unit id="All messages will be deleted - this cannot be undone!" xml:space="preserve" approved="no">
+        <source>All messages will be deleted - this cannot be undone!</source>
+        <target state="translated">Todas as mensagens serão deletadas - isto não pode ser desfeito!</target>
+      </trans-unit>
+      <trans-unit id="Allow to send files and media." xml:space="preserve" approved="no">
+        <source>Allow to send files and media.</source>
+        <target state="translated">Permitir o envio de arquivos e mídia.</target>
+      </trans-unit>
+      <trans-unit id="Allow to send SimpleX links." xml:space="preserve" approved="no">
+        <source>Allow to send SimpleX links.</source>
+        <target state="translated">Permitir envio de links SimpleX.</target>
+      </trans-unit>
+      <trans-unit id="Block for all" xml:space="preserve" approved="no">
+        <source>Block for all</source>
+        <target state="translated">Bloquear para todos</target>
+      </trans-unit>
+      <trans-unit id="Block member" xml:space="preserve" approved="no">
+        <source>Block member</source>
+        <target state="translated">Bloquear membro</target>
+      </trans-unit>
+      <trans-unit id="Blocked by admin" xml:space="preserve" approved="no">
+        <source>Blocked by admin</source>
+        <target state="translated">Bloqueado por um administrador</target>
+      </trans-unit>
+      <trans-unit id="Block group members" xml:space="preserve" approved="no">
+        <source>Block group members</source>
+        <target state="translated">Bloquear membros de grupo</target>
+      </trans-unit>
+      <trans-unit id="Block member for all?" xml:space="preserve" approved="no">
+        <source>Block member for all?</source>
+        <target state="translated">Bloquear membro para todos?</target>
+      </trans-unit>
+      <trans-unit id="Block member?" xml:space="preserve" approved="no">
+        <source>Block member?</source>
+        <target state="translated">Bloquear membro?</target>
+      </trans-unit>
+      <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">Você e seu contato podem apagar mensagens enviadas de maneira irreversível. (24 horas)</target>
+      </trans-unit>
+      <trans-unit id="Can't call member" xml:space="preserve" approved="no">
+        <source>Can't call member</source>
+        <target state="translated">Não foi possível ligar para este membro</target>
+      </trans-unit>
+      <trans-unit id="Can't message member" xml:space="preserve" approved="no">
+        <source>Can't message member</source>
+        <target state="translated">Não foi possível enviar mensagem para este membro</target>
+      </trans-unit>
+      <trans-unit id="Cancel migration" xml:space="preserve" approved="no">
+        <source>Cancel migration</source>
+        <target state="translated">Cancelar migração</target>
+      </trans-unit>
+      <trans-unit id="Abort" xml:space="preserve" approved="no">
+        <source>Abort</source>
+        <target state="translated">Abortar</target>
+      </trans-unit>
+      <trans-unit id="Abort changing address" xml:space="preserve" approved="no">
+        <source>Abort changing address</source>
+        <target state="translated">Abortar troca de endereço</target>
+      </trans-unit>
+      <trans-unit id="Abort changing address?" xml:space="preserve" approved="no">
+        <source>Abort changing address?</source>
+        <target state="translated">Abortar troca de endereço?</target>
+      </trans-unit>
+      <trans-unit id="- optionally notify deleted contacts.&#10;- profile names with spaces.&#10;- and more!" xml:space="preserve" approved="no">
+        <source>- optionally notify deleted contacts.
+- profile names with spaces.
+- and more!</source>
+        <target state="translated">- notificar contatos apagados de maneira opcional.
+- nome de perfil com espaços.
+- e muito mais!</target>
+      </trans-unit>
+      <trans-unit id="Allow sharing" xml:space="preserve" approved="no">
+        <source>Allow sharing</source>
+        <target state="translated">Permitir compartilhamento</target>
+      </trans-unit>
+      <trans-unit id="Block" xml:space="preserve" approved="no">
+        <source>Block</source>
+        <target state="translated">Bloquear</target>
+      </trans-unit>
+      <trans-unit id="Additional accent 2" xml:space="preserve" approved="no">
+        <source>Additional accent 2</source>
+        <target state="translated">Esquema adicional 2</target>
+      </trans-unit>
+      <trans-unit id="Address change will be aborted. Old receiving address will be used." xml:space="preserve" approved="no">
+        <source>Address change will be aborted. Old receiving address will be used.</source>
+        <target state="translated">Alteração de endereço será abortada. O endereço antigo será utilizado.</target>
+      </trans-unit>
+      <trans-unit id="Advanced settings" xml:space="preserve" approved="no">
+        <source>Advanced settings</source>
+        <target state="translated">Configurações avançadas</target>
+      </trans-unit>
+      <trans-unit id="All data is private to your device." xml:space="preserve" approved="no">
+        <source>All data is private to your device.</source>
+        <target state="translated">Toda informação é privada em seu dispositivo.</target>
+      </trans-unit>
+      <trans-unit id="All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." xml:space="preserve" approved="no">
+        <source>All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.</source>
+        <target state="translated">Todos os seus contatos, conversas e arquivos serão encriptados e enviados em pedaços para nós XFTP.</target>
+      </trans-unit>
+      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve" approved="no">
+        <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
+        <target state="translated">Permitir deletar mensagens de maneira irreversível apenas se seu contato permitir para você. (24 horas)</target>
+      </trans-unit>
+      <trans-unit id="Already connecting!" xml:space="preserve" approved="no">
+        <source>Already connecting!</source>
+        <target state="translated">Já está conectando!</target>
+      </trans-unit>
+      <trans-unit id="Already joining the group!" xml:space="preserve" approved="no">
+        <source>Already joining the group!</source>
+        <target state="translated">Já está entrando no grupo!</target>
+      </trans-unit>
+      <trans-unit id="Always use private routing." xml:space="preserve" approved="no">
+        <source>Always use private routing.</source>
+        <target state="translated">Sempre use rotas privadas.</target>
+      </trans-unit>
+      <trans-unit id="Apply to" xml:space="preserve" approved="no">
+        <source>Apply to</source>
+        <target state="translated">Aplicar em</target>
+      </trans-unit>
+      <trans-unit id="Archiving database" xml:space="preserve" approved="no">
+        <source>Archiving database</source>
+        <target state="translated">Arquivando banco de dados</target>
+      </trans-unit>
+      <trans-unit id="Black" xml:space="preserve" approved="no">
+        <source>Black</source>
+        <target state="translated">Preto</target>
+      </trans-unit>
+      <trans-unit id="Cannot forward message" xml:space="preserve" approved="no">
+        <source>Cannot forward message</source>
+        <target state="translated">Não é possível encaminhar mensagem</target>
+      </trans-unit>
+      <trans-unit id="(new)" xml:space="preserve" approved="no">
+        <source>(new)</source>
+        <target state="translated">(novo)</target>
+      </trans-unit>
+      <trans-unit id="(this device v%@)" xml:space="preserve" approved="no">
+        <source>(this device v%@)</source>
+        <target state="translated">este dispositivo</target>
+      </trans-unit>
+      <trans-unit id="**Add contact**: to create a new invitation link, or connect via a link you received." xml:space="preserve" approved="no">
+        <source>**Add contact**: to create a new invitation link, or connect via a link you received.</source>
+        <target state="translated">**Adicionar contato**: criar um novo link de convite ou conectar via um link que você recebeu.</target>
+      </trans-unit>
+      <trans-unit id="**Create group**: to create a new group." xml:space="preserve" approved="no">
+        <source>**Create group**: to create a new group.</source>
+        <target state="translated">**Criar grupo**: criar um novo grupo.</target>
+      </trans-unit>
+      <trans-unit id="**Warning**: the archive will be removed." xml:space="preserve" approved="no">
+        <source>**Warning**: the archive will be removed.</source>
+        <target state="translated">**Aviso**: o arquivo será removido.</target>
+      </trans-unit>
+      <trans-unit id="A few more things" xml:space="preserve" approved="no">
+        <source>A few more things</source>
+        <target state="translated">E mais algumas coisas</target>
+      </trans-unit>
+      <trans-unit id="Archived contacts" xml:space="preserve" approved="no">
+        <source>Archived contacts</source>
+        <target state="translated">Contatos arquivados</target>
+      </trans-unit>
    </body>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="pt-BR" datatype="plaintext">
@@ -314,7 +314,7 @@
      </trans-unit>
      <trans-unit id="About SimpleX Chat" xml:space="preserve" approved="no">
        <source>About SimpleX Chat</source>
-        <target state="translated">關於 SimpleX 對話</target>
+        <target state="translated">關於 SimpleX Chat</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Accent color" xml:space="preserve" approved="no">
@@ -445,7 +445,7 @@
      </trans-unit>
      <trans-unit id="Allow your contacts to send disappearing messages." xml:space="preserve" approved="no">
        <source>Allow your contacts to send disappearing messages.</source>
-        <target state="translated">允許你的聯絡人傳送自動銷毀的訊息。</target>
+        <target state="translated">允許您的聯絡人傳送限時訊息。</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
      <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve" approved="no">
@@ -5898,6 +5898,230 @@ It can happen because of some bug or when the connection is compromised.</source
        <target state="translated">%@ 和 %@ 已連接</target>
        <note>No comment provided by engineer.</note>
      </trans-unit>
+      <trans-unit id="%@ downloaded" xml:space="preserve" approved="no">
+        <source>%@ downloaded</source>
+        <target state="translated">%@ 下載</target>
+      </trans-unit>
+      <trans-unit id="%@ uploaded" xml:space="preserve" approved="no">
+        <source>%@ uploaded</source>
+        <target state="translated">%@ 上傳</target>
+      </trans-unit>
+      <trans-unit id="Abort" xml:space="preserve" approved="no">
+        <source>Abort</source>
+        <target state="translated">中止</target>
+      </trans-unit>
+      <trans-unit id="**Create group**: to create a new group." xml:space="preserve" approved="no">
+        <source>**Create group**: to create a new group.</source>
+        <target state="translated">**創建群組**: 創建一個新的群組。</target>
+      </trans-unit>
+      <trans-unit id="Abort changing address" xml:space="preserve" approved="no">
+        <source>Abort changing address</source>
+        <target state="translated">中止更改地址</target>
+      </trans-unit>
+      <trans-unit id="Accept connection request?" xml:space="preserve" approved="no">
+        <source>Accept connection request?</source>
+        <target state="translated">接受連線請求？</target>
+      </trans-unit>
+      <trans-unit id="Camera not available" xml:space="preserve" approved="no">
+        <source>Camera not available</source>
+        <target state="translated">相機不可用</target>
+      </trans-unit>
+      <trans-unit id="All messages will be deleted - this cannot be undone!" xml:space="preserve" approved="no">
+        <source>All messages will be deleted - this cannot be undone!</source>
+        <target state="translated">所有訊息都將被刪除 - 這不能還原！</target>
+      </trans-unit>
+      <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve" approved="no">
+        <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
+        <target state="translated">只有你的聯絡人允許的情況下，才允許不可逆地將訊息刪除。(24小時)</target>
+      </trans-unit>
+      <trans-unit id="Allow to irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Allow to irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">允許將不可撤銷的訊息刪除。(24小時)</target>
+      </trans-unit>
+      <trans-unit id="Allow your contacts to irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Allow your contacts to irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">允許您的聯絡人不可復原地刪除已傳送的訊息。(24小時)</target>
+      </trans-unit>
+      <trans-unit id="Bad desktop address" xml:space="preserve" approved="no">
+        <source>Bad desktop address</source>
+        <target state="translated">無效的桌面地址</target>
+      </trans-unit>
+      <trans-unit id="Error decrypting file" xml:space="preserve" approved="no">
+        <source>Error decrypting file</source>
+        <target state="translated">解密檔案時出錯</target>
+      </trans-unit>
+      <trans-unit id="Add contact" xml:space="preserve" approved="no">
+        <source>Add contact</source>
+        <target state="translated">新增聯絡人</target>
+      </trans-unit>
+      <trans-unit id="Advanced settings" xml:space="preserve" approved="no">
+        <source>Advanced settings</source>
+        <target state="translated">進階設定</target>
+      </trans-unit>
+      <trans-unit id="Allow calls?" xml:space="preserve" approved="no">
+        <source>Allow calls?</source>
+        <target state="translated">允許通話？</target>
+      </trans-unit>
+      <trans-unit id="Allow to send files and media." xml:space="preserve" approved="no">
+        <source>Allow to send files and media.</source>
+        <target state="translated">允許傳送檔案和媒體。</target>
+      </trans-unit>
+      <trans-unit id="Already joining the group!" xml:space="preserve" approved="no">
+        <source>Already joining the group!</source>
+        <target state="translated">已加入群組！</target>
+      </trans-unit>
+      <trans-unit id="App data migration" xml:space="preserve" approved="no">
+        <source>App data migration</source>
+        <target state="translated">應用資料轉移</target>
+      </trans-unit>
+      <trans-unit id="Apply" xml:space="preserve" approved="no">
+        <source>Apply</source>
+        <target state="translated">應用</target>
+      </trans-unit>
+      <trans-unit id="Apply to" xml:space="preserve" approved="no">
+        <source>Apply to</source>
+        <target state="translated">應用到</target>
+      </trans-unit>
+      <trans-unit id="Archive and upload" xml:space="preserve" approved="no">
+        <source>Archive and upload</source>
+        <target state="translated">儲存並上傳</target>
+      </trans-unit>
+      <trans-unit id="Block" xml:space="preserve" approved="no">
+        <source>Block</source>
+        <target state="translated">封鎖</target>
+      </trans-unit>
+      <trans-unit id="Block group members" xml:space="preserve" approved="no">
+        <source>Block group members</source>
+        <target state="translated">封鎖群組成員</target>
+      </trans-unit>
+      <trans-unit id="Block member" xml:space="preserve" approved="no">
+        <source>Block member</source>
+        <target state="translated">封鎖成員</target>
+      </trans-unit>
+      <trans-unit id="Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!" xml:space="preserve" approved="no">
+        <source>Bulgarian, Finnish, Thai and Ukrainian - thanks to the users and [Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)!</source>
+        <target state="translated">保加利亞語、芬蘭語、泰語和烏克蘭語——感謝使用者們和[Weblate](https://github.com/simplex-chat/simplex-chat/tree/stable#help-translating-simplex-chat)！</target>
+      </trans-unit>
+      <trans-unit id="Can't call member" xml:space="preserve" approved="no">
+        <source>Can't call member</source>
+        <target state="translated">無法與成員通話</target>
+      </trans-unit>
+      <trans-unit id="Can't message member" xml:space="preserve" approved="no">
+        <source>Can't message member</source>
+        <target state="translated">無法傳送訊息給成員</target>
+      </trans-unit>
+      <trans-unit id="Cancel migration" xml:space="preserve" approved="no">
+        <source>Cancel migration</source>
+        <target state="translated">取消遷移</target>
+      </trans-unit>
+      <trans-unit id="Chat database exported" xml:space="preserve" approved="no">
+        <source>Chat database exported</source>
+        <target state="translated">導出聊天數據庫</target>
+      </trans-unit>
+      <trans-unit id="0 sec" xml:space="preserve" approved="no">
+        <source>0 sec</source>
+        <target state="translated">0 秒</target>
+      </trans-unit>
+      <trans-unit id="All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays." xml:space="preserve" approved="no">
+        <source>All your contacts, conversations and files will be securely encrypted and uploaded in chunks to configured XFTP relays.</source>
+        <target state="translated">你的所有聯絡人、對話和文件將被安全加密並切塊上傳到設置的 XFTP 中繼。</target>
+      </trans-unit>
+      <trans-unit id="Address change will be aborted. Old receiving address will be used." xml:space="preserve" approved="no">
+        <source>Address change will be aborted. Old receiving address will be used.</source>
+        <target state="translated">將取消地址更改。將使用舊聯絡地址。</target>
+      </trans-unit>
+      <trans-unit id="Archiving database" xml:space="preserve" approved="no">
+        <source>Archiving database</source>
+        <target state="translated">正在儲存資料庫</target>
+      </trans-unit>
+      <trans-unit id="Cellular" xml:space="preserve" approved="no">
+        <source>Cellular</source>
+        <target state="translated">行動網路</target>
+      </trans-unit>
+      <trans-unit id="%@, %@ and %lld members" xml:space="preserve" approved="no">
+        <source>%@, %@ and %lld members</source>
+        <target state="translated">%@, %@ 和 %lld 成員</target>
+      </trans-unit>
+      <trans-unit id="%lld messages marked deleted" xml:space="preserve" approved="no">
+        <source>%lld messages marked deleted</source>
+        <target state="translated">%lld 條訊息已刪除</target>
+      </trans-unit>
+      <trans-unit id="Already connecting!" xml:space="preserve" approved="no">
+        <source>Already connecting!</source>
+        <target state="translated">已連接！</target>
+      </trans-unit>
+      <trans-unit id="Block member?" xml:space="preserve" approved="no">
+        <source>Block member?</source>
+        <target state="translated">封鎖成員？</target>
+      </trans-unit>
+      <trans-unit id="(new)" xml:space="preserve" approved="no">
+        <source>(new)</source>
+        <target state="translated">(新)</target>
+      </trans-unit>
+      <trans-unit id="%@, %@ and %lld other members connected" xml:space="preserve" approved="no">
+        <source>%@, %@ and %lld other members connected</source>
+        <target state="translated">%@, %@ 和 %lld 個成員已連接</target>
+      </trans-unit>
+      <trans-unit id="A few more things" xml:space="preserve" approved="no">
+        <source>A few more things</source>
+        <target state="translated">其他</target>
+      </trans-unit>
+      <trans-unit id="Show last messages" xml:space="preserve" approved="no">
+        <source>Show last messages</source>
+        <target state="translated">顯示最新的訊息</target>
+      </trans-unit>
+      <trans-unit id="App encrypts new local files (except videos)." xml:space="preserve" approved="no">
+        <source>App encrypts new local files (except videos).</source>
+        <target state="translated">應用程式將為新的本機文件(影片除外)加密。</target>
+      </trans-unit>
+      <trans-unit id="Better groups" xml:space="preserve" approved="no">
+        <source>Better groups</source>
+        <target state="translated">更加的群組</target>
+      </trans-unit>
+      <trans-unit id="%lld new interface languages" xml:space="preserve" approved="no">
+        <source>%lld new interface languages</source>
+        <target state="translated">%lld 種新的介面語言</target>
+      </trans-unit>
+      <trans-unit id="Blocked by admin" xml:space="preserve" approved="no">
+        <source>Blocked by admin</source>
+        <target state="translated">由管理員封鎖</target>
+      </trans-unit>
+      <trans-unit id="Both you and your contact can irreversibly delete sent messages. (24 hours)" xml:space="preserve" approved="no">
+        <source>Both you and your contact can irreversibly delete sent messages. (24 hours)</source>
+        <target state="translated">您與您的聯絡人都可以不可復原地删除已傳送的訊息。(24小時)</target>
+      </trans-unit>
+      <trans-unit id="Encrypt local files" xml:space="preserve" approved="no">
+        <source>Encrypt local files</source>
+        <target state="translated">加密本機檔案</target>
+      </trans-unit>
+      <trans-unit id="- more stable message delivery.&#10;- a bit better groups.&#10;- and more!" xml:space="preserve" approved="no">
+        <source>- more stable message delivery.
+- a bit better groups.
+- and more!</source>
+        <target state="translated">- 更穩定的傳送！
+- 更好的社群！
+- 以及更多！</target>
+      </trans-unit>
+      <trans-unit id="- optionally notify deleted contacts.&#10;- profile names with spaces.&#10;- and more!" xml:space="preserve" approved="no">
+        <source>- optionally notify deleted contacts.
+- profile names with spaces.
+- and more!</source>
+        <target state="translated">- 可選擇通知已刪除的聯絡人
+- 帶空格的共人資料名稱。
+-以及更多！</target>
+      </trans-unit>
+      <trans-unit id="Abort changing address?" xml:space="preserve" approved="no">
+        <source>Abort changing address?</source>
+        <target state="translated">中止更改地址？</target>
+      </trans-unit>
+      <trans-unit id="Allow to send SimpleX links." xml:space="preserve" approved="no">
+        <source>Allow to send SimpleX links.</source>
+        <target state="translated">允許傳送 SimpleX 連結。</target>
+      </trans-unit>
+      <trans-unit id="Background" xml:space="preserve" approved="no">
+        <source>Background</source>
+        <target state="translated">後台</target>
+      </trans-unit>
    </body>
  </file>
  <file original="en.lproj/SimpleX--iOS--InfoPlist.strings" source-language="en" target-language="zh-Hant" datatype="plaintext">
@@ -19,16 +19,17 @@ private let MAX_DOWNSAMPLE_SIZE: Int64 = 2000

 class ShareModel: ObservableObject {
    @Published var sharedContent: SharedContent?
-    @Published var chats = Array<ChatData>()
-    @Published var profileImages = Dictionary<ChatInfo.ID, UIImage>()
-    @Published var search = String()
-    @Published var comment = String()
+    @Published var chats: [ChatData] = []
+    @Published var profileImages: [ChatInfo.ID: UIImage] = [:]
+    @Published var search = ""
+    @Published var comment = ""
    @Published var selected: ChatData?
    @Published var isLoaded = false
    @Published var bottomBar: BottomBar = .loadingSpinner
    @Published var errorAlert: ErrorAlert?
    @Published var hasSimplexLink = false
    @Published var alertRequiresPassword = false
+    var networkTimeout = CFAbsoluteTimeGetCurrent()

    enum BottomBar {
        case sendButton
@@ -51,6 +52,13 @@ class ShareModel: ObservableObject {
    private var itemProvider: NSItemProvider?

    var isSendDisbled: Bool { sharedContent == nil || selected == nil || isProhibited(selected) }
+    
+    var isLinkPreview: Bool {
+        switch sharedContent {
+        case .url: true
+        default: false
+        }
+    }

    func isProhibited(_ chat: ChatData?) -> Bool {
        if let chat, let sharedContent {
@@ -58,7 +66,7 @@ class ShareModel: ObservableObject {
        } else { false }
    }

-    var filteredChats: Array<ChatData> {
+    var filteredChats: [ChatData] {
        search.isEmpty
        ? filterChatsToForwardTo(chats: chats)
        : filterChatsToForwardTo(chats: chats)
@@ -66,7 +74,7 @@ class ShareModel: ObservableObject {
    }

    func setup(context: NSExtensionContext) {
-        if performLAGroupDefault.get() && !allowShareExtensionGroupDefault.get() {
+        if appLocalAuthEnabledGroupDefault.get() && !allowShareExtensionGroupDefault.get() {
            errorAlert = ErrorAlert(title: "App is locked!", message: "You can allow sharing in Privacy & Security / SimpleX Lock settings.")
            return
        }
@@ -111,7 +119,7 @@ class ShareModel: ObservableObject {
                }
                // Process Attachment
                Task {
-                    switch await self.itemProvider!.sharedContent() {
+                    switch await getSharedContent(self.itemProvider!) {
                    case let .success(chatItemContent):
                        await MainActor.run {
                            self.sharedContent = chatItemContent
@@ -141,7 +149,7 @@ class ShareModel: ObservableObject {
                    if selected.chatInfo.chatType == .local {
                        completion()
                    } else {
-                        await MainActor.run { self.bottomBar = .loadingBar(progress: .zero) }
+                        await MainActor.run { self.bottomBar = .loadingBar(progress: 0) }
                        if let e = await handleEvents(
                            isGroupChat: ci.chatInfo.chatType == .group,
                            isWithoutFile: sharedContent.cryptoFile == nil,
@@ -283,14 +291,13 @@ class ShareModel: ObservableObject {
        CompletionHandler.isEventLoopEnabled = true
        let ch = CompletionHandler()
        if isWithoutFile { await ch.completeFile() }
-        var networkTimeout = CFAbsoluteTimeGetCurrent()
+        networkTimeout = CFAbsoluteTimeGetCurrent()
        while await ch.isRunning {
            if CFAbsoluteTimeGetCurrent() - networkTimeout > 30 {
-                networkTimeout = CFAbsoluteTimeGetCurrent()
                await MainActor.run {
-                    self.errorAlert = ErrorAlert(title: "No network connection") {
-                        Button("Keep Trying", role: .cancel) {  }
-                        Button("Dismiss Sheet", role: .destructive) { self.completion() }
+                    self.errorAlert = ErrorAlert(title: "Slow network?", message: "Sending a message takes longer than expected.") {
+                        Button("Wait", role: .cancel) { self.networkTimeout = CFAbsoluteTimeGetCurrent() }
+                        Button("Cancel", role: .destructive) { self.completion() }
                    }
                }
            }
@@ -381,7 +388,7 @@ enum SharedContent {
        switch self {
        case let .image(preview, _): .image(text: comment, image: preview)
        case let .movie(preview, duration, _): .video(text: comment, image: preview, duration: duration)
-        case let .url(preview): .link(text: comment, preview: preview)
+        case let .url(preview): .link(text: preview.uri.absoluteString + (comment == "" ? "" : "\n" + comment), preview: preview)
        case .text: .text(comment)
        case .data: .file(comment)
        }
@@ -396,91 +403,89 @@ enum SharedContent {
    }
 }

-extension NSItemProvider {
-    fileprivate func sharedContent() async -> Result<SharedContent, ErrorAlert> {
-        if let type = firstMatching(of: [.image, .movie, .fileURL, .url, .text]) {
-            switch type {
-                // Prepare Image message
-            case .image:
-
-                // Animated
-                return if hasItemConformingToTypeIdentifier(UTType.gif.identifier) {
-                    if let url = try? await inPlaceUrl(type: type),
-                       let data = try? Data(contentsOf: url),
-                       let image = UIImage(data: data),
-                       let cryptoFile = saveFile(data, generateNewFileName("IMG", "gif"), encrypted: privacyEncryptLocalFilesGroupDefault.get()),
-                       let preview = resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE) {
-                        .success(.image(preview: preview, cryptoFile: cryptoFile))
-                    } else { .failure(ErrorAlert("Error preparing message")) }
-
-                // Static
-                } else {
-                    if let image = await staticImage(),
-                       let cryptoFile = saveImage(image),
-                       let preview = resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE) {
-                        .success(.image(preview: preview, cryptoFile: cryptoFile))
-                    } else { .failure(ErrorAlert("Error preparing message")) }
-                }
-
-            // Prepare Movie message
-            case .movie:
+fileprivate func getSharedContent(_ ip: NSItemProvider) async -> Result<SharedContent, ErrorAlert> {
+    if let type = firstMatching(of: [.image, .movie, .fileURL, .url, .text]) {
+        switch type {
+            // Prepare Image message
+        case .image:
+            // Animated
+            return if ip.hasItemConformingToTypeIdentifier(UTType.gif.identifier) {
                if let url = try? await inPlaceUrl(type: type),
-                   let trancodedUrl = await transcodeVideo(from: url),
-                   let (image, duration) = AVAsset(url: trancodedUrl).generatePreview(),
-                   let preview = resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE),
-                   let cryptoFile = moveTempFileFromURL(trancodedUrl) {
-                    try? FileManager.default.removeItem(at: trancodedUrl)
-                    return .success(.movie(preview: preview, duration: duration, cryptoFile: cryptoFile))
-                } else { return .failure(ErrorAlert("Error preparing message")) }
-
-            // Prepare Data message
-            case .fileURL:
-                if let url = try? await inPlaceUrl(type: .data) {
-                    if isFileTooLarge(for: url) {
-                        let sizeString = ByteCountFormatter.string(
-                            fromByteCount: Int64(getMaxFileSize(.xftp)),
-                            countStyle: .binary
-                        )
-                        return .failure(
-                            ErrorAlert(
-                                title: "Large file!",
-                                message: "Currently maximum supported file size is \(sizeString)."
-                            )
-                        )
-                    }
-                    if let file = saveFileFromURL(url) {
-                        return .success(.data(cryptoFile: file))
-                    }
-                }
-                return .failure(ErrorAlert("Error preparing file"))
-
-            // Prepare Link message
-            case .url:
-                if let url = try? await loadItem(forTypeIdentifier: type.identifier) as? URL {
-                    let content: SharedContent =
-                        if privacyLinkPreviewsGroupDefault.get(), let linkPreview = await getLinkPreview(for: url) {
-                            .url(preview: linkPreview)
-                        } else {
-                            .text(string: url.absoluteString)
-                        }
-                    return .success(content)
-                } else { return .failure(ErrorAlert("Error preparing message")) }
-
-            // Prepare Text message
-            case .text:
-                return if let text = try? await loadItem(forTypeIdentifier: type.identifier) as? String {
-                    .success(.text(string: text))
+                   let data = try? Data(contentsOf: url),
+                   let image = UIImage(data: data),
+                   let cryptoFile = saveFile(data, generateNewFileName("IMG", "gif"), encrypted: privacyEncryptLocalFilesGroupDefault.get()),
+                   let preview = resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE) {
+                    .success(.image(preview: preview, cryptoFile: cryptoFile))
+                } else { .failure(ErrorAlert("Error preparing message")) }
+
+            // Static
+            } else {
+                if let image = await staticImage(),
+                   let cryptoFile = saveImage(image),
+                   let preview = resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE) {
+                    .success(.image(preview: preview, cryptoFile: cryptoFile))
                } else { .failure(ErrorAlert("Error preparing message")) }
-            default: return .failure(ErrorAlert("Unsupported format"))
            }
-        } else {
-            return .failure(ErrorAlert("Unsupported format"))
+
+        // Prepare Movie message
+        case .movie:
+            if let url = try? await inPlaceUrl(type: type),
+               let trancodedUrl = await transcodeVideo(from: url),
+               let (image, duration) = AVAsset(url: trancodedUrl).generatePreview(),
+               let preview = resizeImageToStrSize(image, maxDataSize: MAX_DATA_SIZE),
+               let cryptoFile = moveTempFileFromURL(trancodedUrl) {
+                try? FileManager.default.removeItem(at: trancodedUrl)
+                return .success(.movie(preview: preview, duration: duration, cryptoFile: cryptoFile))
+            } else { return .failure(ErrorAlert("Error preparing message")) }
+
+        // Prepare Data message
+        case .fileURL:
+            if let url = try? await inPlaceUrl(type: .data) {
+                if isFileTooLarge(for: url) {
+                    let sizeString = ByteCountFormatter.string(
+                        fromByteCount: Int64(getMaxFileSize(.xftp)),
+                        countStyle: .binary
+                    )
+                    return .failure(
+                        ErrorAlert(
+                            title: "Large file!",
+                            message: "Currently maximum supported file size is \(sizeString)."
+                        )
+                    )
+                }
+                if let file = saveFileFromURL(url) {
+                    return .success(.data(cryptoFile: file))
+                }
+            }
+            return .failure(ErrorAlert("Error preparing file"))
+
+        // Prepare Link message
+        case .url:
+            if let url = try? await ip.loadItem(forTypeIdentifier: type.identifier) as? URL {
+                let content: SharedContent =
+                    if privacyLinkPreviewsGroupDefault.get(), let linkPreview = await getLinkPreview(for: url) {
+                        .url(preview: linkPreview)
+                    } else {
+                        .text(string: url.absoluteString)
+                    }
+                return .success(content)
+            } else { return .failure(ErrorAlert("Error preparing message")) }
+
+        // Prepare Text message
+        case .text:
+            return if let text = try? await ip.loadItem(forTypeIdentifier: type.identifier) as? String {
+                .success(.text(string: text))
+            } else { .failure(ErrorAlert("Error preparing message")) }
+        default: return .failure(ErrorAlert("Unsupported format"))
        }
+    } else {
+        return .failure(ErrorAlert("Unsupported format"))
    }

-    private func inPlaceUrl(type: UTType) async throws -> URL {
+
+    func inPlaceUrl(type: UTType) async throws -> URL {
        try await withCheckedThrowingContinuation { cont in
-            let _ = loadInPlaceFileRepresentation(forTypeIdentifier: type.identifier) { url, bool, error in
+            let _ = ip.loadInPlaceFileRepresentation(forTypeIdentifier: type.identifier) { url, bool, error in
                if let url = url {
                    cont.resume(returning: url)
                } else if let error = error {
@@ -492,21 +497,21 @@ extension NSItemProvider {
        }
    }

-    private func firstMatching(of types: Array<UTType>) -> UTType? {
+    func firstMatching(of types: Array<UTType>) -> UTType? {
        for type in types {
-            if hasItemConformingToTypeIdentifier(type.identifier) { return type }
+            if ip.hasItemConformingToTypeIdentifier(type.identifier) { return type }
        }
        return nil
    }

-    private func staticImage() async -> UIImage? {
+    func staticImage() async -> UIImage? {
        if let url = try? await inPlaceUrl(type: .image),
           let downsampledImage = downsampleImage(at: url, to: MAX_DOWNSAMPLE_SIZE) {
            downsampledImage
        } else {
            /// Fallback to loading image directly from `ItemProvider`
            /// in case loading from disk is not possible. Required for sharing screenshots.
-            try? await loadItem(forTypeIdentifier: UTType.image.identifier) as? UIImage
+            try? await ip.loadItem(forTypeIdentifier: UTType.image.identifier) as? UIImage
        }
    }
 }
@@ -85,7 +85,7 @@ struct ShareView: View {
    }

    private func compose(isLoading: Bool) -> some View {
-        VStack(spacing: .zero) {
+        VStack(spacing: 0) {
            Divider()
            if let content = model.sharedContent  {
               itemPreview(content)
@@ -132,7 +132,7 @@ struct ShareView: View {
        switch content {
        case let .image(preview, _): imagePreview(preview)
        case let .movie(preview, _, _): imagePreview(preview)
-        case let .url(linkPreview): imagePreview(linkPreview.image)
+        case let .url(preview): linkPreview(preview)
        case let .data(cryptoFile):
            previewArea {
                Image(systemName: "doc.fill")
@@ -160,6 +160,29 @@ struct ShareView: View {
        }
    }

+    @ViewBuilder private func linkPreview(_ linkPreview: LinkPreview) -> some View {
+        previewArea {
+            HStack(alignment: .center, spacing: 8) {
+                if let uiImage = UIImage(base64Encoded: linkPreview.image) {
+                    Image(uiImage: uiImage)
+                        .resizable()
+                        .aspectRatio(contentMode: .fit)
+                        .frame(maxWidth: 80, maxHeight: 60)
+                }
+                VStack(alignment: .center, spacing: 4) {
+                    Text(linkPreview.title)
+                        .lineLimit(1)
+                    Text(linkPreview.uri.absoluteString)
+                        .font(.caption)
+                        .lineLimit(1)
+                        .foregroundColor(.secondary)
+                }
+                .padding(.vertical, 5)
+                .frame(maxWidth: .infinity, minHeight: 60)
+            }
+        }
+    }
+
    @ViewBuilder private func previewArea<V: View>(@ViewBuilder content: @escaping () -> V) -> some View {
        HStack(alignment: .center, spacing: 8) {
            content()
@@ -179,7 +202,7 @@ struct ShareView: View {

    private func loadingBar(progress: Double) -> some View {
        VStack {
-            Text("Sending File")
+            Text("Sending message…")
            ProgressView(value: progress)
        }
        .padding()
@@ -1,7 +1,9 @@
-/* 
-  InfoPlist.strings
-  SimpleX
+/* Bundle display name */
+"CFBundleDisplayName" = "SimpleX SE";
+
+/* Bundle name */
+"CFBundleName" = "SimpleX SE";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Alle Rechte vorbehalten.";

-  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!" = "Die App ist gesperrt!";
+
+/* No comment provided by engineer. */
+"Cancel" = "Abbrechen";
+
+/* No comment provided by engineer. */
+"Cannot access keychain to save database password" = "Es ist nicht möglich, auf den Schlüsselbund zuzugreifen, um das Datenbankpasswort zu speichern";
+
+/* No comment provided by engineer. */
+"Cannot forward message" = "Nachricht kann nicht weitergeleitet werden";
+
+/* No comment provided by engineer. */
+"Comment" = "Kommentieren";
+
+/* No comment provided by engineer. */
+"Currently maximum supported file size is %@." = "Die maximale erlaubte Dateigröße beträgt aktuell %@.";
+
+/* No comment provided by engineer. */
+"Database downgrade required" = "Datenbank-Herabstufung erforderlich";
+
+/* No comment provided by engineer. */
+"Database encrypted!" = "Datenbank verschlüsselt!";
+
+/* No comment provided by engineer. */
+"Database error" = "Datenbankfehler";
+
+/* No comment provided by engineer. */
+"Database passphrase is different from saved in the keychain." = "Das Datenbank-Passwort unterscheidet sich vom im Schlüsselbund gespeicherten.";
+
+/* No comment provided by engineer. */
+"Database passphrase is required to open chat." = "Ein Datenbank-Passwort ist erforderlich, um den Chat zu öffnen.";
+
+/* No comment provided by engineer. */
+"Database upgrade required" = "Datenbank-Aktualisierung erforderlich";
+
+/* No comment provided by engineer. */
+"Error preparing file" = "Fehler beim Vorbereiten der Datei";
+
+/* No comment provided by engineer. */
+"Error preparing message" = "Fehler beim Vorbereiten der Nachricht";
+
+/* No comment provided by engineer. */
+"Error: %@" = "Fehler: %@";
+
+/* No comment provided by engineer. */
+"File error" = "Dateifehler";
+
+/* No comment provided by engineer. */
+"Incompatible database version" = "Datenbank-Version nicht kompatibel";
+
+/* No comment provided by engineer. */
+"Invalid migration confirmation" = "Migrations-Bestätigung ungültig";
+
+/* No comment provided by engineer. */
+"Keychain error" = "Schlüsselbund-Fehler";
+
+/* No comment provided by engineer. */
+"Large file!" = "Große Datei!";
+
+/* No comment provided by engineer. */
+"No active profile" = "Kein aktives Profil";
+
+/* No comment provided by engineer. */
+"Ok" = "OK";
+
+/* No comment provided by engineer. */
+"Open the app to downgrade the database." = "Öffne die App, um die Datenbank herabzustufen.";
+
+/* No comment provided by engineer. */
+"Open the app to upgrade the database." = "Öffne die App, um die Datenbank zu aktualisieren.";
+
+/* No comment provided by engineer. */
+"Passphrase" = "Passwort";
+
+/* No comment provided by engineer. */
+"Please create a profile in the SimpleX app" = "Bitte erstelle ein Profil in der SimpleX-App";
+
+/* No comment provided by engineer. */
+"Selected chat preferences prohibit this message." = "Diese Nachricht ist wegen der gewählten Chat-Einstellungen nicht erlaubt.";
+
+/* No comment provided by engineer. */
+"Sending a message takes longer than expected." = "Das Senden einer Nachricht dauert länger als erwartet.";
+
+/* No comment provided by engineer. */
+"Sending message…" = "Nachricht wird gesendet…";
+
+/* No comment provided by engineer. */
+"Share" = "Teilen";
+
+/* No comment provided by engineer. */
+"Slow network?" = "Langsames Netzwerk?";
+
+/* No comment provided by engineer. */
+"Unknown database error: %@" = "Unbekannter Datenbankfehler: %@";
+
+/* No comment provided by engineer. */
+"Unsupported format" = "Nicht unterstütztes Format";
+
+/* No comment provided by engineer. */
+"Wait" = "Warten";
+
+/* No comment provided by engineer. */
+"Wrong database passphrase" = "Falsches Datenbank-Passwort";
+
+/* No comment provided by engineer. */
+"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "Du kannst das Teilen in den Einstellungen zu Datenschutz & Sicherheit - SimpleX-Sperre erlauben.";

-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
@@ -1,7 +1,9 @@
-/* 
-  InfoPlist.strings
-  SimpleX
+/* Bundle display name */
+"CFBundleDisplayName" = "SimpleX SE";
+
+/* Bundle name */
+"CFBundleName" = "SimpleX SE";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Todos los derechos reservados.";

-  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!" = "¡Aplicación bloqueada!";
+
+/* No comment provided by engineer. */
+"Cancel" = "Cancelar";
+
+/* No comment provided by engineer. */
+"Cannot access keychain to save database password" = "Keychain inaccesible para guardar la contraseña de la base de datos";
+
+/* No comment provided by engineer. */
+"Cannot forward message" = "No se puede reenviar el mensaje";
+
+/* No comment provided by engineer. */
+"Comment" = "Comentario";
+
+/* No comment provided by engineer. */
+"Currently maximum supported file size is %@." = "El tamaño máximo de archivo admitido es %@.";
+
+/* No comment provided by engineer. */
+"Database downgrade required" = "Se requiere volver a versión anterior de la base de datos";
+
+/* No comment provided by engineer. */
+"Database encrypted!" = "¡Base de datos cifrada!";
+
+/* No comment provided by engineer. */
+"Database error" = "Error en base de datos";
+
+/* No comment provided by engineer. */
+"Database passphrase is different from saved in the keychain." = "La contraseña de la base de datos es distinta a la almacenada en keychain.";
+
+/* No comment provided by engineer. */
+"Database passphrase is required to open chat." = "Se requiere la contraseña de la base de datos para abrir la aplicación.";
+
+/* No comment provided by engineer. */
+"Database upgrade required" = "Se requiere actualizar la base de datos";
+
+/* No comment provided by engineer. */
+"Error preparing file" = "Error al preparar el archivo";
+
+/* No comment provided by engineer. */
+"Error preparing message" = "Error al preparar el mensaje";
+
+/* No comment provided by engineer. */
+"Error: %@" = "Error: %@";
+
+/* No comment provided by engineer. */
+"File error" = "Error de archivo";
+
+/* No comment provided by engineer. */
+"Incompatible database version" = "Versión de base de datos incompatible";
+
+/* No comment provided by engineer. */
+"Invalid migration confirmation" = "Confirmación de migración no válida";
+
+/* No comment provided by engineer. */
+"Keychain error" = "Error en keychain";
+
+/* No comment provided by engineer. */
+"Large file!" = "¡Archivo grande!";
+
+/* No comment provided by engineer. */
+"No active profile" = "Ningún perfil activo";
+
+/* No comment provided by engineer. */
+"Ok" = "Ok";
+
+/* No comment provided by engineer. */
+"Open the app to downgrade the database." = "Abre la aplicación para volver a versión anterior de la base de datos.";
+
+/* No comment provided by engineer. */
+"Open the app to upgrade the database." = "Abre la aplicación para actualizar la base de datos.";
+
+/* No comment provided by engineer. */
+"Passphrase" = "Frase de contraseña";
+
+/* No comment provided by engineer. */
+"Please create a profile in the SimpleX app" = "Por favor, crea un perfil en SimpleX";
+
+/* No comment provided by engineer. */
+"Selected chat preferences prohibit this message." = "Las preferencias seleccionadas no permiten este mensaje.";
+
+/* No comment provided by engineer. */
+"Sending a message takes longer than expected." = "Enviar el mensaje lleva más tiempo del esperado.";
+
+/* No comment provided by engineer. */
+"Sending message…" = "Enviando mensaje…";
+
+/* No comment provided by engineer. */
+"Share" = "Compartir";
+
+/* No comment provided by engineer. */
+"Slow network?" = "¿Red lenta?";
+
+/* No comment provided by engineer. */
+"Unknown database error: %@" = "Error desconocido en la base de datos: %@";
+
+/* No comment provided by engineer. */
+"Unsupported format" = "Formato sin soporte";
+
+/* No comment provided by engineer. */
+"Wait" = "Espera";
+
+/* No comment provided by engineer. */
+"Wrong database passphrase" = "Contraseña incorrecta de la base de datos";
+
+/* No comment provided by engineer. */
+"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "Puedes dar permiso para compartir en Privacidad y Seguridad / Bloque SimpleX.";

-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
@@ -1,7 +1,9 @@
-/* 
-  InfoPlist.strings
-  SimpleX
+/* Bundle display name */
+"CFBundleDisplayName" = "SimpleX SE";
+
+/* Bundle name */
+"CFBundleName" = "SimpleX SE";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Tous droits réservés.";

-  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!" = "L'app est verrouillée !";
+
+/* No comment provided by engineer. */
+"Cancel" = "Annuler";
+
+/* No comment provided by engineer. */
+"Cannot access keychain to save database password" = "Impossible d'accéder à la keychain pour enregistrer le mot de passe de la base de données";
+
+/* No comment provided by engineer. */
+"Cannot forward message" = "Impossible de transférer le message";
+
+/* No comment provided by engineer. */
+"Comment" = "Commenter";
+
+/* No comment provided by engineer. */
+"Currently maximum supported file size is %@." = "Actuellement, la taille maximale des fichiers supportés est de %@.";
+
+/* No comment provided by engineer. */
+"Database downgrade required" = "Mise à jour de la base de données nécessaire";
+
+/* No comment provided by engineer. */
+"Database encrypted!" = "Base de données chiffrée !";
+
+/* No comment provided by engineer. */
+"Database error" = "Erreur de base de données";
+
+/* No comment provided by engineer. */
+"Database passphrase is different from saved in the keychain." = "La phrase secrète de la base de données est différente de celle enregistrée dans la keychain.";
+
+/* No comment provided by engineer. */
+"Database passphrase is required to open chat." = "La phrase secrète de la base de données est nécessaire pour ouvrir le chat.";
+
+/* No comment provided by engineer. */
+"Database upgrade required" = "Mise à niveau de la base de données nécessaire";
+
+/* No comment provided by engineer. */
+"Error preparing file" = "Erreur lors de la préparation du fichier";
+
+/* No comment provided by engineer. */
+"Error preparing message" = "Erreur lors de la préparation du message";
+
+/* No comment provided by engineer. */
+"Error: %@" = "Erreur : %@";
+
+/* No comment provided by engineer. */
+"File error" = "Erreur de fichier";
+
+/* No comment provided by engineer. */
+"Incompatible database version" = "Version de la base de données incompatible";
+
+/* No comment provided by engineer. */
+"Invalid migration confirmation" = "Confirmation de migration invalide";
+
+/* No comment provided by engineer. */
+"Keychain error" = "Erreur de la keychain";
+
+/* No comment provided by engineer. */
+"Large file!" = "Fichier trop lourd !";
+
+/* No comment provided by engineer. */
+"No active profile" = "Pas de profil actif";
+
+/* No comment provided by engineer. */
+"Ok" = "Ok";
+
+/* No comment provided by engineer. */
+"Open the app to downgrade the database." = "Ouvrez l'app pour rétrograder la base de données.";
+
+/* No comment provided by engineer. */
+"Open the app to upgrade the database." = "Ouvrez l'app pour mettre à jour la base de données.";
+
+/* No comment provided by engineer. */
+"Passphrase" = "Phrase secrète";
+
+/* No comment provided by engineer. */
+"Please create a profile in the SimpleX app" = "Veuillez créer un profil dans l'app SimpleX";
+
+/* No comment provided by engineer. */
+"Selected chat preferences prohibit this message." = "Les paramètres de chat sélectionnés ne permettent pas l'envoi de ce message.";
+
+/* No comment provided by engineer. */
+"Sending a message takes longer than expected." = "L'envoi d'un message prend plus de temps que prévu.";
+
+/* No comment provided by engineer. */
+"Sending message…" = "Envoi du message…";
+
+/* No comment provided by engineer. */
+"Share" = "Partager";
+
+/* No comment provided by engineer. */
+"Slow network?" = "Réseau lent ?";
+
+/* No comment provided by engineer. */
+"Unknown database error: %@" = "Erreur inconnue de la base de données : %@";
+
+/* No comment provided by engineer. */
+"Unsupported format" = "Format non pris en charge";
+
+/* No comment provided by engineer. */
+"Wait" = "Attendez";
+
+/* No comment provided by engineer. */
+"Wrong database passphrase" = "Mauvaise phrase secrète pour la base de données";
+
+/* No comment provided by engineer. */
+"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "Vous pouvez autoriser le partage dans les paramètres Confidentialité et sécurité / SimpleX Lock.";

-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
@@ -1,7 +1,9 @@
-/* 
-  InfoPlist.strings
-  SimpleX
+/* Bundle display name */
+"CFBundleDisplayName" = "SimpleX SE";
+
+/* Bundle name */
+"CFBundleName" = "SimpleX SE";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Minden jog fenntartva.";

-  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!" = "Az alkalmazás zárolva!";
+
+/* No comment provided by engineer. */
+"Cancel" = "Mégse";
+
+/* No comment provided by engineer. */
+"Cannot access keychain to save database password" = "Nem lehet hozzáférni a kulcstartóhoz az adatbázis jelszavának mentéséhez";
+
+/* No comment provided by engineer. */
+"Cannot forward message" = "Nem lehet továbbítani az üzenetet";
+
+/* No comment provided by engineer. */
+"Comment" = "Hozzászólás";
+
+/* No comment provided by engineer. */
+"Currently maximum supported file size is %@." = "Jelenleg a maximális támogatott fájlméret %@.";
+
+/* No comment provided by engineer. */
+"Database downgrade required" = "Adatbázis visszafejlesztése szükséges";
+
+/* No comment provided by engineer. */
+"Database encrypted!" = "Adatbázis titkosítva!";
+
+/* No comment provided by engineer. */
+"Database error" = "Adatbázis hiba";
+
+/* No comment provided by engineer. */
+"Database passphrase is different from saved in the keychain." = "Az adatbázis jelmondata eltér a kulcstartóban lévőtől.";
+
+/* No comment provided by engineer. */
+"Database passphrase is required to open chat." = "Adatbázis jelmondat szükséges a csevegés megnyitásához.";
+
+/* No comment provided by engineer. */
+"Database upgrade required" = "Adatbázis fejlesztése szükséges";
+
+/* No comment provided by engineer. */
+"Error preparing file" = "Hiba a fájl előkészítésekor";
+
+/* No comment provided by engineer. */
+"Error preparing message" = "Hiba az üzenet előkészítésekor";
+
+/* No comment provided by engineer. */
+"Error: %@" = "Hiba: %@";
+
+/* No comment provided by engineer. */
+"File error" = "Fájlhiba";
+
+/* No comment provided by engineer. */
+"Incompatible database version" = "Nem kompatibilis adatbázis verzió";
+
+/* No comment provided by engineer. */
+"Invalid migration confirmation" = "Érvénytelen átköltöztetési visszaigazolás";
+
+/* No comment provided by engineer. */
+"Keychain error" = "Kulcstartó hiba";
+
+/* No comment provided by engineer. */
+"Large file!" = "Nagy fájl!";
+
+/* No comment provided by engineer. */
+"No active profile" = "Nincs aktív profil";
+
+/* No comment provided by engineer. */
+"Ok" = "Rendben";
+
+/* No comment provided by engineer. */
+"Open the app to downgrade the database." = "Nyissa meg az alkalmazást az adatbázis visszafejlesztéséhez.";
+
+/* No comment provided by engineer. */
+"Open the app to upgrade the database." = "Nyissa meg az alkalmazást az adatbázis fejlesztéséhez.";
+
+/* No comment provided by engineer. */
+"Passphrase" = "Jelmondat";
+
+/* No comment provided by engineer. */
+"Please create a profile in the SimpleX app" = "Hozzon létre egy profilt a SimpleX alkalmazásban";
+
+/* No comment provided by engineer. */
+"Selected chat preferences prohibit this message." = "A kiválasztott csevegési beállítások tiltják ezt az üzenetet.";
+
+/* No comment provided by engineer. */
+"Sending a message takes longer than expected." = "Az üzenet elküldése a vártnál tovább tart.";
+
+/* No comment provided by engineer. */
+"Sending message…" = "Üzenet küldése…";
+
+/* No comment provided by engineer. */
+"Share" = "Megosztás";
+
+/* No comment provided by engineer. */
+"Slow network?" = "Lassú internetkapcsolat?";
+
+/* No comment provided by engineer. */
+"Unknown database error: %@" = "Ismeretlen adatbázis hiba: %@";
+
+/* No comment provided by engineer. */
+"Unsupported format" = "Nem támogatott formátum";
+
+/* No comment provided by engineer. */
+"Wait" = "Várjon";
+
+/* No comment provided by engineer. */
+"Wrong database passphrase" = "Hibás adatbázis jelmondat";
+
+/* No comment provided by engineer. */
+"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "A megosztást az Adatvédelem és biztonság / SimpleX zár menüben engedélyezheti.";

-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
@@ -1,7 +1,9 @@
-/* 
-  InfoPlist.strings
-  SimpleX
+/* Bundle display name */
+"CFBundleDisplayName" = "SimpleX SE";
+
+/* Bundle name */
+"CFBundleName" = "SimpleX SE";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Tutti i diritti riservati.";

-  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!" = "L'app è bloccata!";
+
+/* No comment provided by engineer. */
+"Cancel" = "Annulla";
+
+/* No comment provided by engineer. */
+"Cannot access keychain to save database password" = "Impossibile accedere al portachiavi per salvare la password del database";
+
+/* No comment provided by engineer. */
+"Cannot forward message" = "Impossibile inoltrare il messaggio";
+
+/* No comment provided by engineer. */
+"Comment" = "Commento";
+
+/* No comment provided by engineer. */
+"Currently maximum supported file size is %@." = "Attualmente la dimensione massima supportata è di %@.";
+
+/* No comment provided by engineer. */
+"Database downgrade required" = "Downgrade del database necessario";
+
+/* No comment provided by engineer. */
+"Database encrypted!" = "Database crittografato!";
+
+/* No comment provided by engineer. */
+"Database error" = "Errore del database";
+
+/* No comment provided by engineer. */
+"Database passphrase is different from saved in the keychain." = "La password del database è diversa da quella salvata nel portachiavi.";
+
+/* No comment provided by engineer. */
+"Database passphrase is required to open chat." = "La password del database è necessaria per aprire la chat.";
+
+/* No comment provided by engineer. */
+"Database upgrade required" = "Aggiornamento del database necessario";
+
+/* No comment provided by engineer. */
+"Error preparing file" = "Errore nella preparazione del file";
+
+/* No comment provided by engineer. */
+"Error preparing message" = "Errore nella preparazione del messaggio";
+
+/* No comment provided by engineer. */
+"Error: %@" = "Errore: %@";
+
+/* No comment provided by engineer. */
+"File error" = "Errore del file";
+
+/* No comment provided by engineer. */
+"Incompatible database version" = "Versione del database incompatibile";
+
+/* No comment provided by engineer. */
+"Invalid migration confirmation" = "Conferma di migrazione non valida";
+
+/* No comment provided by engineer. */
+"Keychain error" = "Errore del portachiavi";
+
+/* No comment provided by engineer. */
+"Large file!" = "File grande!";
+
+/* No comment provided by engineer. */
+"No active profile" = "Nessun profilo attivo";
+
+/* No comment provided by engineer. */
+"Ok" = "Ok";
+
+/* No comment provided by engineer. */
+"Open the app to downgrade the database." = "Apri l'app per eseguire il downgrade del database.";
+
+/* No comment provided by engineer. */
+"Open the app to upgrade the database." = "Apri l'app per aggiornare il database.";
+
+/* No comment provided by engineer. */
+"Passphrase" = "Password";
+
+/* No comment provided by engineer. */
+"Please create a profile in the SimpleX app" = "Crea un profilo nell'app SimpleX";
+
+/* No comment provided by engineer. */
+"Selected chat preferences prohibit this message." = "Le preferenze della chat selezionata vietano questo messaggio.";
+
+/* No comment provided by engineer. */
+"Sending a message takes longer than expected." = "L'invio di un messaggio richiede più tempo del previsto.";
+
+/* No comment provided by engineer. */
+"Sending message…" = "Invio messaggio…";
+
+/* No comment provided by engineer. */
+"Share" = "Condividi";
+
+/* No comment provided by engineer. */
+"Slow network?" = "Rete lenta?";
+
+/* No comment provided by engineer. */
+"Unknown database error: %@" = "Errore del database sconosciuto: %@";
+
+/* No comment provided by engineer. */
+"Unsupported format" = "Formato non supportato";
+
+/* No comment provided by engineer. */
+"Wait" = "Attendi";
+
+/* No comment provided by engineer. */
+"Wrong database passphrase" = "Password del database sbagliata";
+
+/* No comment provided by engineer. */
+"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "Puoi consentire la condivisione in Privacy e sicurezza / impostazioni di SimpleX Lock.";

-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
@@ -1,7 +1,9 @@
-/* 
-  InfoPlist.strings
-  SimpleX
+/* Bundle display name */
+"CFBundleDisplayName" = "SimpleX SE";
+
+/* Bundle name */
+"CFBundleName" = "SimpleX SE";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. All rights reserved.";

-  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!" = "App is vergrendeld!";
+
+/* No comment provided by engineer. */
+"Cancel" = "Annuleren";
+
+/* No comment provided by engineer. */
+"Cannot access keychain to save database password" = "Kan geen toegang krijgen tot de keychain om het database wachtwoord op te slaan";
+
+/* No comment provided by engineer. */
+"Cannot forward message" = "Kan bericht niet doorsturen";
+
+/* No comment provided by engineer. */
+"Comment" = "Opmerking";
+
+/* No comment provided by engineer. */
+"Currently maximum supported file size is %@." = "De momenteel maximaal ondersteunde bestandsgrootte is %@.";
+
+/* No comment provided by engineer. */
+"Database downgrade required" = "Database downgrade vereist";
+
+/* No comment provided by engineer. */
+"Database encrypted!" = "Database versleuteld!";
+
+/* No comment provided by engineer. */
+"Database error" = "Database fout";
+
+/* No comment provided by engineer. */
+"Database passphrase is different from saved in the keychain." = "Het wachtwoord van de database verschilt van het wachtwoord die in de keychain is opgeslagen.";
+
+/* No comment provided by engineer. */
+"Database passphrase is required to open chat." = "Database wachtwoord is vereist om je gesprekken te openen.";
+
+/* No comment provided by engineer. */
+"Database upgrade required" = "Database upgrade vereist";
+
+/* No comment provided by engineer. */
+"Error preparing file" = "Fout bij voorbereiden bestand";
+
+/* No comment provided by engineer. */
+"Error preparing message" = "Fout bij het voorbereiden van bericht";
+
+/* No comment provided by engineer. */
+"Error: %@" = "Fout: %@";
+
+/* No comment provided by engineer. */
+"File error" = "Bestandsfout";
+
+/* No comment provided by engineer. */
+"Incompatible database version" = "Incompatibele database versie";
+
+/* No comment provided by engineer. */
+"Invalid migration confirmation" = "Ongeldige migratie bevestiging";
+
+/* No comment provided by engineer. */
+"Keychain error" = "Keychain fout";
+
+/* No comment provided by engineer. */
+"Large file!" = "Groot bestand!";
+
+/* No comment provided by engineer. */
+"No active profile" = "Geen actief profiel";
+
+/* No comment provided by engineer. */
+"Ok" = "Ok";
+
+/* No comment provided by engineer. */
+"Open the app to downgrade the database." = "Open de app om de database te downgraden.";
+
+/* No comment provided by engineer. */
+"Open the app to upgrade the database." = "Open de app om de database te upgraden.";
+
+/* No comment provided by engineer. */
+"Passphrase" = "Wachtwoord";
+
+/* No comment provided by engineer. */
+"Please create a profile in the SimpleX app" = "Maak een profiel aan in de SimpleX app";
+
+/* No comment provided by engineer. */
+"Selected chat preferences prohibit this message." = "Geselecteerde chat voorkeuren verbieden dit bericht.";
+
+/* No comment provided by engineer. */
+"Sending a message takes longer than expected." = "Het verzenden van een bericht duurt langer dan verwacht.";
+
+/* No comment provided by engineer. */
+"Sending message…" = "Bericht versturen…";
+
+/* No comment provided by engineer. */
+"Share" = "Deel";
+
+/* No comment provided by engineer. */
+"Slow network?" = "Traag netwerk?";
+
+/* No comment provided by engineer. */
+"Unknown database error: %@" = "Onbekende database fout: %@";
+
+/* No comment provided by engineer. */
+"Unsupported format" = "Niet ondersteund formaat";
+
+/* No comment provided by engineer. */
+"Wait" = "wachten";
+
+/* No comment provided by engineer. */
+"Wrong database passphrase" = "Verkeerde database wachtwoord";
+
+/* No comment provided by engineer. */
+"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "U kunt delen toestaan in de instellingen voor Privacy en beveiliging / SimpleX Lock.";

-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
@@ -1,7 +1,9 @@
-/* 
-  InfoPlist.strings
-  SimpleX
+/* Bundle display name */
+"CFBundleDisplayName" = "SimpleX SE";
+
+/* Bundle name */
+"CFBundleName" = "SimpleX SE";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Wszelkie prawa zastrzeżone.";

-  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!" = "Aplikacja zablokowana!";
+
+/* No comment provided by engineer. */
+"Cancel" = "Anuluj";
+
+/* No comment provided by engineer. */
+"Cannot access keychain to save database password" = "Nie można uzyskać dostępu do pęku kluczy aby zapisać hasło do bazy danych";
+
+/* No comment provided by engineer. */
+"Cannot forward message" = "Nie można przekazać wiadomości";
+
+/* No comment provided by engineer. */
+"Comment" = "Komentarz";
+
+/* No comment provided by engineer. */
+"Currently maximum supported file size is %@." = "Obecnie maksymalny obsługiwany rozmiar pliku to %@.";
+
+/* No comment provided by engineer. */
+"Database downgrade required" = "Wymagane obniżenie wersji bazy danych";
+
+/* No comment provided by engineer. */
+"Database encrypted!" = "Baza danych zaszyfrowana!";
+
+/* No comment provided by engineer. */
+"Database error" = "Błąd bazy danych";
+
+/* No comment provided by engineer. */
+"Database passphrase is different from saved in the keychain." = "Hasło bazy danych jest inne niż zapisane w pęku kluczy.";
+
+/* No comment provided by engineer. */
+"Database passphrase is required to open chat." = "Hasło do bazy danych jest wymagane do otwarcia czatu.";
+
+/* No comment provided by engineer. */
+"Database upgrade required" = "Wymagana aktualizacja bazy danych";
+
+/* No comment provided by engineer. */
+"Error preparing file" = "Błąd przygotowania pliku";
+
+/* No comment provided by engineer. */
+"Error preparing message" = "Błąd przygotowania wiadomości";
+
+/* No comment provided by engineer. */
+"Error: %@" = "Błąd: %@";
+
+/* No comment provided by engineer. */
+"File error" = "Błąd pliku";
+
+/* No comment provided by engineer. */
+"Incompatible database version" = "Niekompatybilna wersja bazy danych";
+
+/* No comment provided by engineer. */
+"Invalid migration confirmation" = "Nieprawidłowe potwierdzenie migracji";
+
+/* No comment provided by engineer. */
+"Keychain error" = "Błąd pęku kluczy";
+
+/* No comment provided by engineer. */
+"Large file!" = "Duży plik!";
+
+/* No comment provided by engineer. */
+"No active profile" = "Brak aktywnego profilu";
+
+/* No comment provided by engineer. */
+"Ok" = "Ok";
+
+/* No comment provided by engineer. */
+"Open the app to downgrade the database." = "Otwórz aplikację aby obniżyć wersję bazy danych.";
+
+/* No comment provided by engineer. */
+"Open the app to upgrade the database." = "Otwórz aplikację aby zaktualizować bazę danych.";
+
+/* No comment provided by engineer. */
+"Passphrase" = "Hasło";
+
+/* No comment provided by engineer. */
+"Please create a profile in the SimpleX app" = "Proszę utworzyć profil w aplikacji SimpleX";
+
+/* No comment provided by engineer. */
+"Selected chat preferences prohibit this message." = "Wybrane preferencje czatu zabraniają tej wiadomości.";
+
+/* No comment provided by engineer. */
+"Sending a message takes longer than expected." = "Wysłanie wiadomości trwa dłużej niż oczekiwano.";
+
+/* No comment provided by engineer. */
+"Sending message…" = "Wysyłanie wiadomości…";
+
+/* No comment provided by engineer. */
+"Share" = "Udostępnij";
+
+/* No comment provided by engineer. */
+"Slow network?" = "Wolna sieć?";
+
+/* No comment provided by engineer. */
+"Unknown database error: %@" = "Nieznany błąd bazy danych: %@";
+
+/* No comment provided by engineer. */
+"Unsupported format" = "Niewspierany format";
+
+/* No comment provided by engineer. */
+"Wait" = "Czekaj";
+
+/* No comment provided by engineer. */
+"Wrong database passphrase" = "Nieprawidłowe hasło bazy danych";
+
+/* No comment provided by engineer. */
+"You can allow sharing in Privacy & Security / SimpleX Lock settings." = "Możesz zezwolić na udostępnianie w ustawieniach Prywatność i bezpieczeństwo / Blokada SimpleX.";

-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
@@ -1,7 +1,9 @@
-/* 
-  InfoPlist.strings
-  SimpleX
+/* Bundle display name */
+"CFBundleDisplayName" = "SimpleX SE";
+
+/* Bundle name */
+"CFBundleName" = "SimpleX SE";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "Copyright © 2024 SimpleX Chat. Все права защищены.";

-  Created by EP on 30/07/2024.
-  Copyright © 2024 SimpleX Chat. All rights reserved.
-*/
@@ -1,3 +1,111 @@
+/* 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" = "Невозможно сохранить пароль в keychain";
+
+/* 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." = "Пароль базы данных отличается от сохраненного в 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" = "Ошибка keychain";
+
+/* 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.";
+
--- a/Show More
+++ b/Show More