diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.spec.js b/src/components/MessagesList/MessagesGroup/Message/Message.spec.js
index 3f73def72c6..a12c40f2690 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.spec.js
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.spec.js
@@ -802,8 +802,8 @@ describe('Message.vue', () => {
 			expect(reactionButtons.length).toBe(3)
 
 			// Text of the buttons
-			expect(reactionButtons.wrappers[0].text()).toBe('❤️   1')
-			expect(reactionButtons.wrappers[1].text()).toBe('👍   7')
+			expect(reactionButtons.wrappers[0].text()).toBe('❤️  1')
+			expect(reactionButtons.wrappers[1].text()).toBe('👍  7')
 		})
 
 		test('dispatches store action upon picking an emoji from the emojipicker', () => {
diff --git a/src/components/MessagesList/MessagesGroup/Message/Message.vue b/src/components/MessagesList/MessagesGroup/Message/Message.vue
index 0998c2d0205..084ce9fe26b 100644
--- a/src/components/MessagesList/MessagesGroup/Message/Message.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/Message.vue
@@ -127,13 +127,11 @@ the main body of the message as well as a quote.
 						slot="trigger"
 						class="reaction-button"
 						@click="handleReactionClick(reaction)">
-						<span class="reaction-button__emoji"> {{ reaction }} </span>
-						<span> {{ simpleReactions[reaction] }} </span>
+						<span class="reaction-button__emoji">{{ reaction }}</span>
+						<span> {{ simpleReactions[reaction] }}</span>
 					</button>
 					<div v-if="detailedReactions" class="reaction-details">
-						<p v-for="detailedReaction in detailedReactions[reaction]" :key="detailedReaction.actorDisplayName">
-							{{ detailedReaction.actorDisplayName }}
-						</p>
+						<span>{{ getReactionSummary(reaction) }}</span>
 					</div>
 				</Popover>
 
@@ -710,6 +708,22 @@ export default {
 
 			this.isDeleting = false
 		},
+
+		getReactionSummary(reaction) {
+			const list = this.detailedReactions[reaction]
+			const summary = []
+
+			for (const item in list) {
+				if (list[item].actorType === this.$store.getters.getActorType()
+					&& list[item].actorId === this.$store.getters.getActorId()) {
+					summary.unshift(t('spreed', 'You'))
+				} else {
+					summary.push(list[item].actorDisplayName)
+				}
+			}
+
+			return summary.join(', ')
+		},
 	},
 }
 </script>