diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js
index 879d329f8..a71e3ac46 100644
--- a/src/components/chat_message/chat_message.js
+++ b/src/components/chat_message/chat_message.js
@@ -14,6 +14,7 @@ import StatusPopover from 'src/components/status_popover/status_popover.vue'
 import UserAvatar from 'src/components/user_avatar/user_avatar.vue'
 import UserPopover from 'src/components/user_popover/user_popover.vue'
 import Timeago from 'src/components/timeago/timeago.vue'
+import EmojiReactions from 'src/components/emoji_reactions/emoji_reactions.vue'
 
 import { useInstanceStore } from 'src/stores/instance.js'
 import { useInterfaceStore } from 'src/stores/interface'
@@ -25,9 +26,11 @@ import {
   faEllipsisH,
   faTimes,
   faReply,
+  faRetweet,
+  faStar,
 } from '@fortawesome/free-solid-svg-icons'
 
-library.add(faTimes, faEllipsisH, faCircleNotch, faReply)
+library.add(faTimes, faEllipsisH, faCircleNotch, faReply, faStar, faRetweet)
 
 const ChatMessage = {
   name: 'ChatMessage',
@@ -52,6 +55,7 @@ const ChatMessage = {
     Gallery,
     LinkPreview,
     ChatMessageDate,
+    EmojiReactions,
     UserPopover,
     StatusPopover,
     MentionLink,
diff --git a/src/components/chat_message/chat_message.vue b/src/components/chat_message/chat_message.vue
index fb2b139ed..a12218008 100644
--- a/src/components/chat_message/chat_message.vue
+++ b/src/components/chat_message/chat_message.vue
@@ -145,9 +145,28 @@
                 :full-content="true"
               >
                 <template #footer>
+                  <EmojiReactions :status="message" />
                   <span
                     class="created-at"
                   >
+                    <span
+                      v-if="message.favorited"
+                    >
+                      <FAIcon
+                        class="fa-scale-110"
+                        icon="star"
+                        fixed-width
+                      />
+                    </span>
+                    <span
+                      v-if="message.repeated"
+                    >
+                      <FAIcon
+                        class="fa-scale-110"
+                        icon="retweet"
+                        fixed-width
+                      />
+                    </span>
                     <span
                       v-if="message.visibility"
                       class="visibility-icon"