From 23a5ad38fb7ee128e79a53001d2bd8ba95eab1e4 Mon Sep 17 00:00:00 2001
From: ultradyper <ultradyper@users.noreply.github.com>
Date: Thu, 13 Aug 2026 08:52:33 +0000
Subject: [PATCH 1/2] =?UTF-8?q?add:=20=D0=93=D1=80=D1=83=D0=BF=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B5=20=D1=87=D0=B0=D1=82=D1=8B=20=D0=B2=20=D0=9D?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BE=D0=9C=D0=B0=D0=BA=D1=81=20=D0=B8=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D1=80=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D0=BA=20=D0=BD=D0=BE=D0=B2=D0=BE=D1=81=D1=82=D1=8F=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Публичные и закрытые группы: создание, приглашения с подтверждением,
вступление в публичные из списка чатов, выход, исключение и удаление
владельцем, передача владения. Комментарии к статьям в картридже Новости
с кулдауном и лимитами. Админ-логи на все операции.

Co-authored-by: Fineter75 <266314686+Fineter75@users.noreply.github.com>
---
 .../Cartridges/CreateGroupPopup.xaml          |  49 ++
 .../Cartridges/CreateGroupPopup.xaml.cs       |  93 +++
 .../Cartridges/GroupMembersPopup.xaml         |  53 ++
 .../Cartridges/GroupMembersPopup.xaml.cs      | 128 ++++
 .../Cartridges/NanoChatEntry.xaml             |  49 +-
 .../Cartridges/NanoChatEntry.xaml.cs          |  66 +-
 .../Cartridges/NanoChatLookupView.xaml.cs     |  29 +-
 .../Cartridges/NanoChatMessageBubble.xaml     |   8 +
 .../Cartridges/NanoChatMessageBubble.xaml.cs  |  10 +-
 .../CartridgeLoader/Cartridges/NanoChatUi.cs  |  12 +-
 .../Cartridges/NanoChatUiFragment.xaml        |  17 +
 .../Cartridges/NanoChatUiFragment.xaml.cs     | 252 ++++++-
 .../Cartridges/LogProbeUiFragment.xaml.cs     |  45 ++
 .../Cartridges/NewsReaderUi.cs                |   9 +-
 .../Cartridges/NewsReaderUiFragment.xaml      |  52 +-
 .../Cartridges/NewsReaderUiFragment.xaml.cs   | 174 ++++-
 .../LogProbeCartridgeSystem.NanoChat.cs       |   6 +
 .../Cartridges/NanoChatCartridgeSystem.cs     | 689 +++++++++++++++++-
 Content.Server/ADT/NanoChat/NanoChatSystem.cs |  15 +
 .../NewsReaderCartridgeComponent.cs           |   9 +
 .../MassMedia/Systems/NewsSystem.cs           |  71 +-
 .../Cartridges/NanoChatGroup.cs               | 156 ++++
 .../Cartridges/NanoChatUiMessageEvent.cs      |  46 +-
 .../Cartridges/NanoChatUiState.cs             |  12 +
 .../ADT/NanoChat/NanoChatCardComponent.cs     |  18 +
 .../ADT/NanoChat/SharedNanoChatSystem.cs      | 115 +++
 .../Cartridges/NewsReaderUiMessageEvent.cs    |  12 +-
 .../MassMedia/Systems/SharedNewsSystem.cs     |  20 +
 Resources/Locale/en-US/ADT/nanochat/ui.ftl    |  73 ++
 Resources/Locale/en-US/mass-media/news-ui.ftl |   4 +
 Resources/Locale/ru-RU/ADT/nanochat/ui.ftl    |  46 ++
 Resources/Locale/ru-RU/mass-media/news-ui.ftl |   4 +
 32 files changed, 2276 insertions(+), 66 deletions(-)
 create mode 100644 Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml
 create mode 100644 Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml.cs
 create mode 100644 Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml
 create mode 100644 Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml.cs
 create mode 100644 Content.Shared/ADT/CartridgeLoader/Cartridges/NanoChatGroup.cs
 create mode 100644 Resources/Locale/en-US/ADT/nanochat/ui.ftl

diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml b/Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml
new file mode 100644
index 00000000000..e484f447378
--- /dev/null
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml
@@ -0,0 +1,49 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+               Title="{Loc nano-chat-group-create-title}"
+               MinSize="360 420">
+    <PanelContainer StyleClasses="AngleRect">
+        <BoxContainer Orientation="Vertical" Margin="4">
+            <!-- Name input -->
+            <BoxContainer Orientation="Vertical" Margin="0 4">
+                <Label Text="{Loc nano-chat-group-name-label}"
+                       StyleClasses="LabelHeading" />
+                <PanelContainer StyleClasses="ButtonSquare">
+                    <LineEdit Name="NameInput"
+                              PlaceHolder="{Loc nano-chat-group-name-placeholder}" />
+                </PanelContainer>
+            </BoxContainer>
+
+            <!-- Public toggle -->
+            <CheckBox Name="PublicCheck"
+                      Text="{Loc nano-chat-group-public}"
+                      Margin="0 4" />
+
+            <!-- Members -->
+            <Label Text="{Loc nano-chat-group-select-members}"
+                   StyleClasses="LabelHeading"
+                   Margin="0 4 0 0" />
+            <ScrollContainer VerticalExpand="True"
+                             HorizontalExpand="True"
+                             MinSize="0 160">
+                <BoxContainer Name="MembersList"
+                              Orientation="Vertical"
+                              HorizontalExpand="True" />
+            </ScrollContainer>
+
+            <!-- Action buttons -->
+            <BoxContainer Orientation="Horizontal"
+                          HorizontalAlignment="Right"
+                          Margin="0 8 0 0">
+                <Button Name="CancelButton"
+                        Text="{Loc nano-chat-cancel}"
+                        StyleClasses="OpenRight"
+                        MinSize="80 0" />
+                <Button Name="CreateButton"
+                        Text="{Loc nano-chat-create}"
+                        StyleClasses="OpenLeft"
+                        MinSize="80 0"
+                        Disabled="True" />
+            </BoxContainer>
+        </BoxContainer>
+    </PanelContainer>
+</DefaultWindow>
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml.cs b/Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml.cs
new file mode 100644
index 00000000000..07f105ab724
--- /dev/null
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml.cs
@@ -0,0 +1,93 @@
+using System.Linq;
+using Content.Shared.ADT.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.ADT.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class CreateGroupPopup : DefaultWindow
+{
+    private const int MaxNameLength = 32;
+
+    private readonly List<(uint number, CheckBox box)> _memberBoxes = new();
+    private uint _ownNumber;
+
+    public event Action<string, bool, List<uint>>? OnGroupCreated;
+
+    public CreateGroupPopup()
+    {
+        RobustXamlLoader.Load(this);
+
+        ContentsContainer.Margin = new Thickness(3);
+
+        CancelButton.OnPressed += _ => Close();
+        CreateButton.OnPressed += _ => CreateGroup();
+
+        NameInput.OnTextChanged += args =>
+        {
+            if (args.Text.Length > MaxNameLength)
+                NameInput.Text = args.Text[..MaxNameLength];
+            ValidateInputs();
+        };
+
+        PublicCheck.OnToggled += _ => ValidateInputs();
+    }
+
+    public void SetContacts(List<NanoChatRecipient>? contacts, uint ownNumber)
+    {
+        _memberBoxes.Clear();
+        MembersList.RemoveAllChildren();
+        _ownNumber = ownNumber;
+
+        if (contacts == null)
+            return;
+
+        foreach (var contact in contacts.OrderBy(c => c.Name))
+        {
+            if (contact.Number == _ownNumber)
+                continue;
+
+            var box = new CheckBox()
+            {
+                Text = $"{contact.Name} (#{contact.Number:D4})",
+                HorizontalExpand = true,
+            };
+            box.OnToggled += _ => ValidateInputs();
+            MembersList.AddChild(box);
+            _memberBoxes.Add((contact.Number, box));
+        }
+    }
+
+    public void ClearInputs()
+    {
+        NameInput.Text = string.Empty;
+        PublicCheck.Pressed = false;
+        foreach (var (_, box) in _memberBoxes)
+            box.Pressed = false;
+        ValidateInputs();
+    }
+
+    private void ValidateInputs()
+    {
+        CreateButton.Disabled = string.IsNullOrWhiteSpace(NameInput.Text);
+    }
+
+    private void CreateGroup()
+    {
+        var name = NameInput.Text.Trim();
+        if (string.IsNullOrWhiteSpace(name))
+            return;
+
+        var members = _memberBoxes
+            .Where(m => m.box.Pressed)
+            .Select(m => m.number)
+            .ToList();
+
+        OnGroupCreated?.Invoke(name, PublicCheck.Pressed, members);
+        Close();
+    }
+
+}
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml b/Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml
new file mode 100644
index 00000000000..ea7231feb82
--- /dev/null
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml
@@ -0,0 +1,53 @@
+<DefaultWindow xmlns="https://spacestation14.io"
+               Title="{Loc nano-chat-group-members}"
+               MinSize="360 440">
+    <PanelContainer StyleClasses="AngleRect">
+        <BoxContainer Orientation="Vertical" Margin="4">
+            <Label Name="GroupNameLabel"
+                   StyleClasses="LabelHeading"
+                   HorizontalAlignment="Center"
+                   Margin="0 4" />
+
+            <Label Text="{Loc nano-chat-group-member-list}"
+                   StyleClasses="LabelSubText"
+                   Margin="0 2 0 0" />
+            <ScrollContainer VerticalExpand="True"
+                             HorizontalExpand="True"
+                             MinSize="0 180">
+                <BoxContainer Name="MembersList"
+                              Orientation="Vertical"
+                              HorizontalExpand="True" />
+            </ScrollContainer>
+
+            <!-- Invite row -->
+            <BoxContainer Orientation="Horizontal"
+                          Margin="0 6 0 0">
+                <PanelContainer StyleClasses="ButtonSquare"
+                                HorizontalExpand="True">
+                    <LineEdit Name="InviteNumberInput"
+                              PlaceHolder="{Loc nano-chat-group-invite-placeholder}" />
+                </PanelContainer>
+                <Button Name="InviteButton"
+                        Text="{Loc nano-chat-group-invite}"
+                        StyleClasses="OpenLeft"
+                        MinSize="96 0"
+                        Disabled="True" />
+            </BoxContainer>
+
+            <!-- Action buttons -->
+            <BoxContainer Orientation="Horizontal"
+                          HorizontalAlignment="Right"
+                          Margin="0 8 0 0">
+                <Button Name="LeaveButton"
+                        Text="{Loc nano-chat-group-leave}"
+                        StyleClasses="OpenRight"
+                        MinSize="110 0" />
+                <Button Name="DeleteGroupButton"
+                        Text="{Loc nano-chat-group-delete}"
+                        StyleClasses="OpenLeft"
+                        MinSize="110 0"
+                        Visible="False" />
+            </BoxContainer>
+        </BoxContainer>
+    </PanelContainer>
+</DefaultWindow>
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml.cs b/Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml.cs
new file mode 100644
index 00000000000..8b235108e73
--- /dev/null
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml.cs
@@ -0,0 +1,128 @@
+using System.Linq;
+using System.Numerics;
+using Content.Shared.ADT.CartridgeLoader.Cartridges;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client.ADT.CartridgeLoader.Cartridges;
+
+[GenerateTypedNameReferences]
+public sealed partial class GroupMembersPopup : DefaultWindow
+{
+    private uint _groupNumber;
+    private uint _ownNumber;
+    private bool _isOwner;
+
+    public uint GroupNumber => _groupNumber;
+
+    public event Action<uint>? OnInvite;
+    public event Action<uint>? OnKick;
+    public event Action? OnLeave;
+    public event Action? OnDelete;
+
+    public GroupMembersPopup()
+    {
+        RobustXamlLoader.Load(this);
+
+        ContentsContainer.Margin = new Thickness(3);
+
+        LeaveButton.OnPressed += _ =>
+        {
+            OnLeave?.Invoke();
+            Close();
+        };
+        DeleteGroupButton.OnPressed += _ =>
+        {
+            OnDelete?.Invoke();
+            Close();
+        };
+        InviteButton.OnPressed += _ => Invite();
+        InviteNumberInput.OnTextChanged += args =>
+        {
+            if (args.Text.Length > 4)
+                InviteNumberInput.Text = args.Text[..4];
+
+            var digits = string.Concat(args.Text.Where(char.IsDigit));
+            if (digits != args.Text)
+                InviteNumberInput.Text = digits;
+
+            InviteButton.Disabled = !uint.TryParse(InviteNumberInput.Text, out _);
+        };
+        InviteNumberInput.OnTextEntered += _ => Invite();
+    }
+
+    public void SetGroup(NanoChatGroup group, uint ownNumber)
+    {
+        _groupNumber = group.Number;
+        _ownNumber = ownNumber;
+        _isOwner = group.Owner == ownNumber;
+
+        GroupNameLabel.Text = group.Name + "  (" +
+            Loc.GetString("nano-chat-group-members-count", ("count", group.Members.Count)) + ")";
+        DeleteGroupButton.Visible = _isOwner;
+        LeaveButton.Text = Loc.GetString(_isOwner ? "nano-chat-group-leave-owner" : "nano-chat-group-leave");
+
+        MembersList.RemoveAllChildren();
+        foreach (var member in group.Members.OrderBy(m => m.Name))
+        {
+            var nameLabel = new Label()
+            {
+                Text = member.Name + (string.IsNullOrEmpty(member.JobTitle) ? "" : $" ({member.JobTitle})") + $" #{member.Number:D4}",
+                HorizontalExpand = true,
+                ClipText = true,
+            };
+
+            var panel = new PanelContainer()
+            {
+                HorizontalExpand = true,
+            };
+            var row = new BoxContainer()
+            {
+                Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                HorizontalExpand = true,
+                VerticalAlignment = VAlignment.Center,
+            };
+            row.AddChild(nameLabel);
+
+            if (_isOwner && member.Number != ownNumber)
+            {
+                var kickButton = new Button()
+                {
+                    Text = Loc.GetString("nano-chat-group-kick"),
+                    MinSize = new Vector2(80, 28),
+                    MaxSize = new Vector2(80, 28),
+                    Margin = new Thickness(4, 0, 0, 0),
+                };
+                kickButton.AddStyleClass("OpenBoth");
+                var memberNumber = member.Number;
+                kickButton.OnPressed += _ =>
+                {
+                    OnKick?.Invoke(memberNumber);
+                    Close();
+                };
+                row.AddChild(kickButton);
+            }
+
+            panel.AddChild(row);
+            MembersList.AddChild(panel);
+        }
+
+        InviteNumberInput.Text = string.Empty;
+        InviteButton.Disabled = true;
+    }
+
+    private void Invite()
+    {
+        if (!uint.TryParse(InviteNumberInput.Text, out var number))
+            return;
+
+        if (number == _ownNumber)
+            return;
+
+        OnInvite?.Invoke(number);
+        InviteNumberInput.Text = string.Empty;
+        InviteButton.Disabled = true;
+    }
+}
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatEntry.xaml b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatEntry.xaml
index 0b136133624..546148c8690 100644
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatEntry.xaml
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatEntry.xaml
@@ -1,7 +1,10 @@
 <BoxContainer
     xmlns="https://spacestation14.io"
     xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    Orientation="Vertical"
     HorizontalExpand="True">
+
+    <!-- Clickable chat row for DMs and joined groups -->
     <Button Name="ChatButton"
             StyleClasses="ButtonSquare"
             HorizontalExpand="True"
@@ -37,7 +40,7 @@
                                HorizontalAlignment="Center"
                                VerticalAlignment="Center"
                                Margin="0 -2 0 0" />
-                <Label Name="JobLabel"
+                <Label Name="SubLabel"
                        StyleClasses="LabelSubText"
                        HorizontalExpand="True"
                        ClipText="False"
@@ -45,4 +48,48 @@
             </BoxContainer>
         </BoxContainer>
     </Button>
