From 4a2aa028958923c3589f3c382bc5e90d6b0dc0e8 Mon Sep 17 00:00:00 2001
From: dougfabris <devfabris@gmail.com>
Date: Thu, 4 Apr 2024 16:37:39 -0300
Subject: [PATCH 1/2] fix: add space on system message username

---
 .../client/components/message/variants/SystemMessage.tsx   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/meteor/client/components/message/variants/SystemMessage.tsx b/apps/meteor/client/components/message/variants/SystemMessage.tsx
index d69b1ada10dc1..9b1a82a156eb9 100644
--- a/apps/meteor/client/components/message/variants/SystemMessage.tsx
+++ b/apps/meteor/client/components/message/variants/SystemMessage.tsx
@@ -85,7 +85,12 @@ const SystemMessage = ({ message, showUserAvatar, ...props }: SystemMessageProps
 						{...triggerProps}
 					>
 						<MessageSystemName>{getUserDisplayName(user.name, user.username, showRealName)}</MessageSystemName>
-						{showUsername && <MessageUsername data-username={user.username}>@{user.username}</MessageUsername>}
+						{showUsername && (
+							<>
+								{' '}
+								<MessageUsername data-username={user.username}>@{user.username}</MessageUsername>
+							</>
+						)}
 					</MessageNameContainer>
 					{messageType && (
 						<MessageSystemBody

From 9cb658022b98ea2345187e81eab7a5b2c33c4677 Mon Sep 17 00:00:00 2001
From: dougfabris <devfabris@gmail.com>
Date: Thu, 4 Apr 2024 16:42:01 -0300
Subject: [PATCH 2/2] chore: changeset

---
 .changeset/smart-squids-begin.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/smart-squids-begin.md

diff --git a/.changeset/smart-squids-begin.md b/.changeset/smart-squids-begin.md
new file mode 100644
index 0000000000000..48f3f460ea7e0
--- /dev/null
+++ b/.changeset/smart-squids-begin.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes the missing space between name and user name on system messages