diff --git a/src/App.vue b/src/App.vue
index ec424e0a6d4..b2e02bb5fb8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -31,7 +31,6 @@
 		<RightSidebar :is-in-call="isInCall" />
 		<PreventUnload :when="warnLeaving || isSendingMessages" />
 		<MediaSettings :initialize-on-mounted="false" />
-		<UploadEditor />
 		<SettingsDialog />
 		<ConversationSettingsDialog />
 	</NcContent>
@@ -54,7 +53,6 @@ import LeftSidebar from './components/LeftSidebar/LeftSidebar.vue'
 import MediaSettings from './components/MediaSettings/MediaSettings.vue'
 import RightSidebar from './components/RightSidebar/RightSidebar.vue'
 import SettingsDialog from './components/SettingsDialog/SettingsDialog.vue'
-import UploadEditor from './components/UploadEditor.vue'
 
 import { useIsInCall } from './composables/useIsInCall.js'
 import { CONVERSATION, PARTICIPANT } from './constants.js'
@@ -79,7 +77,6 @@ export default {
 		LeftSidebar,
 		PreventUnload,
 		RightSidebar,
-		UploadEditor,
 		SettingsDialog,
 		ConversationSettingsDialog,
 		MediaSettings,
diff --git a/src/FilesSidebarTabApp.vue b/src/FilesSidebarTabApp.vue
index acad204ee10..e89a886fde1 100644
--- a/src/FilesSidebarTabApp.vue
+++ b/src/FilesSidebarTabApp.vue
@@ -41,7 +41,6 @@
 		<template v-else>
 			<CallButton class="call-button" />
 			<ChatView />
-			<UploadEditor />
 			<MediaSettings :initialize-on-mounted="false" />
 		</template>
 	</div>
@@ -58,7 +57,6 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import ChatView from './components/ChatView.vue'
 import MediaSettings from './components/MediaSettings/MediaSettings.vue'
 import CallButton from './components/TopBar/CallButton.vue'
-import UploadEditor from './components/UploadEditor.vue'
 
 import browserCheck from './mixins/browserCheck.js'
 import sessionIssueHandler from './mixins/sessionIssueHandler.js'
@@ -80,7 +78,6 @@ export default {
 	components: {
 		CallButton,
 		ChatView,
-		UploadEditor,
 		MediaSettings,
 		NcButton,
 	},
diff --git a/src/components/BreakoutRoomsEditor/SendMessageDialog.vue b/src/components/BreakoutRoomsEditor/SendMessageDialog.vue
index bcdc4076ea0..05c11c2c665 100644
--- a/src/components/BreakoutRoomsEditor/SendMessageDialog.vue
+++ b/src/components/BreakoutRoomsEditor/SendMessageDialog.vue
@@ -27,11 +27,10 @@
 			<h2 class="send-message-dialog__title">
 				{{ dialogTitle }}
 			</h2>
-			<NewMessageForm v-if="modalContainerId"
-				ref="messageForm"
+			<NewMessage v-if="modalContainerId"
+				ref="newMessage"
 				role="region"
 				:token="token"
-				:breakout-room="true"
 				:container="modalContainerId"
 				:aria-label="t('spreed', 'Post message')"
 				:broadcast="broadcast"
@@ -46,14 +45,14 @@ import { showError, showSuccess } from '@nextcloud/dialogs'
 
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 
-import NewMessageForm from '../NewMessageForm/NewMessageForm.vue'
+import NewMessage from '../NewMessage/NewMessage.vue'
 
 export default {
 	name: 'SendMessageDialog',
 
 	components: {
 		NcModal,
-		NewMessageForm,
+		NewMessage,
 	},
 
 	props: {
@@ -105,10 +104,10 @@ export default {
 	},
 
 	mounted() {
-		// Postpone render of NewMessageForm until modal container is mounted
+		// Postpone render of NewMessage until modal container is mounted
 		this.modalContainerId = `#modal-description-${this.$refs.modal.randId}`
 		this.$nextTick(() => {
-			this.$refs.messageForm.focusInput()
+			this.$refs.newMessage.focusInput()
 		})
 	},
 
diff --git a/src/components/ChatView.vue b/src/components/ChatView.vue
index f494a018db0..c0a2727ad9a 100644
--- a/src/components/ChatView.vue
+++ b/src/components/ChatView.vue
@@ -42,7 +42,7 @@
 			:aria-label="t('spreed', 'Conversation messages')"
 			:token="token"
 			:is-visible="isVisible" />
-		<NewMessageForm v-if="containerId"
+		<NewMessage v-if="containerId"
 			role="region"
 			:token="token"
 			:container="containerId"
@@ -53,7 +53,7 @@
 
 <script>
 import MessagesList from './MessagesList/MessagesList.vue'
-import NewMessageForm from './NewMessageForm/NewMessageForm.vue'
+import NewMessage from './NewMessage/NewMessage.vue'
 
 import { CONVERSATION } from '../constants.js'
 
@@ -63,7 +63,7 @@ export default {
 
 	components: {
 		MessagesList,
-		NewMessageForm,
+		NewMessage,
 	},
 
 	props: {
@@ -106,7 +106,7 @@ export default {
 		},
 	},
 	mounted() {
-		// Postpone render of NewMessageForm until application is mounted
+		// Postpone render of NewMessage until application is mounted
 		this.containerId = this.$store.getters.getMainContainerSelector()
 	},
 
diff --git a/src/components/NewMessageForm/NewMessageForm.vue b/src/components/NewMessage/NewMessage.vue
similarity index 71%
rename from src/components/NewMessageForm/NewMessageForm.vue
rename to src/components/NewMessage/NewMessage.vue
index 7a9d5072481..dab30f8e67b 100644
--- a/src/components/NewMessageForm/NewMessageForm.vue
+++ b/src/components/NewMessage/NewMessage.vue
@@ -3,8 +3,9 @@
   -
   - @author Marco Ambrosini <marcoambrosini@icloud.com>
   - @author Grigorii Shartsev <me@shgk.me>
+  - @author Maksim Sukharev <antreesy.web@gmail.com>
   -
-  - @license GNU AGPL version 3 or any later version
+  - @license AGPL-3.0-or-later
   -
   - This program is free software: you can redistribute it and/or modify
   - it under the terms of the GNU Affero General Public License as
@@ -22,7 +23,7 @@
 
 <template>
 	<div class="wrapper" :class="{'wrapper--has-typing-indicator': showTypingStatus}">
-		<NewMessageFormTypingIndicator v-if="showTypingStatus"
+		<NewMessageTypingIndicator v-if="showTypingStatus"
 			:token="token" />
 
 		<!--native file picker, hidden -->
@@ -34,57 +35,24 @@
 			aria-hidden="true"
 			class="hidden-visually"
 			@change="handleFileInput">
+
 		<div class="new-message">
 			<form class="new-message-form"
 				@submit.prevent>
 				<!-- Attachments menu -->
-				<div v-if="showAttachmentsMenu"
-					class="new-message-form__upload-menu">
-					<NcActions ref="attachmentsMenu"
-						:container="container"
-						:boundaries-element="containerElement"
-						:disabled="disabled"
-						:aria-label="t('spreed', 'Share files to the conversation')"
-						:aria-haspopup="true">
-						<template #icon>
-							<Paperclip :size="16" />
-						</template>
+				<NewMessageAttachments v-if="showAttachmentsMenu"
+					:token="token"
+					:container="container"
+					:boundaries-element="containerElement"
+					:disabled="disabled"
+					:can-upload-files="canUploadFiles"
+					:can-share-files="canShareFiles"
+					:can-create-poll="canCreatePoll"
+					@open-file-upload="openFileUploadWindow"
+					@handle-file-share="handleFileShare"
+					@toggle-poll-editor="togglePollEditor"
+					@update-new-file-dialog="updateNewFileDialog" />
 
-						<NcActionButton v-if="canUploadFiles"
-							:close-after-click="true"
-							@click.prevent="clickImportInput">
-							<template #icon>
-								<Upload :size="20" />
-							</template>
-							{{ t('spreed', 'Upload from device') }}
-						</NcActionButton>
-						<NcActionButton v-if="canShareFiles"
-							:close-after-click="true"
-							@click.prevent="handleFileShare">
-							<template #icon>
-								<Folder :size="20" />
-							</template>
-							{{ shareFromNextcloudLabel }}
-						</NcActionButton>
-						<template v-if="canShareFiles">
-							<NcActionButton v-for="(provider, i) in fileTemplateOptions"
-								:key="i"
-								:close-after-click="true"
-								:icon="provider.iconClass"
-								@click.prevent="showTextFileDialog = i">
-								{{ provider.label }}
-							</NcActionButton>
-						</template>
-						<NcActionButton v-if="canCreatePoll"
-							:close-after-click="true"
-							@click.prevent="toggleSimplePollsEditor(true)">
-							<template #icon>
-								<Poll :size="20" />
-							</template>
-							{{ t('spreed', 'Create new poll') }}
-						</NcActionButton>
-					</NcActions>
-				</div>
 				<!-- Input area -->
 				<div class="new-message-form__input">
 					<div class="new-message-form__emoji-picker">
@@ -112,7 +80,7 @@
 						</NcButton>
 					</div>
 					<div v-if="messageToBeReplied" class="new-message-form__quote">
-						<Quote :is-new-message-form-quote="true"
+						<Quote is-new-message-quote
 							:parent-id="messageToBeReplied.id"
 							v-bind="messageToBeReplied" />
 					</div>
@@ -134,10 +102,12 @@
 						@submit="handleSubmit({ silent: false })" />
 				</div>
 
-				<AudioRecorder v-if="showAudioRecorder"
+				<!-- Audio recorder -->
+				<NewMessageAudioRecorder v-if="showAudioRecorder"
 					:disabled="disabled"
 					@recording="handleRecording"
 					@audio-file="handleAudioFile" />
+
 				<!-- Send buttons -->
 				<template v-else>
 					<NcActions v-if="!broadcast"
@@ -147,7 +117,7 @@
 						<NcActionButton :close-after-click="true"
 							icon="icon-upload"
 							:title="t('spreed', 'Send without notification')"
-							@click.prevent="handleSubmit({ silent: true })">
+							@click="handleSubmit({ silent: true })">
 							{{ silentSendInfo }}
 							<template #icon>
 								<BellOff :size="16" />
@@ -160,7 +130,7 @@
 						native-type="submit"
 						:title="t('spreed', 'Send message')"
 						:aria-label="t('spreed', 'Send message')"
-						@click.prevent="handleSubmit({ silent: false })">
+						@click="handleSubmit({ silent: false })">
 						<template #icon>
 							<Send :size="16" />
 						</template>
@@ -169,93 +139,50 @@
 			</form>
 		</div>
 
-		<SimplePollsEditor v-if="showSimplePollsEditor"
+		<!-- File upload dialog -->
+		<NewMessageUploadEditor />
+
+		<!-- Poll creation dialog -->
+		<NewMessagePollEditor v-if="showPollEditor"
 			:token="token"
-			@close="toggleSimplePollsEditor(false)" />
+			@close="togglePollEditor" />
 
-		<!-- Text file creation dialog -->
-		<NcModal v-if="showTextFileDialog !== false"
-			size="normal"
+		<!-- New file creation dialog -->
+		<NewMessageNewFileDialog v-if="showNewFileDialog !== -1"
+			:token="token"
 			:container="container"
-			class="templates-picker"
-			@close="dismissTextFileCreation">
-			<div class="new-text-file">
-				<h2>
-					{{ t('spreed', 'Create and share a new file') }}
-				</h2>
-				<form class="new-text-file__form templates-picker__form"
-					:style="style"
-					@submit.prevent="handleCreateTextFile">
-					<NcTextField id="new-file-form-name"
-						ref="textFileTitleInput"
-						:error="!!newFileError"
-						:helper-text="newFileError"
-						:label="t('spreed', 'Name of the new file')"
-						:placeholder="textFileTitle"
-						:value.sync="textFileTitle" />
-
-					<template v-if="fileTemplate.templates.length">
-						<ul class="templates-picker__list">
-							<TemplatePreview v-bind="emptyTemplate"
-								:checked="checked === emptyTemplate.fileid"
-								@check="onCheck" />
-
-							<TemplatePreview v-for="template in fileTemplate.templates"
-								:key="template.fileid"
-								v-bind="template"
-								:checked="checked === template.fileid"
-								:ratio="fileTemplate.ratio"
-								@check="onCheck" />
-						</ul>
-					</template>
-
-					<div class="new-text-file__buttons">
-						<NcButton type="tertiary"
-							@click="dismissTextFileCreation">
-							{{ t('spreed', 'Close') }}
-						</NcButton>
-						<NcButton type="primary"
-							@click="handleCreateTextFile">
-							{{ t('spreed', 'Create file') }}
-						</NcButton>
-					</div>
-				</form>
-			</div>
-		</NcModal>
+			:show-new-file-dialog="showNewFileDialog"
+			@dismiss="showNewFileDialog = -1" />
 	</div>
 </template>
 
 <script>
 import BellOff from 'vue-material-design-icons/BellOff.vue'
 import EmoticonOutline from 'vue-material-design-icons/EmoticonOutline.vue'
-import Folder from 'vue-material-design-icons/Folder.vue'
-import Paperclip from 'vue-material-design-icons/Paperclip.vue'
-import Poll from 'vue-material-design-icons/Poll.vue'
 import Send from 'vue-material-design-icons/Send.vue'
-import Upload from 'vue-material-design-icons/Upload.vue'
 
 import { getCapabilities } from '@nextcloud/capabilities'
-import { getFilePickerBuilder, showError } from '@nextcloud/dialogs'
+import { getFilePickerBuilder } from '@nextcloud/dialogs'
 import { generateOcsUrl } from '@nextcloud/router'
 
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
-import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import NcRichContenteditable from '@nextcloud/vue/dist/Components/NcRichContenteditable.js'
-import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
 
 import Quote from '../Quote.vue'
-import AudioRecorder from './AudioRecorder/AudioRecorder.vue'
-import NewMessageFormTypingIndicator from './NewMessageFormTypingIndicator.vue'
-import SimplePollsEditor from './SimplePollsEditor/SimplePollsEditor.vue'
-import TemplatePreview from './TemplatePreview.vue'
+import NewMessageAttachments from './NewMessageAttachments.vue'
+import NewMessageAudioRecorder from './NewMessageAudioRecorder.vue'
+import NewMessageNewFileDialog from './NewMessageNewFileDialog.vue'
+import NewMessagePollEditor from './NewMessagePollEditor.vue'
+import NewMessageTypingIndicator from './NewMessageTypingIndicator.vue'
+import NewMessageUploadEditor from './NewMessageUploadEditor.vue'
 
 import { useViewer } from '../../composables/useViewer.js'
 import { CONVERSATION, PARTICIPANT, PRIVACY } from '../../constants.js'
 import { EventBus } from '../../services/EventBus.js'
-import { shareFile, createTextFile } from '../../services/filesSharingServices.js'
+import { shareFile } from '../../services/filesSharingServices.js'
 import { searchPossibleMentions } from '../../services/mentionsService.js'
 import { fetchClipboardContent } from '../../utils/clipboard.js'
 
@@ -266,39 +193,31 @@ const picker = getFilePickerBuilder(t('spreed', 'File to share'))
 	.allowDirectories()
 	.build()
 
-const border = 2
-const margin = 8
-const width = margin * 20
-
 const disableKeyboardShortcuts = OCP.Accessibility.disableKeyboardShortcuts()
 const supportTypingStatus = getCapabilities()?.spreed?.config?.chat?.['typing-privacy'] !== undefined
 
 export default {
-	name: 'NewMessageForm',
+	name: 'NewMessage',
 
 	disableKeyboardShortcuts,
 
 	components: {
-		AudioRecorder,
 		NcActionButton,
 		NcActions,
 		NcButton,
 		NcEmojiPicker,
-		NcModal,
 		NcRichContenteditable,
-		NcTextField,
-		NewMessageFormTypingIndicator,
+		NewMessageAttachments,
+		NewMessageAudioRecorder,
+		NewMessageNewFileDialog,
+		NewMessagePollEditor,
+		NewMessageTypingIndicator,
+		NewMessageUploadEditor,
 		Quote,
-		SimplePollsEditor,
-		TemplatePreview,
 		// Icons
 		BellOff,
 		EmoticonOutline,
-		Folder,
-		Paperclip,
-		Poll,
 		Send,
-		Upload,
 	},
 
 	props: {
@@ -310,15 +229,6 @@ export default {
 			required: true,
 		},
 
-		/**
-		 * When this component is used to send message to a breakout room we
-		 * adapt the layout and remove some functionality.
-		 */
-		breakoutRoom: {
-			type: Boolean,
-			default: false,
-		},
-
 		/**
 		 * Selector for popovers and pickers to be rendered inside container properly.
 		 * Container must be mounted before passing its ID as a prop
@@ -361,15 +271,12 @@ export default {
 		return {
 			text: '',
 			conversationIsFirstInList: false,
-			// True when the audiorecorder component is recording
+			// True when the audio recorder component is recording
 			isRecordingAudio: false,
-			showSimplePollsEditor: false,
-			showTextFileDialog: false,
-			textFileTitle: t('spreed', 'New file'),
-			newFileError: '',
+			showPollEditor: false,
+			showNewFileDialog: -1,
 			isTributePickerActive: false,
 			// Check empty template by default
-			checked: -1,
 			userData: {},
 			clipboardTimeStamp: null,
 			typingTimeout: null,
@@ -420,9 +327,8 @@ export default {
 		},
 
 		canUploadFiles() {
-			const allowed = getCapabilities()?.spreed?.config?.attachments?.allowed
-			return allowed
-				&& this.attachmentFolderFreeSpace !== 0
+			return getCapabilities()?.spreed?.config?.attachments?.allowed
+				&& this.$store.getters.getAttachmentFolderFreeSpace() !== 0
 				&& this.canShareFiles
 		},
 
@@ -430,10 +336,6 @@ export default {
 			return !this.isOneToOne && !this.noChatPermission
 		},
 
-		attachmentFolderFreeSpace() {
-			return this.$store.getters.getAttachmentFolderFreeSpace()
-		},
-
 		currentConversationIsJoined() {
 			return this.$store.getters.currentConversationIsJoined
 		},
@@ -459,44 +361,8 @@ export default {
 			}
 		},
 
-		shareFromNextcloudLabel() {
-			return t('spreed', 'Share from {nextcloud}', { nextcloud: OC.theme.productName })
-		},
-
-		fileTemplateOptions() {
-			return this.$store.getters.getFileTemplates()
-		},
-
-		fileTemplate() {
-			return this.fileTemplateOptions[this.showTextFileDialog]
-		},
-
-		emptyTemplate() {
-			return {
-				basename: t('files', 'Blank'),
-				fileid: -1,
-				filename: t('files', 'Blank'),
-				hasPreview: false,
-				mime: this.fileTemplate?.mimetypes[0] || this.fileTemplate?.mimetypes,
-			}
-		},
-
-		selectedTemplate() {
-			return this.fileTemplate.templates.find(template => template.fileid === this.checked)
-		},
-
-		style() {
-			return {
-				'--margin': margin + 'px',
-				'--width': width + 'px',
-				'--border': border + 'px',
-				'--fullwidth': width + 2 * margin + 2 * border + 'px',
-				'--height': this.fileTemplate.ratio ? Math.round(width / this.fileTemplate.ratio) + 'px' : null,
-			}
-		},
-
 		showAttachmentsMenu() {
-			return (this.canUploadFiles || this.canShareFiles) && !this.broadcast
+			return this.canShareFiles && !this.broadcast
 		},
 
 		showAudioRecorder() {
@@ -540,16 +406,6 @@ export default {
 			}
 			this.$store.dispatch('setTyping', { typing: false })
 		},
-
-		showTextFileDialog(newValue) {
-			if (newValue !== false) {
-				const fileTemplate = this.fileTemplateOptions[newValue]
-				this.textFileTitle = fileTemplate.label + fileTemplate.extension
-				this.$nextTick(() => {
-					this.focusTextDialogInput()
-				})
-			}
-		},
 	},
 
 	mounted() {
@@ -571,8 +427,7 @@ export default {
 
 	methods: {
 		handleUploadStart() {
-			// refocus on upload start as the user might want to type again
-			// while the upload is running
+			// refocus on upload start as the user might want to type again while the upload is running
 			this.focusInput()
 		},
 
@@ -597,6 +452,7 @@ export default {
 				const temp = document.createElement('textarea')
 				temp.innerHTML = this.text
 				this.text = temp.value
+
 				const temporaryMessage = await this.$store.dispatch('createTemporaryMessage', {
 					text: this.text.trim(),
 					token: this.token,
@@ -641,13 +497,13 @@ export default {
 		async handleSubmitSpam(numberOfMessages) {
 			console.debug('Sending ' + numberOfMessages + ' lorem ipsum messages')
 			for (let i = 0; i < numberOfMessages; i++) {
-				const randomNumber = parseInt(Math.random() * 500, 10)
+				const randomNumber = Math.floor(Math.random() * 500)
 				console.debug('[' + i + '/' + numberOfMessages + '] Sleeping ' + randomNumber + 'ms')
 				await this.sleep(randomNumber)
 
 				const loremIpsum = 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.\n\nDuis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.'
 				this.text = loremIpsum.slice(0, 25 + randomNumber)
-				await this.handleSubmit()
+				await this.handleSubmit({ silent: false })
 			}
 		},
 
@@ -714,10 +570,14 @@ export default {
 		 * Clicks the hidden file input when clicking the correspondent NcActionButton,
 		 * thus opening the file-picker
 		 */
-		clickImportInput() {
+		openFileUploadWindow() {
 			this.$refs.fileUploadInput.click()
 		},
 
+		updateNewFileDialog(value) {
+			this.showNewFileDialog = value
+		},
+
 		handleFileInput(event) {
 			const files = Object.values(event.target.files)
 
@@ -752,9 +612,9 @@ export default {
 		 *
 		 * @param {File[] | FileList} files pasted files list
 		 * @param {boolean} rename whether to rename the files
-		 * @param {boolean} isVoiceMessage indicates whether the file is a vooicemessage
+		 * @param {boolean} isVoiceMessage indicates whether the file is a voice message
 		 */
-		async handleFiles(files, rename = false, isVoiceMessage) {
+		async handleFiles(files, rename = false, isVoiceMessage = false) {
 			// Create a unique id for the upload operation
 			const uploadId = new Date().getTime()
 			// Uploads and shares the files
@@ -772,6 +632,9 @@ export default {
 		 * @param {string} emoji Emoji object
 		 */
 		addEmoji(emoji) {
+			// FIXME: remove after issue is resolved: https://github.com/nextcloud/nextcloud-vue/issues/3264
+			const temp = document.createElement('textarea')
+
 			const selection = document.getSelection()
 
 			const contentEditable = this.$refs.richContenteditable.$refs.contenteditable
@@ -784,17 +647,16 @@ export default {
 				// is added the div content will be "<br><br>"), so the emoji
 				// has to be added before the last "<br>" (if any).
 				if (this.text.endsWith('<br>')) {
-					this.text = this.text.slice(0, this.text.lastIndexOf('<br>')) + emoji + '<br>'
+					temp.innerHTML = this.text.slice(0, this.text.lastIndexOf('<br>')) + emoji + '<br>'
 				} else {
-					this.text += emoji
+					temp.innerHTML = this.text + emoji
 				}
-
+				this.text = temp.value
 				return
 			}
 
 			// Although due to legacy reasons the API allows several ranges the
-			// specification requires the selection to always have a single
-			// range.
+			// specification requires the selection to always have a single range.
 			// https://developer.mozilla.org/en-US/docs/Web/API/Selection#Multiple_ranges_in_a_selection
 			const range = selection.getRangeAt(0)
 
@@ -817,71 +679,14 @@ export default {
 			this.isRecordingAudio = payload
 		},
 
-		toggleSimplePollsEditor(value) {
-			this.showSimplePollsEditor = value
-		},
-
-		/**
-		 * Manages the radio template picker change
-		 *
-		 * @param {number} fileid the selected template file id
-		 */
-		onCheck(fileid) {
-			this.checked = fileid
-		},
-
-		// Create text file and share it to a conversation
-		async handleCreateTextFile() {
-			this.newFileError = ''
-			let filePath = this.$store.getters.getAttachmentFolder() + '/' + this.textFileTitle.replace('/', '')
-
-			if (!filePath.endsWith(this.fileTemplate.extension)) {
-				filePath += this.fileTemplate.extension
-			}
-
-			let fileData
-			try {
-				const response = await createTextFile(
-					filePath,
-					this.selectedTemplate?.filename,
-					this.selectedTemplate?.templateType,
-				)
-				fileData = response.data.ocs.data
-			} catch (error) {
-				console.error('Error while creating file', error)
-				if (error?.response?.data?.ocs?.meta?.message) {
-					showError(error.response.data.ocs.meta.message)
-					this.newFileError = error.response.data.ocs.meta.message
-				} else {
-					showError(t('spreed', 'Error while creating file'))
-				}
-				return
-			}
-
-			await shareFile(filePath, this.token, '', '')
-
-			this.openViewer(filePath, [fileData])
-
-			this.dismissTextFileCreation()
-		},
-
-		dismissTextFileCreation() {
-			this.showTextFileDialog = false
-			this.textFileTitle = t('spreed', 'New file')
-			this.newFileError = ''
-		},
-
-		// Focus and select the text within the input field
-		focusTextDialogInput() {
-			// FIXME upstream: add support of native input methods: focus, select, etc
-			this.$refs.textFileTitleInput.$refs.inputField.$refs.input.select()
+		togglePollEditor() {
+			this.showPollEditor = !this.showPollEditor
 		},
 
 		async autoComplete(search, callback) {
 			const response = await searchPossibleMentions(this.token, search)
 			if (!response) {
-				// It was not possible to get the candidate mentions, so just
-				// keep the previous ones.
+				// It was not possible to get the candidate mentions, so just keep the previous ones.
 				return
 			}
 
@@ -954,7 +759,7 @@ export default {
 </script>
 
 <style lang="scss">
-// Enforce NcAutoCompleteResult to have proper box-sizing
+// FIXME upstream: Enforce NcAutoCompleteResult to have proper box-sizing
 .tribute-container {
 	position: absolute;
 	box-sizing: content-box !important;
@@ -1027,8 +832,7 @@ export default {
 			border-radius: var(--border-radius-large);
 		}
 
-		// put a grey round background when popover is opened
-		// or hover-focused
+		// put a grey round background when popover is opened or hover-focused
 		&__icon:hover,
 		&__icon:focus,
 		&__icon:active {
@@ -1041,7 +845,7 @@ export default {
 }
 
 // Override actions styles TODO: upstream this change
-// Targeting two classess for specificity
+// Targeting two classes for specificity
 :deep(.action-item__menutoggle.action-item__menutoggle--with-icon-slot) {
 	opacity: 1 !important;
 
@@ -1054,38 +858,4 @@ export default {
 		opacity: .5 !important;
 	}
 }
-
-.new-text-file {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	flex-direction: column;
-	gap: 28px;
-	padding: 20px;
-
-	&__buttons {
-		display: flex;
-		gap: 4px;
-		justify-content: center;
-		margin-top: 20px;
-	}
-
-	&__form {
-		width: 100%;
-
-		.templates-picker__list {
-			margin-top: 20px;
-			display: grid;
-			grid-gap: calc(var(--margin) * 2);
-			grid-auto-columns: 1fr;
-			// We want maximum 5 columns. Putting 6 as we don't count the grid gap. So it will always be lower than 6
-			max-width: calc(var(--fullwidth) * 6);
-			grid-template-columns: repeat(auto-fit, var(--fullwidth));
-			// Make sure all rows are the same height
-			grid-auto-rows: 1fr;
-			// Center the columns set
-			justify-content: center;
-		}
-	}
-}
 </style>
diff --git a/src/components/NewMessage/NewMessageAttachments.vue b/src/components/NewMessage/NewMessageAttachments.vue
new file mode 100644
index 00000000000..f9bb1f06a80
--- /dev/null
+++ b/src/components/NewMessage/NewMessageAttachments.vue
@@ -0,0 +1,181 @@
+<!--
+  - @copyright Copyright (c) 2022, Marco Ambrosini <marcoambrosini@icloud.com>
+  -
+  - @author Marco Ambrosini <marcoambrosini@icloud.com>
+  - @author Maksim Sukharev <antreesy.web@gmail.com>
+  -
+  - @license AGPL-3.0-or-later
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -
+  -->
+
+<template>
+	<NcActions ref="attachmentsMenu"
+		:container="container"
+		:boundaries-element="boundariesElement"
+		:disabled="disabled"
+		:aria-label="t('spreed', 'Share files to the conversation')"
+		:aria-haspopup="true">
+		<template #icon>
+			<Paperclip :size="16" />
+		</template>
+
+		<NcActionButton v-if="canUploadFiles"
+			close-after-click
+			@click="$emit('open-file-upload')">
+			<template #icon>
+				<Upload :size="20" />
+			</template>
+			{{ t('spreed', 'Upload from device') }}
+		</NcActionButton>
+
+		<template v-if="canShareFiles">
+			<NcActionButton close-after-click
+				@click="handleFileShare">
+				<template #icon>
+					<Folder :size="20" />
+				</template>
+				{{ shareFromNextcloudLabel }}
+			</NcActionButton>
+
+			<NcActionButton v-for="(provider, index) in fileTemplateOptions"
+				:key="index"
+				close-after-click
+				:icon="provider.iconClass"
+				@click="$emit('update-new-file-dialog', index)">
+				{{ provider.label }}
+			</NcActionButton>
+		</template>
+
+		<NcActionButton v-if="canCreatePoll"
+			close-after-click
+			@click="$emit('toggle-poll-editor')">
+			<template #icon>
+				<Poll :size="20" />
+			</template>
+			{{ t('spreed', 'Create new poll') }}
+		</NcActionButton>
+	</NcActions>
+</template>
+
+<script>
+import Folder from 'vue-material-design-icons/Folder.vue'
+import Paperclip from 'vue-material-design-icons/Paperclip.vue'
+import Poll from 'vue-material-design-icons/Poll.vue'
+import Upload from 'vue-material-design-icons/Upload.vue'
+
+import { getFilePickerBuilder } from '@nextcloud/dialogs'
+
+import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+
+import { shareFile } from '../../services/filesSharingServices.js'
+
+const picker = getFilePickerBuilder(t('spreed', 'File to share'))
+	.setMultiSelect(false)
+	.setModal(true)
+	.setType(1)
+	.allowDirectories()
+	.build()
+
+export default {
+	name: 'NewMessageAttachments',
+
+	components: {
+		NcActionButton,
+		NcActions,
+		// Icons
+		Folder,
+		Paperclip,
+		Poll,
+		Upload,
+	},
+
+	props: {
+		token: {
+			type: String,
+			required: true,
+		},
+
+		container: {
+			type: String,
+			required: true,
+		},
+
+		boundariesElement: {
+			type: Element,
+			required: true,
+		},
+
+		disabled: {
+			type: Boolean,
+			required: true,
+		},
+
+		canShareFiles: {
+			type: Boolean,
+			required: true,
+		},
+
+		canUploadFiles: {
+			type: Boolean,
+			required: true,
+		},
+
+		canCreatePoll: {
+			type: Boolean,
+			required: true,
+		},
+	},
+
+	emits: ['update-new-file-dialog', 'toggle-poll-editor', 'open-file-upload'],
+
+	computed: {
+		fileTemplateOptions() {
+			return this.$store.getters.getFileTemplates()
+		},
+
+		shareFromNextcloudLabel() {
+			return t('spreed', 'Share from {nextcloud}', { nextcloud: OC.theme.productName })
+		},
+	},
+
+	methods: {
+		handleFileShare() {
+			picker.pick()
+				.then((path) => {
+					console.debug(`path ${path} selected for sharing`)
+					if (!path.startsWith('/')) {
+						throw new Error(t('files', 'Invalid path selected'))
+					}
+					return shareFile(path, this.token)
+				})
+
+			// FIXME Remove this hack once it is possible to set the parent
+			// element of the file picker.
+			// By default, the file picker is a sibling of the fullscreen
+			// element, so it is not visible when in fullscreen mode. It is not
+			// possible to specify the parent nor to know when the file picker
+			// was actually opened, so for the time being it is moved if
+			// needed shortly after calling it.
+			setTimeout(() => {
+				if (this.$store.getters.isFullscreen()) {
+					document.getElementById('content-vue').appendChild(document.querySelector('.oc-dialog'))
+				}
+			}, 1000)
+		},
+	},
+}
+</script>
diff --git a/src/components/NewMessageForm/AudioRecorder/AudioRecorder.vue b/src/components/NewMessage/NewMessageAudioRecorder.vue
similarity index 96%
rename from src/components/NewMessageForm/AudioRecorder/AudioRecorder.vue
rename to src/components/NewMessage/NewMessageAudioRecorder.vue
index 552766e7a66..b09a7d25517 100644
--- a/src/components/NewMessageForm/AudioRecorder/AudioRecorder.vue
+++ b/src/components/NewMessage/NewMessageAudioRecorder.vue
@@ -3,7 +3,7 @@
   -
   - @author Marco Ambrosini <marcoambrosini@icloud.com>
   -
-  - @license GNU AGPL version 3 or any later version
+  - @license AGPL-3.0-or-later
   -
   - This program is free software: you can redistribute it and/or modify
   - it under the terms of the GNU Affero General Public License as
@@ -79,10 +79,10 @@ import { showError } from '@nextcloud/dialogs'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 
-import { mediaDevicesManager } from '../../../utils/webrtc/index.js'
+import { mediaDevicesManager } from '../../utils/webrtc/index.js'
 
 export default {
-	name: 'AudioRecorder',
+	name: 'NewMessageAudioRecorder',
 
 	components: {
 		Microphone,
@@ -211,7 +211,7 @@ export default {
 				return
 			}
 
-			// Create a mediarecorder to capture the stream
+			// Create a media recorder to capture the stream
 			try {
 				this.mediaRecorder = new MediaRecorder(this.audioStream, {
 					mimeType: 'audio/wav',
@@ -255,7 +255,7 @@ export default {
 				}
 				this.recordTime.seconds++
 			}, 1000)
-			// Forward an event to let the parent NewMessageForm component
+			// Forward an event to let the parent NewMessage component
 			// that there's an undergoing recording operation
 			this.$emit('recording', true)
 		},
@@ -304,7 +304,6 @@ export default {
 			this.chunks = []
 			this.blob = null
 			this.aborted = false
-			this.isAudiorecorderActive = false
 			this.recordTime = {
 				minutes: 0,
 				seconds: 0,
diff --git a/src/components/NewMessage/NewMessageNewFileDialog.vue b/src/components/NewMessage/NewMessageNewFileDialog.vue
new file mode 100644
index 00000000000..6033a0865c9
--- /dev/null
+++ b/src/components/NewMessage/NewMessageNewFileDialog.vue
@@ -0,0 +1,288 @@
+<!--
+  - @copyright Copyright (c) 2022, Marco Ambrosini <marcoambrosini@icloud.com>
+  -
+  - @author Marco Ambrosini <marcoambrosini@icloud.com>
+  - @author Maksim Sukharev <antreesy.web@gmail.com>
+  -
+  - @license AGPL-3.0-or-later
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program. If not, see <http://www.gnu.org/licenses/>.
+  -
+  -->
+
+<template>
+	<NcModal size="large"
+		:container="container"
+		class="templates-picker"
+		@close="closeModal">
+		<div class="new-text-file">
+			<h2>
+				{{ t('spreed', 'Create and share a new file') }}
+			</h2>
+			<form class="new-text-file__form templates-picker__form"
+				:style="style"
+				@submit.prevent="handleCreateNewFile">
+				<NcTextField id="new-file-form-name"
+					ref="textField"
+					:error="!!newFileError"
+					:helper-text="newFileError"
+					:label="t('spreed', 'Name of the new file')"
+					:placeholder="newFileTitle"
+					:value="newFileTitle"
+					@update:value="updateNewFileTitle" />
+
+				<ul v-if="templates.length > 1" class="templates-picker__list">
+					<NewMessageTemplatePreview v-for="template in templates"
+						:key="template.fileid"
+						:basename="template.basename"
+						:checked="checked === template.fileid"
+						:fileid="template.fileid"
+						:filename="template.filename"
+						:preview-url="template.previewUrl"
+						:has-preview="template.hasPreview"
+						:mime="template.mime"
+						:ratio="fileTemplate.ratio"
+						@check="onCheck" />
+				</ul>
+
+				<div class="new-text-file__buttons">
+					<NcButton type="primary"
+						@click="handleCreateNewFile">
+						{{ t('spreed', 'Create file') }}
+					</NcButton>
+				</div>
+			</form>
+		</div>
+	</NcModal>
+</template>
+
+<script>
+import { showError } from '@nextcloud/dialogs'
+
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
+import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
+
+import NewMessageTemplatePreview from './NewMessageTemplatePreview.vue'
+
+import { useViewer } from '../../composables/useViewer.js'
+import { createNewFile, shareFile } from '../../services/filesSharingServices.js'
+
+export default {
+	name: 'NewMessageNewFileDialog',
+
+	components: {
+		NcButton,
+		NewMessageTemplatePreview,
+		NcModal,
+		NcTextField,
+	},
+
+	props: {
+		token: {
+			type: String,
+			required: true,
+		},
+
+		container: {
+			type: String,
+			required: true,
+		},
+
+		showNewFileDialog: {
+			type: Number,
+			required: true,
+		},
+	},
+
+	emits: ['dismiss'],
+
+	setup() {
+		const { openViewer } = useViewer()
+		return { openViewer }
+	},
+
+	data() {
+		return {
+			newFileTitle: t('spreed', 'New file'),
+			newFileError: '',
+			checked: -1,
+		}
+	},
+
+	computed: {
+		fileTemplateOptions() {
+			return this.$store.getters.getFileTemplates()
+		},
+
+		fileTemplate() {
+			return this.fileTemplateOptions[this.showNewFileDialog]
+		},
+
+		templates() {
+			const emptyTemplate = {
+				basename: t('files', 'Blank'),
+				fileid: -1,
+				filename: t('files', 'Blank'),
+				hasPreview: false,
+				mime: this.fileTemplate?.mimetypes[0] || this.fileTemplate?.mimetypes,
+			}
+
+			return [
+				emptyTemplate,
+				...this.fileTemplate.templates,
+			]
+		},
+
+		selectedTemplate() {
+			return this.templates.find(template => template.fileid === this.checked)
+		},
+
+		style() {
+			const border = 2
+			const margin = 8
+			// Fallback to 16:9 landscape ratio
+			const ratio = this.fileTemplate.ratio ? this.fileTemplate.ratio : 1.77
+			// Landscape templates should be wider than tall ones
+			// We fit 3 templates per row at max for landscape and 4 for portrait
+			const width = ratio > 1 ? margin * 30 : margin * 20
+
+			return {
+				'--margin': margin + 'px',
+				'--width': width + 'px',
+				'--border': border + 'px',
+				'--fullwidth': width + 2 * (margin + border) + 'px',
+				'--height': this.fileTemplate.ratio ? Math.round(width / this.fileTemplate.ratio) + 'px' : null,
+			}
+		},
+	},
+
+	watch: {
+		fileTemplate: {
+			deep: true,
+			immediate: true,
+			handler(value) {
+				this.newFileTitle = value.label + value.extension
+			},
+		},
+		selectedTemplate: {
+			deep: true,
+			handler(value) {
+				if (value.fileid === -1) {
+					this.newFileTitle = this.fileTemplate.label + this.fileTemplate.extension
+				} else {
+					this.newFileTitle = value.basename
+				}
+			},
+		},
+	},
+
+	mounted() {
+		this.$nextTick(() => {
+			this.$refs.textField.$refs.inputField.$refs.input.select()
+		})
+	},
+
+	methods: {
+		updateNewFileTitle(value) {
+			this.newFileTitle = value
+		},
+
+		// Create text file and share it to a conversation
+		async handleCreateNewFile() {
+			this.newFileError = ''
+			let filePath = this.$store.getters.getAttachmentFolder() + '/' + this.newFileTitle.replace('/', '')
+
+			if (!filePath.endsWith(this.fileTemplate.extension)) {
+				filePath += this.fileTemplate.extension
+			}
+
+			let fileData
+			try {
+				const response = await createNewFile(
+					filePath,
+					this.selectedTemplate?.filename,
+					this.selectedTemplate?.templateType,
+				)
+				fileData = response.data.ocs.data
+			} catch (error) {
+				console.error('Error while creating file', error)
+				if (error?.response?.data?.ocs?.meta?.message) {
+					showError(error.response.data.ocs.meta.message)
+					this.newFileError = error.response.data.ocs.meta.message
+				} else {
+					showError(t('spreed', 'Error while creating file'))
+				}
+				return
+			}
+
+			await shareFile(filePath, this.token, '', '')
+
+			this.openViewer(filePath, [fileData])
+
+			this.closeModal()
+		},
+
+		closeModal() {
+			this.newFileError = ''
+			this.newFileTitle = t('spreed', 'New file')
+			this.$emit('dismiss')
+		},
+
+		/**
+		 * Manages the radio template picker change
+		 *
+		 * @param {number} fileid the selected template file id
+		 */
+		onCheck(fileid) {
+			this.checked = fileid
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.new-text-file {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	flex-direction: column;
+	gap: 28px;
+	padding: 20px;
+
+	&__buttons {
+		display: flex;
+		justify-content: end;
+		padding-top: calc(var(--margin) * 2);
+	}
+
+	&__form {
+		width: 100%;
+
+		.templates-picker__list {
+			margin-top: 20px;
+			display: grid;
+			grid-gap: calc(var(--margin) * 2);
+			grid-auto-columns: 1fr;
+			// We want maximum 5 columns. Putting 6 as we don't count the grid gap. So it will always be lower than 6
+			max-width: calc(var(--fullwidth) * 6);
+			grid-template-columns: repeat(auto-fit, var(--fullwidth));
+			// Make sure all rows are the same height
+			grid-auto-rows: 1fr;
+			// Center the columns set
+			justify-content: center;
+		}
+	}
+}
+</style>
diff --git a/src/components/NewMessageForm/SimplePollsEditor/SimplePollsEditor.vue b/src/components/NewMessage/NewMessagePollEditor.vue
similarity index 60%
rename from src/components/NewMessageForm/SimplePollsEditor/SimplePollsEditor.vue
rename to src/components/NewMessage/NewMessagePollEditor.vue
index 3cc3e2d3351..7c47135ac76 100644
--- a/src/components/NewMessageForm/SimplePollsEditor/SimplePollsEditor.vue
+++ b/src/components/NewMessage/NewMessagePollEditor.vue
@@ -1,9 +1,10 @@
 <!--
-  - @copyright Copyright (c) 2022, Marco Ambrosini <marcoambrosini@pm.me>
+  - @copyright Copyright (c) 2022, Marco Ambrosini <marcoambrosini@icloud.com>
   -
-  - @author Marco Ambrosini <marcoambrosini@pm.me>
+  - @author Marco Ambrosini <marcoambrosini@icloud.com>
+  - @author Maksim Sukharev <antreesy.web@gmail.com>
   -
-  - @license GNU AGPL version 3 or any later version
+  - @license AGPL-3.0-or-later
   -
   - This program is free software: you can redistribute it and/or modify
   - it under the terms of the GNU Affero General Public License as
@@ -24,30 +25,37 @@
 	<NcModal size="small"
 		:container="container"
 		v-on="$listeners">
-		<div class="simple-polls-editor">
+		<div class="poll-editor">
 			<h2>{{ t('spreed', 'Create new poll') }}</h2>
 
 			<!-- Poll Question -->
-			<p class="simple-polls-editor__caption">
+			<p class="poll-editor__caption">
 				{{ t('spreed', 'Question') }}
 			</p>
 			<NcTextField :value.sync="pollQuestion" :label="t('spreed', 'Ask a question')" v-on="$listeners" />
 
 			<!-- Poll options -->
-			<p class="simple-polls-editor__caption">
+			<p class="poll-editor__caption">
 				{{ t('spreed', 'Answers') }}
 			</p>
-			<PollOption v-for="(option, index) in pollOptions"
+			<div v-for="(option, index) in pollOptions"
 				:key="index"
-				:ref="`pollOption${index}`"
-				class="simple-polls-editor__option"
-				:value.sync="pollOptions[index]"
-				:label="t('spreed', 'Answer {option}', {option: index + 1})"
-				:can-delete="pollOptions.length > 2"
-				@delete-option="deleteOption(index)" />
+				class="poll-editor__option">
+				<NcTextField ref="pollOption"
+					:value.sync="pollOptions[index]"
+					:label="t('spreed', 'Answer {option}', {option: index + 1})" />
+				<NcButton v-if="pollOptions.length > 2"
+					type="tertiary-no-background"
+					:aria-label="t('spreed', 'Delete poll option')"
+					@click="deleteOption(index)">
+					<template #icon>
+						<Close :size="20" />
+					</template>
+				</NcButton>
+			</div>
 
 			<!-- Add options -->
-			<NcButton class="simple-polls-editor__add-more" type="tertiary-no-background" @click="addOption">
+			<NcButton class="poll-editor__add-more" type="tertiary-no-background" @click="addOption">
 				<template #icon>
 					<Plus />
 				</template>
@@ -55,52 +63,52 @@
 			</NcButton>
 
 			<!-- Poll settings -->
-			<p class="simple-polls-editor__caption">
+			<p class="poll-editor__caption">
 				{{ t('spreed', 'Settings') }}
 			</p>
-			<div class="simple-polls-editor__settings">
-				<CheckBoxRadioSwitch :checked.sync="isPrivate" type="checkbox">
+			<div class="poll-editor__settings">
+				<NcCheckBoxRadioSwitch :checked.sync="isPrivate" type="checkbox">
 					{{ t('spreed', 'Private poll') }}
-				</CheckBoxRadioSwitch>
-				<CheckBoxRadioSwitch :checked.sync="isMultipleAnswer" type="checkbox">
+				</NcCheckBoxRadioSwitch>
+				<NcCheckBoxRadioSwitch :checked.sync="isMultipleAnswer" type="checkbox">
 					{{ t('spreed', 'Multiple answers') }}
-				</CheckBoxRadioSwitch>
-				<div class="simple-polls-editor__actions">
-					<NcButton type="tertiary" @click="dismissEditor">
-						{{ t('spreed', 'Dismiss') }}
-					</NcButton>
-					<!-- create poll button-->
-					<NcButton type="primary" @click="createPoll">
-						{{ t('spreed', 'Create poll') }}
-					</NcButton>
-				</div>
+				</NcCheckBoxRadioSwitch>
+			</div>
+			<div class="poll-editor__actions">
+				<NcButton type="tertiary" @click="dismissEditor">
+					{{ t('spreed', 'Dismiss') }}
+				</NcButton>
+				<!-- create poll button-->
+				<NcButton type="primary" @click="createPoll">
+					{{ t('spreed', 'Create poll') }}
+				</NcButton>
 			</div>
 		</div>
 	</NcModal>
 </template>
 
 <script>
+import Close from 'vue-material-design-icons/Close.vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import CheckBoxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
+import NcCheckBoxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
 
-import PollOption from './PollOption.vue'
-
-import pollService from '../../../services/pollService.js'
+import pollService from '../../services/pollService.js'
 
 export default {
-	name: 'SimplePollsEditor',
+	name: 'NewMessagePollEditor',
 
 	components: {
-		NcModal,
-		CheckBoxRadioSwitch,
+		NcCheckBoxRadioSwitch,
 		NcButton,
-		PollOption,
-		Plus,
+		NcModal,
 		NcTextField,
+		// Icons
+		Close,
+		Plus,
 	},
 
 	props: {
@@ -140,9 +148,7 @@ export default {
 		addOption() {
 			this.pollOptions.push('')
 			this.$nextTick(() => {
-				const indexOfNewPollOption = this.pollOptions.length - 1
-				const refOfNewPollOption = `pollOption${indexOfNewPollOption}`
-				this.$refs[refOfNewPollOption][0].$el.querySelector('.input-field__input').focus()
+				this.$refs.pollOption[this.pollOptions.length - 1].$el.querySelector('.input-field__input').focus()
 			})
 		},
 
@@ -171,7 +177,7 @@ export default {
 
 <style lang="scss" scoped>
 
-.simple-polls-editor {
+.poll-editor {
 	padding: 20px;
 	display: flex;
 	flex-direction: column;
@@ -184,27 +190,30 @@ export default {
 	}
 
 	&__option {
+		display: flex;
+		align-items: center;
+		width: 100%;
 		height: 44px;
 	}
 
+	&__settings {
+		display: flex;
+		flex-direction: column;
+		gap: 4px;
+		margin-bottom: 8px;
+	}
+
 	&__actions {
 		display: flex;
 		justify-content: flex-end;
 		gap: 4px;
 	}
-}
 
-// Upstream
-:deep(.checkbox-radio-switch__label) {
-	align-items: unset;
-	height: unset;
-	margin: 4px 0;
-	padding: 8px;
-	width: 100%;
-	border-radius: var(--border-radius-large);
-	:deep(span) {
-		align-self: flex-start;
+	// FIXME Upstream
+	:deep(.checkbox-radio-switch__label) {
+			min-height: unset;
+			margin: 0;
+			border-radius: var(--border-radius-large);
 	}
 }
-
 </style>
diff --git a/src/components/NewMessageForm/TemplatePreview.vue b/src/components/NewMessage/NewMessageTemplatePreview.vue
similarity index 98%
rename from src/components/NewMessageForm/TemplatePreview.vue
rename to src/components/NewMessage/NewMessageTemplatePreview.vue
index 61151321d4d..832753eff0a 100644
--- a/src/components/NewMessageForm/TemplatePreview.vue
+++ b/src/components/NewMessage/NewMessageTemplatePreview.vue
@@ -3,7 +3,7 @@
   -
   - @author John Molakvoæ <skjnldsv@protonmail.com>
   -
-  - @license GNU AGPL version 3 or any later version
+  - @license AGPL-3.0-or-later
   -
   - This program is free software: you can redistribute it and/or modify
   - it under the terms of the GNU Affero General Public License as
@@ -74,7 +74,7 @@ const getToken = function() {
 const previewWidth = 256
 
 export default {
-	name: 'TemplatePreview',
+	name: 'NewMessageTemplatePreview',
 	inheritAttrs: false,
 
 	props: {
diff --git a/src/components/NewMessageForm/NewMessageFormTypingIndicator.vue b/src/components/NewMessage/NewMessageTypingIndicator.vue
similarity index 97%
rename from src/components/NewMessageForm/NewMessageFormTypingIndicator.vue
rename to src/components/NewMessage/NewMessageTypingIndicator.vue
index 05c2392f759..084e6691b17 100644
--- a/src/components/NewMessageForm/NewMessageFormTypingIndicator.vue
+++ b/src/components/NewMessage/NewMessageTypingIndicator.vue
@@ -3,7 +3,7 @@
   -
   - @author Maksim Sukharev <antreesy.web@gmail.com>
   -
-  - @license GNU AGPL version 3 or any later version
+  - @license AGPL-3.0-or-later
   -
   - This program is free software: you can redistribute it and/or modify
   - it under the terms of the GNU Affero General Public License as
@@ -34,6 +34,7 @@
 					disable-menu
 					disable-tooltip />
 			</div>
+			<!-- eslint-disable-next-line vue/no-v-html -->
 			<p class="indicator__main" v-html="indicatorMessage" />
 		</div>
 	</div>
@@ -45,7 +46,7 @@ import escapeHtml from 'escape-html'
 import AvatarWrapper from '../AvatarWrapper/AvatarWrapper.vue'
 
 export default {
-	name: 'NewMessageFormTypingIndicator',
+	name: 'NewMessageTypingIndicator',
 	components: { AvatarWrapper },
 
 	props: {
diff --git a/src/components/UploadEditor.vue b/src/components/NewMessage/NewMessageUploadEditor.vue
similarity index 94%
rename from src/components/UploadEditor.vue
rename to src/components/NewMessage/NewMessageUploadEditor.vue
index 2ea6e8b7ae8..aaa72302d65 100644
--- a/src/components/UploadEditor.vue
+++ b/src/components/NewMessage/NewMessageUploadEditor.vue
@@ -3,7 +3,7 @@
   -
   - @author Marco Ambrosini <marcoambrosini@icloud.com>
   -
-  - @license GNU AGPL version 3 or any later version
+  - @license AGPL-3.0-or-later
   -
   - This program is free software: you can redistribute it and/or modify
   - it under the terms of the GNU Affero General Public License as
@@ -79,11 +79,11 @@ import Plus from 'vue-material-design-icons/Plus.vue'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 
-import AudioPlayer from './MessagesList/MessagesGroup/Message/MessagePart/AudioPlayer.vue'
-import FilePreview from './MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue'
+import AudioPlayer from '../MessagesList/MessagesGroup/Message/MessagePart/AudioPlayer.vue'
+import FilePreview from '../MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue'
 
 export default {
-	name: 'UploadEditor',
+	name: 'NewMessageUploadEditor',
 
 	components: {
 		NcModal,
@@ -192,7 +192,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '../assets/variables';
+@import '../../assets/variables';
 
 .upload-editor {
 	height: 100%;
diff --git a/src/components/NewMessageForm/SimplePollsEditor/PollOption.vue b/src/components/NewMessageForm/SimplePollsEditor/PollOption.vue
deleted file mode 100644
index 08de43f1519..00000000000
--- a/src/components/NewMessageForm/SimplePollsEditor/PollOption.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--
-  - @copyright Copyright (c) 2022, Marco Ambrosini <marcoambrosini@pm.me>
-  -
-  - @author Marco Ambrosini <marcoambrosini@pm.me>
-  -
-  - @license GNU AGPL version 3 or any later version
-  -
-  - This program is free software: you can redistribute it and/or modify
-  - it under the terms of the GNU Affero General Public License as
-  - published by the Free Software Foundation, either version 3 of the
-  - License, or (at your option) any later version.
-  -
-  - This program is distributed in the hope that it will be useful,
-  - but WITHOUT ANY WARRANTY; without even the implied warranty of
-  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  - GNU Affero General Public License for more details.
-  -
-  - You should have received a copy of the GNU Affero General Public License
-  - along with this program. If not, see <http://www.gnu.org/licenses/>.
-  -
-  -->
-
-<template>
-	<form class="poll-option">
-		<NcTextField class="poll-option__input" v-bind="$attrs" v-on="$listeners" />
-		<NcButton v-if="canDelete"
-			type="tertiary-no-background"
-			:aria-label="t('spreed', 'Delete poll option')"
-			@click="deleteOption">
-			<template #icon>
-				<Close :size="20" />
-			</template>
-		</NcButton>
-	</form>
-</template>
-
-<script>
-import Close from 'vue-material-design-icons/Close.vue'
-
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
-import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
-
-export default {
-	name: 'PollOption',
-
-	components: {
-		NcTextField,
-		NcButton,
-		Close,
-	},
-
-	props: {
-
-		// This is in order to prevent removing the first option from the array
-		canDelete: {
-			type: Boolean,
-			required: true,
-		},
-	},
-
-	emits: ['delete-option'],
-
-	methods: {
-		deleteOption() {
-			this.$emit('delete-option')
-		},
-	},
-}
-</script>
-
-<style lang="scss" scoped>
-
-.poll-option {
-	display: flex;
-	width: 100%;
-	&__input {
-		margin: auto;
-	}
-}
-
-</style>
diff --git a/src/components/Quote.vue b/src/components/Quote.vue
index 9338fe10aa6..988be27cb6c 100644
--- a/src/components/Quote.vue
+++ b/src/components/Quote.vue
@@ -20,7 +20,7 @@
 -->
 
 <docs>
-This component is intended to be used both in `NewMessageForm` and `Message`
+This component is intended to be used both in `NewMessage` and `Message`
 components.
 </docs>
 
@@ -47,7 +47,7 @@ components.
 				<p>{{ shortenedQuoteMessage }}</p>
 			</blockquote>
 		</div>
-		<div v-if="isNewMessageFormQuote" class="quote__main__right">
+		<div v-if="isNewMessageQuote" class="quote__main__right">
 			<NcButton type="tertiary"
 				:aria-label="cancelQuoteLabel"
 				@click="handleAbortReply">
@@ -125,10 +125,10 @@ export default {
 			default: '',
 		},
 		/**
-		 * If the quote component is used in the `NewMessageForm` component we display
+		 * If the quote component is used in the `NewMessage` component we display
 		 * the remove button.
 		 */
-		isNewMessageFormQuote: {
+		isNewMessageQuote: {
 			type: Boolean,
 			default: false,
 		},
diff --git a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue
index d88291283a9..67b943f8c09 100644
--- a/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue
+++ b/src/components/RightSidebar/BreakoutRooms/BreakoutRoomItem.vue
@@ -54,7 +54,7 @@
 						</template>
 						{{ t('spreed', 'Dismiss request for assistance') }}
 					</NcActionButton>
-					<NcActionButton @click="openSendMessageForm">
+					<NcActionButton @click="openSendMessageDialog">
 						<template #icon>
 							<Send :size="16" />
 						</template>
@@ -65,7 +65,7 @@
 				<SendMessageDialog v-if="isDialogOpened"
 					:display-name="roomName"
 					:token="roomToken"
-					@close="closeSendMessageForm" />
+					@close="closeSendMessageDialog" />
 			</template>
 		</div>
 		<ul v-show="showParticipants">
@@ -207,11 +207,11 @@ export default {
 	},
 
 	methods: {
-		openSendMessageForm() {
+		openSendMessageDialog() {
 			this.isDialogOpened = true
 		},
 
-		closeSendMessageForm() {
+		closeSendMessageDialog() {
 			this.isDialogOpened = false
 		},
 
diff --git a/src/services/filesSharingServices.js b/src/services/filesSharingServices.js
index 77cd94f20a0..62777d425b0 100644
--- a/src/services/filesSharingServices.js
+++ b/src/services/filesSharingServices.js
@@ -67,7 +67,7 @@ const getFileTemplates = async () => {
  * @param {string} templateType The template type e.g 'user'
  * @return { object } the file object
  */
-const createTextFile = async function(filePath, templatePath, templateType) {
+const createNewFile = async function(filePath, templatePath, templateType) {
 	return await axios.post(generateOcsUrl('apps/files/api/v1/templates/create'), {
 		filePath,
 		templatePath,
@@ -78,5 +78,5 @@ const createTextFile = async function(filePath, templatePath, templateType) {
 export {
 	shareFile,
 	getFileTemplates,
-	createTextFile,
+	createNewFile,
 }