1 files changed, 23 insertions, 7 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
@@ -10,12 +10,13 @@
 #include <qapplication.h>
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/abstractmail.h>
 #include "mailistviewitem.h"
 #include "viewmail.h"
 #include "selectstore.h"
+#include "selectsmtp.h"
 
 OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
     : MainWindow( parent, name, WStyle_ContextHelp )
 {
     settings = new Settings();
 
@@ -65,21 +66,36 @@ void OpieMail::slotComposeMail()
 void OpieMail::slotSendQueued()
 {
     qDebug( "Send Queued" );
     SMTPaccount *smtp = 0;
 
     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() ) {
-            if ( it->getType().compare( "SMTP" ) == 0 ) {
-                smtp = static_cast<SMTPaccount *>(it);
-                break;
-            }
+    for ( it = list.first(); it; it = list.next() ) {
+        if ( it->getType().compare( "SMTP" ) == 0 ) {
+            smtp = static_cast<SMTPaccount *>(it);
+            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) {
         SMTPwrapper * wrap = new SMTPwrapper(settings);
         if ( wrap->flushOutbox(smtp) ) {
             QMessageBox::information(0,tr("Info"),tr("Mail queue flushed"));
         }
     }