+
+    <!-- Info row for public groups and invites: name + action buttons stacked -->
+    <PanelContainer Name="InfoPanel"
+                    StyleClasses="ButtonSquare"
+                    HorizontalExpand="True"
+                    Margin="0 1"
+                    Visible="False">
+        <BoxContainer Orientation="Vertical"
+                      HorizontalExpand="True"
+                      Margin="6 4">
+            <RichTextLabel Name="InfoNameLabel"
+                           StyleClasses="LabelHeading"
+                           HorizontalExpand="True"
+                           HorizontalAlignment="Center"
+                           Margin="0 -2 0 0" />
+            <Label Name="InfoSubLabel"
+                   StyleClasses="LabelSubText"
+                   HorizontalExpand="True"
+                   HorizontalAlignment="Left"
+                   ClipText="True" />
+            <BoxContainer Name="ActionButtons"
+                          Orientation="Vertical"
+                          HorizontalExpand="True"
+                          Margin="0 3 0 0">
+                <Button Name="JoinButton"
+                        Text="{Loc nano-chat-group-join}"
+                        HorizontalExpand="True"
+                        MinHeight="28"
+                        StyleClasses="OpenBoth" />
+                <Button Name="AcceptButton"
+                        Text="{Loc nano-chat-group-accept}"
+                        HorizontalExpand="True"
+                        MinHeight="28"
+                        Margin="0 2 0 0"
+                        StyleClasses="OpenBoth" />
+                <Button Name="DeclineButton"
+                        Text="{Loc nano-chat-group-decline}"
+                        HorizontalExpand="True"
+                        MinHeight="28"
+                        Margin="0 2 0 0"
+                        StyleClasses="OpenBoth" />
+            </BoxContainer>
+        </BoxContainer>
+    </PanelContainer>
 </BoxContainer>
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
index f58a122d3f4..94acdf3c9fe 100644
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatEntry.xaml.cs
@@ -9,15 +9,75 @@ namespace Content.Client.ADT.CartridgeLoader.Cartridges;
 public sealed partial class NanoChatEntry : BoxContainer
 {
     public event Action<uint>? OnPressed;
+    public event Action<uint>? OnJoinPressed;
+    public event Action<uint>? OnAcceptPressed;
+    public event Action<uint>? OnDeclinePressed;
+
     private uint _number;
     private Action<EventArgs>? _pressHandler;
 
     public NanoChatEntry()
     {
         RobustXamlLoader.Load(this);
+
+        JoinButton.OnPressed += _ => OnJoinPressed?.Invoke(_number);
+        AcceptButton.OnPressed += _ => OnAcceptPressed?.Invoke(_number);
+        DeclineButton.OnPressed += _ => OnDeclinePressed?.Invoke(_number);
     }
 
     public void SetRecipient(NanoChatRecipient recipient, uint number, bool isSelected)
+    {
+        SetupButton(number, isSelected);
+
+        NameLabel.Text = recipient.Name;
+        SubLabel.Text = recipient.JobTitle ?? "";
+        SubLabel.Visible = !string.IsNullOrEmpty(recipient.JobTitle);
+        UnreadIndicator.Visible = recipient.HasUnread;
+        ActionButtons.Visible = false;
+    }
+
+    public void SetGroup(NanoChatGroup group, uint number, bool isSelected)
+    {
+        SetupButton(number, isSelected);
+
+        NameLabel.Text = group.Name;
+        SubLabel.Text = Loc.GetString("nano-chat-group-members-count", ("count", group.Members.Count));
+        SubLabel.Visible = true;
+        UnreadIndicator.Visible = group.HasUnread;
+        ActionButtons.Visible = false;
+    }
+
+    public void SetPublicGroup(NanoChatGroupInfo group, uint number)
+    {
+        _number = number;
+        ChatButton.Visible = false;
+        InfoPanel.Visible = true;
+
+        InfoNameLabel.Text = group.Name;
+        InfoSubLabel.Text = Loc.GetString("nano-chat-public-group-info",
+            ("count", group.MemberCount),
+            ("owner", group.OwnerName ?? Loc.GetString("nano-chat-group-unknown-owner")));
+        ActionButtons.Visible = true;
+        JoinButton.Visible = true;
+        AcceptButton.Visible = false;
+        DeclineButton.Visible = false;
+    }
+
+    public void SetInvite(NanoChatGroupInvite invite, uint number)
+    {
+        _number = number;
+        ChatButton.Visible = false;
+        InfoPanel.Visible = true;
+
+        InfoNameLabel.Text = invite.GroupName;
+        InfoSubLabel.Text = Loc.GetString("nano-chat-invite-row", ("from", invite.FromName));
+        ActionButtons.Visible = true;
+        JoinButton.Visible = false;
+        AcceptButton.Visible = true;
+        DeclineButton.Visible = true;
+    }
+
+    private void SetupButton(uint number, bool isSelected)
     {
         // Remove old handler if it exists
         if (_pressHandler != null)
@@ -29,11 +89,7 @@ public void SetRecipient(NanoChatRecipient recipient, uint number, bool isSelect
         _pressHandler = _ => OnPressed?.Invoke(_number);
         ChatButton.OnPressed += _pressHandler;
 
-        NameLabel.Text = recipient.Name;
-        JobLabel.Text = recipient.JobTitle ?? "";
-        JobLabel.Visible = !string.IsNullOrEmpty(recipient.JobTitle);
-        UnreadIndicator.Visible = recipient.HasUnread;
-
         ChatButton.ModulateSelfOverride = isSelected ? NanoChatMessageBubble.OwnMessageColor : null;
+        ChatButton.Disabled = false;
     }
 }
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatLookupView.xaml.cs b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatLookupView.xaml.cs
index 03d83207e61..a70bbad560d 100644
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatLookupView.xaml.cs
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatLookupView.xaml.cs
@@ -13,11 +13,25 @@ public NanoChatLookupView()
     {
         RobustXamlLoader.Load(this);
     }
+
     public event Action<NanoChatRecipient>? OnStartChat;
+    public event Action? OnCreateGroupRequest;
 
     public void UpdateContactList(NanoChatUiState state)
     {
         ContactsList.RemoveAllChildren();
+
+        // Create group button
+        var createGroupButton = new Button()
+        {
+            Text = Loc.GetString("nano-chat-create-group"),
+            HorizontalExpand = true,
+            StyleClasses = { "OpenBoth" },
+            Margin = new Thickness(0, 0, 0, 4),
+        };
+        createGroupButton.OnPressed += _ => OnCreateGroupRequest?.Invoke();
+        ContactsList.AddChild(createGroupButton);
+
         if (state.Contacts is not { } contacts)
         {
             ContactsList.AddChild(new Label() { Text = Loc.GetString("nano-chat-look-up-no-server") });
@@ -48,7 +62,7 @@ public void UpdateContactList(NanoChatUiState state)
                 ToolTip = Loc.GetString("nano-chat-new-chat"),
             };
             startChatButton.AddStyleClass("OpenBoth");
-            if (contact.Number == state.OwnNumber || state.Recipients.ContainsKey(contact.Number) || state.MaxRecipients <= state.Recipients.Count)
+            if (contact.Number == state.OwnNumber || state.Recipients.ContainsKey(contact.Number) || state.MaxRecipients <= state.Recipients.Count + state.Groups.Count)
             {
                 startChatButton.Disabled = true;
             }
@@ -58,10 +72,17 @@ public void UpdateContactList(NanoChatUiState state)
             {
                 HorizontalExpand = true,
             };
+            var row = new BoxContainer()
+            {
+                Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                HorizontalExpand = true,
+                VerticalAlignment = VAlignment.Center,
+            };
 
-            panel.AddChild(nameLabel);
-            panel.AddChild(numberLabel);
-            panel.AddChild(startChatButton);
+            row.AddChild(nameLabel);
+            row.AddChild(numberLabel);
+            row.AddChild(startChatButton);
+            panel.AddChild(row);
 
             var styleClass = idx % 2 == 0 ? "PanelBackgroundBaseDark" : "PanelBackgroundLight";
             panel.StyleClasses.Add(styleClass);
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml
index 6137b2ca69b..94bb67e107c 100644
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml
@@ -2,8 +2,16 @@
     xmlns="https://spacestation14.io"
     xmlns:cartridges="clr-namespace:Content.Client.ADT.CartridgeLoader.Cartridges"
     xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
+    Orientation="Vertical"
     HorizontalExpand="True">
 
+    <!-- Sender name, shown above the bubble in group chats -->
+    <Label Name="SenderNameLabel"
+           StyleClasses="LabelSmall"
+           HorizontalExpand="True"
+           Margin="16 0 16 3"
+           Visible="False" />
+
     <BoxContainer Name="MessageContainer"
                   Orientation="Horizontal"
                   HorizontalExpand="True">
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml.cs b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml.cs
index ffb20239e21..3484d50bdf2 100644
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml.cs
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatMessageBubble.xaml.cs
@@ -21,11 +21,19 @@ public NanoChatMessageBubble()
         RobustXamlLoader.Load(this);
     }
 
-    public void SetMessage(NanoChatMessage message, bool isOwnMessage)
+    public void SetMessage(NanoChatMessage message, bool isOwnMessage, string? senderName = null)
     {
         if (MessagePanel.PanelOverride is not StyleBoxFlat)
             return;
 
+        // In group chats show the sender's name above other players' messages.
+        SenderNameLabel.Visible = !isOwnMessage && senderName != null;
+        if (SenderNameLabel.Visible)
+        {
+            SenderNameLabel.Text = senderName;
+            SenderNameLabel.Modulate = new Color(0.72f, 0.9f, 0.72f);
+        }
+
         // Configure message appearance
         var style = (StyleBoxFlat)MessagePanel.PanelOverride;
         style.BackgroundColor = isOwnMessage ? OwnMessageColor : OtherMessageColor;
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUi.cs b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUi.cs
index 316d5b2b04d..2332b8e2b17 100644
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUi.cs
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUi.cs
@@ -18,9 +18,9 @@ public override void Setup(BoundUserInterface userInterface, EntityUid? fragment
     {
         _fragment = new NanoChatUiFragment();
 
-        _fragment.OnMessageSent += (type, number, content, job) =>
+        _fragment.OnMessageSent += nanoChatMessage =>
         {
-            SendNanoChatUiMessage(type, number, content, job, userInterface);
+            SendNanoChatUiMessage(nanoChatMessage, userInterface);
         };
     }
 
@@ -30,14 +30,10 @@ public override void UpdateState(BoundUserInterfaceState state)
             _fragment?.UpdateState(cast);
     }
 
-    private static void SendNanoChatUiMessage(NanoChatUiMessageType type,
-        uint? number,
-        string? content,
-        string? job,
+    private static void SendNanoChatUiMessage(NanoChatUiMessageEvent nanoChatMessage,
         BoundUserInterface userInterface)
     {
-        var nanoChatMessage = new NanoChatUiMessageEvent(type, number, content, job);
         var message = new CartridgeUiMessage(nanoChatMessage);
         userInterface.SendMessage(message);
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
index 20b0556dc94..148c16cf5ef 100644
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
@@ -34,6 +34,17 @@
                        StyleClasses="LabelSubText"
                        VerticalAlignment="Center"
                        Margin="0 0 8 0" />
+                <Button Name="MembersButton"
+                        MaxSize="32 32"
+                        Visible="False"
+                        StyleClasses="OpenBoth"
+                        Margin="0 0 4 0"
+                        ToolTip="{Loc nano-chat-group-members}">
+                    <TextureRect StyleClasses="ButtonSquare"
+                                 TexturePath="/Textures/Interface/VerbIcons/group.svg.192dpi.png"
+                                 Stretch="KeepAspectCentered"
+                                 MinSize="18 18" />
+                </Button>
                 <Button Name="DeleteChatButton"
                         MaxSize="32 32"
                         Visible="False"
@@ -139,6 +150,12 @@
                                   VerticalExpand="True"
                                   HorizontalExpand="True"
                                   Margin="0 0 0 4">
+                        <Label Name="GroupInfoLabel"
+                               StyleClasses="LabelSubText"
+                               HorizontalAlignment="Center"
+                               HorizontalExpand="True"
+                               Margin="0 2 0 2"
+                               Visible="False" />
                         <Label Name="CurrentChatName"
                                Text="{Loc nano-chat-select-chat}"
                                HorizontalAlignment="Center"
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
index 8b079669803..57a3ef03c10 100644
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
@@ -14,7 +14,11 @@ public sealed partial class NanoChatUiFragment : BoxContainer
 {
     [Dependency] private readonly IGameTiming _timing = default!;
 
+    private const int MaxGroupMembers = 30;
+
     private readonly NewChatPopup _newChatPopup;
+    private readonly CreateGroupPopup _createGroupPopup;
+    private readonly GroupMembersPopup _membersPopup;
     private uint? _currentChat;
     private uint? _pendingChat;
     private uint _ownNumber;
@@ -22,8 +26,13 @@ public sealed partial class NanoChatUiFragment : BoxContainer
     private bool _listNumber = true;
     private Dictionary<uint, NanoChatRecipient> _recipients = new();
     private Dictionary<uint, List<NanoChatMessage>> _messages = new();
+    private Dictionary<uint, NanoChatGroup> _groups = new();
+    private Dictionary<uint, List<NanoChatMessage>> _groupMessages = new();
+    private List<NanoChatRecipient>? _contacts;
+    private List<NanoChatGroupInfo> _publicGroups = new();
+    private List<NanoChatGroupInvite> _invites = new();
 
-    public event Action<NanoChatUiMessageType, uint?, string?, string?>? OnMessageSent;
+    public event Action<NanoChatUiMessageEvent>? OnMessageSent;
 
     public NanoChatUiFragment()
     {
@@ -31,6 +40,8 @@ public NanoChatUiFragment()
         RobustXamlLoader.Load(this);
 
         _newChatPopup = new NewChatPopup();
+        _createGroupPopup = new CreateGroupPopup();
+        _membersPopup = new GroupMembersPopup();
         SetupEventHandlers();
     }
 
@@ -38,7 +49,7 @@ private void SetupEventHandlers()
     {
         _newChatPopup.OnChatCreated += (number, name, job) =>
         {
-            OnMessageSent?.Invoke(NanoChatUiMessageType.NewChat, number, name, job);
+            OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.NewChat, number, name, job));
         };
 
         NewChatButton.OnPressed += _ =>
@@ -47,11 +58,13 @@ private void SetupEventHandlers()
             _newChatPopup.OpenCentered();
         };
 
+        MembersButton.OnPressed += _ => OpenMembersPopup();
+
         MuteButton.OnPressed += _ =>
         {
             _notificationsMuted = !_notificationsMuted;
             UpdateMuteButton();
-            OnMessageSent?.Invoke(NanoChatUiMessageType.ToggleMute, null, null, null);
+            OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.ToggleMute, null, null, null));
         };
 
         MessageInput.OnTextChanged += args =>
@@ -77,18 +90,48 @@ private void SetupEventHandlers()
         LookupButton.OnPressed += _ => ToggleView();
         LookupView.OnStartChat += contact =>
         {
-            if (OnMessageSent is { } handler)
-            {
-                handler(NanoChatUiMessageType.NewChat, contact.Number, contact.Name, contact.JobTitle);
-                SelectChat(contact.Number);
-                ToggleView();
-            }
+            OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.NewChat, contact.Number, contact.Name, contact.JobTitle));
+            SelectChat(contact.Number);
+            ToggleView();
+        };
+        LookupView.OnCreateGroupRequest += () =>
+        {
+            _createGroupPopup.SetContacts(_contacts, _ownNumber);
+            _createGroupPopup.ClearInputs();
+            _createGroupPopup.OpenCentered();
+        };
+        _createGroupPopup.OnGroupCreated += (name, isPublic, members) =>
+        {
+            OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.CreateGroup,
+                content: name,
+                isPublic: isPublic,
+                members: members));
+        };
+        _membersPopup.OnInvite += targetNumber =>
+        {
+            OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.InviteToGroup,
+                _membersPopup.GroupNumber,
+                targetNumber: targetNumber));
+        };
+        _membersPopup.OnKick += targetNumber =>
+        {
+            OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.KickMember,
+                _membersPopup.GroupNumber,
+                targetNumber: targetNumber));
+        };
+        _membersPopup.OnLeave += () =>
+        {
+            OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.LeaveGroup, _membersPopup.GroupNumber));
+        };
+        _membersPopup.OnDelete += () =>
+        {
+            OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.DeleteGroup, _membersPopup.GroupNumber));
         };
         ListNumberButton.OnPressed += _ =>
         {
             _listNumber = !_listNumber;
             UpdateListNumber();
-            OnMessageSent?.Invoke(NanoChatUiMessageType.ToggleListNumber, null, null, null);
+            OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.ToggleListNumber, null, null, null));
         };
 
         MessageInput.OnTextEntered += _ => SendMessage(); // Send message when pressing enter
@@ -96,6 +139,16 @@ private void SetupEventHandlers()
         DeleteChatButton.OnPressed += _ => DeleteCurrentChat();
     }
 
+    private void OpenMembersPopup()
+    {
+        var activeChat = _pendingChat ?? _currentChat;
+        if (activeChat == null || !_groups.TryGetValue(activeChat.Value, out var group))
+            return;
+
+        _membersPopup.SetGroup(group, _ownNumber);
+        _membersPopup.OpenCentered();
+    }
+
     private void ToggleView()
     {
         ChatView.Visible = !ChatView.Visible;
@@ -124,19 +177,32 @@ private void SendMessage()
             _ownNumber
         );
 
-        if (!_messages.TryGetValue(activeChat.Value, out var value))
+        if (_groups.ContainsKey(activeChat.Value))
         {
-            value = new List<NanoChatMessage>();
-            _messages[activeChat.Value] = value;
+            if (!_groupMessages.TryGetValue(activeChat.Value, out var value))
+            {
+                value = new List<NanoChatMessage>();
+                _groupMessages[activeChat.Value] = value;
+            }
+
+            value.Add(predictedMessage);
         }
+        else
+        {
+            if (!_messages.TryGetValue(activeChat.Value, out var value))
+            {
+                value = new List<NanoChatMessage>();
+                _messages[activeChat.Value] = value;
+            }
 
-        value.Add(predictedMessage);
+            value.Add(predictedMessage);
+        }
 
         // Update UI with predicted message
-        UpdateMessages(_messages);
+        UpdateMessages(_groupMessages, _messages);
 
         // Send message event
-        OnMessageSent?.Invoke(NanoChatUiMessageType.SendMessage, activeChat, messageContent, null);
+        OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.SendMessage, activeChat, messageContent, null));
 
         // Clear input
         MessageInput.Text = string.Empty;
@@ -156,10 +222,16 @@ private void SelectChat(uint number)
         {
             recipient.HasUnread = false;
             _recipients[number] = recipient;
-            UpdateChatList(_recipients);
         }
 
-        OnMessageSent?.Invoke(NanoChatUiMessageType.SelectChat, number, null, null);
+        if (_groups.TryGetValue(number, out var group))
+        {
+            _groups[number] = group with { HasUnread = false };
+        }
+
+        UpdateChatList(_recipients, _groups, _publicGroups, _invites);
+
+        OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.SelectChat, number, null, null));
         UpdateCurrentChat();
     }
 
@@ -169,67 +241,159 @@ private void DeleteCurrentChat()
         if (activeChat == null)
             return;
 
-        OnMessageSent?.Invoke(NanoChatUiMessageType.DeleteChat, activeChat, null, null);
+        OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.DeleteChat, activeChat, null, null));
     }
 
-    private void UpdateChatList(Dictionary<uint, NanoChatRecipient> recipients)
+    private void UpdateChatList(Dictionary<uint, NanoChatRecipient> recipients,
+        Dictionary<uint, NanoChatGroup> groups,
+        List<NanoChatGroupInfo> publicGroups,
+        List<NanoChatGroupInvite> invites)
     {
         ChatList.RemoveAllChildren();
         _recipients = recipients;
+        _groups = groups;
 
-        NoChatsLabel.Visible = recipients.Count == 0;
+        NoChatsLabel.Visible = recipients.Count == 0 && groups.Count == 0 && publicGroups.Count == 0 && invites.Count == 0;
         if (NoChatsLabel.Parent != ChatList)
         {
             NoChatsLabel.Parent?.RemoveChild(NoChatsLabel);
             ChatList.AddChild(NoChatsLabel);
         }
 
-        foreach (var (number, recipient) in recipients.OrderBy(r => r.Value.Name))
+        // Pending invites first: they need a decision.
+        if (invites.Count > 0)
+        {
+            ChatList.AddChild(new Label()
+            {
+                Text = Loc.GetString("nano-chat-invites-section"),
+                StyleClasses = { "LabelSubText" },
+                HorizontalAlignment = HAlignment.Center,
+                Margin = new Thickness(0, 2),
+            });
+        }
+
+        foreach (var invite in invites.OrderBy(i => i.GroupName))
+        {
+            var entry = new NanoChatEntry();
+            entry.SetInvite(invite, invite.GroupNumber);
+            entry.OnAcceptPressed += _ =>
+                OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.AcceptInvite, invite.GroupNumber));
+            entry.OnDeclinePressed += _ =>
+                OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.DeclineInvite, invite.GroupNumber));
+            ChatList.AddChild(entry);
+        }
+
+        // DMs and joined groups, sorted by name.
+        var entries = new List<(uint number, bool isGroup, string sortName)>();
+        foreach (var (number, recipient) in recipients)
+            entries.Add((number, false, recipient.Name));
+        foreach (var (number, group) in groups)
+            entries.Add((number, true, group.Name));
+
+        foreach (var (number, isGroup, _) in entries.OrderBy(e => e.sortName))
         {
             var entry = new NanoChatEntry();
             // For pending chat selection, always show it as selected even if unconfirmed
             var isSelected = (_pendingChat == number) || (_pendingChat == null && _currentChat == number);
-            entry.SetRecipient(recipient, number, isSelected);
+            if (isGroup)
+                entry.SetGroup(groups[number], number, isSelected);
+            else
+                entry.SetRecipient(recipients[number], number, isSelected);
             entry.OnPressed += SelectChat;
             ChatList.AddChild(entry);
         }
+
+        // Public groups everyone can join, shown right in the chat list.
+        if (publicGroups.Count > 0)
+        {
+            ChatList.AddChild(new Label()
+            {
+                Text = Loc.GetString("nano-chat-public-groups-section"),
+                StyleClasses = { "LabelSubText" },
+                HorizontalAlignment = HAlignment.Center,
+                Margin = new Thickness(0, 2),
+            });
+        }
+
+        foreach (var group in publicGroups.OrderBy(g => g.Name))
+        {
+            var entry = new NanoChatEntry();
+            entry.SetPublicGroup(group, group.Number);
+            entry.OnPressed += JoinPublicAndSelect;
+            entry.OnJoinPressed += JoinPublicAndSelect;
+            ChatList.AddChild(entry);
+        }
+    }
+
+    private void JoinPublicAndSelect(uint number)
+    {
+        OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.JoinPublicGroup, number));
+        SelectChat(number);
     }
 
     private void UpdateCurrentChat()
     {
         var activeChat = _pendingChat ?? _currentChat;
         var hasActiveChat = activeChat != null;
+        var isGroup = activeChat != null && _groups.ContainsKey(activeChat.Value);
 
         // Update UI state
         MessagesScroll.Visible = hasActiveChat;
         CurrentChatName.Visible = !hasActiveChat;
         MessageInputContainer.Visible = hasActiveChat;
-        DeleteChatButton.Visible = hasActiveChat;
-        DeleteChatButton.Disabled = !hasActiveChat;
+        MembersButton.Visible = isGroup;
+        DeleteChatButton.Visible = hasActiveChat && !isGroup;
+        DeleteChatButton.Disabled = !hasActiveChat || isGroup;
 
-        if (activeChat != null && _recipients.TryGetValue(activeChat.Value, out var recipient))
+        if (isGroup && _groups.TryGetValue(activeChat!.Value, out var group))
         {
-            CurrentChatName.Text = recipient.Name + (string.IsNullOrEmpty(recipient.JobTitle) ? "" : $" ({recipient.JobTitle})");
+            CurrentChatName.Text = group.Name + "  (" +
+                Loc.GetString("nano-chat-group-members-count", ("count", group.Members.Count)) + ")";
+            GroupInfoLabel.Visible = true;
+            GroupInfoLabel.Text = group.Name + "  |  " +
+                Loc.GetString("nano-chat-group-members-count", ("count", group.Members.Count)) + " / " + MaxGroupMembers;
         }
         else
         {
-            CurrentChatName.Text = Loc.GetString("nano-chat-select-chat");
+            GroupInfoLabel.Visible = false;
+            if (activeChat != null && _recipients.TryGetValue(activeChat.Value, out var recipient))
+            {
+                CurrentChatName.Text = recipient.Name + (string.IsNullOrEmpty(recipient.JobTitle) ? "" : $" ({recipient.JobTitle})");
+            }
+            else
+            {
+                CurrentChatName.Text = Loc.GetString("nano-chat-select-chat");
+            }
         }
     }
 
-    private void UpdateMessages(Dictionary<uint, List<NanoChatMessage>> messages)
+    private void UpdateMessages(Dictionary<uint, List<NanoChatMessage>> groupMessages,
+        Dictionary<uint, List<NanoChatMessage>> messages)
     {
+        _groupMessages = groupMessages;
         _messages = messages;
         MessageList.RemoveAllChildren();
 
         var activeChat = _pendingChat ?? _currentChat;
-        if (activeChat == null || !messages.TryGetValue(activeChat.Value, out var chatMessages))
+        if (activeChat == null)
+            return;
+
+        var isGroup = _groups.ContainsKey(activeChat.Value);
+        var chatMessages = isGroup
+            ? groupMessages.GetValueOrDefault(activeChat.Value)
+            : messages.GetValueOrDefault(activeChat.Value);
+
+        if (chatMessages == null)
             return;
 
         foreach (var message in chatMessages)
         {
             var messageBubble = new NanoChatMessageBubble();
-            messageBubble.SetMessage(message, message.SenderId == _ownNumber);
+            string? senderName = null;
+            if (isGroup && message.SenderId != _ownNumber)
+                senderName = GetGroupSenderName(activeChat.Value, message.SenderId);
+
+            messageBubble.SetMessage(message, message.SenderId == _ownNumber, senderName);
             MessageList.AddChild(messageBubble);
 
             // Add spacing between messages
@@ -244,6 +408,20 @@ private void UpdateMessages(Dictionary<uint, List<NanoChatMessage>> messages)
             scroll.SetScrollValue(new Vector2(0, float.MaxValue));
     }
 
+    private string? GetGroupSenderName(uint groupNumber, uint senderId)
+    {
+        if (_groups.TryGetValue(groupNumber, out var group))
+        {
+            foreach (var member in group.Members)
+            {
+                if (member.Number == senderId)
+                    return member.Name;
+            }
+        }
+
+        return $"#{senderId:D4}";
+    }
+
     private void UpdateMuteButton()
     {
         if (BellMutedIcon != null)
@@ -266,7 +444,7 @@ public void UpdateState(NanoChatUiState state)
         UpdateListNumber();
 
         // Update new chat button state based on recipient limit
-        var atLimit = state.Recipients.Count >= state.MaxRecipients;
+        var atLimit = state.Recipients.Count + state.Groups.Count >= state.MaxRecipients;
         NewChatButton.Disabled = atLimit;
         NewChatButton.ToolTip = atLimit
             ? Loc.GetString("nano-chat-max-recipients")
@@ -285,9 +463,13 @@ public void UpdateState(NanoChatUiState state)
         if (_pendingChat == null)
             _currentChat = state.CurrentChat;
 
+        _contacts = state.Contacts;
+        _publicGroups = state.PublicGroups;
+        _invites = state.Invites;
+
         UpdateCurrentChat();
-        UpdateChatList(state.Recipients);
-        UpdateMessages(state.Messages);
+        UpdateChatList(state.Recipients, state.Groups, _publicGroups, _invites);
+        UpdateMessages(state.GroupMessages, state.Messages);
         LookupView.UpdateContactList(state);
     }
-}
\ No newline at end of file
+}
diff --git a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs
index 6999279cc63..380113e6415 100644
--- a/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/LogProbeUiFragment.xaml.cs
@@ -35,6 +35,7 @@ public void UpdateState(LogProbeUiState state)
         {
             SetupNanoChatView(state.NanoChatData.Value);
             DisplayNanoChatData(state.NanoChatData.Value);
+            DisplayGroupData(state.NanoChatData.Value);
         }
         else
         {
@@ -56,6 +57,8 @@ private void SetupNanoChatView(NanoChatData data)
 
         // Add recipient count
         cardInfo.Add(Loc.GetString("log-probe-recipients", ("count", data.Recipients.Count)));
+        if (data.Groups.Count > 0)
+            cardInfo.Add(Loc.GetString("log-probe-groups", ("count", data.Groups.Count)));
 
         CardNumberLabel.Text = string.Join(" | ", cardInfo);
         CardNumberLabel.Visible = true;
@@ -128,6 +131,48 @@ private void DisplayNanoChatData(NanoChatData data)
             }
         }
     }
