diff --git a/packages/rocketchat-ui-message/client/renderMessageBody.js b/packages/rocketchat-ui-message/client/renderMessageBody.js index 1884627e2378..414c14561ed3 100644 --- a/packages/rocketchat-ui-message/client/renderMessageBody.js +++ b/packages/rocketchat-ui-message/client/renderMessageBody.js @@ -11,7 +11,8 @@ renderMessageBody = function(msg) { const message = RocketChat.callbacks.run('renderMessage', msg); if (message.tokens && message.tokens.length > 0) { - for (const {token, text} of message.tokens) { + // Unmounting tokens(LIFO) + for (const {token, text} of message.tokens.reverse()) { message.html = message.html.replace(token, () => text); // Uses lambda so doesn't need to escape $ } }