diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98acb8be5..5afe6ef06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,9 +20,8 @@
 ### Fixes
 - Make the bots automatically accept group chat contact requests. #4377
 - Fetch at most 100 existing messages even if EXISTS was not received. #4383
-
-### Fixes
 - jsonrpc: typescript client: fix types of events in event emitter
+- delete `smtp` rows when message sending is cancelled #4391
 
 
 ## [1.114.0] - 2023-04-24
diff --git a/src/smtp.rs b/src/smtp.rs
index bc6e29e90..f56ed0988 100644
--- a/src/smtp.rs
+++ b/src/smtp.rs
@@ -575,6 +575,11 @@ pub(crate) async fn send_msg_to_smtp(
             context,
             "Sending of message {} was cancelled by the user.", msg_id
         );
+        context
+            .sql
+            .execute("DELETE FROM smtp WHERE id=?", (rowid,))
+            .await
+            .context("failed to remove cancelled message from smtp table")?;
         return Ok(());
     }