check back before deleting a mail

2 files changed, 11 insertions, 6 deletions

diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 391b55e..e466d9b 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -3,6 +3,7 @@
 #include <qheader.h>
 #include <qtimer.h>
 #include <qlayout.h>
+#include <qmessagebox.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
@@ -181,8 +182,10 @@ void MainWindow::slotDeleteMail()
 {
     if (!mailView->currentItem()) return;
     RecMail mail = ((MailListViewItem*)mailView->currentItem() )->data();
-    mail.Wrapper()->deleteMail( mail );
-    folderView->refreshCurrent();
+    if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + mail.getFrom() + " - " + mail.getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
+       mail.Wrapper()->deleteMail( mail );
+       folderView->refreshCurrent();
+    }
 }
 
 
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 163ffb7..2415c82 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -1,5 +1,5 @@
 #include <qtextbrowser.h>
-#include <qmessagebox.h>
+#include <qmessagebox.h>?
 #include <qtextstream.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
@@ -319,7 +319,9 @@ void ViewMail::slotForward()
 
 void ViewMail::slotDeleteMail( )
 {
-    m_recMail.Wrapper()->deleteMail( m_recMail );
-    hide();
-    deleted = true;
+    if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
+        m_recMail.Wrapper()->deleteMail( m_recMail );
+        hide();
+        deleted = true;
+    }
 }