5 files changed, 59 insertions, 44 deletions
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
index 770e2b8..a7e4837 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.cpp
@@ -1,737 +1,744 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <qdir.h>
 #include <qt.h>
 #include <libetpan/libetpan.h>
 #include "smtpwrapper.h"
 #include "mailwrapper.h"
 #include "mboxwrapper.h"
 #include "logindialog.h"
 #include "mailtypes.h"
 #include "defines.h"
 #include "sendmailprogress.h"
 progressMailSend*SMTPwrapper::sendProgress = 0;
 SMTPwrapper::SMTPwrapper( Settings *s )
    : QObject()
 {
    settings = s;
 }
 QString SMTPwrapper::mailsmtpError( int errnum )
 {
    switch ( errnum ) {
        case MAILSMTP_NO_ERROR:
            return tr( "No error" );
        case MAILSMTP_ERROR_UNEXPECTED_CODE:
            return tr( "Unexpected error code" );
        case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE:
            return tr( "Service not available" );
        case MAILSMTP_ERROR_STREAM:
            return tr( "Stream error" );
        case MAILSMTP_ERROR_HOSTNAME:
            return tr( "gethostname() failed" );
        case MAILSMTP_ERROR_NOT_IMPLEMENTED:
            return tr( "Not implemented" );
        case MAILSMTP_ERROR_ACTION_NOT_TAKEN:
            return tr( "Error, action not taken" );
        case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION:
            return tr( "Data exceeds storage allocation" );
        case MAILSMTP_ERROR_IN_PROCESSING:
            return tr( "Error in processing" );
  //      case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE:
    //        return tr( "Insufficient system storage" );
        case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE:
            return tr( "Mailbox unavailable" );
        case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED:
            return tr( "Mailbox name not allowed" );
        case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND:
            return tr( "Bad command sequence" );
        case MAILSMTP_ERROR_USER_NOT_LOCAL:
            return tr( "User not local" );
        case MAILSMTP_ERROR_TRANSACTION_FAILED:
            return tr( "Transaction failed" );
        case MAILSMTP_ERROR_MEMORY:
            return tr( "Memory error" );
        case MAILSMTP_ERROR_CONNECTION_REFUSED:
            return tr( "Connection refused" );
        default:
            return tr( "Unknown error code" );
    }
 }
 mailimf_mailbox *SMTPwrapper::newMailbox(const QString&name, const QString&mail )
 {
    return mailimf_mailbox_new( strdup( name.latin1() ),
                                strdup( mail.latin1() ) );
 }
 mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr )
 {
    mailimf_address_list *addresses;
    if ( addr.isEmpty() ) return NULL;
    addresses = mailimf_address_list_new_empty();
    QStringList list = QStringList::split( ',', addr );
    QStringList::Iterator it;
    for ( it = list.begin(); it != list.end(); it++ ) {
        char *str = strdup( (*it).latin1() );
        int err = mailimf_address_list_add_parse( addresses, str );
        if ( err != MAILIMF_NO_ERROR ) {
            qDebug( "Error parsing" );
            qDebug( *it );
            free( str );
        } else {
            qDebug( "Parse success! :)" );
        }
    }
    return addresses;
 }
 mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail )
 {
    mailimf_fields *fields;
    mailimf_field *xmailer;
    mailimf_mailbox *sender, *fromBox;
    mailimf_mailbox_list *from;
    mailimf_address_list *to, *cc, *bcc, *reply;
    char *subject = strdup( mail.getSubject().latin1() );
    int err;
    sender = newMailbox( mail.getName(), mail.getMail() );
    if ( sender == NULL ) goto err_free;
    fromBox = newMailbox( mail.getName(), mail.getMail() );
    if ( fromBox == NULL ) goto err_free_sender;
    from = mailimf_mailbox_list_new_empty();
    if ( from == NULL ) goto err_free_fromBox;
    err = mailimf_mailbox_list_add( from, fromBox );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_from;
    to = parseAddresses( mail.getTo() );
    if ( to == NULL ) goto err_free_from;
    cc = parseAddresses( mail.getCC() );
    bcc = parseAddresses( mail.getBCC() );
    reply = parseAddresses( mail.getReply() );
    fields = mailimf_fields_new_with_data( from, sender, reply, to, cc, bcc,
                                           NULL, NULL, subject );
    if ( fields == NULL ) goto err_free_reply;
    xmailer = mailimf_field_new_custom( strdup( "User-Agent" ),
                                        strdup( USER_AGENT ) );
    if ( xmailer == NULL ) goto err_free_fields;
    err = mailimf_fields_add( fields, xmailer );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_xmailer;
    return fields;      // Success :)
 err_free_xmailer:
    mailimf_field_free( xmailer );
 err_free_fields:
    mailimf_fields_free( fields );
 err_free_reply:
    mailimf_address_list_free( reply );
    mailimf_address_list_free( bcc );
    mailimf_address_list_free( cc );
    mailimf_address_list_free( to );
 err_free_from:
    mailimf_mailbox_list_free( from );
 err_free_fromBox:
    mailimf_mailbox_free( fromBox );
 err_free_sender:
    mailimf_mailbox_free( sender );
 err_free:
    free( subject );
    qDebug( "createImfFields - error" );
    return NULL;        // Error :(
 }
 mailmime *SMTPwrapper::buildTxtPart(const QString&str )
 {
    mailmime *txtPart;
    mailmime_fields *fields;
    mailmime_content *content;
    mailmime_parameter *param;
    char *txt = strdup( str.latin1() );
    int err;
    param = mailmime_parameter_new( strdup( "charset" ),
                                    strdup( "iso-8859-1" ) );
    if ( param == NULL ) goto err_free;
    content = mailmime_content_new_with_str( "text/plain" );
    if ( content == NULL ) goto err_free_param;
    err = clist_append( content->ct_parameters, param );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_content;
    fields = mailmime_fields_new_encoding( MAILMIME_MECHANISM_8BIT );
    if ( fields == NULL ) goto err_free_content;
    txtPart = mailmime_new_empty( content, fields );
    if ( txtPart == NULL ) goto err_free_fields;
    err = mailmime_set_body_text( txtPart, txt, strlen( txt ) );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_txtPart;
    return txtPart;     // Success :)
 err_free_txtPart:
    mailmime_free( txtPart );
 err_free_fields:
    mailmime_fields_free( fields );
 err_free_content:
    mailmime_content_free( content );
 err_free_param:
    mailmime_parameter_free( param );
 err_free:
    free( txt );
    qDebug( "buildTxtPart - error" );
    return NULL;        // Error :(
 }
 mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimetype,const QString&TextContent )
 {
    mailmime * filePart = 0;
    mailmime_fields * fields = 0;
    mailmime_content * content = 0;
    mailmime_parameter * param = 0;
    char*name = 0;
    char*file = 0;
    int err;
    int pos = filename.findRev( '/' );
-    
    if (filename.length()>0) {
        QString tmp = filename.right( filename.length() - ( pos + 1 ) );
        name = strdup( tmp.latin1() );        // just filename
        file = strdup( filename.latin1() );   // full name with path
    }
    char *mime = strdup( mimetype.latin1() );   // mimetype -e.g. text/plain
    int disptype = MAILMIME_DISPOSITION_TYPE_ATTACHMENT;
    int mechanism = MAILMIME_MECHANISM_BASE64;
-    
    if ( mimetype.startsWith( "text/" ) ) {
        param = mailmime_parameter_new( strdup( "charset" ),
-                                        strdup( "iso-8859-1" ) );                                   
+                                        strdup( "iso-8859-1" ) );
        disptype = MAILMIME_DISPOSITION_TYPE_INLINE;
        mechanism = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
    }
    fields = mailmime_fields_new_filename(
                disptype, name,
                mechanism );
    content = mailmime_content_new_with_str( mime );
    if (content!=0 && fields != 0) {
        if (param) {
            clist_append(content->ct_parameters,param);
            param = 0;
        }
        if (filename.length()>0) {
            QFileInfo f(filename);
            param = mailmime_parameter_new(strdup("name"),strdup(f.fileName().latin1()));
            clist_append(content->ct_parameters,param);
            param = 0;
-        }            
+        }
        filePart = mailmime_new_empty( content, fields );
    }
    if (filePart) {
        if (filename.length()>0) {
            err = mailmime_set_body_file( filePart, file );
        } else {
            err = mailmime_set_body_text(filePart,strdup(TextContent.ascii()),TextContent.length());
        }
        if (err != MAILIMF_NO_ERROR) {
            qDebug("Error setting body with file %s",file);
            mailmime_free( filePart );
            filePart = 0;
        }
    }
    if (!filePart) {
        if ( param != NULL ) {
            mailmime_parameter_free( param );
        }
        if (content) {
            mailmime_content_free( content );
        } else {
            if (mime) {
                free( mime );
            }
        }
        if (fields) {
            mailmime_fields_free( fields );
        } else {
            if (name) {
                free( name );
            }
            if (file) {
                free( file );
            }
        }
    }
    return filePart;        // Success :)
 }
 void SMTPwrapper::addFileParts( mailmime *message,const QList<Attachment>&files )
 {
    const Attachment *it;
    unsigned int count = files.count();
    qDebug("List contains %i values",count);
    for ( unsigned int i = 0; i < count; ++i ) {
        qDebug( "Adding file" );
        mailmime *filePart;
        int err;
        it = ((QList<Attachment>)files).at(i);
        filePart = buildFilePart( it->getFileName(), it->getMimeType(),"" );
        if ( filePart == NULL ) {
            qDebug( "addFileParts: error adding file:" );
            qDebug( it->getFileName() );
            continue;
        }
        err = mailmime_smart_add_part( message, filePart );
        if ( err != MAILIMF_NO_ERROR ) {
            mailmime_free( filePart );
            qDebug("error smart add");
        }
    }
 }
 mailmime *SMTPwrapper::createMimeMail(const Mail &mail )
 {
    mailmime *message, *txtPart;
    mailimf_fields *fields;
    int err;
    fields = createImfFields( mail );
    if ( fields == NULL ) goto err_free;
    message = mailmime_new_message_data( NULL );
    if ( message == NULL ) goto err_free_fields;
    mailmime_set_imf_fields( message, fields );
    if (mail.getAttachments().count()==0) {
        txtPart = buildTxtPart( mail.getMessage() );
    } else {
        txtPart = buildFilePart("","text/plain",mail.getMessage());
    }
    if ( txtPart == NULL ) goto err_free_message;
    err = mailmime_smart_add_part( message, txtPart );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_txtPart;
    addFileParts( message, mail.getAttachments() );
    return message;         // Success :)
 err_free_txtPart:
    mailmime_free( txtPart );
 err_free_message:
    mailmime_free( message );
 err_free_fields:
    mailimf_fields_free( fields );
 err_free:
    qDebug( "createMimeMail: error" );
    return NULL;            // Error :(
 }
 mailimf_field *SMTPwrapper::getField( mailimf_fields *fields, int type )
 {
    mailimf_field *field;
    clistiter *it;
    it = clist_begin( fields->fld_list );
    while ( it ) {
        field = (mailimf_field *) it->data;
        if ( field->fld_type == type ) {
            return field;
        }
        it = it->next;
    }
    return NULL;
 }
 void SMTPwrapper::addRcpts( clist *list, mailimf_address_list *addr_list )
 {
    clistiter *it, *it2;
    for ( it = clist_begin( addr_list->ad_list ); it; it = it->next ) {
        mailimf_address *addr;
        addr = (mailimf_address *) it->data;
        if ( addr->ad_type == MAILIMF_ADDRESS_MAILBOX ) {
                esmtp_address_list_add( list, addr->ad_data.ad_mailbox->mb_addr_spec, 0, NULL );
        } else if ( addr->ad_type == MAILIMF_ADDRESS_GROUP ) {
            clist *l = addr->ad_data.ad_group->grp_mb_list->mb_list;
                for ( it2 = clist_begin( l ); it2; it2 = it2->next ) {
                mailimf_mailbox *mbox;
                    mbox = (mailimf_mailbox *) it2->data;
                    esmtp_address_list_add( list, mbox->mb_addr_spec, 0, NULL );
                }
            }
    }
 }
 clist *SMTPwrapper::createRcptList( mailimf_fields *fields )
 {
    clist *rcptList;
    mailimf_field *field;
    rcptList = esmtp_address_list_new();
    field = getField( fields, MAILIMF_FIELD_TO );
    if ( field && (field->fld_type == MAILIMF_FIELD_TO)
         && field->fld_data.fld_to->to_addr_list ) {
        addRcpts( rcptList, field->fld_data.fld_to->to_addr_list );
    }
    field = getField( fields, MAILIMF_FIELD_CC );
    if ( field && (field->fld_type == MAILIMF_FIELD_CC)
         && field->fld_data.fld_cc->cc_addr_list ) {
        addRcpts( rcptList, field->fld_data.fld_cc->cc_addr_list );
    }
    field = getField( fields, MAILIMF_FIELD_BCC );
    if ( field && (field->fld_type == MAILIMF_FIELD_BCC)
         && field->fld_data.fld_bcc->bcc_addr_list ) {
        addRcpts( rcptList, field->fld_data.fld_bcc->bcc_addr_list );
    }
    return rcptList;
 }
 char *SMTPwrapper::getFrom( mailimf_field *ffrom)
 {
    char *from = NULL;
    if ( ffrom && (ffrom->fld_type == MAILIMF_FIELD_FROM)
         && ffrom->fld_data.fld_from->frm_mb_list && ffrom->fld_data.fld_from->frm_mb_list->mb_list ) {
        clist *cl = ffrom->fld_data.fld_from->frm_mb_list->mb_list;
        clistiter *it;
        for ( it = clist_begin( cl ); it; it = it->next ) {
            mailimf_mailbox *mb = (mailimf_mailbox *) it->data;
            from = strdup( mb->mb_addr_spec );
        }
    }
    return from;
 }
 char *SMTPwrapper::getFrom( mailmime *mail )
 {
    mailimf_field *ffrom = 0;
    ffrom = getField( mail->mm_data.mm_message.mm_fields, MAILIMF_FIELD_FROM );
    return getFrom(ffrom);
 }
 SMTPaccount *SMTPwrapper::getAccount(const QString&name )
 {
    SMTPaccount *smtp;
    QList<Account> list = settings->getAccounts();
    Account *it;
    for ( it = list.first(); it; it = list.next() ) {
        if ( it->getType().compare( "SMTP" ) == 0 ) {
            smtp = static_cast<SMTPaccount *>(it);
            if ( smtp->getName()== name ) {
                qDebug( "SMTPaccount found for" );
                qDebug( name );
                return smtp;
            }
        }
    }
    return NULL;
 }
 QString SMTPwrapper::getTmpFile() {
    int num = 0;
    QString unique;
    QDir dir( "/tmp" );
    QStringList list = dir.entryList( "opiemail-tmp-*" );
    do {
        unique.setNum( num++ );
    } while ( list.contains( "opiemail-tmp-" + unique ) > 0 );
    return "/tmp/opiemail-tmp-" + unique;
 }
 void SMTPwrapper::writeToFile(const QString&file, mailmime *mail )
 {
    FILE *f;
    int err, col = 0;
    f = fopen( file.latin1(), "w" );
    if ( f == NULL ) {
        qDebug( "writeToFile: error opening file" );
        return;
    }
    err = mailmime_write( f, &col, mail );
    if ( err != MAILIMF_NO_ERROR ) {
        fclose( f );
        qDebug( "writeToFile: error writing mailmime" );
        return;
    }
    fclose( f );
 }
 void SMTPwrapper::readFromFile(const QString&file, char **data, size_t *size )
 {
    QFile msg_cache(file);
    QString msg = "";
    msg_cache.open(IO_ReadOnly);
    char*message = new char[4096];
    memset(message,0,4096);
    while (msg_cache.readBlock(message,4095)>0) {
         msg+=message;
         memset(message,0,4096);
    }
    delete message;
    *data = (char*)malloc(msg.length()+1*sizeof(char));
    memset(*data,0,msg.length()+1);
    memcpy(*data,msg.ascii(),msg.length());
    *size=msg.length();
 }
 void SMTPwrapper::progress( size_t current, size_t maximum )
 {
    if (SMTPwrapper::sendProgress) {
        SMTPwrapper::sendProgress->setSingleMail(current, maximum );
        qApp->processEvents();
    }
 }
 void SMTPwrapper::storeMail(char*mail, size_t length, const QString&box)
 {
    if (!mail) return;
    QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
    MBOXwrapper*wrap = new MBOXwrapper(localfolders);
    wrap->storeMessage(mail,length,box);
    delete wrap;
 }
 void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
 {
    clist *rcpts = 0;
    char *from, *data;
    size_t size;
    if ( smtp == NULL ) {
        return;
    }
    from = data = 0;
-    
    QString file = getTmpFile();
    writeToFile( file, mail );
    readFromFile( file, &data, &size );
    QFile f( file );
    f.remove();
-    
    if (later) {
        storeMail(data,size,"Outgoing");
        if (data) free( data );
        return;
    }
    from = getFrom( mail );
    rcpts = createRcptList( mail->mm_data.mm_message.mm_fields );
    smtpSend(from,rcpts,data,size,smtp);
 }
 int SMTPwrapper::smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp )
 {
    char *server, *user, *pass;
    bool ssl;
    uint16_t port;
    mailsmtp *session;
    int err,result;
-    
    result = 1;
    server = user = pass = 0;
    server = strdup( smtp->getServer().latin1() );
    ssl = smtp->getSSL();
    port = smtp->getPort().toUInt();
-    
    session = mailsmtp_new( 20, &progress );
    if ( session == NULL ) goto free_mem;
    qDebug( "Servername %s at port %i", server, port );
    if ( ssl ) {
        qDebug( "SSL session" );
        err = mailsmtp_ssl_connect( session, server, port );
    } else {
        qDebug( "No SSL session" );
        err = mailsmtp_socket_connect( session, server, port );
    }
    if ( err != MAILSMTP_NO_ERROR ) {result = 0;goto free_mem_session;}
    err = mailsmtp_init( session );
    if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;}
    qDebug( "INIT OK" );
    if ( smtp->getLogin() ) {
        if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) {
            // get'em
            LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true );
            login.show();
            if ( QDialog::Accepted == login.exec() ) {
                // ok
                user = strdup( login.getUser().latin1() );
                pass = strdup( login.getPassword().latin1() );
            } else {
                result = 0; goto free_con_session;
            }
        } else {
            user = strdup( smtp->getUser().latin1() );
            pass = strdup( smtp->getPassword().latin1() );
        }
        qDebug( "session->auth: %i", session->auth);
        err = mailsmtp_auth( session, user, pass );
        if ( err == MAILSMTP_NO_ERROR ) qDebug("auth ok");
        qDebug( "Done auth!" );
    }
    err = mailsmtp_send( session, from, rcpts, data, size );
    if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;}
    qDebug( "Mail sent." );
    storeMail(data,size,"Sent");
 free_con_session:
    mailsmtp_quit( session );
 free_mem_session:
    mailsmtp_free( session );
 free_mem:
    if (rcpts) smtp_address_list_free( rcpts );
    if (data) free( data );
    if (server) free( server );
    if (from) free( from );
    if ( smtp->getLogin() ) {
        free( user );
        free( pass );
    }
    return result;
 }
 void SMTPwrapper::sendMail(const Mail&mail,bool later )
 {
    mailmime * mimeMail;
-    
    SMTPaccount *smtp = getAccount(mail.getName());
-    
    mimeMail = createMimeMail(mail );
    if ( mimeMail == NULL ) {
        qDebug( "sendMail: error creating mime mail" );
    } else {
        sendProgress = new progressMailSend();
-//        sendProgress->showMaximized(); 
+//        sendProgress->showMaximized();
        sendProgress->show();
        sendProgress->setMaxMails(1);
        smtpSend( mimeMail,later,smtp);
        mailmime_free( mimeMail );
        qDebug("Clean up done");
        sendProgress->hide();
        delete sendProgress;
        sendProgress = 0;
    }
 }
 int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which)
 {
    char*data = 0;
    size_t length = 0;
    size_t curTok = 0;
    mailimf_fields *fields = 0;
    mailimf_field*ffrom = 0;
    clist *rcpts = 0;
    char*from = 0;
    wrap->fetchRawBody(*which,&data,&length);
    if (!data) return 0;
-    int err = mailimf_fields_parse( data, length, &curTok, &fields );    
+    int err = mailimf_fields_parse( data, length, &curTok, &fields );
    if (err != MAILIMF_NO_ERROR) {
        free(data);
        delete wrap;
        return 0;
    }
-    
    rcpts = createRcptList( fields );
    ffrom = getField(fields, MAILIMF_FIELD_FROM );
    from = getFrom(ffrom);
-    
    qDebug("Size: %i vs. %i",length,strlen(data));
    if (rcpts && from) {
        return smtpSend(from,rcpts,data,strlen(data),smtp );
    }
    return 0;
 }
 /* this is a special fun */
