1 files changed, 19 insertions, 3 deletions

diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index d3d3cdb..ea0019d 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -15,2 +15,3 @@
 #include "selectstore.h"
+#include "selectsmtp.h"
 
@@ -70,4 +71,5 @@ void OpieMail::slotSendQueued()
     QList<Account> list = settings->getAccounts();
+    QList<SMTPaccount> smtpList;
+    smtpList.setAutoDelete(false);
     Account *it;
-//    if (list.count()==1) {
         for ( it = list.first(); it; it = list.next() ) {
@@ -75,6 +77,20 @@ void OpieMail::slotSendQueued()
                 smtp = static_cast<SMTPaccount *>(it);
-                break;
+            smtpList.append(smtp);
+        }
+    }
+    if (smtpList.count()==0) {
+        QMessageBox::information(0,tr("Info"),tr("Define a smtp account first"));
+        return;
+    }
+    if (smtpList.count()==1) {
+        smtp = smtpList.at(0);
+    } else {
+        smtp = 0;
+        selectsmtp selsmtp;
+        selsmtp.setSelectionlist(&smtpList);
+        selsmtp.showMaximized();
+        if (selsmtp.exec()==QDialog::Accepted) {
+            smtp = selsmtp.selected_smtp();
             }
         }
-//    }
     if (smtp) {