diff --git a/src/components/ActionRow.vue b/src/components/ActionRow.vue
index 25e64da..1e8cefa 100644
--- a/src/components/ActionRow.vue
+++ b/src/components/ActionRow.vue
@@ -3,7 +3,6 @@
     class="action-row ma-0 pa-0"
     no-gutters
     align-content="center"
-    v-on="$listeners"
   >
     <v-col cols="auto" class="me-2 align-self-center">
       <v-icon :size="iconSize">{{ icon }}</v-icon>
diff --git a/src/components/AudioLayout.vue b/src/components/AudioLayout.vue
index a643b39..d234f5d 100644
--- a/src/components/AudioLayout.vue
+++ b/src/components/AudioLayout.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-bind="{ ...$props, ...$attrs }" v-on="$listeners" class="messageIn">
+  <div v-bind="{ ...$props, ...$attrs }" class="messageIn">
     <div class="load-earlier clickable" @click="loadPrevious">
       <v-icon color="white" size="28">expand_less</v-icon>
     </div>
diff --git a/src/components/SelectLanguageDialog.vue b/src/components/SelectLanguageDialog.vue
index bf59a1c..d54ed43 100644
--- a/src/components/SelectLanguageDialog.vue
+++ b/src/components/SelectLanguageDialog.vue
@@ -2,7 +2,6 @@
   <v-dialog
     class="ma-0 pa-0"
     v-bind="{ ...$props, ...$attrs }"
-    v-on="$listeners"
     :width="$vuetify.display.smAndUp ? '940px' : '90%'"
   >
     <v-card class="dialog-card">
diff --git a/src/components/file_mode/FileDropLayout.vue b/src/components/file_mode/FileDropLayout.vue
index c4e0138..28cf69c 100644
--- a/src/components/file_mode/FileDropLayout.vue
+++ b/src/components/file_mode/FileDropLayout.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <div v-bind="{ ...$props, ...$attrs }">
     <!-- No attachments view -->
     <template v-if="!attachments || attachments.length == 0">
       <div>
diff --git a/src/components/messages/MessageIncoming.vue b/src/components/messages/MessageIncoming.vue
index d56aeaf..5e967c6 100644
--- a/src/components/messages/MessageIncoming.vue
+++ b/src/components/messages/MessageIncoming.vue
@@ -23,8 +23,8 @@
         <v-icon>more_vert</v-icon>
       </v-btn>
     </div>
-    <QuickReactionsChannel v-if="room.displayType == ROOM_TYPE_CHANNEL" :event="eventForReactions" :timelineSet="timelineSet" v-on="$listeners"/>
-    <QuickReactions v-else :event="eventForReactions" :timelineSet="timelineSet" v-on="$listeners"/>
+    <QuickReactionsChannel v-if="room.displayType == ROOM_TYPE_CHANNEL" :event="eventForReactions" :timelineSet="timelineSet" v-bind="$attrs"/>
+    <QuickReactions v-else :event="eventForReactions" :timelineSet="timelineSet" v-bind="$attrs"/>
     <SeenBy v-if="room.displayType != ROOM_TYPE_CHANNEL" :room="room" :event="event"/>
   </div>
 </template>
diff --git a/src/components/messages/MessageIncomingAudio.vue b/src/components/messages/MessageIncomingAudio.vue
index f1ed2c6..4ae54e5 100644
--- a/src/components/messages/MessageIncomingAudio.vue
+++ b/src/components/messages/MessageIncomingAudio.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-incoming v-bind="{...$props, ...$attrs}" v-on="$listeners">
+  <message-incoming v-bind="{...$props, ...$attrs}">
     <div class="bubble audio-bubble">
       <audio-player :event="event" :timelineSet="timelineSet">{{ $t('fallbacks.audio_file')}}</audio-player>
     </div>
diff --git a/src/components/messages/MessageIncomingFile.vue b/src/components/messages/MessageIncomingFile.vue
index ef34564..5df9b0f 100644
--- a/src/components/messages/MessageIncomingFile.vue
+++ b/src/components/messages/MessageIncomingFile.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-incoming v-bind="{...$props, ...$attrs}" v-on="$listeners">
+  <message-incoming v-bind="{...$props, ...$attrs}">
     <div class="bubble">
       <div class="original-message" v-if="inReplyToText">
         <div class="original-message-sender">{{ inReplyToSender }}</div>