-void SMTPwrapper::flushOutbox(SMTPaccount*smtp)
+bool SMTPwrapper::flushOutbox(SMTPaccount*smtp)
 {
-    if (!smtp) return;
+    bool returnValue = true;
-    QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
+    if (!smtp) return false;
+   QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
    MBOXwrapper*wrap = new MBOXwrapper(localfolders);
    if (!wrap) {
        qDebug("memory error");
-        return;
+        return false;
    }
    QList<RecMail> mailsToSend;
    QList<RecMail> mailsToRemove;
    QString mbox("Outgoing");
    wrap->listMessages(mbox,mailsToSend);
    if (mailsToSend.count()==0) {
        delete wrap;
-        return;
+        return false;
    }
    mailsToSend.setAutoDelete(false);
    sendProgress = new progressMailSend();
-//        sendProgress->showMaximized(); 
+//        sendProgress->showMaximized();
   sendProgress->show();
   sendProgress->setMaxMails(mailsToSend.count());
    while (mailsToSend.count()>0) {
        if (sendQueuedMail(wrap,smtp,mailsToSend.at(0))==0) {
            QMessageBox::critical(0,tr("Error sending mail"),
                tr("Error sending queued mail - breaking"));
+            returnValue = false;
            break;
        }
        mailsToRemove.append(mailsToSend.at(0));
        mailsToSend.removeFirst();
        sendProgress->setCurrentMails(mailsToRemove.count());
    }
    sendProgress->hide();
    delete sendProgress;
    sendProgress = 0;
    wrap->deleteMails(mbox,mailsToRemove);
    mailsToSend.setAutoDelete(true);
    delete wrap;
+    return returnValue;
 }