+    private void DisplayGroupData(NanoChatData data)
+    {
+        foreach (var (groupId, group) in data.Groups)
+        {
+            var groupInfo = Loc.GetString("log-probe-group-format",
+                ("group", group.Name),
+                ("owner", $"#{group.Owner:D4}"),
+                ("count", group.Members.Count)) + "\n" +
+                string.Join("\n", group.Members
+                    .OrderBy(m => m.Name)
+                    .Select(m => $"    {m.Name}" +
+                                 (string.IsNullOrEmpty(m.JobTitle) ? "" : $" ({m.JobTitle})") +
+                                 $" | #{m.Number:D4}"));
+
+            var groupEntry = new LogProbeUiEntry(0, "---", groupInfo);
+            ProbedDeviceContainer.AddChild(groupEntry);
+
+            if (!data.GroupMessages.TryGetValue(groupId, out var messages))
+                continue;
+
+            var count = 1;
+            foreach (var msg in messages.OrderByDescending(m => m.Timestamp))
+            {
+                if (msg.DeliveryFailed)
+                    continue;
+
+                var messageText = Loc.GetString("log-probe-message-format",
+                    ("sender", $"#{msg.SenderId:D4}"),
+                    ("recipient", group.Name),
+                    ("content", msg.Content));
+
+                var entry = new NanoChatLogEntry(
+                    count,
+                    TimeSpan.FromSeconds(Math.Truncate(msg.Timestamp.TotalSeconds)).ToString(),
+                    messageText);
+
+                ProbedDeviceContainer.AddChild(entry);
+                count++;
+            }
+        }
+    }
+
     private void DisplayAccessLogs(List<PulledAccessLog> logs)
     {
         //Reverse the list so the oldest entries appear at the bottom
diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUi.cs b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUi.cs
index 8ad665d3616..41efc05eb21 100644
--- a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUi.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUi.cs
@@ -30,6 +30,11 @@ public override void Setup(BoundUserInterface userInterface, EntityUid? fragment
         {
             SendNewsReaderMessage(NewsReaderUiAction.NotificationSwitch, userInterface);
         };
+        // ADT-Tweak: комментарии к новостям
+        _fragment.OnCommentSubmitted += content =>
+        {
+            SendNewsReaderMessage(NewsReaderUiAction.AddComment, userInterface, content);
+        };
     }
 
     public override void UpdateState(BoundUserInterfaceState state)
@@ -45,9 +50,9 @@ public override void UpdateState(BoundUserInterfaceState state)
         }
     }
 
-    private void SendNewsReaderMessage(NewsReaderUiAction action, BoundUserInterface userInterface)
+    private void SendNewsReaderMessage(NewsReaderUiAction action, BoundUserInterface userInterface, string? content = null)
     {
-        var newsMessage = new NewsReaderUiMessageEvent(action);
+        var newsMessage = new NewsReaderUiMessageEvent(action, content);
         var message = new CartridgeUiMessage(newsMessage);
         userInterface.SendMessage(message);
     }
diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml
index fd5a7bb1617..f91946b6626 100644
--- a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml
+++ b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml
@@ -32,7 +32,9 @@
             <Label Name="PageName" Align="Center"/>
         </PanelContainer>
     </controls:StripeBack>
-    <PanelContainer VerticalExpand="True">
+
+    <!-- Article body -->
+    <PanelContainer Name="ArticlePane" VerticalExpand="True" HorizontalExpand="True">
         <PanelContainer.PanelOverride>
             <gfx:StyleBoxFlat BackgroundColor="#80808005" />
         </PanelContainer.PanelOverride>
@@ -41,18 +43,62 @@
                 HScrollEnabled="False"
                 HorizontalExpand="True"
                 MinSize="0 0"
-                SizeFlagsStretchRatio="2"
                 VerticalExpand="True">
             <BoxContainer
                 Name="PageTextContainer"
                 MinSize="0 0"
                 Orientation="Vertical"
-                SizeFlagsStretchRatio="2"
                 VerticalExpand="True">
             </BoxContainer>
             <RichTextLabel Margin="8,8,8,8" Name="PageText" VerticalAlignment="Top"/>
         </ScrollContainer>
     </PanelContainer>
+
+    <!-- Comments toggle -->
+    <Button Name="CommentsButton"
+            Text="{Loc news-read-ui-comments-button}"
+            HorizontalExpand="True"
+            Margin="5 4 5 0"
+            StyleClasses="OpenBoth"
+            Visible="False" />
+
+    <!-- Draggable splitter between article and comments -->
+    <cartridges:CommentsSplitterControl Name="CommentsSplitter"
+                                        HorizontalExpand="True"
+                                        Visible="False" />
+
+    <!-- Comments section -->
+    <PanelContainer Name="CommentsPanel"
+                    VerticalExpand="True"
+                    MinHeight="130"
+                    Visible="False">
+        <PanelContainer.PanelOverride>
+            <gfx:StyleBoxFlat BackgroundColor="#80808008" />
+        </PanelContainer.PanelOverride>
+        <BoxContainer Orientation="Vertical" VerticalExpand="True" HorizontalExpand="True" Margin="5">
+            <ScrollContainer Name="CommentsScroll"
+                             HScrollEnabled="False"
+                             VerticalExpand="True"
+                             HorizontalExpand="True">
+                <BoxContainer Name="CommentsList"
+                              Orientation="Vertical"
+                              HorizontalExpand="True"
+                              VerticalExpand="True" />
+            </ScrollContainer>
+            <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="0 4 0 0">
+                <LineEdit Name="CommentInput"
+                          PlaceHolder="{Loc news-read-ui-comment-placeholder}"
+                          HorizontalExpand="True"
+                          StyleClasses="OpenRight" />
+                <Button Name="CommentSendButton"
+                        Text="{Loc news-read-ui-comment-send}"
+                        MinWidth="80"
+                        Disabled="True"
+                        StyleClasses="OpenLeft" />
+            </BoxContainer>
+        </BoxContainer>
+    </PanelContainer>
+
     <BoxContainer Orientation="Horizontal" HorizontalExpand="True" Margin="5,5,5,5">
         <Button
             Name="NotificationSwitch"
diff --git a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs
index f76adfb8661..19c7acac227 100644
--- a/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/NewsReaderUiFragment.xaml.cs
@@ -1,11 +1,16 @@
+using System.Numerics;
 using Content.Client.Message;
 using Content.Client.RichText;
 using Content.Client.UserInterface.RichText;
 using Content.Shared.MassMedia.Systems;
 using Robust.Client.AutoGenerated;
+using Robust.Client.Graphics;
+using Robust.Client.Input;
+using Robust.Client.UserInterface;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.RichText;
 using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Input;
 using Robust.Shared.Utility;
 
 namespace Content.Client.CartridgeLoader.Cartridges;
@@ -15,9 +20,16 @@ public sealed partial class NewsReaderUiFragment : BoxContainer
 {
     public event Action? OnNextButtonPressed;
     public event Action? OnPrevButtonPressed;
-
     public event Action? OnNotificationSwithPressed;
 
+    // ADT-Tweak: комментарии к новостям
+    public event Action<string>? OnCommentSubmitted;
+
+    private bool _hasArticle;
+    private bool _commentsVisible;
+    private const int MinCommentsHeight = 70;
+    private const int MaxCommentsHeight = 400;
+
     public NewsReaderUiFragment()
     {
         RobustXamlLoader.Load(this);
@@ -25,6 +37,47 @@ public NewsReaderUiFragment()
         Next.OnPressed += _ => OnNextButtonPressed?.Invoke();
         Prev.OnPressed += _ => OnPrevButtonPressed?.Invoke();
         NotificationSwitch.OnPressed += _ => OnNotificationSwithPressed?.Invoke();
+
+        CommentsButton.OnPressed += _ => ToggleComments();
+        CommentsSplitter.OnDragged += delta => AdjustCommentsHeight(delta);
+
+        CommentInput.OnTextChanged += args =>
+        {
+            // ADT-Tweak: ограничение длины комментария
+            if (args.Text.Length > 200)
+                CommentInput.Text = args.Text[..200];
+
+            CommentSendButton.Disabled = string.IsNullOrWhiteSpace(CommentInput.Text);
+        };
+        CommentInput.OnTextEntered += _ => SubmitComment();
+        CommentSendButton.OnPressed += _ => SubmitComment();
+    }
+
+    private void SubmitComment()
+    {
+        if (!_hasArticle || string.IsNullOrWhiteSpace(CommentInput.Text))
+            return;
+
+        var content = CommentInput.Text.Trim();
+        if (content.Length == 0)
+            return;
+
+        OnCommentSubmitted?.Invoke(content);
+        CommentInput.Text = string.Empty;
+        CommentSendButton.Disabled = true;
+    }
+
+    private void ToggleComments()
+    {
+        _commentsVisible = !_commentsVisible;
+        CommentsPanel.Visible = _commentsVisible;
+        CommentsSplitter.Visible = _commentsVisible;
+    }
+
+    private void AdjustCommentsHeight(float delta)
+    {
+        var newHeight = CommentsPanel.MinHeight + delta;
+        CommentsPanel.MinHeight = Math.Clamp(newHeight, MinCommentsHeight, MaxCommentsHeight);
     }
 
     public void UpdateState(NewsArticle article, int targetNum, int totalNum, bool notificationOn)
@@ -33,6 +86,14 @@ public void UpdateState(NewsArticle article, int targetNum, int totalNum, bool n
         PageText.Visible = true;
         ShareTime.Visible = true;
         Author.Visible = true;
+        CommentsButton.Visible = true;
+        _hasArticle = true;
+
+        var commentCount = article.Comments?.Count ?? 0;
+        CommentsButton.Text = Loc.GetString("news-read-ui-comments-button",
+            ("count", commentCount));
+        CommentsPanel.Visible = _commentsVisible;
+        CommentsSplitter.Visible = _commentsVisible;
 
         PageName.Text = article.Title;
         PageText.SetMessage(FormattedMessage.FromMarkupPermissive(article.Content), UserFormattableTags.BaseAllowedTags);
@@ -49,6 +110,8 @@ public void UpdateState(NewsArticle article, int targetNum, int totalNum, bool n
 
         Prev.Disabled = targetNum <= 1;
         Next.Disabled = targetNum >= totalNum;
+
+        UpdateComments(article.Comments);
     }
 
     public void UpdateEmptyState(bool notificationOn)
@@ -57,9 +120,118 @@ public void UpdateEmptyState(bool notificationOn)
         PageText.Visible = false;
         ShareTime.Visible = false;
         Author.Visible = false;
+        CommentsButton.Visible = false;
+        CommentsPanel.Visible = false;
+        CommentsSplitter.Visible = false;
+        _hasArticle = false;
 
         PageName.Text = Loc.GetString("news-read-ui-not-found-text");
 
         NotificationSwitch.Text = Loc.GetString(notificationOn ? "news-read-ui-notification-on" : "news-read-ui-notification-off");
+
+        CommentsList.RemoveAllChildren();
+    }
+
+    private void UpdateComments(List<NewsComment>? comments)
+    {
+        CommentsList.RemoveAllChildren();
+
+        if (comments == null || comments.Count == 0)
+        {
+            CommentsList.AddChild(new Label()
+            {
+                Text = Loc.GetString("news-read-ui-comment-no-comments"),
+                StyleClasses = { "LabelSubText" },
+                HorizontalAlignment = HAlignment.Center,
+                Margin = new Thickness(0, 4),
+            });
+            return;
+        }
+
+        for (var idx = 0; idx < comments.Count; idx++)
+        {
+            var comment = comments[idx];
+            var row = new PanelContainer()
+            {
+                HorizontalExpand = true,
+            };
+
+            var inner = new BoxContainer()
+            {
+                Orientation = BoxContainer.LayoutOrientation.Vertical,
+                HorizontalExpand = true,
+                Margin = new Thickness(4, 2),
+            };
+
+            var authorLabel = new Label()
+            {
+                Text = (comment.Author ?? Loc.GetString("news-read-ui-no-author")) + " (" + comment.ShareTime.ToString(@"hh\:mm\:ss") + ")",
+                StyleClasses = { "LabelSmall" },
+                HorizontalExpand = true,
+                Modulate = new Color(0.62f, 0.72f, 0.85f),
+            };
+            var contentLabel = new Label()
+            {
+                Text = comment.Content,
+                HorizontalExpand = true,
+            };
+
+            inner.AddChild(authorLabel);
+            inner.AddChild(contentLabel);
+            row.AddChild(inner);
+            row.StyleClasses.Add(idx % 2 == 0 ? "PanelBackgroundBaseDark" : "PanelBackgroundLight");
+
+            CommentsList.AddChild(row);
+        }
+
+        CommentsScroll.InvalidateMeasure();
+        if (CommentsList.Parent is ScrollContainer scroll)
+            scroll.SetScrollValue(new Vector2(0, float.MaxValue));
+    }
+}
+
+/// <summary>
+///     ADT-Tweak: thin draggable strip used to resize the comments section.
+/// </summary>
+public sealed class CommentsSplitterControl : Control
+{
+    public event Action<float>? OnDragged;
+
+    private bool _dragging;
+    private float _lastGlobalY;
+
+    public CommentsSplitterControl()
+    {
+        MouseFilter = MouseFilterMode.Stop;
+        DefaultCursorShape = CursorShape.VResize;
+        MinSize = new Vector2(0, 6);
+    }
+
+    protected override void KeyBindDown(GUIBoundKeyEventArgs args)
+    {
+        base.KeyBindDown(args);
+        if (args.Function == EngineKeyFunctions.UIClick)
+        {
+            _dragging = true;
+            _lastGlobalY = args.PointerLocation.Position.Y / UIScale;
+        }
+    }
+
+    protected override void KeyBindUp(GUIBoundKeyEventArgs args)
+    {
+        base.KeyBindUp(args);
+        if (args.Function == EngineKeyFunctions.UIClick)
+            _dragging = false;
+    }
+
+    protected override void MouseMove(GUIMouseMoveEventArgs args)
+    {
+        base.MouseMove(args);
+        if (!_dragging)
+            return;
+
+        var delta = args.GlobalPosition.Y - _lastGlobalY;
+        _lastGlobalY = args.GlobalPosition.Y;
+        OnDragged?.Invoke(delta);
     }
 }
diff --git a/Content.Server/ADT/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.NanoChat.cs b/Content.Server/ADT/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.NanoChat.cs
index ebd2f1ed533..67972226aeb 100644
--- a/Content.Server/ADT/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.NanoChat.cs
+++ b/Content.Server/ADT/CartridgeLoader/Cartridges/LogProbeCartridgeSystem.NanoChat.cs
@@ -29,6 +29,8 @@ private void OnRecipientUpdated(ref NanoChatRecipientUpdatedEvent args)
             probe.ScannedNanoChatData = new NanoChatData(
                 new Dictionary<uint, NanoChatRecipient>(card.Recipients),
                 probe.ScannedNanoChatData.Value.Messages,
+                new Dictionary<uint, NanoChatGroup>(card.Groups),
+                probe.ScannedNanoChatData.Value.GroupMessages,
                 card.Number,
                 GetNetEntity(args.CardUid));
 
@@ -51,6 +53,8 @@ private void OnMessageReceived(ref NanoChatMessageReceivedEvent args)
             probe.ScannedNanoChatData = new NanoChatData(
                 probe.ScannedNanoChatData.Value.Recipients,
                 new Dictionary<uint, List<NanoChatMessage>>(card.Messages),
+                probe.ScannedNanoChatData.Value.Groups,
+                new Dictionary<uint, List<NanoChatMessage>>(card.GroupMessages),
                 card.Number,
                 GetNetEntity(args.CardUid));
 
@@ -75,6 +79,8 @@ private void ScanNanoChatCard(Entity<LogProbeCartridgeComponent> ent,
         ent.Comp.ScannedNanoChatData = new NanoChatData(
             new Dictionary<uint, NanoChatRecipient>(card.Recipients),
             new Dictionary<uint, List<NanoChatMessage>>(card.Messages),
+            new Dictionary<uint, NanoChatGroup>(card.Groups),
+            new Dictionary<uint, List<NanoChatMessage>>(card.GroupMessages),
             card.Number,
             GetNetEntity(target)
         );
diff --git a/Content.Server/ADT/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/ADT/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
index aeb21361a06..d3b04e6b0c7 100644
--- a/Content.Server/ADT/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
+++ b/Content.Server/ADT/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
@@ -12,6 +12,7 @@
 using Content.Shared.PDA;
 using Content.Shared.Radio.Components;
 using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
 
@@ -22,6 +23,7 @@ public sealed class NanoChatCartridgeSystem : EntitySystem
     [Dependency] private readonly CartridgeLoaderSystem _cartridge = default!;
     [Dependency] private readonly IAdminLogManager _adminLogger = default!;
     [Dependency] private readonly IGameTiming _timing = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
     [Dependency] private readonly IPrototypeManager _prototype = default!;
     [Dependency] private readonly SharedNanoChatSystem _nanoChat = default!;
     [Dependency] private readonly StationSystem _station = default!;
@@ -31,6 +33,12 @@ public sealed class NanoChatCartridgeSystem : EntitySystem
     // no point in storing it on the comp
     private const int NotificationMaxLength = 64;
 
+    // Group chat limits
+    private const int MaxGroupMembers = 30;
+    private const int MaxGroupNameLength = 32;
+    private const int MaxPendingInvites = 10;
+    private const int MaxGroupHistoryCopied = 100;
+
     public override void Initialize()
     {
         base.Initialize();
@@ -103,6 +111,30 @@ private void OnMessage(Entity<NanoChatCartridgeComponent> ent, ref CartridgeMess
             case NanoChatUiMessageType.ToggleListNumber:
                 HandleToggleListNumber(card);
                 break;
+            case NanoChatUiMessageType.CreateGroup:
+                HandleCreateGroup(card, msg);
+                break;
+            case NanoChatUiMessageType.InviteToGroup:
+                HandleInviteToGroup(card, msg);
+                break;
+            case NanoChatUiMessageType.AcceptInvite:
+                HandleAcceptInvite(card, msg);
+                break;
+            case NanoChatUiMessageType.DeclineInvite:
+                HandleDeclineInvite(card, msg);
+                break;
+            case NanoChatUiMessageType.JoinPublicGroup:
+                HandleJoinPublicGroup(card, msg);
+                break;
+            case NanoChatUiMessageType.LeaveGroup:
+                HandleLeaveGroup(card, msg);
+                break;
+            case NanoChatUiMessageType.KickMember:
+                HandleKickMember(card, msg);
+                break;
+            case NanoChatUiMessageType.DeleteGroup:
+                HandleDeleteGroup(card, msg);
+                break;
         }
 
         UpdateUI(ent, GetEntity(args.LoaderUid));
@@ -184,6 +216,12 @@ private void HandleSelectChat(Entity<NanoChatCardComponent> card, NanoChatUiMess
                 msg.RecipientNumber.Value,
                 recipient with { HasUnread = false });
         }
+
+        // Clear unread flag for groups too
+        if (_nanoChat.GetGroup((card, card.Comp), msg.RecipientNumber.Value) is { } group)
+        {
+            _nanoChat.SetGroup((card, card.Comp), group with { HasUnread = false });
+        }
     }
 
     /// <summary>
@@ -240,6 +278,13 @@ private void HandleSendMessage(Entity<NanoChatCartridgeComponent> cartridge,
         if (msg.RecipientNumber == null || msg.Content == null || card.Comp.Number == null)
             return;
 
+        // Group chat messages are routed to all group members.
+        if (_nanoChat.GetGroup((card, card.Comp), msg.RecipientNumber.Value) != null)
+        {
+            HandleSendGroupMessage(cartridge, card, msg);
+            return;
+        }
+
         if (!EnsureRecipientExists(card, msg.RecipientNumber.Value))
             return;
 
@@ -288,6 +333,592 @@ private void HandleSendMessage(Entity<NanoChatCartridgeComponent> cartridge,
         }
     }
 
