1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/windows/maileditwindow.cpp b/src/gui/windows/maileditwindow.cpp
index b3cfd560b..ec9b32825 100644
--- a/src/gui/windows/maileditwindow.cpp
+++ b/src/gui/windows/maileditwindow.cpp
@@ -136,7 +136,7 @@ void MailEditWindow::action(const ActionEvent &event)
     const std::string &eventId = event.getId();
     if (eventId == "close")
     {
-        scheduleDelete();
+        close();
     }
     else if (eventId == "send")
     {
@@ -189,6 +189,8 @@ void MailEditWindow::setMessage(const std::string &str)
 
 void MailEditWindow::close()
 {
+    if (mUseMail2)
+        mail2Handler->cancelWriteMail();
     scheduleDelete();
 }