diff --git a/noncore/net/mail/libmailwrapper/smtpwrapper.h b/noncore/net/mail/libmailwrapper/smtpwrapper.h
index baa353b..66180b7 100644
--- a/noncore/net/mail/libmailwrapper/smtpwrapper.h
+++ b/noncore/net/mail/libmailwrapper/smtpwrapper.h
@@ -1,65 +1,65 @@
 #ifndef SMTPwrapper_H
 #define SMTPwrapper_H
 #include <qpe/applnk.h>
 #include <qbitarray.h>
 #include <qdatetime.h>
 #include <libetpan/clist.h>
 #include "settings.h"
 class Mail;
 class MBOXwrapper;
 class RecMail;
 class Attachment;
 struct mailimf_fields;
 struct mailimf_field;
 struct mailimf_mailbox;
 struct mailmime;
 struct mailimf_address_list;
 class progressMailSend;
 class SMTPwrapper : public QObject
 {
    Q_OBJECT
 public:
    SMTPwrapper( Settings *s ); 
    virtual ~SMTPwrapper(){}
    void sendMail(const Mail& mail,bool later=false );
-    void flushOutbox(SMTPaccount*smtp);
+    bool flushOutbox(SMTPaccount*smtp);
    static progressMailSend*sendProgress;
 protected:
    mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
    mailimf_fields *createImfFields(const Mail &mail );
    mailmime *createMimeMail(const Mail&mail );
    
    mailimf_address_list *parseAddresses(const QString&addr );
    void addFileParts( mailmime *message,const QList<Attachment>&files );
    mailmime *buildTxtPart(const QString&str );
    mailmime *buildFilePart(const QString&filename,const QString&mimetype,const QString&content);
    void smtpSend( mailmime *mail,bool later, SMTPaccount *smtp );
    clist *createRcptList( mailimf_fields *fields );
    SMTPaccount *getAccount(const QString&from );
    void writeToFile(const QString&file, mailmime *mail );
    void readFromFile(const QString&file, char **data, size_t *size );
    
    static void storeMail(char*mail, size_t length, const QString&box);
    static QString mailsmtpError( int err );
    static QString getTmpFile();
    static void progress( size_t current, size_t maximum );
    static void addRcpts( clist *list, mailimf_address_list *addr_list );
    static char *getFrom( mailmime *mail );
    static char *getFrom( mailimf_field *ffrom);
    static mailimf_field *getField( mailimf_fields *fields, int type );
    int smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp );
    void storeMail(mailmime*mail, const QString&box);
    Settings *settings;
    
    int sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which);
 };
 #endif
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 833cac2..0dede90 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -1,98 +1,99 @@
 #include <qmessagebox.h>
 #include "opiemail.h"
 #include "editaccounts.h"
 #include "composemail.h"
 #include "smtpwrapper.h"
 #include <qpe/qcopenvelope_qws.h>
 #include <qaction.h>
 #include <qapplication.h>
 OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
    : MainWindow( parent, name, flags )
 {
    settings = new Settings();
    folderView->populate( settings->getAccounts() );
    connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) );
    connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
 //    connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
    connect( editSettings, SIGNAL( activated() ), SLOT( slotEditSettings() ) );
    connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) );
    // Added by Stefan Eilers to allow starting by addressbook..
    // copied from old mail2
 #if !defined(QT_NO_COP)
    connect( qApp, SIGNAL( appMessage( const QCString&, const QByteArray& ) ),
             this, SLOT( appMessage( const QCString&, const QByteArray& ) ) );
 #endif
 }
 void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 {
    // copied from old mail2
    // TODO: compose mail should get parameters of a recipient for starting
    // from addressbook. (qcop signal "writeMail(string,string)")
    if (msg == "writeMail(QString,QString)") {
        QDataStream stream(data,IO_ReadOnly);
        QString name, email;
        stream >> name >> email;
        slotComposeMail();
    } else if (msg == "newMail()") {
        slotComposeMail();
    }
 }
 void OpieMail::slotComposeMail()
 {
    qDebug( "Compose Mail" );
    ComposeMail compose( settings, this, 0 , true );
    compose.showMaximized();
    compose.slotAdjustColumns();
    compose.exec();
 }
 void OpieMail::slotSendQueued()
 {
    qDebug( "Send Queued" );
    SMTPaccount *smtp = 0;
    QList<Account> list = settings->getAccounts();
    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;
            }
        }
 //    }
    if (smtp) {
        SMTPwrapper * wrap = new SMTPwrapper(settings);
-        wrap->flushOutbox(smtp);
+        if ( wrap->flushOutbox(smtp) ) {
-        QMessageBox::information(0,tr("Info"),tr("Mail queue flushed"));
+            QMessageBox::information(0,tr("Info"),tr("Mail queue flushed"));
+        }
    }
 }
 void OpieMail::slotSearchMails()
 {
    qDebug( "Search Mails" );
 }
 void OpieMail::slotEditSettings()
 {
    qDebug( "Edit Settings" );
 }
 void OpieMail::slotEditAccounts()
 {
    qDebug( "Edit Accounts" );
    EditAccounts eaDialog( settings, this, 0, true );
    eaDialog.showMaximized();
    eaDialog.slotAdjustColumns();
    eaDialog.exec();
    if ( settings ) delete settings;
    settings = new Settings();
    folderView->populate( settings->getAccounts() );
 }