+    /// <summary>
+    ///     Handles sending a message to a group chat: routes it to every member card.
+    /// </summary>
+    private void HandleSendGroupMessage(Entity<NanoChatCartridgeComponent> cartridge,
+        Entity<NanoChatCardComponent> card,
+        NanoChatUiMessageEvent msg)
+    {
+        if (msg.RecipientNumber is not { } groupNumber || msg.Content == null || card.Comp.Number == null)
+            return;
+
+        if (_nanoChat.GetGroup((card, card.Comp), groupNumber) is not { } group)
+            return;
+
+        var content = msg.Content;
+        if (!string.IsNullOrWhiteSpace(content))
+        {
+            content = FormattedMessage.EscapeText(content.Trim());
+            if (content.Length > NanoChatMessage.MaxContentLength)
+                content = content[..NanoChatMessage.MaxContentLength];
+        }
+
+        var message = new NanoChatMessage(
+            _timing.CurTime,
+            content,
+            (uint)card.Comp.Number
+        );
+
+        // Deliver to every member except the sender. A group with only the
+        // sender is still a valid chat: the message is stored in the history.
+        var otherMembers = group.Members.Where(m => m.Number != card.Comp.Number).ToList();
+        var deliveredAny = false;
+        var deliveredCards = new List<Entity<NanoChatCardComponent>>();
+        foreach (var member in otherMembers)
+        {
+            var (deliveryFailed, recipientCards) = AttemptMessageDelivery(cartridge, member.Number);
+            if (deliveryFailed)
+                continue;
+
+            deliveredAny = true;
+            deliveredCards.AddRange(recipientCards);
+        }
+
+        message = message with { DeliveryFailed = otherMembers.Count > 0 && !deliveredAny };
+
+        // Store in sender's outbox under the group number.
+        _nanoChat.AddGroupMessage((card, card.Comp), groupNumber, message);
+
+        var deliveredText = deliveredCards.Count > 0
+            ? string.Join(", ", deliveredCards.Select(r => ToPrettyString(r)))
+            : $"#{groupNumber:D4} ({group.Members.Count} members)";
+
+        _adminLogger.Add(LogType.Chat,
+            LogImpact.Low,
+            $"{ToPrettyString(card):user} sent NanoChat group message to #{groupNumber:D4} '{group.Name}' ({deliveredCards.Count}/{group.Members.Count} delivered): {content}{(message.DeliveryFailed ? " [DELIVERY FAILED]" : "")}");
+
+        var msgEv = new NanoChatMessageReceivedEvent(card);
+        RaiseLocalEvent(ref msgEv);
+
+        if (message.DeliveryFailed)
+            return;
+
+        foreach (var recipient in deliveredCards)
+        {
+            // Skip cards that left the group meanwhile.
+            if (_nanoChat.GetGroup((recipient, recipient.Comp), groupNumber) == null)
+                continue;
+
+            _nanoChat.AddGroupMessage((recipient, recipient.Comp), groupNumber, message with { DeliveryFailed = false });
+            HandleGroupUnreadNotification(recipient, group, message);
+
+            var recipientEv = new NanoChatMessageReceivedEvent(recipient);
+            RaiseLocalEvent(ref recipientEv);
+            UpdateUIForCard(recipient);
+        }
+    }
+
+    /// <summary>
+    ///     Handles unread status and notifications for a group message.
+    /// </summary>
+    private void HandleGroupUnreadNotification(Entity<NanoChatCardComponent> recipient,
+        NanoChatGroup group,
+        NanoChatMessage message)
+    {
+        if (recipient.Comp.Number == null)
+            return;
+
+        var hasSelectedCurrentChat = _nanoChat.GetCurrentChat((recipient, recipient.Comp)) == group.Number;
+
+        if (!hasSelectedCurrentChat)
+            _nanoChat.SetGroup((recipient, recipient.Comp), group with { HasUnread = true });
+
+        if (recipient.Comp.NotificationsMuted ||
+            recipient.Comp.PdaUid is not {} pdaUid ||
+            !TryComp<CartridgeLoaderComponent>(pdaUid, out var loader) ||
+            // Don't notify if the recipient has the NanoChat program open with this chat selected.
+            (hasSelectedCurrentChat &&
+                _ui.IsUiOpen(pdaUid, PdaUiKey.Key) &&
+                HasComp<NanoChatCartridgeComponent>(loader.ActiveProgram)))
+            return;
+
+        _cartridge.SendNotification(pdaUid,
+            Loc.GetString("nano-chat-group-message-title", ("group", group.Name)),
+            Loc.GetString("nano-chat-new-message-body", ("message", TruncateMessage(message.Content))),
+            loader);
+    }
+
+    /// <summary>
+    ///     Finds the card with the given NanoChat number.
+    /// </summary>
+    private Entity<NanoChatCardComponent>? GetCardByNumber(uint number)
+    {
+        var query = EntityQueryEnumerator<NanoChatCardComponent>();
+        while (query.MoveNext(out var uid, out var card))
+        {
+            if (card.Number == number)
+                return (uid, card);
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    ///     Finds a card that has the given group and returns the group definition.
+    /// </summary>
+    private NanoChatGroup? FindGroupDefinition(uint groupNumber)
+    {
+        var query = EntityQueryEnumerator<NanoChatCardComponent>();
+        while (query.MoveNext(out var uid, out var card))
+        {
+            if (_nanoChat.GetGroup((uid, card), groupNumber) is { } group)
+                return group;
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    ///     Finds all cards that are members of the given group.
+    /// </summary>
+    private List<Entity<NanoChatCardComponent>> GetGroupMemberCards(uint groupNumber)
+    {
+        var cards = new List<Entity<NanoChatCardComponent>>();
+        var query = EntityQueryEnumerator<NanoChatCardComponent>();
+        while (query.MoveNext(out var uid, out var card))
+        {
+            if (_nanoChat.GetGroup((uid, card), groupNumber) != null)
+                cards.Add((uid, card));
+        }
+
+        return cards;
+    }
+
+    /// <summary>
+    ///     Rewrites the group definition on all member cards.
+    /// </summary>
+    private void WriteGroupToAllMembers(NanoChatGroup group)
+    {
+        foreach (var memberCard in GetGroupMemberCards(group.Number))
+        {
+            _nanoChat.SetGroup((memberCard, memberCard.Comp), group);
+        }
+    }
+
+    /// <summary>
+    ///     Handles creation of a new group chat.
+    /// </summary>
+    private void HandleCreateGroup(Entity<NanoChatCardComponent> card, NanoChatUiMessageEvent msg)
+    {
+        if (msg.Content == null || msg.Members == null || card.Comp.Number == null)
+            return;
+
+        var name = msg.Content.Trim();
+        if (string.IsNullOrWhiteSpace(name))
+            return;
+
+        if (name.Length > MaxGroupNameLength)
+            name = name[..MaxGroupNameLength];
+
+        // Max 29 other members + the owner = MaxGroupMembers.
+        if (msg.Members.Count > MaxGroupMembers - 1)
+            return;
+
+        var memberNumbers = new List<uint>();
+        foreach (var memberNumber in msg.Members.Distinct())
+        {
+            if (memberNumber == card.Comp.Number)
+                continue;
+
+            // Only real cards can be added.
+            if (GetCardByNumber(memberNumber) == null)
+                continue;
+
+            memberNumbers.Add(memberNumber);
+        }
+
+        // Generate a unique group number.
+        var groupNumber = GenerateGroupNumber();
+
+        var members = new List<NanoChatMember> { GetMemberInfo(card.Comp.Number.Value) ?? new NanoChatMember(card.Comp.Number.Value, "Unknown") };
+        foreach (var memberNumber in memberNumbers)
+        {
+            members.Add(GetMemberInfo(memberNumber) ?? new NanoChatMember(memberNumber, "Unknown"));
+        }
+
+        var group = new NanoChatGroup(groupNumber, name, msg.IsPublic, card.Comp.Number.Value, members);
+
+        // Add to the owner's card.
+        _nanoChat.SetGroup((card, card.Comp), group);
+
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Medium,
+            $"{ToPrettyString(msg.Actor):user} created NanoChat group #{groupNumber:D4} '{name}' ({(msg.IsPublic ? "public" : "closed")}) with {members.Count} members: {string.Join(", ", members.Select(m => $"#{m.Number:D4} ({m.Name})"))}");
+
+        // Add to every initial member's card and notify them.
+        foreach (var memberCard in memberNumbers.Select(GetCardByNumber))
+        {
+            if (memberCard == null)
+                continue;
+
+            _nanoChat.SetGroup((memberCard.Value, memberCard.Value.Comp), group);
+            SendGroupNotification(memberCard.Value, "nano-chat-group-added-title", ("group", name));
+            UpdateUIForCard(memberCard.Value);
+        }
+
+        UpdateUIForCard(card);
+
+        // Public groups must show up in everyone's chat list right away.
+        if (msg.IsPublic)
+            UpdateUIForAllCards();
+    }
+
+    /// <summary>
+    ///     Handles inviting a player to a group.
+    /// </summary>
+    private void HandleInviteToGroup(Entity<NanoChatCardComponent> card, NanoChatUiMessageEvent msg)
+    {
+        if (msg.RecipientNumber is not { } groupNumber || msg.TargetNumber is not { } targetNumber || card.Comp.Number == null)
+            return;
+
+        if (_nanoChat.GetGroup((card, card.Comp), groupNumber) is not { } group)
+            return;
+
+        if (group.Members.Any(m => m.Number == targetNumber))
+            return;
+
+        if (group.Members.Count >= MaxGroupMembers)
+            return;
+
+        if (GetCardByNumber(targetNumber) is not { } targetCard)
+            return;
+
+        if (targetCard.Comp.Invites.Count >= MaxPendingInvites)
+            return;
+
+        if (_nanoChat.GetInvite((targetCard, targetCard.Comp), groupNumber) != null)
+            return;
+
+        var senderName = group.Members.FirstOrDefault(m => m.Number == card.Comp.Number).Name;
+
+        _nanoChat.AddInvite((targetCard, targetCard.Comp),
+            new NanoChatGroupInvite(groupNumber, group.Name, card.Comp.Number.Value, senderName));
+
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Low,
+            $"{ToPrettyString(msg.Actor):user} invited #{targetNumber:D4} to NanoChat group #{groupNumber:D4} '{group.Name}'");
+
+        SendGroupNotification(targetCard, "nano-chat-group-invite-title", ("group", group.Name), ("from", senderName));
+        UpdateUIForCard(targetCard);
+    }
+
+    /// <summary>
+    ///     Handles accepting a pending group invitation.
+    /// </summary>
+    private void HandleAcceptInvite(Entity<NanoChatCardComponent> card, NanoChatUiMessageEvent msg)
+    {
+        if (msg.RecipientNumber is not { } groupNumber || card.Comp.Number == null)
+            return;
+
+        var invite = _nanoChat.GetInvite((card, card.Comp), groupNumber);
+        if (invite == null)
+            return;
+
+        _nanoChat.RemoveInvite((card, card.Comp), groupNumber);
+
+        if (_nanoChat.GetGroup((card, card.Comp), groupNumber) != null)
+            return;
+
+        var group = FindGroupDefinition(groupNumber);
+        if (group == null)
+        {
+            UpdateUIForCard(card);
+            return;
+        }
+
+        if (group.Value.Members.Count >= MaxGroupMembers)
+        {
+            SendGroupNotification(card, "nano-chat-group-full", ("group", group.Value.Name));
+            UpdateUIForCard(card);
+            return;
+        }
+
+        var memberInfo = GetMemberInfo(card.Comp.Number.Value) ?? new NanoChatMember(card.Comp.Number.Value, "Unknown");
+        var members = new List<NanoChatMember>(group.Value.Members) { memberInfo };
+        var updatedGroup = group.Value with { Members = members };
+
+        WriteGroupToAllMembers(updatedGroup);
+
+        // Copy recent group history to the new member.
+        var sourceCard = GetGroupMemberCards(groupNumber).FirstOrDefault(c => c.Owner != card.Owner);
+        if (sourceCard.Owner != EntityUid.Invalid && _nanoChat.GetGroupMessages((sourceCard, sourceCard.Comp), groupNumber) is { } history)
+        {
+            var recent = history.Count <= MaxGroupHistoryCopied
+                ? history
+                : history.GetRange(history.Count - MaxGroupHistoryCopied, MaxGroupHistoryCopied);
+            _nanoChat.SetGroup((card, card.Comp), updatedGroup);
+            foreach (var historicalMessage in recent)
+            {
+                _nanoChat.AddGroupMessage((card, card.Comp), groupNumber, historicalMessage);
+            }
+        }
+        else
+        {
+            _nanoChat.SetGroup((card, card.Comp), updatedGroup);
+        }
+
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Low,
+            $"{ToPrettyString(msg.Actor):user} joined NanoChat group #{groupNumber:D4} '{group.Value.Name}' (accepted invite from #{invite.Value.FromNumber:D4})");
+
+        SendGroupNotification(card, "nano-chat-group-joined-title", ("group", group.Value.Name));
+        UpdateUIForCard(card);
+        UpdateUIForAllCards();
+    }
+
+    /// <summary>
+    ///     Handles declining a pending group invitation.
+    /// </summary>
+    private void HandleDeclineInvite(Entity<NanoChatCardComponent> card, NanoChatUiMessageEvent msg)
+    {
+        if (msg.RecipientNumber is not { } groupNumber)
+            return;
+
+        if (_nanoChat.GetInvite((card, card.Comp), groupNumber) == null)
+            return;
+
+        _nanoChat.RemoveInvite((card, card.Comp), groupNumber);
+
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Low,
+            $"{ToPrettyString(msg.Actor):user} declined invite to NanoChat group #{groupNumber:D4}");
+
+        UpdateUIForCard(card);
+    }
+
+    /// <summary>
+    ///     Handles joining a public group without an invite.
+    /// </summary>
+    private void HandleJoinPublicGroup(Entity<NanoChatCardComponent> card, NanoChatUiMessageEvent msg)
+    {
+        if (msg.RecipientNumber is not { } groupNumber || card.Comp.Number == null)
+            return;
+
+        if (_nanoChat.GetGroup((card, card.Comp), groupNumber) != null)
+            return;
+
+        var group = FindGroupDefinition(groupNumber);
+        if (group == null || !group.Value.IsPublic)
+        {
+            UpdateUIForCard(card);
+            return;
+        }
+
+        if (group.Value.Members.Count >= MaxGroupMembers)
+        {
+            SendGroupNotification(card, "nano-chat-group-full", ("group", group.Value.Name));
+            UpdateUIForCard(card);
+            return;
+        }
+
+        var memberInfo = GetMemberInfo(card.Comp.Number.Value) ?? new NanoChatMember(card.Comp.Number.Value, "Unknown");
+        var members = new List<NanoChatMember>(group.Value.Members) { memberInfo };
+        var updatedGroup = group.Value with { Members = members };
+
+        WriteGroupToAllMembers(updatedGroup);
+
+        var sourceCard = GetGroupMemberCards(groupNumber).FirstOrDefault(c => c.Owner != card.Owner);
+        if (sourceCard.Owner != EntityUid.Invalid && _nanoChat.GetGroupMessages((sourceCard, sourceCard.Comp), groupNumber) is { } history)
+        {
+            var recent = history.Count <= MaxGroupHistoryCopied
+                ? history
+                : history.GetRange(history.Count - MaxGroupHistoryCopied, MaxGroupHistoryCopied);
+            _nanoChat.SetGroup((card, card.Comp), updatedGroup);
+            foreach (var historicalMessage in recent)
+            {
+                _nanoChat.AddGroupMessage((card, card.Comp), groupNumber, historicalMessage);
+            }
+        }
+        else
+        {
+            _nanoChat.SetGroup((card, card.Comp), updatedGroup);
+        }
+
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Low,
+            $"{ToPrettyString(msg.Actor):user} joined public NanoChat group #{groupNumber:D4} '{group.Value.Name}'");
+
+        SendGroupNotification(card, "nano-chat-group-joined-title", ("group", group.Value.Name));
+        UpdateUIForCard(card);
+        UpdateUIForAllCards();
+    }
+
+    /// <summary>
+    ///     Handles leaving a group. If the owner leaves, ownership is transferred
+    ///     to the first remaining member; if nobody remains the group is deleted.
+    /// </summary>
+    private void HandleLeaveGroup(Entity<NanoChatCardComponent> card, NanoChatUiMessageEvent msg)
+    {
+        if (msg.RecipientNumber is not { } groupNumber || card.Comp.Number == null)
+            return;
+
+        if (_nanoChat.GetGroup((card, card.Comp), groupNumber) is not { } group)
+            return;
+
+        var isOwner = group.Owner == card.Comp.Number;
+
+        _nanoChat.RemoveGroup((card, card.Comp), groupNumber);
+        UpdateUIForCard(card);
+
+        if (isOwner)
+        {
+            var remainingMembers = group.Members.Where(m => m.Number != card.Comp.Number).ToList();
+            if (remainingMembers.Count == 0)
+            {
+                // No members left, delete the group everywhere.
+                DeleteGroupEverywhere(group);
+                _adminLogger.Add(LogType.Action,
+                    LogImpact.Medium,
+                    $"{ToPrettyString(msg.Actor):user} left NanoChat group #{groupNumber:D4} '{group.Name}' (no members left, group deleted)");
+                return;
+            }
+
+            var newOwner = remainingMembers[0].Number;
+            var updatedGroup = group with { Owner = newOwner, Members = remainingMembers };
+            WriteGroupToAllMembers(updatedGroup);
+
+            if (GetCardByNumber(newOwner) is { } newOwnerCard)
+            {
+                SendGroupNotification(newOwnerCard, "nano-chat-group-owner-title", ("group", group.Name));
+                UpdateUIForCard(newOwnerCard);
+            }
+
+            _adminLogger.Add(LogType.Action,
+                LogImpact.Medium,
+                $"{ToPrettyString(msg.Actor):user} left NanoChat group #{groupNumber:D4} '{group.Name}', ownership transferred to #{newOwner:D4}");
+        }
+        else
+        {
+            var updatedGroup = group with { Members = group.Members.Where(m => m.Number != card.Comp.Number).ToList() };
+            WriteGroupToAllMembers(updatedGroup);
+
+            _adminLogger.Add(LogType.Action,
+                LogImpact.Low,
+                $"{ToPrettyString(msg.Actor):user} left NanoChat group #{groupNumber:D4} '{group.Name}'");
+        }
+
+        UpdateUIForAllCards();
+    }
+
+    /// <summary>
+    ///     Handles kicking a member from a group (owner only).
+    /// </summary>
+    private void HandleKickMember(Entity<NanoChatCardComponent> card, NanoChatUiMessageEvent msg)
+    {
+        if (msg.RecipientNumber is not { } groupNumber || msg.TargetNumber is not { } targetNumber || card.Comp.Number == null)
+            return;
+
+        if (_nanoChat.GetGroup((card, card.Comp), groupNumber) is not { } group)
+            return;
+
+        if (group.Owner != card.Comp.Number)
+            return;
+
+        if (targetNumber == group.Owner || !group.Members.Any(m => m.Number == targetNumber))
+            return;
+
+        var updatedGroup = group with { Members = group.Members.Where(m => m.Number != targetNumber).ToList() };
+        WriteGroupToAllMembers(updatedGroup);
+
+        if (GetCardByNumber(targetNumber) is { } targetCard)
+        {
+            _nanoChat.RemoveGroup((targetCard, targetCard.Comp), groupNumber);
+            _nanoChat.RemoveInvite((targetCard, targetCard.Comp), groupNumber);
+            SendGroupNotification(targetCard, "nano-chat-group-kicked-title", ("group", group.Name));
+            UpdateUIForCard(targetCard);
+        }
+
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Medium,
+            $"{ToPrettyString(msg.Actor):user} kicked #{targetNumber:D4} from NanoChat group #{groupNumber:D4} '{group.Name}'");
+
+        UpdateUIForAllCards();
+    }
+
+    /// <summary>
+    ///     Handles deleting a group entirely (owner only).
+    /// </summary>
+    private void HandleDeleteGroup(Entity<NanoChatCardComponent> card, NanoChatUiMessageEvent msg)
+    {
+        if (msg.RecipientNumber is not { } groupNumber || card.Comp.Number == null)
+            return;
+
+        if (_nanoChat.GetGroup((card, card.Comp), groupNumber) is not { } group)
+            return;
+
+        if (group.Owner != card.Comp.Number)
+            return;
+
+        DeleteGroupEverywhere(group);
+
+        _adminLogger.Add(LogType.Action,
+            LogImpact.Medium,
+            $"{ToPrettyString(msg.Actor):user} deleted NanoChat group #{groupNumber:D4} '{group.Name}'");
+
+        UpdateUIForAllCards();
+    }
+
+    /// <summary>
+    ///     Removes the group and its messages from every card that has it, notifying members.
+    ///     Also removes any stale invitations to the group.
+    /// </summary>
+    private void DeleteGroupEverywhere(NanoChatGroup group)
+    {
+        foreach (var memberCard in GetGroupMemberCards(group.Number))
+        {
+            _nanoChat.RemoveGroup((memberCard, memberCard.Comp), group.Number);
+            SendGroupNotification(memberCard, "nano-chat-group-deleted-title", ("group", group.Name));
+            UpdateUIForCard(memberCard);
+        }
+
+        // Remove stale invitations from all cards, not just members.
+        var query = EntityQueryEnumerator<NanoChatCardComponent>();
+        while (query.MoveNext(out var uid, out var card))
+        {
+            if (_nanoChat.RemoveInvite((uid, card), group.Number))
+                UpdateUIForCard(uid);
+        }
+    }
+
+    /// <summary>
+    ///     Sends a PDA notification to the card's owner.
+    /// </summary>
+    private void SendGroupNotification(Entity<NanoChatCardComponent> card, string titleKey, params (string, object)[] args)
+    {
+        if (card.Comp.PdaUid is not {} pdaUid ||
+            !TryComp<CartridgeLoaderComponent>(pdaUid, out var loader))
+            return;
+
+        var title = Loc.GetString(titleKey, args);
+        _cartridge.SendNotification(pdaUid, title, "", loader);
+    }
+
+    /// <summary>
+    ///     Generates a unique group number.
+    /// </summary>
+    private uint GenerateGroupNumber()
+    {
+        while (true)
+        {
+            var candidate = (uint)_random.Next(1000, 10000);
+            if (FindGroupDefinition(candidate) == null)
+                return candidate;
+        }
+    }
+
+    /// <summary>
+    ///     Gets a <see cref="NanoChatMember" /> for the given NanoChat number.
+    /// </summary>
+    private NanoChatMember? GetMemberInfo(uint number)
+    {
+        var info = GetCardInfo(number);
+        if (info == null)
+            return null;
+
+        return new NanoChatMember(info.Value.Number, info.Value.Name, info.Value.JobTitle);
+    }
+
     /// <summary>
     ///     Ensures a recipient exists in the sender's contacts.
     /// </summary>
@@ -530,9 +1161,11 @@ private void OnUiReady(Entity<NanoChatCartridgeComponent> ent, ref CartridgeUiRe
     private void UpdateUI(Entity<NanoChatCartridgeComponent> ent, EntityUid loader)
     {
         List<NanoChatRecipient>? contacts;
-        if (_station.GetOwningStation(loader) is { } station)
+        EntityUid? station = null;
+        if (_station.GetOwningStation(loader) is { } owningStation)
         {
-            ent.Comp.Station = station;
+            station = owningStation;
+            ent.Comp.Station = owningStation;
 
             contacts = [];
 
@@ -553,6 +1186,10 @@ private void UpdateUI(Entity<NanoChatCartridgeComponent> ent, EntityUid loader)
 
         var recipients = new Dictionary<uint, NanoChatRecipient>();
         var messages = new Dictionary<uint, List<NanoChatMessage>>();
+        var groups = new Dictionary<uint, NanoChatGroup>();
+        var groupMessages = new Dictionary<uint, List<NanoChatMessage>>();
+        var invites = new List<NanoChatGroupInvite>();
+        var publicGroups = new List<NanoChatGroupInfo>();
         uint? currentChat = null;
         uint ownNumber = 0;
         var maxRecipients = 50;
@@ -563,15 +1200,24 @@ private void UpdateUI(Entity<NanoChatCartridgeComponent> ent, EntityUid loader)
         {
             recipients = card.Recipients;
             messages = card.Messages;
+            groups = card.Groups;
+            groupMessages = card.GroupMessages;
+            invites = card.Invites.Values.ToList();
             currentChat = card.CurrentChat;
             ownNumber = card.Number ?? 0;
             maxRecipients = card.MaxRecipients;
             notificationsMuted = card.NotificationsMuted;
             listNumber = card.ListNumber;
+
+            publicGroups = GetPublicGroups((ent.Comp.Card.Value, card), station);
         }
 
         var state = new NanoChatUiState(recipients,
             messages,
+            groups,
+            groupMessages,
+            invites,
+            publicGroups,
             contacts,
             currentChat,
             ownNumber,
@@ -580,4 +1226,43 @@ private void UpdateUI(Entity<NanoChatCartridgeComponent> ent, EntityUid loader)
             listNumber);
         _cartridge.UpdateCartridgeUiState(loader, state);
     }
+
+    /// <summary>
+    ///     Compiles the list of public groups visible to the given card:
+    ///     same station only, excluding groups the viewer is already in.
+    /// </summary>
+    private List<NanoChatGroupInfo> GetPublicGroups(Entity<NanoChatCardComponent> viewerCard, EntityUid? viewerStation)
+    {
+        var result = new List<NanoChatGroupInfo>();
+        var seen = new HashSet<uint>();
+
+        if (viewerStation == null)
+            return result;
+
+        var query = EntityQueryEnumerator<NanoChatCardComponent>();
+        while (query.MoveNext(out var cardUid, out var card))
+        {
+            if (_station.GetOwningStation(cardUid) != viewerStation)
+                continue;
+
+            foreach (var group in card.Groups.Values)
+            {
+                if (!group.IsPublic || seen.Contains(group.Number))
+                    continue;
+
+                if (_nanoChat.GetGroup((viewerCard, viewerCard.Comp), group.Number) != null)
+                    continue;
+
+                var groupNumber = group.Number;
+
+                seen.Add(groupNumber);
+
+                var ownerName = GetCardInfo(group.Owner)?.Name;
+                result.Add(new NanoChatGroupInfo(groupNumber, group.Name, ownerName, group.Members.Count));
+            }
+        }
+
+        result.Sort((a, b) => string.CompareOrdinal(a.Name, b.Name));
+        return result;
+    }
 }
diff --git a/Content.Server/ADT/NanoChat/NanoChatSystem.cs b/Content.Server/ADT/NanoChat/NanoChatSystem.cs
index 3313449c66b..491a919f1b7 100644
--- a/Content.Server/ADT/NanoChat/NanoChatSystem.cs
+++ b/Content.Server/ADT/NanoChat/NanoChatSystem.cs
@@ -69,6 +69,7 @@ private void OnMicrowaved(Entity<NanoChatCardComponent> ent, ref BeingMicrowaved
         if (randomPick <= 0.10f)
         {
             ent.Comp.Messages.Clear();
+            ent.Comp.GroupMessages.Clear();
             // TODO: these shouldn't be shown at the same time as the popups from IdCardSystem
             // _popup.PopupEntity(Loc.GetString("nanochat-card-microwave-erased", ("card", ent)),
             //     ent,
@@ -123,6 +124,20 @@ private void ScrambleMessages(NanoChatCardComponent component)
                 component.Messages[recipientNumber].Clear();
             }
         }
+
+        // Group messages get scrambled too, but never reassigned.
+        foreach (var (_, messages) in component.GroupMessages)
+        {
+            for (var i = 0; i < messages.Count; i++)
+            {
+                if (!_random.Prob(0.5f))
+                    continue;
+
+                var message = messages[i];
+                message.Content = ScrambleText(message.Content);
+                messages[i] = message;
+            }
+        }
     }
 
     private string ScrambleText(string text)
