diff --git a/Content.Client/Chat/UI/ChatBox.xaml.cs b/Content.Client/Chat/UI/ChatBox.xaml.cs index 74d3f8eb11..0199d0666a 100644 --- a/Content.Client/Chat/UI/ChatBox.xaml.cs +++ b/Content.Client/Chat/UI/ChatBox.xaml.cs @@ -395,7 +395,13 @@ namespace Content.Client.Chat.UI private void WriteChatMessage(StoredChatMessage message) { - Logger.DebugS("chat", $"{message.Channel}: {message.Message}"); + var messageText = FormattedMessage.EscapeText(message.Message); + if (!string.IsNullOrEmpty(message.MessageWrap)) + { + messageText = string.Format(message.MessageWrap, messageText); + } + + Logger.DebugS("chat", $"{message.Channel}: {messageText}"); if (IsFilteredOut(message.Channel)) return; @@ -403,12 +409,6 @@ namespace Content.Client.Chat.UI // TODO: Can make this "smarter" later by only setting it false when the message has been scrolled to message.Read = true; - var messageText = FormattedMessage.EscapeText(message.Message); - if (!string.IsNullOrEmpty(message.MessageWrap)) - { - messageText = string.Format(message.MessageWrap, messageText); - } - var color = message.MessageColorOverride != Color.Transparent ? message.MessageColorOverride : ChatHelper.ChatColor(message.Channel);