diff --git a/noncore/net/mail/smtpwrapper.cpp b/noncore/net/mail/smtpwrapper.cpp
index 770e2b8..a7e4837 100644
--- a/noncore/net/mail/smtpwrapper.cpp
+++ b/noncore/net/mail/smtpwrapper.cpp
@@ -1,737 +1,744 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <string.h>
 #include <qdir.h>
 #include <qt.h>
 #include <libetpan/libetpan.h>
 #include "smtpwrapper.h"
 #include "mailwrapper.h"
 #include "mboxwrapper.h"
 #include "logindialog.h"
 #include "mailtypes.h"
 #include "defines.h"
 #include "sendmailprogress.h"
 progressMailSend*SMTPwrapper::sendProgress = 0;
 SMTPwrapper::SMTPwrapper( Settings *s )
    : QObject()
 {
    settings = s;
 }
 QString SMTPwrapper::mailsmtpError( int errnum )
 {
    switch ( errnum ) {
        case MAILSMTP_NO_ERROR:
            return tr( "No error" );
        case MAILSMTP_ERROR_UNEXPECTED_CODE:
            return tr( "Unexpected error code" );
        case MAILSMTP_ERROR_SERVICE_NOT_AVAILABLE:
            return tr( "Service not available" );
        case MAILSMTP_ERROR_STREAM:
            return tr( "Stream error" );
        case MAILSMTP_ERROR_HOSTNAME:
            return tr( "gethostname() failed" );
        case MAILSMTP_ERROR_NOT_IMPLEMENTED:
            return tr( "Not implemented" );
        case MAILSMTP_ERROR_ACTION_NOT_TAKEN:
            return tr( "Error, action not taken" );
        case MAILSMTP_ERROR_EXCEED_STORAGE_ALLOCATION:
            return tr( "Data exceeds storage allocation" );
        case MAILSMTP_ERROR_IN_PROCESSING:
            return tr( "Error in processing" );
  //      case MAILSMTP_ERROR_INSUFFISANT_SYSTEM_STORAGE:
    //        return tr( "Insufficient system storage" );
        case MAILSMTP_ERROR_MAILBOX_UNAVAILABLE:
            return tr( "Mailbox unavailable" );
        case MAILSMTP_ERROR_MAILBOX_NAME_NOT_ALLOWED:
            return tr( "Mailbox name not allowed" );
        case MAILSMTP_ERROR_BAD_SEQUENCE_OF_COMMAND:
            return tr( "Bad command sequence" );
        case MAILSMTP_ERROR_USER_NOT_LOCAL:
            return tr( "User not local" );
        case MAILSMTP_ERROR_TRANSACTION_FAILED:
            return tr( "Transaction failed" );
        case MAILSMTP_ERROR_MEMORY:
            return tr( "Memory error" );
        case MAILSMTP_ERROR_CONNECTION_REFUSED:
            return tr( "Connection refused" );
        default:
            return tr( "Unknown error code" );
    }
 }
 mailimf_mailbox *SMTPwrapper::newMailbox(const QString&name, const QString&mail )
 {
    return mailimf_mailbox_new( strdup( name.latin1() ),
                                strdup( mail.latin1() ) );
 }
 mailimf_address_list *SMTPwrapper::parseAddresses(const QString&addr )
 {
    mailimf_address_list *addresses;
    if ( addr.isEmpty() ) return NULL;
    addresses = mailimf_address_list_new_empty();
    QStringList list = QStringList::split( ',', addr );
    QStringList::Iterator it;
    for ( it = list.begin(); it != list.end(); it++ ) {
        char *str = strdup( (*it).latin1() );
        int err = mailimf_address_list_add_parse( addresses, str );
        if ( err != MAILIMF_NO_ERROR ) {
            qDebug( "Error parsing" );
            qDebug( *it );
            free( str );
        } else {
            qDebug( "Parse success! :)" );
        }
    }
    return addresses;
 }
 mailimf_fields *SMTPwrapper::createImfFields(const Mail&mail )
 {
    mailimf_fields *fields;
    mailimf_field *xmailer;
    mailimf_mailbox *sender, *fromBox;
    mailimf_mailbox_list *from;
    mailimf_address_list *to, *cc, *bcc, *reply;
    char *subject = strdup( mail.getSubject().latin1() );
    int err;
    sender = newMailbox( mail.getName(), mail.getMail() );
    if ( sender == NULL ) goto err_free;
    fromBox = newMailbox( mail.getName(), mail.getMail() );
    if ( fromBox == NULL ) goto err_free_sender;
    from = mailimf_mailbox_list_new_empty();
    if ( from == NULL ) goto err_free_fromBox;
    err = mailimf_mailbox_list_add( from, fromBox );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_from;
    to = parseAddresses( mail.getTo() );
    if ( to == NULL ) goto err_free_from;
    cc = parseAddresses( mail.getCC() );
    bcc = parseAddresses( mail.getBCC() );
    reply = parseAddresses( mail.getReply() );
    fields = mailimf_fields_new_with_data( from, sender, reply, to, cc, bcc,
                                           NULL, NULL, subject );
    if ( fields == NULL ) goto err_free_reply;
    xmailer = mailimf_field_new_custom( strdup( "User-Agent" ),
                                        strdup( USER_AGENT ) );
    if ( xmailer == NULL ) goto err_free_fields;
    err = mailimf_fields_add( fields, xmailer );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_xmailer;
    return fields;      // Success :)
 err_free_xmailer:
    mailimf_field_free( xmailer );
 err_free_fields:
    mailimf_fields_free( fields );
 err_free_reply:
    mailimf_address_list_free( reply );
    mailimf_address_list_free( bcc );
    mailimf_address_list_free( cc );
    mailimf_address_list_free( to );
 err_free_from:
    mailimf_mailbox_list_free( from );
 err_free_fromBox:
    mailimf_mailbox_free( fromBox );
 err_free_sender:
    mailimf_mailbox_free( sender );
 err_free:
    free( subject );
    qDebug( "createImfFields - error" );
    return NULL;        // Error :(
 }
 mailmime *SMTPwrapper::buildTxtPart(const QString&str )
 {
    mailmime *txtPart;
    mailmime_fields *fields;
    mailmime_content *content;
    mailmime_parameter *param;
    char *txt = strdup( str.latin1() );
    int err;
    param = mailmime_parameter_new( strdup( "charset" ),
                                    strdup( "iso-8859-1" ) );
    if ( param == NULL ) goto err_free;
    content = mailmime_content_new_with_str( "text/plain" );
    if ( content == NULL ) goto err_free_param;
    err = clist_append( content->ct_parameters, param );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_content;
    fields = mailmime_fields_new_encoding( MAILMIME_MECHANISM_8BIT );
    if ( fields == NULL ) goto err_free_content;
    txtPart = mailmime_new_empty( content, fields );
    if ( txtPart == NULL ) goto err_free_fields;
    err = mailmime_set_body_text( txtPart, txt, strlen( txt ) );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_txtPart;
    return txtPart;     // Success :)
 err_free_txtPart:
    mailmime_free( txtPart );
 err_free_fields:
    mailmime_fields_free( fields );
 err_free_content:
    mailmime_content_free( content );
 err_free_param:
    mailmime_parameter_free( param );
 err_free:
    free( txt );
    qDebug( "buildTxtPart - error" );
    return NULL;        // Error :(
 }
 mailmime *SMTPwrapper::buildFilePart(const QString&filename,const QString&mimetype,const QString&TextContent )
 {
    mailmime * filePart = 0;
    mailmime_fields * fields = 0;
    mailmime_content * content = 0;
    mailmime_parameter * param = 0;
    char*name = 0;
    char*file = 0;
    int err;
    int pos = filename.findRev( '/' );
-    
    if (filename.length()>0) {
        QString tmp = filename.right( filename.length() - ( pos + 1 ) );
        name = strdup( tmp.latin1() );        // just filename
        file = strdup( filename.latin1() );   // full name with path
    }
    char *mime = strdup( mimetype.latin1() );   // mimetype -e.g. text/plain
    int disptype = MAILMIME_DISPOSITION_TYPE_ATTACHMENT;
    int mechanism = MAILMIME_MECHANISM_BASE64;
-    
    if ( mimetype.startsWith( "text/" ) ) {
        param = mailmime_parameter_new( strdup( "charset" ),
-                                        strdup( "iso-8859-1" ) );                                   
+                                        strdup( "iso-8859-1" ) );
        disptype = MAILMIME_DISPOSITION_TYPE_INLINE;
        mechanism = MAILMIME_MECHANISM_QUOTED_PRINTABLE;
    }
    fields = mailmime_fields_new_filename(
                disptype, name,
                mechanism );
    content = mailmime_content_new_with_str( mime );
    if (content!=0 && fields != 0) {
        if (param) {
            clist_append(content->ct_parameters,param);
            param = 0;
        }
        if (filename.length()>0) {
            QFileInfo f(filename);
            param = mailmime_parameter_new(strdup("name"),strdup(f.fileName().latin1()));
            clist_append(content->ct_parameters,param);
            param = 0;
-        }            
+        }
        filePart = mailmime_new_empty( content, fields );
    }
    if (filePart) {
        if (filename.length()>0) {
            err = mailmime_set_body_file( filePart, file );
        } else {
            err = mailmime_set_body_text(filePart,strdup(TextContent.ascii()),TextContent.length());
        }
        if (err != MAILIMF_NO_ERROR) {
            qDebug("Error setting body with file %s",file);
            mailmime_free( filePart );
            filePart = 0;
        }
    }
    if (!filePart) {
        if ( param != NULL ) {
            mailmime_parameter_free( param );
        }
        if (content) {
            mailmime_content_free( content );
        } else {
            if (mime) {
                free( mime );
            }
        }
        if (fields) {
            mailmime_fields_free( fields );
        } else {
            if (name) {
                free( name );
            }
            if (file) {
                free( file );
            }
        }
    }
    return filePart;        // Success :)
 }
 void SMTPwrapper::addFileParts( mailmime *message,const QList<Attachment>&files )
 {
    const Attachment *it;
    unsigned int count = files.count();
    qDebug("List contains %i values",count);
    for ( unsigned int i = 0; i < count; ++i ) {
        qDebug( "Adding file" );
        mailmime *filePart;
        int err;
        it = ((QList<Attachment>)files).at(i);
        filePart = buildFilePart( it->getFileName(), it->getMimeType(),"" );
        if ( filePart == NULL ) {
            qDebug( "addFileParts: error adding file:" );
            qDebug( it->getFileName() );
            continue;
        }
        err = mailmime_smart_add_part( message, filePart );
        if ( err != MAILIMF_NO_ERROR ) {
            mailmime_free( filePart );
            qDebug("error smart add");
        }
    }
 }
 mailmime *SMTPwrapper::createMimeMail(const Mail &mail )
 {
    mailmime *message, *txtPart;
    mailimf_fields *fields;
    int err;
    fields = createImfFields( mail );
    if ( fields == NULL ) goto err_free;
    message = mailmime_new_message_data( NULL );
    if ( message == NULL ) goto err_free_fields;
    mailmime_set_imf_fields( message, fields );
    if (mail.getAttachments().count()==0) {
        txtPart = buildTxtPart( mail.getMessage() );
    } else {
        txtPart = buildFilePart("","text/plain",mail.getMessage());
    }
    if ( txtPart == NULL ) goto err_free_message;
    err = mailmime_smart_add_part( message, txtPart );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_txtPart;
    addFileParts( message, mail.getAttachments() );
    return message;         // Success :)
 err_free_txtPart:
    mailmime_free( txtPart );
 err_free_message:
    mailmime_free( message );
 err_free_fields:
    mailimf_fields_free( fields );
 err_free:
    qDebug( "createMimeMail: error" );
    return NULL;            // Error :(
 }
 mailimf_field *SMTPwrapper::getField( mailimf_fields *fields, int type )
 {
    mailimf_field *field;
    clistiter *it;
    it = clist_begin( fields->fld_list );
    while ( it ) {
        field = (mailimf_field *) it->data;
        if ( field->fld_type == type ) {
            return field;
        }
        it = it->next;
    }
    return NULL;
 }
 void SMTPwrapper::addRcpts( clist *list, mailimf_address_list *addr_list )
 {
    clistiter *it, *it2;
    for ( it = clist_begin( addr_list->ad_list ); it; it = it->next ) {
        mailimf_address *addr;
        addr = (mailimf_address *) it->data;
        if ( addr->ad_type == MAILIMF_ADDRESS_MAILBOX ) {
                esmtp_address_list_add( list, addr->ad_data.ad_mailbox->mb_addr_spec, 0, NULL );
        } else if ( addr->ad_type == MAILIMF_ADDRESS_GROUP ) {
            clist *l = addr->ad_data.ad_group->grp_mb_list->mb_list;
                for ( it2 = clist_begin( l ); it2; it2 = it2->next ) {
                mailimf_mailbox *mbox;
                    mbox = (mailimf_mailbox *) it2->data;
                    esmtp_address_list_add( list, mbox->mb_addr_spec, 0, NULL );
                }
            }
    }
 }
 clist *SMTPwrapper::createRcptList( mailimf_fields *fields )
 {
    clist *rcptList;
    mailimf_field *field;
    rcptList = esmtp_address_list_new();
    field = getField( fields, MAILIMF_FIELD_TO );
    if ( field && (field->fld_type == MAILIMF_FIELD_TO)
         && field->fld_data.fld_to->to_addr_list ) {
        addRcpts( rcptList, field->fld_data.fld_to->to_addr_list );
    }
    field = getField( fields, MAILIMF_FIELD_CC );
    if ( field && (field->fld_type == MAILIMF_FIELD_CC)
         && field->fld_data.fld_cc->cc_addr_list ) {
        addRcpts( rcptList, field->fld_data.fld_cc->cc_addr_list );
    }
    field = getField( fields, MAILIMF_FIELD_BCC );
    if ( field && (field->fld_type == MAILIMF_FIELD_BCC)
         && field->fld_data.fld_bcc->bcc_addr_list ) {
        addRcpts( rcptList, field->fld_data.fld_bcc->bcc_addr_list );
    }
    return rcptList;
 }
 char *SMTPwrapper::getFrom( mailimf_field *ffrom)
 {
    char *from = NULL;
    if ( ffrom && (ffrom->fld_type == MAILIMF_FIELD_FROM)
         && ffrom->fld_data.fld_from->frm_mb_list && ffrom->fld_data.fld_from->frm_mb_list->mb_list ) {
        clist *cl = ffrom->fld_data.fld_from->frm_mb_list->mb_list;
        clistiter *it;
        for ( it = clist_begin( cl ); it; it = it->next ) {
            mailimf_mailbox *mb = (mailimf_mailbox *) it->data;
            from = strdup( mb->mb_addr_spec );
        }
    }
    return from;
 }
 char *SMTPwrapper::getFrom( mailmime *mail )
 {
    mailimf_field *ffrom = 0;
    ffrom = getField( mail->mm_data.mm_message.mm_fields, MAILIMF_FIELD_FROM );
    return getFrom(ffrom);
 }
 SMTPaccount *SMTPwrapper::getAccount(const QString&name )
 {
    SMTPaccount *smtp;
    QList<Account> list = settings->getAccounts();
    Account *it;
    for ( it = list.first(); it; it = list.next() ) {
        if ( it->getType().compare( "SMTP" ) == 0 ) {
            smtp = static_cast<SMTPaccount *>(it);
            if ( smtp->getName()== name ) {
                qDebug( "SMTPaccount found for" );
                qDebug( name );
                return smtp;
            }
        }
    }
    return NULL;
 }
 QString SMTPwrapper::getTmpFile() {
    int num = 0;
    QString unique;
    QDir dir( "/tmp" );
    QStringList list = dir.entryList( "opiemail-tmp-*" );
    do {
        unique.setNum( num++ );
    } while ( list.contains( "opiemail-tmp-" + unique ) > 0 );
    return "/tmp/opiemail-tmp-" + unique;
 }
 void SMTPwrapper::writeToFile(const QString&file, mailmime *mail )
 {
    FILE *f;
    int err, col = 0;
    f = fopen( file.latin1(), "w" );
    if ( f == NULL ) {
        qDebug( "writeToFile: error opening file" );
        return;
    }
    err = mailmime_write( f, &col, mail );
    if ( err != MAILIMF_NO_ERROR ) {
        fclose( f );
        qDebug( "writeToFile: error writing mailmime" );
        return;
    }
    fclose( f );
 }
 void SMTPwrapper::readFromFile(const QString&file, char **data, size_t *size )
 {
    QFile msg_cache(file);
    QString msg = "";
    msg_cache.open(IO_ReadOnly);
    char*message = new char[4096];
    memset(message,0,4096);
    while (msg_cache.readBlock(message,4095)>0) {
         msg+=message;
         memset(message,0,4096);
    }
    delete message;
    *data = (char*)malloc(msg.length()+1*sizeof(char));
    memset(*data,0,msg.length()+1);
    memcpy(*data,msg.ascii(),msg.length());
    *size=msg.length();
 }
 void SMTPwrapper::progress( size_t current, size_t maximum )
 {
    if (SMTPwrapper::sendProgress) {
        SMTPwrapper::sendProgress->setSingleMail(current, maximum );
        qApp->processEvents();
    }
 }
 void SMTPwrapper::storeMail(char*mail, size_t length, const QString&box)
 {
    if (!mail) return;
    QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
    MBOXwrapper*wrap = new MBOXwrapper(localfolders);
    wrap->storeMessage(mail,length,box);
    delete wrap;
 }
 void SMTPwrapper::smtpSend( mailmime *mail,bool later, SMTPaccount *smtp )
 {
    clist *rcpts = 0;
    char *from, *data;
    size_t size;
    if ( smtp == NULL ) {
        return;
    }
    from = data = 0;
-    
    QString file = getTmpFile();
    writeToFile( file, mail );
    readFromFile( file, &data, &size );
    QFile f( file );
    f.remove();
-    
    if (later) {
        storeMail(data,size,"Outgoing");
        if (data) free( data );
        return;
    }
    from = getFrom( mail );
    rcpts = createRcptList( mail->mm_data.mm_message.mm_fields );
    smtpSend(from,rcpts,data,size,smtp);
 }
 int SMTPwrapper::smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp )
 {
    char *server, *user, *pass;
    bool ssl;
    uint16_t port;
    mailsmtp *session;
    int err,result;
-    
    result = 1;
    server = user = pass = 0;
    server = strdup( smtp->getServer().latin1() );
    ssl = smtp->getSSL();
    port = smtp->getPort().toUInt();
-    
    session = mailsmtp_new( 20, &progress );
    if ( session == NULL ) goto free_mem;
    qDebug( "Servername %s at port %i", server, port );
    if ( ssl ) {
        qDebug( "SSL session" );
        err = mailsmtp_ssl_connect( session, server, port );
    } else {
        qDebug( "No SSL session" );
        err = mailsmtp_socket_connect( session, server, port );
    }
    if ( err != MAILSMTP_NO_ERROR ) {result = 0;goto free_mem_session;}
    err = mailsmtp_init( session );
    if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;}
    qDebug( "INIT OK" );
    if ( smtp->getLogin() ) {
        if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) {
            // get'em
            LoginDialog login( smtp->getUser(), smtp->getPassword(), NULL, 0, true );
            login.show();
            if ( QDialog::Accepted == login.exec() ) {
                // ok
                user = strdup( login.getUser().latin1() );
                pass = strdup( login.getPassword().latin1() );
            } else {
                result = 0; goto free_con_session;
            }
        } else {
            user = strdup( smtp->getUser().latin1() );
            pass = strdup( smtp->getPassword().latin1() );
        }
        qDebug( "session->auth: %i", session->auth);
        err = mailsmtp_auth( session, user, pass );
        if ( err == MAILSMTP_NO_ERROR ) qDebug("auth ok");
        qDebug( "Done auth!" );
    }
    err = mailsmtp_send( session, from, rcpts, data, size );
    if ( err != MAILSMTP_NO_ERROR ) {result = 0; goto free_con_session;}
    qDebug( "Mail sent." );
    storeMail(data,size,"Sent");
 free_con_session:
    mailsmtp_quit( session );
 free_mem_session:
    mailsmtp_free( session );
 free_mem:
    if (rcpts) smtp_address_list_free( rcpts );
    if (data) free( data );
    if (server) free( server );
    if (from) free( from );
    if ( smtp->getLogin() ) {
        free( user );
        free( pass );
    }
    return result;
 }
 void SMTPwrapper::sendMail(const Mail&mail,bool later )
 {
    mailmime * mimeMail;
-    
    SMTPaccount *smtp = getAccount(mail.getName());
-    
    mimeMail = createMimeMail(mail );
    if ( mimeMail == NULL ) {
        qDebug( "sendMail: error creating mime mail" );
    } else {
        sendProgress = new progressMailSend();
-//        sendProgress->showMaximized(); 
+//        sendProgress->showMaximized();
        sendProgress->show();
        sendProgress->setMaxMails(1);
        smtpSend( mimeMail,later,smtp);
        mailmime_free( mimeMail );
        qDebug("Clean up done");
        sendProgress->hide();
        delete sendProgress;
        sendProgress = 0;
    }
 }
 int SMTPwrapper::sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which)
 {
    char*data = 0;
    size_t length = 0;
    size_t curTok = 0;
    mailimf_fields *fields = 0;
    mailimf_field*ffrom = 0;
    clist *rcpts = 0;
    char*from = 0;
    wrap->fetchRawBody(*which,&data,&length);
    if (!data) return 0;
-    int err = mailimf_fields_parse( data, length, &curTok, &fields );    
+    int err = mailimf_fields_parse( data, length, &curTok, &fields );
    if (err != MAILIMF_NO_ERROR) {
        free(data);
        delete wrap;
        return 0;
    }
-    
    rcpts = createRcptList( fields );
    ffrom = getField(fields, MAILIMF_FIELD_FROM );
    from = getFrom(ffrom);
-    
    qDebug("Size: %i vs. %i",length,strlen(data));
    if (rcpts && from) {
        return smtpSend(from,rcpts,data,strlen(data),smtp );
    }
    return 0;
 }
 /* this is a special fun */