diff --git a/Content.Server/CartridgeLoader/Cartridges/NewsReaderCartridgeComponent.cs b/Content.Server/CartridgeLoader/Cartridges/NewsReaderCartridgeComponent.cs
index 525b9fa245e..46db22a84b3 100644
--- a/Content.Server/CartridgeLoader/Cartridges/NewsReaderCartridgeComponent.cs
+++ b/Content.Server/CartridgeLoader/Cartridges/NewsReaderCartridgeComponent.cs
@@ -1,3 +1,5 @@
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
 namespace Content.Server.CartridgeLoader.Cartridges;
 
 [RegisterComponent]
@@ -8,4 +10,11 @@ public sealed partial class NewsReaderCartridgeComponent : Component
 
     [ViewVariables(VVAccess.ReadWrite), DataField]
     public bool NotificationOn = true;
+
+    // ADT-Tweak: кулдаун комментариев
+    /// <summary>
+    ///     Last time this reader posted a comment, for rate limiting.
+    /// </summary>
+    [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+    public TimeSpan LastCommentTime;
 }
diff --git a/Content.Server/MassMedia/Systems/NewsSystem.cs b/Content.Server/MassMedia/Systems/NewsSystem.cs
index 16a7243815b..d6dc51f9205 100644
--- a/Content.Server/MassMedia/Systems/NewsSystem.cs
+++ b/Content.Server/MassMedia/Systems/NewsSystem.cs
@@ -47,6 +47,11 @@ public sealed class NewsSystem : SharedNewsSystem
     [Dependency] private readonly IConfigurationManager _cfg = default!;
     [Dependency] private readonly IBaseServer _baseServer = default!;
 
+    // ADT-Tweak: комментарии к новостям
+    private const int MaxCommentLength = 200;
+    private static readonly TimeSpan CommentCooldown = TimeSpan.FromSeconds(3);
+    private const int MaxCommentsPerArticle = 100;
+
     private WebhookIdentifier? _webhookId = null;
     private Color _webhookEmbedColor;
     private bool _webhookSendDuringRound;
@@ -210,7 +215,8 @@ public bool TryAddNews(EntityUid uid, string title, string content, [NotNullWhen
             Title = title.Length <= MaxTitleLength ? title : $"{title[..MaxTitleLength]}...",
             Content = content.Length <= MaxContentLength ? content : $"{content[..MaxContentLength]}...",
             Author = author,
-            ShareTime = _ticker.RoundDuration()
+            ShareTime = _ticker.RoundDuration(),
+            Comments = new List<NewsComment>()
         };
 
         articles.Add(article.Value);
@@ -295,6 +301,9 @@ private void OnReaderUiMessage(Entity<NewsReaderCartridgeComponent> ent, ref Car
             case NewsReaderUiAction.NotificationSwitch:
                 ent.Comp.NotificationOn = !ent.Comp.NotificationOn;
                 break;
+            case NewsReaderUiAction.AddComment:
+                HandleAddComment(ent, message.Content, message.Actor);
+                break;
         }
 
         UpdateReaderUi(ent, GetEntity(args.LoaderUid));
@@ -304,6 +313,66 @@ private void OnReaderUiReady(Entity<NewsReaderCartridgeComponent> ent, ref Cartr
     {
         UpdateReaderUi(ent, args.Loader);
     }
+
+    /// <summary>
+    ///     Adds a comment to the article the reader is currently viewing. // ADT-Tweak
+    ///     The comment becomes visible to every reader on the station.
+    /// </summary>
+    private void HandleAddComment(Entity<NewsReaderCartridgeComponent> ent, string? rawContent, EntityUid actor)
+    {
+        if (string.IsNullOrWhiteSpace(rawContent))
+            return;
+
+        // Rate limit comments per reader.
+        if (_timing.CurTime - ent.Comp.LastCommentTime < CommentCooldown)
+            return;
+
+        if (!TryGetArticles(ent, out var articles))
+            return;
+
+        if (ent.Comp.ArticleNumber < 0 || ent.Comp.ArticleNumber >= articles.Count)
+            return;
+
+        var article = articles[ent.Comp.ArticleNumber];
+        article.Comments ??= new List<NewsComment>();
+
+        if (article.Comments.Count >= MaxCommentsPerArticle)
+            return;
+
+        var content = FormattedMessage.EscapeText(rawContent.Trim());
+        if (content.Length > MaxCommentLength)
+            content = content[..MaxCommentLength];
+
+        var tryGetIdentityShortInfoEvent = new TryGetIdentityShortInfoEvent(ent, actor);
+        RaiseLocalEvent(tryGetIdentityShortInfoEvent);
+        string? authorName = tryGetIdentityShortInfoEvent.Title;
+
+        article.Comments.Add(new NewsComment
+        {
+            Author = authorName,
+            Content = content,
+            ShareTime = _ticker.RoundDuration()
+        });
+        articles[ent.Comp.ArticleNumber] = article;
+
+        ent.Comp.LastCommentTime = _timing.CurTime;
+
+        _adminLogger.Add(
+            LogType.Chat,
+            LogImpact.Low,
+            $"{ToPrettyString(actor):actor} commented on news article {article.Title} by {article.Author}: {content}"
+        );
+
+        // Update every reader so everyone sees the new comment.
+        var query = EntityQueryEnumerator<NewsReaderCartridgeComponent, CartridgeComponent>();
+        while (query.MoveNext(out var readerUid, out var readerComp, out var cartridge))
+        {
+            if (cartridge.LoaderUid is not { } loaderUid)
+                continue;
+
+            UpdateReaderUi((readerUid, readerComp), loaderUid);
+        }
+    }
     #endregion
 
     private bool TryGetArticles(EntityUid uid, [NotNullWhen(true)] out List<NewsArticle>? articles)
diff --git a/Content.Shared/ADT/CartridgeLoader/Cartridges/NanoChatGroup.cs b/Content.Shared/ADT/CartridgeLoader/Cartridges/NanoChatGroup.cs
new file mode 100644
index 00000000000..04cd7ecd41f
--- /dev/null
+++ b/Content.Shared/ADT/CartridgeLoader/Cartridges/NanoChatGroup.cs
@@ -0,0 +1,156 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.ADT.CartridgeLoader.Cartridges;
+
+/// <summary>
+///     A group chat in NanoChat. Group data is replicated on every member card;
+///     the server is the source of truth and rewrites it on every group operation.
+/// </summary>
+[Serializable, NetSerializable, DataRecord]
+public partial struct NanoChatGroup
+{
+    /// <summary>
+    ///     Unique group number.
+    /// </summary>
+    public uint Number;
+
+    /// <summary>
+    ///     Display name of the group.
+    /// </summary>
+    public string Name;
+
+    /// <summary>
+    ///     Whether anyone can join the group without an invitation.
+    /// </summary>
+    public bool IsPublic;
+
+    /// <summary>
+    ///     NanoChat number of the group owner.
+    /// </summary>
+    public uint Owner;
+
+    /// <summary>
+    ///     All members of the group, including the owner.
+    /// </summary>
+    public List<NanoChatMember> Members;
+
+    /// <summary>
+    ///     Whether the group has unread messages.
+    /// </summary>
+    public bool HasUnread;
+
+    public NanoChatGroup(
+        uint number,
+        string name,
+        bool isPublic,
+        uint owner,
+        List<NanoChatMember> members,
+        bool hasUnread = false)
+    {
+        Number = number;
+        Name = name;
+        IsPublic = isPublic;
+        Owner = owner;
+        Members = members;
+        HasUnread = hasUnread;
+    }
+}
+
+/// <summary>
+///     A single member of a group chat.
+/// </summary>
+[Serializable, NetSerializable, DataRecord]
+public partial struct NanoChatMember
+{
+    /// <summary>
+    ///     The member's NanoChat number.
+    /// </summary>
+    public uint Number;
+
+    /// <summary>
+    ///     The member's display name.
+    /// </summary>
+    public string Name;
+
+    /// <summary>
+    ///     The member's job title, if available.
+    /// </summary>
+    public string? JobTitle;
+
+    public NanoChatMember(uint number, string name, string? jobTitle = null)
+    {
+        Number = number;
+        Name = name;
+        JobTitle = jobTitle;
+    }
+}
+
+/// <summary>
+///     A pending group invitation stored on the invitee's card.
+/// </summary>
+[Serializable, NetSerializable, DataRecord]
+public partial struct NanoChatGroupInvite
+{
+    /// <summary>
+    ///     Number of the group the invitee was invited to.
+    /// </summary>
+    public uint GroupNumber;
+
+    /// <summary>
+    ///     Name of the group.
+    /// </summary>
+    public string GroupName;
+
+    /// <summary>
+    ///     NanoChat number of the player who sent the invite.
+    /// </summary>
+    public uint FromNumber;
+
+    /// <summary>
+    ///     Name of the player who sent the invite.
+    /// </summary>
+    public string FromName;
+
+    public NanoChatGroupInvite(uint groupNumber, string groupName, uint fromNumber, string fromName)
+    {
+        GroupNumber = groupNumber;
+        GroupName = groupName;
+        FromNumber = fromNumber;
+        FromName = fromName;
+    }
+}
+
+/// <summary>
+///     Public info about a group, shown in the group browser.
+/// </summary>
+[Serializable, NetSerializable, DataRecord]
+public partial struct NanoChatGroupInfo
+{
+    /// <summary>
+    ///     Number of the group.
+    /// </summary>
+    public uint Number;
+
+    /// <summary>
+    ///     Name of the group.
+    /// </summary>
+    public string Name;
+
+    /// <summary>
+    ///     Name of the group owner.
+    /// </summary>
+    public string? OwnerName;
+
+    /// <summary>
+    ///     Current member count.
+    /// </summary>
+    public int MemberCount;
+
+    public NanoChatGroupInfo(uint number, string name, string? ownerName, int memberCount)
+    {
+        Number = number;
+        Name = name;
+        OwnerName = ownerName;
+        MemberCount = memberCount;
+    }
+}
diff --git a/Content.Shared/ADT/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs b/Content.Shared/ADT/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
index 0063907b34f..b0ed04a6b76 100644
--- a/Content.Shared/ADT/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
+++ b/Content.Shared/ADT/CartridgeLoader/Cartridges/NanoChatUiMessageEvent.cs
@@ -26,6 +26,26 @@ public sealed class NanoChatUiMessageEvent : CartridgeMessageEvent
     /// </summary>
     public readonly string? RecipientJob;
 
+    /// <summary>
+    ///     The group name when creating a group.
+    /// </summary>
+    public readonly string? GroupName;
+
+    /// <summary>
+    ///     Whether the created group is public.
+    /// </summary>
+    public readonly bool IsPublic;
+
+    /// <summary>
+    ///     Target NanoChat number for group operations (invite, kick).
+    /// </summary>
+    public readonly uint? TargetNumber;
+
+    /// <summary>
+    ///     Initial member numbers when creating a group.
+    /// </summary>
+    public readonly List<uint>? Members;
+
     /// <summary>
     ///     Creates a new NanoChat UI message event.
     /// </summary>
@@ -33,15 +53,27 @@ public sealed class NanoChatUiMessageEvent : CartridgeMessageEvent
     /// <param name="recipientNumber">Optional recipient number for the message</param>
     /// <param name="content">Optional content of the message</param>
     /// <param name="recipientJob">Optional job title for new chat creation</param>
+    /// <param name="groupName">Optional group name for group creation</param>
+    /// <param name="isPublic">Whether the created group is public</param>
+    /// <param name="targetNumber">Optional target number for group operations</param>
+    /// <param name="members">Optional initial members for group creation</param>
     public NanoChatUiMessageEvent(NanoChatUiMessageType type,
         uint? recipientNumber = null,
         string? content = null,
-        string? recipientJob = null)
+        string? recipientJob = null,
+        string? groupName = null,
+        bool isPublic = false,
+        uint? targetNumber = null,
+        List<uint>? members = null)
     {
         Type = type;
         RecipientNumber = recipientNumber;
         Content = content;
         RecipientJob = recipientJob;
+        GroupName = groupName;
+        IsPublic = isPublic;
+        TargetNumber = targetNumber;
+        Members = members;
     }
 }
 
@@ -55,6 +87,14 @@ public enum NanoChatUiMessageType : byte
     DeleteChat,
     ToggleMute,
     ToggleListNumber,
+    CreateGroup,
+    InviteToGroup,
+    AcceptInvite,
+    DeclineInvite,
+    JoinPublicGroup,
+    LeaveGroup,
+    KickMember,
+    DeleteGroup,
 }
 
 // putting this here because i can
@@ -147,11 +187,15 @@ public NanoChatMessage(TimeSpan timestamp, string content, uint senderId, bool d
 public readonly partial struct NanoChatData(
     Dictionary<uint, NanoChatRecipient> recipients,
     Dictionary<uint, List<NanoChatMessage>> messages,
+    Dictionary<uint, NanoChatGroup> groups,
+    Dictionary<uint, List<NanoChatMessage>> groupMessages,
     uint? cardNumber,
     NetEntity card)
 {
     public Dictionary<uint, NanoChatRecipient> Recipients { get; } = recipients;
     public Dictionary<uint, List<NanoChatMessage>> Messages { get; } = messages;
+    public Dictionary<uint, NanoChatGroup> Groups { get; } = groups;
+    public Dictionary<uint, List<NanoChatMessage>> GroupMessages { get; } = groupMessages;
     public uint? CardNumber { get; } = cardNumber;
     public NetEntity Card { get; } = card;
 }
diff --git a/Content.Shared/ADT/CartridgeLoader/Cartridges/NanoChatUiState.cs b/Content.Shared/ADT/CartridgeLoader/Cartridges/NanoChatUiState.cs
index 5b2aa4c03f6..12686c49e8f 100644
--- a/Content.Shared/ADT/CartridgeLoader/Cartridges/NanoChatUiState.cs
+++ b/Content.Shared/ADT/CartridgeLoader/Cartridges/NanoChatUiState.cs
@@ -7,6 +7,10 @@ public sealed class NanoChatUiState : BoundUserInterfaceState
 {
     public readonly Dictionary<uint, NanoChatRecipient> Recipients = new();
     public readonly Dictionary<uint, List<NanoChatMessage>> Messages = new();
+    public readonly Dictionary<uint, NanoChatGroup> Groups = new();
+    public readonly Dictionary<uint, List<NanoChatMessage>> GroupMessages = new();
+    public readonly List<NanoChatGroupInvite> Invites = new();
+    public readonly List<NanoChatGroupInfo> PublicGroups = new();
     public readonly List<NanoChatRecipient>? Contacts;
     public readonly uint? CurrentChat;
     public readonly uint OwnNumber;
@@ -17,6 +21,10 @@ public sealed class NanoChatUiState : BoundUserInterfaceState
     public NanoChatUiState(
         Dictionary<uint, NanoChatRecipient> recipients,
         Dictionary<uint, List<NanoChatMessage>> messages,
+        Dictionary<uint, NanoChatGroup> groups,
+        Dictionary<uint, List<NanoChatMessage>> groupMessages,
+        List<NanoChatGroupInvite> invites,
+        List<NanoChatGroupInfo> publicGroups,
         List<NanoChatRecipient>? contacts,
         uint? currentChat,
         uint ownNumber,
@@ -26,6 +34,10 @@ public NanoChatUiState(
     {
         Recipients = recipients;
         Messages = messages;
+        Groups = groups;
+        GroupMessages = groupMessages;
+        Invites = invites;
+        PublicGroups = publicGroups;
         Contacts = contacts;
         CurrentChat = currentChat;
         OwnNumber = ownNumber;
diff --git a/Content.Shared/ADT/NanoChat/NanoChatCardComponent.cs b/Content.Shared/ADT/NanoChat/NanoChatCardComponent.cs
index e2e391e639d..76e66d99c9c 100644
--- a/Content.Shared/ADT/NanoChat/NanoChatCardComponent.cs
+++ b/Content.Shared/ADT/NanoChat/NanoChatCardComponent.cs
@@ -32,6 +32,24 @@ public sealed partial class NanoChatCardComponent : Component
     [DataField]
     public uint? CurrentChat;
 
+    /// <summary>
+    ///     All group chats this card is a member of, keyed by group number.
+    /// </summary>
+    [DataField]
+    public Dictionary<uint, NanoChatGroup> Groups = new();
+
+    /// <summary>
+    ///     All group chat messages stored on this card, keyed by group number.
+    /// </summary>
+    [DataField]
+    public Dictionary<uint, List<NanoChatMessage>> GroupMessages = new();
+
+    /// <summary>
+    ///     Pending group invitations stored on this card, keyed by group number.
+    /// </summary>
+    [DataField]
+    public Dictionary<uint, NanoChatGroupInvite> Invites = new();
+
     /// <summary>
     ///     The maximum amount of recipients this card supports.
     /// </summary>
diff --git a/Content.Shared/ADT/NanoChat/SharedNanoChatSystem.cs b/Content.Shared/ADT/NanoChat/SharedNanoChatSystem.cs
index 90d6a7ddcaa..92045988d37 100644
--- a/Content.Shared/ADT/NanoChat/SharedNanoChatSystem.cs
+++ b/Content.Shared/ADT/NanoChat/SharedNanoChatSystem.cs
@@ -292,5 +292,120 @@ public bool EnsureRecipientExists(Entity<NanoChatCardComponent?> card,
         return true;
     }
 
+    /// <summary>
+    ///     Gets a group from the card by its number.
+    /// </summary>
+    public NanoChatGroup? GetGroup(Entity<NanoChatCardComponent?> card, uint groupNumber)
+    {
+        if (!Resolve(card, ref card.Comp) || !card.Comp.Groups.TryGetValue(groupNumber, out var group))
+            return null;
+
+        return group;
+    }
+
+    /// <summary>
+    ///     Sets a group on the card (adds or replaces).
+    /// </summary>
+    public void SetGroup(Entity<NanoChatCardComponent?> card, NanoChatGroup group)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return;
+
+        card.Comp.Groups[group.Number] = group;
+        Dirty(card);
+    }
+
+    /// <summary>
+    ///     Removes a group and its messages from the card.
+    /// </summary>
+    public bool RemoveGroup(Entity<NanoChatCardComponent?> card, uint groupNumber, bool keepMessages = false)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return false;
+
+        var removed = card.Comp.Groups.Remove(groupNumber);
+
+        if (!keepMessages)
+            card.Comp.GroupMessages.Remove(groupNumber);
+
+        // Don't leave the UI pointing at a removed group.
+        if (card.Comp.CurrentChat == groupNumber)
+            card.Comp.CurrentChat = null;
+
+        if (removed)
+            Dirty(card);
+
+        return removed;
+    }
+
+    /// <summary>
+    ///     Adds a message to a group conversation on the card.
+    /// </summary>
+    public void AddGroupMessage(Entity<NanoChatCardComponent?> card, uint groupNumber, NanoChatMessage message)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return;
+
+        if (!card.Comp.GroupMessages.TryGetValue(groupNumber, out var messages))
+        {
+            messages = new List<NanoChatMessage>();
+            card.Comp.GroupMessages[groupNumber] = messages;
+        }
+
+        messages.Add(message);
+        card.Comp.LastMessageTime = _timing.CurTime;
+        Dirty(card);
+    }
+
+    /// <summary>
+    ///     Gets all group messages for a specific group from the card.
+    /// </summary>
+    public List<NanoChatMessage>? GetGroupMessages(Entity<NanoChatCardComponent?> card, uint groupNumber)
+    {
+        if (!Resolve(card, ref card.Comp) || !card.Comp.GroupMessages.TryGetValue(groupNumber, out var messages))
+            return null;
+
+        return new List<NanoChatMessage>(messages);
+    }
+
+    /// <summary>
+    ///     Adds a pending group invitation to the card.
+    /// </summary>
+    public void AddInvite(Entity<NanoChatCardComponent?> card, NanoChatGroupInvite invite)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return;
+
+        card.Comp.Invites[invite.GroupNumber] = invite;
+        Dirty(card);
+    }
+
+    /// <summary>
+    ///     Removes a pending group invitation from the card.
+    /// </summary>
+    public bool RemoveInvite(Entity<NanoChatCardComponent?> card, uint groupNumber)
+    {
+        if (!Resolve(card, ref card.Comp))
+            return false;
+
+        var removed = card.Comp.Invites.Remove(groupNumber);
+
+        if (removed)
+            Dirty(card);
+
+        return removed;
+    }
+
+    /// <summary>
+    ///     Gets a pending group invitation from the card.
+    /// </summary>
+    public NanoChatGroupInvite? GetInvite(Entity<NanoChatCardComponent?> card, uint groupNumber)
+    {
+        if (!Resolve(card, ref card.Comp) || !card.Comp.Invites.TryGetValue(groupNumber, out var invite))
+            return null;
+
+        return invite;
+    }
+
     #endregion
 }
diff --git a/Content.Shared/CartridgeLoader/Cartridges/NewsReaderUiMessageEvent.cs b/Content.Shared/CartridgeLoader/Cartridges/NewsReaderUiMessageEvent.cs
index bab10c01c42..010299968c1 100644
--- a/Content.Shared/CartridgeLoader/Cartridges/NewsReaderUiMessageEvent.cs
+++ b/Content.Shared/CartridgeLoader/Cartridges/NewsReaderUiMessageEvent.cs
@@ -7,9 +7,16 @@ public sealed class NewsReaderUiMessageEvent : CartridgeMessageEvent
 {
     public readonly NewsReaderUiAction Action;
 
-    public NewsReaderUiMessageEvent(NewsReaderUiAction action)
+    // ADT-Tweak: комментарии к новостям
+    /// <summary>
+    ///     Comment content for the <see cref="NewsReaderUiAction.AddComment" /> action.
+    /// </summary>
+    public readonly string? Content;
+
+    public NewsReaderUiMessageEvent(NewsReaderUiAction action, string? content = null)
     {
         Action = action;
+        Content = content;
     }
 }
 
@@ -18,5 +25,6 @@ public enum NewsReaderUiAction
 {
     Next,
     Prev,
-    NotificationSwitch
+    NotificationSwitch,
+    AddComment // ADT-Tweak
 }
diff --git a/Content.Shared/MassMedia/Systems/SharedNewsSystem.cs b/Content.Shared/MassMedia/Systems/SharedNewsSystem.cs
index b1855d97f7d..449ad19bae3 100644
--- a/Content.Shared/MassMedia/Systems/SharedNewsSystem.cs
+++ b/Content.Shared/MassMedia/Systems/SharedNewsSystem.cs
@@ -25,6 +25,26 @@ public struct NewsArticle
 
     [ViewVariables]
     public TimeSpan ShareTime;
