3 files changed, 6 insertions, 3 deletions

diff --git a/noncore/unsupported/mail2/TODO b/noncore/unsupported/mail2/TODO
index ef596dc..5873615 100644
--- a/noncore/unsupported/mail2/TODO
+++ b/noncore/unsupported/mail2/TODO
@@ -1,10 +1,11 @@
-LISAmail TODO
+Mail TODO
 -----------------------------------------------------------------------------
 
 General stuff:
+ - This program needs a name!
  - If password is empty, ask for it during fetch.
  - Check if all necessary fields in AccoundEditor are filled. 
 
 Protocol related:
  - The IMAP implentation is kinda strange and slow.
  - The SMTP implentation is goddamn strange.
@@ -24,8 +25,8 @@ Mail management:
 
 Testing:
  I'm using the courier-imap server at my developement site. I didn't have
  much opportunity to test on other servers. Giving me test-accounts on other
  servers would be helpfull.
 
-If you want something added, drop a mail. Comments are allways welcome.
+If you want something added, drop a mail. Comments are always welcome.
 
diff --git a/noncore/unsupported/mail2/composer.cpp b/noncore/unsupported/mail2/composer.cpp
index 2f13604..03d50b6 100644
--- a/noncore/unsupported/mail2/composer.cpp
+++ b/noncore/unsupported/mail2/composer.cpp
@@ -134,12 +134,14 @@ void Composer::slotSendError(const QString &error)
         status->setText(tr("<font color=#ff0000>Error occoured during sending.</font>"));
         QMessageBox::warning(this, tr("Error"), tr("<p>%1</p").arg(error), tr("Ok"));
 }
 
 void Composer::slotSendFinished()
 {
+        QMessageBox::information(this, tr("Success"), tr("<p>The mail was sent successfully.</p>"), tr("Ok"));
+
         status->setText(QString(0));
         abort->setEnabled(false);
 }
 
 void Composer::slotFillStuff()
 {
diff --git a/noncore/unsupported/mail2/libmail/mailfactory.cpp b/noncore/unsupported/mail2/libmail/mailfactory.cpp
index 58cf5f8..427e72c 100644
--- a/noncore/unsupported/mail2/libmail/mailfactory.cpp
+++ b/noncore/unsupported/mail2/libmail/mailfactory.cpp
@@ -97,13 +97,13 @@ MailFactory::MailFactory(SendMail &smail, QWidget *parent)
                                 _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>"), tr("Continue"), tr("Abort"));
+                                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();
                                         _abort = true;
                                 }
                         }
                 }