diff --git a/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue b/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue
index 29fe8eefc3..5b234f10dc 100644
--- a/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue
+++ b/src/components/MessagesList/MessagesGroup/Message/MessagePart/MessageBody.vue
@@ -5,8 +5,6 @@
 
 <template>
 	<div ref="messageMain"
-		v-element-size="[onResize, { width: 0, height: 22.5 }]"
-		v-intersection-observer="onIntersectionObserver"
 		class="message-main">
 		<!-- System or deleted message body content -->
 		<div v-if="isSystemMessage || isDeletedMessage"
@@ -130,7 +128,6 @@
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { t } from '@nextcloud/l10n'
 import moment from '@nextcloud/moment'
-import { vElementSize as ElementSize, vIntersectionObserver as IntersectionObserver } from '@vueuse/components'
 import emojiRegex from 'emoji-regex'
 import { inject, toRefs } from 'vue'
 import NcButton from '@nextcloud/vue/components/NcButton'
@@ -181,11 +178,6 @@ export default {
 		ReloadIcon,
 	},
 
-	directives: {
-		IntersectionObserver,
-		ElementSize,
-	},
-
 	props: {
 		message: {
 			type: Object,
@@ -238,8 +230,6 @@ export default {
 			showReloadButton: false,
 			currentCodeBlock: null,
 			copyButtonOffset: 0,
-			isVisible: false,
-			previousSize: { width: 0, height: 22.5 }, // default height of one-line message body without widgets
 		}
 	},
 
@@ -491,29 +481,6 @@ export default {
 				this.isEditing = value
 			}
 		},
-
-		onIntersectionObserver([{ isIntersecting }]) {
-			this.isVisible = isIntersecting
-		},
-
-		onResize({ width, height }) {
-			const oldWidth = this.previousSize?.width
-			const oldHeight = this.previousSize?.height
-			this.previousSize = { width, height }
-
-			if (!this.isVisible) {
-				return
-			}
-			if (oldWidth && oldWidth !== width) {
-				// Resizing messages list
-				return
-			}
-			if (height === 0) {
-				// component is unmounted
-				return
-			}
-			EventBus.emit('message-height-changed', { heightDiff: height - oldHeight })
-		},
 	},
 }
 </script>
diff --git a/src/components/MessagesList/MessagesList.vue b/src/components/MessagesList/MessagesList.vue
index ae550af5a0..7247c1ea78 100644
--- a/src/components/MessagesList/MessagesList.vue
+++ b/src/components/MessagesList/MessagesList.vue
@@ -329,7 +329,6 @@ export default {
 		EventBus.on('scroll-chat-to-bottom', this.scrollToBottom)
 		EventBus.on('focus-message', this.focusMessage)
 		EventBus.on('route-change', this.onRouteChange)
-		EventBus.on('message-height-changed', this.onMessageHeightChanged)
 		window.addEventListener('focus', this.onWindowFocus)
 
 		this.resizeObserver = new ResizeObserver(this.updateSize)
@@ -344,7 +343,6 @@ export default {
 		EventBus.off('scroll-chat-to-bottom', this.scrollToBottom)
 		EventBus.off('focus-message', this.focusMessage)
 		EventBus.off('route-change', this.onRouteChange)
-		EventBus.off('message-height-changed', this.onMessageHeightChanged)
 
 		if (this.resizeObserver) {
 			this.resizeObserver.disconnect()
@@ -1088,11 +1086,6 @@ export default {
 			return group.isSystemMessagesGroup ? MessagesSystemGroup : MessagesGroup
 		},
 
-		onMessageHeightChanged({ heightDiff }) {
-			// scroll down by the height difference
-			this.$refs.scroller.scrollTop += heightDiff
-		},
-
 		updateTasksCount() {
 			if (!this.$refs.scroller) {
 				return
diff --git a/src/services/EventBus.ts b/src/services/EventBus.ts
index 0e45480489..daf83af71b 100644
--- a/src/services/EventBus.ts
+++ b/src/services/EventBus.ts
@@ -31,7 +31,6 @@ export type Events = {
 	'focus-message': number // TODO: listener method can receive ...[messageId, smooth, highlightAnimation]
 	'forbidden-route': { error: string }
 	'joined-conversation': { token: string }
-	'message-height-changed': { heightDiff: number }
 	'poll-drafts-open': { token: string, selector?: string }
 	'poll-editor-open': { token: string, id: number | null, fromDrafts: boolean, action?: string, selector?: string }
 	'refresh-peer-list': void