diff --git a/apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift b/apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift
index 30ed3fa1a4..e743e0bffa 100644
--- a/apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatItem/MsgContentView.swift
@@ -93,7 +93,18 @@ struct MsgContentView: View {
 
     @inline(__always)
     private func msgContentView() -> some View {
-        let r = messageText(text, formattedText, textStyle: textStyle, sender: sender, mentions: mentions, userMemberId: userMemberId, showSecrets: showSecrets, backgroundColor: containerBackground, prefix: prefix)
+        let r = messageText(
+            text,
+            formattedText,
+            textStyle: textStyle,
+            sender: sender,
+            mentions: mentions,
+            userMemberId: userMemberId,
+            showSecrets: showSecrets,
+            commands: chat.chatInfo.useCommands && chat.chatInfo.sndReady,
+            backgroundColor: containerBackground,
+            prefix: prefix
+        )
         let s = r.string
         let t: Text
         if let mt = meta {
@@ -104,7 +115,7 @@ struct MsgContentView: View {
         } else {
             t = Text(AttributedString(s))
         }
-        return msgTextResultView(r, t, showSecrets: $showSecrets)
+        return msgTextResultView(r, t, showSecrets: $showSecrets, sendCommand: { cmd in sendCommandMsg(chat, cmd) })
     }
 
     @inline(__always)
@@ -120,14 +131,27 @@ struct MsgContentView: View {
     }
 }
 
-func msgTextResultView(_ r: MsgTextResult, _ t: Text, showSecrets: Binding<Set<Int>>? = nil, centered: Bool = false, smallFont: Bool = false) -> some View {
+func msgTextResultView(
+    _ r: MsgTextResult,
+    _ t: Text,
+    showSecrets: Binding<Set<Int>>? = nil,
+    sendCommand: ((String) -> Void)? = nil,
+    centered: Bool = false,
+    smallFont: Bool = false
+) -> some View {
     t.if(r.hasSecrets, transform: hiddenSecretsView)
-        .if(r.handleTaps) { $0.overlay(handleTextTaps(r.string, showSecrets: showSecrets, centered: centered, smallFont: smallFont)) }
+        .if(r.handleTaps) { $0.overlay(handleTextTaps(r.string, showSecrets: showSecrets, sendCommand: sendCommand, centered: centered, smallFont: smallFont)) }
 }
 
 // smallFont parameter is used to pad height, otherwise CTFrameGetLines fails to see them as lines - it's needed if font is not .body
 @inline(__always)
-private func handleTextTaps(_ s: NSAttributedString, showSecrets: Binding<Set<Int>>? = nil, centered: Bool, smallFont: Bool) -> some View {
+private func handleTextTaps(
+    _ s: NSAttributedString,
+    showSecrets: Binding<Set<Int>>? = nil,
+    sendCommand: ((String) -> Void)? = nil,
+    centered: Bool,
+    smallFont: Bool
+) -> some View {
     return GeometryReader { g in
         Rectangle()
             .fill(Color.clear)
@@ -187,6 +211,8 @@ private func handleTextTaps(_ s: NSAttributedString, showSecrets: Binding<Set<In
                     } else {
                         showSecrets.wrappedValue.insert(i)
                     }
+                } else if let sendCommand, let cmd = attrs[commandAttrKey] as? String {
+                    sendCommand(cmd)
                 }
                 stop.pointee = true
             }
@@ -218,6 +244,8 @@ private let webLinkAttrKey = NSAttributedString.Key("chat.simplex.app.webLink")
 
 private let secretAttrKey = NSAttributedString.Key("chat.simplex.app.secret")
 
+private let commandAttrKey = NSAttributedString.Key("chat.simplex.app.command")
+
 typealias MsgTextResult = (string: NSMutableAttributedString, hasSecrets: Bool, handleTaps: Bool)
 
 @inline(__always)
@@ -240,6 +268,7 @@ func markdownText(
         mentions: mentions,
         userMemberId: userMemberId,
         showSecrets: showSecrets,
+        commands: false,
         backgroundColor: UIColor(backgroundColor)
     )
 }
@@ -254,6 +283,7 @@ func messageText(
     mentions: [String: CIMention]?,
     userMemberId: String?,
     showSecrets: Set<Int>?,
+    commands: Bool = false,
     backgroundColor: UIColor,
     prefix: NSAttributedString? = nil
 ) -> MsgTextResult {
@@ -343,6 +373,15 @@ func messageText(
                 if case .description = privacySimplexLinkModeDefault.get() {
                     t = simplexLinkText(linkType, smpHosts)
                 }
+            case let .command(cmdStr):
+                snippet = snippet ?? UIFont.monospacedSystemFont(ofSize: descr.pointSize, weight: .regular)
+                attrs[.font] = snippet
+                t = "/" + cmdStr
+                if !preview && commands {
+                    attrs[.foregroundColor] = uiLinkColor
+                    attrs[commandAttrKey] = t
+                    handleTaps = true
+                }
             case let .mention(memberName):
                 if let m = mentions?[memberName] {
                     mention = mention ?? UIFont(descriptor: descr.addingAttributes([.traits: [UIFontDescriptor.TraitKey.weight: UIFont.Weight.semibold]]), size: descr.pointSize)
diff --git a/apps/ios/Shared/Views/Chat/ChatView.swift b/apps/ios/Shared/Views/Chat/ChatView.swift
index 712a88114f..2f8d6f2acd 100644
--- a/apps/ios/Shared/Views/Chat/ChatView.swift
+++ b/apps/ios/Shared/Views/Chat/ChatView.swift
@@ -59,6 +59,7 @@ struct ChatView: View {
     @State private var ignoreLoadingRequests: Int64? = nil
     @State private var animatedScrollingInProgress: Bool = false
     @State private var showUserSupportChatSheet = false
+    @State private var showCommandsMenu = false
 
     @State private var scrollView: EndlessScrollView<MergedItem> = EndlessScrollView(frame: .zero)
 
@@ -109,6 +110,9 @@ struct ChatView: View {
                     if let groupInfo = chat.chatInfo.groupInfo, !composeState.message.isEmpty {
                         GroupMentionsView(im: im, groupInfo: groupInfo, composeState: $composeState, selectedRange: $selectedRange, keyboardVisible: $keyboardVisible)
                     }
+                    if !chat.chatInfo.menuCommands.isEmpty {
+                        CommandsMenuView(chat: chat, composeState: $composeState, selectedRange: $selectedRange, showCommandsMenu: $showCommandsMenu)
+                    }
                     FloatingButtons(im: im, theme: theme, scrollView: scrollView, chat: chat, loadingMoreItems: $loadingMoreItems, loadingTopItems: $loadingTopItems, requestedTopScroll: $requestedTopScroll, loadingBottomItems: $loadingBottomItems, requestedBottomScroll: $requestedBottomScroll, animatedScrollingInProgress: $animatedScrollingInProgress, listState: scrollView.listState, model: floatingButtonModel, reloadItems: {
                             mergedItems.boxedValue = MergedItems.create(im, revealedItems)
                             scrollView.updateItems(mergedItems.boxedValue.items)
@@ -135,6 +139,7 @@ struct ChatView: View {
                         chat: chat,
                         im: im,
                         composeState: $composeState,
+                        showCommandsMenu: $showCommandsMenu,
                         keyboardVisible: $keyboardVisible,
                         keyboardHiddenDate: $keyboardHiddenDate,
                         selectedRange: $selectedRange,
@@ -919,10 +924,12 @@ struct ChatView: View {
                     case .inv:
                         "Tap Connect to chat"
                     case .con:
-                        "Tap Connect to send request"
+                        contact.isBot ? "Tap Connect to use bot" : "Tap Connect to send request"
                     }
                 } else if contact.nextAcceptContactRequest {
                     "Accept contact request"
+                } else if case .bot = contact.profile.peerType {
+                    "Bot"
                 } else {
                     "Your contact"
                 }
@@ -956,9 +963,7 @@ struct ChatView: View {
         switch (chat.chatInfo) {
         case let .direct(contact):
             if !contact.sndReady && contact.active && !contact.sendMsgToConnect && !contact.nextAcceptContactRequest {
-                contact.preparedContact?.uiConnLinkType == .con
-                ? "contact should accept…"
-                : contact.contactGroupMemberId != nil
+                (contact.preparedContact?.uiConnLinkType == .con && !contact.isBot) || contact.contactGroupMemberId != nil
                 ? "contact should accept…"
                 : "connecting…"
             } else {
diff --git a/apps/ios/Shared/Views/Chat/CommandsMenuView.swift b/apps/ios/Shared/Views/Chat/CommandsMenuView.swift
new file mode 100644
index 0000000000..525bf5725c
--- /dev/null
+++ b/apps/ios/Shared/Views/Chat/CommandsMenuView.swift
@@ -0,0 +1,187 @@
+//
+//  CommandsMenuView.swift
+//  SimpleX (iOS)
+//
+//  Created by EP on 03/08/2025.
+//  Copyright © 2025 SimpleX Chat. All rights reserved.
+//
+
+import SwiftUI
+import SimpleXChat
+
+let COMMAND_ROW_SIZE: CGFloat = 48
+let MAX_VISIBLE_COMMAND_ROWS: CGFloat = 5.8
+
+struct CommandsMenuView: View {
+    @EnvironmentObject var m: ChatModel
+    @EnvironmentObject var theme: AppTheme
+    @ObservedObject var chat: Chat
+    @Binding var composeState: ComposeState
+    @Binding var selectedRange: NSRange
+    @Binding var showCommandsMenu: Bool
+
+    @State private var currentCommands: [ChatBotCommand] = []
+    @State private var menuTreeBackPath: [(label: String, commands: [ChatBotCommand])] = []
+    @State private var keywordWidth: CGFloat = 0
+
+    var body: some View {
+        ZStack(alignment: .bottom) {
+            if !currentCommands.isEmpty {
+                Color.white.opacity(0.01)
+                    .edgesIgnoringSafeArea(.all)
+                    .onTapGesture {
+                        showCommandsMenu = false
+                        currentCommands = []
+                        menuTreeBackPath = []
+                    }
+                VStack(spacing: 0) {
+                    Spacer()
+                    let cmdsCount = currentCommands.count + (menuTreeBackPath.isEmpty ? 0 : 1)
+                    let scroll = ScrollView {
+                        VStack(spacing: 0) {
+                            if let prev = menuTreeBackPath.last {
+                                Divider()
+                                menuLabelRow(prev)
+                            }
+                            ForEach(currentCommands, id: \.self, content: commandRow)
+                        }
+                    }
+                    .frame(maxWidth: .infinity, maxHeight: COMMAND_ROW_SIZE * min(MAX_VISIBLE_COMMAND_ROWS, CGFloat(cmdsCount)))
+                    .background(theme.colors.background)
+
+                    if #available(iOS 16.0, *) {
+                        scroll.scrollDismissesKeyboard(.never)
+                    } else {
+                        scroll
+                    }
+                }
+                .onPreferenceChange(DetermineWidth.Key.self) { keywordWidth = $0 }
+            }
+        }
+        .onChange(of: composeState.message) { message in
+            let msg = message.trimmingCharacters(in: .whitespaces)
+            if msg == "/" {
+                currentCommands = chat.chatInfo.menuCommands
+            } else if msg.first == "/" {
+                currentCommands = filterShownCommands(chat.chatInfo.menuCommands, msg.dropFirst())
+            } else {
+                showCommandsMenu = false
+                currentCommands = []
+            }
+            menuTreeBackPath = []
+        }
+        .onChange(of: showCommandsMenu) { show in
+            currentCommands = show ? chat.chatInfo.menuCommands : []
+            menuTreeBackPath = []
+        }
+    }
+
+    private func menuLabelRow(_ prev: (label: String, commands: [ChatBotCommand])) -> some View {
+        HStack {
+            Image(systemName: "chevron.left")
+                .foregroundColor(theme.colors.secondary)
+            Text(prev.label)
+                .fontWeight(.medium)
+                .frame(maxWidth: .infinity)
+        }
+        .padding(.horizontal)
+        .frame(maxWidth: .infinity, alignment: .leading)
+        .frame(height: COMMAND_ROW_SIZE, alignment: .center)
+        .contentShape(Rectangle())
+        .onTapGesture {
+            if !menuTreeBackPath.isEmpty {
+                currentCommands = menuTreeBackPath.removeLast().commands
+            }
+        }
+    }
+
+    @ViewBuilder
+    private func commandRow(_ command: ChatBotCommand) -> some View {
+        Divider()
+        switch command {
+        case let .command(keyword, label, params):
+            HStack {
+                Text(label)
+                    .lineLimit(1)
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                Text("/" + keyword)
+                    .font(.subheadline)
+                    .lineLimit(1)
+                    .foregroundColor(theme.colors.secondary)
+                    .frame(minWidth: keywordWidth, alignment: .trailing)
+                    .overlay(DetermineWidth())
+            }
+            .padding(.horizontal)
+            .frame(height: COMMAND_ROW_SIZE, alignment: .center)
+            .contentShape(Rectangle())
+            .onTapGesture {
+                if let params {
+                    composeState.message = "/\(keyword) \(params)"
+                    selectedRange = NSRange(location: composeState.message.count, length: 0)
+                } else {
+                    composeState.message = ""
+                    sendCommandMsg(chat, "/\(keyword)")
+                }
+                showCommandsMenu = false
+                currentCommands = []
+                menuTreeBackPath = []
+            }
+        case let .menu(label, cmds):
+            HStack {
+                Text(label)
+                    .fontWeight(.medium)
+                    .lineLimit(1)
+                Spacer()
+                Image(systemName: "chevron.right")
+                    .foregroundColor(theme.colors.secondary)
+            }
+            .padding(.horizontal)
+            .frame(height: COMMAND_ROW_SIZE, alignment: .center)
+            .contentShape(Rectangle())
+            .onTapGesture {
+                menuTreeBackPath.append((label: label, commands: currentCommands))
+                currentCommands = cmds
+            }
+        }
+    }
+
+    private func filterShownCommands(_ commands: [ChatBotCommand], _ msg: String.SubSequence) -> [ChatBotCommand] {
+        var cmds: [ChatBotCommand] = []
+        for command in commands {
+            switch command {
+            case let .command(keyword, _, _):
+                if keyword.starts(with: msg) {
+                    cmds.append(command)
+                }
+            case let .menu(_, innerCmds):
+                cmds.append(contentsOf: filterShownCommands(innerCmds, msg))
+            }
+        }
+        return cmds
+    }
+}
+
+func sendCommandMsg(_ chat: Chat, _ cmd: String) {
+    if chat.chatInfo.sndReady {
+        Task {
+            if let chatItems = await apiSendMessages(
+                type: chat.chatInfo.chatType,
+                id: chat.chatInfo.apiId,
+                scope: chat.chatInfo.groupChatScope(),
+                composedMessages: [ComposedMessage(msgContent: .text(cmd))]
+            ) {
+                await MainActor.run {
+                    for ci in chatItems {
+                        ChatModel.shared.addChatItem(chat.chatInfo, ci)
+                    }
+                }
+            }
+        }
+    } else {
+        showAlert(
+            NSLocalizedString("You can't send messages!", comment: "alert title"),
+            message: NSLocalizedString("To send commands you must be connected.", comment: "alert message"),
+            actions: { [okAlertAction] }
+        )
+    }
+}
diff --git a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift
index 876761a588..a6e6518e7b 100644
--- a/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift
+++ b/apps/ios/Shared/Views/Chat/ComposeMessage/ComposeView.swift
@@ -323,6 +323,7 @@ struct ComposeView: View {
     @ObservedObject var chat: Chat
     @ObservedObject var im: ItemsModel
     @Binding var composeState: ComposeState
+    @Binding var showCommandsMenu: Bool
     @Binding var keyboardVisible: Bool
     @Binding var keyboardHiddenDate: Date
     @Binding var selectedRange: NSRange
@@ -410,18 +411,7 @@ struct ComposeView: View {
 
             if chat.chatInfo.groupInfo?.nextConnectPrepared == true {
                 if chat.chatInfo.groupInfo?.businessChat == nil {
-                    Button(action: connectPreparedGroup) {
-                        ZStack(alignment: .trailing) {
-                            Label("Join group", systemImage: "person.2.fill")
-                                .frame(maxWidth: .infinity)
-                            if composeState.progressByTimeout {
-                                ProgressView()
-                                    .padding()
-                            }
-                        }
-                    }
-                    .frame(height: 60)
-                    .disabled(composeState.inProgress)
+                    connectButtonView("Join group", icon: "person.2.fill", connect: connectPreparedGroup)
                 } else {
                     sendContactRequestView(disableSendButton, icon: "briefcase.fill", sendRequest: connectPreparedGroup)
                 }
@@ -429,27 +419,22 @@ struct ComposeView: View {
                 contextSendMessageToConnect("Send direct message to connect")
                 Divider()
                 HStack (alignment: .center) {
-                    attachmentButton().disabled(true)
+                    attachmentAndCommandsButtons().disabled(true)
                     sendMessageView(disableSendButton, sendToConnect: sendMemberContactInvitation)
                 }
                 .padding(.horizontal, 12)
-            } else if contact?.nextConnectPrepared == true, let linkType = contact?.preparedContact?.uiConnLinkType {
+            } else if let contact,
+                      contact.nextConnectPrepared == true,
+                      let linkType = contact.preparedContact?.uiConnLinkType {
                 switch linkType {
                 case .inv:
-                    Button(action: sendConnectPreparedContact) {
-                        ZStack(alignment: .trailing) {
-                            Label("Connect", systemImage: "person.fill.badge.plus")
-                                .frame(maxWidth: .infinity)
-                            if composeState.progressByTimeout {
-                                ProgressView()
-                                    .padding()
-                            }
-                        }
-                    }
-                    .frame(height: 60)
-                    .disabled(composeState.inProgress)
+                    connectButtonView("Connect", icon: "person.fill.badge.plus", connect: sendConnectPreparedContact)
                 case .con:
-                    sendContactRequestView(disableSendButton, icon: "person.fill.badge.plus", sendRequest: sendConnectPreparedContactRequest)
+                    if contact.isBot {
+                        connectButtonView("Connect", icon: "bolt.fill", connect: sendConnectPreparedContact)
+                    } else {
+                        sendContactRequestView(disableSendButton, icon: "person.fill.badge.plus", sendRequest: sendConnectPreparedContactRequest)
+                    }
                 }
             } else if contact?.nextAcceptContactRequest == true, let crId = contact?.contactRequestId {
                 ContextContactRequestActionsView(contactRequestId: crId)
@@ -457,7 +442,7 @@ struct ComposeView: View {
                 ContextMemberContactActionsView(contact: ct, groupDirectInv: groupDirectInv)
             } else {
                 HStack (alignment: .center) {
-                    attachmentButton()
+                    attachmentAndCommandsButtons()
                     sendMessageView(disableSendButton)
                 }
                 .padding(.horizontal, 12)
@@ -635,6 +620,21 @@ struct ComposeView: View {
         }
     }
 
+    private func connectButtonView(_ label: LocalizedStringKey, icon: String, connect: @escaping () -> Void) -> some View {
+        Button(action: connect) {
+            ZStack(alignment: .trailing) {
+                Label(label, systemImage: icon)
+                    .frame(maxWidth: .infinity)
+                if composeState.progressByTimeout {
+                    ProgressView()
+                        .padding()
+                }
+            }
+        }
+        .frame(height: 60)
+        .disabled(composeState.inProgress)
+    }
+
     private func sendContactRequestView(_ disableSendButton: Bool, icon: String, sendRequest: @escaping () -> Void) -> some View {
         HStack (alignment: .center) {
             sendMessageView(
@@ -703,6 +703,35 @@ struct ComposeView: View {
         }
     }
 
+    @ViewBuilder private func attachmentAndCommandsButtons() -> some View {
+        let msg = composeState.message.trimmingCharacters(in: .whitespaces)
+        let showAttachment = chat.chatInfo.contact?.profile.peerType != .bot || chat.chatInfo.featureEnabled(.files)
+        let showCommands = chat.chatInfo.useCommands && (!showAttachment || msg.isEmpty || msg.starts(with: "/"))
+        if showCommands {
+            commandsButton()
+        }
+        if showAttachment {
+            attachmentButton()
+                .padding(.trailing, 3)
+                .if(showCommands) { v in v.padding(.leading, 3) }
+        }
+    }
+
+    private func commandsButton() -> some View {
+        Button {
+            showCommandsMenu.toggle()
+        } label: {
+            Text(verbatim: "//")
+                .font(.title3)
+                .italic()
+                .contentShape(Rectangle())
+        }
+        .disabled(!chat.chatInfo.sendMsgEnabled || chat.chatInfo.menuCommands.isEmpty)
+        .frame(width: 25, height: 25)
+        .tint(theme.colors.primary)
+        .padding(.bottom, 2)
+    }
+
     @ViewBuilder private func attachmentButton() -> some View {
         let b = Button {
             showChooseSource = true
@@ -714,12 +743,11 @@ struct ComposeView: View {
             .frame(width: 25, height: 25)
             .tint(theme.colors.primary)
         if im.secondaryIMFilter == nil,
-           case let .group(g, _) = chat.chatInfo,
-           !g.fullGroupPreferences.files.on(for: g.membership) {
+           !chat.chatInfo.featureEnabled(.files) {
             b.disabled(true).onTapGesture {
                 AlertManager.shared.showAlertMsg(
                     title: "Files and media prohibited!",
-                    message: "Only group owners can enable files and media."
+                    message: chat.chatInfo.groupInfo == nil ? nil : "Only group owners can enable files and media."
                 )
             }
         } else {
@@ -750,7 +778,6 @@ struct ComposeView: View {
         }
     }
 
-    // TODO [short links] different messages for business
     private func sendConnectPreparedContactRequest() {
         hideKeyboard()
         let empty = composeState.whitespaceOnly
@@ -1489,33 +1516,3 @@ struct ComposeView: View {
         cancelledLinks = []
     }
 }
-
-struct ComposeView_Previews: PreviewProvider {
-    static var previews: some View {
-        let chat = Chat(chatInfo: ChatInfo.sampleData.direct, chatItems: [])
-        let im = ItemsModel.shared
-        @State var composeState = ComposeState(message: "hello")
-        @State var selectedRange = NSRange()
-
-        return Group {
-            ComposeView(
-                chat: chat,
-                im: im,
-                composeState: $composeState,
-                keyboardVisible: Binding.constant(true),
-                keyboardHiddenDate: Binding.constant(Date.now),
-                selectedRange: $selectedRange
-            )
-            .environmentObject(ChatModel())
-            ComposeView(
-                chat: chat,
-                im: im,
-                composeState: $composeState,
-                keyboardVisible: Binding.constant(true),
-                keyboardHiddenDate: Binding.constant(Date.now),
-                selectedRange: $selectedRange
-            )
-            .environmentObject(ChatModel())
-        }
-    }
-}
diff --git a/apps/ios/Shared/Views/Chat/Group/GroupMentions.swift b/apps/ios/Shared/Views/Chat/Group/GroupMentions.swift
index 07cc7bd217..440ed5227d 100644
--- a/apps/ios/Shared/Views/Chat/Group/GroupMentions.swift
+++ b/apps/ios/Shared/Views/Chat/Group/GroupMentions.swift
@@ -67,7 +67,7 @@ struct GroupMentionsView: View {
                             }
                         }
                             .frame(maxHeight: MEMBER_ROW_SIZE * min(MAX_VISIBLE_MEMBER_ROWS, CGFloat(filtered.count)))
-                            .background(Color(UIColor.systemBackground))
+                            .background(theme.colors.background)
 
                         if #available(iOS 16.0, *) {
                             scroll.scrollDismissesKeyboard(.never)
diff --git a/apps/ios/Shared/Views/ChatList/ChatPreviewView.swift b/apps/ios/Shared/Views/ChatList/ChatPreviewView.swift
index 79f72e539a..c56d947a5a 100644
--- a/apps/ios/Shared/Views/ChatList/ChatPreviewView.swift
+++ b/apps/ios/Shared/Views/ChatList/ChatPreviewView.swift
@@ -351,12 +351,14 @@ struct ChatPreviewView: View {
             if contact.isContactCard {
                 Text("Tap to Connect")
                     .foregroundColor(theme.colors.primary)
+            } else if contact.isBot && contact.nextConnectPrepared {
+                Text("Open to use bot")
             } else if contact.sendMsgToConnect {
                 Text("Open to connect")
             } else if contact.nextAcceptContactRequest {
                 Text("Open to accept")
             } else if !contact.sndReady && contact.activeConn != nil && contact.active {
-                contact.preparedContact?.uiConnLinkType == .con
+                (contact.preparedContact?.uiConnLinkType == .con && !contact.isBot) || contact.contactGroupMemberId != nil
                 ? Text("contact should accept…")
                 : Text("connecting…")
             } else {
diff --git a/apps/ios/Shared/Views/Helpers/ProfileImage.swift b/apps/ios/Shared/Views/Helpers/ProfileImage.swift
index 4cc244cb24..9c2916880c 100644
--- a/apps/ios/Shared/Views/Helpers/ProfileImage.swift
+++ b/apps/ios/Shared/Views/Helpers/ProfileImage.swift
@@ -27,6 +27,7 @@ struct ProfileImage: View {
             Image(systemName: iconName)
                 .resizable()
                 .foregroundColor(c)
+                .scaledToFit()
                 .frame(width: size, height: size)
                 .background(
                     Circle()
diff --git a/apps/ios/Shared/Views/NewChat/NewChatView.swift b/apps/ios/Shared/Views/NewChat/NewChatView.swift
index 432422d77b..3de1fdb972 100644
--- a/apps/ios/Shared/Views/NewChat/NewChatView.swift
+++ b/apps/ios/Shared/Views/NewChat/NewChatView.swift
@@ -1039,7 +1039,11 @@ private func showPrepareContactAlert(
         profileImage:
             ProfileImage(
                 imageStr: contactShortLinkData.profile.image,
-                iconName: contactShortLinkData.business ? "briefcase.circle.fill" : "person.crop.circle.fill",
+                iconName: contactShortLinkData.business
+                            ? "briefcase.circle.fill"
+                            : contactShortLinkData.profile.peerType == .bot
+                            ? "cube.fill"
+                            : "person.crop.circle.fill",
                 size: alertProfileImageSize
             ),
         theme: theme,
@@ -1112,7 +1116,7 @@ private func showOpenKnownContactAlert(
         profileImage:
             ProfileImage(
                 imageStr: contact.profile.image,
-                iconName: "person.crop.circle.fill",
+                iconName: contact.chatIconName,
                 size: alertProfileImageSize
             ),
         theme: theme,
@@ -1138,7 +1142,7 @@ private func showOpenKnownGroupAlert(
         profileImage:
             ProfileImage(
                 imageStr: groupInfo.groupProfile.image,
-                iconName: groupInfo.businessChat == nil ? "person.2.circle.fill" : "briefcase.circle.fill",
+                iconName: groupInfo.chatIconName,
                 size: alertProfileImageSize
             ),
         theme: theme,
diff --git a/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff b/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff
index c4f75e1989..bfa410ca8e 100644
--- a/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff	
+++ b/apps/ios/SimpleX Localizations/bg.xcloc/Localized Contents/bg.xliff	
@@ -855,6 +855,10 @@ swipe action</note>
         <target>Позволи понижаване</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Позволи необратимо изтриване на съобщение само ако вашият контакт го рарешава. (24 часа)</target>
@@ -939,6 +943,10 @@ swipe action</note>
         <target>Позволи на вашите контакти да изпращат изчезващи съобщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>Позволи на вашите контакти да изпращат гласови съобщения.</target>
@@ -1287,6 +1295,10 @@ swipe action</note>
         <target>Размазване на медия</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>И вие, и вашият контакт можете да добавяте реакции към съобщението.</target>
@@ -1307,6 +1319,10 @@ swipe action</note>
         <target>И вие, и вашият контакт можете да изпращате изчезващи съобщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>И вие, и вашият контакт можете да изпращате гласови съобщения.</target>
@@ -3607,6 +3623,10 @@ snd error text</note>
         <target>Файлове и медия</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>Файловете и медията са забранени в тази група.</target>
@@ -5378,6 +5398,10 @@ Requires compatible VPN.</source>
         <target>Само вие можете да изпращате изчезващи съобщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>Само вие можете да изпращате гласови съобщения.</target>
@@ -5403,6 +5427,10 @@ Requires compatible VPN.</source>
         <target>Само вашият контакт може да изпраща изчезващи съобщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>Само вашият контакт може да изпраща гласови съобщения.</target>
@@ -5470,6 +5498,10 @@ Requires compatible VPN.</source>
         <source>Open to join</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <target>Приложението се отваря…</target>
@@ -7431,6 +7463,10 @@ report reason</note>
         <source>Tap Connect to send request</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <note>No comment provided by engineer.</note>
@@ -7815,6 +7851,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <source>To send</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>За поддръжка на незабавни push известия, базата данни за чат трябва да бъде мигрирана.</target>
@@ -8658,7 +8698,7 @@ Repeat join request?</source>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Не може да изпращате съобщения!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff b/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff
index 0ae8e0a70a..87524b09ab 100644
--- a/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff	
+++ b/apps/ios/SimpleX Localizations/cs.xcloc/Localized Contents/cs.xliff	
@@ -819,6 +819,10 @@ swipe action</note>
         <source>Allow downgrade</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Povolte nevratné smazání zprávy pouze v případě, že vám to váš kontakt dovolí. (24 hodin)</target>
@@ -901,6 +905,10 @@ swipe action</note>
         <target>Umožněte svým kontaktům odesílat mizící zprávy.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>Povolte svým kontaktům odesílání hlasových zpráv.</target>
@@ -1219,6 +1227,10 @@ swipe action</note>
         <source>Blur media</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Vy i váš kontakt můžete přidávat reakce na zprávy.</target>
@@ -1239,6 +1251,10 @@ swipe action</note>
         <target>Vy i váš kontakt můžete posílat mizící zprávy.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>Hlasové zprávy můžete posílat vy i váš kontakt.</target>
@@ -3469,6 +3485,10 @@ snd error text</note>
         <target>Soubory a média</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>Soubory a média jsou zakázány v této skupině.</target>
@@ -5185,6 +5205,10 @@ Vyžaduje povolení sítě VPN.</target>
         <target>Mizící zprávy můžete odesílat pouze vy.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>Hlasové zprávy můžete posílat pouze vy.</target>
@@ -5210,6 +5234,10 @@ Vyžaduje povolení sítě VPN.</target>
         <target>Zmizelé zprávy může odesílat pouze váš kontakt.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>Hlasové zprávy může odesílat pouze váš kontakt.</target>
@@ -5275,6 +5303,10 @@ Vyžaduje povolení sítě VPN.</target>
         <source>Open to join</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <note>No comment provided by engineer.</note>
@@ -7190,6 +7222,10 @@ report reason</note>
         <source>Tap Connect to send request</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <note>No comment provided by engineer.</note>
@@ -7564,6 +7600,10 @@ Před zapnutím této funkce budete vyzváni k dokončení ověření.</target>
         <source>To send</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>Pro podporu doručování okamžitých upozornění musí být přenesena chat databáze.</target>
@@ -8365,7 +8405,7 @@ Repeat join request?</source>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Nemůžete posílat zprávy!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff
index cda7e1ead0..3a9c362405 100644
--- a/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff	
+++ b/apps/ios/SimpleX Localizations/de.xcloc/Localized Contents/de.xliff	
@@ -867,6 +867,10 @@ swipe action</note>
         <target>Herabstufung erlauben</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Erlauben Sie das unwiederbringliche Löschen von Nachrichten nur dann, wenn es Ihnen Ihr Kontakt ebenfalls erlaubt. (24 Stunden)</target>
@@ -952,6 +956,10 @@ swipe action</note>
         <target>Erlauben Sie Ihren Kontakten das Senden von verschwindenden Nachrichten.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>Erlauben Sie Ihren Kontakten Sprachnachrichten zu senden.</target>
@@ -1312,6 +1320,10 @@ swipe action</note>
         <target>Medien verpixeln</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Sowohl Sie, als auch Ihr Kontakt können Reaktionen auf Nachrichten geben.</target>
@@ -1332,6 +1344,10 @@ swipe action</note>
         <target>Ihr Kontakt und Sie können beide verschwindende Nachrichten senden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>Sowohl Ihr Kontakt, als auch Sie können Sprachnachrichten senden.</target>
@@ -3794,6 +3810,10 @@ snd error text</note>
         <target>Dateien und Medien</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>In dieser Gruppe sind Dateien und Medien nicht erlaubt.</target>
@@ -5684,6 +5704,10 @@ Dies erfordert die Aktivierung eines VPNs.</target>
         <target>Nur Sie können verschwindende Nachrichten senden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>Nur Sie können Sprachnachrichten versenden.</target>
@@ -5709,6 +5733,10 @@ Dies erfordert die Aktivierung eines VPNs.</target>
         <target>Nur Ihr Kontakt kann verschwindende Nachrichten senden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>Nur Ihr Kontakt kann Sprachnachrichten versenden.</target>
@@ -5784,6 +5812,10 @@ Dies erfordert die Aktivierung eines VPNs.</target>
         <target>Zum Beitreten öffnen</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <target>App wird geöffnet…</target>
@@ -7914,6 +7946,10 @@ report reason</note>
         <target>Verbinden tippen, um die Anfrage zu senden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <target>Tippen Sie im Menü auf SimpleX-Adresse erstellen, um sie später zu erstellen.</target>
@@ -8327,6 +8363,10 @@ Sie werden aufgefordert, die Authentifizierung abzuschließen, bevor diese Funkt
         <target>Für das Senden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>Um sofortige Push-Benachrichtigungen zu unterstützen, muss die Chat-Datenbank migriert werden.</target>
@@ -9224,7 +9264,7 @@ Verbindungsanfrage wiederholen?</target>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Sie können keine Nachrichten versenden!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff
index 947f0a2d6c..05b9b9bc9d 100644
--- a/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff	
+++ b/apps/ios/SimpleX Localizations/en.xcloc/Localized Contents/en.xliff	
@@ -867,6 +867,11 @@ swipe action</note>
         <target>Allow downgrade</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <target>Allow files and media only if your contact allows them.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</target>
@@ -952,6 +957,11 @@ swipe action</note>
         <target>Allow your contacts to send disappearing messages.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <target>Allow your contacts to send files and media.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>Allow your contacts to send voice messages.</target>
@@ -1312,6 +1322,11 @@ swipe action</note>
         <target>Blur media</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <target>Bot</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Both you and your contact can add message reactions.</target>
@@ -1332,6 +1347,11 @@ swipe action</note>
         <target>Both you and your contact can send disappearing messages.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <target>Both you and your contact can send files and media.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>Both you and your contact can send voice messages.</target>
@@ -3796,6 +3816,11 @@ snd error text</note>
         <target>Files and media</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <target>Files and media are prohibited in this chat.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>Files and media are prohibited.</target>
@@ -5687,6 +5712,11 @@ Requires compatible VPN.</target>
         <target>Only you can send disappearing messages.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <target>Only you can send files and media.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>Only you can send voice messages.</target>
@@ -5712,6 +5742,11 @@ Requires compatible VPN.</target>
         <target>Only your contact can send disappearing messages.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <target>Only your contact can send files and media.</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>Only your contact can send voice messages.</target>
@@ -5787,6 +5822,11 @@ Requires compatible VPN.</target>
         <target>Open to join</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <target>Open to use bot</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <target>Opening app…</target>
@@ -7917,6 +7957,11 @@ report reason</note>
         <target>Tap Connect to send request</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <target>Tap Connect to use bot</target>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <target>Tap Create SimpleX address in the menu to create it later.</target>
@@ -8331,6 +8376,11 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>To send</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <target>To send commands you must be connected.</target>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>To support instant push notifications the chat database has to be migrated.</target>
@@ -9228,7 +9278,7 @@ Repeat join request?</target>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>You can't send messages!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff b/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff
index b58f716f8e..1454ad639d 100644
--- a/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff	
+++ b/apps/ios/SimpleX Localizations/es.xcloc/Localized Contents/es.xliff	
@@ -867,6 +867,10 @@ swipe action</note>
         <target>Permitir versión anterior</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Se permite la eliminación irreversible de mensajes pero sólo si tu contacto también la permite para tí. (24 horas)</target>
@@ -952,6 +956,10 @@ swipe action</note>
         <target>Permites a tus contactos enviar mensajes temporales.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>Permites a tus contactos enviar mensajes de voz.</target>
@@ -1312,6 +1320,10 @@ swipe action</note>
         <target>Difuminar multimedia</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Tanto tú como tu contacto podéis añadir reacciones a los mensajes.</target>
@@ -1332,6 +1344,10 @@ swipe action</note>
         <target>Tanto tú como tu contacto podéis enviar mensajes temporales.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>Tanto tú como tu contacto podéis enviar mensajes de voz.</target>
@@ -3794,6 +3810,10 @@ snd error text</note>
         <target>Archivos y multimedia</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>Los archivos y multimedia no están permitidos en este grupo.</target>
@@ -5684,6 +5704,10 @@ Requiere activación de la VPN.</target>
         <target>Sólo tú puedes enviar mensajes temporales.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>Sólo tú puedes enviar mensajes de voz.</target>
@@ -5709,6 +5733,10 @@ Requiere activación de la VPN.</target>
         <target>Sólo tu contacto puede enviar mensajes temporales.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>Sólo tu contacto puede enviar mensajes de voz.</target>
@@ -5784,6 +5812,10 @@ Requiere activación de la VPN.</target>
         <target>Abrir para unirte</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <target>Iniciando aplicación…</target>
@@ -7914,6 +7946,10 @@ report reason</note>
         <target>Pulsa Conectar para enviar solicitud</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <target>Pulsa Crear dirección SimpleX en el menú para crearla más tarde.</target>
@@ -8327,6 +8363,10 @@ Se te pedirá que completes la autenticación antes de activar esta función.</t
         <target>Para enviar</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>Para permitir las notificaciones automáticas instantáneas, la base de datos se debe migrar.</target>
@@ -9224,7 +9264,7 @@ Repeat join request?</source>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>¡No puedes enviar mensajes!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff b/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff
index b5ba7bb864..4b42238a22 100644
--- a/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff	
+++ b/apps/ios/SimpleX Localizations/fi.xcloc/Localized Contents/fi.xliff	
@@ -792,6 +792,10 @@ swipe action</note>
         <source>Allow downgrade</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Salli peruuttamaton viestien poisto vain, jos kontaktisi sallii ne sinulle. (24 tuntia)</target>
@@ -874,6 +878,10 @@ swipe action</note>
         <target>Salli kontaktiesi lähettää katoavia viestejä.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>Salli kontaktiesi lähettää ääniviestejä.</target>
@@ -1191,6 +1199,10 @@ swipe action</note>
         <source>Blur media</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Sekä sinä että kontaktisi voivat käyttää viestireaktioita.</target>
@@ -1211,6 +1223,10 @@ swipe action</note>
         <target>Sekä sinä että kontaktisi voitte lähettää katoavia viestejä.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>Sekä sinä että kontaktisi voitte lähettää ääniviestejä.</target>
@@ -3437,6 +3453,10 @@ snd error text</note>
         <target>Tiedostot ja media</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>Tiedostot ja media ovat tässä ryhmässä kiellettyjä.</target>
@@ -5152,6 +5172,10 @@ Edellyttää VPN:n sallimista.</target>
         <target>Vain sinä voit lähettää katoavia viestejä.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>Vain sinä voit lähettää ääniviestejä.</target>
@@ -5177,6 +5201,10 @@ Edellyttää VPN:n sallimista.</target>
         <target>Vain kontaktisi voi lähettää katoavia viestejä.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>Vain kontaktisi voi lähettää ääniviestejä.</target>
@@ -5241,6 +5269,10 @@ Edellyttää VPN:n sallimista.</target>
         <source>Open to join</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <note>No comment provided by engineer.</note>
@@ -7154,6 +7186,10 @@ report reason</note>
         <source>Tap Connect to send request</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <note>No comment provided by engineer.</note>
@@ -7528,6 +7564,10 @@ Sinua kehotetaan suorittamaan todennus loppuun, ennen kuin tämä ominaisuus ote
         <source>To send</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>Keskustelujen-tietokanta on siirrettävä välittömien push-ilmoitusten tukemiseksi.</target>
@@ -8328,7 +8368,7 @@ Repeat join request?</source>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Et voi lähettää viestejä!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff b/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff
index 8072b5784b..36c1fdfc91 100644
--- a/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff	
+++ b/apps/ios/SimpleX Localizations/fr.xcloc/Localized Contents/fr.xliff	
@@ -861,6 +861,10 @@ swipe action</note>
         <target>Autoriser la rétrogradation</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Autoriser la suppression irréversible des messages uniquement si votre contact vous l'autorise. (24 heures)</target>
@@ -946,6 +950,10 @@ swipe action</note>
         <target>Autorise votre contact à envoyer des messages éphémères.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>Autorise vos contacts à envoyer des messages vocaux.</target>
@@ -1303,6 +1311,10 @@ swipe action</note>
         <target>Flouter les médias</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Vous et votre contact pouvez ajouter des réactions aux messages.</target>
@@ -1323,6 +1335,10 @@ swipe action</note>
         <target>Vous et votre contact êtes tous deux en mesure d'envoyer des messages éphémères.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>Vous et votre contact êtes tous deux en mesure d'envoyer des messages vocaux.</target>
@@ -3767,6 +3783,10 @@ snd error text</note>
         <target>Fichiers et médias</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>Les fichiers et les médias sont interdits dans ce groupe.</target>
@@ -5611,6 +5631,10 @@ Nécessite l'activation d'un VPN.</target>
         <target>Seulement vous pouvez envoyer des messages éphémères.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>Vous seul pouvez envoyer des messages vocaux.</target>
@@ -5636,6 +5660,10 @@ Nécessite l'activation d'un VPN.</target>
         <target>Seulement votre contact peut envoyer des messages éphémères.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>Seul votre contact peut envoyer des messages vocaux.</target>
@@ -5705,6 +5733,10 @@ Nécessite l'activation d'un VPN.</target>
         <source>Open to join</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <target>Ouverture de l'app…</target>
@@ -7779,6 +7811,10 @@ report reason</note>
         <source>Tap Connect to send request</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <target>Appuyez sur Créer une adresse SimpleX dans le menu pour la créer ultérieurement.</target>
@@ -8184,6 +8220,10 @@ Vous serez invité à confirmer l'authentification avant que cette fonction ne s
         <target>Pour envoyer</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>Pour prendre en charge les notifications push instantanées, la base de données du chat doit être migrée.</target>
@@ -9065,7 +9105,7 @@ Répéter la demande d'adhésion ?</target>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Vous ne pouvez pas envoyer de messages !</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff b/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff
index 1339f0ce74..156d12ea9f 100644
--- a/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff	
+++ b/apps/ios/SimpleX Localizations/hu.xcloc/Localized Contents/hu.xliff	
@@ -867,6 +867,10 @@ swipe action</note>
         <target>Visszafejlesztés engedélyezése</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Az üzenetek végleges törlése csak abban az esetben van engedélyezve, ha a partnere is engedélyezi. (24 óra)</target>
@@ -952,6 +956,10 @@ swipe action</note>
         <target>Az eltűnő üzenetek küldésének engedélyezése a partnerei számára.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>A hangüzenetek küldése engedélyezve van a partnerei számára.</target>
@@ -1312,6 +1320,10 @@ swipe action</note>
         <target>Médiatartalom elhomályosítása</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Mindkét fél hozzáadhat az üzenetekhez reakciókat.</target>
@@ -1332,6 +1344,10 @@ swipe action</note>
         <target>Mindkét fél küldhet eltűnő üzeneteket.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>Mindkét fél küldhet hangüzeneteket.</target>
@@ -3794,6 +3810,10 @@ snd error text</note>
         <target>Fájlok és médiatartalmak</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>A fájlok- és a médiatartalmak küldése le van tiltva.</target>
@@ -5684,6 +5704,10 @@ VPN engedélyezése szükséges.</target>
         <target>Csak Ön tud eltűnő üzeneteket küldeni.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>Csak Ön tud hangüzeneteket küldeni.</target>
@@ -5709,6 +5733,10 @@ VPN engedélyezése szükséges.</target>
         <target>Csak a partnere tud eltűnő üzeneteket küldeni.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>Csak a partnere tud hangüzeneteket küldeni.</target>
@@ -5784,6 +5812,10 @@ VPN engedélyezése szükséges.</target>
         <target>Megnyitás a csatlakozáshoz</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <target>Az alkalmazás megnyitása…</target>
@@ -7914,6 +7946,10 @@ report reason</note>
         <target>Koppintson a „Kapcsolódás” gombra a kérés elküldéséhez</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <target>Koppintson a SimpleX-cím létrehozása menüpontra a későbbi létrehozáshoz.</target>
@@ -8327,6 +8363,10 @@ A funkció bekapcsolása előtt a rendszer felszólítja a képernyőzár beáll
         <target>A küldéshez</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>Az azonnali push-értesítések támogatásához a csevegési adatbázis átköltöztetése szükséges.</target>
@@ -9224,7 +9264,7 @@ Megismétli a csatlakozási kérést?</target>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Nem lehet üzeneteket küldeni!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff b/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff
index 4b51e9dae3..5d3e962d25 100644
--- a/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff	
+++ b/apps/ios/SimpleX Localizations/it.xcloc/Localized Contents/it.xliff	
@@ -867,6 +867,10 @@ swipe action</note>
         <target>Consenti downgrade</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Consenti l'eliminazione irreversibile dei messaggi solo se il contatto la consente a te. (24 ore)</target>
@@ -952,6 +956,10 @@ swipe action</note>
         <target>Permetti ai tuoi contatti di inviare messaggi a tempo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>Permetti ai tuoi contatti di inviare messaggi vocali.</target>
@@ -1312,6 +1320,10 @@ swipe action</note>
         <target>Sfocatura dei file multimediali</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Sia tu che il tuo contatto potete aggiungere reazioni ai messaggi.</target>
@@ -1332,6 +1344,10 @@ swipe action</note>
         <target>Sia tu che il tuo contatto potete inviare messaggi a tempo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>Sia tu che il tuo contatto potete inviare messaggi vocali.</target>
@@ -3794,6 +3810,10 @@ snd error text</note>
         <target>File e multimediali</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>File e contenuti multimediali sono vietati in questo gruppo.</target>
@@ -5684,6 +5704,10 @@ Richiede l'attivazione della VPN.</target>
         <target>Solo tu puoi inviare messaggi a tempo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>Solo tu puoi inviare messaggi vocali.</target>
@@ -5709,6 +5733,10 @@ Richiede l'attivazione della VPN.</target>
         <target>Solo il tuo contatto può inviare messaggi a tempo.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>Solo il tuo contatto può inviare messaggi vocali.</target>
@@ -5784,6 +5812,10 @@ Richiede l'attivazione della VPN.</target>
         <target>Apri per entrare</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <target>Apertura dell'app…</target>
@@ -7914,6 +7946,10 @@ report reason</note>
         <target>Tocca Connetti per inviare la richiesta</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <target>Tocca Crea indirizzo SimpleX nel menu per crearlo più tardi.</target>
@@ -8327,6 +8363,10 @@ Ti verrà chiesto di completare l'autenticazione prima di attivare questa funzio
         <target>Per inviare</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>Per supportare le notifiche push istantanee, il database della chat deve essere migrato.</target>
@@ -9224,7 +9264,7 @@ Ripetere la richiesta di ingresso?</target>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Non puoi inviare messaggi!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff b/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff
index 743c5392e6..b76edfc106 100644
--- a/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff	
+++ b/apps/ios/SimpleX Localizations/ja.xcloc/Localized Contents/ja.xliff	
@@ -831,6 +831,10 @@ swipe action</note>
         <source>Allow downgrade</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>送信相手も永久メッセージ削除を許可する時のみに許可する。(24時間)</target>
@@ -915,6 +919,10 @@ swipe action</note>
         <target>送信相手が消えるメッセージを送るのを許可する。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>送信相手からの音声メッセージを許可する。</target>
@@ -1240,6 +1248,10 @@ swipe action</note>
         <source>Blur media</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>自分も相手もメッセージへのリアクションを追加できます。</target>
@@ -1260,6 +1272,10 @@ swipe action</note>
         <target>あなたと連絡相手が消えるメッセージを送信できます。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>あなたと連絡相手が音声メッセージを送信できます。</target>
@@ -3510,6 +3526,10 @@ snd error text</note>
         <target>ファイルとメディア</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>このグループでは、ファイルとメディアは禁止されています。</target>
@@ -5228,6 +5248,10 @@ VPN を有効にする必要があります。</target>
         <target>消えるメッセージを送れるのはあなただけです。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>音声メッセージを送れるのはあなただけです。</target>
@@ -5253,6 +5277,10 @@ VPN を有効にする必要があります。</target>
         <target>消えるメッセージを送れるのはあなたの連絡相手だけです。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>音声メッセージを送れるのはあなたの連絡相手だけです。</target>
@@ -5318,6 +5346,10 @@ VPN を有効にする必要があります。</target>
         <source>Open to join</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <note>No comment provided by engineer.</note>
@@ -7225,6 +7257,10 @@ report reason</note>
         <source>Tap Connect to send request</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <note>No comment provided by engineer.</note>
@@ -7598,6 +7634,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <source>To send</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>インスタント プッシュ通知をサポートするには、チャット データベースを移行する必要があります。</target>
@@ -8399,7 +8439,7 @@ Repeat join request?</source>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>メッセージを送信できませんでした！</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff b/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff
index 6d65bd070f..495fd3ee1a 100644
--- a/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff	
+++ b/apps/ios/SimpleX Localizations/nl.xcloc/Localized Contents/nl.xliff	
@@ -865,6 +865,10 @@ swipe action</note>
         <target>Downgraden toestaan</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Sta het definitief verwijderen van berichten alleen toe als uw contact dit toestaat. (24 uur)</target>
@@ -950,6 +954,10 @@ swipe action</note>
         <target>Sta toe dat uw contacten verdwijnende berichten verzenden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>Sta toe dat uw contacten spraak berichten verzenden.</target>
@@ -1308,6 +1316,10 @@ swipe action</note>
         <target>Vervaag media</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Zowel u als uw contact kunnen bericht reacties toevoegen.</target>
@@ -1328,6 +1340,10 @@ swipe action</note>
         <target>Zowel jij als je contact kunnen verdwijnende berichten sturen.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>Zowel jij als je contact kunnen spraak berichten verzenden.</target>
@@ -3778,6 +3794,10 @@ snd error text</note>
         <target>Bestanden en media</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>Bestanden en media zijn niet toegestaan.</target>
@@ -5660,6 +5680,10 @@ Vereist het inschakelen van VPN.</target>
         <target>Alleen jij kunt verdwijnende berichten verzenden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>Alleen jij kunt spraak berichten verzenden.</target>
@@ -5685,6 +5709,10 @@ Vereist het inschakelen van VPN.</target>
         <target>Alleen uw contact kan verdwijnende berichten verzenden.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>Alleen uw contact kan spraak berichten verzenden.</target>
@@ -5755,6 +5783,10 @@ Vereist het inschakelen van VPN.</target>
         <source>Open to join</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <target>App openen…</target>
@@ -7866,6 +7898,10 @@ report reason</note>
         <source>Tap Connect to send request</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <target>Tik op SimpleX-adres maken in het menu om het later te maken.</target>
@@ -8275,6 +8311,10 @@ U wordt gevraagd de authenticatie te voltooien voordat deze functie wordt ingesc
         <target>Om te verzenden</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>Om directe push meldingen te ondersteunen, moet de chat database worden gemigreerd.</target>
@@ -9163,7 +9203,7 @@ Deelnameverzoek herhalen?</target>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Je kunt geen berichten versturen!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff b/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff
index 5dd679dfff..224bc41e42 100644
--- a/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff	
+++ b/apps/ios/SimpleX Localizations/pl.xcloc/Localized Contents/pl.xliff	
@@ -861,6 +861,10 @@ swipe action</note>
         <target>Zezwól na obniżenie wersji</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Zezwalaj na nieodwracalne usuwanie wiadomości tylko wtedy, gdy Twój kontakt Ci na to pozwoli. (24 godziny)</target>
@@ -946,6 +950,10 @@ swipe action</note>
         <target>Zezwól swoim kontaktom na wysyłanie znikających wiadomości.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>Zezwól swoim kontaktom na wysyłanie wiadomości głosowych.</target>
@@ -1302,6 +1310,10 @@ swipe action</note>
         <target>Rozmycie mediów</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Zarówno Ty, jak i Twój kontakt możecie dodawać reakcje wiadomości.</target>
@@ -1322,6 +1334,10 @@ swipe action</note>
         <target>Zarówno Ty, jak i Twój kontakt możecie wysyłać znikające wiadomości.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>Zarówno Ty, jak i Twój kontakt możecie wysyłać wiadomości głosowe.</target>
@@ -3708,6 +3724,10 @@ snd error text</note>
         <target>Pliki i media</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>Pliki i media są zabronione w tej grupie.</target>
@@ -5525,6 +5545,10 @@ Wymaga włączenia VPN.</target>
         <target>Tylko Ty możesz wysyłać znikające wiadomości.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>Tylko Ty możesz wysyłać wiadomości głosowe.</target>
@@ -5550,6 +5574,10 @@ Wymaga włączenia VPN.</target>
         <target>Tylko Twój kontakt może wysyłać znikające wiadomości.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>Tylko Twój kontakt może wysyłać wiadomości głosowe.</target>
@@ -5617,6 +5645,10 @@ Wymaga włączenia VPN.</target>
         <source>Open to join</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <target>Otwieranie aplikacji…</target>
@@ -7669,6 +7701,10 @@ report reason</note>
         <source>Tap Connect to send request</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <note>No comment provided by engineer.</note>
@@ -8064,6 +8100,10 @@ Przed włączeniem tej funkcji zostanie wyświetlony monit uwierzytelniania.</ta
         <source>To send</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>Aby obsługiwać natychmiastowe powiadomienia push, należy zmigrować bazę danych czatu.</target>
@@ -8933,7 +8973,7 @@ Powtórzyć prośbę dołączenia?</target>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Nie możesz wysyłać wiadomości!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff
index 156c341f8a..00f91be200 100644
--- a/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff	
+++ b/apps/ios/SimpleX Localizations/ru.xcloc/Localized Contents/ru.xliff	
@@ -867,6 +867,10 @@ swipe action</note>
         <target>Разрешить прямую доставку</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Разрешить необратимое удаление сообщений, только если Ваш контакт разрешает это Вам. (24 часа)</target>
@@ -952,6 +956,10 @@ swipe action</note>
         <target>Разрешить Вашим контактам отправлять исчезающие сообщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>Разрешить Вашим контактам отправлять голосовые сообщения.</target>
@@ -1312,6 +1320,10 @@ swipe action</note>
         <target>Размытие изображений</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>И Вы, и Ваш контакт можете добавлять реакции на сообщения.</target>
@@ -1332,6 +1344,10 @@ swipe action</note>
         <target>Вы и Ваш контакт можете отправлять исчезающие сообщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>Вы и Ваш контакт можете отправлять голосовые сообщения.</target>
@@ -3796,6 +3812,10 @@ snd error text</note>
         <target>Файлы и медиа</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>Файлы и медиа запрещены в этой группе.</target>
@@ -5686,6 +5706,10 @@ Requires compatible VPN.</source>
         <target>Только Вы можете отправлять исчезающие сообщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>Только Вы можете отправлять голосовые сообщения.</target>
@@ -5711,6 +5735,10 @@ Requires compatible VPN.</source>
         <target>Только Ваш контакт может отправлять исчезающие сообщения.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>Только Ваш контакт может отправлять голосовые сообщения.</target>
@@ -5786,6 +5814,10 @@ Requires compatible VPN.</source>
         <target>Откройте чтобы вступить</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <target>Приложение отрывается…</target>
@@ -7916,6 +7948,10 @@ report reason</note>
         <target>Нажмите Соединиться, чтобы отправить запрос</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <target>Нажмите Создать адрес SimpleX в меню, чтобы создать его позже.</target>
@@ -8330,6 +8366,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>Для оправки</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>Для поддержки мгновенный доставки уведомлений данные чата должны быть перемещены.</target>
@@ -9227,7 +9267,7 @@ Repeat join request?</source>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Вы не можете отправлять сообщения!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff b/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff
index b7fbf073bd..2c514afc72 100644
--- a/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff	
+++ b/apps/ios/SimpleX Localizations/th.xcloc/Localized Contents/th.xliff	
@@ -784,6 +784,10 @@ swipe action</note>
         <source>Allow downgrade</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>อนุญาตให้ลบข้อความแบบถาวรเฉพาะในกรณีที่ผู้ติดต่อของคุณอนุญาตให้คุณเท่านั้น</target>
@@ -866,6 +870,10 @@ swipe action</note>
         <target>อนุญาตให้ผู้ติดต่อของคุณส่งข้อความที่จะหายไปหลังปิดแชท (disappearing messages)</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>อนุญาตให้ผู้ติดต่อของคุณส่งข้อความเสียง</target>
@@ -1183,6 +1191,10 @@ swipe action</note>
         <source>Blur media</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>ทั้งคุณและผู้ติดต่อของคุณสามารถเพิ่มปฏิกิริยาของข้อความได้</target>
@@ -1203,6 +1215,10 @@ swipe action</note>
         <target>ทั้งคุณและผู้ติดต่อของคุณสามารถส่งข้อความที่หายไปได้</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>ทั้งคุณและผู้ติดต่อของคุณสามารถส่งข้อความเสียงได้</target>
@@ -3422,6 +3438,10 @@ snd error text</note>
         <target>ไฟล์และสื่อ</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>ไฟล์และสื่อเป็นสิ่งต้องห้ามในกลุ่มนี้</target>
@@ -5131,6 +5151,10 @@ Requires compatible VPN.</source>
         <target>มีเพียงคุณเท่านั้นที่สามารถส่งข้อความที่จะหายไปหลังจากเวลาที่กำหนดหลังการอ่าน (disappearing messages) ได้</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>มีเพียงคุณเท่านั้นที่สามารถส่งข้อความเสียงได้</target>
@@ -5156,6 +5180,10 @@ Requires compatible VPN.</source>
         <target>เฉพาะผู้ติดต่อของคุณเท่านั้นที่สามารถส่งข้อความที่จะหายไปหลังจากเวลาที่กำหนดหลังการอ่าน (disappearing messages) ได้</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>ผู้ติดต่อของคุณเท่านั้นที่สามารถส่งข้อความเสียงได้</target>
@@ -5220,6 +5248,10 @@ Requires compatible VPN.</source>
         <source>Open to join</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <note>No comment provided by engineer.</note>
@@ -7127,6 +7159,10 @@ report reason</note>
         <source>Tap Connect to send request</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <note>No comment provided by engineer.</note>
@@ -7500,6 +7536,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <source>To send</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>เพื่อรองรับการแจ้งเตือนแบบทันที ฐานข้อมูลการแชทจะต้องได้รับการโยกย้าย</target>
@@ -8298,7 +8338,7 @@ Repeat join request?</source>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>คุณไม่สามารถส่งข้อความได้!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff b/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff
index cd07746337..5f26c285f5 100644
--- a/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff	
+++ b/apps/ios/SimpleX Localizations/tr.xcloc/Localized Contents/tr.xliff	
@@ -867,6 +867,10 @@ swipe action</note>
         <target>Sürüm düşürmeye izin ver</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Konuştuğun kişi, kalıcı olarak silinebilen mesajlara izin veriyorsa sen de ver. (24 saat içinde)</target>
@@ -952,6 +956,10 @@ swipe action</note>
         <target>Kişilerinizin kaybolan mesajlar göndermesine izin verin.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>Kişilerinizin sesli mesajlar göndermesine izin verin.</target>
@@ -1312,6 +1320,10 @@ swipe action</note>
         <target>Medyayı bulanıklaştır</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Sen ve konuştuğun kişi mesaj tepkileri ekleyebilir.</target>
@@ -1332,6 +1344,10 @@ swipe action</note>
         <target>Sen ve konuştuğun kişi kaybolan mesajlar gönderebilir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>Sen ve konuştuğun kişi sesli mesaj gönderebilir.</target>
@@ -3792,6 +3808,10 @@ snd error text</note>
         <target>Dosyalar ve medya</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>Dosyalar ve medya bu grupta yasaklandı.</target>
@@ -5681,6 +5701,10 @@ VPN'nin etkinleştirilmesi gerekir.</target>
         <target>Sadece sen kaybolan mesajlar gönderebilirsin.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>Sadece sen sesli mesajlar gönderebilirsin.</target>
@@ -5706,6 +5730,10 @@ VPN'nin etkinleştirilmesi gerekir.</target>
         <target>Sadece karşıdaki kişi kaybolan mesajlar gönderebilir.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>Sadece karşıdaki kişi sesli mesajlar gönderebilir.</target>
@@ -5781,6 +5809,10 @@ VPN'nin etkinleştirilmesi gerekir.</target>
         <target>Katılmak için aç</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <target>Uygulama açılıyor…</target>
@@ -7906,6 +7938,10 @@ report reason</note>
         <target>Bağlan'a dokunarak isteği gönderin</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <target>Daha sonra oluşturmak için menüden BasitX adresi oluştur'a dokunun.</target>
@@ -8316,6 +8352,10 @@ Bu özellik etkinleştirilmeden önce kimlik doğrulamayı tamamlamanız istenec
         <target>Göndermek için</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>Anlık anlık bildirimleri desteklemek için sohbet veritabanının taşınması gerekir.</target>
@@ -9205,7 +9245,7 @@ Katılma isteği tekrarlansın mı?</target>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Mesajlar gönderemezsiniz!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff b/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff
index 9b6ff96324..d87f1cc613 100644
--- a/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff	
+++ b/apps/ios/SimpleX Localizations/uk.xcloc/Localized Contents/uk.xliff	
@@ -867,6 +867,10 @@ swipe action</note>
         <target>Дозволити пониження версії</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>Дозволяйте безповоротне видалення повідомлень, тільки якщо контакт дозволяє вам це зробити. (24 години)</target>
@@ -952,6 +956,10 @@ swipe action</note>
         <target>Дозвольте своїм контактам надсилати зникаючі повідомлення.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>Дозвольте своїм контактам надсилати голосові повідомлення.</target>
@@ -1312,6 +1320,10 @@ swipe action</note>
         <target>Розмиття медіа</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>Реакції на повідомлення можете додавати як ви, так і ваш контакт.</target>
@@ -1332,6 +1344,10 @@ swipe action</note>
         <target>Ви і ваш контакт можете надсилати зникаючі повідомлення.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>Надсилати голосові повідомлення можете як ви, так і ваш контакт.</target>
@@ -3794,6 +3810,10 @@ snd error text</note>
         <target>Файли і медіа</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>Файли та медіа в цій групі заборонені.</target>
@@ -5684,6 +5704,10 @@ Requires compatible VPN.</source>
         <target>Тільки ви можете надсилати зникаючі повідомлення.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>Тільки ви можете надсилати голосові повідомлення.</target>
@@ -5709,6 +5733,10 @@ Requires compatible VPN.</source>
         <target>Тільки ваш контакт може надсилати зникаючі повідомлення.</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>Тільки ваш контакт може надсилати голосові повідомлення.</target>
@@ -5784,6 +5812,10 @@ Requires compatible VPN.</source>
         <target>Відкрито для приєднання</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <target>Відкриваємо програму…</target>
@@ -7914,6 +7946,10 @@ report reason</note>
         <target>Натисніть Підключитися, щоб відправити запит</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <target>Натисніть «Створити адресу SimpleX» у меню, щоб створити її пізніше.</target>
@@ -8327,6 +8363,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <target>Щоб відправити</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>Для підтримки миттєвих push-повідомлень необхідно перенести базу даних чату.</target>
@@ -9224,7 +9264,7 @@ Repeat join request?</source>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>Ви не можете надсилати повідомлення!</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff b/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff
index fce4207e84..f8767b14e4 100644
--- a/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff	
+++ b/apps/ios/SimpleX Localizations/zh-Hans.xcloc/Localized Contents/zh-Hans.xliff	
@@ -862,6 +862,10 @@ swipe action</note>
         <target>允许降级</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow files and media only if your contact allows them." xml:space="preserve">
+        <source>Allow files and media only if your contact allows them.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow irreversible message deletion only if your contact allows it to you. (24 hours)" xml:space="preserve">
         <source>Allow irreversible message deletion only if your contact allows it to you. (24 hours)</source>
         <target>仅有您的联系人许可后才允许不可撤回消息移除</target>
@@ -947,6 +951,10 @@ swipe action</note>
         <target>允许您的联系人发送限时消息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Allow your contacts to send files and media." xml:space="preserve">
+        <source>Allow your contacts to send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Allow your contacts to send voice messages." xml:space="preserve">
         <source>Allow your contacts to send voice messages.</source>
         <target>允许您的联系人发送语音消息。</target>
@@ -1305,6 +1313,10 @@ swipe action</note>
         <target>模糊媒体</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Bot" xml:space="preserve">
+        <source>Bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can add message reactions." xml:space="preserve">
         <source>Both you and your contact can add message reactions.</source>
         <target>您和您的联系人都可以添加消息回应。</target>
@@ -1325,6 +1337,10 @@ swipe action</note>
         <target>您和您的联系人都可以发送限时消息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Both you and your contact can send files and media." xml:space="preserve">
+        <source>Both you and your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Both you and your contact can send voice messages." xml:space="preserve">
         <source>Both you and your contact can send voice messages.</source>
         <target>您和您的联系人都可以发送语音消息。</target>
@@ -3767,6 +3783,10 @@ snd error text</note>
         <target>文件和媒体</target>
         <note>chat feature</note>
       </trans-unit>
+      <trans-unit id="Files and media are prohibited in this chat." xml:space="preserve">
+        <source>Files and media are prohibited in this chat.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Files and media are prohibited." xml:space="preserve">
         <source>Files and media are prohibited.</source>
         <target>此群组中禁止文件和媒体。</target>
@@ -5645,6 +5665,10 @@ Requires compatible VPN.</source>
         <target>只有您可以发送限时消息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only you can send files and media." xml:space="preserve">
+        <source>Only you can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only you can send voice messages." xml:space="preserve">
         <source>Only you can send voice messages.</source>
         <target>只有您可以发送语音消息。</target>
@@ -5670,6 +5694,10 @@ Requires compatible VPN.</source>
         <target>只有您的联系人才可以发送限时消息。</target>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Only your contact can send files and media." xml:space="preserve">
+        <source>Only your contact can send files and media.</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Only your contact can send voice messages." xml:space="preserve">
         <source>Only your contact can send voice messages.</source>
         <target>只有您的联系人可以发送语音消息。</target>
@@ -5739,6 +5767,10 @@ Requires compatible VPN.</source>
         <source>Open to join</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Open to use bot" xml:space="preserve">
+        <source>Open to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Opening app…" xml:space="preserve">
         <source>Opening app…</source>
         <target>正在打开应用程序…</target>
@@ -7794,6 +7826,10 @@ report reason</note>
         <source>Tap Connect to send request</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="Tap Connect to use bot" xml:space="preserve">
+        <source>Tap Connect to use bot</source>
+        <note>No comment provided by engineer.</note>
+      </trans-unit>
       <trans-unit id="Tap Create SimpleX address in the menu to create it later." xml:space="preserve">
         <source>Tap Create SimpleX address in the menu to create it later.</source>
         <note>No comment provided by engineer.</note>
@@ -8186,6 +8222,10 @@ You will be prompted to complete authentication before this feature is enabled.<
         <source>To send</source>
         <note>No comment provided by engineer.</note>
       </trans-unit>
+      <trans-unit id="To send commands you must be connected." xml:space="preserve">
+        <source>To send commands you must be connected.</source>
+        <note>alert message</note>
+      </trans-unit>
       <trans-unit id="To support instant push notifications the chat database has to be migrated." xml:space="preserve">
         <source>To support instant push notifications the chat database has to be migrated.</source>
         <target>为了支持即时推送通知，聊天数据库必须被迁移。</target>
@@ -9053,7 +9093,7 @@ Repeat join request?</source>
       <trans-unit id="You can't send messages!" xml:space="preserve">
         <source>You can't send messages!</source>
         <target>您无法发送消息！</target>
-        <note>No comment provided by engineer.</note>
+        <note>alert title</note>
       </trans-unit>
       <trans-unit id="You could not be verified; please try again." xml:space="preserve">
         <source>You could not be verified; please try again.</source>
diff --git a/apps/ios/SimpleX.xcodeproj/project.pbxproj b/apps/ios/SimpleX.xcodeproj/project.pbxproj
index a46384d99b..d79dde0582 100644
--- a/apps/ios/SimpleX.xcodeproj/project.pbxproj
+++ b/apps/ios/SimpleX.xcodeproj/project.pbxproj
@@ -245,6 +245,7 @@
 		D77B92DC2952372200A5A1CC /* SwiftyGif in Frameworks */ = {isa = PBXBuildFile; productRef = D77B92DB2952372200A5A1CC /* SwiftyGif */; };
 		D7F0E33929964E7E0068AF69 /* LZString in Frameworks */ = {isa = PBXBuildFile; productRef = D7F0E33829964E7E0068AF69 /* LZString */; };
 		E51CC1E62C62085600DB91FE /* OneHandUICard.swift in Sources */ = {isa = PBXBuildFile; fileRef = E51CC1E52C62085600DB91FE /* OneHandUICard.swift */; };
+		E559A0A12E3F77EE00B26F74 /* CommandsMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E559A0A02E3F77EE00B26F74 /* CommandsMenuView.swift */; };
 		E5DCF8DB2C56FAC1007928CC /* SimpleXChat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5CE2BA682845308900EC33A6 /* SimpleXChat.framework */; };
 		E5DCF9712C590272007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF96F2C590272007928CC /* Localizable.strings */; };
 		E5DCF9842C5902CE007928CC /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = E5DCF9822C5902CE007928CC /* Localizable.strings */; };
@@ -607,6 +608,7 @@
 		D741547929AF90B00022400A /* PushKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PushKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.1.sdk/System/Library/Frameworks/PushKit.framework; sourceTree = DEVELOPER_DIR; };
 		D7AA2C3429A936B400737B40 /* MediaEncryption.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; name = MediaEncryption.playground; path = Shared/MediaEncryption.playground; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		E51CC1E52C62085600DB91FE /* OneHandUICard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneHandUICard.swift; sourceTree = "<group>"; };
+		E559A0A02E3F77EE00B26F74 /* CommandsMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CommandsMenuView.swift; sourceTree = "<group>"; };
 		E5DCF9702C590272007928CC /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E5DCF9722C590274007928CC /* bg */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = bg; path = bg.lproj/Localizable.strings; sourceTree = "<group>"; };
 		E5DCF9732C590275007928CC /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
@@ -771,6 +773,7 @@
 				5C2E260E27A30FDC00F70299 /* ChatView.swift */,
 				5C7505A727B6D34800BE3227 /* ChatInfoToolbar.swift */,
 				5C971E1C27AEBEF600C8A3CE /* ChatInfoView.swift */,
+				E559A0A02E3F77EE00B26F74 /* CommandsMenuView.swift */,
 				5C1A4C1D27A715B700EAD5AD /* ChatItemView.swift */,
 				5CE4407127ADB1D0007B033A /* Emoji.swift */,
 				5CADE79B292131E900072E13 /* ContactPreferencesView.swift */,
@@ -1512,6 +1515,7 @@
 				8CBC14862D357CDB00BBD901 /* StorageView.swift in Sources */,
 				5C9A5BDB2871E05400A5B906 /* SetNotificationsMode.swift in Sources */,
 				5CB0BA8E2827126500B3292C /* OnboardingView.swift in Sources */,
+				E559A0A12E3F77EE00B26F74 /* CommandsMenuView.swift in Sources */,
 				6442E0BE2880182D00CEC0F9 /* GroupChatInfoView.swift in Sources */,
 				8CC956EE2BC0041000412A11 /* NetworkObserver.swift in Sources */,
 				5C2E261227A30FEA00F70299 /* TerminalView.swift in Sources */,
diff --git a/apps/ios/SimpleXChat/ChatTypes.swift b/apps/ios/SimpleXChat/ChatTypes.swift
index db370efdc1..f868b787ee 100644
--- a/apps/ios/SimpleXChat/ChatTypes.swift
+++ b/apps/ios/SimpleXChat/ChatTypes.swift
@@ -115,7 +115,8 @@ public struct Profile: Codable, NamedChat, Hashable {
         shortDescr: String? = nil,
         image: String? = nil,
         contactLink: String? = nil,
-        preferences: Preferences? = nil
+        preferences: Preferences? = nil,
+        peerType: ChatPeerType? = nil
     ) {
         self.displayName = displayName
         self.fullName = fullName
@@ -131,6 +132,7 @@ public struct Profile: Codable, NamedChat, Hashable {
     public var image: String?
     public var contactLink: String?
     public var preferences: Preferences?
+    public var peerType: ChatPeerType?
     public var localAlias: String { get { "" } }
 
     var profileViewName: String {
@@ -152,6 +154,7 @@ public struct LocalProfile: Codable, NamedChat, Hashable {
         image: String? = nil,
         contactLink: String? = nil,
         preferences: Preferences? = nil,
+        peerType: ChatPeerType? = nil,
         localAlias: String
     ) {
         self.profileId = profileId
@@ -161,6 +164,7 @@ public struct LocalProfile: Codable, NamedChat, Hashable {
         self.image = image
         self.contactLink = contactLink
         self.preferences = preferences
+        self.peerType = peerType
         self.localAlias = localAlias
     }
 
@@ -171,6 +175,7 @@ public struct LocalProfile: Codable, NamedChat, Hashable {
     public var image: String?
     public var contactLink: String?
     public var preferences: Preferences?
+    public var peerType: ChatPeerType?
     public var localAlias: String
 
     var profileViewName: String {
@@ -188,6 +193,11 @@ public struct LocalProfile: Codable, NamedChat, Hashable {
     )
 }
 
+public enum ChatPeerType: String, Codable {
+    case human
+    case bot
+}
+
 public func toLocalProfile (_ profileId: Int64, _ profile: Profile, _ localAlias: String) -> LocalProfile {
     LocalProfile(
         profileId: profileId,
@@ -197,6 +207,7 @@ public func toLocalProfile (_ profileId: Int64, _ profile: Profile, _ localAlias
         image: profile.image,
         contactLink: profile.contactLink,
         preferences: profile.preferences,
+        peerType: profile.peerType,
         localAlias: localAlias
     )
 }
@@ -208,7 +219,8 @@ public func fromLocalProfile (_ profile: LocalProfile) -> Profile {
         shortDescr: profile.shortDescr,
         image: profile.image,
         contactLink: profile.contactLink,
-        preferences: profile.preferences
+        preferences: profile.preferences,
+        peerType: profile.peerType
     )
 }
 
@@ -249,20 +261,26 @@ public struct FullPreferences: Decodable, Equatable, Hashable {
     public var fullDelete: SimplePreference
     public var reactions: SimplePreference
     public var voice: SimplePreference
+    public var files: SimplePreference
     public var calls: SimplePreference
+    public var commands: [ChatBotCommand]
 
     public init(
         timedMessages: TimedMessagesPreference,
         fullDelete: SimplePreference,
         reactions: SimplePreference,
         voice: SimplePreference,
-        calls: SimplePreference
+        files: SimplePreference,
+        calls: SimplePreference,
+        commands: [ChatBotCommand]
     ) {
         self.timedMessages = timedMessages
         self.fullDelete = fullDelete
         self.reactions = reactions
         self.voice = voice
+        self.files = files
         self.calls = calls
+        self.commands = commands
     }
 
     public static let sampleData = FullPreferences(
@@ -270,7 +288,9 @@ public struct FullPreferences: Decodable, Equatable, Hashable {
         fullDelete: SimplePreference(allow: .no),
         reactions: SimplePreference(allow: .yes),
         voice: SimplePreference(allow: .yes),
-        calls: SimplePreference(allow: .yes)
+        files: SimplePreference(allow: .always),
+        calls: SimplePreference(allow: .yes),
+        commands: []
     )
 }
 
@@ -279,20 +299,26 @@ public struct Preferences: Codable, Hashable {
     public var fullDelete: SimplePreference?
     public var reactions: SimplePreference?
     public var voice: SimplePreference?
+    public var files: SimplePreference?
     public var calls: SimplePreference?
+    public var commands: [ChatBotCommand]?
 
     public init(
         timedMessages: TimedMessagesPreference?,
         fullDelete: SimplePreference?,
         reactions: SimplePreference?,
         voice: SimplePreference?,
-        calls: SimplePreference?
+        files: SimplePreference?,
+        calls: SimplePreference?,
+        commands: [ChatBotCommand]?
     ) {
         self.timedMessages = timedMessages
         self.fullDelete = fullDelete
         self.reactions = reactions
         self.voice = voice
+        self.files = files
         self.calls = calls
+        self.commands = commands
     }
 
     func copy(
@@ -300,14 +326,18 @@ public struct Preferences: Codable, Hashable {
         fullDelete: SimplePreference? = nil,
         reactions: SimplePreference? = nil,
         voice: SimplePreference? = nil,
-        calls: SimplePreference? = nil
+        files: SimplePreference? = nil,
+        calls: SimplePreference? = nil,
+        commands: [ChatBotCommand]? = nil
     ) -> Preferences {
         Preferences(
             timedMessages: timedMessages ?? self.timedMessages,
             fullDelete: fullDelete ?? self.fullDelete,
             reactions: reactions ?? self.reactions,
             voice: voice ?? self.voice,
-            calls: calls ?? self.calls
+            files: files ?? self.files,
+            calls: calls ?? self.calls,
+            commands: commands ?? self.commands
         )
     }
 
@@ -317,6 +347,7 @@ public struct Preferences: Codable, Hashable {
         case .fullDelete: return copy(fullDelete: SimplePreference(allow: allowed))
         case .reactions: return copy(reactions: SimplePreference(allow: allowed))
         case .voice: return copy(voice: SimplePreference(allow: allowed))
+        case .files: return copy(voice: SimplePreference(allow: allowed))
         case .calls: return copy(calls: SimplePreference(allow: allowed))
         }
     }
@@ -326,17 +357,72 @@ public struct Preferences: Codable, Hashable {
         fullDelete: SimplePreference(allow: .no),
         reactions: SimplePreference(allow: .yes),
         voice: SimplePreference(allow: .yes),
-        calls: SimplePreference(allow: .yes)
+        files: SimplePreference(allow: .always),
+        calls: SimplePreference(allow: .yes),
+        commands: nil
     )
 }
 
+public indirect enum ChatBotCommand: Hashable {
+    case command(keyword: String, label: String, params: String?)
+    case menu(label: String, commands: [ChatBotCommand])
+
+    enum CodingKeys: String, CodingKey {
+        case type
+        case keyword
+        case label
+        case params
+        case hidden
+        case commands
+    }
+}
+
+extension ChatBotCommand: Decodable {
+    public init(from decoder: Decoder) throws {
+        let c = try decoder.container(keyedBy: CodingKeys.self)
+        let type = try c.decode(String.self, forKey: CodingKeys.type)
+        switch type {
+        case "command":
+            let keyword = try c.decode(String.self, forKey: CodingKeys.keyword)
+            let label = try c.decode(String.self, forKey: CodingKeys.label)
+            let params = c.contains(CodingKeys.params) ? try c.decode((String?).self, forKey: CodingKeys.params) : nil
+            self = .command(keyword: keyword, label: label, params: params)
+        case "menu":
+            let label = try c.decode(String.self, forKey: CodingKeys.label)
+            let commands = try c.decode(([ChatBotCommand]).self, forKey: CodingKeys.commands)
+            self = .menu(label: label, commands: commands)
+        default:
+            throw DecodingError.dataCorruptedError(forKey: CodingKeys.type, in: c, debugDescription: "Unsupported command type: \(type)")
+        }
+    }
+}
+
+extension ChatBotCommand: Encodable {
+    public func encode(to encoder: Encoder) throws {
+        var c = encoder.container(keyedBy: CodingKeys.self)
+        switch self {
+        case let .command(keyword, label, params):
+            try c.encode("command", forKey: .type)
+            try c.encode(keyword, forKey: .keyword)
+            try c.encode(label, forKey: .label)
+            if let params { try c.encode(params, forKey: .params) }
+        case let .menu(label, commands):
+            try c.encode("menu", forKey: .type)
+            try c.encode(label, forKey: .label)
+            try c.encode(commands, forKey: .commands)
+        }
+    }
+}
+
 public func fullPreferencesToPreferences(_ fullPreferences: FullPreferences) -> Preferences {
     Preferences(
         timedMessages: fullPreferences.timedMessages,
         fullDelete: fullPreferences.fullDelete,
         reactions: fullPreferences.reactions,
         voice: fullPreferences.voice,
-        calls: fullPreferences.calls
+        files: fullPreferences.files,
+        calls: fullPreferences.calls,
+        commands: fullPreferences.commands
     )
 }
 
@@ -346,7 +432,9 @@ public func contactUserPreferencesToPreferences(_ contactUserPreferences: Contac
         fullDelete: contactUserPreferences.fullDelete.userPreference.preference,
         reactions: contactUserPreferences.reactions.userPreference.preference,
         voice: contactUserPreferences.voice.userPreference.preference,
-        calls: contactUserPreferences.calls.userPreference.preference
+        files: contactUserPreferences.files.userPreference.preference,
+        calls: contactUserPreferences.calls.userPreference.preference,
+        commands: contactUserPreferences.commands
     )
 }
 
@@ -484,20 +572,26 @@ public struct ContactUserPreferences: Decodable, Hashable {
     public var fullDelete: ContactUserPreference<SimplePreference>
     public var reactions: ContactUserPreference<SimplePreference>
     public var voice: ContactUserPreference<SimplePreference>
+    public var files: ContactUserPreference<SimplePreference>
     public var calls: ContactUserPreference<SimplePreference>
+    public var commands: [ChatBotCommand]?
 
     public init(
         timedMessages: ContactUserPreference<TimedMessagesPreference>,
         fullDelete: ContactUserPreference<SimplePreference>,
         reactions: ContactUserPreference<SimplePreference>,
         voice: ContactUserPreference<SimplePreference>,
-        calls: ContactUserPreference<SimplePreference>
+        files: ContactUserPreference<SimplePreference>,
+        calls: ContactUserPreference<SimplePreference>,
+        commands: [ChatBotCommand]?
     ) {
         self.timedMessages = timedMessages
         self.fullDelete = fullDelete
         self.reactions = reactions
         self.voice = voice
+        self.files = files
         self.calls = calls
+        self.commands = commands
     }
 
     public static let sampleData = ContactUserPreferences(
@@ -521,11 +615,17 @@ public struct ContactUserPreferences: Decodable, Hashable {
             userPreference: ContactUserPref<SimplePreference>.user(preference: SimplePreference(allow: .yes)),
             contactPreference: SimplePreference(allow: .yes)
         ),
+        files: ContactUserPreference<SimplePreference>(
+            enabled: FeatureEnabled(forUser: true, forContact: true),
+            userPreference: ContactUserPref<SimplePreference>.user(preference: SimplePreference(allow: .yes)),
+            contactPreference: SimplePreference(allow: .yes)
+        ),
         calls: ContactUserPreference<SimplePreference>(
             enabled: FeatureEnabled(forUser: true, forContact: true),
             userPreference: ContactUserPref<SimplePreference>.user(preference: SimplePreference(allow: .yes)),
             contactPreference: SimplePreference(allow: .yes)
-        )
+        ),
+        commands: nil
     )
 }
 
@@ -598,6 +698,7 @@ public enum ChatFeature: String, Decodable, Feature, Hashable {
     case fullDelete
     case reactions
     case voice
+    case files
     case calls
 
     public var id: Self { self }
@@ -624,6 +725,7 @@ public enum ChatFeature: String, Decodable, Feature, Hashable {
         case .fullDelete: return NSLocalizedString("Delete for everyone", comment: "chat feature")
         case .reactions: return NSLocalizedString("Message reactions", comment: "chat feature")
         case .voice: return NSLocalizedString("Voice messages", comment: "chat feature")
+        case .files: return NSLocalizedString("Files and media", comment: "chat feature")
         case .calls: return NSLocalizedString("Audio/video calls", comment: "chat feature")
         }
     }
@@ -634,6 +736,7 @@ public enum ChatFeature: String, Decodable, Feature, Hashable {
         case .fullDelete: return "trash.slash"
         case .reactions: return "face.smiling"
         case .voice: return "mic"
+        case .files: return "doc"
         case .calls: return "phone"
         }
     }
@@ -644,6 +747,7 @@ public enum ChatFeature: String, Decodable, Feature, Hashable {
         case .fullDelete: return "trash.slash.fill"
         case .reactions: return "face.smiling.fill"
         case .voice: return "mic.fill"
+        case .files: return "doc.fill"
         case .calls: return "phone.fill"
         }
     }
@@ -681,6 +785,12 @@ public enum ChatFeature: String, Decodable, Feature, Hashable {
             case .yes: return "Allow voice messages only if your contact allows them."
             case .no: return "Prohibit sending voice messages."
             }
+        case .files:
+            switch allowed {
+            case .always: return "Allow your contacts to send files and media."
+            case .yes: return "Allow files and media only if your contact allows them."
+            case .no: return "Prohibit sending files and media."
+            }
         case .calls:
             switch allowed {
             case .always: return "Allow your contacts to call you."
@@ -724,6 +834,14 @@ public enum ChatFeature: String, Decodable, Feature, Hashable {
                     : enabled.forContact
                     ? "Only your contact can send voice messages."
                     : "Voice messages are prohibited in this chat."
+        case .files:
+            return enabled.forUser && enabled.forContact
+                    ? "Both you and your contact can send files and media."
+                    : enabled.forUser
+                    ? "Only you can send files and media."
+                    : enabled.forContact
+                    ? "Only your contact can send files and media."
+                    : "Files and media are prohibited in this chat."
         case .calls:
             return enabled.forUser && enabled.forContact
                     ? "Both you and your contact can make calls."
@@ -957,7 +1075,9 @@ public struct ContactFeaturesAllowed: Equatable, Hashable {
     public var fullDelete: ContactFeatureAllowed
     public var reactions: ContactFeatureAllowed
     public var voice: ContactFeatureAllowed
+    public var files: ContactFeatureAllowed
     public var calls: ContactFeatureAllowed
+    public var commands: [ChatBotCommand]?
 
     public init(
         timedMessagesAllowed: Bool,
@@ -965,14 +1085,18 @@ public struct ContactFeaturesAllowed: Equatable, Hashable {
         fullDelete: ContactFeatureAllowed,
         reactions: ContactFeatureAllowed,
         voice: ContactFeatureAllowed,
-        calls: ContactFeatureAllowed
+        files: ContactFeatureAllowed,
+        calls: ContactFeatureAllowed,
+        commands: [ChatBotCommand]?
     ) {
         self.timedMessagesAllowed = timedMessagesAllowed
         self.timedMessagesTTL = timedMessagesTTL
         self.fullDelete = fullDelete
         self.reactions = reactions
         self.voice = voice
+        self.files = files
         self.calls = calls
+        self.commands = commands
     }
 
     public static let sampleData = ContactFeaturesAllowed(
@@ -981,7 +1105,9 @@ public struct ContactFeaturesAllowed: Equatable, Hashable {
         fullDelete: ContactFeatureAllowed.userDefault(.no),
         reactions: ContactFeatureAllowed.userDefault(.yes),
         voice: ContactFeatureAllowed.userDefault(.yes),
-        calls: ContactFeatureAllowed.userDefault(.yes)
+        files: ContactFeatureAllowed.userDefault(.always),
+        calls: ContactFeatureAllowed.userDefault(.yes),
+        commands: nil
     )
 }
 
@@ -994,7 +1120,9 @@ public func contactUserPrefsToFeaturesAllowed(_ contactUserPreferences: ContactU
         fullDelete: contactUserPrefToFeatureAllowed(contactUserPreferences.fullDelete),
         reactions: contactUserPrefToFeatureAllowed(contactUserPreferences.reactions),
         voice: contactUserPrefToFeatureAllowed(contactUserPreferences.voice),
-        calls: contactUserPrefToFeatureAllowed(contactUserPreferences.calls)
+        files: contactUserPrefToFeatureAllowed(contactUserPreferences.files),
+        calls: contactUserPrefToFeatureAllowed(contactUserPreferences.calls),
+        commands: contactUserPreferences.commands
     )
 }
 
@@ -1016,7 +1144,9 @@ public func contactFeaturesAllowedToPrefs(_ contactFeaturesAllowed: ContactFeatu
         fullDelete: contactFeatureAllowedToPref(contactFeaturesAllowed.fullDelete),
         reactions: contactFeatureAllowedToPref(contactFeaturesAllowed.reactions),
         voice: contactFeatureAllowedToPref(contactFeaturesAllowed.voice),
-        calls: contactFeatureAllowedToPref(contactFeaturesAllowed.calls)
+        files: contactFeatureAllowedToPref(contactFeaturesAllowed.files),
+        calls: contactFeatureAllowedToPref(contactFeaturesAllowed.calls),
+        commands: contactFeaturesAllowed.commands
     )
 }
 
@@ -1057,6 +1187,7 @@ public struct FullGroupPreferences: Decodable, Equatable, Hashable {
     public var simplexLinks: RoleGroupPreference
     public var reports: GroupPreference
     public var history: GroupPreference
+    public var commands: [ChatBotCommand]
 
     public init(
         timedMessages: TimedMessagesGroupPreference,
@@ -1067,7 +1198,8 @@ public struct FullGroupPreferences: Decodable, Equatable, Hashable {
         files: RoleGroupPreference,
         simplexLinks: RoleGroupPreference,
         reports: GroupPreference,
-        history: GroupPreference
+        history: GroupPreference,
+        commands: [ChatBotCommand]
     ) {
         self.timedMessages = timedMessages
         self.directMessages = directMessages
@@ -1078,6 +1210,7 @@ public struct FullGroupPreferences: Decodable, Equatable, Hashable {
         self.simplexLinks = simplexLinks
         self.reports = reports
         self.history = history
+        self.commands = commands
     }
 
     public static let sampleData = FullGroupPreferences(
@@ -1089,7 +1222,8 @@ public struct FullGroupPreferences: Decodable, Equatable, Hashable {
         files: RoleGroupPreference(enable: .on, role: nil),
         simplexLinks: RoleGroupPreference(enable: .on, role: nil),
         reports: GroupPreference(enable: .on),
-        history: GroupPreference(enable: .on)
+        history: GroupPreference(enable: .on),
+        commands: []
     )
 }
 
@@ -1103,6 +1237,7 @@ public struct GroupPreferences: Codable, Hashable {
     public var simplexLinks: RoleGroupPreference?
     public var reports: GroupPreference?
     public var history: GroupPreference?
+    public var commands: [ChatBotCommand]?
 
     public init(
         timedMessages: TimedMessagesGroupPreference? = nil,
@@ -1113,7 +1248,8 @@ public struct GroupPreferences: Codable, Hashable {
         files: RoleGroupPreference? = nil,
         simplexLinks: RoleGroupPreference? = nil,
         reports: GroupPreference? = nil,
-        history: GroupPreference? = nil
+        history: GroupPreference? = nil,
+        commands: [ChatBotCommand]? = nil
     ) {
         self.timedMessages = timedMessages
         self.directMessages = directMessages
@@ -1124,6 +1260,7 @@ public struct GroupPreferences: Codable, Hashable {
         self.simplexLinks = simplexLinks
         self.reports = reports
         self.history = history
+        self.commands = commands
     }
 
     public static let sampleData = GroupPreferences(
@@ -1135,7 +1272,8 @@ public struct GroupPreferences: Codable, Hashable {
         files: RoleGroupPreference(enable: .on, role: nil),
         simplexLinks: RoleGroupPreference(enable: .on, role: nil),
         reports: GroupPreference(enable: .on),
-        history: GroupPreference(enable: .on)
+        history: GroupPreference(enable: .on),
+        commands: nil
     )
 }
 
@@ -1149,7 +1287,8 @@ public func toGroupPreferences(_ fullPreferences: FullGroupPreferences) -> Group
         files: fullPreferences.files,
         simplexLinks: fullPreferences.simplexLinks,
         reports: fullPreferences.reports,
-        history: fullPreferences.history
+        history: fullPreferences.history,
+        commands: fullPreferences.commands
     )
 }
 
@@ -1368,6 +1507,19 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
         }
     }
 
+    public var sndReady: Bool {
+        switch self {
+        case let .direct(contact): contact.sndReady
+        case let .group(groupInfo, groupScope):
+            groupInfo.membership.memberActive
+                && (groupScope != nil || (!groupInfo.membership.memberPending && groupInfo.membership.memberRole != .observer))
+        case .local: true
+        case .contactRequest: false
+        case .contactConnection: false
+        case .invalidJSON: false
+        }
+    }
+
     public var chatDeleted: Bool {
         get {
             switch self {
@@ -1502,6 +1654,7 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
             case .fullDelete: return cups.fullDelete.enabled.forUser
             case .reactions: return cups.reactions.enabled.forUser
             case .voice: return cups.voice.enabled.forUser
+            case .files: return cups.files.enabled.forUser
             case .calls: return cups.calls.enabled.forUser
             }
         case let .group(groupInfo, _):
@@ -1511,12 +1664,17 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
             case .fullDelete: return prefs.fullDelete.on
             case .reactions: return prefs.reactions.on
             case .voice: return prefs.voice.on(for: groupInfo.membership)
+            case .files: return prefs.files.on(for: groupInfo.membership)
             case .calls: return false
             }
         case .local:
             switch feature {
+            case .timedMessages: return false
+            case .fullDelete: return false
+            case .reactions: return false
             case .voice: return true
-            default: return false
+            case .files: return true
+            case .calls: return false
             }
         default: return false
         }
@@ -1619,6 +1777,22 @@ public enum ChatInfo: Identifiable, Decodable, NamedChat, Hashable {
         if case .group = self { true } else { false }
     }
 
+    public var useCommands: Bool {
+        switch self {
+        case let .direct(c): c.isBot
+        case let .group(g, _): (g.groupProfile.groupPreferences?.commands?.count ?? 0) > 0
+        default: false
+        }
+    }
+
+    public var menuCommands: [ChatBotCommand] {
+        switch self {
+        case let .direct(c): c.isBot ? c.profile.preferences?.commands ?? [] : []
+        case let .group(g, _): g.groupProfile.groupPreferences?.commands ?? []
+        default: []
+        }
+    }
+
     public var chatTags: [Int64]? {
         switch self {
         case let .direct(contact): return contact.chatTags
@@ -1803,16 +1977,26 @@ public struct Contact: Identifiable, Decodable, NamedChat, Hashable {
         (activeConn == nil || activeConn?.connStatus == .prepared) && profile.contactLink != nil && active && preparedContact == nil && contactRequestId == nil
     }
 
+    @inline(__always)
+    public var isBot: Bool {
+        profile.peerType == .bot
+    }
+
     public var contactConnIncognito: Bool {
         activeConn?.customUserProfileId != nil
     }
 
+    public var chatIconName: String {
+        isBot ? "cube.fill" : "person.crop.circle.fill"
+    }
+
     public func allowsFeature(_ feature: ChatFeature) -> Bool {
         switch feature {
         case .timedMessages: return mergedPreferences.timedMessages.contactPreference.allow != .no
         case .fullDelete: return mergedPreferences.fullDelete.contactPreference.allow != .no
         case .reactions: return mergedPreferences.reactions.contactPreference.allow != .no
         case .voice: return mergedPreferences.voice.contactPreference.allow != .no
+        case .files: return mergedPreferences.files.contactPreference.allow != .no
         case .calls: return mergedPreferences.calls.contactPreference.allow != .no
         }
     }
@@ -1823,6 +2007,7 @@ public struct Contact: Identifiable, Decodable, NamedChat, Hashable {
         case .fullDelete: return mergedPreferences.fullDelete.userPreference.preference.allow != .no
         case .reactions: return mergedPreferences.reactions.userPreference.preference.allow != .no
         case .voice: return mergedPreferences.voice.userPreference.preference.allow != .no
+        case .files: return mergedPreferences.files.userPreference.preference.allow != .no
         case .calls: return mergedPreferences.calls.userPreference.preference.allow != .no
         }
     }
@@ -4446,6 +4631,7 @@ public enum Format: Decodable, Equatable, Hashable {
     case colored(color: FormatColor)
     case uri
     case simplexLink(linkType: SimplexLinkType, simplexUri: String, smpHosts: [String])
+    case command(commandStr: String)
     case mention(memberName: String)
     case email
     case phone
diff --git a/apps/ios/SimpleXChat/ChatUtils.swift b/apps/ios/SimpleXChat/ChatUtils.swift
index 2016094958..98ee9cd5d4 100644
--- a/apps/ios/SimpleXChat/ChatUtils.swift
+++ b/apps/ios/SimpleXChat/ChatUtils.swift
@@ -93,7 +93,7 @@ private func canForwardToChat(_ cInfo: ChatInfo) -> Bool {
 
 public func chatIconName(_ cInfo: ChatInfo) -> String {
     switch cInfo {
-    case .direct: "person.crop.circle.fill"
+    case let .direct(contact): contact.chatIconName
     case let .group(groupInfo, _): groupInfo.chatIconName
     case .local: "folder.circle.fill"
     case .contactRequest: "person.crop.circle.fill"
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
index d61e44f528..962bd82dd3 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/ChatModel.kt
@@ -1633,6 +1633,18 @@ sealed class ChatInfo: SomeChat, NamedChat {
 
   val sendMsgEnabled get() = userCantSendReason == null
 
+  val sndReady: Boolean get() =
+      when(this) {
+        is Direct -> contact.sndReady
+        is Group ->
+          groupInfo.membership.memberActive
+              && (groupChatScope != null || (!groupInfo.membership.memberPending && groupInfo.membership.memberRole != GroupMemberRole.Observer))
+        is Local -> true
+        is ContactRequest -> false
+        is ContactConnection -> false
+        is InvalidJSON -> false
+      }
+
   fun groupChatScope(): GroupChatScope? = when (this) {
     is Group -> groupChatScope?.toChatScope()
     else -> null
@@ -1676,6 +1688,20 @@ sealed class ChatInfo: SomeChat, NamedChat {
 
   val hasMentions: Boolean get() = this is Group
 
+  val useCommands: Boolean get() = when(this) {
+    is Direct -> contact.isBot
+    is Group -> groupInfo.groupProfile.groupPreferences?.commands?.isNotEmpty() ?: false
+    else -> false
+  }
+
+  val menuCommands: List<ChatBotCommand> get() = when(this) {
+    is Direct ->
+      if (contact.isBot) contact.profile.preferences?.commands ?: emptyList()
+      else emptyList()
+    is Group -> groupInfo.groupProfile.groupPreferences?.commands ?: emptyList()
+    else -> emptyList()
+  }
+
   val contactCard: Boolean
     get() = when (this) {
       is Direct -> contact.isContactCard
@@ -1759,6 +1785,7 @@ data class Contact(
     ChatFeature.FullDelete -> mergedPreferences.fullDelete.enabled.forUser
     ChatFeature.Reactions -> mergedPreferences.reactions.enabled.forUser
     ChatFeature.Voice -> mergedPreferences.voice.enabled.forUser
+    ChatFeature.Files -> mergedPreferences.files.enabled.forUser
     ChatFeature.Calls -> mergedPreferences.calls.enabled.forUser
   }
   override val timedMessagesTTL: Int? get() = with(mergedPreferences.timedMessages) { if (enabled.forUser) userPreference.pref.ttl else null }
@@ -1775,7 +1802,6 @@ data class Contact(
     return profile.chatViewName.lowercase().contains(s) || profile.displayName.lowercase().contains(s) || profile.fullName.lowercase().contains(s)
   }
 
-
   val directOrUsed: Boolean get() =
     if (activeConn != null) {
       (activeConn.connLevel == 0 && !activeConn.viaGroupLink) || contactUsed
@@ -1783,16 +1809,22 @@ data class Contact(
       true
     }
 
-  val isContactCard: Boolean =
+  val isContactCard: Boolean get() =
     (activeConn == null || activeConn.connStatus == ConnStatus.Prepared) && profile.contactLink != null && active && preparedContact == null && contactRequestId == null
 
-  val contactConnIncognito =
+  val isBot: Boolean get() = profile.peerType == ChatPeerType.Bot
+
+  val contactConnIncognito: Boolean get() =
     activeConn?.customUserProfileId != null
 
+  val chatIconName: ImageResource get() =
+    if (isBot) MR.images.ic_cube else MR.images.ic_account_circle_filled
+
   fun allowsFeature(feature: ChatFeature): Boolean = when (feature) {
     ChatFeature.TimedMessages -> mergedPreferences.timedMessages.contactPreference.allow != FeatureAllowed.NO
     ChatFeature.FullDelete -> mergedPreferences.fullDelete.contactPreference.allow != FeatureAllowed.NO
     ChatFeature.Voice -> mergedPreferences.voice.contactPreference.allow != FeatureAllowed.NO
+    ChatFeature.Files -> mergedPreferences.files.contactPreference.allow != FeatureAllowed.NO
     ChatFeature.Reactions -> mergedPreferences.reactions.contactPreference.allow != FeatureAllowed.NO
     ChatFeature.Calls -> mergedPreferences.calls.contactPreference.allow != FeatureAllowed.NO
   }
@@ -1802,6 +1834,7 @@ data class Contact(
     ChatFeature.FullDelete -> mergedPreferences.fullDelete.userPreference.pref.allow != FeatureAllowed.NO
     ChatFeature.Reactions -> mergedPreferences.reactions.userPreference.pref.allow != FeatureAllowed.NO
     ChatFeature.Voice -> mergedPreferences.voice.userPreference.pref.allow != FeatureAllowed.NO
+    ChatFeature.Files -> mergedPreferences.files.userPreference.pref.allow != FeatureAllowed.NO
     ChatFeature.Calls -> mergedPreferences.calls.userPreference.pref.allow != FeatureAllowed.NO
   }
 
@@ -1931,14 +1964,15 @@ data class Profile(
   override val image: String? = null,
   override val localAlias : String = "",
   val contactLink: String? = null,
-  val preferences: ChatPreferences? = null
+  val preferences: ChatPreferences? = null,
+  val peerType: ChatPeerType? = null
 ): NamedChat {
   val profileViewName: String
     get() {
       return if (fullName == "" || displayName == fullName) displayName else "$displayName ($fullName)"
     }
 
-  fun toLocalProfile(profileId: Long): LocalProfile = LocalProfile(profileId, displayName, fullName, shortDescr, image, localAlias, contactLink, preferences)
+  fun toLocalProfile(profileId: Long): LocalProfile = LocalProfile(profileId, displayName, fullName, shortDescr, image, localAlias, contactLink, preferences, peerType)
 
   companion object {
     val sampleData = Profile(
@@ -1958,11 +1992,12 @@ data class LocalProfile(
   override val image: String? = null,
   override val localAlias: String,
   val contactLink: String? = null,
-  val preferences: ChatPreferences? = null
+  val preferences: ChatPreferences? = null,
+  val peerType: ChatPeerType? = null
 ): NamedChat {
   val profileViewName: String = localAlias.ifEmpty { if (fullName == "" || displayName == fullName) displayName else "$displayName ($fullName)" }
 
-  fun toProfile(): Profile = Profile(displayName, fullName, shortDescr, image, localAlias, contactLink, preferences)
+  fun toProfile(): Profile = Profile(displayName, fullName, shortDescr, image, localAlias, contactLink, preferences, peerType)
 
   companion object {
     val sampleData = LocalProfile(
@@ -1976,6 +2011,12 @@ data class LocalProfile(
   }
 }
 
+@Serializable
+enum class ChatPeerType {
+  @SerialName("human") Human,
+  @SerialName("bot") Bot
+}
+
 @Serializable
 data class UserProfileUpdateSummary(
   val updateSuccesses: Int,
@@ -2030,6 +2071,7 @@ data class GroupInfo (
     ChatFeature.FullDelete -> fullGroupPreferences.fullDelete.on
     ChatFeature.Reactions -> fullGroupPreferences.reactions.on
     ChatFeature.Voice -> fullGroupPreferences.voice.on(membership)
+    ChatFeature.Files -> fullGroupPreferences.files.on(membership)
     ChatFeature.Calls -> false
   }
   override val timedMessagesTTL: Int? get() = with(fullGroupPreferences.timedMessages) { if (on) ttl else null }
@@ -2484,7 +2526,14 @@ class NoteFolder(
   override val nextConnectPrepared get() = false
   override val profileChangeProhibited get() = false
   override val incognito get() = false
-  override fun featureEnabled(feature: ChatFeature) = feature == ChatFeature.Voice
+  override fun featureEnabled(feature: ChatFeature) = when (feature) {
+    ChatFeature.TimedMessages -> false
+    ChatFeature.FullDelete -> false
+    ChatFeature.Reactions -> false
+    ChatFeature.Voice -> true
+    ChatFeature.Files -> true
+    ChatFeature.Calls -> false
+  }
   override val timedMessagesTTL: Int? get() = null
   override val displayName get() = generalGetString(MR.strings.note_folder_local_display_name)
   override val fullName get() = ""
@@ -4349,6 +4398,7 @@ sealed class Format {
   @Serializable @SerialName("colored") class Colored(val color: FormatColor): Format()
   @Serializable @SerialName("uri") class Uri: Format()
   @Serializable @SerialName("simplexLink") class SimplexLink(val linkType: SimplexLinkType, val simplexUri: String, val smpHosts: List<String>): Format()
+  @Serializable @SerialName("command") class Command(val commandStr: String): Format()
   @Serializable @SerialName("mention") class Mention(val memberName: String): Format()
   @Serializable @SerialName("email") class Email: Format()
   @Serializable @SerialName("phone") class Phone: Format()
@@ -4363,6 +4413,7 @@ sealed class Format {
     is Colored -> SpanStyle(color = this.color.uiColor)
     is Uri -> linkStyle
     is SimplexLink -> linkStyle
+    is Command -> SpanStyle(color = MaterialTheme.colors.primary, fontFamily = FontFamily.Monospace)
     is Mention -> SpanStyle(fontWeight = FontWeight.Medium)
     is Email -> linkStyle
     is Phone -> linkStyle
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
index 9e10d249c0..b23869849d 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/model/SimpleXAPI.kt
@@ -19,6 +19,7 @@ import androidx.compose.ui.unit.dp
 import chat.simplex.common.model.ChatController.getNetCfg
 import chat.simplex.common.model.ChatController.setNetCfg
 import chat.simplex.common.model.ChatModel.changingActiveUserMutex
+import chat.simplex.common.model.GroupFeature.Files
 import chat.simplex.common.model.MsgContent.MCUnknown
 import chat.simplex.common.model.SMPProxyFallback.AllowProtected
 import chat.simplex.common.model.SMPProxyMode.Always
@@ -2643,8 +2644,6 @@ object ChatController {
               if (cItem.isActiveReport) {
                 chatModel.chatsContext.increaseGroupReportsCounter(rhId, cInfo.id)
               }
-            }
-            withContext(Dispatchers.Main) {
               chatModel.secondaryChatsContext.value?.addChatItem(rhId, cInfo, cItem)
             }
           } else if (cItem.isRcvNew && cInfo.ntfsEnabled(cItem)) {
@@ -4881,14 +4880,18 @@ data class FullChatPreferences(
   val fullDelete: SimpleChatPreference,
   val reactions: SimpleChatPreference,
   val voice: SimpleChatPreference,
+  val files: SimpleChatPreference,
   val calls: SimpleChatPreference,
+  val commands: List<ChatBotCommand>
 ) {
   fun toPreferences(): ChatPreferences = ChatPreferences(
     timedMessages = timedMessages,
     fullDelete = fullDelete,
     reactions = reactions,
     voice = voice,
-    calls = calls
+    files = files,
+    calls = calls,
+    commands = commands,
   )
 
   companion object {
@@ -4897,7 +4900,9 @@ data class FullChatPreferences(
       fullDelete = SimpleChatPreference(allow = FeatureAllowed.NO),
       reactions = SimpleChatPreference(allow = FeatureAllowed.YES),
       voice = SimpleChatPreference(allow = FeatureAllowed.YES),
+      files = SimpleChatPreference(allow = FeatureAllowed.YES),
       calls = SimpleChatPreference(allow = FeatureAllowed.YES),
+      commands = listOf(),
     )
   }
 }
@@ -4908,7 +4913,9 @@ data class ChatPreferences(
   val fullDelete: SimpleChatPreference?,
   val reactions: SimpleChatPreference?,
   val voice: SimpleChatPreference?,
+  val files: SimpleChatPreference?,
   val calls: SimpleChatPreference?,
+  val commands: List<ChatBotCommand>?,
 ) {
   fun setAllowed(feature: ChatFeature, allowed: FeatureAllowed = FeatureAllowed.YES, param: Int? = null): ChatPreferences =
     when (feature) {
@@ -4916,6 +4923,7 @@ data class ChatPreferences(
       ChatFeature.FullDelete -> this.copy(fullDelete = SimpleChatPreference(allow = allowed))
       ChatFeature.Reactions -> this.copy(reactions = SimpleChatPreference(allow = allowed))
       ChatFeature.Voice -> this.copy(voice = SimpleChatPreference(allow = allowed))
+      ChatFeature.Files -> this.copy(files = SimpleChatPreference(allow = allowed))
       ChatFeature.Calls -> this.copy(calls = SimpleChatPreference(allow = allowed))
     }
 
@@ -4925,7 +4933,9 @@ data class ChatPreferences(
       fullDelete = SimpleChatPreference(allow = FeatureAllowed.NO),
       reactions = SimpleChatPreference(allow = FeatureAllowed.YES),
       voice = SimpleChatPreference(allow = FeatureAllowed.YES),
+      files = SimpleChatPreference(allow = FeatureAllowed.YES),
       calls = SimpleChatPreference(allow = FeatureAllowed.YES),
+      commands = null,
     )
   }
 }
@@ -4953,6 +4963,12 @@ data class TimedMessagesPreference(
   }
 }
 
+@Serializable
+sealed class ChatBotCommand {
+  @Serializable @SerialName("command") class Command(val keyword: String, val label: String, val params: String?): ChatBotCommand()
+  @Serializable @SerialName("menu") class Menu(val label: String, val commands: List<ChatBotCommand>): ChatBotCommand()
+}
+
 @Serializable
 data class PresentedServersSummary(
   val statsStartedAt: Instant,
@@ -5203,14 +5219,18 @@ data class ContactUserPreferences(
   val fullDelete: ContactUserPreference,
   val reactions: ContactUserPreference,
   val voice: ContactUserPreference,
+  val files: ContactUserPreference,
   val calls: ContactUserPreference,
+  val commands: List<ChatBotCommand>?,
 ) {
   fun toPreferences(): ChatPreferences = ChatPreferences(
     timedMessages = timedMessages.userPreference.pref,
     fullDelete = fullDelete.userPreference.pref,
     reactions = reactions.userPreference.pref,
     voice = voice.userPreference.pref,
-    calls = calls.userPreference.pref
+    files = files.userPreference.pref,
+    calls = calls.userPreference.pref,
+    commands = commands,
   )
 
   companion object {
@@ -5235,11 +5255,17 @@ data class ContactUserPreferences(
         userPreference = ContactUserPref.User(preference = SimpleChatPreference(allow = FeatureAllowed.YES)),
         contactPreference = SimpleChatPreference(allow = FeatureAllowed.YES)
       ),
+      files = ContactUserPreference(
+        enabled = FeatureEnabled(forUser = true, forContact = true),
+        userPreference = ContactUserPref.User(preference = SimpleChatPreference(allow = FeatureAllowed.YES)),
+        contactPreference = SimpleChatPreference(allow = FeatureAllowed.YES)
+      ),
       calls = ContactUserPreference(
         enabled = FeatureEnabled(forUser = true, forContact = true),
         userPreference = ContactUserPref.User(preference = SimpleChatPreference(allow = FeatureAllowed.YES)),
         contactPreference = SimpleChatPreference(allow = FeatureAllowed.YES)
       ),
+      commands = null,
     )
   }
 }
@@ -5329,6 +5355,7 @@ enum class ChatFeature: Feature {
   @SerialName("fullDelete") FullDelete,
   @SerialName("reactions") Reactions,
   @SerialName("voice") Voice,
+  @SerialName("files") Files,
   @SerialName("calls") Calls;
 
   val asymmetric: Boolean get() = when (this) {
@@ -5348,6 +5375,7 @@ enum class ChatFeature: Feature {
       FullDelete -> generalGetString(MR.strings.full_deletion)
       Reactions -> generalGetString(MR.strings.message_reactions)
       Voice -> generalGetString(MR.strings.voice_messages)
+      Files -> generalGetString(MR.strings.files_and_media)
       Calls -> generalGetString(MR.strings.audio_video_calls)
     }
 
@@ -5357,6 +5385,7 @@ enum class ChatFeature: Feature {
       FullDelete -> painterResource(MR.images.ic_delete_forever)
       Reactions -> painterResource(MR.images.ic_add_reaction)
       Voice -> painterResource(MR.images.ic_keyboard_voice)
+      Files -> painterResource(MR.images.ic_draft)
       Calls -> painterResource(MR.images.ic_call)
     }
 
@@ -5366,6 +5395,7 @@ enum class ChatFeature: Feature {
       FullDelete -> painterResource(MR.images.ic_delete_forever_filled)
       Reactions -> painterResource(MR.images.ic_add_reaction_filled)
       Voice -> painterResource(MR.images.ic_keyboard_voice_filled)
+      Files -> painterResource(MR.images.ic_draft_filled)
       Calls -> painterResource(MR.images.ic_call_filled)
   }
 
@@ -5386,11 +5416,16 @@ enum class ChatFeature: Feature {
         FeatureAllowed.YES -> generalGetString(MR.strings.allow_message_reactions_only_if)
         FeatureAllowed.NO -> generalGetString(MR.strings.prohibit_message_reactions)
       }
-        Voice -> when (allowed) {
+      Voice -> when (allowed) {
         FeatureAllowed.ALWAYS -> generalGetString(MR.strings.allow_your_contacts_to_send_voice_messages)
         FeatureAllowed.YES -> generalGetString(MR.strings.allow_voice_messages_only_if)
         FeatureAllowed.NO -> generalGetString(MR.strings.prohibit_sending_voice_messages)
       }
+      Files -> when (allowed) {
+        FeatureAllowed.ALWAYS -> generalGetString(MR.strings.allow_your_contacts_to_send_files_and_media)
+        FeatureAllowed.YES -> generalGetString(MR.strings.allow_files_and_media_only_if)
+        FeatureAllowed.NO -> generalGetString(MR.strings.prohibit_sending_files_and_media)
+      }
       Calls -> when (allowed) {
         FeatureAllowed.ALWAYS -> generalGetString(MR.strings.allow_your_contacts_to_call)
         FeatureAllowed.YES -> generalGetString(MR.strings.allow_calls_only_if)
@@ -5424,6 +5459,12 @@ enum class ChatFeature: Feature {
         enabled.forContact -> generalGetString(MR.strings.only_your_contact_can_send_voice)
         else -> generalGetString(MR.strings.voice_prohibited_in_this_chat)
       }
+      Files -> when {
+        enabled.forUser && enabled.forContact -> generalGetString(MR.strings.both_you_and_your_contact_can_send_files)
+        enabled.forUser -> generalGetString(MR.strings.only_you_can_send_files)
+        enabled.forContact -> generalGetString(MR.strings.only_your_contact_can_send_files)
+        else -> generalGetString(MR.strings.files_prohibited_in_this_chat)
+      }
       Calls -> when {
         enabled.forUser && enabled.forContact -> generalGetString(MR.strings.both_you_and_your_contact_can_make_calls)
         enabled.forUser -> generalGetString(MR.strings.only_you_can_make_calls)
@@ -5618,7 +5659,9 @@ data class ContactFeaturesAllowed(
   val fullDelete: ContactFeatureAllowed,
   val reactions: ContactFeatureAllowed,
   val voice: ContactFeatureAllowed,
+  val files: ContactFeatureAllowed,
   val calls: ContactFeatureAllowed,
+  val commands: List<ChatBotCommand>?,
 ) {
   companion object {
     val sampleData = ContactFeaturesAllowed(
@@ -5627,7 +5670,9 @@ data class ContactFeaturesAllowed(
       fullDelete = ContactFeatureAllowed.UserDefault(FeatureAllowed.NO),
       reactions = ContactFeatureAllowed.UserDefault(FeatureAllowed.YES),
       voice = ContactFeatureAllowed.UserDefault(FeatureAllowed.YES),
+      files = ContactFeatureAllowed.UserDefault(FeatureAllowed.YES),
       calls = ContactFeatureAllowed.UserDefault(FeatureAllowed.YES),
+      commands = null,
     )
   }
 }
@@ -5641,7 +5686,9 @@ fun contactUserPrefsToFeaturesAllowed(contactUserPreferences: ContactUserPrefere
     fullDelete = contactUserPrefToFeatureAllowed(contactUserPreferences.fullDelete),
     reactions = contactUserPrefToFeatureAllowed(contactUserPreferences.reactions),
     voice = contactUserPrefToFeatureAllowed(contactUserPreferences.voice),
+    files = contactUserPrefToFeatureAllowed(contactUserPreferences.files),
     calls = contactUserPrefToFeatureAllowed(contactUserPreferences.calls),
+    commands = contactUserPreferences.commands,
   )
 }
 
@@ -5661,7 +5708,9 @@ fun contactFeaturesAllowedToPrefs(contactFeaturesAllowed: ContactFeaturesAllowed
     fullDelete = contactFeatureAllowedToPref(contactFeaturesAllowed.fullDelete),
     reactions = contactFeatureAllowedToPref(contactFeaturesAllowed.reactions),
     voice = contactFeatureAllowedToPref(contactFeaturesAllowed.voice),
+    files = contactFeatureAllowedToPref(contactFeaturesAllowed.files),
     calls = contactFeatureAllowedToPref(contactFeaturesAllowed.calls),
+    commands = contactFeaturesAllowed.commands,
   )
 
 fun contactFeatureAllowedToPref(contactFeatureAllowed: ContactFeatureAllowed): SimpleChatPreference? =
@@ -5697,6 +5746,7 @@ data class FullGroupPreferences(
   val simplexLinks: RoleGroupPreference,
   val reports: GroupPreference,
   val history: GroupPreference,
+  val commands: List<ChatBotCommand>,
 ) {
   fun toGroupPreferences(): GroupPreferences =
     GroupPreferences(
@@ -5709,6 +5759,7 @@ data class FullGroupPreferences(
       simplexLinks = simplexLinks,
       reports = reports,
       history = history,
+      commands = commands,
     )
 
   companion object {
@@ -5722,6 +5773,7 @@ data class FullGroupPreferences(
       simplexLinks = RoleGroupPreference(GroupFeatureEnabled.ON, role = null),
       reports = GroupPreference(GroupFeatureEnabled.ON),
       history = GroupPreference(GroupFeatureEnabled.ON),
+      commands = listOf()
     )
   }
 }
@@ -5737,6 +5789,7 @@ data class GroupPreferences(
   val simplexLinks: RoleGroupPreference? = null,
   val reports: GroupPreference? = null,
   val history: GroupPreference? = null,
+  val commands: List<ChatBotCommand>? = null
 ) {
   companion object {
     val sampleData = GroupPreferences(
@@ -5749,6 +5802,7 @@ data class GroupPreferences(
       simplexLinks = RoleGroupPreference(GroupFeatureEnabled.ON, role = null),
       reports = GroupPreference(GroupFeatureEnabled.ON),
       history = GroupPreference(GroupFeatureEnabled.ON),
+      commands = null,
     )
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
index d19c19b83a..a3365b2087 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
@@ -102,19 +102,21 @@ fun ChatView(
   val chat = chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId.value }
   // They have their own iterator inside for a reason to prevent crash "Reading a state that was created after the snapshot..."
   val remoteHostId = remember { derivedStateOf { chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId.value }?.remoteHostId } }
-  val activeChatInfo = remember { derivedStateOf {
-    var chatInfo = chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId.value }?.chatInfo
+  val activeChat = remember { derivedStateOf {
+    var chat = chatModel.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId.value }
+    val chatInfo = chat?.chatInfo
     if (
       chatsCtx.secondaryContextFilter is SecondaryContextFilter.GroupChatScopeContext
+      && chat != null
       && chatInfo is ChatInfo.Group
     ) {
       val scopeInfo = chatsCtx.secondaryContextFilter.groupScopeInfo
-      chatInfo = chatInfo.copy(groupChatScope = scopeInfo)
+      chat = chat.copy(chatInfo = chatInfo.copy(groupChatScope = scopeInfo))
     }
-    chatInfo
+    chat
   } }
   val user = chatModel.currentUser.value
-  val chatInfo = activeChatInfo.value
+  val chatInfo = activeChat.value?.chatInfo
   if (chat == null || chatInfo == null || user == null) {
     LaunchedEffect(Unit) {
       chatModel.chatId.value = null
@@ -138,6 +140,7 @@ fun ChatView(
     val attachmentBottomSheetState = rememberModalBottomSheetState(initialValue = ModalBottomSheetValue.Hidden)
     val scope = rememberCoroutineScope()
     val selectedChatItems = rememberSaveable { mutableStateOf(null as Set<Long>?) }
+    val showCommandsMenu = rememberSaveable { mutableStateOf(false) }
     if (appPlatform.isAndroid) {
       DisposableEffect(Unit) {
         onDispose {
@@ -186,7 +189,6 @@ fun ChatView(
         chatsCtx.chats.value.firstOrNull { chat -> chat.chatInfo.id == staleChatId.value }?.chatStats?.unreadCount ?: 0
       }
     }
-    val reportsCount = reportsCount(chatInfo.id)
     val clipboard = LocalClipboardManager.current
     CompositionLocalProvider(
       LocalAppBarHandler provides rememberAppBarHandler(chatInfo.id, keyboardCoversBar = false),
@@ -214,7 +216,7 @@ fun ChatView(
           ChatLayout(
             chatsCtx = chatsCtx,
             remoteHostId = remoteHostId,
-            chatInfo = activeChatInfo,
+            chat = activeChat,
             unreadCount,
             composeState,
             composeView = { focusRequester ->
@@ -237,7 +239,7 @@ fun ChatView(
                     )
                   }
                   ComposeView(
-                    rhId = remoteHostId.value, chatModel, chatsCtx, Chat(remoteHostId = chatRh, chatInfo = chatInfo, chatItems = emptyList()), composeState, attachmentOption,
+                    rhId = remoteHostId.value, chatModel, chatsCtx, Chat(remoteHostId = chatRh, chatInfo = chatInfo, chatItems = emptyList()), composeState, showCommandsMenu, attachmentOption,
                     showChooseAttachment = { scope.launch { attachmentBottomSheetState.show() } },
                     focusRequester = focusRequester
                   )
@@ -347,7 +349,7 @@ fun ChatView(
                 ModalManager.end.showCustomModal { close ->
                   val appBar = remember { mutableStateOf(null as @Composable (BoxScope.() -> Unit)?) }
                   ModalView(close, appBar = appBar.value) {
-                    val chatInfo = remember { activeChatInfo }.value
+                    val chatInfo = remember { activeChat }.value?.chatInfo
                     if (chatInfo is ChatInfo.Direct) {
                       var contactInfo: Pair<ConnectionStats?, Profile?>? by remember { mutableStateOf(preloadedContactInfo) }
                       var code: String? by remember { mutableStateOf(preloadedCode) }
@@ -377,7 +379,7 @@ fun ChatView(
                       }
                     }
                     LaunchedEffect(Unit) {
-                      snapshotFlow { activeChatInfo.value?.id }
+                      snapshotFlow { activeChat.value?.id }
                         .drop(1)
                         .collect {
                           appBar.value = null
@@ -389,37 +391,37 @@ fun ChatView(
               }
             },
             showReports = {
-              val info = activeChatInfo.value ?: return@ChatLayout
+              val cInfo = activeChat.value?.chatInfo ?: return@ChatLayout
               if (ModalManager.end.hasModalsOpen()) {
                 ModalManager.end.closeModals()
                 return@ChatLayout
               }
               hideKeyboard(view)
               scope.launch {
-                showGroupReportsView(staleChatId, scrollToItemId, info)
+                showGroupReportsView(staleChatId, scrollToItemId, cInfo)
               }
             },
             showSupportChats = {
-              val info = activeChatInfo.value ?: return@ChatLayout
+              val cInfo = activeChat.value?.chatInfo ?: return@ChatLayout
               if (ModalManager.end.hasModalsOpen()) {
                 ModalManager.end.closeModals()
                 return@ChatLayout
               }
               hideKeyboard(view)
               scope.launch {
-                if (info is ChatInfo.Group && info.groupInfo.membership.memberRole >= GroupMemberRole.Moderator) {
+                if (cInfo is ChatInfo.Group && cInfo.groupInfo.membership.memberRole >= GroupMemberRole.Moderator) {
                   ModalManager.end.showCustomModal { close ->
                     MemberSupportView(
                       chatRh,
                       chat,
-                      info.groupInfo,
+                      cInfo.groupInfo,
                       scrollToItemId,
                       close
                     )
                   }
-                } else if (info is ChatInfo.Group) {
+                } else if (cInfo is ChatInfo.Group) {
                   val scopeInfo = GroupChatScopeInfo.MemberSupport(groupMember_ = null)
-                  val supportChatInfo = ChatInfo.Group(info.groupInfo, groupChatScope = scopeInfo)
+                  val supportChatInfo = ChatInfo.Group(cInfo.groupInfo, groupChatScope = scopeInfo)
                   scope.launch {
                     showMemberSupportChatView(
                       chatModel.chatId,
@@ -723,7 +725,8 @@ fun ChatView(
             onComposed,
             developerTools = chatModel.controller.appPrefs.developerTools.get(),
             showViaProxy = chatModel.controller.appPrefs.showSentViaProxy.get(),
-            showSearch = showSearch
+            showSearch = showSearch,
+            showCommandsMenu = showCommandsMenu
           )
         }
       }
@@ -768,9 +771,7 @@ private fun connectingText(chatInfo: ChatInfo): String? {
         && !chatInfo.contact.sendMsgToConnect
         && !chatInfo.contact.nextAcceptContactRequest
       ) {
-        if (chatInfo.contact.preparedContact?.uiConnLinkType == ConnectionMode.Con) {
-          generalGetString(MR.strings.contact_should_accept)
-        } else if (chatInfo.contact.contactGroupMemberId != null) {
+        if ((chatInfo.contact.preparedContact?.uiConnLinkType == ConnectionMode.Con && !chatInfo.contact.isBot) || chatInfo.contact.contactGroupMemberId != null) {
           generalGetString(MR.strings.contact_should_accept)
         } else {
           generalGetString(MR.strings.contact_connection_pending)
@@ -807,7 +808,7 @@ fun startChatCall(remoteHostId: Long?, chatInfo: ChatInfo, media: CallMediaType)
 fun ChatLayout(
   chatsCtx: ChatModel.ChatsContext,
   remoteHostId: State<Long?>,
-  chatInfo: State<ChatInfo?>,
+  chat: State<Chat?>,
   unreadCount: State<Int>,
   composeState: MutableState<ComposeState>,
   composeView: (@Composable (FocusRequester?) -> Unit),
@@ -854,8 +855,10 @@ fun ChatLayout(
   onComposed: suspend (chatId: String) -> Unit,
   developerTools: Boolean,
   showViaProxy: Boolean,
-  showSearch: MutableState<Boolean>
+  showSearch: MutableState<Boolean>,
+  showCommandsMenu: MutableState<Boolean>
 ) {
+  val chatInfo = remember { derivedStateOf { chat.value?.chatInfo } }
   val scope = rememberCoroutineScope()
   val attachmentDisabled = remember { derivedStateOf { composeState.value.attachmentDisabled } }
   Box(
@@ -886,19 +889,20 @@ fun ChatLayout(
       val composeViewHeight = remember { mutableStateOf(0.dp) }
       Box(Modifier.fillMaxSize().chatViewBackgroundModifier(MaterialTheme.colors, MaterialTheme.wallpaper, LocalAppBarHandler.current?.backgroundGraphicsLayerSize, LocalAppBarHandler.current?.backgroundGraphicsLayer, drawWallpaper = chatsCtx.secondaryContextFilter == null)) {
         val remoteHostId = remember { remoteHostId }.value
-        val chatInfo = remember { chatInfo }.value
+        val chat = remember { chat }.value
+        val chatInfo = chat?.chatInfo
         val oneHandUI = remember { appPrefs.oneHandUI.state }
         val chatBottomBar = remember { appPrefs.chatBottomBar.state }
         val composeViewFocusRequester = remember { if (appPlatform.isDesktop) FocusRequester() else null }
         AdaptingBottomPaddingLayout(Modifier, CHAT_COMPOSE_LAYOUT_ID, composeViewHeight) {
-          if (chatInfo != null) {
+          if (chat != null) {
             Box(Modifier.fillMaxSize(), contentAlignment = Alignment.BottomCenter) {
               // disables scrolling to top of chat item on click inside the bubble
               CompositionLocalProvider(LocalBringIntoViewSpec provides object : BringIntoViewSpec {
                 override fun calculateScrollDistance(offset: Float, size: Float, containerSize: Float): Float = 0f
               }) {
                 ChatItemsList(
-                  chatsCtx, remoteHostId, chatInfo, unreadCount, composeState, composeViewHeight, searchValue,
+                  chatsCtx, remoteHostId, chat, unreadCount, composeState, composeViewHeight, searchValue,
                   useLinkPreviews, linkMode, scrollToItemId, selectedChatItems, showMemberInfo, showChatInfo = info, loadMessages, deleteMessage, deleteMessages, archiveReports,
                   receiveFile, cancelFile, joinGroup, acceptCall, acceptFeature, openDirectChat, forwardItem,
                   updateContactStats, updateMemberStats, syncContactConnection, syncMemberConnection, findModelChat, findModelMember,
@@ -920,6 +924,11 @@ fun ChatLayout(
                   )
                 }
               }
+              if (chatInfo != null && chatInfo.menuCommands.isNotEmpty()) {
+                Column(Modifier.align(Alignment.BottomStart).padding(bottom = composeViewHeight.value)) {
+                  CommandsMenuView(chatsCtx, chat, composeState, showCommandsMenu)
+                }
+              }
             }
           }
           if (chatsCtx.contentTag == MsgContentTag.Report) {
@@ -1362,7 +1371,7 @@ private var reportsListState: LazyListState? = null
 fun BoxScope.ChatItemsList(
   chatsCtx: ChatModel.ChatsContext,
   remoteHostId: Long?,
-  chatInfo: ChatInfo,
+  chat: Chat,
   unreadCount: State<Int>,
   composeState: MutableState<ComposeState>,
   composeViewHeight: State<Dp>,
@@ -1399,6 +1408,7 @@ fun BoxScope.ChatItemsList(
   developerTools: Boolean,
   showViaProxy: Boolean
 ) {
+  val chatInfo = chat.chatInfo
   val loadingTopItems = remember { mutableStateOf(false) }
   val loadingBottomItems = remember { mutableStateOf(false) }
   // just for changing local var here based on request
@@ -1561,7 +1571,7 @@ fun BoxScope.ChatItemsList(
                 highlightedItems.value = setOf()
               }
           }
-          ChatItemView(chatsCtx, remoteHostId, chatInfo, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, revealed = revealed, highlighted = highlighted, hoveredItemId = hoveredItemId, range = range, searchIsNotBlank = searchValueIsNotBlank, fillMaxWidth = fillMaxWidth, selectedChatItems = selectedChatItems, selectChatItem = { selectUnselectChatItem(true, cItem, revealed, selectedChatItems, reversedChatItems) }, deleteMessage = deleteMessage, deleteMessages = deleteMessages, archiveReports = archiveReports, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, forwardItem = forwardItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, scrollToItemId = scrollToItemId, scrollToQuotedItemFromItem = scrollToQuotedItemFromItem, setReaction = setReaction, showItemDetails = showItemDetails, reveal = reveal, showMemberInfo = showMemberInfo, showChatInfo = showChatInfo, developerTools = developerTools, showViaProxy = showViaProxy, itemSeparation = itemSeparation, showTimestamp = itemSeparation.timestamp)
+          ChatItemView(chatsCtx, remoteHostId, chat, cItem, composeState, provider, useLinkPreviews = useLinkPreviews, linkMode = linkMode, revealed = revealed, highlighted = highlighted, hoveredItemId = hoveredItemId, range = range, searchIsNotBlank = searchValueIsNotBlank, fillMaxWidth = fillMaxWidth, selectedChatItems = selectedChatItems, selectChatItem = { selectUnselectChatItem(true, cItem, revealed, selectedChatItems, reversedChatItems) }, deleteMessage = deleteMessage, deleteMessages = deleteMessages, archiveReports = archiveReports, receiveFile = receiveFile, cancelFile = cancelFile, joinGroup = joinGroup, acceptCall = acceptCall, acceptFeature = acceptFeature, openDirectChat = openDirectChat, forwardItem = forwardItem, updateContactStats = updateContactStats, updateMemberStats = updateMemberStats, syncContactConnection = syncContactConnection, syncMemberConnection = syncMemberConnection, findModelChat = findModelChat, findModelMember = findModelMember, scrollToItem = scrollToItem, scrollToItemId = scrollToItemId, scrollToQuotedItemFromItem = scrollToQuotedItemFromItem, setReaction = setReaction, showItemDetails = showItemDetails, reveal = reveal, showMemberInfo = showMemberInfo, showChatInfo = showChatInfo, developerTools = developerTools, showViaProxy = showViaProxy, itemSeparation = itemSeparation, showTimestamp = itemSeparation.timestamp)
         }
       }
 
@@ -1769,10 +1779,12 @@ fun BoxScope.ChatItemsList(
           if (contact.nextConnectPrepared && preparedLinkType != null) {
             when (preparedLinkType) {
               ConnectionMode.Inv -> generalGetString(MR.strings.chat_banner_connect_to_chat)
-              ConnectionMode.Con -> generalGetString(MR.strings.chat_banner_send_request_to_connect)
+              ConnectionMode.Con -> generalGetString(if (contact.isBot) MR.strings.chat_banner_connect_to_use_bot else MR.strings.chat_banner_send_request_to_connect)
             }
           } else if (contact.nextAcceptContactRequest) {
             generalGetString(MR.strings.chat_banner_accept_contact_request)
+          } else if (contact.isBot) {
+            generalGetString(MR.strings.chat_banner_bot)
           } else {
             generalGetString(MR.strings.chat_banner_your_contact)
           }
@@ -3304,7 +3316,7 @@ fun PreviewChatLayout() {
     ChatLayout(
       chatsCtx = ChatModel.ChatsContext(secondaryContextFilter = null),
       remoteHostId = remember { mutableStateOf(null) },
-      chatInfo = remember { mutableStateOf(ChatInfo.Direct.sampleData) },
+      chat = remember { mutableStateOf(Chat.sampleData) },
       unreadCount = unreadCount,
       composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
       composeView = { _ -> },
@@ -3351,7 +3363,8 @@ fun PreviewChatLayout() {
       onComposed = {},
       developerTools = false,
       showViaProxy = false,
-      showSearch =  remember { mutableStateOf(false) }
+      showSearch = remember { mutableStateOf(false) },
+      showCommandsMenu = remember { mutableStateOf(false) }
     )
   }
 }
@@ -3383,7 +3396,7 @@ fun PreviewGroupChatLayout() {
     ChatLayout(
       chatsCtx = ChatModel.ChatsContext(secondaryContextFilter = null),
       remoteHostId = remember { mutableStateOf(null) },
-      chatInfo = remember { mutableStateOf(ChatInfo.Direct.sampleData) },
+      chat = remember { mutableStateOf(Chat.sampleData) },
       unreadCount = unreadCount,
       composeState = remember { mutableStateOf(ComposeState(useLinkPreviews = true)) },
       composeView = { _ -> },
@@ -3430,7 +3443,8 @@ fun PreviewGroupChatLayout() {
       onComposed = {},
       developerTools = false,
       showViaProxy = false,
-      showSearch =  remember { mutableStateOf(false) }
+      showSearch = remember { mutableStateOf(false) },
+      showCommandsMenu = remember { mutableStateOf(false) }
     )
   }
 }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/CommandsMenuView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/CommandsMenuView.kt
new file mode 100644
index 0000000000..26b1fce741
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/CommandsMenuView.kt
@@ -0,0 +1,244 @@
+package chat.simplex.common.views.chat
+
+import androidx.compose.animation.core.Animatable
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.material.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.layout
+import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.dp
+import chat.simplex.common.model.*
+import chat.simplex.common.platform.*
+import chat.simplex.common.ui.theme.DEFAULT_PADDING
+import chat.simplex.common.ui.theme.DEFAULT_PADDING_HALF
+import chat.simplex.common.views.chat.group.*
+import chat.simplex.common.views.chat.item.sendCommandMsg
+import chat.simplex.common.views.helpers.commandMenuAnimSpec
+import chat.simplex.res.MR
+import dev.icerock.moko.resources.compose.painterResource
+import kotlinx.coroutines.launch
+
+private val COMMAND_MENU_ROW_SIZE = 48.dp
+private val MAX_COMMAND_MENU_HEIGHT = COMMAND_MENU_ROW_SIZE * 6 - 8.dp
+
+@Composable
+fun CommandsMenuView(
+  chatsCtx: ChatModel.ChatsContext,
+  chat: Chat,
+  composeState: MutableState<ComposeState>,
+  showCommandsMenu: MutableState<Boolean>
+) {
+  val maxHeightInPx = with(LocalDensity.current) { windowHeight().toPx() }
+  val offsetY = remember { Animatable(maxHeightInPx) }
+  val scope = rememberCoroutineScope()
+
+  val currentCommands = remember { mutableStateOf<List<ChatBotCommand>>(emptyList()) }
+  val menuTreeBackPath = remember { mutableStateOf<List<Pair<String, List<ChatBotCommand>>>>(emptyList()) }
+
+  fun filterShownCommands(commands: List<ChatBotCommand>, msg: CharSequence): List<ChatBotCommand> {
+    val cmds = mutableListOf<ChatBotCommand>()
+    for (cmd in commands) {
+      when (cmd) {
+        is ChatBotCommand.Command ->
+          if (cmd.keyword.startsWith(msg)) {
+            cmds.add(cmd)
+          }
+        is ChatBotCommand.Menu ->
+          cmds.addAll(filterShownCommands(cmd.commands, msg))
+      }
+    }
+    return cmds
+  }
+
+  suspend fun closeCommandsMenu() {
+    showCommandsMenu.value = false
+    currentCommands.value = emptyList()
+    menuTreeBackPath.value = emptyList()
+    if (offsetY.value != 0f) {
+      return
+    }
+    offsetY.animateTo(
+      targetValue = maxHeightInPx,
+      animationSpec = commandMenuAnimSpec()
+    )
+  }
+
+  fun messageChanged(message: String) {
+    val msg = message.trim()
+    menuTreeBackPath.value = emptyList()
+    if (msg == "/") {
+      currentCommands.value = chat.chatInfo.menuCommands
+    } else if (msg.startsWith("/")) {
+      currentCommands.value = filterShownCommands(chat.chatInfo.menuCommands, msg.drop(1))
+    } else {
+      scope.launch { closeCommandsMenu() }
+    }
+  }
+
+  LaunchedEffect(currentCommands.value.isNotEmpty()) {
+    if (currentCommands.value.isNotEmpty()) {
+      offsetY.animateTo(
+        targetValue = 0f,
+        animationSpec = commandMenuAnimSpec()
+      )
+    }
+  }
+
+  LaunchedEffect(composeState.value.message) {
+    messageChanged(composeState.value.message.text)
+  }
+
+  LaunchedEffect(showCommandsMenu.value) {
+    if (showCommandsMenu.value) {
+      currentCommands.value = chat.chatInfo.menuCommands
+      menuTreeBackPath.value = emptyList()
+    } else {
+      closeCommandsMenu()
+    }
+  }
+
+  @Composable
+  fun MenuLabelRow(prev: Pair<String, List<ChatBotCommand>>) {
+    Box(
+      modifier = Modifier
+        .fillMaxWidth()
+        .height(COMMAND_MENU_ROW_SIZE)
+        .clickable {
+          if (menuTreeBackPath.value.isNotEmpty()) {
+            currentCommands.value = menuTreeBackPath.value.last().second
+            menuTreeBackPath.value = menuTreeBackPath.value.dropLast(1)
+          }
+        },
+      contentAlignment = Alignment.Center
+    ) {
+      Row(Modifier.padding(horizontal = DEFAULT_PADDING), verticalAlignment = Alignment.CenterVertically) {
+        Icon(
+          painterResource(MR.images.ic_arrow_back_ios_new),
+          contentDescription = null,
+          tint = MaterialTheme.colors.secondary
+        )
+        Spacer(Modifier.width(DEFAULT_PADDING_HALF))
+        Text(
+          text = prev.first,
+          style = MaterialTheme.typography.body2,
+          textAlign = TextAlign.Center,
+          fontWeight = FontWeight.Medium,
+          maxLines = 1,
+          modifier = Modifier.weight(1f),
+          overflow = TextOverflow.Ellipsis
+        )
+      }
+    }
+  }
+
+  @Composable
+  fun CommandRow(cmd: ChatBotCommand) {
+    when (cmd) {
+      is ChatBotCommand.Command -> {
+        Box(
+          modifier = Modifier
+            .fillMaxWidth()
+            .height(COMMAND_MENU_ROW_SIZE)
+            .clickable {
+              if (cmd.params != null) {
+                val msg = "/${cmd.keyword} ${cmd.params}"
+                composeState.value = ComposeState(message = ComposeMessage(msg, TextRange(msg.length)), useLinkPreviews = true)
+              } else {
+                composeState.value = ComposeState(message = ComposeMessage(), useLinkPreviews = true)
+                sendCommandMsg(chatsCtx, chat,"/${cmd.keyword}")
+              }
+              scope.launch { closeCommandsMenu() }
+            },
+          contentAlignment = Alignment.Center
+        ) {
+          Row(Modifier.padding(horizontal = DEFAULT_PADDING), verticalAlignment = Alignment.CenterVertically) {
+            Text(
+              text = cmd.label,
+              style = MaterialTheme.typography.body1,
+              maxLines = 1,
+              modifier = Modifier.weight(1f),
+              textAlign = TextAlign.Start,
+              overflow = TextOverflow.Ellipsis
+            )
+            Spacer(Modifier.width(DEFAULT_PADDING_HALF))
+            Text(
+              text = "/${cmd.keyword}",
+              style = MaterialTheme.typography.body2,
+              maxLines = 1,
+              color = MaterialTheme.colors.secondary
+            )
+          }
+        }
+      }
+      is ChatBotCommand.Menu ->
+        Box(
+          modifier = Modifier
+            .fillMaxWidth()
+            .height(COMMAND_MENU_ROW_SIZE)
+            .clickable {
+              menuTreeBackPath.value += Pair(cmd.label, currentCommands.value)
+              currentCommands.value = cmd.commands
+            },
+          contentAlignment = Alignment.Center
+        ) {
+          Row(Modifier.padding(horizontal = DEFAULT_PADDING), verticalAlignment = Alignment.CenterVertically) {
+            Text(
+              text = cmd.label,
+              style = MaterialTheme.typography.body1,
+              fontWeight = FontWeight.Medium,
+              maxLines = 1,
+              modifier = Modifier.weight(1f),
+              overflow = TextOverflow.Ellipsis
+            )
+            Spacer(Modifier.width(DEFAULT_PADDING_HALF))
+            Icon(
+              painterResource(MR.images.ic_chevron_right),
+              contentDescription = null,
+              tint = MaterialTheme.colors.secondary
+            )
+          }
+        }
+    }
+  }
+
+  Box(
+    modifier = Modifier
+      .fillMaxSize()
+      .offset { IntOffset(0, offsetY.value.toInt()) }
+      .clickable(indication = null, interactionSource = remember { MutableInteractionSource() }) {
+        scope.launch { closeCommandsMenu() }
+      },
+    contentAlignment = Alignment.BottomStart
+  ) {
+    LazyColumnWithScrollBarNoAppBar(
+      Modifier
+        .heightIn(max = MAX_COMMAND_MENU_HEIGHT)
+        .background(MaterialTheme.colors.surface),
+      maxHeight = remember { mutableStateOf(MAX_COMMAND_MENU_HEIGHT) },
+      containerAlignment = Alignment.BottomEnd
+    ) {
+      itemsIndexed(currentCommands.value, key = { i, cmd -> "$i ${cmd.hashCode()}" }) { i, command ->
+        if (i == 0) {
+          val prev = menuTreeBackPath.value.lastOrNull()
+          if (prev != null) {
+            Divider()
+            MenuLabelRow(prev)
+          }
+        }
+        Divider()
+        Box(Modifier.fillMaxWidth()) { CommandRow(command) }
+      }
+    }
+  }
+}
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
index ce55c62ae2..5f99ac77d6 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ComposeView.kt
@@ -17,7 +17,9 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ImageBitmap
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.style.TextDecoration
 import dev.icerock.moko.resources.compose.painterResource
 import dev.icerock.moko.resources.compose.stringResource
 import androidx.compose.ui.unit.dp
@@ -345,6 +347,7 @@ fun ComposeView(
   chatsCtx: ChatModel.ChatsContext,
   chat: Chat,
   composeState: MutableState<ComposeState>,
+  showCommandsMenu: MutableState<Boolean>,
   attachmentOption: MutableState<AttachmentOption?>,
   showChooseAttachment: () -> Unit,
   focusRequester: FocusRequester?,
@@ -483,7 +486,7 @@ fun ComposeView(
     if (!chatItems.isNullOrEmpty()) {
       chatItems.forEach { aChatItem ->
         withContext(Dispatchers.Main) {
-          chatsCtx.addChatItem(chat.remoteHostId, cInfo, aChatItem.chatItem)
+          chatsCtx.addChatItem(chat.remoteHostId, aChatItem.chatInfo, aChatItem.chatItem)
         }
       }
       return chatItems.first().chatItem
@@ -593,7 +596,6 @@ fun ComposeView(
   }
 
   suspend fun sendMessageAsync(text: String?, live: Boolean, ttl: Int?): List<ChatItem>? {
-    val cInfo = chat.chatInfo
     val cs = composeState.value
     var sent: List<ChatItem>?
     var lastMessageFailedToSend: ComposeState? = null
@@ -1064,6 +1066,22 @@ fun ComposeView(
   val userCantSendReason = rememberUpdatedState(chat.chatInfo.userCantSendReason)
   val nextSendGrpInv = rememberUpdatedState(chat.nextSendGrpInv)
 
+  @Composable
+  fun CommandsButton() {
+    val commandsEnabled = chat.chatInfo.sendMsgEnabled && chat.chatInfo.menuCommands.isNotEmpty()
+    IconButton(
+      onClick = { showCommandsMenu.value = !showCommandsMenu.value },
+      enabled = commandsEnabled
+    ) {
+      Box(
+        modifier = Modifier.size(28.dp).clip(CircleShape),
+        contentAlignment = Alignment.Center
+      ) {
+        Text("//", style = MaterialTheme.typography.h3.copy(fontStyle = FontStyle.Italic, color = if (commandsEnabled) MaterialTheme.colors.primary else MaterialTheme.colors.secondary))
+      }
+    }
+  }
+
   @Composable
   fun AttachmentButton() {
     val isGroupAndProhibitedFiles =
@@ -1087,7 +1105,6 @@ fun ComposeView(
           && !nextSendGrpInv.value
     IconButton(
       attachmentClicked,
-      Modifier.padding(start = 3.dp, end = 1.dp, bottom = if (appPlatform.isAndroid) 2.sp.toDp() else 5.sp.toDp() * fontSizeSqrtMultiplier),
       enabled = attachmentEnabled
     ) {
       Icon(
@@ -1101,6 +1118,24 @@ fun ComposeView(
     }
   }
 
+  @Composable
+  fun AttachmentAndCommandsButtons() {
+    val cInfo = chat.chatInfo
+    Row(
+      Modifier.padding(start = 3.dp, end = 1.dp, bottom = if (appPlatform.isAndroid) 2.sp.toDp() else 5.sp.toDp() * fontSizeSqrtMultiplier),
+      horizontalArrangement = Arrangement.spacedBy((-8).dp)
+    ) {
+      val msg = composeState.value.message.text.trim()
+      val showAttachment = cInfo !is ChatInfo.Direct || cInfo.contact.profile.peerType != ChatPeerType.Bot || cInfo.featureEnabled(ChatFeature.Files)
+      if (cInfo.useCommands && (!showAttachment || msg.isEmpty() || msg.startsWith("/"))) {
+        CommandsButton()
+      }
+      if (showAttachment) {
+        AttachmentButton()
+      }
+    }
+  }
+
   val allowedVoiceByPrefs = remember(chat.chatInfo) { chat.chatInfo.featureEnabled(ChatFeature.Voice) }
   LaunchedEffect(allowedVoiceByPrefs) {
     if (!allowedVoiceByPrefs && composeState.value.preview is ComposePreview.VoicePreview) {
@@ -1280,7 +1315,7 @@ fun ComposeView(
         )
         Text(
           text,
-          style = MaterialTheme.typography.caption,
+          style = MaterialTheme.typography.body2,
           color = if (composeState.value.inProgress) MaterialTheme.colors.secondary else MaterialTheme.colors.primary
         )
       }
@@ -1433,7 +1468,7 @@ fun ComposeView(
           ContextSendMessageToConnect(generalGetString(MR.strings.compose_send_direct_message_to_connect))
           Divider()
           Row(Modifier.padding(end = 8.dp), verticalAlignment = Alignment.Bottom) {
-            AttachmentButton()
+            AttachmentAndCommandsButtons()
             SendMsgView_(
               disableSendButton = disableSendButton,
               sendToConnect = { withApi { sendMemberContactInvitation() } }
@@ -1453,11 +1488,19 @@ fun ComposeView(
               connect = { withApi { sendConnectPreparedContact() } }
             )
           ConnectionMode.Con ->
-            SendContactRequestView(
-              disableSendButton = disableSendButton,
-              icon = MR.images.ic_person_add_filled,
-              sendRequest = { showSendConnectPreparedContactAlert() }
-            )
+            if (chat.chatInfo.contact.isBot) {
+              ConnectButtonView(
+                text = stringResource(MR.strings.compose_view_connect),
+                icon = MR.images.ic_bolt_filled,
+                connect = { withApi { sendConnectPreparedContact() } }
+              )
+            } else {
+              SendContactRequestView(
+                disableSendButton = disableSendButton,
+                icon = MR.images.ic_person_add_filled,
+                sendRequest = { showSendConnectPreparedContactAlert() }
+              )
+            }
         }
       } else if (
         chat.chatInfo is ChatInfo.Direct
@@ -1480,7 +1523,7 @@ fun ComposeView(
         )
       } else {
         Row(Modifier.padding(end = 8.dp), verticalAlignment = Alignment.Bottom) {
-          AttachmentButton()
+          AttachmentAndCommandsButtons()
           SendMsgView_(disableSendButton = disableSendButton)
         }
       }
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/SelectableChatItemToolbars.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/SelectableChatItemToolbars.kt
index ac722783a3..03d0b99854 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/SelectableChatItemToolbars.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/SelectableChatItemToolbars.kt
@@ -77,7 +77,7 @@ fun SelectedItemsButtonsToolbar(
   val forwardCountProhibited = remember { mutableStateOf(false) }
   Box {
     // It's hard to measure exact height of ComposeView with different fontSizes. Better to depend on actual ComposeView, even empty
-    ComposeView(rhId = null, chatModel = chatModel, chatModel.chatsContext, Chat.sampleData, remember { mutableStateOf(ComposeState(useLinkPreviews = false)) }, remember { mutableStateOf(null) }, {}, remember { FocusRequester() })
+    ComposeView(rhId = null, chatModel = chatModel, chatModel.chatsContext, Chat.sampleData, remember { mutableStateOf(ComposeState(useLinkPreviews = false)) }, remember { mutableStateOf(false) }, remember { mutableStateOf(null) }, {}, remember { FocusRequester() })
     Row(
       Modifier
         .matchParentSize()
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMembersToolbar.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMembersToolbar.kt
index 62f1a4337c..81e7d80da3 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMembersToolbar.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/group/GroupMembersToolbar.kt
@@ -44,7 +44,7 @@ fun SelectedItemsMembersToolbar(
   ) {
     // It's hard to measure exact height of ComposeView with different fontSizes. Better to depend on actual ComposeView, even empty
     Box(Modifier.alpha(0f)) {
-      ComposeView(rhId = null, chatModel = chatModel, chatModel.chatsContext, Chat.sampleData, remember { mutableStateOf(ComposeState(useLinkPreviews = false)) }, remember { mutableStateOf(null) }, {}, remember { FocusRequester() })
+      ComposeView(rhId = null, chatModel = chatModel, chatModel.chatsContext, Chat.sampleData, remember { mutableStateOf(ComposeState(useLinkPreviews = false)) }, remember { mutableStateOf(false) }, remember { mutableStateOf(null) }, {}, remember { FocusRequester() })
     }
     Row(
       Modifier
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt
index 0f9b3151fe..6f873035f1 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/ChatItemView.kt
@@ -65,7 +65,7 @@ data class ChatItemReactionMenuItem (
 fun ChatItemView(
   chatsCtx: ChatModel.ChatsContext,
   rhId: Long?,
-  cInfo: ChatInfo,
+  chat: Chat,
   cItem: ChatItem,
   composeState: MutableState<ComposeState>,
   imageProvider: (() -> ImageGalleryProvider)? = null,
@@ -109,6 +109,7 @@ fun ChatItemView(
   itemSeparation: ItemSeparation,
   preview: Boolean = false,
 ) {
+  val cInfo = chat.chatInfo
   val uriHandler = LocalUriHandler.current
   val sent = cItem.chatDir.sent
   val alignment = if (sent) Alignment.CenterEnd else Alignment.CenterStart
@@ -327,7 +328,7 @@ fun ChatItemView(
           ) {
             @Composable
             fun framedItemView() {
-              FramedItemView(chatsCtx, cInfo, cItem, uriHandler, imageProvider, linkMode = linkMode, showViaProxy = showViaProxy, showMenu, showTimestamp = showTimestamp, tailVisible = itemSeparation.largeGap, receiveFile, onLinkLongClick, scrollToItem, scrollToItemId, scrollToQuotedItemFromItem)
+              FramedItemView(chatsCtx, chat, cItem, uriHandler, imageProvider, linkMode = linkMode, showViaProxy = showViaProxy, showMenu, showTimestamp = showTimestamp, tailVisible = itemSeparation.largeGap, receiveFile, onLinkLongClick, scrollToItem, scrollToItemId, scrollToQuotedItemFromItem)
             }
 
             fun deleteMessageQuestionText(): String {
@@ -1449,7 +1450,7 @@ fun PreviewChatItemView(
   ChatItemView(
     chatsCtx = ChatModel.ChatsContext(secondaryContextFilter = null),
     rhId = null,
-    ChatInfo.Direct.sampleData,
+    Chat.sampleData,
     chatItem,
     useLinkPreviews = true,
     linkMode = SimplexLinkMode.DESCRIPTION,
@@ -1500,7 +1501,7 @@ fun PreviewChatItemViewDeletedContent() {
     ChatItemView(
       chatsCtx = ChatModel.ChatsContext(secondaryContextFilter = null),
       rhId = null,
-      ChatInfo.Direct.sampleData,
+      Chat.sampleData,
       ChatItem.getDeletedContentSampleData(),
       useLinkPreviews = true,
       linkMode = SimplexLinkMode.DESCRIPTION,
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt
index ad02b8d812..f36da6c908 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/FramedItemView.kt
@@ -21,14 +21,17 @@ import androidx.compose.ui.unit.*
 import chat.simplex.common.model.*
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
+import chat.simplex.common.views.chat.ComposeState
 import chat.simplex.common.views.helpers.*
 import chat.simplex.res.MR
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
 import kotlin.math.ceil
 
 @Composable
 fun FramedItemView(
   chatsCtx: ChatModel.ChatsContext,
-  chatInfo: ChatInfo,
+  chat: Chat,
   ci: ChatItem,
   uriHandler: UriHandler? = null,
   imageProvider: (() -> ImageGalleryProvider)? = null,
@@ -43,6 +46,7 @@ fun FramedItemView(
   scrollToItemId: MutableState<Long?>,
   scrollToQuotedItemFromItem: (Long) -> Unit = {},
 ) {
+  val chatInfo = chat.chatInfo
   val sent = ci.chatDir.sent
   val chatTTL = chatInfo.timedMessagesTTL
 
@@ -182,7 +186,7 @@ fun FramedItemView(
   fun ciFileView(ci: ChatItem, text: String) {
     CIFileView(ci.file, ci.meta.itemEdited, showMenu, false, receiveFile)
     if (text != "" || ci.meta.isLive) {
-      CIMarkdownText(ci, chatInfo, chatTTL, linkMode = linkMode, uriHandler, showViaProxy = showViaProxy,  showTimestamp = showTimestamp)
+      CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode = linkMode, uriHandler, showViaProxy = showViaProxy,  showTimestamp = showTimestamp)
     }
   }
 
@@ -295,7 +299,7 @@ fun FramedItemView(
                 if (mc.text == "" && !ci.meta.isLive) {
                   metaColor = Color.White
                 } else {
-                  CIMarkdownText(ci, chatInfo, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+                  CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
                 }
               }
               is MsgContent.MCVideo -> {
@@ -303,26 +307,26 @@ fun FramedItemView(
                 if (mc.text == "" && !ci.meta.isLive) {
                   metaColor = Color.White
                 } else {
-                  CIMarkdownText(ci, chatInfo, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+                  CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
                 }
               }
               is MsgContent.MCVoice -> {
                 CIVoiceView(mc.duration, ci.file, ci.meta.itemEdited, ci.chatDir.sent, hasText = true, ci, timedMessagesTTL = chatTTL, showViaProxy = showViaProxy, showTimestamp = showTimestamp, longClick = { onLinkLongClick("") }, receiveFile = receiveFile)
                 if (mc.text != "") {
-                  CIMarkdownText(ci, chatInfo, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+                  CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
                 }
               }
               is MsgContent.MCFile -> ciFileView(ci, mc.text)
               is MsgContent.MCUnknown ->
                 if (ci.file == null) {
-                  CIMarkdownText(ci, chatInfo, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+                  CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
                 } else {
                   ciFileView(ci, mc.text)
                 }
               is MsgContent.MCLink -> {
                 ChatItemLinkView(mc.preview, showMenu, onLongClick = { showMenu.value = true })
                 Box(Modifier.widthIn(max = DEFAULT_MAX_IMAGE_WIDTH)) {
-                  CIMarkdownText(ci, chatInfo, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+                  CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
                 }
               }
               is MsgContent.MCReport -> {
@@ -331,9 +335,9 @@ fun FramedItemView(
                     append(if (mc.text.isEmpty()) mc.reason.text else "${mc.reason.text}: ")
                   }
                 }
-                CIMarkdownText(ci, chatInfo, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp, prefix = prefix)
+                CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp, prefix = prefix)
               }
-              else -> CIMarkdownText(ci, chatInfo, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
+              else -> CIMarkdownText(chatsCtx, ci, chat, chatTTL, linkMode, uriHandler, onLinkLongClick, showViaProxy = showViaProxy, showTimestamp = showTimestamp)
             }
           }
         }
@@ -353,8 +357,9 @@ fun FramedItemView(
 
 @Composable
 fun CIMarkdownText(
+  chatsCtx: ChatModel.ChatsContext,
   ci: ChatItem,
-  chatInfo: ChatInfo,
+  chat: Chat,
   chatTTL: Int?,
   linkMode: SimplexLinkMode,
   uriHandler: UriHandler?,
@@ -364,9 +369,11 @@ fun CIMarkdownText(
   prefix: AnnotatedString? = null
 ) {
   Box(Modifier.padding(vertical = 7.dp, horizontal = 12.dp)) {
+    val chatInfo = chat.chatInfo
     val text = if (ci.meta.isLive) ci.content.msgContent?.text ?: ci.text else ci.text
     MarkdownText(
       text, if (text.isEmpty()) emptyList() else ci.formattedText, toggleSecrets = true,
+      sendCommandMsg = if (chatInfo.useCommands && chat.chatInfo.sndReady) { { msg -> sendCommandMsg(chatsCtx, chat, msg) } } else null,
       meta = ci.meta, chatTTL = chatTTL, linkMode = linkMode,
       mentions = ci.mentions, userMemberId = when {
         chatInfo is ChatInfo.Group -> chatInfo.groupInfo.membership.memberId
@@ -377,6 +384,32 @@ fun CIMarkdownText(
   }
 }
 
+fun sendCommandMsg(chatsCtx: ChatModel.ChatsContext, chat: Chat, msg: String) {
+  if (chat.chatInfo.sndReady) {
+    withLongRunningApi(slow = 60_000) {
+      val cInfo = chat.chatInfo
+      val chatItems =
+        chatModel.controller.apiSendMessages(
+          rh = chat.remoteHostId,
+          type = cInfo.chatType,
+          id = cInfo.apiId,
+          scope = cInfo.groupChatScope(),
+          composedMessages = listOf(ComposedMessage(fileSource = null, quotedItemId = null, msgContent = MsgContent.MCText(msg), mentions = emptyMap()))
+        )
+      if (!chatItems.isNullOrEmpty()) {
+        chatItems.forEach { aChatItem ->
+          withContext(Dispatchers.Main) {
+            chatsCtx.addChatItem(chat.remoteHostId, aChatItem.chatInfo, aChatItem.chatItem)
+          }
+        }
+      }
+    }
+  } else {
+    AlertManager.shared.showAlertMsg(MR.strings.cant_send_message_alert_title, MR.strings.cant_send_commands_alert_text)
+  }
+}
+
+
 const val CHAT_IMAGE_LAYOUT_ID = "chatImage"
 const val CHAT_BUBBLE_LAYOUT_ID = "chatBubble"
 const val CHAT_COMPOSE_LAYOUT_ID = "chatCompose"
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt
index ad11eb4897..291eedb4ee 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/item/TextItemView.kt
@@ -11,6 +11,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.pointer.*
 import androidx.compose.ui.platform.*
 import androidx.compose.ui.text.*
+import androidx.compose.ui.text.AnnotatedString.Range
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
@@ -61,6 +62,7 @@ fun MarkdownText (
   mentions: Map<String, CIMention>? = null,
   userMemberId: String? = null,
   toggleSecrets: Boolean,
+  sendCommandMsg: ((String) -> Unit)? = null,
   style: TextStyle = MaterialTheme.typography.body1.copy(color = MaterialTheme.colors.onSurface, lineHeight = 22.sp),
   maxLines: Int = Int.MAX_VALUE,
   overflow: TextOverflow = TextOverflow.Clip,
@@ -134,7 +136,9 @@ fun MarkdownText (
       }
       Text(annotatedText, style = style, modifier = modifier, maxLines = maxLines, overflow = overflow, inlineContent = inlineContent?.second ?: mapOf())
     } else {
-      var hasAnnotations = false
+      var hasLinks = false
+      var hasSecrets = false
+      var hasCommands = false
       val annotatedText = buildAnnotatedString {
         inlineContent?.first?.invoke(this)
         appendSender(this, sender, senderBold)
@@ -143,7 +147,7 @@ fun MarkdownText (
           if (ft.format == null) append(ft.text)
           else if (toggleSecrets && ft.format is Format.Secret) {
             val ftStyle = ft.format.style
-            hasAnnotations = true
+            hasSecrets = true
             val key = i.toString()
             withAnnotation(tag = "SECRET", annotation = key) {
               if (showSecrets[key] == true) append(ft.text) else withStyle(ftStyle) { append(ft.text) }
@@ -168,10 +172,21 @@ fun MarkdownText (
             } else {
               append(ft.text)
             }
+          } else if (ft.format is Format.Command) {
+            if (sendCommandMsg == null) {
+              append(ft.text)
+            } else {
+              hasCommands = true
+              val ftStyle = ft.format.style
+              val cmd = ft.format.commandStr
+              withAnnotation(tag = "COMMAND", annotation = cmd) {
+                withStyle(ftStyle) { append("/$cmd") }
+              }
+            }
           } else {
             val link = ft.link(linkMode)
             if (link != null) {
-              hasAnnotations = true
+              hasLinks = true
               val ftStyle = ft.format.style
               withAnnotation(tag = if (ft.format is Format.SimplexLink) "SIMPLEX_URL" else "URL", annotation = link) {
                 withStyle(ftStyle) { append(ft.viewText(linkMode)) }
@@ -189,51 +204,53 @@ fun MarkdownText (
           withStyle(reserveTimestampStyle) { append("\n" + metaText) }
         else */if (meta != null) withStyle(reserveTimestampStyle) { append(reserve) }
       }
-      if (hasAnnotations && uriHandler != null) {
+      if ((hasLinks && uriHandler != null) || hasSecrets || (hasCommands && sendCommandMsg != null)) {
         val icon = remember { mutableStateOf(PointerIcon.Default) }
         ClickableText(annotatedText, style = style, modifier = modifier.pointerHoverIcon(icon.value), maxLines = maxLines, overflow = overflow,
           onLongClick = { offset ->
-            annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset)
-              .firstOrNull()?.let { annotation -> onLinkLongClick(annotation.item) }
-            annotatedText.getStringAnnotations(tag = "SIMPLEX_URL", start = offset, end = offset)
-              .firstOrNull()?.let { annotation -> onLinkLongClick(annotation.item) }
+            if (hasLinks) {
+              annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset)
+                .firstOrNull()?.let { annotation -> onLinkLongClick(annotation.item) }
+              annotatedText.getStringAnnotations(tag = "SIMPLEX_URL", start = offset, end = offset)
+                .firstOrNull()?.let { annotation -> onLinkLongClick(annotation.item) }
+            }
           },
           onClick = { offset ->
-            annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset)
-              .firstOrNull()?.let { annotation ->
+            val withAnnotation: (String, (Range<String>) -> Unit) -> Unit = { tag, f ->
+              annotatedText.getStringAnnotations(tag, start = offset, end = offset).firstOrNull()?.let(f)
+            }
+            if (hasLinks && uriHandler != null) {
+              withAnnotation("URL") { a ->
                 try {
-                  uriHandler.openUri(annotation.item)
+                  uriHandler.openUri(a.item)
                 } catch (e: Exception) {
                   // It can happen, for example, when you click on a text 0.00001 but don't have any app that can catch
                   // `tel:` scheme in url installed on a device (no phone app or contacts, maybe)
                   Log.e(TAG, "Open url: ${e.stackTraceToString()}")
                 }
               }
-            annotatedText.getStringAnnotations(tag = "SIMPLEX_URL", start = offset, end = offset)
-              .firstOrNull()?.let { annotation ->
-                uriHandler.openVerifiedSimplexUri(annotation.item)
-              }
-            annotatedText.getStringAnnotations(tag = "SECRET", start = offset, end = offset)
-              .firstOrNull()?.let { annotation ->
-                val key = annotation.item
+              withAnnotation("SIMPLEX_URL") { a -> uriHandler.openVerifiedSimplexUri(a.item) }
+            } else if (hasSecrets) {
+              withAnnotation("SECRET") { a ->
+                val key = a.item
                 showSecrets[key] = !(showSecrets[key] ?: false)
               }
+            } else if (hasCommands && sendCommandMsg != null) {
+              withAnnotation("COMMAND") { a -> sendCommandMsg("/${a.item}") }
+            }
           },
           onHover = { offset ->
-            icon.value = annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset)
-              .firstOrNull()?.let {
+            val hasAnnotation: (String) -> Boolean = { tag -> annotatedText.hasStringAnnotations(tag, start = offset, end = offset) }
+            icon.value =
+              if (hasAnnotation("URL") || hasAnnotation("SIMPLEX_URL") || hasAnnotation("SECRET") || hasAnnotation("COMMAND")) {
                 PointerIcon.Hand
-              } ?: annotatedText.getStringAnnotations(tag = "SIMPLEX_URL", start = offset, end = offset)
-              .firstOrNull()?.let {
-                PointerIcon.Hand
-              } ?: annotatedText.getStringAnnotations(tag = "SECRET", start = offset, end = offset)
-              .firstOrNull()?.let {
-                PointerIcon.Hand
-              } ?: PointerIcon.Default
+              } else {
+                PointerIcon.Default
+              }
           },
           shouldConsumeEvent = { offset ->
-            annotatedText.getStringAnnotations(tag = "URL", start = offset, end = offset).any()
-            annotatedText.getStringAnnotations(tag = "SIMPLEX_URL", start = offset, end = offset).any()
+            annotatedText.hasStringAnnotations(tag = "URL", start = offset, end = offset)
+                || annotatedText.hasStringAnnotations(tag = "SIMPLEX_URL", start = offset, end = offset)
           }
         )
       } else {
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatPreviewView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatPreviewView.kt
index e6c74b7558..35681ff1d2 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatPreviewView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chatlist/ChatPreviewView.kt
@@ -176,12 +176,14 @@ fun ChatPreviewView(
       is ChatInfo.Direct ->
         if (cInfo.contact.isContactCard) {
           stringResource(MR.strings.contact_tap_to_connect) to MaterialTheme.colors.primary
+        } else if (cInfo.contact.isBot && cInfo.contact.nextConnectPrepared) {
+          stringResource(MR.strings.open_to_use_bot) to Color.Unspecified
         } else if (cInfo.contact.sendMsgToConnect) {
           stringResource(MR.strings.open_to_connect) to Color.Unspecified
         } else if (cInfo.contact.nextAcceptContactRequest) {
           stringResource(MR.strings.open_to_accept) to Color.Unspecified
         } else if (!cInfo.contact.sndReady && cInfo.contact.activeConn != null && cInfo.contact.active) {
-          if (cInfo.contact.preparedContact?.uiConnLinkType == ConnectionMode.Con) {
+          if ((cInfo.contact.preparedContact?.uiConnLinkType == ConnectionMode.Con && !cInfo.contact.isBot) || cInfo.contact.contactGroupMemberId != null) {
             stringResource(MR.strings.contact_should_accept) to Color.Unspecified
           } else {
             stringResource(MR.strings.contact_connection_pending) to Color.Unspecified
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AnimationUtils.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AnimationUtils.kt
index 75f61dda04..a55b1a0d56 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AnimationUtils.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/AnimationUtils.kt
@@ -2,14 +2,14 @@ package chat.simplex.common.views.helpers
 
 import androidx.compose.animation.core.*
 
-fun <T> chatListAnimationSpec() = tween<T>(durationMillis = 250, easing = FastOutSlowInEasing)
-
-fun <T> newChatSheetAnimSpec() = tween<T>(256, 0, LinearEasing)
+fun <T> chatListAnimationSpec() = tween<T>(durationMillis = 350, easing = FastOutSlowInEasing)
 
 fun <T> audioProgressBarAnimationSpec() = tween<T>(durationMillis = 30, easing = LinearEasing)
 
-fun <T> userPickerAnimSpec() = tween<T>(256, 0, FastOutSlowInEasing)
+fun <T> userPickerAnimSpec() = tween<T>(350, 0, FastOutSlowInEasing)
 
-fun <T> mentionPickerAnimSpec() = tween<T>(256, 0, FastOutSlowInEasing)
+fun <T> mentionPickerAnimSpec() = tween<T>(350, 0, FastOutSlowInEasing)
 
-fun <T> contextUserPickerAnimSpec() = tween<T>(256, 0, FastOutSlowInEasing)
+fun <T> commandMenuAnimSpec() = tween<T>(350, 0, FastOutSlowInEasing)
+
+fun <T> contextUserPickerAnimSpec() = tween<T>(350, 0, FastOutSlowInEasing)
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatInfoImage.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatInfoImage.kt
index 72fab4990b..72ef8c623d 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatInfoImage.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/helpers/ChatInfoImage.kt
@@ -33,6 +33,7 @@ fun ChatInfoImage(chatInfo: ChatInfo, size: Dp, iconColor: Color = MaterialTheme
     when (chatInfo) {
       is ChatInfo.Group -> chatInfo.groupInfo.chatIconName
       is ChatInfo.Local -> MR.images.ic_folder_filled
+      is ChatInfo.Direct -> chatInfo.contact.chatIconName
       else -> MR.images.ic_account_circle_filled
     }
   ProfileImage(size, chatInfo.image, icon, if (chatInfo is ChatInfo.Local) NoteFolderIconColor else iconColor)
diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ConnectPlan.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ConnectPlan.kt
index 786e3483c5..b1c5caedc9 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ConnectPlan.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/newchat/ConnectPlan.kt
@@ -390,7 +390,7 @@ private fun showOpenKnownContactAlert(chatModel: ChatModel, rhId: Long?, close:
       ProfileImage(
         size = alertProfileImageSize,
         image = contact.profile.image,
-        icon = MR.images.ic_account_circle_filled
+        icon = contact.chatIconName
       )
     },
     confirmText = generalGetString(if (contact.nextConnectPrepared) MR.strings.connect_plan_open_new_chat else MR.strings.connect_plan_open_chat),
@@ -474,7 +474,7 @@ private fun showOpenKnownGroupAlert(chatModel: ChatModel, rhId: Long?, close: ((
       ProfileImage(
         size = alertProfileImageSize,
         image = groupInfo.groupProfile.image,
-        icon = if (groupInfo.businessChat == null) MR.images.ic_supervised_user_circle_filled else MR.images.ic_work_filled_padded
+        icon = groupInfo.chatIconName
       )
     },
     confirmText = generalGetString(
@@ -515,7 +515,10 @@ fun showPrepareContactAlert(
       ProfileImage(
         size = alertProfileImageSize,
         image = contactShortLinkData.profile.image,
-        icon = if (contactShortLinkData.business) MR.images.ic_work_filled_padded else MR.images.ic_account_circle_filled
+        icon =
+          if (contactShortLinkData.business) MR.images.ic_work_filled_padded
+          else if (contactShortLinkData.profile.peerType == ChatPeerType.Bot) MR.images.ic_cube
+          else MR.images.ic_account_circle_filled
       )
     },
     confirmText = generalGetString(MR.strings.connect_plan_open_new_chat),
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
index e962c3a646..22cdd3a643 100644
--- a/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/base/strings.xml
@@ -449,6 +449,7 @@
   <string name="no_chats_found">No chats found</string>
   <string name="contact_tap_to_connect">Tap to Connect</string>
   <string name="open_to_connect">Open to connect</string>
+  <string name="open_to_use_bot">Open to use bot</string>
   <string name="open_to_accept">Open to accept</string>
   <string name="contact_should_accept">contact should accept…</string>
   <string name="connect_with_contact_name_question">Connect with %1$s?</string>
@@ -489,8 +490,10 @@
   <!-- ChatBannerView -->
   <string name="chat_banner_connect_to_chat">Tap Connect to chat</string>
   <string name="chat_banner_send_request_to_connect">Tap Connect to send request</string>
+  <string name="chat_banner_connect_to_use_bot">Tap Connect to use bot</string>
   <string name="chat_banner_accept_contact_request">Accept contact request</string>
   <string name="chat_banner_your_contact">Your contact</string>
+  <string name="chat_banner_bot">Bot</string>
   <string name="chat_banner_join_group">Tap Join group</string>
   <string name="chat_banner_your_group">Your group</string>
   <string name="chat_banner_group">Group</string>
@@ -562,6 +565,7 @@
   <string name="you_are_observer">you are observer</string>
   <string name="reviewed_by_admins">reviewed by admins</string>
   <string name="cant_send_message_member_has_old_version">member has old version</string>
+  <string name="cant_send_commands_alert_text">To send commands you must be connected.</string>
 
   <!-- Images - chat.simplex.app.views.chat.item.CIImageView.kt -->
   <string name="image_descr">Image</string>
@@ -2157,6 +2161,9 @@
   <string name="allow_your_contacts_to_send_voice_messages">Allow your contacts to send voice messages.</string>
   <string name="allow_voice_messages_only_if">Allow voice messages only if your contact allows them.</string>
   <string name="prohibit_sending_voice_messages">Prohibit sending voice messages.</string>
+  <string name="allow_your_contacts_to_send_files_and_media">Allow your contacts to send files and media.</string>
+  <string name="allow_files_and_media_only_if">Allow files and media only if your contact allows them.</string>
+  <string name="prohibit_sending_files_and_media">Prohibit sending files and media.</string>
   <string name="allow_your_contacts_adding_message_reactions">Allow your contacts adding message reactions.</string>
   <string name="allow_message_reactions_only_if">Allow message reactions only if your contact allows them.</string>
   <string name="prohibit_message_reactions">Prohibit message reactions.</string>
@@ -2175,6 +2182,10 @@
   <string name="only_you_can_send_voice">Only you can send voice messages.</string>
   <string name="only_your_contact_can_send_voice">Only your contact can send voice messages.</string>
   <string name="voice_prohibited_in_this_chat">Voice messages are prohibited in this chat.</string>
+  <string name="both_you_and_your_contact_can_send_files">Both you and your contact can send files and media.</string>
+  <string name="only_you_can_send_files">Only you can send files and media.</string>
+  <string name="only_your_contact_can_send_files">Only your contact can send files and media.</string>
+  <string name="files_prohibited_in_this_chat">Files and media are prohibited in this chat.</string>
   <string name="both_you_and_your_contact_can_add_message_reactions">Both you and your contact can add message reactions.</string>
   <string name="only_you_can_add_message_reactions">Only you can add message reactions.</string>
   <string name="only_your_contact_can_add_message_reactions">Only your contact can add message reactions.</string>
diff --git a/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_cube.svg b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_cube.svg
new file mode 100644
index 0000000000..252afc1acc
--- /dev/null
+++ b/apps/multiplatform/common/src/commonMain/resources/MR/images/ic_cube.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="22px" viewBox="0 -960 960 960" width="22px" fill="#000000"><path d="m451.5-89.5-298-172q-14.25-8.43-21.62-21.46-7.38-13.04-7.38-28.54V-649q0-15 7.38-28.29 7.37-13.28 21.62-21.71l298-171.5q13.83-8 28.66-8 14.84 0 28.84 8L807-699q13.75 8.43 21.13 21.71Q835.5-664 835.5-649v337.5q0 15.5-7.37 28.79-7.38 13.28-21.13 21.21l-298 172q-14.33 8-29.16 8-14.84 0-28.34-8Zm0-374V-156l28.5 16.5 29-16.5v-307.66L778-620v-28.5L745.5-667 480-512 214-667l-32 18.16V-619l269.5 155.5Z"/></svg>
\ No newline at end of file
diff --git a/apps/simplex-broadcast-bot/src/Broadcast/Options.hs b/apps/simplex-broadcast-bot/src/Broadcast/Options.hs
index 8107b664c4..d9f091a13a 100644
--- a/apps/simplex-broadcast-bot/src/Broadcast/Options.hs
+++ b/apps/simplex-broadcast-bot/src/Broadcast/Options.hs
@@ -11,10 +11,11 @@ import Data.Text (Text)
 import Options.Applicative
 import Simplex.Chat.Bot.KnownContacts
 import Simplex.Chat.Controller (updateStr, versionNumber, versionString)
-import Simplex.Chat.Options (ChatCmdLog (..), ChatOpts (..), CoreChatOpts, coreChatOptsP)
+import Simplex.Chat.Options (ChatCmdLog (..), ChatOpts (..), CoreChatOpts, CreateBotOpts (..), coreChatOptsP)
 
 data BroadcastBotOpts = BroadcastBotOpts
   { coreOptions :: CoreChatOpts,
+    botDisplayName :: Text,
     publishers :: [KnownContact],
     welcomeMessage :: Text,
     prohibitedMessage :: Text
@@ -29,6 +30,12 @@ defaultProhibitedMessage ps = "Sorry, only these users can broadcast messages: "
 broadcastBotOpts :: FilePath -> FilePath -> Parser BroadcastBotOpts
 broadcastBotOpts appDir defaultDbName = do
   coreOptions <- coreChatOptsP appDir defaultDbName
+  botDisplayName <-
+    strOption
+      ( long "display-name"
+          <> metavar "DISPLAY_NAME"
+          <> help "The display name of the broadcast bot"
+      )
   publishers <-
     option
       parseKnownContacts
@@ -55,6 +62,7 @@ broadcastBotOpts appDir defaultDbName = do
   pure
     BroadcastBotOpts
       { coreOptions,
+        botDisplayName,
         publishers,
         welcomeMessage = fromMaybe (defaultWelcomeMessage publishers) welcomeMessage_,
         prohibitedMessage = fromMaybe (defaultProhibitedMessage publishers) prohibitedMessage_
@@ -72,7 +80,7 @@ getBroadcastBotOpts appDir defaultDbName =
     versionAndUpdate = versionStr <> "\n" <> updateStr
 
 mkChatOpts :: BroadcastBotOpts -> ChatOpts
-mkChatOpts BroadcastBotOpts {coreOptions} =
+mkChatOpts BroadcastBotOpts {coreOptions, botDisplayName} =
   ChatOpts
     { coreOptions,
       chatCmd = "",
@@ -86,5 +94,6 @@ mkChatOpts BroadcastBotOpts {coreOptions} =
       autoAcceptFileSize = 0,
       muteNotifications = True,
       markRead = False,
+      createBot = Just CreateBotOpts {botDisplayName, allowFiles = False},
       maintenance = False
     }
diff --git a/apps/simplex-directory-service/src/Directory/Options.hs b/apps/simplex-directory-service/src/Directory/Options.hs
index 2c26905e79..2eba633609 100644
--- a/apps/simplex-directory-service/src/Directory/Options.hs
+++ b/apps/simplex-directory-service/src/Directory/Options.hs
@@ -16,7 +16,7 @@ import qualified Data.Text as T
 import Options.Applicative
 import Simplex.Chat.Bot.KnownContacts
 import Simplex.Chat.Controller (updateStr, versionNumber, versionString)
-import Simplex.Chat.Options (ChatCmdLog (..), ChatOpts (..), CoreChatOpts, coreChatOptsP)
+import Simplex.Chat.Options (ChatCmdLog (..), ChatOpts (..), CoreChatOpts, CreateBotOpts (..), coreChatOptsP)
 
 data DirectoryOpts = DirectoryOpts
   { coreOptions :: CoreChatOpts,
@@ -119,7 +119,7 @@ directoryOpts appDir defaultDbName = do
           <> help "The display name of the directory service bot, without *'s and spaces (SimpleX-Directory)"
           <> value "SimpleX-Directory"
       )
-  runCLI <- 
+  runCLI <-
     switch
       ( long "run-cli"
           <> help "Run directory service as CLI"
@@ -155,7 +155,7 @@ getDirectoryOpts appDir defaultDbName =
     versionAndUpdate = versionStr <> "\n" <> updateStr
 
 mkChatOpts :: DirectoryOpts -> ChatOpts
-mkChatOpts DirectoryOpts {coreOptions} =
+mkChatOpts DirectoryOpts {coreOptions, serviceName} =
   ChatOpts
     { coreOptions,
       chatCmd = "",
@@ -169,5 +169,6 @@ mkChatOpts DirectoryOpts {coreOptions} =
       autoAcceptFileSize = 0,
       muteNotifications = True,
       markRead = False,
+      createBot = Just CreateBotOpts {botDisplayName = serviceName, allowFiles = False},
       maintenance = False
     }
diff --git a/bots/README.md b/bots/README.md
index 0b1943b7a7..9449e9d847 100644
--- a/bots/README.md
+++ b/bots/README.md
@@ -1,6 +1,8 @@
 # SimpleX Chat bot API
 
 - [Why create a bot](#why-create-a-bot)
+- [What is SimpleX bot](#what-is-simplex-bot)
+- [How to configure bot profile](#how-to-configure-bot-profile)
 - [How to create a bot](#how-to-create-a-bot)
 - [Sending commands](#sending-commands)
 - [Processing events](#processing-events)
@@ -12,8 +14,9 @@
 ## Why create a bot
 
 You can implement SimpleX Chat for these and many other scenarios:
-- customer support - both as a single- and a multi-agent support chat (using SimpleX Chat [business address]() feature),
+- customer support - both as a single- and a multi-agent support chat (using SimpleX Chat [business address](https://simplex.chat/docs/business.html) feature),
 - information search and retrieval bots, with or without LLM integration,
+- moderation bots, to moderate your group and communities.
 - broadcast bot, when messages from your trusted users are forwarded to all connected contacts - e.g., see our SimpleX Status bot in the app ([source code](../apps/simplex-broadcast-bot/)),
 - feedback bot, when messages from connected contacts are forwarded to a preset list of your trusted users,
 - P2P trading bots, connecting buyers and sellers,
@@ -22,6 +25,65 @@ You can implement SimpleX Chat for these and many other scenarios:
 We will share all useful bots you create in the bottom of this page - please submit a PR to add it.
 
 
+## What is SimpleX bot
+
+SimpleX bot is a participant of SimpleX network. Theoretically, bot can do everything that a usual SimpleX Chat user can do – send and receive messages and files, connect to addresses and join groups, etc. But to be useful, a bot should distinguish itself as a bot, and to provide an interface for the users to interact with it.
+
+## How to configure bot profile
+
+Starting from v6.4.3, SimpleX Chat apps support bot configuration to distinguish bots, to highlight commands in messages, and to show command menus.
+
+### Set up bot profile
+
+To distinguish SimpleX user profile as a bot, set its `peerType` property to `"bot"`. It can be done in one of these ways:
+- using CLI options `--create-bot-display-name` and `create-bot-allow-files` when first starting CLI to create bot profile,
+- using command `/create bot [files=on] <name>[ <bio>]` (if name contains spaces, it must be in single quotes), when creating additional bot profiles in the same database,
+- by configuring bot commands that the users will see in the UI when they type `/` character or tap `//` button with `/set bot commands ...` CLI command (see syntax below),
+- by using [APIUpdateProfile](./api/COMMANDS.md#apiupdateprofile) bot command to set `peerType` and configure bot commands at the same time.
+
+### Configure bot commands
+
+Bot commands are messages that start from `/` character. Normally, they would consist of lowercase latin letters, but commands can use any letters, digits and underscores. Commands can have parameters.
+
+All commands in messages will be highlighted in the chats with the bot, and when users tap them, they will be instantly sent. If the message has a single line and starts from `/` character, the whole message will be highlighted. Otherwise, if command is included as part of the message, it will be highlighted until the first space after `/` character: e.g., `/list` command in Directory service shows user's groups.
+
+*Please note*: commands in messages will be highlighted based purely on `/` character, regardless of whether they are supported by the bot or included in bot configuration. It allows bots to have "hidden" commands that bot would support, but that won't be shown in the menu. But it may also lead to mistakes if bot sends incorrect commands in the instructions to the users.
+
+Bots can also send highlighted commands with parameters. To do that, bots should surround both command and its parameters in single quotes: e.g., `/'role 2'`. Quotes won't show in the apps UI, and if the user taps this command, it will be sent as `/role 2`.
+
+Configured bot commands will be be offered to the users as a menu, and for quick lookup as the user types.
+
+Bot commands configuration is a property in `preferences` object in bot profile received by the user. These preferences can be configured both on the bot user profile level, to offer the same commands to all connected users, and as overrides for specific contacts, to offer different commands to different bot contacts.
+
+Configuring commands in bot user can be done either with [APIUpdateProfile](./api/COMMANDS.md#apiupdateprofile) or with `/set bot commands` CLI command:
+
+```
+/set bot commands <commands>
+```
+
+where:
+
+```
+commands = <commandOrMenu>[,<commandOrMenu>...]
+commandOrMenu = command | menu
+command = '<label>':/'<keyword>[ <params>]'
+menu = '<label>':{<commands>}
+```
+
+This syntax allows creating nested menus of commands with and without parameters. You must enclose parameter names with the characters `<` and `>`. Currently, users have to edit command templates to set actual parameters, but in the future there will be UI support to fill in parameters based on this syntax. For example, some of SimpleX Directory service commands could be configured with this command:
+
+```
+/set bot commands 'How to use bot':/help,'Show your groups':/list,'Your group settings':{'Set default role':/'role <ID>','Set anti-spam filter':/'filter <ID>'}
+```
+
+Configuring commands for specific contacts can be done with [APISetContactPrefs](./api/COMMANDS.md#apisetcontactprefs) command.
+
+### Bots and business addresses
+
+A useful scenario would be when bot is used to accept requests to bot's business address, so that a new business chat is created for every connecting user, and then invites other people from the business, as appropriate.
+
+Business chat is a special group chat under the hood, but the connected customer sees business avatar, and all users that bot would add to the group later see customer' avatar. This chat will inherits preferences from the bot profile, so if you want to allow customers to send files, you need to allow them in the bot. And if bot has any commands configured, they will also be available to customers in the menu.
+
 ## How to create a bot
 
 [SimpleX Chat CLI](../docs/CLI.md) can be run as a local WebSockets server on any port:
diff --git a/bots/api/COMMANDS.md b/bots/api/COMMANDS.md
index 17637c1e71..4ea8b7e466 100644
--- a/bots/api/COMMANDS.md
+++ b/bots/api/COMMANDS.md
@@ -28,6 +28,9 @@ This file is generated automatically.
 - [APIBlockMembersForAll](#apiblockmembersforall)
 - [APIRemoveMembers](#apiremovemembers)
 - [APILeaveGroup](#apileavegroup)
+- [APIListMembers](#apilistmembers)
+- [APINewGroup](#apinewgroup)
+- [APIUpdateGroupProfile](#apiupdategroupprofile)
 
 [Group link commands](#group-link-commands)
 - [APICreateGroupLink](#apicreategrouplink)
@@ -54,6 +57,7 @@ This file is generated automatically.
 - [APISetActiveUser](#apisetactiveuser)
 - [APIDeleteUser](#apideleteuser)
 - [APIUpdateProfile](#apiupdateprofile)
+- [APISetContactPrefs](#apisetcontactprefs)
 
 ---
 
@@ -795,6 +799,110 @@ LeftMemberUser: User left group.
 ---
 
 
+### APIListMembers
+
+Get group members.
+
+*Network usage*: no.
+
+**Parameters**:
+- groupId: int64
+
+**Syntax**:
+
+```
+/_members #<groupId>
+```
+
+```javascript
+'/_members #' + groupId // JavaScript
+```
+
+```python
+'/_members #' + str(groupId) # Python
+```
+
+**Response**:
+
+GroupMembers: Group members.
+- type: "groupMembers"
+- user: [User](./TYPES.md#user)
+- group: [Group](./TYPES.md#group)
+
+---
+
+
+### APINewGroup
+
+Create group.
+
+*Network usage*: no.
+
+**Parameters**:
+- userId: int64
+- incognito: bool
+- groupProfile: [GroupProfile](./TYPES.md#groupprofile)
+
+**Syntax**:
+
+```
+/_group <userId>[ incognito=on] <json(groupProfile)>
+```
+
+```javascript
+'/_group ' + userId + (incognito ? ' incognito=on' : '') + ' ' + JSON.stringify(groupProfile) // JavaScript
+```
+
+```python
+'/_group ' + str(userId) + (' incognito=on' if incognito else '') + ' ' + json.dumps(groupProfile) # Python
+```
+
+**Response**:
+
+GroupCreated: Group created.
+- type: "groupCreated"
+- user: [User](./TYPES.md#user)
+- groupInfo: [GroupInfo](./TYPES.md#groupinfo)
+
+---
+
+
+### APIUpdateGroupProfile
+
+Update group profile.
+
+*Network usage*: background.
+
+**Parameters**:
+- groupId: int64
+- groupProfile: [GroupProfile](./TYPES.md#groupprofile)
+
+**Syntax**:
+
+```
+/_group_profile #<groupId> <json(groupProfile)>
+```
+
+```javascript
+'/_group_profile #' + groupId + ' ' + JSON.stringify(groupProfile) // JavaScript
+```
+
+```python
+'/_group_profile #' + str(groupId) + ' ' + json.dumps(groupProfile) # Python
+```
+
+**Response**:
+
+GroupUpdated: Group updated.
+- type: "groupUpdated"
+- user: [User](./TYPES.md#user)
+- fromGroup: [GroupInfo](./TYPES.md#groupinfo)
+- toGroup: [GroupInfo](./TYPES.md#groupinfo)
+- member_: [GroupMember](./TYPES.md#groupmember)?
+
+---
+
+
 ## Group link commands
 
 These commands can be used by bots that manage multiple public groups
@@ -1128,7 +1236,7 @@ ContactRequestRejected: Contact request rejected.
 
 ## Chat commands
 
-Commands to list and delete coversations.
+Commands to list and delete conversations.
 
 
 ### APIListContacts
@@ -1430,3 +1538,38 @@ UserProfileUpdated: User profile updated.
 - updateSummary: [UserProfileUpdateSummary](./TYPES.md#userprofileupdatesummary)
 
 ---
+
+
+### APISetContactPrefs
+
+Configure chat preference overrides for the contact.
+
+*Network usage*: background.
+
+**Parameters**:
+- contactId: int64
+- preferences: [Preferences](./TYPES.md#preferences)
+
+**Syntax**:
+
+```
+/_set prefs @<contactId> <json(preferences)>
+```
+
+```javascript
+'/_set prefs @' + contactId + ' ' + JSON.stringify(preferences) // JavaScript
+```
+
+```python
+'/_set prefs @' + str(contactId) + ' ' + json.dumps(preferences) # Python
+```
+
+**Response**:
+
+ContactPrefsUpdated: Contact preferences updated.
+- type: "contactPrefsUpdated"
+- user: [User](./TYPES.md#user)
+- fromContact: [Contact](./TYPES.md#contact)
+- toContact: [Contact](./TYPES.md#contact)
+
+---
diff --git a/bots/api/TYPES.md b/bots/api/TYPES.md
index 5515181de9..416fd1ca3a 100644
--- a/bots/api/TYPES.md
+++ b/bots/api/TYPES.md
@@ -32,6 +32,7 @@ This file is generated automatically.
 - [CIReactionCount](#cireactioncount)
 - [CIStatus](#cistatus)
 - [CITimed](#citimed)
+- [ChatBotCommand](#chatbotcommand)
 - [ChatDeleteMode](#chatdeletemode)
 - [ChatError](#chaterror)
 - [ChatErrorType](#chaterrortype)
@@ -39,6 +40,7 @@ This file is generated automatically.
 - [ChatInfo](#chatinfo)
 - [ChatItem](#chatitem)
 - [ChatItemDeletion](#chatitemdeletion)
+- [ChatPeerType](#chatpeertype)
 - [ChatRef](#chatref)
 - [ChatSettings](#chatsettings)
 - [ChatStats](#chatstats)
@@ -80,6 +82,7 @@ This file is generated automatically.
 - [FormattedText](#formattedtext)
 - [FullGroupPreferences](#fullgrouppreferences)
 - [FullPreferences](#fullpreferences)
+- [Group](#group)
 - [GroupChatScope](#groupchatscope)
 - [GroupChatScopeInfo](#groupchatscopeinfo)
 - [GroupDirectInvitation](#groupdirectinvitation)
@@ -853,6 +856,24 @@ Invalid:
 - deleteAt: UTCTime?
 
 
+---
+
+## ChatBotCommand
+
+**Discriminated union type**:
+
+Command:
+- type: "command"
+- keyword: string
+- label: string
+- params: string?
+
+Menu:
+- type: "menu"
+- label: string
+- commands: [[ChatBotCommand](#chatbotcommand)]
+
+
 ---
 
 ## ChatDeleteMode
@@ -1206,7 +1227,9 @@ Exception:
 - "fullDelete"
 - "reactions"
 - "voice"
+- "files"
 - "calls"
+- "sessions"
 
 
 ---
@@ -1263,6 +1286,15 @@ Message deletion result.
 - toChatItem: [AChatItem](#achatitem)?
 
 
+---
+
+## ChatPeerType
+
+**Enum type**:
+- "human"
+- "bot"
+
+
 ---
 
 ## ChatRef
@@ -1687,7 +1719,10 @@ User:
 - fullDelete: [ContactUserPreference](#contactuserpreference)
 - reactions: [ContactUserPreference](#contactuserpreference)
 - voice: [ContactUserPreference](#contactuserpreference)
+- files: [ContactUserPreference](#contactuserpreference)
 - calls: [ContactUserPreference](#contactuserpreference)
+- sessions: [ContactUserPreference](#contactuserpreference)
+- commands: [[ChatBotCommand](#chatbotcommand)]?
 
 
 ---
@@ -1950,6 +1985,10 @@ SimplexLink:
 - simplexUri: string
 - smpHosts: [string]
 
+Command:
+- type: "command"
+- commandStr: string
+
 Mention:
 - type: "mention"
 - memberName: string
@@ -1984,6 +2023,8 @@ Phone:
 - simplexLinks: [RoleGroupPreference](#rolegrouppreference)
 - reports: [GroupPreference](#grouppreference)
 - history: [GroupPreference](#grouppreference)
+- sessions: [RoleGroupPreference](#rolegrouppreference)
+- commands: [[ChatBotCommand](#chatbotcommand)]
 
 
 ---
@@ -1995,7 +2036,19 @@ Phone:
 - fullDelete: [SimplePreference](#simplepreference)
 - reactions: [SimplePreference](#simplepreference)
 - voice: [SimplePreference](#simplepreference)
+- files: [SimplePreference](#simplepreference)
 - calls: [SimplePreference](#simplepreference)
+- sessions: [SimplePreference](#simplepreference)
+- commands: [[ChatBotCommand](#chatbotcommand)]
+
+
+---
+
+## Group
+
+**Record type**:
+- groupInfo: [GroupInfo](#groupinfo)
+- members: [[GroupMember](#groupmember)]
 
 
 ---
@@ -2060,6 +2113,7 @@ MemberSupport:
 - "simplexLinks"
 - "reports"
 - "history"
+- "sessions"
 
 
 ---
@@ -2265,6 +2319,8 @@ Known:
 - simplexLinks: [RoleGroupPreference](#rolegrouppreference)?
 - reports: [GroupPreference](#grouppreference)?
 - history: [GroupPreference](#grouppreference)?
+- sessions: [RoleGroupPreference](#rolegrouppreference)?
+- commands: [[ChatBotCommand](#chatbotcommand)]?
 
 
 ---
@@ -2414,6 +2470,7 @@ Unknown:
 - image: string?
 - contactLink: string?
 - preferences: [Preferences](#preferences)?
+- peerType: [ChatPeerType](#chatpeertype)?
 - localAlias: string
 
 
@@ -2639,7 +2696,10 @@ Unknown:
 - fullDelete: [SimplePreference](#simplepreference)?
 - reactions: [SimplePreference](#simplepreference)?
 - voice: [SimplePreference](#simplepreference)?
+- files: [SimplePreference](#simplepreference)?
 - calls: [SimplePreference](#simplepreference)?
+- sessions: [SimplePreference](#simplepreference)?
+- commands: [[ChatBotCommand](#chatbotcommand)]?
 
 
 ---
@@ -2676,6 +2736,7 @@ Unknown:
 - image: string?
 - contactLink: string?
 - preferences: [Preferences](#preferences)?
+- peerType: [ChatPeerType](#chatpeertype)?
 
 
 ---
diff --git a/bots/src/API/Docs/Commands.hs b/bots/src/API/Docs/Commands.hs
index 9630ea2070..3804a23f31 100644
--- a/bots/src/API/Docs/Commands.hs
+++ b/bots/src/API/Docs/Commands.hs
@@ -114,10 +114,10 @@ chatCommandsDocsData =
         ("APIMembersRole", [], "Set members role. Requires Admin role.", ["CRMembersRoleUser"], [], Just UNBackground, "/_member role #" <> Param "groupId" <> " " <> Join ',' "groupMemberIds" <> " " <> Param "memberRole"),
         ("APIBlockMembersForAll", [], "Block members. Requires Moderator role.", ["CRMembersBlockedForAllUser"], [], Just UNBackground, "/_block #" <> Param "groupId" <> " " <> Join ',' "groupMemberIds" <> OnOffParam "blocked" "blocked" Nothing),
         ("APIRemoveMembers", [], "Remove members. Requires Admin role.", ["CRUserDeletedMembers", "CRChatCmdError"], ["CEGroupMemberNotFound"], Just UNBackground, "/_remove #" <> Param "groupId" <> " " <> Join ',' "groupMemberIds" <> OnOffParam "messages" "withMessages" (Just False)),
-        ("APILeaveGroup", [], "Leave group.", ["CRLeftMemberUser"], [], Just UNBackground, "/_leave #" <> Param "groupId")
-        -- ("APIListMembers", [], "Get group members.", ["CRGroupMembers"], [], Nothing, ""),
-        -- ("APINewGroup", [], "Create group.", ["CRGroupCreated"], [], Nothing, ""),
-        -- ("APIUpdateGroupProfile", [], "Update group profile.", ["CRGroupUpdated"], [], Just UNBackground, [])
+        ("APILeaveGroup", [], "Leave group.", ["CRLeftMemberUser"], [], Just UNBackground, "/_leave #" <> Param "groupId"),
+        ("APIListMembers", [], "Get group members.", ["CRGroupMembers"], [], Nothing, "/_members #" <> Param "groupId"),
+        ("APINewGroup", [], "Create group.", ["CRGroupCreated"], [], Nothing, "/_group " <> Param "userId" <> OnOffParam "incognito" "incognito" (Just False) <> " " <> Json "groupProfile"),
+        ("APIUpdateGroupProfile", [], "Update group profile.", ["CRGroupUpdated"], [], Just UNBackground, "/_group_profile #" <> Param "groupId" <> " " <> Json "groupProfile")
       ]
     ),
     ( "Group link commands",
@@ -138,7 +138,7 @@ chatCommandsDocsData =
       ]
     ),
     ( "Chat commands",
-      "Commands to list and delete coversations.",
+      "Commands to list and delete conversations.",
       [ ("APIListContacts", [], "Get contacts.", ["CRContactsList"], [], Nothing, "/_contacts " <> Param "userId"),
         ("APIListGroups", [], "Get groups.", ["CRGroupsList"], [], Nothing, "/_groups " <> Param "userId" <> Optional "" (" @" <> Param "$0") "contactId_" <> Optional "" (" " <> Param "$0") "search"),
         ("APIDeleteChat", [], "Delete chat.", ["CRContactDeleted", "CRContactConnectionDeleted", "CRGroupDeletedUser"], [], Just UNBackground, "/_delete " <> Param "chatRef" <> " " <> Param "chatDeleteMode")
@@ -174,7 +174,8 @@ chatCommandsDocsData =
         ("ListUsers", [], "Get all user profiles", ["CRUsersList"], [], Nothing, "/users"),
         ("APISetActiveUser", [], "Set active user profile", ["CRActiveUser"], ["CEChatNotStarted"], Nothing, "/_user " <> Param "userId" <> Optional "" (" " <> Json "$0") "viewPwd"),
         ("APIDeleteUser", [], "Delete user profile.", ["CRCmdOk"], [], Just UNBackground, "/_delete user " <> Param "userId" <> OnOffParam "del_smp" "delSMPQueues" Nothing <> Optional "" (" " <> Json "$0") "viewPwd"),
-        ("APIUpdateProfile", [], "Update user profile.", ["CRUserProfileUpdated"], [], Just UNBackground, "/_profile " <> Param "userId" <> " " <> Json "profile")
+        ("APIUpdateProfile", [], "Update user profile.", ["CRUserProfileUpdated"], [], Just UNBackground, "/_profile " <> Param "userId" <> " " <> Json "profile"),
+        ("APISetContactPrefs", [], "Configure chat preference overrides for the contact.", ["CRContactPrefsUpdated"], [], Just UNBackground, "/_set prefs @" <> Param "contactId" <> " " <> Json "preferences")
       ]
     )
   ]
@@ -251,6 +252,7 @@ cliCommands =
     "SendMessageQuote",
     "SetActiveUser",
     "SetAddressSettings",
+    "SetBotCommands",
     "SetChatTTL",
     "SetContactFeature",
     "SetContactTimedMessages",
@@ -359,9 +361,7 @@ undocumentedCommands =
     "APIGroupMemberQueueInfo",
     "APIHideUser",
     "APIImportArchive",
-    "APIListMembers",
     "APIMuteUser",
-    "APINewGroup",
     "APIPlanForwardChatItems",
     "APIPrepareContact",
     "APIPrepareGroup",
@@ -384,7 +384,6 @@ undocumentedCommands =
     "APISetConnectionAlias",
     "APISetConnectionIncognito",
     "APISetContactAlias",
-    "APISetContactPrefs",
     "APISetEncryptLocalFiles",
     "APISetGroupAlias",
     "APISetMemberSettings",
@@ -408,7 +407,6 @@ undocumentedCommands =
     "APIUnhideUser",
     "APIUnmuteUser",
     "APIUpdateChatTag",
-    "APIUpdateGroupProfile",
     "APIUploadStandaloneFile",
     "APIUserRead",
     "APIValidateServers",
diff --git a/bots/src/API/Docs/Responses.hs b/bots/src/API/Docs/Responses.hs
index 50e9c4c14b..96f461e696 100644
--- a/bots/src/API/Docs/Responses.hs
+++ b/bots/src/API/Docs/Responses.hs
@@ -57,12 +57,16 @@ chatResponsesDocsData =
     ("CRContactAlreadyExists", ""),
     ("CRContactConnectionDeleted", "Connection deleted"),
     ("CRContactDeleted", ""),
+    ("CRContactPrefsUpdated", "Contact preferences updated"),
     ("CRContactRequestRejected", ""),
     ("CRContactsList", "Contacts"),
     ("CRGroupDeletedUser", "User deleted group"),
     ("CRGroupLink", ""),
     ("CRGroupLinkCreated", ""),
     ("CRGroupLinkDeleted", ""),
+    ("CRGroupCreated", ""),
+    ("CRGroupMembers", ""),
+    ("CRGroupUpdated", ""),
     ("CRGroupsList", "Groups"),
     ("CRInvitation", "One-time invitation"),
     ("CRLeftMemberUser", "User left group"),
@@ -92,13 +96,9 @@ chatResponsesDocsData =
     -- ("CRChatItems", "The most recent messages"),
     -- ("CRConnectionAliasUpdated", ""),
     -- ("CRContactAliasUpdated", ""),
-    -- ("CRContactPrefsUpdated", "Contact preferences updated"),
     -- ("CRContactRatchetSyncStarted", "Contact encryption synchronization started"),
     -- ("CRGroupAliasUpdated", ""),
-    -- ("CRGroupCreated", ""),
     -- ("CRGroupMemberRatchetSyncStarted", "Member encryption synchronization started"),
-    -- ("CRGroupMembers", ""),
-    -- ("CRGroupUpdated", ""),
     -- ("CRItemsReadForChat", "Messages marked as read"),
     -- ("CRReactionMembers", "Members who set reaction on the message"),
   ]
@@ -138,7 +138,6 @@ undocumentedResponses =
     "CRContactAliasUpdated",
     "CRContactCode",
     "CRContactInfo",
-    "CRContactPrefsUpdated",
     "CRContactRatchetSyncStarted",
     "CRContactSwitchAborted",
     "CRContactSwitchStarted",
@@ -151,17 +150,14 @@ undocumentedResponses =
     "CRForwardPlan",
     "CRGroupAliasUpdated",
     "CRGroupChatItemsDeleted",
-    "CRGroupCreated",
     "CRGroupDescription",
     "CRGroupInfo",
     "CRGroupMemberCode",
     "CRGroupMemberInfo",
     "CRGroupMemberRatchetSyncStarted",
-    "CRGroupMembers",
     "CRGroupMemberSwitchAborted",
     "CRGroupMemberSwitchStarted",
     "CRGroupProfile",
-    "CRGroupUpdated",
     "CRGroupUserChanged",
     "CRItemsReadForChat",
     "CRJoinedGroupMember",
diff --git a/bots/src/API/Docs/Types.hs b/bots/src/API/Docs/Types.hs
index fd8529ff52..c0cf2867c2 100644
--- a/bots/src/API/Docs/Types.hs
+++ b/bots/src/API/Docs/Types.hs
@@ -207,11 +207,13 @@ chatTypesDocsData =
     (sti @BrokerErrorType, STUnion, "", [], "", ""),
     (sti @BusinessChatInfo, STRecord, "", [], "", ""),
     (sti @BusinessChatType, STEnum, "BC", [], "", ""),
+    (sti @ChatBotCommand, STUnion, "CBC", [], "", ""),
     (sti @ChatDeleteMode, STUnion, "CDM", [], Param "type" <> Choice "self" [("messages", "")] (OnOffParam "notify" "notify" (Just True)), ""),
     (sti @ChatError, STUnion, "Chat", ["ChatErrorDatabase", "ChatErrorRemoteHost", "ChatErrorRemoteCtrl"], "", ""),
     (sti @ChatErrorType, STUnion, "CE", ["CEContactNotFound", "CEServerProtocol", "CECallState", "CEInvalidChatMessage"], "", ""),
     (sti @ChatFeature, STEnum, "CF", [], "", ""),
     (sti @ChatItemDeletion, STRecord, "", [], "", "Message deletion result."),
+    (sti @ChatPeerType, STEnum, "CPT", [], "", ""),
     (sti @ChatRef, STRecord, "", [], Param "chatType" <> Param "chatId" <> Optional "" (Param "$0") "chatScope", "Used in API commands. Chat scope can only be passed with groups."),
     (sti @ChatSettings, STRecord, "", [], "", ""),
     (sti @ChatStats, STRecord, "", [], "", ""),
@@ -259,6 +261,7 @@ chatTypesDocsData =
     (sti @FormattedText, STRecord, "", [], "", ""),
     (sti @FullGroupPreferences, STRecord, "", [], "", ""),
     (sti @FullPreferences, STRecord, "", [], "", ""),
+    (sti @Group, STRecord, "", [], "", ""),
     (sti @GroupChatScope, STUnion1, "GCS", [], "(_support" <> Optional "" (":" <> Param "$0") "groupMemberId_" <> ")", ""),
     (sti @GroupChatScopeInfo, STUnion1, "GCSI", [], "", ""),
     (sti @GroupFeature, STEnum, "GF", [], "", ""),
@@ -356,7 +359,6 @@ chatTypesDocsData =
     -- (sti @ChatName, STRecord, "", [], "", ""),
     -- (sti @ChatPagination, STRecord, "CP", [], "", ""),
     -- (sti @ConnectionStats, STRecord, "", [], "", ""),
-    -- (sti @Group, STRecord, "", [], "", ""),
     -- (sti @GroupSndStatus, STUnion, "GSS", [], "", ""),
     -- (sti @MemberDeliveryStatus, STRecord, "", [], "", ""),
     -- (sti @MemberReaction, STRecord, "", [], "", ""),
@@ -392,11 +394,13 @@ deriving instance Generic BlockingReason
 deriving instance Generic BrokerErrorType
 deriving instance Generic BusinessChatInfo
 deriving instance Generic BusinessChatType
+deriving instance Generic ChatBotCommand
 deriving instance Generic ChatDeleteMode
 deriving instance Generic ChatError
 deriving instance Generic ChatErrorType
 deriving instance Generic ChatFeature
 deriving instance Generic ChatItemDeletion
+deriving instance Generic ChatPeerType
 deriving instance Generic ChatRef
 deriving instance Generic ChatSettings
 deriving instance Generic ChatStats
@@ -444,6 +448,7 @@ deriving instance Generic Format
 deriving instance Generic FormattedText
 deriving instance Generic FullGroupPreferences
 deriving instance Generic FullPreferences
+deriving instance Generic Group
 deriving instance Generic GroupChatScope
 deriving instance Generic GroupChatScopeInfo
 deriving instance Generic GroupFeature
diff --git a/bots/src/API/TypeInfo.hs b/bots/src/API/TypeInfo.hs
index d8efd21742..3d7269e766 100644
--- a/bots/src/API/TypeInfo.hs
+++ b/bots/src/API/TypeInfo.hs
@@ -142,11 +142,8 @@ toTypeInfo tr =
       args = typeRepArgs tr
       name = tyConName tc
    in case name of
-        "List" -> case args of
-          [elemTr]
-            | elemTr == typeRep (Proxy @Char) -> TIType (ST TString [])
-            | otherwise -> TIArray {elemType = toTypeInfo elemTr, nonEmpty = False}
-          _ -> TIType (simpleType tr)
+        "List" -> listType args
+        "ListDef" -> listType args
         "NonEmpty" -> case args of
           [elemTr] -> TIArray {elemType = toTypeInfo elemTr, nonEmpty = True}
           _ -> TIType (simpleType tr)
@@ -158,6 +155,11 @@ toTypeInfo tr =
           _ -> TIType (simpleType tr)
         _ -> TIType (simpleType tr)
   where
+    listType = \case
+      [elemTr]
+        | elemTr == typeRep (Proxy @Char) -> TIType (ST TString [])
+        | otherwise -> TIArray {elemType = toTypeInfo elemTr, nonEmpty = False}
+      _ -> TIType (simpleType tr)
     simpleType tr' = primitiveToLower $ case tyConName (typeRepTyCon tr') of
       "AgentUserId" -> ST TInt64 []
       "Integer" -> ST TInt64 []
@@ -208,8 +210,10 @@ toTypeInfo tr =
       ]
     simplePrefTypes =
       [ "CallsPreference",
+        "FilesPreference",
         "FullDeletePreference",
         "ReactionsPreference",
+        "SessionsPreference",
         "VoicePreference"
       ]
     groupPrefTypes =
@@ -222,5 +226,6 @@ toTypeInfo tr =
       [ "DirectMessagesGroupPreference",
         "VoiceGroupPreference",
         "FilesGroupPreference",
+        "SessionsGroupPreference",
         "SimplexLinksGroupPreference"
       ]
diff --git a/docs/protocol/simplex-chat.schema.json b/docs/protocol/simplex-chat.schema.json
index 50d41265f7..4614ba6929 100644
--- a/docs/protocol/simplex-chat.schema.json
+++ b/docs/protocol/simplex-chat.schema.json
@@ -20,11 +20,21 @@
             "format": "data URI format for base64 encoded image"
           }
         },
-        "contactLink": {"ref": "connReqUri"},
-        "preferences": {
+        "shortDescr": {
           "type": "string",
+          "metadata": {"comment": "profile bio (160 characters)"}
+        },
+        "contactLink": {"ref": "connReqUri"},
+        "peerType": {"enum": ["human", "bot"]},
+        "preferences": {
+          "optionalProperties": {
+            "commands": {
+              "elements": {"ref": "command"}
+            }
+          },
+          "additionalProperties": true,
           "metadata": {
-            "format": "JSON encoded user preferences"
+            "format": "an object with user or contact preferences"
           }
         }
       },
@@ -47,15 +57,59 @@
             "format": "data URI format for base64 encoded image"
           }
         },
-        "groupPreferences": {
+        "shortDescr": {
           "type": "string",
+          "metadata": {"comment": "group purpose / short description (160 characters)"}
+        },
+        "groupPreferences": {
+          "optionalProperties": {
+            "commands": {
+              "elements": {"ref": "command"}
+            }
+          },
+          "additionalProperties": "true",
           "metadata": {
-            "format": "JSON encoded user preferences"
+            "format": "an object with group preferences"
           }
         }
       },
       "additionalProperties": true
     },
+    "command": {
+      "discriminator": "type",
+      "mapping": {
+        "command": {
+          "properties": {
+            "keyword": {
+              "type": "string",
+              "metadata": {"format": "Must start from / and consist from letters, digits and underscores only, no punctuation or spaces"}
+            },
+            "label": {
+              "type": "string",
+              "metadata": {"comment": "shown to the user after command keyword in menus"}
+            }
+          },
+          "optionalProperties": {
+            "params": {
+              "type": "string",
+              "metadata": {"comment": "Params that can follow after keyword using command-line syntax. If params property is not present, command will be sent on selection"}}
+            },
+            "hidden": {
+              "type": "bool",
+              "metadata": {"comment": "Won't be shown in menu when true"}
+            }
+          }
+        },
+        "menu": {
+          "properties": {
+            "label": {"type": "string"},
+            "commands": {
+              "elements": {"ref": "command"}
+            }
+          }
+        }
+      }
+    },
     "msgContainer": {
       "properties": {
         "content": {"ref": "msgContent"}
@@ -658,6 +712,16 @@
         }
       }
     },
+    "x.grp.prefs": {
+      "properties": {
+        "msgId": {"ref": "base64url"},
+        "params": {
+          "properties": {
+            "groupPreferences": {"ref": "groupPreferences"}
+          }
+        }
+      }
+    },
     "x.grp.direct.inv": {
       "properties": {
         "msgId": {"ref": "base64url"},
diff --git a/docs/rfcs/2024-11-28-business-address.md b/docs/rfcs/2024-11-28-business-address.md
index e41c904457..7cee4ed6a3 100644
--- a/docs/rfcs/2024-11-28-business-address.md
+++ b/docs/rfcs/2024-11-28-business-address.md
@@ -8,7 +8,7 @@ When business uses a communication system for support and other business scenari
 
 It's important for the business:
 - to have bot accept incoming requests.
-- to be able to add other people to the coversation, as transfer and as escalation.
+- to be able to add other people to the conversation, as transfer and as escalation.
 
 This is how all messaging support system works, and how WeChat business accounts work, but no messenger provides it.
 
diff --git a/docs/rfcs/2024-12-08-chat-bot-ui.md b/docs/rfcs/2024-12-08-chat-bot-ui.md
new file mode 100644
index 0000000000..cc1fb63b23
--- /dev/null
+++ b/docs/rfcs/2024-12-08-chat-bot-ui.md
@@ -0,0 +1,54 @@
+# Chat bots UI
+
+## Problem
+
+Chat bots are a simple way to increase utility of the network, as it helps other people to create value by providing arbitrary services via chat interface.
+
+Interacting with chat bots requires structured commands, which require entering them correctly, similarly how people do it in the terminal, and for most users it's hard.
+
+## Solution
+
+### Bot commands
+
+As commands should be recognized based on their syntax, the same list of commands should be accepted irrespective of the conversation state. In cases commands cannot be executed, for any reason, bot would respond with the message.
+
+The bot profile is probably the best place to include supported commands, in the form of a menu tree. See the schema.
+
+The downside of communicating commands via profile is that they may change per contact or per group. The place to put commands would be chat preferences, which also makes sense - receiving commands is "the preference" of the bot. This preference would indicate that bot supports commands, and also which commands are supported with any additional information.
+
+This menu will be shown to the end users in the app when they type "/" character in the first position of after several spaces. When the user chooses command from the menu, it will be inserted into the entry field for further editing. The placeholders for parameter should be inserted as "<name>". Clients may offer some interaction for filling parameters in, but in MVP it is sufficient to let users edit them directly.
+
+When processing commands bots should ignore leading and trailing spaces in the user messages.
+
+### Interactive dialogues with buttons
+
+A special message sent by chat bot that would show a modal UI requiring to choose one of several presented options. These options should contain the text visible to the user with an optional emoji or action icon. The clients may automatically use icons for known words.
+
+When this message is received, the compose area is either replaced with or complemented (if the context allows a free text entry in response) with one or several buttons, either located in a row, with wrapping, or in a column.
+
+When the response is sent, the chosen text is sent, possibly as a reply to the original message, and the original message can be looked at to show which choices it offered in message information pane. There could be slightly different design or some marker to indicate that it was a message that offered multiple choices, and it could be updated to indicate it was replied to.
+
+The clients probably should not show client messages as replies. There are 3 options here:
+- show as a normal reply. This avoids any ambiguity in the conversation history, and may protect customers from misbehaving bots - the message would be visually attached to the question.
+- simply do not show reply in the conversation, but use replies in the protocol.
+- use some other marker in the protocol.
+
+I prefer sending and showing normal replies in these cases, as it avoids any ambiguity in the transcript about which question the choices were offered for. That means that bots should support replies, not only normal messages.
+
+For protocol design we have three options:
+- a completely different message content constructor,
+- an extension to x.msg.new message instructing the bot to show button,
+- a normal message where all information would be present in the message text so it could be correctly presented by the old clients, with additional property that would be interpreted by the new clients so that it can parse the message text to present it as a multiple choice.
+- the bots can send a normal message to the old clients with a different message to the new clients, and it can be abstracted by the bot library.
+
+The last option where the bot sends text message to the old clients and structured message to the new clients seems the most reasonable, as it avoids the need to parse texts, while preserves backward compatibility without complicating code for bot developers.
+
+### Protocol
+
+Add to message container an optional property `dialog`, an object with these properties:
+
+- `choices`: required property with an array of choices presented as buttons, with required property `text` and optional properties `tag`, `role`, `icon`.
+- `layout`: "row" or "column" (default). "column" layout could use standard confirmation dialogue to present choices on iOS (although it should not be modal, and should allow scrolling the conversation, but not replying or sending messages).
+- `allow`: an object showing possible arbitrary message responses, currently only `text` property is allowed with `false` (default) or `true` value. Because button responses are just text messages, if free text is allowed, and user sends the same text as button, with or without surrounding spaces, the bots should interpret them in the same way.
+
+See the schema in the protocol schema document.
diff --git a/simplex-chat.cabal b/simplex-chat.cabal
index fe9c2c6b4e..fb1dc5e5fc 100644
--- a/simplex-chat.cabal
+++ b/simplex-chat.cabal
@@ -114,6 +114,7 @@ library
           Simplex.Chat.Store.Postgres.Migrations.M20250721_indexes
           Simplex.Chat.Store.Postgres.Migrations.M20250729_member_contact_requests
           Simplex.Chat.Store.Postgres.Migrations.M20250801_via_group_link_uri
+          Simplex.Chat.Store.Postgres.Migrations.M20250802_chat_peer_type
   else
       exposed-modules:
           Simplex.Chat.Archive
@@ -253,6 +254,7 @@ library
           Simplex.Chat.Store.SQLite.Migrations.M20250721_indexes
           Simplex.Chat.Store.SQLite.Migrations.M20250729_member_contact_requests
           Simplex.Chat.Store.SQLite.Migrations.M20250801_via_group_link_uri
+          Simplex.Chat.Store.SQLite.Migrations.M20250802_chat_peer_type
   other-modules:
       Paths_simplex_chat
   hs-source-dirs:
diff --git a/src/Simplex/Chat/Controller.hs b/src/Simplex/Chat/Controller.hs
index b165ec135f..eb7ed53283 100644
--- a/src/Simplex/Chat/Controller.hs
+++ b/src/Simplex/Chat/Controller.hs
@@ -530,6 +530,7 @@ data ChatCommand
   | CancelFile {fileId :: FileTransferId}
   | FileStatus FileTransferId
   | ShowProfile -- UserId (not used in UI)
+  | SetBotCommands [ChatBotCommand]
   | UpdateProfile ContactName (Maybe Text) -- UserId (not used in UI)
   | UpdateProfileImage (Maybe ImageData) -- UserId (not used in UI)
   | ShowProfileImage
diff --git a/src/Simplex/Chat/Core.hs b/src/Simplex/Chat/Core.hs
index e70aeb8775..7ad822da91 100644
--- a/src/Simplex/Chat/Core.hs
+++ b/src/Simplex/Chat/Core.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
 
 module Simplex.Chat.Core
   ( simplexChatCore,
@@ -23,10 +24,11 @@ import Data.Time.LocalTime (getCurrentTimeZone)
 import Simplex.Chat
 import Simplex.Chat.Controller
 import Simplex.Chat.Library.Commands
-import Simplex.Chat.Options (ChatOpts (..), CoreChatOpts (..))
+import Simplex.Chat.Options (ChatOpts (..), CoreChatOpts (..), CreateBotOpts (..))
 import Simplex.Chat.Remote.Types (RemoteHostId)
 import Simplex.Chat.Store.Profiles
 import Simplex.Chat.Types
+import Simplex.Chat.Types.Preferences (FeatureAllowed (..), FilesPreference (..), Preferences (..), emptyChatPrefs)
 import Simplex.Chat.View (ChatResponseEvent, serializeChatError, serializeChatResponse)
 import Simplex.Messaging.Agent.Store.Shared (MigrationConfirmation (..))
 import Simplex.Messaging.Agent.Store.Common (DBStore, withTransaction)
@@ -36,7 +38,7 @@ import Text.Read (readMaybe)
 import UnliftIO.Async
 
 simplexChatCore :: ChatConfig -> ChatOpts -> (User -> ChatController -> IO ()) -> IO ()
-simplexChatCore cfg@ChatConfig {confirmMigrations, testView} opts@ChatOpts {coreOptions = CoreChatOpts {dbOptions, logAgent, yesToUpMigrations}, maintenance} chat =
+simplexChatCore cfg@ChatConfig {confirmMigrations, testView} opts@ChatOpts {coreOptions = CoreChatOpts {dbOptions, logAgent, yesToUpMigrations}, createBot, maintenance} chat =
   case logAgent of
     Just level -> do
       setLogLevel level
@@ -52,7 +54,7 @@ simplexChatCore cfg@ChatConfig {confirmMigrations, testView} opts@ChatOpts {core
       u_ <- getSelectActiveUser chatStore
       let backgroundMode = not maintenance
       cc <- newChatController db u_ cfg opts backgroundMode
-      u <- maybe (createActiveUser cc) pure u_
+      u <- maybe (createActiveUser cc createBot) pure u_
       unless testView $ putStrLn $ "Current user: " <> userStr u
       runSimplexChat opts u cc chat
 
@@ -96,21 +98,27 @@ getSelectActiveUser st = do
                     let user = users !! (n - 1)
                      in Just <$> withTransaction st (`setActiveUser` user)
 
-createActiveUser :: ChatController -> IO User
-createActiveUser cc = do
-  putStrLn
-    "No user profiles found, it will be created now.\n\
-    \Please choose your display name.\n\
-    \It will be sent to your contacts when you connect.\n\
-    \It is only stored on your device and you can change it later."
-  loop
+createActiveUser :: ChatController -> Maybe CreateBotOpts -> IO User
+createActiveUser cc = \case
+  Just CreateBotOpts {botDisplayName, allowFiles} -> do
+    let preferences = if allowFiles then Nothing else Just emptyChatPrefs {files = Just FilesPreference {allow = FANo}}
+    createUser exitFailure $ (mkProfile botDisplayName) {peerType = Just CPTBot, preferences}
+  Nothing -> do
+    putStrLn
+      "No user profiles found, it will be created now.\n\
+      \Please choose your display name.\n\
+      \It will be sent to your contacts when you connect.\n\
+      \It is only stored on your device and you can change it later."
+    loop
   where
     loop = do
       displayName <- T.pack <$> getWithPrompt "display name"
-      let profile = Just Profile {displayName, fullName = "", shortDescr = Nothing, image = Nothing, contactLink = Nothing, preferences = Nothing}
-      execChatCommand' (CreateActiveUser NewUser {profile, pastTimestamp = False}) 0 `runReaderT` cc >>= \case
+      createUser loop $ mkProfile displayName
+    mkProfile displayName = Profile {displayName, fullName = "", shortDescr = Nothing, image = Nothing, contactLink = Nothing, peerType = Nothing, preferences = Nothing}
+    createUser onError p =
+      execChatCommand' (CreateActiveUser NewUser {profile = Just p, pastTimestamp = False}) 0 `runReaderT` cc >>= \case
         Right (CRActiveUser user) -> pure user
-        r -> printResponseEvent (Nothing, Nothing) (config cc) r >> loop
+        r -> printResponseEvent (Nothing, Nothing) (config cc) r >> onError
 
 printResponseEvent :: ChatResponseEvent r => (Maybe RemoteHostId, Maybe User) -> ChatConfig -> Either ChatError r -> IO ()
 printResponseEvent hu cfg = \case
diff --git a/src/Simplex/Chat/Library/Commands.hs b/src/Simplex/Chat/Library/Commands.hs
index 90e79d845b..0d10204ffd 100644
--- a/src/Simplex/Chat/Library/Commands.hs
+++ b/src/Simplex/Chat/Library/Commands.hs
@@ -2799,6 +2799,11 @@ processChatCommand vr nm = \case
           fileStatus <- withFastStore $ \db -> getFileTransferProgress db user fileId
           pure $ CRFileTransferStatus user fileStatus
   ShowProfile -> withUser $ \user@User {profile} -> pure $ CRUserProfile user (fromLocalProfile profile)
+  SetBotCommands commands -> withUser $ \user@User {profile} -> do
+    let LocalProfile {preferences} = profile
+        prefs = Just (fromMaybe emptyChatPrefs preferences :: Preferences) {commands = Just commands}
+        p = (fromLocalProfile profile :: Profile) {preferences = prefs, peerType = Just CPTBot}
+    updateProfile user p
   UpdateProfile displayName shortDescr -> withUser $ \user@User {profile} -> do
     let p = (fromLocalProfile profile :: Profile) {displayName, shortDescr, fullName = ""}
     updateProfile user p
@@ -4376,6 +4381,7 @@ chatCommandP =
       "/unblock #" *> (SetShowMemberMessages <$> displayNameP <* A.space <*> (char_ '@' *> displayNameP) <*> pure True),
       "/_create user " *> (CreateActiveUser <$> jsonP),
       "/create user " *> (CreateActiveUser <$> newUserP),
+      "/create bot " *> (CreateActiveUser <$> newBotUserP),
       "/users" $> ListUsers,
       "/_user " *> (APISetActiveUser <$> A.decimal <*> optional (A.space *> jsonP)),
       ("/user " <|> "/u ") *> (SetActiveUser <$> displayNameP <*> optional (A.space *> pwdP)),
@@ -4690,10 +4696,14 @@ chatCommandP =
       "/show profile image" $> ShowProfileImage,
       ("/profile " <|> "/p ") *> (uncurry UpdateProfile <$> profileNameDescr),
       ("/profile" <|> "/p") $> ShowProfile,
+      "/set bot commands " *> (SetBotCommands <$> botCommandsP),
+      "/delete bot commands" $> SetBotCommands [],
       "/set voice #" *> (SetGroupFeatureRole (AGFR SGFVoice) <$> displayNameP <*> _strP <*> optional memberRole),
       "/set voice @" *> (SetContactFeature (ACF SCFVoice) <$> displayNameP <*> optional (A.space *> strP)),
       "/set voice " *> (SetUserFeature (ACF SCFVoice) <$> strP),
       "/set files #" *> (SetGroupFeatureRole (AGFR SGFFiles) <$> displayNameP <*> _strP <*> optional memberRole),
+      "/set files @" *> (SetContactFeature (ACF SCFFiles) <$> displayNameP <*> optional (A.space *> strP)),
+      "/set files " *> (SetUserFeature (ACF SCFFiles) <$> strP),
       "/set history #" *> (SetGroupFeature (AGFNR SGFHistory) <$> displayNameP <*> (A.space *> strP)),
       "/set reactions #" *> (SetGroupFeature (AGFNR SGFReactions) <$> displayNameP <*> (A.space *> strP)),
       "/set calls @" *> (SetContactFeature (ACF SCFCalls) <$> displayNameP <*> optional (A.space *> strP)),
@@ -4803,9 +4813,33 @@ chatCommandP =
       pure UserMsgReceiptSettings {enable, clearOverrides}
     onOffP = ("on" $> True) <|> ("off" $> False)
     profileNameDescr = (,) <$> displayNameP <*> shortDescrP
+    -- 'Help with bot':'link <ID>','Menu of commands':[...]
+    botCommandsP :: Parser [ChatBotCommand]
+    botCommandsP = commandP `A.sepBy'` A.char ','
+      where
+        commandP = do
+          label <- safeDecodeUtf8 <$> ((quoted <|> A.takeTill (== ':')) <* A.char ':')
+          when (T.null label) $ fail "empty command label"
+          A.peekChar' >>= \case
+            '{' -> A.char '{' *> (CBCMenu label <$> botCommandsP) <* A.char '}'
+            _ -> do
+              cmd <- safeDecodeUtf8 <$> (optional (A.char '/') *> (quoted <|> A.takeTill (A.inClass ":,}")))
+              (keyword, params) <- case T.words cmd of
+                [] -> fail "empty command"
+                k : ws -> pure (k, if null ws then Nothing else Just $ T.unwords ws)
+              pure CBCCommand {label, keyword, params}
+        quoted = A.char '\'' *> A.takeTill (== '\'') <* A.char '\''
     newUserP = do
       (cName, shortDescr) <- profileNameDescr
-      let profile = Just Profile {displayName = cName, fullName = "", shortDescr, image = Nothing, contactLink = Nothing, preferences = Nothing}
+      let profile = Just Profile {displayName = cName, fullName = "", shortDescr, image = Nothing, contactLink = Nothing, peerType = Nothing, preferences = Nothing}
+      pure NewUser {profile, pastTimestamp = False}
+    newBotUserP = do
+      files_ <- optional $ "files=" *> onOffP <* A.space
+      (cName, shortDescr) <- profileNameDescr
+      let preferences = case files_ of
+            Just True -> Nothing
+            _ -> Just (emptyChatPrefs :: Preferences) {files = Just FilesPreference {allow = FANo}}
+          profile = Just Profile {displayName = cName, fullName = "", shortDescr, image = Nothing, contactLink = Nothing, peerType = Just CPTBot, preferences}
       pure NewUser {profile, pastTimestamp = False}
     jsonP :: J.FromJSON a => Parser a
     jsonP = J.eitherDecodeStrict' <$?> A.takeByteString
diff --git a/src/Simplex/Chat/Library/Internal.hs b/src/Simplex/Chat/Library/Internal.hs
index 941ee04c9e..ff60c6c32f 100644
--- a/src/Simplex/Chat/Library/Internal.hs
+++ b/src/Simplex/Chat/Library/Internal.hs
@@ -1010,7 +1010,7 @@ acceptBusinessJoinRequestAsync
   clientMember@GroupMember {groupMemberId, memberId}
   UserContactRequest {agentInvitationId = AgentInvId cReqInvId, cReqChatVRange, xContactId} = do
     vr <- chatVersionRange
-    let userProfile@Profile {displayName, preferences} = userProfileInGroup user Nothing
+    let userProfile@Profile {displayName, preferences} = fromLocalProfile $ profile' user
         -- TODO [short links] take groupPreferences from group info
         groupPreferences = maybe defaultBusinessGroupPrefs businessGroupPrefs preferences
         msg =
@@ -2518,6 +2518,7 @@ simplexTeamContactProfile =
       shortDescr = Just "Send questions about SimpleX Chat app and your suggestions",
       image = Just (ImageData "data:image/jpg;base64,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"),
       contactLink = Just $ CLFull adminContactReq,
+      peerType = Nothing,
       preferences = Nothing
     }
 
@@ -2529,6 +2530,7 @@ simplexStatusContactProfile =
       shortDescr = Just "Automatic server status and app release updates",
       image = Just (ImageData "data:image/jpg;base64,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"),
       contactLink = Just (either error CLFull $ strDecode "simplex:/contact/#/?v=1-2&smp=smp%3A%2F%2Fu2dS9sG8nMNURyZwqASV4yROM28Er0luVTx5X1CsMrU%3D%40smp4.simplex.im%2FShQuD-rPokbDvkyotKx5NwM8P3oUXHxA%23%2F%3Fv%3D1-2%26dh%3DMCowBQYDK2VuAyEA6fSx1k9zrOmF0BJpCaTarZvnZpMTAVQhd3RkDQ35KT0%253D%26srv%3Do5vmywmrnaxalvz6wi3zicyftgio6psuvyniis6gco6bp6ekl4cqj4id.onion"),
+      peerType = Just CPTBot,
       preferences = Nothing
     }
 
diff --git a/src/Simplex/Chat/Markdown.hs b/src/Simplex/Chat/Markdown.hs
index f368631852..67e38bab15 100644
--- a/src/Simplex/Chat/Markdown.hs
+++ b/src/Simplex/Chat/Markdown.hs
@@ -50,6 +50,7 @@ data Format
   | Colored {color :: FormatColor}
   | Uri
   | SimplexLink {linkType :: SimplexLinkType, simplexUri :: AConnectionLink, smpHosts :: NonEmpty Text}
+  | Command {commandStr :: Text}
   | Mention {memberName :: Text}
   | Email
   | Phone
@@ -134,11 +135,21 @@ unmarked :: Text -> Markdown
 unmarked = Markdown Nothing
 
 parseMaybeMarkdownList :: Text -> Maybe MarkdownList
-parseMaybeMarkdownList s
-  | all (isNothing . format) ml = Nothing
-  | otherwise = Just . reverse $ foldl' acc [] ml
+parseMaybeMarkdownList s = case ls of
+  [] -> Nothing
+  [l]
+    | T.null cmd -> Nothing
+    | isCmd -> Just [FormattedText (Just $ Command cmd) l]
+    where
+      (isCmd, cmd) = case T.uncons $ T.dropWhile (== ' ') l of
+        Just (c, rest) -> (c == '/', rest)
+        Nothing -> (False, "")
+  _
+    | all (isNothing . format) ml -> Nothing
+    | otherwise -> Just . reverse $ foldl' acc [] ml
   where
-    ml = intercalate ["\n"] . map (markdownToList . parseMarkdown) $ T.lines s
+    ls = T.lines s
+    ml = intercalate ["\n"] $ map (markdownToList . parseMarkdown) ls
     acc [] m = [m]
     acc ms@(FormattedText f t : ms') ft@(FormattedText f' t')
       | f == f' = FormattedText f (t <> t') : ms'
@@ -175,6 +186,7 @@ markdownP = mconcat <$> A.many' fragmentP
           '#' -> A.char '#' *> secretP
           '!' -> coloredP <|> wordP
           '@' -> mentionP <|> wordP
+          '/' -> commandP <|> wordP
           _
             | isDigit c -> phoneP <|> wordP
             | otherwise -> wordP
@@ -204,12 +216,14 @@ markdownP = mconcat <$> A.many' fragmentP
       if T.null s || T.last s == ' '
         then fail "not colored"
         else pure $ markdown (colored clr) s
-    mentionP = do
-      c <- A.char '@' *> A.peekChar'
-      (name, punct) <- displayNameTextP_
-      let sName = if c == '\'' then '\'' `T.cons` name `T.snoc` '\'' else name
-          mention = markdown (Mention name) ('@' `T.cons` sName)
-      pure $ if T.null punct then mention else mention :|: unmarked punct
+    mentionP = prefixedStringP '@' displayNameTextP_ Mention
+    commandP = prefixedStringP '/' commandTextP Command
+    prefixedStringP pfx parser format = do
+      c <- A.char pfx *> A.peekChar'
+      (str, punct) <- parser
+      let origStr = if c == '\'' then '\'' `T.cons` str `T.snoc` '\'' else str
+          res = markdown (format str) (pfx `T.cons` origStr)
+      pure $ if T.null punct then res else res :|: unmarked punct
     colorP =
       A.anyChar >>= \case
         'r' -> optional "ed" $> Red
@@ -304,6 +318,7 @@ markdownText (FormattedText f_ t) = case f_ of
     Uri -> t
     SimplexLink {} -> t
     Mention _ -> t
+    Command _ -> t
     Email -> t
     Phone -> t
     Unknown _ -> t
@@ -336,6 +351,13 @@ displayNameTextP_ = (,"") <$> quoted '\'' <|> splitPunctuation <$> takeNameTill
     quoted c = A.char c *> takeNameTill (== c) <* A.char c
     refChar c = c > ' ' && c /= '#' && c /= '@' && c /= '\''
 
+commandTextP :: Parser (Text, Text)
+commandTextP = do
+  (cmd, punct) <- displayNameTextP_
+  case T.words cmd of
+    (keyword : _) | T.all (\c -> isAlpha c || isDigit c || c == '_') keyword -> pure (cmd, punct)
+    _ -> fail "invalid command keyword"
+
 -- quotes names that contain spaces or end on punctuation
 viewName :: Text -> Text
 viewName s = if T.any isSpace s || maybe False (isPunctuation . snd) (T.unsnoc s) then "'" <> s <> "'" else s
diff --git a/src/Simplex/Chat/Mobile.hs b/src/Simplex/Chat/Mobile.hs
index bb1f45fc67..5d9af59b23 100644
--- a/src/Simplex/Chat/Mobile.hs
+++ b/src/Simplex/Chat/Mobile.hs
@@ -244,6 +244,7 @@ mobileChatOpts dbOptions =
       autoAcceptFileSize = 0,
       muteNotifications = True,
       markRead = False,
+      createBot = Nothing,
       maintenance = True
     }
 
diff --git a/src/Simplex/Chat/Options.hs b/src/Simplex/Chat/Options.hs
index ff2af56b85..9411c66175 100644
--- a/src/Simplex/Chat/Options.hs
+++ b/src/Simplex/Chat/Options.hs
@@ -8,6 +8,7 @@
 module Simplex.Chat.Options
   ( ChatOpts (..),
     CoreChatOpts (..),
+    CreateBotOpts (..),
     ChatCmdLog (..),
     chatOptsP,
     coreChatOptsP,
@@ -49,6 +50,7 @@ data ChatOpts = ChatOpts
     autoAcceptFileSize :: Integer,
     muteNotifications :: Bool,
     markRead :: Bool,
+    createBot :: Maybe CreateBotOpts,
     maintenance :: Bool
   }
 
@@ -68,6 +70,11 @@ data CoreChatOpts = CoreChatOpts
     yesToUpMigrations :: Bool
   }
 
+data CreateBotOpts = CreateBotOpts
+  { botDisplayName :: Text,
+    allowFiles :: Bool
+  }
+
 data ChatCmdLog = CCLAll | CCLMessages | CCLNone
   deriving (Eq)
 
@@ -354,6 +361,18 @@ chatOptsP appDir defaultDbName = do
           <> short 'r'
           <> help "Mark shown messages as read"
       )
+  createBotDisplayName <-
+    optional $
+      strOption
+        ( long "create-bot-display-name"
+            <> metavar "BOT_NAME"
+            <> help "Create new bot user on the first start with the passed display name"
+        )
+  createBotAllowFiles <-
+    switch
+      ( long "create-bot-allow-files"
+          <> help "Flag for created bot to allow files (only allowed together with --create-bot option)"
+      )
   maintenance <-
     switch
       ( long "maintenance"
@@ -374,6 +393,11 @@ chatOptsP appDir defaultDbName = do
         autoAcceptFileSize,
         muteNotifications,
         markRead,
+        createBot = case createBotDisplayName of
+          Just botDisplayName -> Just CreateBotOpts {botDisplayName, allowFiles = createBotAllowFiles}
+          Nothing
+            | createBotAllowFiles -> error "--create-bot-allow-files option requires --create-bot-name option"
+            | otherwise -> Nothing,
         maintenance
       }
 
diff --git a/src/Simplex/Chat/ProfileGenerator.hs b/src/Simplex/Chat/ProfileGenerator.hs
index 176320f282..b0903589de 100644
--- a/src/Simplex/Chat/ProfileGenerator.hs
+++ b/src/Simplex/Chat/ProfileGenerator.hs
@@ -10,7 +10,7 @@ generateRandomProfile :: IO Profile
 generateRandomProfile = do
   adjective <- pick adjectives
   noun <- pickNoun adjective 2
-  pure $ Profile {displayName = adjective <> noun, fullName = "", shortDescr = Nothing, image = Nothing, contactLink = Nothing, preferences = Nothing}
+  pure $ Profile {displayName = adjective <> noun, fullName = "", shortDescr = Nothing, image = Nothing, contactLink = Nothing, peerType = Nothing, preferences = Nothing}
   where
     pick :: [a] -> IO a
     pick xs = (xs !!) <$> randomRIO (0, length xs - 1)
diff --git a/src/Simplex/Chat/Store/Connections.hs b/src/Simplex/Chat/Store/Connections.hs
index 634c4e7175..549d2bd860 100644
--- a/src/Simplex/Chat/Store/Connections.hs
+++ b/src/Simplex/Chat/Store/Connections.hs
@@ -110,7 +110,7 @@ getConnectionEntity db vr user@User {userId, userContactId} agentConnId = do
           db
           [sql|
             SELECT
-              c.contact_profile_id, c.local_display_name, c.via_group, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, c.contact_used, c.contact_status, c.enable_ntfs, c.send_rcpts, c.favorite,
+              c.contact_profile_id, c.local_display_name, c.via_group, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, c.contact_used, c.contact_status, c.enable_ntfs, c.send_rcpts, c.favorite,
               p.preferences, c.user_preferences, c.created_at, c.updated_at, c.chat_ts, c.conn_full_link_to_connect, c.conn_short_link_to_connect, c.welcome_shared_msg_id, c.request_shared_msg_id, c.contact_request_id,
               c.contact_group_member_id, c.contact_grp_inv_sent, c.grp_direct_inv_link, c.grp_direct_inv_from_group_id, c.grp_direct_inv_from_group_member_id, c.grp_direct_inv_from_member_conn_id, c.grp_direct_inv_started_connection,
               c.ui_themes, c.chat_deleted, c.custom_data, c.chat_item_ttl
@@ -120,8 +120,8 @@ getConnectionEntity db vr user@User {userId, userContactId} agentConnId = do
           |]
           (userId, contactId)
     toContact' :: Int64 -> Connection -> [ChatTagId] -> ContactRow' -> Contact
-    toContact' contactId conn chatTags ((profileId, localDisplayName, viaGroup, displayName, fullName, shortDescr, image, contactLink, localAlias, BI contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, BI favorite, preferences, userPreferences, createdAt, updatedAt, chatTs) :. preparedContactRow :. (contactRequestId, contactGroupMemberId, BI contactGrpInvSent) :. groupDirectInvRow :. (uiThemes, BI chatDeleted, customData, chatItemTTL)) =
-      let profile = LocalProfile {profileId, displayName, fullName, shortDescr, image, contactLink, preferences, localAlias}
+    toContact' contactId conn chatTags ((profileId, localDisplayName, viaGroup, displayName, fullName, shortDescr, image, contactLink, peerType, localAlias, BI contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, BI favorite, preferences, userPreferences, createdAt, updatedAt, chatTs) :. preparedContactRow :. (contactRequestId, contactGroupMemberId, BI contactGrpInvSent) :. groupDirectInvRow :. (uiThemes, BI chatDeleted, customData, chatItemTTL)) =
+      let profile = LocalProfile {profileId, displayName, fullName, shortDescr, image, contactLink, peerType, preferences, localAlias}
           chatSettings = ChatSettings {enableNtfs = fromMaybe MFAll enableNtfs_, sendRcpts = unBI <$> sendRcpts, favorite}
           mergedPreferences = contactUserPreferences user userPreferences preferences $ connIncognito conn
           activeConn = Just conn
@@ -148,12 +148,12 @@ getConnectionEntity db vr user@User {userId, userContactId} agentConnId = do
                   mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
                   mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
                   -- GroupInfo {membership = GroupMember {memberProfile}}
-                  pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+                  pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.chat_peer_type, pu.local_alias, pu.preferences,
                   mu.created_at, mu.updated_at,
                   mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts,
                   -- from GroupMember
                   m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
-                  m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+                  m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
                   m.created_at, m.updated_at,
                   m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts
                 FROM group_members m
diff --git a/src/Simplex/Chat/Store/ContactRequest.hs b/src/Simplex/Chat/Store/ContactRequest.hs
index 3f41abb29f..d9ad9ec763 100644
--- a/src/Simplex/Chat/Store/ContactRequest.hs
+++ b/src/Simplex/Chat/Store/ContactRequest.hs
@@ -109,7 +109,7 @@ createOrUpdateContactRequest
             [sql|
               SELECT
                 -- Contact
-                ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
+                ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.chat_peer_type, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
                 cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.conn_full_link_to_connect, ct.conn_short_link_to_connect, ct.welcome_shared_msg_id, ct.request_shared_msg_id, ct.contact_request_id,
                 ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.grp_direct_inv_link, ct.grp_direct_inv_from_group_id, ct.grp_direct_inv_from_group_member_id, ct.grp_direct_inv_from_member_conn_id, ct.grp_direct_inv_started_connection,
                 ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl,
@@ -144,7 +144,7 @@ createOrUpdateContactRequest
             SELECT
               cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id,
               cr.contact_id, cr.business_group_id, cr.user_contact_link_id,
-              cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, cr.xcontact_id,
+              cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, cr.xcontact_id,
               cr.pq_support, cr.welcome_shared_msg_id, cr.request_shared_msg_id, p.preferences,
               cr.created_at, cr.updated_at,
               cr.peer_chat_min_version, cr.peer_chat_max_version
@@ -204,8 +204,7 @@ createOrUpdateContactRequest
               ct <- getContact db vr user contactId
               pure $ RSCurrentRequest Nothing ucr (Just $ REContact ct)
             createBusinessChat = do
-              let Profile {preferences = userPreferences} = userProfileInGroup user Nothing
-                  groupPreferences = maybe defaultBusinessGroupPrefs businessGroupPrefs userPreferences
+              let groupPreferences = maybe defaultBusinessGroupPrefs businessGroupPrefs $ preferences' user
               (gInfo@GroupInfo {groupId}, clientMember) <-
                 createBusinessRequestGroup db vr gVar user cReqChatVRange profile profileId ldn groupPreferences
               liftIO $
diff --git a/src/Simplex/Chat/Store/Direct.hs b/src/Simplex/Chat/Store/Direct.hs
index c9b76a0fd2..f25f7f2562 100644
--- a/src/Simplex/Chat/Store/Direct.hs
+++ b/src/Simplex/Chat/Store/Direct.hs
@@ -262,7 +262,7 @@ getContactByConnReqHash db vr user@User {userId} cReqHash1 cReqHash2 = do
         [sql|
           SELECT
             -- Contact
-            ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
+            ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.chat_peer_type, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
             cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.conn_full_link_to_connect, ct.conn_short_link_to_connect, ct.welcome_shared_msg_id, ct.request_shared_msg_id, ct.contact_request_id,
             ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.grp_direct_inv_link, ct.grp_direct_inv_from_group_id, ct.grp_direct_inv_from_group_member_id, ct.grp_direct_inv_from_member_conn_id, ct.grp_direct_inv_started_connection,
             ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl,
@@ -642,15 +642,15 @@ updateContactProfile_ db userId profileId profile = do
   updateContactProfile_' db userId profileId profile currentTs
 
 updateContactProfile_' :: DB.Connection -> UserId -> ProfileId -> Profile -> UTCTime -> IO ()
-updateContactProfile_' db userId profileId Profile {displayName, fullName, shortDescr, image, contactLink, preferences} updatedAt = do
+updateContactProfile_' db userId profileId Profile {displayName, fullName, shortDescr, image, contactLink, preferences, peerType} updatedAt = do
   DB.execute
     db
     [sql|
       UPDATE contact_profiles
-      SET display_name = ?, full_name = ?, short_descr = ?, image = ?, contact_link = ?, preferences = ?, updated_at = ?
+      SET display_name = ?, full_name = ?, short_descr = ?, image = ?, contact_link = ?, preferences = ?, chat_peer_type = ?, updated_at = ?
       WHERE user_id = ? AND contact_profile_id = ?
     |]
-    (displayName, fullName, shortDescr, image, contactLink, preferences, updatedAt, userId, profileId)
+    (displayName, fullName, shortDescr, image, contactLink, preferences, peerType, updatedAt, userId, profileId)
 
 -- update only member profile fields (when member doesn't have associated contact - we can reset contactLink and prefs)
 updateMemberContactProfileReset_ :: DB.Connection -> UserId -> ProfileId -> Profile -> IO ()
@@ -735,7 +735,7 @@ contactRequestQuery =
     SELECT
       cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id,
       cr.contact_id, cr.business_group_id, cr.user_contact_link_id,
-      cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, cr.xcontact_id,
+      cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, cr.xcontact_id,
       cr.pq_support, cr.welcome_shared_msg_id, cr.request_shared_msg_id, p.preferences,
       cr.created_at, cr.updated_at,
       cr.peer_chat_min_version, cr.peer_chat_max_version
@@ -854,7 +854,7 @@ getContact_ db vr user@User {userId} contactId deleted = do
       [sql|
         SELECT
           -- Contact
-          ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
+          ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.chat_peer_type, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
           cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.conn_full_link_to_connect, ct.conn_short_link_to_connect, ct.welcome_shared_msg_id, ct.request_shared_msg_id, ct.contact_request_id,
           ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.grp_direct_inv_link, ct.grp_direct_inv_from_group_id, ct.grp_direct_inv_from_group_member_id, ct.grp_direct_inv_from_member_conn_id, ct.grp_direct_inv_started_connection,
           ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl,
diff --git a/src/Simplex/Chat/Store/Groups.hs b/src/Simplex/Chat/Store/Groups.hs
index cceef17228..d9ea7e20e7 100644
--- a/src/Simplex/Chat/Store/Groups.hs
+++ b/src/Simplex/Chat/Store/Groups.hs
@@ -201,11 +201,11 @@ import Database.SQLite.Simple (Only (..), Query, (:.) (..))
 import Database.SQLite.Simple.QQ (sql)
 #endif
 
-type MaybeGroupMemberRow = (Maybe Int64, Maybe Int64, Maybe MemberId, Maybe VersionChat, Maybe VersionChat, Maybe GroupMemberRole, Maybe GroupMemberCategory, Maybe GroupMemberStatus, Maybe BoolInt, Maybe MemberRestrictionStatus) :. (Maybe Int64, Maybe GroupMemberId, Maybe ContactName, Maybe ContactId, Maybe ProfileId) :. (Maybe ProfileId, Maybe ContactName, Maybe Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, Maybe LocalAlias, Maybe Preferences) :. (Maybe UTCTime, Maybe UTCTime) :. (Maybe UTCTime, Maybe Int64, Maybe Int64, Maybe Int64, Maybe UTCTime)
+type MaybeGroupMemberRow = (Maybe Int64, Maybe Int64, Maybe MemberId, Maybe VersionChat, Maybe VersionChat, Maybe GroupMemberRole, Maybe GroupMemberCategory, Maybe GroupMemberStatus, Maybe BoolInt, Maybe MemberRestrictionStatus) :. (Maybe Int64, Maybe GroupMemberId, Maybe ContactName, Maybe ContactId, Maybe ProfileId) :. (Maybe ProfileId, Maybe ContactName, Maybe Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, Maybe ChatPeerType, Maybe LocalAlias, Maybe Preferences) :. (Maybe UTCTime, Maybe UTCTime) :. (Maybe UTCTime, Maybe Int64, Maybe Int64, Maybe Int64, Maybe UTCTime)
 
 toMaybeGroupMember :: Int64 -> MaybeGroupMemberRow -> Maybe GroupMember
-toMaybeGroupMember userContactId ((Just groupMemberId, Just groupId, Just memberId, Just minVer, Just maxVer, Just memberRole, Just memberCategory, Just memberStatus, Just showMessages, memberBlocked') :. (invitedById, invitedByGroupMemberId, Just localDisplayName, memberContactId, Just memberContactProfileId) :. (Just profileId, Just displayName, Just fullName, shortDescr, image, contactLink, Just localAlias, contactPreferences) :. (Just createdAt, Just updatedAt) :. (supportChatTs, Just supportChatUnread, Just supportChatUnanswered, Just supportChatMentions, supportChatLastMsgFromMemberTs)) =
-  Just $ toGroupMember userContactId ((groupMemberId, groupId, memberId, minVer, maxVer, memberRole, memberCategory, memberStatus, showMessages, memberBlocked') :. (invitedById, invitedByGroupMemberId, localDisplayName, memberContactId, memberContactProfileId) :. (profileId, displayName, fullName, shortDescr, image, contactLink, localAlias, contactPreferences) :. (createdAt, updatedAt) :. (supportChatTs, supportChatUnread, supportChatUnanswered, supportChatMentions, supportChatLastMsgFromMemberTs))
+toMaybeGroupMember userContactId ((Just groupMemberId, Just groupId, Just memberId, Just minVer, Just maxVer, Just memberRole, Just memberCategory, Just memberStatus, Just showMessages, memberBlocked') :. (invitedById, invitedByGroupMemberId, Just localDisplayName, memberContactId, Just memberContactProfileId) :. (Just profileId, Just displayName, Just fullName, shortDescr, image, contactLink, peerType, Just localAlias, contactPreferences) :. (Just createdAt, Just updatedAt) :. (supportChatTs, Just supportChatUnread, Just supportChatUnanswered, Just supportChatMentions, supportChatLastMsgFromMemberTs)) =
+  Just $ toGroupMember userContactId ((groupMemberId, groupId, memberId, minVer, maxVer, memberRole, memberCategory, memberStatus, showMessages, memberBlocked') :. (invitedById, invitedByGroupMemberId, localDisplayName, memberContactId, memberContactProfileId) :. (profileId, displayName, fullName, shortDescr, image, contactLink, peerType, localAlias, contactPreferences) :. (createdAt, updatedAt) :. (supportChatTs, supportChatUnread, supportChatUnanswered, supportChatMentions, supportChatLastMsgFromMemberTs))
 toMaybeGroupMember _ _ = Nothing
 
 createGroupLink :: DB.Connection -> User -> GroupInfo -> ConnId -> CreatedLinkContact -> GroupLinkId -> GroupMemberRole -> SubscriptionMode -> ExceptT StoreError IO GroupLink
@@ -958,7 +958,7 @@ getUserGroupDetails db vr User {userId, userContactId} _contactId_ search_ = do
             g.business_chat, g.business_member_id, g.customer_member_id,
             g.ui_themes, g.custom_data, g.chat_item_ttl, g.members_require_attention, g.via_group_link_uri,
             mu.group_member_id, g.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, mu.member_status, mu.show_messages, mu.member_restriction,
-            mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id, pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+            mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id, pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.chat_peer_type, pu.local_alias, pu.preferences,
             mu.created_at, mu.updated_at,
             mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts
           FROM groups g
@@ -1024,7 +1024,7 @@ groupMemberQuery =
   [sql|
     SELECT
       m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
-      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
       m.created_at, m.updated_at,
       m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
       c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.xcontact_id, c.custom_user_profile_id,
@@ -1918,12 +1918,12 @@ getViaGroupMember db vr User {userId, userContactId} Contact {contactId} = do
             mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
             mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
             -- GroupInfo {membership = GroupMember {memberProfile}}
-            pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+            pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.chat_peer_type, pu.local_alias, pu.preferences,
             mu.created_at, mu.updated_at,
             mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts,
             -- via GroupMember
             m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
-            m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+            m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
             m.created_at, m.updated_at,
             m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
             c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.xcontact_id, c.custom_user_profile_id,
diff --git a/src/Simplex/Chat/Store/Messages.hs b/src/Simplex/Chat/Store/Messages.hs
index 0086fcee64..d1c147d43c 100644
--- a/src/Simplex/Chat/Store/Messages.hs
+++ b/src/Simplex/Chat/Store/Messages.hs
@@ -648,7 +648,7 @@ getChatItemQuote_ db User {userId, userContactId} chatDirection QuotedMsg {msgRe
               -- GroupMember
               m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category,
               m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id,
-              p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+              p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
               m.created_at, m.updated_at,
               m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts
             FROM group_members m
@@ -1066,7 +1066,7 @@ getContactRequestChatPreviews_ db User {userId} pagination clq = case clq of
         SELECT
           cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id,
           cr.contact_id, cr.business_group_id, cr.user_contact_link_id,
-          cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, cr.xcontact_id,
+          cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, cr.xcontact_id,
           cr.pq_support, cr.welcome_shared_msg_id, cr.request_shared_msg_id, p.preferences,
           cr.created_at, cr.updated_at,
           cr.peer_chat_min_version, cr.peer_chat_max_version
@@ -2920,7 +2920,7 @@ getGroupChatItem db User {userId, userContactId} groupId itemId = ExceptT $ do
             -- GroupMember
             m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category,
             m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id,
-            p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+            p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
             m.created_at, m.updated_at,
             m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
             -- quoted ChatItem
@@ -2928,13 +2928,13 @@ getGroupChatItem db User {userId, userContactId} groupId itemId = ExceptT $ do
             -- quoted GroupMember
             rm.group_member_id, rm.group_id, rm.member_id, rm.peer_chat_min_version, rm.peer_chat_max_version, rm.member_role, rm.member_category,
             rm.member_status, rm.show_messages, rm.member_restriction, rm.invited_by, rm.invited_by_group_member_id, rm.local_display_name, rm.contact_id, rm.contact_profile_id, rp.contact_profile_id,
-            rp.display_name, rp.full_name, rp.short_descr, rp.image, rp.contact_link, rp.local_alias, rp.preferences,
+            rp.display_name, rp.full_name, rp.short_descr, rp.image, rp.contact_link, rp.chat_peer_type, rp.local_alias, rp.preferences,
             rm.created_at, rm.updated_at,
             rm.support_chat_ts, rm.support_chat_items_unread, rm.support_chat_items_member_attention, rm.support_chat_items_mentions, rm.support_chat_last_msg_from_member_ts,
             -- deleted by GroupMember
             dbm.group_member_id, dbm.group_id, dbm.member_id, dbm.peer_chat_min_version, dbm.peer_chat_max_version, dbm.member_role, dbm.member_category,
             dbm.member_status, dbm.show_messages, dbm.member_restriction, dbm.invited_by, dbm.invited_by_group_member_id, dbm.local_display_name, dbm.contact_id, dbm.contact_profile_id, dbp.contact_profile_id,
-            dbp.display_name, dbp.full_name, dbp.short_descr, dbp.image, dbp.contact_link, dbp.local_alias, dbp.preferences,
+            dbp.display_name, dbp.full_name, dbp.short_descr, dbp.image, dbp.contact_link, dbp.chat_peer_type, dbp.local_alias, dbp.preferences,
             dbm.created_at, dbm.updated_at,
             dbm.support_chat_ts, dbm.support_chat_items_unread, dbm.support_chat_items_member_attention, dbm.support_chat_items_mentions, dbm.support_chat_last_msg_from_member_ts
           FROM chat_items i
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations.hs b/src/Simplex/Chat/Store/Postgres/Migrations.hs
index 1fc8054702..ce1987db15 100644
--- a/src/Simplex/Chat/Store/Postgres/Migrations.hs
+++ b/src/Simplex/Chat/Store/Postgres/Migrations.hs
@@ -15,6 +15,7 @@ import Simplex.Chat.Store.Postgres.Migrations.M20250709_profile_short_descr
 import Simplex.Chat.Store.Postgres.Migrations.M20250721_indexes
 import Simplex.Chat.Store.Postgres.Migrations.M20250729_member_contact_requests
 import Simplex.Chat.Store.Postgres.Migrations.M20250801_via_group_link_uri
+import Simplex.Chat.Store.Postgres.Migrations.M20250802_chat_peer_type
 import Simplex.Messaging.Agent.Store.Shared (Migration (..))
 
 schemaMigrations :: [(String, Text, Maybe Text)]
@@ -29,7 +30,8 @@ schemaMigrations =
     ("20250709_profile_short_descr", m20250709_profile_short_descr, Just down_m20250709_profile_short_descr),
     ("20250721_indexes", m20250721_indexes, Just down_m20250721_indexes),
     ("20250729_member_contact_requests", m20250729_member_contact_requests, Just down_m20250729_member_contact_requests),
-    ("20250801_via_group_link_uri", m20250801_via_group_link_uri, Just down_m20250801_via_group_link_uri)
+    ("20250801_via_group_link_uri", m20250801_via_group_link_uri, Just down_m20250801_via_group_link_uri),
+    ("20250802_chat_peer_type", m20250802_chat_peer_type, Just down_m20250802_chat_peer_type)
   ]
 
 -- | The list of migrations in ascending order by date
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/M20250802_chat_peer_type.hs b/src/Simplex/Chat/Store/Postgres/Migrations/M20250802_chat_peer_type.hs
new file mode 100644
index 0000000000..cbef6f65f3
--- /dev/null
+++ b/src/Simplex/Chat/Store/Postgres/Migrations/M20250802_chat_peer_type.hs
@@ -0,0 +1,21 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.Postgres.Migrations.M20250802_chat_peer_type where
+
+import Data.Text (Text)
+import qualified Data.Text as T
+import Text.RawString.QQ (r)
+
+m20250802_chat_peer_type :: Text
+m20250802_chat_peer_type =
+  T.pack
+    [r|
+ALTER TABLE contact_profiles ADD COLUMN chat_peer_type TEXT;
+|]
+
+down_m20250802_chat_peer_type :: Text
+down_m20250802_chat_peer_type =
+  T.pack
+    [r|
+ALTER TABLE contact_profiles DROP COLUMN chat_peer_type;
+|]
diff --git a/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql b/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql
index e649c03c34..c0560de376 100644
--- a/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql
+++ b/src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql
@@ -333,7 +333,8 @@ CREATE TABLE test_chat_schema.contact_profiles (
     local_alias text DEFAULT ''::text NOT NULL,
     preferences text,
     contact_link bytea,
-    short_descr text
+    short_descr text,
+    chat_peer_type text
 );
 
 
diff --git a/src/Simplex/Chat/Store/Profiles.hs b/src/Simplex/Chat/Store/Profiles.hs
index b74705fd53..64fbbddda0 100644
--- a/src/Simplex/Chat/Store/Profiles.hs
+++ b/src/Simplex/Chat/Store/Profiles.hs
@@ -130,7 +130,7 @@ createUserRecord :: DB.Connection -> AgentUserId -> Profile -> Bool -> ExceptT S
 createUserRecord db auId p activeUser = createUserRecordAt db auId p activeUser =<< liftIO getCurrentTime
 
 createUserRecordAt :: DB.Connection -> AgentUserId -> Profile -> Bool -> UTCTime -> ExceptT StoreError IO User
-createUserRecordAt db (AgentUserId auId) Profile {displayName, fullName, shortDescr, image, preferences = userPreferences} activeUser currentTs =
+createUserRecordAt db (AgentUserId auId) Profile {displayName, fullName, shortDescr, image, peerType, preferences = userPreferences} activeUser currentTs =
   checkConstraint SEDuplicateName . liftIO $ do
     when activeUser $ DB.execute_ db "UPDATE users SET active_user = 0"
     let showNtfs = True
@@ -149,8 +149,8 @@ createUserRecordAt db (AgentUserId auId) Profile {displayName, fullName, shortDe
       (displayName, displayName, userId, currentTs, currentTs)
     DB.execute
       db
-      "INSERT INTO contact_profiles (display_name, full_name, short_descr, image, user_id, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?)"
-      (displayName, fullName, shortDescr, image, userId, userPreferences, currentTs, currentTs)
+      "INSERT INTO contact_profiles (display_name, full_name, short_descr, image, chat_peer_type, user_id, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?)"
+      (displayName, fullName, shortDescr, image, peerType, userId, userPreferences, currentTs, currentTs)
     profileId <- insertedRowId db
     DB.execute
       db
@@ -158,7 +158,7 @@ createUserRecordAt db (AgentUserId auId) Profile {displayName, fullName, shortDe
       (profileId, displayName, userId, BI True, currentTs, currentTs, currentTs)
     contactId <- insertedRowId db
     DB.execute db "UPDATE users SET contact_id = ? WHERE user_id = ?" (contactId, userId)
-    pure $ toUser $ (userId, auId, contactId, profileId, BI activeUser, order, displayName, fullName, shortDescr, image, Nothing, userPreferences) :. (BI showNtfs, BI sendRcptsContacts, BI sendRcptsSmallGroups, BI autoAcceptMemberContacts, Nothing, Nothing, Nothing, Nothing)
+    pure $ toUser $ (userId, auId, contactId, profileId, BI activeUser, order) :. (displayName, fullName, shortDescr, image, Nothing, peerType, userPreferences) :. (BI showNtfs, BI sendRcptsContacts, BI sendRcptsSmallGroups, BI autoAcceptMemberContacts, Nothing, Nothing, Nothing, Nothing)
 
 -- TODO [mentions]
 getUsersInfo :: DB.Connection -> IO [UserInfo]
@@ -350,14 +350,14 @@ getUserContactProfiles db User {userId} =
     <$> DB.query
       db
       [sql|
-        SELECT display_name, full_name, short_descr, image, contact_link, preferences
+        SELECT display_name, full_name, short_descr, image, contact_link, chat_peer_type, preferences
         FROM contact_profiles
         WHERE user_id = ?
       |]
       (Only userId)
   where
-    toContactProfile :: (ContactName, Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, Maybe Preferences) -> Profile
-    toContactProfile (displayName, fullName, shortDescr, image, contactLink, preferences) = Profile {displayName, fullName, shortDescr, image, contactLink, preferences}
+    toContactProfile :: (ContactName, Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, Maybe ChatPeerType, Maybe Preferences) -> Profile
+    toContactProfile (displayName, fullName, shortDescr, image, contactLink, peerType, preferences) = Profile {displayName, fullName, shortDescr, image, contactLink, peerType, preferences}
 
 createUserContactLink :: DB.Connection -> User -> ConnId -> CreatedLinkContact -> SubscriptionMode -> ExceptT StoreError IO ()
 createUserContactLink db User {userId} agentConnId (CCLink cReq shortLink) subMode =
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations.hs b/src/Simplex/Chat/Store/SQLite/Migrations.hs
index 7665d5155f..3d5fc307ee 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations.hs
+++ b/src/Simplex/Chat/Store/SQLite/Migrations.hs
@@ -138,6 +138,7 @@ import Simplex.Chat.Store.SQLite.Migrations.M20250709_profile_short_descr
 import Simplex.Chat.Store.SQLite.Migrations.M20250721_indexes
 import Simplex.Chat.Store.SQLite.Migrations.M20250729_member_contact_requests
 import Simplex.Chat.Store.SQLite.Migrations.M20250801_via_group_link_uri
+import Simplex.Chat.Store.SQLite.Migrations.M20250802_chat_peer_type
 import Simplex.Messaging.Agent.Store.Shared (Migration (..))
 
 schemaMigrations :: [(String, Query, Maybe Query)]
@@ -275,7 +276,8 @@ schemaMigrations =
     ("20250709_profile_short_descr", m20250709_profile_short_descr, Just down_m20250709_profile_short_descr),
     ("20250721_indexes", m20250721_indexes, Just down_m20250721_indexes),
     ("20250729_member_contact_requests", m20250729_member_contact_requests, Just down_m20250729_member_contact_requests),
-    ("20250801_via_group_link_uri", m20250801_via_group_link_uri, Just down_m20250801_via_group_link_uri)
+    ("20250801_via_group_link_uri", m20250801_via_group_link_uri, Just down_m20250801_via_group_link_uri),
+    ("20250802_chat_peer_type", m20250802_chat_peer_type, Just down_m20250802_chat_peer_type)
   ]
 
 -- | The list of migrations in ascending order by date
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/M20250802_chat_peer_type.hs b/src/Simplex/Chat/Store/SQLite/Migrations/M20250802_chat_peer_type.hs
new file mode 100644
index 0000000000..9ba345ce94
--- /dev/null
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/M20250802_chat_peer_type.hs
@@ -0,0 +1,18 @@
+{-# LANGUAGE QuasiQuotes #-}
+
+module Simplex.Chat.Store.SQLite.Migrations.M20250802_chat_peer_type where
+
+import Database.SQLite.Simple (Query)
+import Database.SQLite.Simple.QQ (sql)
+
+m20250802_chat_peer_type :: Query
+m20250802_chat_peer_type =
+  [sql|
+ALTER TABLE contact_profiles ADD COLUMN chat_peer_type TEXT;
+|]
+
+down_m20250802_chat_peer_type :: Query
+down_m20250802_chat_peer_type =
+  [sql|
+ALTER TABLE contact_profiles DROP COLUMN chat_peer_type;
+|]
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
index c66716d56a..a603551934 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
@@ -70,12 +70,12 @@ Query:
                   mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
                   mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
                   -- GroupInfo {membership = GroupMember {memberProfile}}
-                  pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+                  pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.chat_peer_type, pu.local_alias, pu.preferences,
                   mu.created_at, mu.updated_at,
                   mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts,
                   -- from GroupMember
                   m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
-                  m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+                  m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
                   m.created_at, m.updated_at,
                   m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts
                 FROM group_members m
@@ -196,7 +196,7 @@ Plan:
 Query: 
               SELECT
                 -- Contact
-                ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
+                ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.chat_peer_type, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
                 cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.conn_full_link_to_connect, ct.conn_short_link_to_connect, ct.welcome_shared_msg_id, ct.request_shared_msg_id, ct.contact_request_id,
                 ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.grp_direct_inv_link, ct.grp_direct_inv_from_group_id, ct.grp_direct_inv_from_group_member_id, ct.grp_direct_inv_from_member_conn_id, ct.grp_direct_inv_started_connection,
                 ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl,
@@ -386,7 +386,7 @@ Plan:
 
 Query: 
             SELECT
-              c.contact_profile_id, c.local_display_name, c.via_group, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, c.contact_used, c.contact_status, c.enable_ntfs, c.send_rcpts, c.favorite,
+              c.contact_profile_id, c.local_display_name, c.via_group, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, c.contact_used, c.contact_status, c.enable_ntfs, c.send_rcpts, c.favorite,
               p.preferences, c.user_preferences, c.created_at, c.updated_at, c.chat_ts, c.conn_full_link_to_connect, c.conn_short_link_to_connect, c.welcome_shared_msg_id, c.request_shared_msg_id, c.contact_request_id,
               c.contact_group_member_id, c.contact_grp_inv_sent, c.grp_direct_inv_link, c.grp_direct_inv_from_group_id, c.grp_direct_inv_from_group_member_id, c.grp_direct_inv_from_member_conn_id, c.grp_direct_inv_started_connection,
               c.ui_themes, c.chat_deleted, c.custom_data, c.chat_item_ttl
@@ -402,7 +402,7 @@ Query:
             SELECT
               cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id,
               cr.contact_id, cr.business_group_id, cr.user_contact_link_id,
-              cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, cr.xcontact_id,
+              cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, cr.xcontact_id,
               cr.pq_support, cr.welcome_shared_msg_id, cr.request_shared_msg_id, p.preferences,
               cr.created_at, cr.updated_at,
               cr.peer_chat_min_version, cr.peer_chat_max_version
@@ -677,7 +677,7 @@ Query:
               -- GroupMember
               m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category,
               m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id,
-              p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+              p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
               m.created_at, m.updated_at,
               m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts
             FROM group_members m
@@ -871,7 +871,7 @@ Query:
             -- GroupMember
             m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category,
             m.member_status, m.show_messages, m.member_restriction, m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id,
-            p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+            p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
             m.created_at, m.updated_at,
             m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
             -- quoted ChatItem
@@ -879,13 +879,13 @@ Query:
             -- quoted GroupMember
             rm.group_member_id, rm.group_id, rm.member_id, rm.peer_chat_min_version, rm.peer_chat_max_version, rm.member_role, rm.member_category,
             rm.member_status, rm.show_messages, rm.member_restriction, rm.invited_by, rm.invited_by_group_member_id, rm.local_display_name, rm.contact_id, rm.contact_profile_id, rp.contact_profile_id,
-            rp.display_name, rp.full_name, rp.short_descr, rp.image, rp.contact_link, rp.local_alias, rp.preferences,
+            rp.display_name, rp.full_name, rp.short_descr, rp.image, rp.contact_link, rp.chat_peer_type, rp.local_alias, rp.preferences,
             rm.created_at, rm.updated_at,
             rm.support_chat_ts, rm.support_chat_items_unread, rm.support_chat_items_member_attention, rm.support_chat_items_mentions, rm.support_chat_last_msg_from_member_ts,
             -- deleted by GroupMember
             dbm.group_member_id, dbm.group_id, dbm.member_id, dbm.peer_chat_min_version, dbm.peer_chat_max_version, dbm.member_role, dbm.member_category,
             dbm.member_status, dbm.show_messages, dbm.member_restriction, dbm.invited_by, dbm.invited_by_group_member_id, dbm.local_display_name, dbm.contact_id, dbm.contact_profile_id, dbp.contact_profile_id,
-            dbp.display_name, dbp.full_name, dbp.short_descr, dbp.image, dbp.contact_link, dbp.local_alias, dbp.preferences,
+            dbp.display_name, dbp.full_name, dbp.short_descr, dbp.image, dbp.contact_link, dbp.chat_peer_type, dbp.local_alias, dbp.preferences,
             dbm.created_at, dbm.updated_at,
             dbm.support_chat_ts, dbm.support_chat_items_unread, dbm.support_chat_items_member_attention, dbm.support_chat_items_mentions, dbm.support_chat_last_msg_from_member_ts
           FROM chat_items i
@@ -937,7 +937,7 @@ SEARCH ri USING COVERING INDEX idx_chat_items_direct_shared_msg_id (user_id=? AN
 Query: 
           SELECT
             -- Contact
-            ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
+            ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.chat_peer_type, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
             cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.conn_full_link_to_connect, ct.conn_short_link_to_connect, ct.welcome_shared_msg_id, ct.request_shared_msg_id, ct.contact_request_id,
             ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.grp_direct_inv_link, ct.grp_direct_inv_from_group_id, ct.grp_direct_inv_from_group_member_id, ct.grp_direct_inv_from_member_conn_id, ct.grp_direct_inv_started_connection,
             ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl,
@@ -978,12 +978,12 @@ Query:
             mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
             mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
             -- GroupInfo {membership = GroupMember {memberProfile}}
-            pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+            pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.chat_peer_type, pu.local_alias, pu.preferences,
             mu.created_at, mu.updated_at,
             mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts,
             -- via GroupMember
             m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
-            m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+            m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
             m.created_at, m.updated_at,
             m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
             c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.xcontact_id, c.custom_user_profile_id,
@@ -1025,7 +1025,7 @@ Query:
             g.business_chat, g.business_member_id, g.customer_member_id,
             g.ui_themes, g.custom_data, g.chat_item_ttl, g.members_require_attention, g.via_group_link_uri,
             mu.group_member_id, g.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category, mu.member_status, mu.show_messages, mu.member_restriction,
-            mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id, pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+            mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id, pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.chat_peer_type, pu.local_alias, pu.preferences,
             mu.created_at, mu.updated_at,
             mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts
           FROM groups g
@@ -1580,7 +1580,7 @@ Plan:
 Query: 
         SELECT
           -- Contact
-          ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
+          ct.contact_id, ct.contact_profile_id, ct.local_display_name, ct.via_group, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.chat_peer_type, cp.local_alias, ct.contact_used, ct.contact_status, ct.enable_ntfs, ct.send_rcpts, ct.favorite,
           cp.preferences, ct.user_preferences, ct.created_at, ct.updated_at, ct.chat_ts, ct.conn_full_link_to_connect, ct.conn_short_link_to_connect, ct.welcome_shared_msg_id, ct.request_shared_msg_id, ct.contact_request_id,
           ct.contact_group_member_id, ct.contact_grp_inv_sent, ct.grp_direct_inv_link, ct.grp_direct_inv_from_group_id, ct.grp_direct_inv_from_group_member_id, ct.grp_direct_inv_from_member_conn_id, ct.grp_direct_inv_started_connection,
           ct.ui_themes, ct.chat_deleted, ct.custom_data, ct.chat_item_ttl,
@@ -1684,7 +1684,7 @@ Query:
         SELECT
           cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id,
           cr.contact_id, cr.business_group_id, cr.user_contact_link_id,
-          cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, cr.xcontact_id,
+          cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, cr.xcontact_id,
           cr.pq_support, cr.welcome_shared_msg_id, cr.request_shared_msg_id, p.preferences,
           cr.created_at, cr.updated_at,
           cr.peer_chat_min_version, cr.peer_chat_max_version
@@ -1713,7 +1713,7 @@ Query:
         SELECT
           cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id,
           cr.contact_id, cr.business_group_id, cr.user_contact_link_id,
-          cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, cr.xcontact_id,
+          cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, cr.xcontact_id,
           cr.pq_support, cr.welcome_shared_msg_id, cr.request_shared_msg_id, p.preferences,
           cr.created_at, cr.updated_at,
           cr.peer_chat_min_version, cr.peer_chat_max_version
@@ -1742,7 +1742,7 @@ Query:
         SELECT
           cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id,
           cr.contact_id, cr.business_group_id, cr.user_contact_link_id,
-          cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, cr.xcontact_id,
+          cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, cr.xcontact_id,
           cr.pq_support, cr.welcome_shared_msg_id, cr.request_shared_msg_id, p.preferences,
           cr.created_at, cr.updated_at,
           cr.peer_chat_min_version, cr.peer_chat_max_version
@@ -3231,7 +3231,7 @@ Plan:
 SEARCH connections USING INTEGER PRIMARY KEY (rowid=?)
 
 Query: 
-        SELECT cp.contact_profile_id, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.local_alias, cp.preferences -- , ct.user_preferences
+        SELECT cp.contact_profile_id, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.chat_peer_type, cp.local_alias, cp.preferences -- , ct.user_preferences
         FROM contact_profiles cp
         WHERE cp.user_id = ? AND cp.contact_profile_id = ?
       
@@ -3274,7 +3274,7 @@ SEARCH f USING PRIMARY KEY (file_id=?)
 SEARCH d USING INTEGER PRIMARY KEY (rowid=?)
 
 Query: 
-        SELECT display_name, full_name, short_descr, image, contact_link, preferences
+        SELECT display_name, full_name, short_descr, image, contact_link, chat_peer_type, preferences
         FROM contact_profiles
         WHERE user_id = ?
       
@@ -4462,7 +4462,7 @@ SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
 
 Query: 
       UPDATE contact_profiles
-      SET display_name = ?, full_name = ?, short_descr = ?, image = ?, contact_link = ?, preferences = ?, updated_at = ?
+      SET display_name = ?, full_name = ?, short_descr = ?, image = ?, contact_link = ?, preferences = ?, chat_peer_type = ?, updated_at = ?
       WHERE user_id = ? AND contact_profile_id = ?
     
 Plan:
@@ -4753,7 +4753,7 @@ Query:
       -- GroupMember - membership
       mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
       mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
-      pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+      pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.chat_peer_type, pu.local_alias, pu.preferences,
       mu.created_at, mu.updated_at,
       mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts
     FROM groups g
@@ -4779,7 +4779,7 @@ Query:
       -- GroupMember - membership
       mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
       mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
-      pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+      pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.chat_peer_type, pu.local_alias, pu.preferences,
       mu.created_at, mu.updated_at,
       mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts
     FROM groups g
@@ -4797,7 +4797,7 @@ Query:
     SELECT
       cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id,
       cr.contact_id, cr.business_group_id, cr.user_contact_link_id,
-      cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, cr.xcontact_id,
+      cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, cr.xcontact_id,
       cr.pq_support, cr.welcome_shared_msg_id, cr.request_shared_msg_id, p.preferences,
       cr.created_at, cr.updated_at,
       cr.peer_chat_min_version, cr.peer_chat_max_version
@@ -4812,7 +4812,7 @@ Query:
     SELECT
       cr.contact_request_id, cr.local_display_name, cr.agent_invitation_id,
       cr.contact_id, cr.business_group_id, cr.user_contact_link_id,
-      cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, cr.xcontact_id,
+      cr.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, cr.xcontact_id,
       cr.pq_support, cr.welcome_shared_msg_id, cr.request_shared_msg_id, p.preferences,
       cr.created_at, cr.updated_at,
       cr.peer_chat_min_version, cr.peer_chat_max_version
@@ -4826,7 +4826,7 @@ SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
 Query: 
     SELECT
       m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
-      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
       m.created_at, m.updated_at,
       m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
       c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.xcontact_id, c.custom_user_profile_id,
@@ -4859,7 +4859,7 @@ SEARCH cc USING COVERING INDEX idx_connections_group_member (user_id=? AND group
 Query: 
     SELECT
       m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
-      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
       m.created_at, m.updated_at,
       m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
       c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.xcontact_id, c.custom_user_profile_id,
@@ -4884,7 +4884,7 @@ SEARCH cc USING COVERING INDEX idx_connections_group_member (user_id=? AND group
 Query: 
     SELECT
       m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
-      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
       m.created_at, m.updated_at,
       m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
       c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.xcontact_id, c.custom_user_profile_id,
@@ -4909,7 +4909,7 @@ SEARCH cc USING COVERING INDEX idx_connections_group_member (user_id=? AND group
 Query: 
     SELECT
       m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
-      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
       m.created_at, m.updated_at,
       m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
       c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.xcontact_id, c.custom_user_profile_id,
@@ -4934,7 +4934,7 @@ SEARCH cc USING COVERING INDEX idx_connections_group_member (user_id=? AND group
 Query: 
     SELECT
       m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
-      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
       m.created_at, m.updated_at,
       m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
       c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.xcontact_id, c.custom_user_profile_id,
@@ -4959,7 +4959,7 @@ SEARCH cc USING COVERING INDEX idx_connections_group_member (user_id=? AND group
 Query: 
     SELECT
       m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
-      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
       m.created_at, m.updated_at,
       m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
       c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.xcontact_id, c.custom_user_profile_id,
@@ -4984,7 +4984,7 @@ SEARCH cc USING COVERING INDEX idx_connections_group_member (user_id=? AND group
 Query: 
     SELECT
       m.group_member_id, m.group_id, m.member_id, m.peer_chat_min_version, m.peer_chat_max_version, m.member_role, m.member_category, m.member_status, m.show_messages, m.member_restriction,
-      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.local_alias, p.preferences,
+      m.invited_by, m.invited_by_group_member_id, m.local_display_name, m.contact_id, m.contact_profile_id, p.contact_profile_id, p.display_name, p.full_name, p.short_descr, p.image, p.contact_link, p.chat_peer_type, p.local_alias, p.preferences,
       m.created_at, m.updated_at,
       m.support_chat_ts, m.support_chat_items_unread, m.support_chat_items_member_attention, m.support_chat_items_mentions, m.support_chat_last_msg_from_member_ts,
       c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.xcontact_id, c.custom_user_profile_id,
@@ -5130,7 +5130,7 @@ Plan:
 SEARCH server_operators USING INTEGER PRIMARY KEY (rowid=?)
 
 Query: 
-    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.preferences,
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.chat_peer_type, ucp.preferences,
       u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.auto_accept_member_contacts, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
     FROM users u
     JOIN contacts uct ON uct.contact_id = u.contact_id
@@ -5142,7 +5142,7 @@ SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
 SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
 
 Query: 
-    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.preferences,
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.chat_peer_type, ucp.preferences,
       u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.auto_accept_member_contacts, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
     FROM users u
     JOIN contacts uct ON uct.contact_id = u.contact_id
@@ -5155,7 +5155,7 @@ SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
 SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
 
 Query: 
-    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.preferences,
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.chat_peer_type, ucp.preferences,
       u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.auto_accept_member_contacts, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
     FROM users u
     JOIN contacts uct ON uct.contact_id = u.contact_id
@@ -5168,7 +5168,7 @@ SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
 SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
 
 Query: 
-    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.preferences,
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.chat_peer_type, ucp.preferences,
       u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.auto_accept_member_contacts, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
     FROM users u
     JOIN contacts uct ON uct.contact_id = u.contact_id
@@ -5182,7 +5182,7 @@ SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
 SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
 
 Query: 
-    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.preferences,
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.chat_peer_type, ucp.preferences,
       u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.auto_accept_member_contacts, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
     FROM users u
     JOIN contacts uct ON uct.contact_id = u.contact_id
@@ -5195,7 +5195,7 @@ SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
 SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
 
 Query: 
-    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.preferences,
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.chat_peer_type, ucp.preferences,
       u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.auto_accept_member_contacts, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
     FROM users u
     JOIN contacts uct ON uct.contact_id = u.contact_id
@@ -5208,7 +5208,7 @@ SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
 SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
 
 Query: 
-    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.preferences,
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.chat_peer_type, ucp.preferences,
       u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.auto_accept_member_contacts, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
     FROM users u
     JOIN contacts uct ON uct.contact_id = u.contact_id
@@ -5221,7 +5221,7 @@ SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
 SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
 
 Query: 
-    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.preferences,
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.chat_peer_type, ucp.preferences,
       u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.auto_accept_member_contacts, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
     FROM users u
     JOIN contacts uct ON uct.contact_id = u.contact_id
@@ -5234,7 +5234,7 @@ SEARCH uct USING INTEGER PRIMARY KEY (rowid=?)
 SEARCH ucp USING INTEGER PRIMARY KEY (rowid=?)
 
 Query: 
-    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.preferences,
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.chat_peer_type, ucp.preferences,
       u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.auto_accept_member_contacts, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
     FROM users u
     JOIN contacts uct ON uct.contact_id = u.contact_id
@@ -5727,7 +5727,11 @@ Plan:
 Query: INSERT INTO chat_item_messages (chat_item_id, message_id, created_at, updated_at) VALUES (?,?,?,?)
 Plan:
 
-Query: INSERT INTO contact_profiles (display_name, full_name, short_descr, image, contact_link, user_id, local_alias, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?,?)
+Query: INSERT INTO contact_profiles (display_name, full_name, short_descr, image, chat_peer_type, user_id, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?)
+Plan:
+SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
+
+Query: INSERT INTO contact_profiles (display_name, full_name, short_descr, image, contact_link, chat_peer_type, user_id, local_alias, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?)
 Plan:
 SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
 
@@ -5735,10 +5739,6 @@ Query: INSERT INTO contact_profiles (display_name, full_name, short_descr, image
 Plan:
 SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
 
-Query: INSERT INTO contact_profiles (display_name, full_name, short_descr, image, user_id, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?)
-Plan:
-SEARCH contact_requests USING COVERING INDEX idx_contact_requests_contact_profile_id (contact_profile_id=?)
-
 Query: INSERT INTO contacts (contact_profile_id, local_display_name, user_id, is_user, created_at, updated_at, chat_ts) VALUES (?,?,?,?,?,?,?)
 Plan:
 SEARCH users USING COVERING INDEX sqlite_autoindex_users_1 (contact_id=?)
diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql b/src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql
index 371f3f09ec..952d0541d9 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_schema.sql
@@ -19,7 +19,8 @@ CREATE TABLE contact_profiles(
   local_alias TEXT DEFAULT '' CHECK(local_alias NOT NULL),
   preferences TEXT,
   contact_link BLOB,
-  short_descr TEXT
+  short_descr TEXT,
+  chat_peer_type TEXT
 );
 CREATE TABLE users(
   user_id INTEGER PRIMARY KEY,
diff --git a/src/Simplex/Chat/Store/Shared.hs b/src/Simplex/Chat/Store/Shared.hs
index 67c4eb8c1e..1caf034f2a 100644
--- a/src/Simplex/Chat/Store/Shared.hs
+++ b/src/Simplex/Chat/Store/Shared.hs
@@ -387,12 +387,12 @@ createContact db user profile = do
   void $ createContact_ db user profile emptyChatPrefs Nothing "" Nothing currentTs
 
 createContact_ :: DB.Connection -> User -> Profile -> Preferences -> Maybe (ACreatedConnLink, Maybe SharedMsgId) -> LocalAlias -> Maybe Int64 -> UTCTime -> ExceptT StoreError IO ContactId
-createContact_ db User {userId} Profile {displayName, fullName, shortDescr, image, contactLink, preferences} ctUserPreferences prepared localAlias viaGroup currentTs =
+createContact_ db User {userId} Profile {displayName, fullName, shortDescr, image, contactLink, peerType, preferences} ctUserPreferences prepared localAlias viaGroup currentTs =
   ExceptT . withLocalDisplayName db userId displayName $ \ldn -> do
     DB.execute
       db
-      "INSERT INTO contact_profiles (display_name, full_name, short_descr, image, contact_link, user_id, local_alias, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?,?)"
-      (displayName, fullName, shortDescr, image, contactLink, userId, localAlias, preferences, currentTs, currentTs)
+      "INSERT INTO contact_profiles (display_name, full_name, short_descr, image, contact_link, chat_peer_type, user_id, local_alias, preferences, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?,?,?,?)"
+      ((displayName, fullName, shortDescr, image, contactLink, peerType) :. (userId, localAlias, preferences, currentTs, currentTs))
     profileId <- insertedRowId db
     DB.execute
       db
@@ -459,13 +459,13 @@ type PreparedContactRow = (Maybe AConnectionRequestUri, Maybe AConnShortLink, Ma
 
 type GroupDirectInvitationRow = (Maybe ConnReqInvitation, Maybe GroupId, Maybe GroupMemberId, Maybe Int64, BoolInt)
 
-type ContactRow' = (ProfileId, ContactName, Maybe Int64, ContactName, Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, LocalAlias, BoolInt, ContactStatus) :. (Maybe MsgFilter, Maybe BoolInt, BoolInt, Maybe Preferences, Preferences, UTCTime, UTCTime, Maybe UTCTime) :. PreparedContactRow :. (Maybe Int64, Maybe GroupMemberId, BoolInt) :. GroupDirectInvitationRow :. (Maybe UIThemeEntityOverrides, BoolInt, Maybe CustomData, Maybe Int64)
+type ContactRow' = (ProfileId, ContactName, Maybe Int64, ContactName, Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, Maybe ChatPeerType, LocalAlias, BoolInt, ContactStatus) :. (Maybe MsgFilter, Maybe BoolInt, BoolInt, Maybe Preferences, Preferences, UTCTime, UTCTime, Maybe UTCTime) :. PreparedContactRow :. (Maybe Int64, Maybe GroupMemberId, BoolInt) :. GroupDirectInvitationRow :. (Maybe UIThemeEntityOverrides, BoolInt, Maybe CustomData, Maybe Int64)
 
 type ContactRow = Only ContactId :. ContactRow'
 
 toContact :: VersionRangeChat -> User -> [ChatTagId] -> ContactRow :. MaybeConnectionRow -> Contact
-toContact vr user chatTags ((Only contactId :. (profileId, localDisplayName, viaGroup, displayName, fullName, shortDescr, image, contactLink, localAlias, BI contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, BI favorite, preferences, userPreferences, createdAt, updatedAt, chatTs) :. preparedContactRow :. (contactRequestId, contactGroupMemberId, BI contactGrpInvSent) :. groupDirectInvRow :. (uiThemes, BI chatDeleted, customData, chatItemTTL)) :. connRow) =
-  let profile = LocalProfile {profileId, displayName, fullName, shortDescr, image, contactLink, preferences, localAlias}
+toContact vr user chatTags ((Only contactId :. (profileId, localDisplayName, viaGroup, displayName, fullName, shortDescr, image, contactLink, peerType, localAlias, BI contactUsed, contactStatus) :. (enableNtfs_, sendRcpts, BI favorite, preferences, userPreferences, createdAt, updatedAt, chatTs) :. preparedContactRow :. (contactRequestId, contactGroupMemberId, BI contactGrpInvSent) :. groupDirectInvRow :. (uiThemes, BI chatDeleted, customData, chatItemTTL)) :. connRow) =
+  let profile = LocalProfile {profileId, displayName, fullName, shortDescr, image, contactLink, peerType, preferences, localAlias}
       activeConn = toMaybeConnection vr connRow
       chatSettings = ChatSettings {enableNtfs = fromMaybe MFAll enableNtfs_, sendRcpts = unBI <$> sendRcpts, favorite}
       incognito = maybe False connIncognito activeConn
@@ -496,35 +496,35 @@ getProfileById db userId profileId =
     DB.query
       db
       [sql|
-        SELECT cp.contact_profile_id, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.local_alias, cp.preferences -- , ct.user_preferences
+        SELECT cp.contact_profile_id, cp.display_name, cp.full_name, cp.short_descr, cp.image, cp.contact_link, cp.chat_peer_type, cp.local_alias, cp.preferences -- , ct.user_preferences
         FROM contact_profiles cp
         WHERE cp.user_id = ? AND cp.contact_profile_id = ?
       |]
       (userId, profileId)
 
-type ContactRequestRow = (Int64, ContactName, AgentInvId, Maybe ContactId, Maybe GroupId, Maybe Int64) :. (Int64, ContactName, Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact) :. (Maybe XContactId, PQSupport, Maybe SharedMsgId, Maybe SharedMsgId, Maybe Preferences, UTCTime, UTCTime, VersionChat, VersionChat)
+type ContactRequestRow = (Int64, ContactName, AgentInvId, Maybe ContactId, Maybe GroupId, Maybe Int64) :. (Int64, ContactName, Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, Maybe ChatPeerType) :. (Maybe XContactId, PQSupport, Maybe SharedMsgId, Maybe SharedMsgId, Maybe Preferences, UTCTime, UTCTime, VersionChat, VersionChat)
 
 toContactRequest :: ContactRequestRow -> UserContactRequest
-toContactRequest ((contactRequestId, localDisplayName, agentInvitationId, contactId_, businessGroupId_, userContactLinkId_) :. (profileId, displayName, fullName, shortDescr, image, contactLink) :. (xContactId, pqSupport, welcomeSharedMsgId, requestSharedMsgId, preferences, createdAt, updatedAt, minVer, maxVer)) = do
-  let profile = Profile {displayName, fullName, shortDescr, image, contactLink, preferences}
+toContactRequest ((contactRequestId, localDisplayName, agentInvitationId, contactId_, businessGroupId_, userContactLinkId_) :. (profileId, displayName, fullName, shortDescr, image, contactLink, peerType) :. (xContactId, pqSupport, welcomeSharedMsgId, requestSharedMsgId, preferences, createdAt, updatedAt, minVer, maxVer)) = do
+  let profile = Profile {displayName, fullName, shortDescr, image, contactLink, peerType, preferences}
       cReqChatVRange = fromMaybe (versionToRange maxVer) $ safeVersionRange minVer maxVer
    in UserContactRequest {contactRequestId, agentInvitationId, contactId_, businessGroupId_, userContactLinkId_, cReqChatVRange, localDisplayName, profileId, profile, xContactId, pqSupport, welcomeSharedMsgId, requestSharedMsgId, createdAt, updatedAt}
 
 userQuery :: Query
 userQuery =
   [sql|
-    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.preferences,
+    SELECT u.user_id, u.agent_user_id, u.contact_id, ucp.contact_profile_id, u.active_user, u.active_order, u.local_display_name, ucp.full_name, ucp.short_descr, ucp.image, ucp.contact_link, ucp.chat_peer_type, ucp.preferences,
       u.show_ntfs, u.send_rcpts_contacts, u.send_rcpts_small_groups, u.auto_accept_member_contacts, u.view_pwd_hash, u.view_pwd_salt, u.user_member_profile_updated_at, u.ui_themes
     FROM users u
     JOIN contacts uct ON uct.contact_id = u.contact_id
     JOIN contact_profiles ucp ON ucp.contact_profile_id = uct.contact_profile_id
   |]
 
-toUser :: (UserId, UserId, ContactId, ProfileId, BoolInt, Int64, ContactName, Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, Maybe Preferences) :. (BoolInt, BoolInt, BoolInt, BoolInt, Maybe B64UrlByteString, Maybe B64UrlByteString, Maybe UTCTime, Maybe UIThemeEntityOverrides) -> User
-toUser ((userId, auId, userContactId, profileId, BI activeUser, activeOrder, displayName, fullName, shortDescr, image, contactLink, userPreferences) :. (BI showNtfs, BI sendRcptsContacts, BI sendRcptsSmallGroups, BI autoAcceptMemberContacts, viewPwdHash_, viewPwdSalt_, userMemberProfileUpdatedAt, uiThemes)) =
+toUser :: (UserId, UserId, ContactId, ProfileId, BoolInt, Int64) :. (ContactName, Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, Maybe ChatPeerType, Maybe Preferences) :. (BoolInt, BoolInt, BoolInt, BoolInt, Maybe B64UrlByteString, Maybe B64UrlByteString, Maybe UTCTime, Maybe UIThemeEntityOverrides) -> User
+toUser ((userId, auId, userContactId, profileId, BI activeUser, activeOrder) :. (displayName, fullName, shortDescr, image, contactLink, peerType, userPreferences) :. (BI showNtfs, BI sendRcptsContacts, BI sendRcptsSmallGroups, BI autoAcceptMemberContacts, viewPwdHash_, viewPwdSalt_, userMemberProfileUpdatedAt, uiThemes)) =
   User {userId, agentUserId = AgentUserId auId, userContactId, localDisplayName = displayName, profile, activeUser, activeOrder, fullPreferences, showNtfs, sendRcptsContacts, sendRcptsSmallGroups, autoAcceptMemberContacts = BoolDef autoAcceptMemberContacts, viewPwdHash, userMemberProfileUpdatedAt, uiThemes}
   where
-    profile = LocalProfile {profileId, displayName, fullName, shortDescr, image, contactLink, preferences = userPreferences, localAlias = ""}
+    profile = LocalProfile {profileId, displayName, fullName, shortDescr, image, contactLink, peerType, preferences = userPreferences, localAlias = ""}
     fullPreferences = fullPreferences' userPreferences
     viewPwdHash = UserPwdHash <$> viewPwdHash_ <*> viewPwdSalt_
 
@@ -642,7 +642,7 @@ type GroupInfoRow = (Int64, GroupName, GroupName, Text, Maybe Text, Text, Maybe
 
 type GroupMemberRow = (Int64, Int64, MemberId, VersionChat, VersionChat, GroupMemberRole, GroupMemberCategory, GroupMemberStatus, BoolInt, Maybe MemberRestrictionStatus) :. (Maybe Int64, Maybe GroupMemberId, ContactName, Maybe ContactId, ProfileId) :. ProfileRow :. (UTCTime, UTCTime) :. (Maybe UTCTime, Int64, Int64, Int64, Maybe UTCTime)
 
-type ProfileRow = (ProfileId, ContactName, Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, LocalAlias, Maybe Preferences)
+type ProfileRow = (ProfileId, ContactName, Text, Maybe Text, Maybe ImageData, Maybe ConnLinkContact, Maybe ChatPeerType, LocalAlias, Maybe Preferences)
 
 toGroupInfo :: VersionRangeChat -> Int64 -> [ChatTagId] -> GroupInfoRow -> GroupInfo
 toGroupInfo vr userContactId chatTags ((groupId, localDisplayName, displayName, fullName, shortDescr, localAlias, description, image) :. (enableNtfs_, sendRcpts, BI favorite, groupPreferences, memberAdmission) :. (createdAt, updatedAt, chatTs, userMemberProfileSentAt) :. preparedGroupRow :. businessRow :. (uiThemes, customData, chatItemTTL, membersRequireAttention, viaGroupLinkUri) :. userMemberRow) =
@@ -681,8 +681,8 @@ toGroupMember userContactId ((groupMemberId, groupId, memberId, minVer, maxVer,
    in GroupMember {..}
 
 rowToLocalProfile :: ProfileRow -> LocalProfile
-rowToLocalProfile (profileId, displayName, fullName, shortDescr, image, contactLink, localAlias, preferences) =
-  LocalProfile {profileId, displayName, fullName, shortDescr, image, contactLink, localAlias, preferences}
+rowToLocalProfile (profileId, displayName, fullName, shortDescr, image, contactLink, peerType, localAlias, preferences) =
+  LocalProfile {profileId, displayName, fullName, shortDescr, image, contactLink, peerType, localAlias, preferences}
 
 toBusinessChatInfo :: BusinessChatInfoRow -> Maybe BusinessChatInfo
 toBusinessChatInfo (Just chatType, Just businessId, Just customerId) = Just BusinessChatInfo {chatType, businessId, customerId}
@@ -702,7 +702,7 @@ groupInfoQuery =
       -- GroupMember - membership
       mu.group_member_id, mu.group_id, mu.member_id, mu.peer_chat_min_version, mu.peer_chat_max_version, mu.member_role, mu.member_category,
       mu.member_status, mu.show_messages, mu.member_restriction, mu.invited_by, mu.invited_by_group_member_id, mu.local_display_name, mu.contact_id, mu.contact_profile_id, pu.contact_profile_id,
-      pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.local_alias, pu.preferences,
+      pu.display_name, pu.full_name, pu.short_descr, pu.image, pu.contact_link, pu.chat_peer_type, pu.local_alias, pu.preferences,
       mu.created_at, mu.updated_at,
       mu.support_chat_ts, mu.support_chat_items_unread, mu.support_chat_items_member_attention, mu.support_chat_items_mentions, mu.support_chat_last_msg_from_member_ts
     FROM groups g
diff --git a/src/Simplex/Chat/Types.hs b/src/Simplex/Chat/Types.hs
index 964d8f083b..5d25ae64e3 100644
--- a/src/Simplex/Chat/Types.hs
+++ b/src/Simplex/Chat/Types.hs
@@ -616,7 +616,10 @@ contactUserPreferences user userPreferences contactPreferences connectedIncognit
       fullDelete = pref SCFFullDelete,
       reactions = pref SCFReactions,
       voice = pref SCFVoice,
-      calls = pref SCFCalls
+      files = pref SCFFiles,
+      calls = pref SCFCalls,
+      sessions = pref SCFSessions,
+      commands = contactPreferences >>= commands_
     }
   where
     pref :: FeatureI f => SChatFeature f -> ContactUserPreference (FeaturePreference f)
@@ -642,7 +645,8 @@ data Profile = Profile
     shortDescr :: Maybe Text, -- short description limited to 160 characters
     image :: Maybe ImageData,
     contactLink :: Maybe ConnLinkContact,
-    preferences :: Maybe Preferences
+    preferences :: Maybe Preferences,
+    peerType :: Maybe ChatPeerType
     -- fields that should not be read into this data type to prevent sending them as part of profile to contacts:
     -- - contact_profile_id
     -- - incognito
@@ -650,9 +654,32 @@ data Profile = Profile
   }
   deriving (Eq, Show)
 
+data ChatPeerType = CPTHuman | CPTBot
+  deriving (Eq, Show)
+
+instance FromJSON ChatPeerType where
+  parseJSON = textParseJSON "ChatPeerType"
+
+instance ToJSON ChatPeerType where
+  toJSON = J.String . textEncode
+  toEncoding = JE.text . textEncode
+
+instance FromField ChatPeerType where fromField = fromTextField_ textDecode
+
+instance ToField ChatPeerType where toField = toField . textEncode
+
+instance TextEncoding ChatPeerType where
+  textDecode = \case
+    "human" -> Just CPTHuman
+    "bot" -> Just CPTBot
+    _ -> Nothing
+  textEncode = \case
+    CPTHuman -> "human"
+    CPTBot -> "bot"
+
 profileFromName :: ContactName -> Profile
 profileFromName displayName =
-  Profile {displayName, fullName = "", shortDescr = Nothing, image = Nothing, contactLink = Nothing, preferences = Nothing}
+  Profile {displayName, fullName = "", shortDescr = Nothing, image = Nothing, contactLink = Nothing, preferences = Nothing, peerType = Nothing}
 
 -- check if profiles match ignoring preferences
 profilesMatch :: LocalProfile -> LocalProfile -> Bool
@@ -662,8 +689,8 @@ profilesMatch
     n1 == n2 && fn1 == fn2 && i1 == i2
 
 redactedMemberProfile :: Profile -> Profile
-redactedMemberProfile Profile {displayName, fullName, shortDescr, image} =
-  Profile {displayName, fullName, shortDescr, image, contactLink = Nothing, preferences = Nothing}
+redactedMemberProfile Profile {displayName, fullName, shortDescr, image, peerType} =
+  Profile {displayName, fullName, shortDescr, image, contactLink = Nothing, preferences = Nothing, peerType}
 
 data IncognitoProfile = NewIncognito Profile | ExistingIncognito LocalProfile
 
@@ -700,6 +727,7 @@ data LocalProfile = LocalProfile
     image :: Maybe ImageData,
     contactLink :: Maybe ConnLinkContact,
     preferences :: Maybe Preferences,
+    peerType :: Maybe ChatPeerType,
     localAlias :: LocalAlias
   }
   deriving (Eq, Show)
@@ -708,12 +736,12 @@ localProfileId :: LocalProfile -> ProfileId
 localProfileId LocalProfile {profileId} = profileId
 
 toLocalProfile :: ProfileId -> Profile -> LocalAlias -> LocalProfile
-toLocalProfile profileId Profile {displayName, fullName, shortDescr, image, contactLink, preferences} localAlias =
-  LocalProfile {profileId, displayName, fullName, shortDescr, image, contactLink, preferences, localAlias}
+toLocalProfile profileId Profile {displayName, fullName, shortDescr, image, contactLink, preferences, peerType} localAlias =
+  LocalProfile {profileId, displayName, fullName, shortDescr, image, contactLink, preferences, peerType, localAlias}
 
 fromLocalProfile :: LocalProfile -> Profile
-fromLocalProfile LocalProfile {displayName, fullName, shortDescr, image, contactLink, preferences} =
-  Profile {displayName, fullName, shortDescr, image, contactLink, preferences}
+fromLocalProfile LocalProfile {displayName, fullName, shortDescr, image, contactLink, preferences, peerType} =
+  Profile {displayName, fullName, shortDescr, image, contactLink, preferences, peerType}
 
 data GroupProfile = GroupProfile
   { displayName :: GroupName,
diff --git a/src/Simplex/Chat/Types/Preferences.hs b/src/Simplex/Chat/Types/Preferences.hs
index e036f43a0e..af56b6c658 100644
--- a/src/Simplex/Chat/Types/Preferences.hs
+++ b/src/Simplex/Chat/Types/Preferences.hs
@@ -1,9 +1,11 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE NamedFieldPuns #-}
@@ -34,7 +36,7 @@ import Simplex.Chat.Options.DB (FromField (..), ToField (..))
 import Simplex.Chat.Types.Shared
 import Simplex.Messaging.Agent.Store.DB (blobFieldDecoder, fromTextField_)
 import Simplex.Messaging.Encoding.String
-import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, sumTypeJSON)
+import Simplex.Messaging.Parsers (defaultJSON, dropPrefix, enumJSON, sumTypeJSON, taggedObjectJSON)
 import Simplex.Messaging.Util (decodeJSON, encodeJSON, safeDecodeUtf8, (<$?>))
 
 data ChatFeature
@@ -42,7 +44,9 @@ data ChatFeature
   | CFFullDelete
   | CFReactions
   | CFVoice
+  | CFFiles
   | CFCalls
+  | CFSessions
   deriving (Show)
 
 data SChatFeature (f :: ChatFeature) where
@@ -50,7 +54,9 @@ data SChatFeature (f :: ChatFeature) where
   SCFFullDelete :: SChatFeature 'CFFullDelete
   SCFReactions :: SChatFeature 'CFReactions
   SCFVoice :: SChatFeature 'CFVoice
+  SCFFiles :: SChatFeature 'CFFiles
   SCFCalls :: SChatFeature 'CFCalls
+  SCFSessions :: SChatFeature 'CFSessions
 
 deriving instance Show (SChatFeature f)
 
@@ -64,7 +70,9 @@ chatFeatureNameText = \case
   CFFullDelete -> "Full deletion"
   CFReactions -> "Message reactions"
   CFVoice -> "Voice messages"
+  CFFiles -> "Files and media"
   CFCalls -> "Audio/video calls"
+  CFSessions -> "Chat sessions"
 
 chatFeatureNameText' :: SChatFeature f -> Text
 chatFeatureNameText' = chatFeatureNameText . chatFeature
@@ -75,16 +83,20 @@ allChatFeatures =
     ACF SCFFullDelete,
     ACF SCFReactions,
     ACF SCFVoice,
+    -- ACF SCFFiles, -- not showing in the UI
     ACF SCFCalls
+    -- ACF SCFSessions -- not showing in the UI
   ]
 
 chatPrefSel :: SChatFeature f -> Preferences -> Maybe (FeaturePreference f)
-chatPrefSel f Preferences {timedMessages, fullDelete, reactions, voice, calls} = case f of
+chatPrefSel f Preferences {timedMessages, fullDelete, reactions, voice, files, calls, sessions} = case f of
   SCFTimedMessages -> timedMessages
   SCFFullDelete -> fullDelete
   SCFReactions -> reactions
   SCFVoice -> voice
+  SCFFiles -> files
   SCFCalls -> calls
+  SCFSessions -> sessions
 
 chatFeature :: SChatFeature f -> ChatFeature
 chatFeature = \case
@@ -92,7 +104,9 @@ chatFeature = \case
   SCFFullDelete -> CFFullDelete
   SCFReactions -> CFReactions
   SCFVoice -> CFVoice
+  SCFFiles -> CFFiles
   SCFCalls -> CFCalls
+  SCFSessions -> CFSessions
 
 class PreferenceI p where
   getPreference :: SChatFeature f -> p -> FeaturePreference f
@@ -104,12 +118,14 @@ instance PreferenceI (Maybe Preferences) where
   getPreference f prefs = fromMaybe (getPreference f defaultChatPrefs) (chatPrefSel f =<< prefs)
 
 instance PreferenceI FullPreferences where
-  getPreference f FullPreferences {timedMessages, fullDelete, reactions, voice, calls} = case f of
+  getPreference f FullPreferences {timedMessages, fullDelete, reactions, voice, files, calls, sessions} = case f of
     SCFTimedMessages -> timedMessages
     SCFFullDelete -> fullDelete
     SCFReactions -> reactions
     SCFVoice -> voice
+    SCFFiles -> files
     SCFCalls -> calls
+    SCFSessions -> sessions
   {-# INLINE getPreference #-}
 
 setPreference :: forall f. FeatureI f => SChatFeature f -> Maybe FeatureAllowed -> Maybe Preferences -> Preferences
@@ -129,7 +145,9 @@ setPreference_ f pref_ prefs =
     SCFFullDelete -> prefs {fullDelete = pref_}
     SCFReactions -> prefs {reactions = pref_}
     SCFVoice -> prefs {voice = pref_}
+    SCFFiles -> prefs {files = pref_}
     SCFCalls -> prefs {calls = pref_}
+    SCFSessions -> prefs {sessions = pref_}
 
 -- collection of optional chat preferences for the user and the contact
 data Preferences = Preferences
@@ -137,10 +155,17 @@ data Preferences = Preferences
     fullDelete :: Maybe FullDeletePreference,
     reactions :: Maybe ReactionsPreference,
     voice :: Maybe VoicePreference,
-    calls :: Maybe CallsPreference
+    files :: Maybe FilesPreference,
+    calls :: Maybe CallsPreference,
+    sessions :: Maybe SessionsPreference,
+    commands :: Maybe [ChatBotCommand]
   }
   deriving (Eq, Show)
 
+class HasCommands p where commands_ :: p -> Maybe [ChatBotCommand]
+
+instance HasCommands Preferences where commands_ Preferences {commands} = commands
+
 data GroupFeature
   = GFTimedMessages
   | GFDirectMessages
@@ -151,6 +176,7 @@ data GroupFeature
   | GFSimplexLinks
   | GFReports
   | GFHistory
+  | GFSessions
   deriving (Show)
 
 data SGroupFeature (f :: GroupFeature) where
@@ -163,6 +189,7 @@ data SGroupFeature (f :: GroupFeature) where
   SGFSimplexLinks :: SGroupFeature 'GFSimplexLinks
   SGFReports :: SGroupFeature 'GFReports
   SGFHistory :: SGroupFeature 'GFHistory
+  SGFSessions :: SGroupFeature 'GFSessions
 
 deriving instance Show (SGroupFeature f)
 
@@ -189,6 +216,7 @@ groupFeatureNameText = \case
   GFSimplexLinks -> "SimpleX links"
   GFReports -> "Member reports"
   GFHistory -> "Recent history"
+  GFSessions -> "Chat sessions"
 
 groupFeatureNameText' :: SGroupFeature f -> Text
 groupFeatureNameText' = groupFeatureNameText . toGroupFeature
@@ -216,7 +244,7 @@ allGroupFeatures =
   ]
 
 groupPrefSel :: SGroupFeature f -> GroupPreferences -> Maybe (GroupFeaturePreference f)
-groupPrefSel f GroupPreferences {timedMessages, directMessages, fullDelete, reactions, voice, files, simplexLinks, reports, history} = case f of
+groupPrefSel f GroupPreferences {timedMessages, directMessages, fullDelete, reactions, voice, files, simplexLinks, reports, history, sessions} = case f of
   SGFTimedMessages -> timedMessages
   SGFDirectMessages -> directMessages
   SGFFullDelete -> fullDelete
@@ -226,6 +254,7 @@ groupPrefSel f GroupPreferences {timedMessages, directMessages, fullDelete, reac
   SGFSimplexLinks -> simplexLinks
   SGFReports -> reports
   SGFHistory -> history
+  SGFSessions -> sessions
 
 toGroupFeature :: SGroupFeature f -> GroupFeature
 toGroupFeature = \case
@@ -238,6 +267,7 @@ toGroupFeature = \case
   SGFSimplexLinks -> GFSimplexLinks
   SGFReports -> GFReports
   SGFHistory -> GFHistory
+  SGFSessions -> GFSessions
 
 class GroupPreferenceI p where
   getGroupPreference :: SGroupFeature f -> p -> GroupFeaturePreference f
@@ -249,7 +279,7 @@ instance GroupPreferenceI (Maybe GroupPreferences) where
   getGroupPreference pt prefs = fromMaybe (getGroupPreference pt defaultGroupPrefs) (groupPrefSel pt =<< prefs)
 
 instance GroupPreferenceI FullGroupPreferences where
-  getGroupPreference f FullGroupPreferences {timedMessages, directMessages, fullDelete, reactions, voice, files, simplexLinks, reports, history} = case f of
+  getGroupPreference f FullGroupPreferences {timedMessages, directMessages, fullDelete, reactions, voice, files, simplexLinks, reports, history, sessions} = case f of
     SGFTimedMessages -> timedMessages
     SGFDirectMessages -> directMessages
     SGFFullDelete -> fullDelete
@@ -259,6 +289,7 @@ instance GroupPreferenceI FullGroupPreferences where
     SGFSimplexLinks -> simplexLinks
     SGFReports -> reports
     SGFHistory -> history
+    SGFSessions -> sessions
   {-# INLINE getGroupPreference #-}
 
 -- collection of optional group preferences
@@ -271,10 +302,26 @@ data GroupPreferences = GroupPreferences
     files :: Maybe FilesGroupPreference,
     simplexLinks :: Maybe SimplexLinksGroupPreference,
     reports :: Maybe ReportsGroupPreference,
-    history :: Maybe HistoryGroupPreference
+    history :: Maybe HistoryGroupPreference,
+    sessions :: Maybe SessionsGroupPreference,
+    commands :: Maybe [ChatBotCommand]
   }
   deriving (Eq, Show)
 
+instance HasCommands GroupPreferences where commands_ GroupPreferences {commands} = commands
+
+data ChatBotCommand
+  = CBCCommand
+      { keyword :: Text, -- "order"
+        label :: Text, -- Information about order
+        params :: Maybe Text -- "<order number>", command is sent on selection if params is absent
+      }
+  | CBCMenu
+      { label :: Text, -- Orders
+        commands :: [ChatBotCommand]
+      }
+  deriving (Eq, Show)
+
 setGroupPreference :: forall f. GroupFeatureNoRoleI f => SGroupFeature f -> GroupFeatureEnabled -> Maybe GroupPreferences -> GroupPreferences
 setGroupPreference f enable prefs_ = setGroupPreference_ f pref prefs
   where
@@ -306,6 +353,7 @@ setGroupPreference_ f pref prefs =
     SGFSimplexLinks -> prefs {simplexLinks = pref}
     SGFReports -> prefs {reports = pref}
     SGFHistory -> prefs {history = pref}
+    SGFSessions -> prefs {sessions = pref}
 
 setGroupTimedMessagesPreference :: TimedMessagesGroupPreference -> Maybe GroupPreferences -> GroupPreferences
 setGroupTimedMessagesPreference pref prefs_ =
@@ -320,10 +368,21 @@ data FullPreferences = FullPreferences
     fullDelete :: FullDeletePreference,
     reactions :: ReactionsPreference,
     voice :: VoicePreference,
-    calls :: CallsPreference
+    files :: FilesPreference,
+    calls :: CallsPreference,
+    sessions :: SessionsPreference,
+    commands :: ListDef ChatBotCommand
   }
   deriving (Eq, Show)
 
+newtype ListDef a = ListDef [a]
+  deriving (Eq, Show)
+  deriving newtype (ToJSON)
+
+instance FromJSON a => FromJSON (ListDef a) where
+  parseJSON v = ListDef <$> parseJSON v
+  omittedField = Just (ListDef [])
+
 -- full collection of group preferences defined in the app - it is used to ensure we include all preferences and to simplify processing
 -- if some of the preferences are not defined in GroupPreferences, defaults from defaultGroupPrefs are used here.
 data FullGroupPreferences = FullGroupPreferences
@@ -335,7 +394,9 @@ data FullGroupPreferences = FullGroupPreferences
     files :: FilesGroupPreference,
     simplexLinks :: SimplexLinksGroupPreference,
     reports :: ReportsGroupPreference,
-    history :: HistoryGroupPreference
+    history :: HistoryGroupPreference,
+    sessions :: SessionsGroupPreference,
+    commands :: ListDef ChatBotCommand
   }
   deriving (Eq, Show)
 
@@ -345,7 +406,10 @@ data ContactUserPreferences = ContactUserPreferences
     fullDelete :: ContactUserPreference FullDeletePreference,
     reactions :: ContactUserPreference ReactionsPreference,
     voice :: ContactUserPreference VoicePreference,
-    calls :: ContactUserPreference CallsPreference
+    files :: ContactUserPreference FilesPreference,
+    calls :: ContactUserPreference CallsPreference,
+    sessions :: ContactUserPreference SessionsPreference,
+    commands :: Maybe [ChatBotCommand]
   }
   deriving (Eq, Show)
 
@@ -360,13 +424,16 @@ data ContactUserPref p = CUPContact {preference :: p} | CUPUser {preference :: p
   deriving (Eq, Show)
 
 toChatPrefs :: FullPreferences -> Preferences
-toChatPrefs FullPreferences {timedMessages, fullDelete, reactions, voice, calls} =
+toChatPrefs FullPreferences {timedMessages, fullDelete, reactions, voice, files, calls, sessions, commands = ListDef cmds} =
   Preferences
     { timedMessages = Just timedMessages,
       fullDelete = Just fullDelete,
       reactions = Just reactions,
       voice = Just voice,
-      calls = Just calls
+      files = Just files,
+      calls = Just calls,
+      sessions = Just sessions,
+      commands = Just cmds
     }
 
 defaultChatPrefs :: FullPreferences
@@ -376,11 +443,14 @@ defaultChatPrefs =
       fullDelete = FullDeletePreference {allow = FANo},
       reactions = ReactionsPreference {allow = FAYes},
       voice = VoicePreference {allow = FAYes},
-      calls = CallsPreference {allow = FAYes}
+      files = FilesPreference {allow = FAAlways},
+      calls = CallsPreference {allow = FAYes},
+      sessions = SessionsPreference {allow = FANo},
+      commands = ListDef []
     }
 
 emptyChatPrefs :: Preferences
-emptyChatPrefs = Preferences Nothing Nothing Nothing Nothing Nothing
+emptyChatPrefs = Preferences Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing
 
 defaultGroupPrefs :: FullGroupPreferences
 defaultGroupPrefs =
@@ -393,19 +463,24 @@ defaultGroupPrefs =
       files = FilesGroupPreference {enable = FEOn, role = Nothing},
       simplexLinks = SimplexLinksGroupPreference {enable = FEOn, role = Nothing},
       reports = ReportsGroupPreference {enable = FEOn},
-      history = HistoryGroupPreference {enable = FEOff}
+      history = HistoryGroupPreference {enable = FEOff},
+      sessions = SessionsGroupPreference {enable = FEOff, role = Nothing},
+      commands = ListDef []
     }
 
 emptyGroupPrefs :: GroupPreferences
-emptyGroupPrefs = GroupPreferences Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing
+emptyGroupPrefs = GroupPreferences Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing
 
 businessGroupPrefs :: Preferences -> GroupPreferences
-businessGroupPrefs Preferences {timedMessages, fullDelete, reactions, voice} =
+businessGroupPrefs Preferences {timedMessages, fullDelete, reactions, voice, files, sessions, commands} =
   defaultBusinessGroupPrefs
     { timedMessages = Just TimedMessagesGroupPreference {enable = maybe FEOff enableFeature timedMessages, ttl = maybe Nothing prefParam timedMessages},
       fullDelete = Just FullDeleteGroupPreference {enable = maybe FEOff enableFeature fullDelete, role = Nothing},
       reactions = Just ReactionsGroupPreference {enable = maybe FEOn enableFeature reactions},
-      voice = Just VoiceGroupPreference {enable = maybe FEOff enableFeature voice, role = Nothing}
+      voice = Just VoiceGroupPreference {enable = maybe FEOff enableFeature voice, role = Nothing},
+      files = Just FilesGroupPreference {enable = maybe FEOff enableFeature files, role = Nothing},
+      sessions = Just SessionsGroupPreference {enable = maybe FEOff enableFeature sessions, role = Nothing},
+      commands
     }
   where
     enableFeature :: FeatureI f => FeaturePreference f -> GroupFeatureEnabled
@@ -424,7 +499,9 @@ defaultBusinessGroupPrefs =
       files = Just $ FilesGroupPreference FEOn Nothing,
       simplexLinks = Just $ SimplexLinksGroupPreference FEOn Nothing,
       reports = Just $ ReportsGroupPreference FEOff,
-      history = Just $ HistoryGroupPreference FEOn
+      history = Just $ HistoryGroupPreference FEOn,
+      sessions = Just $ SessionsGroupPreference FEOn Nothing,
+      commands = Nothing
     }
 
 data TimedMessagesPreference = TimedMessagesPreference
@@ -442,9 +519,15 @@ data ReactionsPreference = ReactionsPreference {allow :: FeatureAllowed}
 data VoicePreference = VoicePreference {allow :: FeatureAllowed}
   deriving (Eq, Show)
 
+data FilesPreference = FilesPreference {allow :: FeatureAllowed}
+  deriving (Eq, Show)
+
 data CallsPreference = CallsPreference {allow :: FeatureAllowed}
   deriving (Eq, Show)
 
+data SessionsPreference = SessionsPreference {allow :: FeatureAllowed}
+  deriving (Eq, Show)
+
 class (Eq (FeaturePreference f), HasField "allow" (FeaturePreference f) FeatureAllowed) => FeatureI f where
   type FeaturePreference (f :: ChatFeature) = p | p -> f
   sFeature :: SChatFeature f
@@ -462,9 +545,15 @@ instance HasField "allow" ReactionsPreference FeatureAllowed where
 instance HasField "allow" VoicePreference FeatureAllowed where
   hasField p@VoicePreference {allow} = (\a -> p {allow = a}, allow)
 
+instance HasField "allow" FilesPreference FeatureAllowed where
+  hasField p@FilesPreference {allow} = (\a -> p {allow = a}, allow)
+
 instance HasField "allow" CallsPreference FeatureAllowed where
   hasField p@CallsPreference {allow} = (\a -> p {allow = a}, allow)
 
+instance HasField "allow" SessionsPreference FeatureAllowed where
+  hasField p@SessionsPreference {allow} = (\a -> p {allow = a}, allow)
+
 instance FeatureI 'CFTimedMessages where
   type FeaturePreference 'CFTimedMessages = TimedMessagesPreference
   sFeature = SCFTimedMessages
@@ -485,11 +574,21 @@ instance FeatureI 'CFVoice where
   sFeature = SCFVoice
   prefParam _ = Nothing
 
+instance FeatureI 'CFFiles where
+  type FeaturePreference 'CFFiles = FilesPreference
+  sFeature = SCFFiles
+  prefParam _ = Nothing
+
 instance FeatureI 'CFCalls where
   type FeaturePreference 'CFCalls = CallsPreference
   sFeature = SCFCalls
   prefParam _ = Nothing
 
+instance FeatureI 'CFSessions where
+  type FeaturePreference 'CFSessions = SessionsPreference
+  sFeature = SCFSessions
+  prefParam _ = Nothing
+
 data GroupPreference = GroupPreference
   {enable :: GroupFeatureEnabled}
   deriving (Eq, Show)
@@ -532,6 +631,10 @@ data HistoryGroupPreference = HistoryGroupPreference
   {enable :: GroupFeatureEnabled}
   deriving (Eq, Show)
 
+data SessionsGroupPreference = SessionsGroupPreference
+  {enable :: GroupFeatureEnabled, role :: Maybe GroupMemberRole}
+  deriving (Eq, Show)
+
 class (Eq (GroupFeaturePreference f), HasField "enable" (GroupFeaturePreference f) GroupFeatureEnabled) => GroupFeatureI f where
   type GroupFeaturePreference (f :: GroupFeature) = p | p -> f
   sGroupFeature :: SGroupFeature f
@@ -572,6 +675,9 @@ instance HasField "enable" ReportsGroupPreference GroupFeatureEnabled where
 instance HasField "enable" HistoryGroupPreference GroupFeatureEnabled where
   hasField p@HistoryGroupPreference {enable} = (\e -> p {enable = e}, enable)
 
+instance HasField "enable" SessionsGroupPreference GroupFeatureEnabled where
+  hasField p@SessionsGroupPreference {enable} = (\e -> p {enable = e}, enable)
+
 instance GroupFeatureI 'GFTimedMessages where
   type GroupFeaturePreference 'GFTimedMessages = TimedMessagesGroupPreference
   sGroupFeature = SGFTimedMessages
@@ -626,6 +732,12 @@ instance GroupFeatureI 'GFHistory where
   groupPrefParam _ = Nothing
   groupPrefRole _ = Nothing
 
+instance GroupFeatureI 'GFSessions where
+  type GroupFeaturePreference 'GFSessions = SessionsGroupPreference
+  sGroupFeature = SGFSessions
+  groupPrefParam _ = Nothing
+  groupPrefRole SessionsGroupPreference {role} = role
+
 instance GroupFeatureNoRoleI 'GFTimedMessages
 
 instance GroupFeatureNoRoleI 'GFFullDelete
@@ -651,6 +763,9 @@ instance HasField "role" FilesGroupPreference (Maybe GroupMemberRole) where
 instance HasField "role" SimplexLinksGroupPreference (Maybe GroupMemberRole) where
   hasField p@SimplexLinksGroupPreference {role} = (\r -> p {role = r}, role)
 
+instance HasField "role" SessionsGroupPreference (Maybe GroupMemberRole) where
+  hasField p@SessionsGroupPreference {role} = (\r -> p {role = r}, role)
+
 instance GroupFeatureRoleI 'GFDirectMessages
 
 instance GroupFeatureRoleI 'GFFullDelete
@@ -661,6 +776,8 @@ instance GroupFeatureRoleI 'GFFiles
 
 instance GroupFeatureRoleI 'GFSimplexLinks
 
+instance GroupFeatureRoleI 'GFSessions
+
 groupPrefStateText :: HasField "enable" p GroupFeatureEnabled => GroupFeature -> p -> Maybe Int -> Maybe GroupMemberRole -> Text
 groupPrefStateText feature pref param role =
   let enabled = getField @"enable" pref
@@ -770,7 +887,10 @@ mergePreferences contactPrefs userPreferences canFallbackToUserTTL =
       fullDelete = pref SCFFullDelete,
       reactions = pref SCFReactions,
       voice = pref SCFVoice,
-      calls = pref SCFCalls
+      files = pref SCFFiles,
+      calls = pref SCFCalls,
+      sessions = pref SCFSessions,
+      commands = ListDef $ fromMaybe [] $ (contactPrefs >>= commands_) <|> (userPreferences >>= commands_)
     }
   where
     timedPrefNoTTLFallback :: TimedMessagesPreference
@@ -794,7 +914,10 @@ fullPreferences' userPreferences =
       fullDelete = pref SCFFullDelete,
       reactions = pref SCFReactions,
       voice = pref SCFVoice,
-      calls = pref SCFCalls
+      files = pref SCFFiles,
+      calls = pref SCFCalls,
+      sessions = pref SCFSessions,
+      commands = ListDef $ fromMaybe [] $ userPreferences >>= commands_
     }
   where
     pref :: SChatFeature f -> FeaturePreference f
@@ -813,14 +936,16 @@ mergeGroupPreferences groupPreferences =
       files = pref SGFFiles,
       simplexLinks = pref SGFSimplexLinks,
       reports = pref SGFReports,
-      history = pref SGFHistory
+      history = pref SGFHistory,
+      sessions = pref SGFSessions,
+      commands = ListDef $ fromMaybe [] $ groupPreferences >>= commands_
     }
   where
     pref :: SGroupFeature f -> GroupFeaturePreference f
     pref pt = fromMaybe (getGroupPreference pt defaultGroupPrefs) (groupPreferences >>= groupPrefSel pt)
 
 toGroupPreferences :: FullGroupPreferences -> GroupPreferences
-toGroupPreferences groupPreferences =
+toGroupPreferences groupPreferences@FullGroupPreferences {commands = ListDef cmds} =
   GroupPreferences
     { timedMessages = pref SGFTimedMessages,
       directMessages = pref SGFDirectMessages,
@@ -830,7 +955,9 @@ toGroupPreferences groupPreferences =
       files = pref SGFFiles,
       simplexLinks = pref SGFSimplexLinks,
       reports = pref SGFReports,
-      history = pref SGFHistory
+      history = pref SGFHistory,
+      sessions = pref SGFSessions,
+      commands = Just cmds
     }
   where
     pref :: SGroupFeature f -> Maybe (GroupFeaturePreference f)
@@ -893,12 +1020,14 @@ preferenceState pref =
    in (allow, param)
 
 getContactUserPreference :: SChatFeature f -> ContactUserPreferences -> ContactUserPreference (FeaturePreference f)
-getContactUserPreference f ContactUserPreferences {timedMessages, fullDelete, reactions, voice, calls} = case f of
+getContactUserPreference f ContactUserPreferences {timedMessages, fullDelete, reactions, voice, files, calls, sessions} = case f of
   SCFTimedMessages -> timedMessages
   SCFFullDelete -> fullDelete
   SCFReactions -> reactions
   SCFVoice -> voice
+  SCFFiles -> files
   SCFCalls -> calls
+  SCFSessions -> sessions
 
 $(J.deriveJSON (enumJSON $ dropPrefix "CF") ''ChatFeature)
 
@@ -912,8 +1041,22 @@ $(J.deriveJSON defaultJSON ''ReactionsPreference)
 
 $(J.deriveJSON defaultJSON ''VoicePreference)
 
+$(J.deriveToJSON defaultJSON ''FilesPreference)
+
+instance FromJSON FilesPreference where
+  parseJSON v = $(J.mkParseJSON defaultJSON ''FilesPreference) v
+  omittedField = Just FilesPreference {allow = FAAlways}
+
 $(J.deriveJSON defaultJSON ''CallsPreference)
 
+$(J.deriveToJSON defaultJSON ''SessionsPreference)
+
+instance FromJSON SessionsPreference where
+  parseJSON v = $(J.mkParseJSON defaultJSON ''SessionsPreference) v
+  omittedField = Just SessionsPreference {allow = FANo}
+
+$(J.deriveJSON (taggedObjectJSON $ dropPrefix "CBC") ''ChatBotCommand)
+
 $(J.deriveJSON defaultJSON ''Preferences)
 
 instance ToField Preferences where
@@ -942,6 +1085,12 @@ $(J.deriveJSON defaultJSON ''ReportsGroupPreference)
 
 $(J.deriveJSON defaultJSON ''HistoryGroupPreference)
 
+$(J.deriveToJSON defaultJSON ''SessionsGroupPreference)
+
+instance FromJSON SessionsGroupPreference where
+  parseJSON v = $(J.mkParseJSON defaultJSON ''SessionsGroupPreference) v
+  omittedField = Just SessionsGroupPreference {enable = FEOff, role = Nothing}
+
 $(J.deriveJSON defaultJSON ''GroupPreferences)
 
 instance ToField GroupPreferences where
diff --git a/src/Simplex/Chat/View.hs b/src/Simplex/Chat/View.hs
index b376993beb..6fef6cc204 100644
--- a/src/Simplex/Chat/View.hs
+++ b/src/Simplex/Chat/View.hs
@@ -19,7 +19,7 @@ import qualified Data.Aeson as J
 import qualified Data.Aeson.TH as JQ
 import qualified Data.ByteString.Char8 as B
 import qualified Data.ByteString.Lazy.Char8 as LB
-import Data.Char (toUpper)
+import Data.Char (isSpace, toUpper)
 import Data.Function (on)
 import Data.Int (Int64)
 import Data.List (groupBy, intercalate, intersperse, partition, sortOn)
@@ -607,8 +607,8 @@ viewUsersList us =
    in if null ss then ["no users"] else ss
   where
     ldn (UserInfo User {localDisplayName = n} _) = T.toLower n
-    userInfo (UserInfo User {localDisplayName = n, profile = LocalProfile {fullName, shortDescr}, activeUser, showNtfs, viewPwdHash} count)
-      | activeUser || isNothing viewPwdHash = Just $ ttyFullName n fullName shortDescr <> infoStr
+    userInfo (UserInfo User {localDisplayName = n, profile = LocalProfile {fullName, shortDescr, peerType}, activeUser, showNtfs, viewPwdHash} count)
+      | activeUser || isNothing viewPwdHash = Just $ ttyFullName n fullName shortDescr <> infoStr <> bot
       | otherwise = Nothing
       where
         infoStr = if null info then "" else " (" <> mconcat (intersperse ", " info) <> ")"
@@ -617,6 +617,9 @@ viewUsersList us =
             <> [highlight' "hidden" | isJust viewPwdHash]
             <> ["muted" | not showNtfs]
             <> [plain ("unread: " <> show count) | count /= 0]
+        bot = case peerType of
+          Just CPTBot -> " (bot)"
+          _ -> ""
 
 viewGroupSubscribed :: GroupName -> [StyledString]
 viewGroupSubscribed g = [ttyGroup g <> ": connected to server(s)"]
@@ -1429,11 +1432,24 @@ viewContactAndMemberAssociated ct g m ct' =
   ]
 
 viewUserProfile :: Profile -> [StyledString]
-viewUserProfile Profile {displayName, fullName, shortDescr} =
-  [ "user profile: " <> ttyFullName displayName fullName shortDescr,
-    "use " <> highlight' "/p <name> [<bio>]" <> " to change it",
-    "(the updated profile will be sent to all your contacts)"
+viewUserProfile Profile {displayName, fullName, shortDescr, peerType, preferences} =
+  [ "user profile: " <> ttyFullName displayName fullName shortDescr <> bot,
+    "use " <> highlight' "/p <name> [<bio>]" <> " to change it"
   ]
+    ++ viewCommands
+  where
+    viewCommands = case preferences of
+      Just Preferences {commands = Just cmds} | peerType == Just CPTBot && not (null cmds) ->
+        ("Bot commands:" : concatMap (viewCommand "") cmds)
+          ++ ["use " <> highlight' "/set bot commands ..." <> " or " <> highlight' "/delete bot commands"]
+      _ -> []
+    viewCommand indent = \case
+      CBCCommand {label, keyword, params} ->
+        [plain $ indent <> quoted label <> ":/" <> quoted (keyword <> maybe "" (" " <>) params)]
+      CBCMenu {label, commands} ->
+        (plain (indent <> quoted label <> ":{") : concatMap (viewCommand $ "  " <> indent) commands) ++ [plain $ indent <> "}"]
+    quoted s = if T.any isSpace s then "'" <> s <> "'" else s
+    bot = if peerType == Just CPTBot then " (bot)" else ""
 
 viewUserPrivacy :: User -> User -> [StyledString]
 viewUserPrivacy User {userId} User {userId = userId', localDisplayName = n', showNtfs, viewPwdHash} =
diff --git a/tests/Bots/BroadcastTests.hs b/tests/Bots/BroadcastTests.hs
index 500e30183b..bec8d99f7e 100644
--- a/tests/Bots/BroadcastTests.hs
+++ b/tests/Bots/BroadcastTests.hs
@@ -16,7 +16,7 @@ import Simplex.Chat.Bot.KnownContacts
 import Simplex.Chat.Core
 import Simplex.Chat.Options (CoreChatOpts (..))
 import Simplex.Chat.Options.DB
-import Simplex.Chat.Types (Profile (..))
+import Simplex.Chat.Types (ChatPeerType (..), Profile (..))
 import Test.Hspec hiding (it)
 #if !defined(dbPostgres)
 import System.FilePath ((</>))
@@ -33,7 +33,7 @@ withBroadcastBot opts test =
     bot = simplexChatCore testCfg (mkChatOpts opts) $ broadcastBot opts
 
 broadcastBotProfile :: Profile
-broadcastBotProfile = Profile {displayName = "broadcast_bot", fullName = "Broadcast Bot", shortDescr = Nothing, image = Nothing, contactLink = Nothing, preferences = Nothing}
+broadcastBotProfile = Profile {displayName = "broadcast_bot", fullName = "Broadcast Bot", shortDescr = Nothing, image = Nothing, contactLink = Nothing, peerType = Just CPTBot, preferences = Nothing}
 
 mkBotOpts :: TestParams -> [KnownContact] -> BroadcastBotOpts
 mkBotOpts ps publishers =
@@ -49,6 +49,7 @@ mkBotOpts ps publishers =
 #endif
 
           },
+      botDisplayName = "broadcast_bot",
       publishers,
       welcomeMessage = defaultWelcomeMessage publishers,
       prohibitedMessage = defaultWelcomeMessage publishers
diff --git a/tests/Bots/DirectoryTests.hs b/tests/Bots/DirectoryTests.hs
index 6a4ff8f5fc..a69f57cfca 100644
--- a/tests/Bots/DirectoryTests.hs
+++ b/tests/Bots/DirectoryTests.hs
@@ -24,7 +24,7 @@ import Simplex.Chat.Core
 import qualified Simplex.Chat.Markdown as MD
 import Simplex.Chat.Options (CoreChatOpts (..))
 import Simplex.Chat.Options.DB
-import Simplex.Chat.Types (Profile (..))
+import Simplex.Chat.Types (ChatPeerType (..), Profile (..))
 import Simplex.Chat.Types.Shared (GroupMemberRole (..))
 import System.FilePath ((</>))
 import Test.Hspec hiding (it)
@@ -75,7 +75,7 @@ directoryServiceTests = do
     it "should accept some incorrect spellings" testCaptcha
 
 directoryProfile :: Profile
-directoryProfile = Profile {displayName = "SimpleX-Directory", fullName = "", shortDescr = Nothing, image = Nothing, contactLink = Nothing, preferences = Nothing}
+directoryProfile = Profile {displayName = "SimpleX-Directory", fullName = "", shortDescr = Nothing, image = Nothing, contactLink = Nothing, peerType = Just CPTBot, preferences = Nothing}
 
 mkDirectoryOpts :: TestParams -> [KnownContact] -> Maybe KnownGroup -> DirectoryOpts
 mkDirectoryOpts TestParams {tmpPath = ps} superUsers ownersGroup =
diff --git a/tests/ChatClient.hs b/tests/ChatClient.hs
index efcab785a9..b868671f3b 100644
--- a/tests/ChatClient.hs
+++ b/tests/ChatClient.hs
@@ -117,6 +117,7 @@ testOpts =
       autoAcceptFileSize = 0,
       muteNotifications = True,
       markRead = True,
+      createBot = Nothing,
       maintenance = False
     }
 
diff --git a/tests/ChatTests/Local.hs b/tests/ChatTests/Local.hs
index 38d8220a9e..985586816f 100644
--- a/tests/ChatTests/Local.hs
+++ b/tests/ChatTests/Local.hs
@@ -67,7 +67,6 @@ testUserNotes ps = withNewTestChat ps "alice" aliceProfile $ \alice -> do
   alice ##> "/create user secret"
   alice <## "user profile: secret"
   alice <## "use /p <name> [<bio>] to change it"
-  alice <## "(the updated profile will be sent to all your contacts)"
 
   alice ##> "/tail"
 
diff --git a/tests/ChatTests/Profiles.hs b/tests/ChatTests/Profiles.hs
index f043e1c425..07bf06b61b 100644
--- a/tests/ChatTests/Profiles.hs
+++ b/tests/ChatTests/Profiles.hs
@@ -19,7 +19,7 @@ import qualified Data.Attoparsec.ByteString.Char8 as A
 import qualified Data.ByteString.Char8 as B
 import qualified Data.Text as T
 import Simplex.Chat.Controller (ChatConfig (..), ChatHooks (..), defaultChatHooks)
-import Simplex.Chat.Options
+import Simplex.Chat.Options (ChatOpts (..), CoreChatOpts (..))
 import Simplex.Chat.Protocol (currentChatVersion)
 import Simplex.Chat.Store.Shared (createContact)
 import Simplex.Chat.Types (ConnStatus (..), Profile (..), GroupRejectionReason (..))
@@ -153,7 +153,6 @@ testUpdateProfile =
       alice ##> "/p"
       alice <## "user profile: alice (Alice)"
       alice <## "use /p <name> [<bio>] to change it"
-      alice <## "(the updated profile will be sent to all your contacts)"
       alice ##> "/p alice"
       concurrentlyN_
         [ alice <## "user bio removed (your 2 contacts are notified)",
@@ -281,7 +280,7 @@ testMultiWordProfileNames =
     aliceProfile' = baseProfile {displayName = "Alice Jones"}
     bobProfile' = baseProfile {displayName = "Bob James"}
     cathProfile' = baseProfile {displayName = "Cath Johnson"}
-    baseProfile = Profile {displayName = "", fullName = "", shortDescr = Nothing, image = Nothing, contactLink = Nothing, preferences = defaultPrefs}
+    baseProfile = Profile {displayName = "", fullName = "", shortDescr = Nothing, image = Nothing, contactLink = Nothing, peerType = Nothing, preferences = defaultPrefs}
 
 testUserContactLink :: HasCallStack => TestParams -> IO ()
 testUserContactLink =
@@ -964,27 +963,27 @@ testBusinessUpdateProfiles = testChatCfg4 testCfgNoShortLinks businessProfile al
           cath <## "use @business <message> to send messages"
           cath <# "#alisa business> hey"
       ]
-    biz ##> "/set voice #alisa on"
+    biz ##> "/set delete #alisa on"
     biz <## "updated group preferences:"
-    biz <## "Voice messages: on"
+    biz <## "Full deletion: on"
     concurrentlyN_
       [ do
           alice <## "business_1 updated group #business:"
           alice <## "updated group preferences:"
-          alice <## "Voice messages: on",
+          alice <## "Full deletion: on",
         do
           bob <## "business_1 updated group #business:"
           bob <## "updated group preferences:"
-          bob <## "Voice messages: on",
+          bob <## "Full deletion: on",
         do
           cath <## "business updated group #alisa:"
           cath <## "updated group preferences:"
-          cath <## "Voice messages: on"
+          cath <## "Full deletion: on"
       ]
-    biz #$> ("/_get chat #1 count=1", chat, [(1, "Voice messages: on")])
-    alice #$> ("/_get chat #1 count=1", chat, [(0, "Voice messages: on")])
-    bob #$> ("/_get chat #1 count=1", chat, [(0, "Voice messages: on")])
-    cath #$> ("/_get chat #1 count=1", chat, [(0, "Voice messages: on")])
+    biz #$> ("/_get chat #1 count=1", chat, [(1, "Full deletion: on")])
+    alice #$> ("/_get chat #1 count=1", chat, [(0, "Full deletion: on")])
+    bob #$> ("/_get chat #1 count=1", chat, [(0, "Full deletion: on")])
+    cath #$> ("/_get chat #1 count=1", chat, [(0, "Full deletion: on")])
 
 testPlanAddressOkKnown :: HasCallStack => TestParams -> IO ()
 testPlanAddressOkKnown =
@@ -2789,7 +2788,6 @@ testSetUITheme =
     userInfo a name = do
       a <## ("user profile: " <> name)
       a <## "use /p <name> [<bio>] to change it"
-      a <## "(the updated profile will be sent to all your contacts)"
     contactInfo a = do
       a <## "contact ID: 2"
       a <## "receiving messages via: localhost"
diff --git a/tests/ChatTests/Utils.hs b/tests/ChatTests/Utils.hs
index 179aad65bb..8650b80b06 100644
--- a/tests/ChatTests/Utils.hs
+++ b/tests/ChatTests/Utils.hs
@@ -78,7 +78,7 @@ businessProfile :: Profile
 businessProfile = mkProfile "biz" "Biz Inc" Nothing
 
 mkProfile :: T.Text -> T.Text -> Maybe ImageData -> Profile
-mkProfile displayName descr image = Profile {displayName, fullName = "", shortDescr = Just descr, image, contactLink = Nothing, preferences = defaultPrefs}
+mkProfile displayName descr image = Profile {displayName, fullName = "", shortDescr = Just descr, image, contactLink = Nothing, peerType = Nothing, preferences = defaultPrefs}
 
 it :: HasCallStack => String -> (TestParams -> Expectation) -> SpecWith (Arg (TestParams -> Expectation))
 it name test =
@@ -699,7 +699,6 @@ showActiveUser :: HasCallStack => TestCC -> String -> Expectation
 showActiveUser cc name = do
   cc <## ("user profile: " <> name)
   cc <## "use /p <name> [<bio>] to change it"
-  cc <## "(the updated profile will be sent to all your contacts)"
 
 connectUsersNoShortLink :: HasCallStack => TestCC -> TestCC -> IO ()
 connectUsersNoShortLink cc1 cc2 = connectUsers_ cc1 cc2 True
diff --git a/tests/JSONFixtures.hs b/tests/JSONFixtures.hs
index baf9dde8c1..a2577240a1 100644
--- a/tests/JSONFixtures.hs
+++ b/tests/JSONFixtures.hs
@@ -17,10 +17,10 @@ activeUserExistsTagged :: LB.ByteString
 activeUserExistsTagged = "{\"error\":{\"type\":\"error\",\"errorType\":{\"type\":\"userExists\",\"contactName\":\"alice\"}}}"
 
 activeUserSwift :: LB.ByteString
-activeUserSwift = "{\"result\":{\"_owsf\":true,\"activeUser\":{\"user\":{\"userId\":1,\"agentUserId\":\"1\",\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"profileId\":1,\"displayName\":\"alice\",\"fullName\":\"\",\"shortDescr\":\"Alice\",\"localAlias\":\"\"},\"fullPreferences\":{\"timedMessages\":{\"allow\":\"yes\"},\"fullDelete\":{\"allow\":\"no\"},\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"},\"calls\":{\"allow\":\"yes\"}},\"activeUser\":true,\"activeOrder\":1,\"showNtfs\":true,\"sendRcptsContacts\":true,\"sendRcptsSmallGroups\":true,\"autoAcceptMemberContacts\":false}}}}"
+activeUserSwift = "{\"result\":{\"_owsf\":true,\"activeUser\":{\"user\":{\"userId\":1,\"agentUserId\":\"1\",\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"profileId\":1,\"displayName\":\"alice\",\"fullName\":\"\",\"shortDescr\":\"Alice\",\"localAlias\":\"\"},\"fullPreferences\":{\"timedMessages\":{\"allow\":\"yes\"},\"fullDelete\":{\"allow\":\"no\"},\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"},\"files\":{\"allow\":\"always\"},\"calls\":{\"allow\":\"yes\"},\"sessions\":{\"allow\":\"no\"},\"commands\":[]},\"activeUser\":true,\"activeOrder\":1,\"showNtfs\":true,\"sendRcptsContacts\":true,\"sendRcptsSmallGroups\":true,\"autoAcceptMemberContacts\":false}}}}"
 
 activeUserTagged :: LB.ByteString
-activeUserTagged = "{\"result\":{\"type\":\"activeUser\",\"user\":{\"userId\":1,\"agentUserId\":\"1\",\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"profileId\":1,\"displayName\":\"alice\",\"fullName\":\"\",\"shortDescr\":\"Alice\",\"localAlias\":\"\"},\"fullPreferences\":{\"timedMessages\":{\"allow\":\"yes\"},\"fullDelete\":{\"allow\":\"no\"},\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"},\"calls\":{\"allow\":\"yes\"}},\"activeUser\":true,\"activeOrder\":1,\"showNtfs\":true,\"sendRcptsContacts\":true,\"sendRcptsSmallGroups\":true,\"autoAcceptMemberContacts\":false}}}"
+activeUserTagged = "{\"result\":{\"type\":\"activeUser\",\"user\":{\"userId\":1,\"agentUserId\":\"1\",\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"profileId\":1,\"displayName\":\"alice\",\"fullName\":\"\",\"shortDescr\":\"Alice\",\"localAlias\":\"\"},\"fullPreferences\":{\"timedMessages\":{\"allow\":\"yes\"},\"fullDelete\":{\"allow\":\"no\"},\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"},\"files\":{\"allow\":\"always\"},\"calls\":{\"allow\":\"yes\"},\"sessions\":{\"allow\":\"no\"},\"commands\":[]},\"activeUser\":true,\"activeOrder\":1,\"showNtfs\":true,\"sendRcptsContacts\":true,\"sendRcptsSmallGroups\":true,\"autoAcceptMemberContacts\":false}}}"
 
 chatStartedSwift :: LB.ByteString
 chatStartedSwift = "{\"result\":{\"_owsf\":true,\"chatStarted\":{}}}"
@@ -35,7 +35,7 @@ networkStatusesTagged :: LB.ByteString
 networkStatusesTagged = "{\"result\":{\"type\":\"networkStatuses\",\"user_\":" <> userJSON <> ",\"networkStatuses\":[]}}"
 
 userJSON :: LB.ByteString
-userJSON = "{\"userId\":1,\"agentUserId\":\"1\",\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"profileId\":1,\"displayName\":\"alice\",\"fullName\":\"\",\"shortDescr\":\"Alice\",\"localAlias\":\"\"},\"fullPreferences\":{\"timedMessages\":{\"allow\":\"yes\"},\"fullDelete\":{\"allow\":\"no\"},\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"},\"calls\":{\"allow\":\"yes\"}},\"activeUser\":true,\"activeOrder\":1,\"showNtfs\":true,\"sendRcptsContacts\":true,\"sendRcptsSmallGroups\":true,\"autoAcceptMemberContacts\":false}"
+userJSON = "{\"userId\":1,\"agentUserId\":\"1\",\"userContactId\":1,\"localDisplayName\":\"alice\",\"profile\":{\"profileId\":1,\"displayName\":\"alice\",\"fullName\":\"\",\"shortDescr\":\"Alice\",\"localAlias\":\"\"},\"fullPreferences\":{\"timedMessages\":{\"allow\":\"yes\"},\"fullDelete\":{\"allow\":\"no\"},\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"},\"files\":{\"allow\":\"always\"},\"calls\":{\"allow\":\"yes\"},\"sessions\":{\"allow\":\"no\"},\"commands\":[]},\"activeUser\":true,\"activeOrder\":1,\"showNtfs\":true,\"sendRcptsContacts\":true,\"sendRcptsSmallGroups\":true,\"autoAcceptMemberContacts\":false}"
 
 memberSubSummarySwift :: LB.ByteString
 memberSubSummarySwift = "{\"result\":{\"_owsf\":true,\"memberSubSummary\":{\"user\":" <> userJSON <> ",\"memberSubscriptions\":[]}}}"
diff --git a/tests/MarkdownTests.hs b/tests/MarkdownTests.hs
index 05d5362cf1..31dc3d668a 100644
--- a/tests/MarkdownTests.hs
+++ b/tests/MarkdownTests.hs
@@ -23,6 +23,7 @@ markdownTests = do
   textWithEmail
   textWithPhone
   textWithMentions
+  textWithCommands
   multilineMarkdownList
 
 infixr 1 ==>, <==, <==>, ==>>, <<==, <<==>>
@@ -287,9 +288,36 @@ textWithMentions = describe "text with mentions" do
     "hello @bob @ alice!" <==> "hello " <> mention "bob" "@bob" <> " @ alice!"
     "hello @bob @" <==> "hello " <> mention "bob" "@bob" <> " @"
 
+command :: Text -> Text -> Markdown
+command = Markdown . Just . Command
+
+textWithCommands :: Spec
+textWithCommands = describe "text with commands" do
+  it "correct markdown" do
+    "/start" <==> command "start" "/start"
+    "send /help" <==> "send " <> command "help" "/help"
+    "send /help !" <==> "send " <> command "help" "/help" <> " !"
+    "send /help!" <==> "send " <> command "help" "/help" <> "!"
+    "send /help..." <==> "send " <> command "help" "/help" <> "..."
+    "send /'filter 1'" <==> "send " <> command "filter 1" "/'filter 1'"
+    "/'filter 1'" <==> command "filter 1" "/'filter 1'"
+    "/filter 1" <==> command "filter" "/filter" <> " 1" -- this is parsed as full command by parseMaybeMarkdownList
+    "send /'filter 1'." <==> "send " <> command "filter 1" "/'filter 1'" <> "."
+    "send /'filter 1.'!" <==> "send " <> command "filter 1." "/'filter 1.'" <> "!"
+  it "ignored as markdown" $ do
+    "send /'filter 1" <==> "send /'filter 1"
+    "send /help /'filter 1" <==> "send " <> command "help" "/help" <> " /'filter 1"
+    "send / help!" <==> "send / help!"
+    "send /help / filter" <==> "send " <> command "help" "/help" <> " / filter"
+    "send /help /" <==> "send " <> command "help" "/help" <> " /"
+    "send /he?lp" <==> "send /he?lp"
+
 uri' :: Text -> FormattedText
 uri' = FormattedText $ Just Uri
 
+command' :: Text -> Text -> FormattedText
+command' = FormattedText . Just . Command
+
 multilineMarkdownList :: Spec
 multilineMarkdownList = describe "multiline markdown" do
   it "correct markdown" do
@@ -305,3 +333,6 @@ multilineMarkdownList = describe "multiline markdown" do
         [ FormattedText (simplexLinkFormat XLInvitation ("simplex:" <> inv) ["smp.simplex.im"]) ("https://simplex.chat" <> inv),
           "\ntext"
         ]
+  it "command markdown" do
+    "/link 1" <<==>> [command' "link 1" "/link 1"]
+    " /link 1" <<==>> [command' "link 1" " /link 1"]
diff --git a/tests/ProtocolTests.hs b/tests/ProtocolTests.hs
index b42c838c8a..2332fa429c 100644
--- a/tests/ProtocolTests.hs
+++ b/tests/ProtocolTests.hs
@@ -98,13 +98,13 @@ s #==# msg = do
   s ==# msg
 
 testChatPreferences :: Maybe Preferences
-testChatPreferences = Just Preferences {voice = Just VoicePreference {allow = FAYes}, fullDelete = Nothing, timedMessages = Nothing, calls = Nothing, reactions = Just ReactionsPreference {allow = FAYes}}
+testChatPreferences = Just Preferences {voice = Just VoicePreference {allow = FAYes}, files = Nothing, fullDelete = Nothing, timedMessages = Nothing, calls = Nothing, reactions = Just ReactionsPreference {allow = FAYes}, sessions = Nothing, commands = Nothing}
 
 testGroupPreferences :: Maybe GroupPreferences
-testGroupPreferences = Just GroupPreferences {timedMessages = Nothing, directMessages = Nothing, reactions = Just ReactionsGroupPreference {enable = FEOn}, voice = Just VoiceGroupPreference {enable = FEOn, role = Nothing}, files = Nothing, fullDelete = Nothing, simplexLinks = Nothing, history = Nothing, reports = Nothing}
+testGroupPreferences = Just GroupPreferences {timedMessages = Nothing, directMessages = Nothing, reactions = Just ReactionsGroupPreference {enable = FEOn}, voice = Just VoiceGroupPreference {enable = FEOn, role = Nothing}, files = Nothing, fullDelete = Nothing, simplexLinks = Nothing, history = Nothing, reports = Nothing, sessions = Nothing, commands = Nothing}
 
 testProfile :: Profile
-testProfile = Profile {displayName = "alice", fullName = "Alice", shortDescr = Nothing, image = Just (ImageData "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII="), contactLink = Nothing, preferences = testChatPreferences}
+testProfile = Profile {displayName = "alice", fullName = "Alice", shortDescr = Nothing, image = Just (ImageData "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII="), peerType = Nothing, contactLink = Nothing, preferences = testChatPreferences}
 
 testGroupProfile :: GroupProfile
 testGroupProfile = GroupProfile {displayName = "team", fullName = "Team", description = Nothing, shortDescr = Nothing, image = Nothing, groupPreferences = testGroupPreferences, memberAdmission = Nothing}
@@ -223,7 +223,7 @@ decodeChatMessageTest = describe "Chat message encoding/decoding" $ do
       #==# XInfo testProfile
   it "x.info with empty full name" $
     "{\"v\":\"1\",\"event\":\"x.info\",\"params\":{\"profile\":{\"fullName\":\"\",\"displayName\":\"alice\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
-      #==# XInfo Profile {displayName = "alice", fullName = "", shortDescr = Nothing, image = Nothing, contactLink = Nothing, preferences = testChatPreferences}
+      #==# XInfo Profile {displayName = "alice", fullName = "", shortDescr = Nothing, image = Nothing, contactLink = Nothing, peerType = Nothing, preferences = testChatPreferences}
   it "x.contact with xContactId" $
     "{\"v\":\"1\",\"event\":\"x.contact\",\"params\":{\"contactReqId\":\"AQIDBA==\",\"profile\":{\"fullName\":\"Alice\",\"displayName\":\"alice\",\"image\":\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAgAAAAIAQMAAAD+wSzIAAAABlBMVEX///+/v7+jQ3Y5AAAADklEQVQI12P4AIX8EAgALgAD/aNpbtEAAAAASUVORK5CYII=\",\"preferences\":{\"reactions\":{\"allow\":\"yes\"},\"voice\":{\"allow\":\"yes\"}}}}}"
       #==# XContact testProfile (Just $ XContactId "\1\2\3\4") Nothing Nothing
diff --git a/tests/RemoteTests.hs b/tests/RemoteTests.hs
index f869c68227..e21f97d69e 100644
--- a/tests/RemoteTests.hs
+++ b/tests/RemoteTests.hs
@@ -449,7 +449,6 @@ multipleProfilesTest = testChat4 aliceProfile aliceDesktopProfile bobProfile cat
   desktop ##> "/create user desk_bottom"
   desktop <## "user profile: desk_bottom"
   desktop <## "use /p <name> [<bio>] to change it"
-  desktop <## "(the updated profile will be sent to all your contacts)"
   desktop ##> "/users"
   desktop <## "alice_desktop (Alice Desktop)"
   desktop <## "desk_bottom (active)"
@@ -462,7 +461,6 @@ multipleProfilesTest = testChat4 aliceProfile aliceDesktopProfile bobProfile cat
   desktop ##> "/create user alt_alice"
   desktop <## "user profile: alt_alice"
   desktop <## "use /p <name> [<bio>] to change it"
-  desktop <## "(the updated profile will be sent to all your contacts)"
 
   desktop ##> "/users"
   desktop <## "alice (Alice)"
@@ -471,7 +469,6 @@ multipleProfilesTest = testChat4 aliceProfile aliceDesktopProfile bobProfile cat
   desktop ##> "/user"
   desktop <## "user profile: alt_alice"
   desktop <## "use /p <name> [<bio>] to change it"
-  desktop <## "(the updated profile will be sent to all your contacts)"
 
   bob #> "@alice hi"
   (desktop, "[user: alice] ") ^<# "bob> hi"
@@ -484,7 +481,6 @@ multipleProfilesTest = testChat4 aliceProfile aliceDesktopProfile bobProfile cat
   desktop ##> "/user"
   desktop <## "user profile: desk_bottom"
   desktop <## "use /p <name> [<bio>] to change it"
-  desktop <## "(the updated profile will be sent to all your contacts)"
 
   bob #> "@alice hey"
   (desktop, "[remote: 1, user: alice] ") ^<# "bob> hey"
diff --git a/tests/Test.hs b/tests/Test.hs
index eb7803abdd..46106f0654 100644
--- a/tests/Test.hs
+++ b/tests/Test.hs
@@ -59,7 +59,7 @@ main = do
             "src/Simplex/Chat/Store/Postgres/Migrations/chat_schema.sql"
 #else
       describe "Schema dump" schemaDumpTest
-      describe "API docs" apiDocsTest
+      describe "Bot API docs" apiDocsTest
       around tmpBracket $ describe "WebRTC encryption" webRTCTests
 #endif
       describe "SimpleX chat markdown" markdownTests