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
@@ -46,26 +46,26 @@ AttachDiag::AttachDiag(QWidget* parent = 0, const char* name = 0, bool modal, WF
 
         if (fileSelector->fileCount() == 0) {
                 attachButton->setEnabled(false);
                 fileSelector->setEnabled(false);
         }
 }
 
 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;
         }
 
         return DocLnk();
         }
 
 
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
@@ -1,25 +1,25 @@
 #ifndef ATTACHDIAG_H
 #define ATTACHDIAG_H
 
 #include <qdialog.h>
 
 #include <qpe/applnk.h>
 
 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 &);
 
 private:
         DocLnk currentFile;
 
 };
 
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
@@ -190,25 +190,25 @@ void Composer::slotOpenAddressPicker()
                 }
         } else if (to->isHidden() && cc->isHidden() && !bcc->isHidden()) {
                 if (bcc->text().isEmpty()) {
                         bcc->setText(AddressPicker::getNames());
                 } else {
                         bcc->setText(bcc->text() + ", " + AddressPicker::getNames());
                 }
         }
 }
 
 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);
         
         (void) new AttachViewItem(attachView, attachment);
 }
 
 void Composer::slotDelAttach()
 {
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
@@ -92,27 +92,27 @@ MailFactory::MailFactory(SendMail &smail, QWidget *parent)
                                 _body += "Content-Type: " + mimetype + "; name=\"" + (*it).newName() + "\"\n";
 
                                 // TODO: Decide which content transfer encoding is best. B64 for binary, QP for text.
                                 _body += "Content-Transfer-Encoding: base64\n";
 
                                 _body += "Content-Disposition: attachment; filename=\"" + (*it).newName() + "\"\n";
                                 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 + "--";
         }
 
         if (_abort) {
                 _body = QString(0);
                 _header = QString(0);
         }
 }