2 files changed, 11 insertions, 1 deletions
diff --git a/examples/qtmail/app/writemail.cpp b/examples/qtmail/app/writemail.cpp
index 8e8b62f9..8b92eb43 100644
--- a/examples/qtmail/app/writemail.cpp
+++ b/examples/qtmail/app/writemail.cpp
@@ -385,7 +385,7 @@ bool WriteMail::prepareComposer(QMailMessage::MessageType type, const QMailAccou
 {
     bool success = false;
 
-    // Don't discard mail being composed without user intervention
+    // Don't discard mail being composed without user confirmation
     if (changed()) {
         if (QMessageBox::question(qApp->activeWindow(),
                                   tr("Compose new message"),
@@ -476,6 +476,13 @@ void WriteMail::statusChanged(const QString& status)
         setWindowTitle(status);
 }
 
+void WriteMail::closeEvent(QCloseEvent *event)
+{
+    reset();
+    QMainWindow::closeEvent(event);
+}
+
+
 bool WriteMail::composerSelected(const QPair<QString, QMailMessage::MessageType> &selection)
 {
     // We need to ensure that we can send for this composer
diff --git a/examples/qtmail/app/writemail.h b/examples/qtmail/app/writemail.h
index d0699965..1fa31712 100644
--- a/examples/qtmail/app/writemail.h
+++ b/examples/qtmail/app/writemail.h
@@ -98,6 +98,9 @@ protected slots:
     bool composerSelected(const QPair<QString, QMailMessage::MessageType> &selection);
     void statusChanged(const QString& status);
 
+protected:
+    void closeEvent(QCloseEvent * event);
+
 private:
     bool largeAttachments();
     bool buildMail(bool includeSignature);