diff --git a/src/components/NewMessageModal.vue b/src/components/NewMessageModal.vue
index 5dc7757326..4ce6a5a136 100644
--- a/src/components/NewMessageModal.vue
+++ b/src/components/NewMessageModal.vue
@@ -45,8 +45,6 @@
 							</NcButton>
 						</template>
 					</EmptyContent>
-					<Loading v-else-if="uploadingAttachments" :hint="t('mail', 'Uploading attachments …')" role="alert" />
-					<Loading v-else-if="sending" :hint="t('mail', 'Sending …')" role="alert" />
 					<EmptyContent v-else-if="warning"
 						:name="t('mail', 'Warning sending your message')"
 						class="empty-content"
@@ -131,7 +129,6 @@ import NoSentMailboxConfiguredError from '../errors/NoSentMailboxConfiguredError
 import ManyRecipientsError from '../errors/ManyRecipientsError.js'
 import AttachmentMissingError from '../errors/AttachmentMissingError.js'
 import SubjectMissingError from '../errors/SubjectMissingError.js'
-import Loading from './Loading.vue'
 import MinimizeIcon from 'vue-material-design-icons/Minus.vue'
 import MaximizeIcon from 'vue-material-design-icons/ArrowExpand.vue'
 import DefaultComposerIcon from 'vue-material-design-icons/ArrowCollapse.vue'
@@ -149,7 +146,6 @@ export default {
 		NcButton,
 		Composer,
 		EmptyContent,
-		Loading,
 		Modal,
 		MinimizeIcon,
 		MaximizeIcon,
diff --git a/src/store/outboxStore.js b/src/store/outboxStore.js
index 2a99136a85..edce2a505d 100644
--- a/src/store/outboxStore.js
+++ b/src/store/outboxStore.js
@@ -174,11 +174,13 @@ export default defineStore('outbox', {
 		 * @return {Promise<boolean>} Resolves to false if sending was skipped. Resolves after UNDO_DELAY has elapsed and the message dispatch was triggered. Warning: This might take a long time, depending on UNDO_DELAY.
 		 */
 		async sendMessageWithUndo({ id }) {
+			this.mainStore.hideMessageComposerMutation()
+
 			return new Promise((resolve, reject) => {
 				const message = this.getMessage(id)
 
 				showUndo(
-					t('mail', 'Message sent'),
+					t('mail', 'Sending message…'),
 					async () => {
 						logger.info('Attempting to stop sending message ' + message.id)
 						const stopped = await this.stopMessage({ message })
@@ -187,7 +189,8 @@ export default defineStore('outbox', {
 							type: 'outbox',
 							data: { ...message },
 						}, { root: true })
-					}, {
+					},
+					{
 						timeout: UNDO_DELAY,
 						close: true,
 					},
@@ -196,6 +199,9 @@ export default defineStore('outbox', {
 				setTimeout(async () => {
 					try {
 						const wasSent = await this.sendMessage({ id: message.id, force: false })
+						if (wasSent) {
+							showSuccess(t('mail', 'Message sent'))
+						}
 						resolve(wasSent)
 					} catch (error) {
 						showError(t('mail', 'Could not send message'))