+
+    // ADT-Tweak: комментарии читателей к статье
+    [ViewVariables]
+    public List<NewsComment>? Comments;
+}
+
+/// <summary>
+///     A single reader comment on a news article. // ADT-Tweak
+/// </summary>
+[Serializable, NetSerializable]
+public struct NewsComment
+{
+    [ViewVariables(VVAccess.ReadWrite)]
+    public string? Author;
+
+    [ViewVariables(VVAccess.ReadWrite)]
+    public string Content;
+
+    [ViewVariables]
+    public TimeSpan ShareTime;
 }
 
 [ByRefEvent]
diff --git a/Resources/Locale/en-US/ADT/nanochat/ui.ftl b/Resources/Locale/en-US/ADT/nanochat/ui.ftl
new file mode 100644
index 00000000000..bf57780a10f
--- /dev/null
+++ b/Resources/Locale/en-US/ADT/nanochat/ui.ftl
@@ -0,0 +1,73 @@
+nano-chat-program-name = NanoMax
+nano-chat-title = NanoMax
+nano-chat-new-chat = New chat
+nano-chat-contacts = CONTACTS
+nano-chat-no-chats = No active chats
+nano-chat-select-chat = Select a chat to start
+nano-chat-message-placeholder = Start typing...
+nano-chat-send = Send
+nano-chat-delete = Delete
+nano-chat-loading = Loading...
+nano-chat-message-too-long = Message is too long ({ $current } of { $max } max characters)
+nano-chat-max-recipients = Max chats reached
+nano-chat-new-message-title = Message from { $sender }
+nano-chat-new-message-body = { $message }
+nano-chat-toggle-mute = Mute notifications
+nano-chat-delivery-failed = Delivery failed
+nano-chat-look-up-no-server = Could not find telecomms server
+nano-chat-look-up = Look up numbers
+nano-chat-list-number = List number
+nano-chat-new-title = Create new chat
+nano-chat-number-label = User
+nano-chat-name-label = Name
+nano-chat-job-label = Job title
+nano-chat-number-placeholder = Enter number
+nano-chat-name-placeholder = Enter name
+nano-chat-job-placeholder = Enter job title (optional)
+nano-chat-cancel = Cancel
+nano-chat-create = Create
+nano-chat-contacts-tab = Contacts
+nano-chat-groups-tab = Groups
+nano-chat-invites-tab = Invites
+nano-chat-create-group = Create group
+nano-chat-group-create-title = Create group
+nano-chat-group-name-label = Group name
+nano-chat-group-name-placeholder = Enter group name
+nano-chat-group-public = Public (join without an invite)
+nano-chat-group-select-members = Select members
+nano-chat-group-members-count = { $count } { $count ->
+    [one] member
+   *[other] members
+}
+nano-chat-group-members = Members
+nano-chat-group-member-list = Member list
+nano-chat-group-invite = Invite
+nano-chat-group-invite-placeholder = Enter number
+nano-chat-group-leave = Leave group
+nano-chat-group-leave-owner = Leave (transfer ownership)
+nano-chat-group-delete = Delete group
+nano-chat-group-kick = Kick
+nano-chat-group-join = Join
+nano-chat-group-accept = Accept
+nano-chat-group-decline = Decline
+nano-chat-group-no-groups = No public groups
+nano-chat-group-no-invites = No invites
+nano-chat-group-unknown-owner = Unknown
+nano-chat-group-info = { $name } | Owner: { $owner } | { $count } members
+nano-chat-group-invite-info = Group: { $group } | From: { $from }
+nano-chat-group-message-title = Group { $group }
+nano-chat-group-invite-title = Invite to group { $group }
+nano-chat-group-invite-body = From { $from }
+nano-chat-group-added-title = You were added to group { $group }
+nano-chat-group-joined-title = You joined group { $group }
+nano-chat-group-kicked-title = You were kicked from group { $group }
+nano-chat-group-deleted-title = Group { $group } was deleted
+nano-chat-group-owner-title = You are now the owner of group { $group }
+nano-chat-group-full = Group { $group } is full
+log-probe-groups = { $count } Groups
+log-probe-group-format = Group: { $group } | Owner: { $owner } | { $count } members
+
+nano-chat-public-group-info = { $count } members | Owner: { $owner }
+nano-chat-invite-row = Invite from { $from }
+nano-chat-invites-section = INVITES
+nano-chat-public-groups-section = PUBLIC GROUPS
diff --git a/Resources/Locale/en-US/mass-media/news-ui.ftl b/Resources/Locale/en-US/mass-media/news-ui.ftl
index b6c826936ba..5227f532420 100644
--- a/Resources/Locale/en-US/mass-media/news-ui.ftl
+++ b/Resources/Locale/en-US/mass-media/news-ui.ftl
@@ -36,3 +36,7 @@ news-write-ui-richtext-tooltip = News articles support rich text
 
 news-pda-notification-header = New news article
 news-publish-admin-announcement = {$actor} published news article {$title} by {$author}
+news-read-ui-comment-placeholder = Leave a comment...
+news-read-ui-comment-send = Send
+news-read-ui-comment-no-comments = No comments yet
+news-read-ui-comments-button = Comments ({ $count })
diff --git a/Resources/Locale/ru-RU/ADT/nanochat/ui.ftl b/Resources/Locale/ru-RU/ADT/nanochat/ui.ftl
index cf273155456..3ea70e2ec08 100644
--- a/Resources/Locale/ru-RU/ADT/nanochat/ui.ftl
+++ b/Resources/Locale/ru-RU/ADT/nanochat/ui.ftl
@@ -34,3 +34,49 @@ log-probe-card-number = Карта: { $number }
 log-probe-recipients = { $count } Получатели
 log-probe-recipient-list = Известные Получатели:
 log-probe-message-format = { $sender } → { $recipient }: { $content }
+nano-chat-contacts-tab = Контакты
+nano-chat-groups-tab = Группы
+nano-chat-invites-tab = Приглашения
+nano-chat-create-group = Создать группу
+nano-chat-group-create-title = Создать группу
+nano-chat-group-name-label = Название группы
+nano-chat-group-name-placeholder = Введите название группы
+nano-chat-group-public = Публичная (можно вступить без приглашения)
+nano-chat-group-select-members = Выберите участников
+nano-chat-group-members-count = { $count } { $count ->
+    [one] участник
+    [few] участника
+   *[other] участников
+}
+nano-chat-group-members = Участники
+nano-chat-group-member-list = Список участников
+nano-chat-group-invite = Пригласить
+nano-chat-group-invite-placeholder = Введите номер
+nano-chat-group-leave = Выйти из группы
+nano-chat-group-leave-owner = Выйти (передать владение)
+nano-chat-group-delete = Удалить группу
+nano-chat-group-kick = Исключить
+nano-chat-group-join = Вступить
+nano-chat-group-accept = Принять
+nano-chat-group-decline = Отклонить
+nano-chat-group-no-groups = Публичных групп нет
+nano-chat-group-no-invites = Приглашений нет
+nano-chat-group-unknown-owner = Неизвестный
+nano-chat-group-info = { $name } | Владелец: { $owner } | { $count } участников
+nano-chat-group-invite-info = Группа: { $group } | От: { $from }
+nano-chat-group-message-title = Группа { $group }
+nano-chat-group-invite-title = Приглашение в группу { $group }
+nano-chat-group-invite-body = От { $from }
+nano-chat-group-added-title = Вы добавлены в группу { $group }
+nano-chat-group-joined-title = Вы вступили в группу { $group }
+nano-chat-group-kicked-title = Вы исключены из группы { $group }
+nano-chat-group-deleted-title = Группа { $group } удалена
+nano-chat-group-owner-title = Вы теперь владелец группы { $group }
+nano-chat-group-full = Группа { $group } заполнена
+log-probe-groups = { $count } Группы
+log-probe-group-format = Группа: { $group } | Владелец: { $owner } | { $count } участников
+
+nano-chat-public-group-info = { $count } участников | Владелец: { $owner }
+nano-chat-invite-row = Приглашение от { $from }
+nano-chat-invites-section = ПРИГЛАШЕНИЯ
+nano-chat-public-groups-section = ПУБЛИЧНЫЕ ГРУППЫ
diff --git a/Resources/Locale/ru-RU/mass-media/news-ui.ftl b/Resources/Locale/ru-RU/mass-media/news-ui.ftl
index e9f70e4824f..6912b8f80df 100644
--- a/Resources/Locale/ru-RU/mass-media/news-ui.ftl
+++ b/Resources/Locale/ru-RU/mass-media/news-ui.ftl
@@ -41,3 +41,7 @@ news-write-ui-richtext-tooltip =
     { "[bullet/]bullet[/color]" }
 news-pda-notification-header = Новая новостная статья
 news-publish-admin-announcement = { $actor } опубликовал(а) новостную статью { $title } за авторством { $author }
+news-read-ui-comment-placeholder = Оставьте комментарий...
+news-read-ui-comment-send = Отправить
+news-read-ui-comment-no-comments = Комментариев пока нет
+news-read-ui-comments-button = Комментарии ({ $count })

From 795a485d42e5c21c25c91e3971247f05b3f2f550 Mon Sep 17 00:00:00 2001
From: ultradyper <ultradyper@users.noreply.github.com>
Date: Fri, 14 Aug 2026 08:46:40 +0000
Subject: [PATCH 2/2] =?UTF-8?q?tweak:=20=D0=A0=D0=B5=D0=B2=D0=BE=D1=80?=
 =?UTF-8?q?=D0=BA=20UI=20=D0=9D=D0=B0=D0=BD=D0=BE=D0=9C=D0=B0=D0=BA=D1=81:?=
 =?UTF-8?q?=20=D0=B8=D0=BD=D0=BB=D0=B0=D0=B9=D0=BD-=D1=81=D0=BE=D0=B7?=
 =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF?=
 =?UTF-8?q?,=20=D0=BF=D0=BE=D0=B8=D1=81=D0=BA,=20=D1=83=D1=87=D0=B0=D1=81?=
 =?UTF-8?q?=D1=82=D0=BD=D0=B8=D0=BA=D0=B8=20=D0=B2=20=D0=BE=D1=81=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BD=D0=BE=D0=BC=20=D0=BE=D0=BA=D0=BD=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Cartridges/CreateGroupPopup.xaml          |  49 -----
 .../Cartridges/CreateGroupPopup.xaml.cs       |  93 --------
 .../Cartridges/GroupMembersPopup.xaml         |  53 -----
 .../Cartridges/GroupMembersPopup.xaml.cs      | 128 -----------
 .../Cartridges/NanoChatEntry.xaml             |  29 +--
 .../Cartridges/NanoChatLookupView.xaml        |  72 +++++-
 .../Cartridges/NanoChatLookupView.xaml.cs     | 200 +++++++++++++----
 .../Cartridges/NanoChatUiFragment.xaml        | 120 ++++++----
 .../Cartridges/NanoChatUiFragment.xaml.cs     | 206 +++++++++++-------
 .../Cartridges/NewChatPopup.xaml              |  52 -----
 .../Cartridges/NewChatPopup.xaml.cs           |  87 --------
 .../Cartridges/NanoChatCartridgeSystem.cs     |  17 ++
 Resources/Locale/en-US/ADT/nanochat/ui.ftl    |  25 ++-
 Resources/Locale/ru-RU/ADT/nanochat/ui.ftl    |  16 +-
 14 files changed, 491 insertions(+), 656 deletions(-)
 delete mode 100644 Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml
 delete mode 100644 Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml.cs
 delete mode 100644 Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml
 delete mode 100644 Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml.cs
 delete mode 100644 Content.Client/ADT/CartridgeLoader/Cartridges/NewChatPopup.xaml
 delete mode 100644 Content.Client/ADT/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs

diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml b/Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml
deleted file mode 100644
index e484f447378..00000000000
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml
+++ /dev/null
@@ -1,49 +0,0 @@
-<DefaultWindow xmlns="https://spacestation14.io"
-               Title="{Loc nano-chat-group-create-title}"
-               MinSize="360 420">
-    <PanelContainer StyleClasses="AngleRect">
-        <BoxContainer Orientation="Vertical" Margin="4">
-            <!-- Name input -->
-            <BoxContainer Orientation="Vertical" Margin="0 4">
-                <Label Text="{Loc nano-chat-group-name-label}"
-                       StyleClasses="LabelHeading" />
-                <PanelContainer StyleClasses="ButtonSquare">
-                    <LineEdit Name="NameInput"
-                              PlaceHolder="{Loc nano-chat-group-name-placeholder}" />
-                </PanelContainer>
-            </BoxContainer>
-
-            <!-- Public toggle -->
-            <CheckBox Name="PublicCheck"
-                      Text="{Loc nano-chat-group-public}"
-                      Margin="0 4" />
-
-            <!-- Members -->
-            <Label Text="{Loc nano-chat-group-select-members}"
-                   StyleClasses="LabelHeading"
-                   Margin="0 4 0 0" />
-            <ScrollContainer VerticalExpand="True"
-                             HorizontalExpand="True"
-                             MinSize="0 160">
-                <BoxContainer Name="MembersList"
-                              Orientation="Vertical"
-                              HorizontalExpand="True" />
-            </ScrollContainer>
-
-            <!-- Action buttons -->
-            <BoxContainer Orientation="Horizontal"
-                          HorizontalAlignment="Right"
-                          Margin="0 8 0 0">
-                <Button Name="CancelButton"
-                        Text="{Loc nano-chat-cancel}"
-                        StyleClasses="OpenRight"
-                        MinSize="80 0" />
-                <Button Name="CreateButton"
-                        Text="{Loc nano-chat-create}"
-                        StyleClasses="OpenLeft"
-                        MinSize="80 0"
-                        Disabled="True" />
-            </BoxContainer>
-        </BoxContainer>
-    </PanelContainer>
-</DefaultWindow>
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml.cs b/Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml.cs
deleted file mode 100644
index 07f105ab724..00000000000
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/CreateGroupPopup.xaml.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System.Linq;
-using Content.Shared.ADT.CartridgeLoader.Cartridges;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client.ADT.CartridgeLoader.Cartridges;
-
-[GenerateTypedNameReferences]
-public sealed partial class CreateGroupPopup : DefaultWindow
-{
-    private const int MaxNameLength = 32;
-
-    private readonly List<(uint number, CheckBox box)> _memberBoxes = new();
-    private uint _ownNumber;
-
-    public event Action<string, bool, List<uint>>? OnGroupCreated;
-
-    public CreateGroupPopup()
-    {
-        RobustXamlLoader.Load(this);
-
-        ContentsContainer.Margin = new Thickness(3);
-
-        CancelButton.OnPressed += _ => Close();
-        CreateButton.OnPressed += _ => CreateGroup();
-
-        NameInput.OnTextChanged += args =>
-        {
-            if (args.Text.Length > MaxNameLength)
-                NameInput.Text = args.Text[..MaxNameLength];
-            ValidateInputs();
-        };
-
-        PublicCheck.OnToggled += _ => ValidateInputs();
-    }
-
-    public void SetContacts(List<NanoChatRecipient>? contacts, uint ownNumber)
-    {
-        _memberBoxes.Clear();
-        MembersList.RemoveAllChildren();
-        _ownNumber = ownNumber;
-
-        if (contacts == null)
-            return;
-
-        foreach (var contact in contacts.OrderBy(c => c.Name))
-        {
-            if (contact.Number == _ownNumber)
-                continue;
-
-            var box = new CheckBox()
-            {
-                Text = $"{contact.Name} (#{contact.Number:D4})",
-                HorizontalExpand = true,
-            };
-            box.OnToggled += _ => ValidateInputs();
-            MembersList.AddChild(box);
-            _memberBoxes.Add((contact.Number, box));
-        }
-    }
-
-    public void ClearInputs()
-    {
-        NameInput.Text = string.Empty;
-        PublicCheck.Pressed = false;
-        foreach (var (_, box) in _memberBoxes)
-            box.Pressed = false;
-        ValidateInputs();
-    }
-
-    private void ValidateInputs()
-    {
-        CreateButton.Disabled = string.IsNullOrWhiteSpace(NameInput.Text);
-    }
-
-    private void CreateGroup()
-    {
-        var name = NameInput.Text.Trim();
-        if (string.IsNullOrWhiteSpace(name))
-            return;
-
-        var members = _memberBoxes
-            .Where(m => m.box.Pressed)
-            .Select(m => m.number)
-            .ToList();
-
-        OnGroupCreated?.Invoke(name, PublicCheck.Pressed, members);
-        Close();
-    }
-
-}
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml b/Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml
deleted file mode 100644
index ea7231feb82..00000000000
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml
+++ /dev/null
@@ -1,53 +0,0 @@
-<DefaultWindow xmlns="https://spacestation14.io"
-               Title="{Loc nano-chat-group-members}"
-               MinSize="360 440">
-    <PanelContainer StyleClasses="AngleRect">
-        <BoxContainer Orientation="Vertical" Margin="4">
-            <Label Name="GroupNameLabel"
-                   StyleClasses="LabelHeading"
-                   HorizontalAlignment="Center"
-                   Margin="0 4" />
-
-            <Label Text="{Loc nano-chat-group-member-list}"
-                   StyleClasses="LabelSubText"
-                   Margin="0 2 0 0" />
-            <ScrollContainer VerticalExpand="True"
-                             HorizontalExpand="True"
-                             MinSize="0 180">
-                <BoxContainer Name="MembersList"
-                              Orientation="Vertical"
-                              HorizontalExpand="True" />
-            </ScrollContainer>
-
-            <!-- Invite row -->
-            <BoxContainer Orientation="Horizontal"
-                          Margin="0 6 0 0">
-                <PanelContainer StyleClasses="ButtonSquare"
-                                HorizontalExpand="True">
-                    <LineEdit Name="InviteNumberInput"
-                              PlaceHolder="{Loc nano-chat-group-invite-placeholder}" />
-                </PanelContainer>
-                <Button Name="InviteButton"
-                        Text="{Loc nano-chat-group-invite}"
-                        StyleClasses="OpenLeft"
-                        MinSize="96 0"
-                        Disabled="True" />
-            </BoxContainer>
-
-            <!-- Action buttons -->
-            <BoxContainer Orientation="Horizontal"
-                          HorizontalAlignment="Right"
-                          Margin="0 8 0 0">
-                <Button Name="LeaveButton"
-                        Text="{Loc nano-chat-group-leave}"
-                        StyleClasses="OpenRight"
-                        MinSize="110 0" />
-                <Button Name="DeleteGroupButton"
-                        Text="{Loc nano-chat-group-delete}"
-                        StyleClasses="OpenLeft"
-                        MinSize="110 0"
-                        Visible="False" />
-            </BoxContainer>
-        </BoxContainer>
-    </PanelContainer>
-</DefaultWindow>
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml.cs b/Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml.cs
deleted file mode 100644
index 8b235108e73..00000000000
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/GroupMembersPopup.xaml.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System.Linq;
-using System.Numerics;
-using Content.Shared.ADT.CartridgeLoader.Cartridges;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client.ADT.CartridgeLoader.Cartridges;
-
-[GenerateTypedNameReferences]
-public sealed partial class GroupMembersPopup : DefaultWindow
-{
-    private uint _groupNumber;
-    private uint _ownNumber;
-    private bool _isOwner;
-
-    public uint GroupNumber => _groupNumber;
-
-    public event Action<uint>? OnInvite;
-    public event Action<uint>? OnKick;
-    public event Action? OnLeave;
-    public event Action? OnDelete;
-
-    public GroupMembersPopup()
-    {
-        RobustXamlLoader.Load(this);
-
-        ContentsContainer.Margin = new Thickness(3);
-
-        LeaveButton.OnPressed += _ =>
-        {
-            OnLeave?.Invoke();
-            Close();
-        };
-        DeleteGroupButton.OnPressed += _ =>
-        {
-            OnDelete?.Invoke();
-            Close();
-        };
-        InviteButton.OnPressed += _ => Invite();
-        InviteNumberInput.OnTextChanged += args =>
-        {
-            if (args.Text.Length > 4)
-                InviteNumberInput.Text = args.Text[..4];
-
-            var digits = string.Concat(args.Text.Where(char.IsDigit));
-            if (digits != args.Text)
-                InviteNumberInput.Text = digits;
-
-            InviteButton.Disabled = !uint.TryParse(InviteNumberInput.Text, out _);
-        };
-        InviteNumberInput.OnTextEntered += _ => Invite();
-    }
-
-    public void SetGroup(NanoChatGroup group, uint ownNumber)
-    {
-        _groupNumber = group.Number;
-        _ownNumber = ownNumber;
-        _isOwner = group.Owner == ownNumber;
-
-        GroupNameLabel.Text = group.Name + "  (" +
-            Loc.GetString("nano-chat-group-members-count", ("count", group.Members.Count)) + ")";
-        DeleteGroupButton.Visible = _isOwner;
-        LeaveButton.Text = Loc.GetString(_isOwner ? "nano-chat-group-leave-owner" : "nano-chat-group-leave");
-
-        MembersList.RemoveAllChildren();
-        foreach (var member in group.Members.OrderBy(m => m.Name))
-        {
-            var nameLabel = new Label()
-            {
-                Text = member.Name + (string.IsNullOrEmpty(member.JobTitle) ? "" : $" ({member.JobTitle})") + $" #{member.Number:D4}",
-                HorizontalExpand = true,
-                ClipText = true,
-            };
-
-            var panel = new PanelContainer()
-            {
-                HorizontalExpand = true,
-            };
-            var row = new BoxContainer()
-            {
-                Orientation = BoxContainer.LayoutOrientation.Horizontal,
-                HorizontalExpand = true,
-                VerticalAlignment = VAlignment.Center,
-            };
-            row.AddChild(nameLabel);
-
-            if (_isOwner && member.Number != ownNumber)
-            {
-                var kickButton = new Button()
-                {
-                    Text = Loc.GetString("nano-chat-group-kick"),
-                    MinSize = new Vector2(80, 28),
-                    MaxSize = new Vector2(80, 28),
-                    Margin = new Thickness(4, 0, 0, 0),
-                };
-                kickButton.AddStyleClass("OpenBoth");
-                var memberNumber = member.Number;
-                kickButton.OnPressed += _ =>
-                {
-                    OnKick?.Invoke(memberNumber);
-                    Close();
-                };
-                row.AddChild(kickButton);
-            }
-
-            panel.AddChild(row);
-            MembersList.AddChild(panel);
-        }
-
-        InviteNumberInput.Text = string.Empty;
-        InviteButton.Disabled = true;
-    }
-
-    private void Invite()
-    {
-        if (!uint.TryParse(InviteNumberInput.Text, out var number))
-            return;
-
-        if (number == _ownNumber)
-            return;
-
-        OnInvite?.Invoke(number);
-        InviteNumberInput.Text = string.Empty;
-        InviteButton.Disabled = true;
-    }
-}
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatEntry.xaml b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatEntry.xaml
index 546148c8690..95ea8cba932 100644
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatEntry.xaml
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatEntry.xaml
@@ -34,17 +34,18 @@
                           HorizontalExpand="True"
                           VerticalExpand="True"
                           VerticalAlignment="Center">