diff --git a/src/components/messages/MessageIncomingImage.vue b/src/components/messages/MessageIncomingImage.vue
index 6c5c4bc..caf8f31 100644
--- a/src/components/messages/MessageIncomingImage.vue
+++ b/src/components/messages/MessageIncomingImage.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-incoming v-bind="{...$props, ...$attrs}" v-on="$listeners">
+  <message-incoming v-bind="{...$props, ...$attrs}">
     <div class="bubble image-bubble" ref="imageRef">
       <v-img
         :aspect-ratio="16 / 9"
diff --git a/src/components/messages/MessageIncomingPoll.vue b/src/components/messages/MessageIncomingPoll.vue
index 3008f22..0433118 100644
--- a/src/components/messages/MessageIncomingPoll.vue
+++ b/src/components/messages/MessageIncomingPoll.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-incoming v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-incoming v-bind="{ ...$props, ...$attrs }">
     <div class="bubble poll-bubble">
       <div class="poll-icon">
         <v-icon dark>$vuetify.icons.poll</v-icon>
diff --git a/src/components/messages/MessageIncomingSticker.vue b/src/components/messages/MessageIncomingSticker.vue
index afa5800..0a3a020 100644
--- a/src/components/messages/MessageIncomingSticker.vue
+++ b/src/components/messages/MessageIncomingSticker.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-incoming v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-incoming v-bind="{ ...$props, ...$attrs }">
     <div class="bubble sticker-bubble">
       <v-img
         :aspect-ratio="16 / 9"
diff --git a/src/components/messages/MessageIncomingText.vue b/src/components/messages/MessageIncomingText.vue
index f98648d..d3c966d 100644
--- a/src/components/messages/MessageIncomingText.vue
+++ b/src/components/messages/MessageIncomingText.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-incoming v-bind="{...$props, ...$attrs}" v-on="$listeners">
+  <message-incoming v-bind="{...$props, ...$attrs}">
     <div class="bubble">
       <div class="original-message" v-if="inReplyToText">
         <div class="original-message-sender">{{ inReplyToSender }}</div>
diff --git a/src/components/messages/MessageIncomingThread.vue b/src/components/messages/MessageIncomingThread.vue
index 9a10424..4bb35a8 100644
--- a/src/components/messages/MessageIncomingThread.vue
+++ b/src/components/messages/MessageIncomingThread.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-incoming v-bind="{ ...$props, ...$attrs }" v-on="$listeners" v-if="items.length > 1 || event.isRedacted() || forceMultiview">
+  <message-incoming v-bind="{ ...$props, ...$attrs }" v-if="items.length > 1 || event.isRedacted() || forceMultiview">
     <div class="bubble">
       <div class="original-message" v-if="inReplyToText">
         <div class="original-message-sender">{{ inReplyToSender }}</div>
@@ -10,7 +10,7 @@
       </div>
 
       <div class="message">
-        <SwipeableThumbnailsView :items="items" v-if="!event.isRedacted() && room.displayType == ROOM_TYPE_CHANNEL" v-on="$listeners" />
+        <SwipeableThumbnailsView :items="items" v-if="!event.isRedacted() && room.displayType == ROOM_TYPE_CHANNEL" v-bind="$attrs" />
         <v-container v-else-if="!event.isRedacted()" fluid class="imageCollection">
           <v-row wrap>
             <v-col v-for="({ size, item }) in layoutedItems()" :key="item.event.getId()" :cols="size">
@@ -32,7 +32,7 @@
   </message-incoming>
   <component v-else-if="items.length == 1" :is="componentFn(items[0].event)" 
     :originalEvent="items[0].event"
-    v-bind="{...$props, ...$attrs}" v-on="$listeners"
+    v-bind="{...$props, ...$attrs}"
   />
 </template>
 
diff --git a/src/components/messages/MessageIncomingVideo.vue b/src/components/messages/MessageIncomingVideo.vue
index c7af6d8..5150fe0 100644
--- a/src/components/messages/MessageIncomingVideo.vue
+++ b/src/components/messages/MessageIncomingVideo.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-incoming v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-incoming v-bind="{ ...$props, ...$attrs }">
     <div class="bubble image-bubble">
       <v-responsive :aspect-ratio="16 / 9" :src="src">
         <video :src="src" controls class="w-100 h-100">
