diff --git a/src/components/Envelope.vue b/src/components/Envelope.vue
index a61d100d6b..d9cdd38f57 100644
--- a/src/components/Envelope.vue
+++ b/src/components/Envelope.vue
@@ -327,20 +327,6 @@
 						{{ t('mail', 'Archive message') }}
 					</template>
 				</ActionButton>
-				<ActionButton
-					v-if="hasDeleteAcl"
-					:close-after-click="true"
-					@click.prevent="onDelete">
-					<template #icon>
-						<DeleteIcon :size="20" />
-					</template>
-					<template v-if="layoutMessageViewThreaded">
-						{{ t('mail', 'Delete thread') }}
-					</template>
-					<template v-else>
-						{{ t('mail', 'Delete message') }}
-					</template>
-				</ActionButton>
 				<ActionButton
 					:close-after-click="false"
 					@click="showMoreActionOptions">
@@ -437,6 +423,20 @@
 					</template>
 					{{ t('mail', 'Download message') }}
 				</ActionLink>
+				<ActionButton
+					v-if="hasDeleteAcl"
+					:close-after-click="true"
+					@click.prevent="onDelete">
+					<template #icon>
+						<DeleteIcon :size="20" />
+					</template>
+					<template v-if="layoutMessageViewThreaded">
+						{{ t('mail', 'Delete thread') }}
+					</template>
+					<template v-else>
+						{{ t('mail', 'Delete message') }}
+					</template>
+				</ActionButton>
 			</template>
 			<template v-if="quickActionMenu">
 				<ActionButton