-                <RichTextLabel Name="NameLabel"
-                               StyleClasses="LabelHeading"
-                               HorizontalExpand="True"
-                               HorizontalAlignment="Center"
-                               VerticalAlignment="Center"
-                               Margin="0 -2 0 0" />
+                <Label Name="NameLabel"
+                       StyleClasses="LabelHeading"
+                       HorizontalExpand="True"
+                       VerticalAlignment="Center"
+                       Align="Center"
+                       ClipText="True"
+                       Margin="0 -2 0 0" />
                 <Label Name="SubLabel"
                        StyleClasses="LabelSubText"
                        HorizontalExpand="True"
-                       ClipText="False"
-                       HorizontalAlignment="Center" />
+                       Align="Center"
+                       ClipText="True" />
             </BoxContainer>
         </BoxContainer>
     </Button>
@@ -58,15 +59,15 @@
         <BoxContainer Orientation="Vertical"
                       HorizontalExpand="True"
                       Margin="6 4">
-            <RichTextLabel Name="InfoNameLabel"
-                           StyleClasses="LabelHeading"
-                           HorizontalExpand="True"
-                           HorizontalAlignment="Center"
-                           Margin="0 -2 0 0" />
+            <Label Name="InfoNameLabel"
+                   StyleClasses="LabelHeading"
+                   HorizontalExpand="True"
+                   Align="Center"
+                   ClipText="True"
+                   Margin="0 -2 0 0" />
             <Label Name="InfoSubLabel"
                    StyleClasses="LabelSubText"
                    HorizontalExpand="True"
-                   HorizontalAlignment="Left"
                    ClipText="True" />
             <BoxContainer Name="ActionButtons"
                           Orientation="Vertical"
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatLookupView.xaml b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatLookupView.xaml
index 1a15b7966f0..a1d35966e43 100644
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatLookupView.xaml
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatLookupView.xaml
@@ -4,12 +4,70 @@
     HorizontalExpand="True"
     VerticalExpand="True"
     StyleClasses="AngleRect">
-    <ScrollContainer Margin="-10"
-                     VerticalExpand="True"
-                     HorizontalExpand="True">
-        <BoxContainer Name="ContactsList"
+    <BoxContainer Orientation="Vertical"
+                  VerticalExpand="True"
+                  HorizontalExpand="True"
+                  Margin="6">
+        <!-- Поиск по имени или номеру -->
+        <PanelContainer StyleClasses="ButtonSquare"
+                        Margin="0 4 0 0">
+            <LineEdit Name="SearchInput"
+                      PlaceHolder="{Loc nano-chat-search-placeholder}" />
+        </PanelContainer>
+
+        <!-- Инлайн-создание группы: поле имени и публичность -->
+        <BoxContainer Name="CreateGroupPanel"
                       Orientation="Vertical"
-                      VerticalExpand="True"
-                      HorizontalExpand="True" />
-    </ScrollContainer>
+                      Visible="False"
+                      Margin="0 6 0 0">
+            <Label Text="{Loc nano-chat-group-name-label}"
+                   StyleClasses="LabelHeading" />
+            <PanelContainer StyleClasses="ButtonSquare">
+                <LineEdit Name="GroupNameInput"
+                          PlaceHolder="{Loc nano-chat-group-name-placeholder}" />
+            </PanelContainer>
+            <CheckBox Name="PublicCheck"
+                      Text="{Loc nano-chat-group-public}"
+                      Margin="0 4" />
+        </BoxContainer>
+
+        <ScrollContainer VerticalExpand="True"
+                         HorizontalExpand="True"
+                         Margin="0 4 0 0">
+            <BoxContainer Name="ContactsList"
+                          Orientation="Vertical"
+                          VerticalExpand="True"
+                          HorizontalExpand="True" />
+        </ScrollContainer>
+
+        <!-- Кнопка создания группы; в режиме создания замещается Отменить/Создать -->
+        <BoxContainer Name="CreateGroupButtons"
+                      Orientation="Horizontal"
+                      HorizontalExpand="True"
+                      Margin="0 6 0 0">
+            <Button Name="CreateGroupButton"
+                    Text="{Loc nano-chat-create-group}"
+                    HorizontalExpand="True"
+                    MinHeight="28"
+                    StyleClasses="OpenBoth" />
+        </BoxContainer>
+        <BoxContainer Name="ConfirmGroupButtons"
+                      Orientation="Horizontal"
+                      HorizontalExpand="True"
+                      Visible="False"
+                      Margin="0 6 0 0">
+            <Button Name="CancelCreateButton"
+                    Text="{Loc nano-chat-cancel}"
+                    HorizontalExpand="True"
+                    MinHeight="28"
+                    StyleClasses="OpenRight" />
+            <Button Name="ConfirmCreateButton"
+                    Text="{Loc nano-chat-create}"
+                    HorizontalExpand="True"
+                    MinHeight="28"
+                    Margin="4 0 0 0"
+                    StyleClasses="OpenLeft"
+                    Disabled="True" />
+        </BoxContainer>
+    </BoxContainer>
 </cartridges:NanoChatLookupView>
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatLookupView.xaml.cs b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatLookupView.xaml.cs
index a70bbad560d..db32f3fee83 100644
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatLookupView.xaml.cs
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatLookupView.xaml.cs
@@ -1,3 +1,4 @@
+using System.Linq;
 using System.Numerics;
 using Content.Shared.ADT.CartridgeLoader.Cartridges;
 using Robust.Client.AutoGenerated;
@@ -9,79 +10,149 @@ namespace Content.Client.ADT.CartridgeLoader.Cartridges;
 [GenerateTypedNameReferences]
 public sealed partial class NanoChatLookupView : PanelContainer
 {
+    private const int MaxGroupNameLength = 32;
+
+    private List<NanoChatRecipient>? _contacts;
+    private readonly HashSet<uint> _selectedMembers = new();
+    private HashSet<uint> _recipientNumbers = new();
+    private uint _ownNumber;
+    private bool _atRecipientLimit;
+    private bool _createMode;
+
     public NanoChatLookupView()
     {
         RobustXamlLoader.Load(this);
+
+        CreateGroupButton.OnPressed += _ => EnterCreateMode();
+        CancelCreateButton.OnPressed += _ => ExitCreateMode();
+        ConfirmCreateButton.OnPressed += _ => CreateGroup();
+        GroupNameInput.OnTextChanged += args =>
+        {
+            if (args.Text.Length > MaxGroupNameLength)
+                GroupNameInput.Text = args.Text[..MaxGroupNameLength];
+            UpdateConfirmButton();
+        };
+        SearchInput.OnTextChanged += _ => UpdateContactList(_contacts, _ownNumber);
     }
 
+    public event Action<string, bool, List<uint>>? OnCreateGroupRequest;
     public event Action<NanoChatRecipient>? OnStartChat;
-    public event Action? OnCreateGroupRequest;
 
     public void UpdateContactList(NanoChatUiState state)
+    {
+        _contacts = state.Contacts;
+        _ownNumber = state.OwnNumber;
+        _recipientNumbers = new HashSet<uint>(state.Recipients.Keys);
+        _atRecipientLimit = state.MaxRecipients <= state.Recipients.Count + state.Groups.Count;
+        UpdateContactList(_contacts, _ownNumber);
+    }
+
+    /// <summary>Перерисовывает список контактов с учётом поиска и режима создания группы.</summary>
+    private void UpdateContactList(List<NanoChatRecipient>? contacts, uint ownNumber)
     {
         ContactsList.RemoveAllChildren();
 
-        // Create group button
-        var createGroupButton = new Button()
+        if (contacts == null)
         {
-            Text = Loc.GetString("nano-chat-create-group"),
-            HorizontalExpand = true,
-            StyleClasses = { "OpenBoth" },
-            Margin = new Thickness(0, 0, 0, 4),
-        };
-        createGroupButton.OnPressed += _ => OnCreateGroupRequest?.Invoke();
-        ContactsList.AddChild(createGroupButton);
+            ContactsList.AddChild(new Label() { Text = Loc.GetString("nano-chat-look-up-no-server") });
+            return;
+        }
 
-        if (state.Contacts is not { } contacts)
+        var query = SearchInput.Text.Trim();
+        var digits = string.Concat(query.Where(char.IsDigit));
+        var filtered = contacts
+            .Where(c => c.Number != ownNumber)
+            .Where(c => MatchesQuery(c, query, digits))
+            .OrderBy(c => c.Name)
+            .ToList();
+
+        if (filtered.Count == 0)
         {
-            ContactsList.AddChild(new Label() { Text = Loc.GetString("nano-chat-look-up-no-server") });
+            // Номер вне телефонной книги: подсказываем вместо молчаливого пустого списка.
+            var hint = query.Length > 0 && digits.Length > 0
+                ? Loc.GetString("nano-chat-search-number-not-found", ("number", digits))
+                : Loc.GetString("nano-chat-search-no-results");
+            ContactsList.AddChild(new Label()
+            {
+                Text = hint,
+                StyleClasses = { "LabelSubText" },
+                HorizontalAlignment = HAlignment.Center,
+                Margin = new Thickness(0, 8),
+            });
             return;
         }
 
-        for (var idx = 0; idx < contacts.Count; idx++)
+        for (var idx = 0; idx < filtered.Count; idx++)
         {
-            var contact = contacts[idx];
+            var contact = filtered[idx];
+            var row = new BoxContainer()
+            {
+                Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                HorizontalExpand = true,
+                VerticalAlignment = VAlignment.Center,
+            };
+
+            // Чекбокс выбора участника появляется только в режиме создания группы.
+            if (_createMode)
+            {
+                var memberBox = new CheckBox()
+                {
+                    HorizontalExpand = false,
+                    Margin = new Thickness(4, 0, 4, 0),
+                    // Выбор переживает перерисовку (например, при вводе в поиск).
+                    Pressed = _selectedMembers.Contains(contact.Number),
+                };
+                memberBox.OnToggled += _ =>
+                {
+                    if (memberBox.Pressed)
+                        _selectedMembers.Add(contact.Number);
+                    else
+                        _selectedMembers.Remove(contact.Number);
+                };
+                row.AddChild(memberBox);
+            }
+
             var nameLabel = new Label()
             {
                 Text = contact.Name,
-                HorizontalAlignment = HAlignment.Left,
-                HorizontalExpand = true
+                HorizontalExpand = true,
+                ClipText = true,
             };
             var numberLabel = new Label()
             {
-                Text = $"#{contacts[idx].Number:D4}",
+                Text = $"#{contact.Number:D4}",
                 HorizontalAlignment = HAlignment.Right,
                 Margin = new Thickness(0, 0, 36, 0),
             };
-            var startChatButton = new Button()
-            {
-                Text = "+",
-                HorizontalAlignment = HAlignment.Right,
-                MinSize = new Vector2(32, 32),
-                MaxSize = new Vector2(32, 32),
-                ToolTip = Loc.GetString("nano-chat-new-chat"),
-            };
-            startChatButton.AddStyleClass("OpenBoth");
-            if (contact.Number == state.OwnNumber || state.Recipients.ContainsKey(contact.Number) || state.MaxRecipients <= state.Recipients.Count + state.Groups.Count)
+            row.AddChild(nameLabel);
+            row.AddChild(numberLabel);
+
+            // В режиме создания кнопка «+» не нужна: строка выбирается чекбоксом.
+            if (!_createMode)
             {
-                startChatButton.Disabled = true;
+                var startChatButton = new Button()
+                {
+                    Text = "+",
+                    HorizontalAlignment = HAlignment.Right,
+                    MinSize = new Vector2(32, 32),
+                    MaxSize = new Vector2(32, 32),
+                    ToolTip = Loc.GetString("nano-chat-new-chat"),
+                };
+                startChatButton.AddStyleClass("OpenBoth");
+                if (contact.Number == ownNumber ||
+                    _recipientNumbers.Contains(contact.Number) ||
+                    _atRecipientLimit)
+                {
+                    startChatButton.Disabled = true;
+                }
+                startChatButton.OnPressed += _ => OnStartChat?.Invoke(contact);
+                row.AddChild(startChatButton);
             }
-            startChatButton.OnPressed += _ => OnStartChat?.Invoke(contact);
 
             var panel = new PanelContainer()
             {
                 HorizontalExpand = true,
             };
-            var row = new BoxContainer()
-            {
-                Orientation = BoxContainer.LayoutOrientation.Horizontal,
-                HorizontalExpand = true,
-                VerticalAlignment = VAlignment.Center,
-            };
-
-            row.AddChild(nameLabel);
-            row.AddChild(numberLabel);
-            row.AddChild(startChatButton);
             panel.AddChild(row);
 
             var styleClass = idx % 2 == 0 ? "PanelBackgroundBaseDark" : "PanelBackgroundLight";
@@ -90,4 +161,55 @@ public void UpdateContactList(NanoChatUiState state)
             ContactsList.AddChild(panel);
         }
     }
+
+    private static bool MatchesQuery(NanoChatRecipient contact, string query, string digits)
+    {
+        if (query.Length == 0)
+            return true;
+
+        // Совпадение по имени (без учёта регистра) или по номеру.
+        if (contact.Name.Contains(query, StringComparison.OrdinalIgnoreCase))
+            return true;
+
+        return digits.Length > 0 && contact.Number.ToString().Contains(digits);
+    }
+
+    private void EnterCreateMode()
+    {
+        _createMode = true;
+        CreateGroupPanel.Visible = true;
+        CreateGroupButtons.Visible = false;
+        ConfirmGroupButtons.Visible = true;
+        GroupNameInput.Text = string.Empty;
+        PublicCheck.Pressed = false;
+        UpdateConfirmButton();
+        UpdateContactList(_contacts, _ownNumber);
+    }
+
+    private void ExitCreateMode()
+    {
+        _createMode = false;
+        _selectedMembers.Clear();
+        CreateGroupPanel.Visible = false;
+        CreateGroupButtons.Visible = true;
+        ConfirmGroupButtons.Visible = false;
+        UpdateContactList(_contacts, _ownNumber);
+    }
+
+    private void UpdateConfirmButton()
+    {
+        ConfirmCreateButton.Disabled = string.IsNullOrWhiteSpace(GroupNameInput.Text);
+    }
+
+    private void CreateGroup()
+    {
+        var name = GroupNameInput.Text.Trim();
+        if (string.IsNullOrWhiteSpace(name))
+            return;
+
+        var members = _selectedMembers.ToList();
+
+        OnCreateGroupRequest?.Invoke(name, PublicCheck.Pressed, members);
+        ExitCreateMode();
+    }
 }
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
index 148c16cf5ef..5b5e5135add 100644
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml
@@ -6,7 +6,7 @@
     Orientation="Vertical"
     HorizontalExpand="True"
     VerticalExpand="True"
-    Margin="5">
+    Margin="3">
 
     <!-- Main container that fills the entire PDA screen -->
     <BoxContainer Orientation="Vertical"
@@ -34,17 +34,6 @@
                        StyleClasses="LabelSubText"
                        VerticalAlignment="Center"
                        Margin="0 0 8 0" />
-                <Button Name="MembersButton"
-                        MaxSize="32 32"
-                        Visible="False"
-                        StyleClasses="OpenBoth"
-                        Margin="0 0 4 0"
-                        ToolTip="{Loc nano-chat-group-members}">
-                    <TextureRect StyleClasses="ButtonSquare"
-                                 TexturePath="/Textures/Interface/VerbIcons/group.svg.192dpi.png"
-                                 Stretch="KeepAspectCentered"
-                                 MinSize="18 18" />
-                </Button>
                 <Button Name="DeleteChatButton"
                         MaxSize="32 32"
                         Visible="False"
@@ -75,13 +64,6 @@
                                      MinSize="18 18" />
                     </Control>
                 </Button>
-                <Button Name="NewChatButton"
-                        Text="+"
-                        MinSize="32 32"
-                        MaxSize="32 32"
-                        Margin="0 0 4 0"
-                        StyleClasses="OpenBoth"
-                        ToolTip="{Loc nano-chat-new-chat}" />
                 <Button Name="LookupButton"
                         MaxSize="32 32"
                         StyleClasses="OpenBoth"
@@ -92,17 +74,6 @@
                                  Stretch="KeepAspectCentered"
                                  MinSize="18 18" />
                 </Button>
-                <Button Name="ListNumberButton"
-                        MaxSize="32 32"
-                        StyleClasses="OpenBoth"
-                        Margin="0 0 4 0"
-                        ToolTip="{Loc nano-chat-list-number}"
-                        ToggleMode="True">
-                    <TextureRect StyleClasses="ButtonSquare"
-                                 TexturePath="/Textures/ADT/Interface/VerbIcons/hamburger_icon.svg.png"
-                                 Stretch="KeepAspectCentered"
-                                 MinSize="18 18" />
-                </Button>
             </BoxContainer>
         </controls:StripeBack>
 
@@ -111,7 +82,7 @@
                       Orientation="Horizontal"
                       VerticalExpand="True"
                       HorizontalExpand="True"
-                      Margin="0 5 0 0">
+                      Margin="0 3 0 0">
             <!-- Left panel: Chat list -->
             <PanelContainer StyleClasses="AngleRect"
                             VerticalExpand="True"
@@ -124,7 +95,7 @@
                                   Orientation="Vertical"
                                   VerticalExpand="True"
                                   HorizontalExpand="True"
-                                  Margin="4">
+                                  Margin="2">
                         <!-- Chat entries will be added here dynamically -->
                         <Label Name="NoChatsLabel"
                                Text="{Loc nano-chat-no-chats}"
@@ -150,12 +121,28 @@
                                   VerticalExpand="True"
                                   HorizontalExpand="True"
                                   Margin="0 0 0 4">
-                        <Label Name="GroupInfoLabel"
-                               StyleClasses="LabelSubText"
-                               HorizontalAlignment="Center"
-                               HorizontalExpand="True"
-                               Margin="0 2 0 2"
-                               Visible="False" />
+                        <BoxContainer Name="GroupInfoRow"
+                                      Orientation="Horizontal"
+                                      HorizontalExpand="True"
+                                      Visible="False"
+                                      Margin="4 2 4 2">
+                            <Label Name="GroupInfoLabel"
+                                   StyleClasses="LabelSubText"
+                                   HorizontalExpand="True"
+                                   Align="Center"
+                                   ClipText="True" />
+                            <Button Name="MembersButton"
+                                    MinSize="24 24"
+                                    MaxSize="24 24"
+                                    StyleClasses="OpenBoth"
+                                    Margin="4 0 0 0"
+                                    ToolTip="{Loc nano-chat-group-members}">
+                                <TextureRect StyleClasses="ButtonSquare"
+                                             TexturePath="/Textures/Interface/VerbIcons/group.svg.192dpi.png"
+                                             Stretch="KeepAspectCentered"
+                                             MinSize="14 14" />
+                            </Button>
+                        </BoxContainer>
                         <Label Name="CurrentChatName"
                                Text="{Loc nano-chat-select-chat}"
                                HorizontalAlignment="Center"
@@ -172,6 +159,63 @@
                         </ScrollContainer>
                     </BoxContainer>
 
+                    <!-- Members view: replaces the chat for group management -->
+                    <BoxContainer Name="MembersView"
+                                  Orientation="Vertical"
+                                  VerticalExpand="True"
+                                  HorizontalExpand="True"
+                                  Margin="0 0 0 4"
+                                  Visible="False">
+                        <BoxContainer Orientation="Horizontal"
+                                      HorizontalExpand="True"
+                                      Margin="4 2 4 2">
+                            <Button Name="MembersBackButton"
+                                    Text="{Loc nano-chat-back}"
+                                    MinSize="64 28"
+                                    StyleClasses="OpenBoth" />
+                            <Label Name="MembersGroupNameLabel"
+                                   StyleClasses="LabelHeading"
+                                   HorizontalExpand="True"
+                                   Align="Center"
+                                   ClipText="True" />
+                        </BoxContainer>
+                        <ScrollContainer Name="MembersScroll"
+                                         VerticalExpand="True"
+                                         HorizontalExpand="True"
+                                         Margin="0 4 0 0">
+                            <BoxContainer Name="MembersList"
+                                          Orientation="Vertical"
+                                          HorizontalExpand="True" />
+                        </ScrollContainer>
+                        <BoxContainer Orientation="Horizontal"
+                                      HorizontalExpand="True"
+                                      Margin="0 6 0 0">
+                            <PanelContainer StyleClasses="ButtonSquare"
+                                            HorizontalExpand="True">
+                                <LineEdit Name="MembersInviteInput"
+                                          PlaceHolder="{Loc nano-chat-group-invite-placeholder}" />
+                            </PanelContainer>
+                            <Button Name="MembersInviteButton"
+                                    Text="{Loc nano-chat-group-invite}"
+                                    StyleClasses="OpenLeft"
+                                    MinSize="96 0"
+                                    Disabled="True" />
+                        </BoxContainer>
+                        <BoxContainer Orientation="Horizontal"
+                                      HorizontalAlignment="Right"
+                                      Margin="0 8 0 0">
+                            <Button Name="MembersLeaveButton"
+                                    Text="{Loc nano-chat-group-leave}"
+                                    StyleClasses="OpenRight"
+                                    MinSize="110 0" />
+                            <Button Name="MembersDeleteButton"
+                                    Text="{Loc nano-chat-group-delete}"
+                                    StyleClasses="OpenLeft"
+                                    MinSize="110 0"
+                                    Visible="False" />
+                        </BoxContainer>
+                    </BoxContainer>
+
                     <!-- Message input -->
                     <BoxContainer Name="MessageInputContainer"
                                   Orientation="Horizontal"
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
index 57a3ef03c10..754bc93ae40 100644
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
+++ b/Content.Client/ADT/CartridgeLoader/Cartridges/NanoChatUiFragment.xaml.cs
@@ -16,19 +16,15 @@ public sealed partial class NanoChatUiFragment : BoxContainer
 
     private const int MaxGroupMembers = 30;
 
-    private readonly NewChatPopup _newChatPopup;
-    private readonly CreateGroupPopup _createGroupPopup;
-    private readonly GroupMembersPopup _membersPopup;
     private uint? _currentChat;
     private uint? _pendingChat;
     private uint _ownNumber;
     private bool _notificationsMuted;
-    private bool _listNumber = true;
+    private uint? _membersGroupNumber;
     private Dictionary<uint, NanoChatRecipient> _recipients = new();
     private Dictionary<uint, List<NanoChatMessage>> _messages = new();
     private Dictionary<uint, NanoChatGroup> _groups = new();
     private Dictionary<uint, List<NanoChatMessage>> _groupMessages = new();
-    private List<NanoChatRecipient>? _contacts;
     private List<NanoChatGroupInfo> _publicGroups = new();
     private List<NanoChatGroupInvite> _invites = new();
 
@@ -39,26 +35,12 @@ public NanoChatUiFragment()
         IoCManager.InjectDependencies(this);
         RobustXamlLoader.Load(this);
 