diff --git a/src/components/messages/MessageOutgoing.vue b/src/components/messages/MessageOutgoing.vue
index 2bcf636..0a76139 100644
--- a/src/components/messages/MessageOutgoing.vue
+++ b/src/components/messages/MessageOutgoing.vue
@@ -29,8 +29,8 @@
       <AuthedImage v-if="userAvatar" :src="userAvatar" />
       <span v-else class="text-white headline">{{ userAvatarLetter }}</span>
     </v-avatar>
-    <QuickReactionsChannel v-if="room.displayType == ROOM_TYPE_CHANNEL" :event="eventForReactions" :timelineSet="timelineSet" v-on="$listeners"/>
-    <QuickReactions v-else :event="eventForReactions" :timelineSet="timelineSet" v-on="$listeners"/>
+    <QuickReactionsChannel v-if="room.displayType == ROOM_TYPE_CHANNEL" :event="eventForReactions" :timelineSet="timelineSet" v-bind="$attrs"/>
+    <QuickReactions v-else :event="eventForReactions" :timelineSet="timelineSet" v-bin="$attrs"/>
     <SeenBy v-if="room.displayType != ROOM_TYPE_CHANNEL" :room="room" :event="event"/>
   </div>
 </template>
diff --git a/src/components/messages/MessageOutgoingAudio.vue b/src/components/messages/MessageOutgoingAudio.vue
index 70db51d..69fcc78 100644
--- a/src/components/messages/MessageOutgoingAudio.vue
+++ b/src/components/messages/MessageOutgoingAudio.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-outgoing v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
     <div class="bubble audio-bubble">
       <audio-player :event="event" :timelineSet="timelineSet">{{ $t('fallbacks.audio_file')}}</audio-player>
     </div>
diff --git a/src/components/messages/MessageOutgoingFile.vue b/src/components/messages/MessageOutgoingFile.vue
index 87e8e6d..30cb03d 100644
--- a/src/components/messages/MessageOutgoingFile.vue
+++ b/src/components/messages/MessageOutgoingFile.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-outgoing v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
     <div class="bubble">
       <div class="original-message" v-if="inReplyToText">
         <div class="original-message-sender">{{ inReplyToSender }}</div>
diff --git a/src/components/messages/MessageOutgoingImage.vue b/src/components/messages/MessageOutgoingImage.vue
index bdfa332..89c4c1c 100644
--- a/src/components/messages/MessageOutgoingImage.vue
+++ b/src/components/messages/MessageOutgoingImage.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-outgoing v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
     <div class="bubble image-bubble" ref="imageRef">
       <v-img
         :aspect-ratio="16 / 9"
diff --git a/src/components/messages/MessageOutgoingPoll.vue b/src/components/messages/MessageOutgoingPoll.vue
index 779c63e..74fb7b7 100644
--- a/src/components/messages/MessageOutgoingPoll.vue
+++ b/src/components/messages/MessageOutgoingPoll.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-outgoing v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
     <div class="bubble poll-bubble">
       <div class="poll-icon">
         <v-icon light>$vuetify.icons.poll</v-icon>
diff --git a/src/components/messages/MessageOutgoingSticker.vue b/src/components/messages/MessageOutgoingSticker.vue
index 2fa7655..5aa7417 100644
--- a/src/components/messages/MessageOutgoingSticker.vue
+++ b/src/components/messages/MessageOutgoingSticker.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-outgoing v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
     <div class="bubble sticker-bubble">
       <v-img
         :aspect-ratio="16 / 9"
diff --git a/src/components/messages/MessageOutgoingText.vue b/src/components/messages/MessageOutgoingText.vue
index fd55d75..719d80a 100644
--- a/src/components/messages/MessageOutgoingText.vue
+++ b/src/components/messages/MessageOutgoingText.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-outgoing v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
     <div class="bubble">
       <div class="original-message" v-if="inReplyToText">
         <div class="original-message-sender">{{ inReplyToSender }}</div>