-void SMTPwrapper::flushOutbox(SMTPaccount*smtp)
+bool SMTPwrapper::flushOutbox(SMTPaccount*smtp)
 {
-    if (!smtp) return;
+    bool returnValue = true;
-    QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
+    if (!smtp) return false;
+   QString localfolders = (QString) getenv( "HOME" ) + QString("/Applications/opiemail/localmail/");
    MBOXwrapper*wrap = new MBOXwrapper(localfolders);
    if (!wrap) {
        qDebug("memory error");
-        return;
+        return false;
    }
    QList<RecMail> mailsToSend;
    QList<RecMail> mailsToRemove;
    QString mbox("Outgoing");
    wrap->listMessages(mbox,mailsToSend);
    if (mailsToSend.count()==0) {
        delete wrap;
-        return;
+        return false;
    }
    mailsToSend.setAutoDelete(false);
    sendProgress = new progressMailSend();
-//        sendProgress->showMaximized(); 
+//        sendProgress->showMaximized();
   sendProgress->show();
   sendProgress->setMaxMails(mailsToSend.count());
    while (mailsToSend.count()>0) {
        if (sendQueuedMail(wrap,smtp,mailsToSend.at(0))==0) {
            QMessageBox::critical(0,tr("Error sending mail"),
                tr("Error sending queued mail - breaking"));
+            returnValue = false;
            break;
        }
        mailsToRemove.append(mailsToSend.at(0));
        mailsToSend.removeFirst();
        sendProgress->setCurrentMails(mailsToRemove.count());
    }
    sendProgress->hide();
    delete sendProgress;
    sendProgress = 0;
    wrap->deleteMails(mbox,mailsToRemove);
    mailsToSend.setAutoDelete(true);
    delete wrap;
+    return returnValue;
 }