-        _newChatPopup = new NewChatPopup();
-        _createGroupPopup = new CreateGroupPopup();
-        _membersPopup = new GroupMembersPopup();
         SetupEventHandlers();
     }
 
     private void SetupEventHandlers()
     {
-        _newChatPopup.OnChatCreated += (number, name, job) =>
-        {
-            OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.NewChat, number, name, job));
-        };
-
-        NewChatButton.OnPressed += _ =>
-        {
-            _newChatPopup.ClearInputs();
-            _newChatPopup.OpenCentered();
-        };
-
-        MembersButton.OnPressed += _ => OpenMembersPopup();
+        MembersButton.OnPressed += _ => OpenMembersView();
 
         MuteButton.OnPressed += _ =>
         {
@@ -94,59 +76,144 @@ private void SetupEventHandlers()
             SelectChat(contact.Number);
             ToggleView();
         };
-        LookupView.OnCreateGroupRequest += () =>
-        {
-            _createGroupPopup.SetContacts(_contacts, _ownNumber);
-            _createGroupPopup.ClearInputs();
-            _createGroupPopup.OpenCentered();
-        };
-        _createGroupPopup.OnGroupCreated += (name, isPublic, members) =>
+        LookupView.OnCreateGroupRequest += (name, isPublic, members) =>
         {
             OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.CreateGroup,
                 content: name,
                 isPublic: isPublic,
                 members: members));
         };
-        _membersPopup.OnInvite += targetNumber =>
-        {
-            OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.InviteToGroup,
-                _membersPopup.GroupNumber,
-                targetNumber: targetNumber));
-        };
-        _membersPopup.OnKick += targetNumber =>
-        {
-            OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.KickMember,
-                _membersPopup.GroupNumber,
-                targetNumber: targetNumber));
-        };
-        _membersPopup.OnLeave += () =>
-        {
-            OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.LeaveGroup, _membersPopup.GroupNumber));
-        };
-        _membersPopup.OnDelete += () =>
-        {
-            OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.DeleteGroup, _membersPopup.GroupNumber));
-        };
-        ListNumberButton.OnPressed += _ =>
-        {
-            _listNumber = !_listNumber;
-            UpdateListNumber();
-            OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.ToggleListNumber, null, null, null));
-        };
+        MembersBackButton.OnPressed += _ => CloseMembersView();
+        MembersInviteButton.OnPressed += _ => InviteMember();
+        MembersInviteInput.OnTextChanged += args => OnMembersInviteTextChanged(args);
+        MembersInviteInput.OnTextEntered += _ => InviteMember();
+        MembersLeaveButton.OnPressed += _ => LeaveGroup();
+        MembersDeleteButton.OnPressed += _ => DeleteGroup();
 
         MessageInput.OnTextEntered += _ => SendMessage(); // Send message when pressing enter
         SendButton.OnPressed += _ => SendMessage();
         DeleteChatButton.OnPressed += _ => DeleteCurrentChat();
     }
 
-    private void OpenMembersPopup()
+    /// <summary>Открывает список участников группы прямо в основном окне, замещая чат.</summary>
+    private void OpenMembersView()
     {
         var activeChat = _pendingChat ?? _currentChat;
         if (activeChat == null || !_groups.TryGetValue(activeChat.Value, out var group))
             return;
 
-        _membersPopup.SetGroup(group, _ownNumber);
-        _membersPopup.OpenCentered();
+        _membersGroupNumber = activeChat.Value;
+        UpdateMembersView(group);
+        MessageArea.Visible = false;
+        MembersView.Visible = true;
+    }
+
+    private void CloseMembersView()
+    {
+        _membersGroupNumber = null;
+        MembersView.Visible = false;
+        MessageArea.Visible = true;
+    }
+
+    /// <summary>Перерисовывает список участников: имя, должность, номер и кнопку кика у владельца.</summary>
+    private void UpdateMembersView(NanoChatGroup group)
+    {
+        var isOwner = group.Owner == _ownNumber;
+        MembersGroupNameLabel.Text = group.Name + "  (" +
+            Loc.GetString("nano-chat-group-members-count", ("count", group.Members.Count)) + ")";
+        MembersLeaveButton.Text = Loc.GetString(isOwner ? "nano-chat-group-leave-owner" : "nano-chat-group-leave");
+        MembersDeleteButton.Visible = isOwner;
+
+        MembersList.RemoveAllChildren();
+        foreach (var member in group.Members.OrderBy(m => m.Name))
+        {
+            var nameLabel = new Label()
+            {
+                Text = member.Name + (string.IsNullOrEmpty(member.JobTitle) ? "" : $" ({member.JobTitle})") + $" #{member.Number:D4}",
+                HorizontalExpand = true,
+                ClipText = true,
+            };
+
+            var row = new BoxContainer()
+            {
+                Orientation = BoxContainer.LayoutOrientation.Horizontal,
+                HorizontalExpand = true,
+                VerticalAlignment = VAlignment.Center,
+            };
+            row.AddChild(nameLabel);
+
+            if (isOwner && member.Number != _ownNumber)
+            {
+                var kickButton = new Button()
+                {
+                    Text = Loc.GetString("nano-chat-group-kick"),
+                    MinSize = new Vector2(80, 28),
+                    MaxSize = new Vector2(80, 28),
+                    Margin = new Thickness(4, 0, 0, 0),
+                };
+                kickButton.AddStyleClass("OpenBoth");
+                var memberNumber = member.Number;
+                kickButton.OnPressed += _ =>
+                {
+                    OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.KickMember,
+                        group.Number,
+                        targetNumber: memberNumber));
+                };
+                row.AddChild(kickButton);
+            }
+
+            var panel = new PanelContainer { HorizontalExpand = true };
+            panel.AddChild(row);
+            MembersList.AddChild(panel);
+        }
+
+        MembersInviteInput.Text = string.Empty;
+        MembersInviteButton.Disabled = true;
+    }
+
+    private void InviteMember()
+    {
+        if (_membersGroupNumber == null || !uint.TryParse(MembersInviteInput.Text, out var number))
+            return;
+
+        if (number == _ownNumber)
+            return;
+
+        OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.InviteToGroup,
+            _membersGroupNumber.Value,
+            targetNumber: number));
+        MembersInviteInput.Text = string.Empty;
+        MembersInviteButton.Disabled = true;
+    }
+
+    private void OnMembersInviteTextChanged(LineEdit.LineEditEventArgs args)
+    {
+        if (args.Text.Length > 4)
+            MembersInviteInput.Text = args.Text[..4];
+
+        var digits = string.Concat(args.Text.Where(char.IsDigit));
+        if (digits != args.Text)
+            MembersInviteInput.Text = digits;
+
+        MembersInviteButton.Disabled = !uint.TryParse(MembersInviteInput.Text, out _);
+    }
+
+    private void LeaveGroup()
+    {
+        if (_membersGroupNumber == null)
+            return;
+
+        OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.LeaveGroup, _membersGroupNumber.Value));
+        CloseMembersView();
+    }
+
+    private void DeleteGroup()
+    {
+        if (_membersGroupNumber == null)
+            return;
+
+        OnMessageSent?.Invoke(new NanoChatUiMessageEvent(NanoChatUiMessageType.DeleteGroup, _membersGroupNumber.Value));
+        CloseMembersView();
     }
 
     private void ToggleView()
@@ -341,21 +408,24 @@ private void UpdateCurrentChat()
         MessagesScroll.Visible = hasActiveChat;
         CurrentChatName.Visible = !hasActiveChat;
         MessageInputContainer.Visible = hasActiveChat;
+        GroupInfoRow.Visible = isGroup;
         MembersButton.Visible = isGroup;
         DeleteChatButton.Visible = hasActiveChat && !isGroup;
         DeleteChatButton.Disabled = !hasActiveChat || isGroup;
 
+        // Чат сменился или группа удалена - закрываем список участников.
+        if (MembersView.Visible && (activeChat != _membersGroupNumber || !isGroup))
+            CloseMembersView();
+
         if (isGroup && _groups.TryGetValue(activeChat!.Value, out var group))
         {
             CurrentChatName.Text = group.Name + "  (" +
                 Loc.GetString("nano-chat-group-members-count", ("count", group.Members.Count)) + ")";
-            GroupInfoLabel.Visible = true;
             GroupInfoLabel.Text = group.Name + "  |  " +
                 Loc.GetString("nano-chat-group-members-count", ("count", group.Members.Count)) + " / " + MaxGroupMembers;
         }
         else
         {
-            GroupInfoLabel.Visible = false;
             if (activeChat != null && _recipients.TryGetValue(activeChat.Value, out var recipient))
             {
                 CurrentChatName.Text = recipient.Name + (string.IsNullOrEmpty(recipient.JobTitle) ? "" : $" ({recipient.JobTitle})");
@@ -428,27 +498,12 @@ private void UpdateMuteButton()
             BellMutedIcon.Visible = _notificationsMuted;
     }
 
-    private void UpdateListNumber()
-    {
-        if (ListNumberButton != null)
-            ListNumberButton.Pressed = _listNumber;
-    }
-
     public void UpdateState(NanoChatUiState state)
     {
         _ownNumber = state.OwnNumber;
         _notificationsMuted = state.NotificationsMuted;
-        _listNumber = state.ListNumber;
         OwnNumberLabel.Text = $"#{state.OwnNumber:D4}";
         UpdateMuteButton();
-        UpdateListNumber();
-
-        // Update new chat button state based on recipient limit
-        var atLimit = state.Recipients.Count + state.Groups.Count >= state.MaxRecipients;
-        NewChatButton.Disabled = atLimit;
-        NewChatButton.ToolTip = atLimit
-            ? Loc.GetString("nano-chat-max-recipients")
-            : Loc.GetString("nano-chat-new-chat");
 
         // First handle pending chat resolution if we have one
         if (_pendingChat != null)
@@ -463,7 +518,6 @@ public void UpdateState(NanoChatUiState state)
         if (_pendingChat == null)
             _currentChat = state.CurrentChat;
 
-        _contacts = state.Contacts;
         _publicGroups = state.PublicGroups;
         _invites = state.Invites;
 
@@ -471,5 +525,9 @@ public void UpdateState(NanoChatUiState state)
         UpdateChatList(state.Recipients, state.Groups, _publicGroups, _invites);
         UpdateMessages(state.GroupMessages, state.Messages);
         LookupView.UpdateContactList(state);
+
+        // Перерисовываем список участников, если он открыт.
+        if (MembersView.Visible && _membersGroupNumber != null && _groups.TryGetValue(_membersGroupNumber.Value, out var membersGroup))
+            UpdateMembersView(membersGroup);
     }
 }
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/NewChatPopup.xaml b/Content.Client/ADT/CartridgeLoader/Cartridges/NewChatPopup.xaml
deleted file mode 100644
index 20095c4fce9..00000000000
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/NewChatPopup.xaml
+++ /dev/null
@@ -1,52 +0,0 @@
-<DefaultWindow xmlns="https://spacestation14.io"
-               Title="{Loc nano-chat-new-title}"
-               MinSize="300 200">
-    <PanelContainer StyleClasses="AngleRect">
-        <BoxContainer Orientation="Vertical" Margin="4">
-            <!-- Number input -->
-            <BoxContainer Orientation="Vertical" Margin="0 4">
-                <Label Text="{Loc nano-chat-number-label}"
-                       StyleClasses="LabelHeading" />
-                <PanelContainer StyleClasses="ButtonSquare">
-                    <LineEdit Name="NumberInput"
-                              PlaceHolder="{Loc nano-chat-number-placeholder}" />
-                </PanelContainer>
-            </BoxContainer>
-
-            <!-- Name input -->
-            <BoxContainer Orientation="Vertical" Margin="0 4">
-                <Label Text="{Loc nano-chat-name-label}"
-                       StyleClasses="LabelHeading" />
-                <PanelContainer StyleClasses="ButtonSquare">
-                    <LineEdit Name="NameInput"
-                              PlaceHolder="{Loc nano-chat-name-placeholder}" />
-                </PanelContainer>
-            </BoxContainer>
-
-            <!-- Job input (optional) -->
-            <BoxContainer Orientation="Vertical" Margin="0 4">
-                <Label Text="{Loc nano-chat-job-label}"
-                       StyleClasses="LabelHeading" />
-                <PanelContainer StyleClasses="ButtonSquare">
-                    <LineEdit Name="JobInput"
-                              PlaceHolder="{Loc nano-chat-job-placeholder}" />
-                </PanelContainer>
-            </BoxContainer>
-
-            <!-- Action buttons -->
-            <BoxContainer Orientation="Horizontal"
-                          HorizontalAlignment="Right"
-                          Margin="0 8 0 0">
-                <Button Name="CancelButton"
-                        Text="{Loc nano-chat-cancel}"
-                        StyleClasses="OpenRight"
-                        MinSize="80 0" />
-                <Button Name="CreateButton"
-                        Text="{Loc nano-chat-create}"
-                        StyleClasses="OpenLeft"
-                        MinSize="80 0"
-                        Disabled="True" />
-            </BoxContainer>
-        </BoxContainer>
-    </PanelContainer>
-</DefaultWindow>
diff --git a/Content.Client/ADT/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs b/Content.Client/ADT/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
deleted file mode 100644
index b2f37f58dd2..00000000000
--- a/Content.Client/ADT/CartridgeLoader/Cartridges/NewChatPopup.xaml.cs
+++ /dev/null
@@ -1,87 +0,0 @@
-using System.Linq;
-using Robust.Client.AutoGenerated;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Client.UserInterface.XAML;
-
-namespace Content.Client.ADT.CartridgeLoader.Cartridges;
-
-[GenerateTypedNameReferences]
-public sealed partial class NewChatPopup : DefaultWindow
-{
-    private const int MaxInputLength = 16;
-    private const int MaxNumberLength = 4; // i hardcoded it to be 4 so suffer
-
-    public event Action<uint, string, string?>? OnChatCreated;
-
-    public NewChatPopup()
-    {
-        RobustXamlLoader.Load(this);
-
-        // margins trolling
-        ContentsContainer.Margin = new Thickness(3);
-
-        // Button handlers
-        CancelButton.OnPressed += _ => Close();
-        CreateButton.OnPressed += _ => CreateChat();
-
-        // Input validation
-        NumberInput.OnTextChanged += _ => ValidateInputs();
-        NameInput.OnTextChanged += _ => ValidateInputs();
-
-        // Input validation
-        NumberInput.OnTextChanged += args =>
-        {
-            if (args.Text.Length > MaxNumberLength)
-                NumberInput.Text = args.Text[..MaxNumberLength];
-
-            // Filter to digits only
-            var newText = string.Concat(NumberInput.Text.Where(char.IsDigit));
-            if (newText != NumberInput.Text)
-                NumberInput.Text = newText;
-
-            ValidateInputs();
-        };
-
-        NameInput.OnTextChanged += args =>
-        {
-            if (args.Text.Length > MaxInputLength)
-                NameInput.Text = args.Text[..MaxInputLength];
-            ValidateInputs();
-        };
-
-        JobInput.OnTextChanged += args =>
-        {
-            if (args.Text.Length > MaxInputLength)
-                JobInput.Text = args.Text[..MaxInputLength];
-        };
-    }
-
-    private void ValidateInputs()
-    {
-        var isValid = !string.IsNullOrWhiteSpace(NumberInput.Text) &&
-                      !string.IsNullOrWhiteSpace(NameInput.Text) &&
-                      uint.TryParse(NumberInput.Text, out _);
-
-        CreateButton.Disabled = !isValid;
-    }
-
-    private void CreateChat()
-    {
-        if (!uint.TryParse(NumberInput.Text, out var number))
-            return;
-
-        var name = NameInput.Text.Trim();
-        var job = string.IsNullOrWhiteSpace(JobInput.Text) ? null : JobInput.Text.Trim();
-
-        OnChatCreated?.Invoke(number, name, job);
-        Close();
-    }
-
-    public void ClearInputs()
-    {
-        NumberInput.Text = string.Empty;
-        NameInput.Text = string.Empty;
-        JobInput.Text = string.Empty;
-        ValidateInputs();
-    }
-}
diff --git a/Content.Server/ADT/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs b/Content.Server/ADT/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
index d3b04e6b0c7..298de94698d 100644
--- a/Content.Server/ADT/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
+++ b/Content.Server/ADT/CartridgeLoader/Cartridges/NanoChatCartridgeSystem.cs
@@ -162,6 +162,19 @@ private bool GetCardEntity(
         return true;
     }
 
+    /// <summary>True, если на станции есть карта НаноМакс с указанным номером.</summary>
+    private bool CardExistsWithNumber(uint number)
+    {
+        var query = AllEntityQuery<NanoChatCardComponent>();
+        while (query.MoveNext(out _, out var card))
+        {
+            if (card.Number == number)
+                return true;
+        }
+
+        return false;
+    }
+
     /// <summary>
     ///     Handles creation of a new chat conversation.
     /// </summary>
@@ -170,6 +183,10 @@ private void HandleNewChat(Entity<NanoChatCardComponent> card, NanoChatUiMessage
         if (msg.RecipientNumber == null || msg.Content == null || msg.RecipientNumber == card.Comp.Number)
             return;
 
+        // Не создаём чат с номером, которого нет ни на одной карте (иначе сообщения уходят в никуда).
+        if (!CardExistsWithNumber(msg.RecipientNumber.Value))
+            return;
+
         var name = msg.Content;
         if (!string.IsNullOrWhiteSpace(name))
         {
diff --git a/Resources/Locale/en-US/ADT/nanochat/ui.ftl b/Resources/Locale/en-US/ADT/nanochat/ui.ftl
index bf57780a10f..e78a6303a33 100644
--- a/Resources/Locale/en-US/ADT/nanochat/ui.ftl
+++ b/Resources/Locale/en-US/ADT/nanochat/ui.ftl
@@ -9,28 +9,18 @@ nano-chat-send = Send
 nano-chat-delete = Delete
 nano-chat-loading = Loading...
 nano-chat-message-too-long = Message is too long ({ $current } of { $max } max characters)
-nano-chat-max-recipients = Max chats reached
 nano-chat-new-message-title = Message from { $sender }
 nano-chat-new-message-body = { $message }
 nano-chat-toggle-mute = Mute notifications
 nano-chat-delivery-failed = Delivery failed
 nano-chat-look-up-no-server = Could not find telecomms server
 nano-chat-look-up = Look up numbers
-nano-chat-list-number = List number
-nano-chat-new-title = Create new chat
-nano-chat-number-label = User
-nano-chat-name-label = Name
-nano-chat-job-label = Job title
-nano-chat-number-placeholder = Enter number
-nano-chat-name-placeholder = Enter name
-nano-chat-job-placeholder = Enter job title (optional)
 nano-chat-cancel = Cancel
 nano-chat-create = Create
 nano-chat-contacts-tab = Contacts
 nano-chat-groups-tab = Groups
 nano-chat-invites-tab = Invites
 nano-chat-create-group = Create group
-nano-chat-group-create-title = Create group
 nano-chat-group-name-label = Group name
 nano-chat-group-name-placeholder = Enter group name
 nano-chat-group-public = Public (join without an invite)
@@ -40,7 +30,6 @@ nano-chat-group-members-count = { $count } { $count ->
    *[other] members
 }
 nano-chat-group-members = Members
-nano-chat-group-member-list = Member list
 nano-chat-group-invite = Invite
 nano-chat-group-invite-placeholder = Enter number
 nano-chat-group-leave = Leave group
@@ -71,3 +60,17 @@ nano-chat-public-group-info = { $count } members | Owner: { $owner }
 nano-chat-invite-row = Invite from { $from }
 nano-chat-invites-section = INVITES
 nano-chat-public-groups-section = PUBLIC GROUPS
+
+nano-chat-back = Back
+nano-chat-search-placeholder = Search by name or number
+nano-chat-search-no-results = Nothing found
+nano-chat-search-number-not-found = Number #{ $number } not found in the list
+
+log-probe-scan-nanochat = Scanned NanoMax logs { $card }
+log-probe-header-access = Access log scanner
+log-probe-header-nanochat = NanoMax log scanner
+log-probe-label-message = Message
+log-probe-card-number = Card: { $number }
+log-probe-recipients = { $count } Recipients
+log-probe-recipient-list = Known Recipients:
+log-probe-message-format = { $sender } → { $recipient }: { $content }
diff --git a/Resources/Locale/ru-RU/ADT/nanochat/ui.ftl b/Resources/Locale/ru-RU/ADT/nanochat/ui.ftl
index 3ea70e2ec08..74d1b1a309b 100644
--- a/Resources/Locale/ru-RU/ADT/nanochat/ui.ftl
+++ b/Resources/Locale/ru-RU/ADT/nanochat/ui.ftl
@@ -9,21 +9,12 @@ nano-chat-send = Отправить
 nano-chat-delete = Удалить
 nano-chat-loading = Загрузка...
 nano-chat-message-too-long = Сообщение слишком длинное ({ $current } из { $max } максимальных символов)
-nano-chat-max-recipients = Максимум чатов достигнут
 nano-chat-new-message-title = Сообщение от { $sender }
 nano-chat-new-message-body = { $message }
 nano-chat-toggle-mute = Заглушить оповещения
 nano-chat-delivery-failed = Не удалось отправить
 nano-chat-look-up-no-server = Не удалось найти телекоммуникационный сервер
 nano-chat-look-up = Поиск номеров
-nano-chat-list-number = Список номеров
-nano-chat-new-title = Создать новый чат
-nano-chat-number-label = Пользователь
-nano-chat-name-label = Имя
-nano-chat-job-label = Название профессии
-nano-chat-number-placeholder = Введите номер
-nano-chat-name-placeholder = Введите имя
-nano-chat-job-placeholder = Введите название профессии (опционально)
 nano-chat-cancel = Отменить
 nano-chat-create = Создать
 log-probe-scan-nanochat = Отсканированы НаноМакс логи { $card }
@@ -38,7 +29,6 @@ nano-chat-contacts-tab = Контакты
 nano-chat-groups-tab = Группы
 nano-chat-invites-tab = Приглашения
 nano-chat-create-group = Создать группу
-nano-chat-group-create-title = Создать группу
 nano-chat-group-name-label = Название группы
 nano-chat-group-name-placeholder = Введите название группы
 nano-chat-group-public = Публичная (можно вступить без приглашения)
@@ -49,7 +39,6 @@ nano-chat-group-members-count = { $count } { $count ->
    *[other] участников
 }
 nano-chat-group-members = Участники
-nano-chat-group-member-list = Список участников
 nano-chat-group-invite = Пригласить
 nano-chat-group-invite-placeholder = Введите номер
 nano-chat-group-leave = Выйти из группы
@@ -80,3 +69,8 @@ nano-chat-public-group-info = { $count } участников | Владелец
 nano-chat-invite-row = Приглашение от { $from }
 nano-chat-invites-section = ПРИГЛАШЕНИЯ
 nano-chat-public-groups-section = ПУБЛИЧНЫЕ ГРУППЫ
+
+nano-chat-back = Назад
+nano-chat-search-placeholder = Поиск по имени или номеру
+nano-chat-search-no-results = Никого не найдено
+nano-chat-search-number-not-found = Номер #{ $number } не найден в списке