diff --git a/src/components/messages/MessageOutgoingThread.vue b/src/components/messages/MessageOutgoingThread.vue
index 4e963af..50a64ac 100644
--- a/src/components/messages/MessageOutgoingThread.vue
+++ b/src/components/messages/MessageOutgoingThread.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-outgoing v-bind="{ ...$props, ...$attrs }" v-on="$listeners" v-if="items.length > 1 || event.isRedacted() || forceMultiview">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }" v-if="items.length > 1 || event.isRedacted() || forceMultiview">
     <div class="bubble">
       <div class="original-message" v-if="inReplyToText">
         <div class="original-message-sender">{{ inReplyToSender }}</div>
@@ -11,7 +11,7 @@
 
 
       <div class="message">
-        <SwipeableThumbnailsView :items="items" v-if="!event.isRedacted() && room.displayType == ROOM_TYPE_CHANNEL" v-on="$listeners" />
+        <SwipeableThumbnailsView :items="items" v-if="!event.isRedacted() && room.displayType == ROOM_TYPE_CHANNEL" v-bind="$attrs" />
         <v-container v-else-if="!event.isRedacted()" fluid class="imageCollection">
           <v-row wrap>
             <v-col v-for="({ size, item }) in layoutedItems()" :key="item.event.getId()" :cols="size">
@@ -33,7 +33,7 @@
   </message-outgoing>
   <component v-else-if="items.length == 1" :is="componentFn(items[0].event)"
     :originalEvent="items[0].event"
-    v-bind="{...$props, ...$attrs}" v-on="$listeners"
+    v-bind="{...$props, ...$attrs}"
   />
 </template>
 
diff --git a/src/components/messages/MessageOutgoingVideo.vue b/src/components/messages/MessageOutgoingVideo.vue
index 32a0e18..027818d 100644
--- a/src/components/messages/MessageOutgoingVideo.vue
+++ b/src/components/messages/MessageOutgoingVideo.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-outgoing v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
     <div class="bubble image-bubble">
       <v-responsive :aspect-ratio="16 / 9" class="ma-0 pa-0">
         <video :src="src" controls class="w-100 h-100">
diff --git a/src/components/messages/export/MessageIncomingAudioExport.vue b/src/components/messages/export/MessageIncomingAudioExport.vue
index b7d3032..f606bba 100644
--- a/src/components/messages/export/MessageIncomingAudioExport.vue
+++ b/src/components/messages/export/MessageIncomingAudioExport.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-incoming v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-incoming v-bind="{ ...$props, ...$attrs }">
     <audio controls>{{ $t("fallbacks.audio_file") }}</audio>
   </message-incoming>
 </template>
diff --git a/src/components/messages/export/MessageIncomingFileExport.vue b/src/components/messages/export/MessageIncomingFileExport.vue
index 3696760..e29bbc9 100644
--- a/src/components/messages/export/MessageIncomingFileExport.vue
+++ b/src/components/messages/export/MessageIncomingFileExport.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-incoming v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-incoming v-bind="{ ...$props, ...$attrs }">
     <a style="text-decoration: none;color: currentColor" class="bubble" target="_blank" :href="href" >
       <div :class="{ 'thumbnail-item': true, 'preview': true, 'file-item': true }">
         <b>{{ $sanitize(fileName) }}</b>
diff --git a/src/components/messages/export/MessageIncomingImageExport.vue b/src/components/messages/export/MessageIncomingImageExport.vue
index 6d1a821..0de1943 100644
--- a/src/components/messages/export/MessageIncomingImageExport.vue
+++ b/src/components/messages/export/MessageIncomingImageExport.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-incoming v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-incoming v-bind="{ ...$props, ...$attrs }">
     <div class="bubble image-bubble">
       <v-img :aspect-ratio="16 / 9" ref="image" :src="src" :cover="cover" :contain="contain" />
     </div>
diff --git a/src/components/messages/export/MessageIncomingThreadExport.vue b/src/components/messages/export/MessageIncomingThreadExport.vue
index a527dd2..a122984 100644
--- a/src/components/messages/export/MessageIncomingThreadExport.vue
+++ b/src/components/messages/export/MessageIncomingThreadExport.vue
@@ -1,7 +1,7 @@
 <template>
