diff --git a/src/assets/css/_mixins.scss b/src/assets/css/_mixins.scss
index a575d47..2ff021f 100644
--- a/src/assets/css/_mixins.scss
+++ b/src/assets/css/_mixins.scss
@@ -1,9 +1 @@
-@mixin emoji-reaction-transform($type: 'right') {
-  @if $type == 'right' {
-    transform: translateX(20px) translateX(100%);
-  }
-
-  @if $type == 'left' {
-    transform: translateX(-20px) translateX(-100%);
-  }
-}
\ No newline at end of file
+// Sass Mixins
\ No newline at end of file
diff --git a/src/assets/css/chat.scss b/src/assets/css/chat.scss
index 4bf6dbd..873f015 100644
--- a/src/assets/css/chat.scss
+++ b/src/assets/css/chat.scss
@@ -352,6 +352,10 @@ body {
 .message-wrapper {
   position: relative;
   user-select: none;
+
+  .quick-reaction-container .emoji {
+    display: inline;
+  }
 }
 
 .messageIn {
@@ -438,6 +442,13 @@ body {
   .link {
     color: inherit;
   }
+  .quick-reaction-container {
+    margin-left: 42px;
+
+    [dir="rtl"] & {
+      margin-right: 42px;
+    }
+  }
 }
 
 .messageOut {
@@ -539,6 +550,13 @@ body {
   .link {
     color: inherit;
   }
+  .quick-reaction-container {
+    margin-right: 42px;
+
+    [dir="rtl"] & {
+      margin-left: 42px;
+    }
+  }
 }
 
 .sender,
@@ -712,53 +730,6 @@ body {
   text-align: center;
 }
 
-.quick-reaction-container {
-  display: inline-block;
-  position: relative;
-  vertical-align: bottom;
-  top: 18px;
-  z-index: 2;
-  background-color: #f7f7f7;
-  border: 1px solid rgba(white, 0.9);
-  border-radius: 13px;
-  height: 26px;
-  width: max-content;
-  padding: 0px 6px;
-  @include emoji-reaction-transform('left');
-
-  .messageOut & {
-    @include emoji-reaction-transform('right');
-
-    [dir="rtl"] & {
-      @include emoji-reaction-transform('left');
-    }
-  }
-  .quick-reaction {
-    position: relative;
-    top: -2px;
-    margin: 0px 0px;
-    padding: 1px;
-    font-size: 10px;
-    &:hover {
-      //border: 1px solid #888888;
-      background-color: #e2e2e2;
-    }
-    .quick-reaction-count {
-      color: #888888;
-      font-size: 0.7rem;
-    }
-  }
-  .sent .quick-reaction-count {
-    color: black;
-    font-weight: 700;
-    // background-color: palegreen;
-  }
-
-  [dir="rtl"] & {
-    @include emoji-reaction-transform('right');
-  }
-}
-
 .download-overlay {
   position: absolute;
   left: 0;
diff --git a/src/assets/translations/en.json b/src/assets/translations/en.json
index f237d9b..4e07c04 100644
--- a/src/assets/translations/en.json
+++ b/src/assets/translations/en.json
@@ -7,7 +7,11 @@
   "global": {
     "save": "Save",
     "password_didnot_match": "Password didn't match",
-    "password_hint": "Minimum 12 character containing atleast one numeric, one uppercase and one lowercase letter"
+    "password_hint": "Minimum 12 character containing atleast one numeric, one uppercase and one lowercase letter",
+    "show_less": "Show less",
+    "show_more": "Show more",
+    "add_reaction": "Add reaction",
+    "click_to_remove": "Click to remove"
   },
   "menu": {
     "start_private_chat": "Private chat with this user",
@@ -83,7 +87,8 @@
     "time_ago": "Today | Yesterday | {count} days ago",
     "outgoing_message_deleted_text": "You deleted this message.",
     "incoming_message_deleted_text": "This message was deleted.",
-    "not_allowed_to_send": "Only admins and moderators are allowed to send to the room"
+    "not_allowed_to_send": "Only admins and moderators are allowed to send to the room",
+    "reaction_count_more": "{reactionCount} more"
   },
   "room": {
     "invitations": "You have no invitations | You have 1 invitation | You have {count} invitations",
diff --git a/src/components/Chat.vue b/src/components/Chat.vue
index fb30d38..74f7ec7 100644
--- a/src/components/Chat.vue
+++ b/src/components/Chat.vue
@@ -56,7 +56,12 @@
               :timelineSet="timelineSet" v-on:send-quick-reaction.stop="sendQuickReaction"
               v-on:context-menu="showContextMenuForEvent($event)" v-on:own-avatar-clicked="viewProfile"
               v-on:other-avatar-clicked="showAvatarMenuForEvent($event)" v-on:download="download(event)"
-              v-on:poll-closed="pollWasClosed(event)" />
+              v-on:poll-closed="pollWasClosed(event)"
+              v-on:more="
+                isEmojiQuickReaction = true
+                showMoreMessageOperations($event)
+                "
+              />
             <!-- <div v-if="debugging" style="user-select:text">EventID: {{ event.getId() }}</div> -->
             <!-- <div v-if="debugging" style="user-select:text">Event: {{ JSON.stringify(event) }}</div> -->
             <div v-if="event.getId() == readMarker && index < events.length - 1" class="read-marker"
diff --git a/src/components/messages/MessageIncoming.vue b/src/components/messages/MessageIncoming.vue
index e1f1727..4e43de7 100644
--- a/src/components/messages/MessageIncoming.vue
+++ b/src/components/messages/MessageIncoming.vue
@@ -20,7 +20,7 @@
         <v-icon>more_vert</v-icon>
       </v-btn>
     </div>
-    <QuickReactions :event="event" :timelineSet="timelineSet" />
+    <QuickReactions :event="event" :timelineSet="timelineSet" v-on="$listeners"/>
   </div>
 </template>
 
diff --git a/src/components/messages/MessageOutgoing.vue b/src/components/messages/MessageOutgoing.vue
index d2495eb..882ddb3 100644
--- a/src/components/messages/MessageOutgoing.vue
+++ b/src/components/messages/MessageOutgoing.vue
@@ -8,7 +8,6 @@
       <div class="status">{{ event.status }}</div>
     </div>
 
-    <QuickReactions :event="event" :timelineSet="timelineSet" />
     <div class="op-button" ref="opbutton" v-if="!event.isRedacted()">
       <v-btn id="btn-show-menu" icon @click.stop="showContextMenu($refs.opbutton)">
         <v-icon>more_vert</v-icon>
@@ -25,6 +24,7 @@
       <img v-if="userAvatar" :src="userAvatar" />
       <span v-else class="white--text headline">{{ userAvatarLetter }}</span>
     </v-avatar>
+    <QuickReactions :event="event" :timelineSet="timelineSet" v-on="$listeners"/>
   </div>
 </template>
 
diff --git a/src/components/messages/QuickReactions.vue b/src/components/messages/QuickReactions.vue
index 63dc6be..dd1f952 100644
--- a/src/components/messages/QuickReactions.vue
+++ b/src/components/messages/QuickReactions.vue
@@ -1,13 +1,67 @@
 <template>
   <div class="quick-reaction-container" v-show="reactions">
-    <span :class="{'quick-reaction':true,'sent':value.includes($matrix.currentUserId)}" v-for="(value, name) in reactionMap" :key="name" @click.stop="onClickEmoji(name)">
-      {{ name }} <span class="quick-reaction-count">{{ value.length }}</span>
-    </span>
+    <div
+      class="emoji"
+      v-for="(value, name, index) in reactionMap"
+      :key="name"
+      v-show="showAllReaction || index < REACTION_LIMIT"
+    >
+      <v-tooltip top v-if="value.includes($matrix.currentUserId)">
+        <template v-slot:activator="{ on, attrs }">
+          <v-chip
+            class="pa-2 ma-1 ml-0"
+            outlined
+            small
+            v-bind="attrs"
+            v-on="on"
+            @click="onClickEmoji(name)"
+          >
+            {{ name }} {{ value.length }}
+          </v-chip>
+        </template>
+        <span v-if="value.includes($matrix.currentUserId)">{{ $t("global.click_to_remove") }}</span>
+      </v-tooltip>
+      <v-chip
+        v-else
+        class="pa-2 ma-1 ml-0"
+        outlined
+        small
+      >
+        {{ name }} {{ value.length }}
+      </v-chip>
+    </div>
+    <v-chip
+      v-if="totalReaction > REACTION_LIMIT"
+      @click="showAllReaction = !showAllReaction"
+      class="pa-2 ma-1 ml-0"
+      outlined
+      small
+    >
+      {{ otherReactionText }}
+    </v-chip>
+    <v-tooltip top v-if="!!totalReaction">
+      <template v-slot:activator="{ on, attrs }">
+        <v-chip
+          outlined
+          small
+          class="pa-2 ma-1 ml-0"
+          v-bind="attrs"
+          v-on="on"
+          @click="more"
+        >
+          <v-icon small> $vuetify.icons.addReaction </v-icon>
+        </v-chip>
+      </template>
+      <span>{{ $t("global.add_reaction") }}</span>
+    </v-tooltip>
   </div>
 </template>
 
 <script>
+import messageOperationsMixin from "./messageOperationsMixin";
+
 export default {
+  mixins: [messageOperationsMixin],
   props: {
     event: {
       type: Object,
@@ -25,7 +79,9 @@ export default {
   data() {
     return {
       reactionMap: {},
-      reactions: null
+      reactions: null,
+      REACTION_LIMIT: 5,
+      showAllReaction: false
     }
   },
   mounted() {
@@ -38,6 +94,14 @@ export default {
       this.reactions.off('Relations.add', this.onAddRelation);
     }
   },
+  computed: {
+    totalReaction() {
+      return Object.keys(this.reactionMap).length
+    },
+    otherReactionText() {
+      return this.showAllReaction ? this.$t("global.show_less") : this.$t("message.reaction_count_more", { reactionCount: this.totalReaction - this.REACTION_LIMIT })
+    }
+  },
   methods: {
     onRelationsCreated() {
       this.reactions = this.timelineSet.relations.getChildEventsForEvent(this.event.getId(), 'm.annotation', 'm.reaction');