4 files changed, 6 insertions, 6 deletions

diff --git a/noncore/unsupported/mail2/attachdiag.cpp b/noncore/unsupported/mail2/attachdiag.cpp
index 6e6c3d4..bedf3c4 100644
--- a/noncore/unsupported/mail2/attachdiag.cpp
+++ b/noncore/unsupported/mail2/attachdiag.cpp
@@ -52,15 +52,15 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF
 
 void AttachDiag::fileSelected(const DocLnk &file)
 {
 	currentFile = file;
 }
 
-DocLnk AttachDiag::getFile()
+DocLnk AttachDiag::getFile(QWidget *parent)
 {
-	AttachDiag *attach = new AttachDiag(0, 0, true);
+	AttachDiag *attach = new AttachDiag(parent, 0, true);
 	attach->showMaximized();
 	attach->show();
 
 	if (QDialog::Accepted == attach->exec()) {
 		return attach->currentFile;
 	}
diff --git a/noncore/unsupported/mail2/attachdiag.h b/noncore/unsupported/mail2/attachdiag.h
index c673cfc..bce5b4b 100644
--- a/noncore/unsupported/mail2/attachdiag.h
+++ b/noncore/unsupported/mail2/attachdiag.h
@@ -7,13 +7,13 @@
 
 class AttachDiag : public QDialog
 {
 	Q_OBJECT
 
 public:
-	static DocLnk getFile();
+	static DocLnk getFile(QWidget *parent);
 
 protected:
 	AttachDiag(QWidget *parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0);
 
 private slots:
 	void fileSelected(const DocLnk &);
diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp
index 57f0779..82ed117 100644
--- a/noncore/unsupported/mail2/composer.cpp
+++ b/noncore/unsupported/mail2/composer.cpp
@@ -196,13 +196,13 @@ void Composer::slotOpenAddressPicker()
 		}
 	}
 }
 
 void Composer::slotAddAttach()
 {
-	DocLnk lnk = AttachDiag::getFile();
+	DocLnk lnk = AttachDiag::getFile(this);
 	if (lnk.name().isEmpty()) return;
 
 	Attachment attachment;
 	attachment.setFileName(lnk.file());
 	attachment.setNewName(lnk.name());
 	attachment.setDocLnk(&lnk);
diff --git a/noncore/unsupported/mail2/libmail/mailfactory.cpp b/noncore/unsupported/mail2/libmail/mailfactory.cpp
index 427e72c..6602919 100644
--- a/noncore/unsupported/mail2/libmail/mailfactory.cpp
+++ b/noncore/unsupported/mail2/libmail/mailfactory.cpp
@@ -98,15 +98,15 @@ MailFactory::MailFactory(SendMail &smail, QWidget *parent)
 				if (!(*it).description().isEmpty()) 
 					_body += "Content-Description: " + (*it).description() + "\n";
 
 				_body += "\n" + MiscFunctions::encodeBase64(file) + "\n";
 			} else {
 				int ret = QMessageBox::critical(_parent, tr("Error"), tr("<p>Couldn't attach file '%1'. Continue anyway or abort?</p>").arg((*it).fileName()), tr("Continue"), tr("Abort"));
-				if (ret == 1) {
-					it = attachments.end();
+				if (ret != 0) {
 					_abort = true;
+					break;
 				}
 			}
 		}
 		_body += "\n--" + boundary + "--";
 	}