-  <message-incoming class="messageIn-thread" v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-incoming class="messageIn-thread" v-bind="{ ...$props, ...$attrs }">
     <component v-for="item in items" :is="componentFn(item.event)" :originalEvent="item.event" :key="item.event.getId()"
-      v-bind="{ ...$props }" v-on="$listeners" ref="exportedEvent" />
+      v-bind="{ ...$props, ...$attrs }" ref="exportedEvent" />
   </message-incoming>
 </template>
 
diff --git a/src/components/messages/export/MessageIncomingVideoExport.vue b/src/components/messages/export/MessageIncomingVideoExport.vue
index 1716a36..1f5f9b5 100644
--- a/src/components/messages/export/MessageIncomingVideoExport.vue
+++ b/src/components/messages/export/MessageIncomingVideoExport.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-incoming v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-incoming v-bind="{ ...$props, ...$attrs }">
     <div class="bubble image-bubble">
       <v-responsive :aspect-ratio="16 / 9" :src="src">
         <video controls class="w-100 h-100">
diff --git a/src/components/messages/export/MessageOutgoingAudioExport.vue b/src/components/messages/export/MessageOutgoingAudioExport.vue
index f32c19a..45e3897 100644
--- a/src/components/messages/export/MessageOutgoingAudioExport.vue
+++ b/src/components/messages/export/MessageOutgoingAudioExport.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-outgoing v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
     <audio controls>{{ $t("fallbacks.audio_file") }}</audio>
   </message-outgoing>
 </template>
diff --git a/src/components/messages/export/MessageOutgoingFileExport.vue b/src/components/messages/export/MessageOutgoingFileExport.vue
index 0bcaa6f..9188771 100644
--- a/src/components/messages/export/MessageOutgoingFileExport.vue
+++ b/src/components/messages/export/MessageOutgoingFileExport.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-outgoing v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
     <a style="text-decoration: none;color: currentColor" class="bubble" target="_blank" :href="href" >
       <div :class="{ 'thumbnail-item': true, 'preview': true, 'file-item': true }">
         <b>{{ $sanitize(fileName) }}</b>
diff --git a/src/components/messages/export/MessageOutgoingImageExport.vue b/src/components/messages/export/MessageOutgoingImageExport.vue
index 3bb6e77..acbc56c 100644
--- a/src/components/messages/export/MessageOutgoingImageExport.vue
+++ b/src/components/messages/export/MessageOutgoingImageExport.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-outgoing v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
     <div class="bubble image-bubble">
       <v-img :aspect-ratio="16 / 9" ref="image" :src="src" :cover="cover" :contain="contain" />
     </div>
diff --git a/src/components/messages/export/MessageOutgoingThreadExport.vue b/src/components/messages/export/MessageOutgoingThreadExport.vue
index 108e5cf..6344269 100644
--- a/src/components/messages/export/MessageOutgoingThreadExport.vue
+++ b/src/components/messages/export/MessageOutgoingThreadExport.vue
@@ -1,7 +1,7 @@
 <template>
-  <message-outgoing class="messageOut-thread" v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-outgoing class="messageOut-thread" v-bind="{ ...$props, ...$attrs }">
     <component v-for="item in items" :is="componentFn(item.event)" :originalEvent="item.event" :key="item.event.getId()"
-      v-bind="{ ...$props }" v-on="$listeners" ref="exportedEvent" />
+      v-bind="{ ...$props, ...$attrs }" ref="exportedEvent" />
   </message-outgoing>
 </template>
 
diff --git a/src/components/messages/export/MessageOutgoingVideoExport.vue b/src/components/messages/export/MessageOutgoingVideoExport.vue
index 8faf38f..e0c729b 100644
--- a/src/components/messages/export/MessageOutgoingVideoExport.vue
+++ b/src/components/messages/export/MessageOutgoingVideoExport.vue
@@ -1,5 +1,5 @@
 <template>
-  <message-outgoing v-bind="{ ...$props, ...$attrs }" v-on="$listeners">
+  <message-outgoing v-bind="{ ...$props, ...$attrs }">
     <div class="bubble image-bubble">
       <v-responsive :aspect-ratio="16 / 9" class="ma-0 pa-0">
         <video controls class="w-100 h-100">