diff --git a/noncore/net/mail/smtpwrapper.h b/noncore/net/mail/smtpwrapper.h
index baa353b..66180b7 100644
--- a/noncore/net/mail/smtpwrapper.h
+++ b/noncore/net/mail/smtpwrapper.h
@@ -1,65 +1,65 @@
 #ifndef SMTPwrapper_H
 #define SMTPwrapper_H
 #include <qpe/applnk.h>
 #include <qbitarray.h>
 #include <qdatetime.h>
 #include <libetpan/clist.h>
 #include "settings.h"
 class Mail;
 class MBOXwrapper;
 class RecMail;
 class Attachment;
 struct mailimf_fields;
 struct mailimf_field;
 struct mailimf_mailbox;
 struct mailmime;
 struct mailimf_address_list;
 class progressMailSend;
 class SMTPwrapper : public QObject
 {
    Q_OBJECT
 public:
    SMTPwrapper( Settings *s ); 
    virtual ~SMTPwrapper(){}
    void sendMail(const Mail& mail,bool later=false );
-    void flushOutbox(SMTPaccount*smtp);
+    bool flushOutbox(SMTPaccount*smtp);
    static progressMailSend*sendProgress;
 protected:
    mailimf_mailbox *newMailbox(const QString&name,const QString&mail );
    mailimf_fields *createImfFields(const Mail &mail );
    mailmime *createMimeMail(const Mail&mail );
    
    mailimf_address_list *parseAddresses(const QString&addr );
    void addFileParts( mailmime *message,const QList<Attachment>&files );
    mailmime *buildTxtPart(const QString&str );
    mailmime *buildFilePart(const QString&filename,const QString&mimetype,const QString&content);
    void smtpSend( mailmime *mail,bool later, SMTPaccount *smtp );
    clist *createRcptList( mailimf_fields *fields );
    SMTPaccount *getAccount(const QString&from );
    void writeToFile(const QString&file, mailmime *mail );
    void readFromFile(const QString&file, char **data, size_t *size );
    
    static void storeMail(char*mail, size_t length, const QString&box);
    static QString mailsmtpError( int err );
    static QString getTmpFile();
    static void progress( size_t current, size_t maximum );
    static void addRcpts( clist *list, mailimf_address_list *addr_list );
    static char *getFrom( mailmime *mail );
    static char *getFrom( mailimf_field *ffrom);
    static mailimf_field *getField( mailimf_fields *fields, int type );
    int smtpSend(char*from,clist*rcpts,char*data,size_t size, SMTPaccount *smtp );
    void storeMail(mailmime*mail, const QString&box);
    Settings *settings;
    
    int sendQueuedMail(MBOXwrapper*wrap,SMTPaccount*smtp,RecMail*which);
 };
 #endif