diff --git a/src/components/NewMessageModal.vue b/src/components/NewMessageModal.vue
index 0ccd7ef56e..2772af8a33 100644
--- a/src/components/NewMessageModal.vue
+++ b/src/components/NewMessageModal.vue
@@ -117,10 +117,10 @@ export default {
 				attachments: data.attachments,
 				aliasId: data.aliasId,
 				inReplyToMessageId: null,
-				sendAt: data.sendAt ? data.sendAt : Math.floor(now / 1000),
+				sendAt: data.sendAt ? data.sendAt : Math.floor((now + UNDO_DELAY) / 1000),
 			}
-			if (dataForServer.sendAt < Math.floor(now / 1000)) {
-				dataForServer.sendAt = Math.floor(now / 1000)
+			if (dataForServer.sendAt < Math.floor((now + UNDO_DELAY) / 1000)) {
+				dataForServer.sendAt = Math.floor((now + UNDO_DELAY) / 1000)
 			}
 
 			let message
@@ -135,7 +135,7 @@ export default {
 				})
 			}
 
-			if (!data.sendAt) {
+			if (!data.sendAt || data.sendAt < Math.floor((now + UNDO_DELAY) / 1000)) {
 				showUndo(
 					t('mail', 'Message sent'),
 					async() => {