5 files changed, 168 insertions, 169 deletions
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.cpp b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
index 17bed65..13a3fd9 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.cpp
@@ -10,21 +10,21 @@
 #include "mailwrapper.h"
 #include "logindialog.h"
-#include "mail.h"
+//#include "mail.h"
 #include "defines.h"
 Attachment::Attachment( DocLnk lnk )
-{ 
+{
-    doc = lnk; 
+    doc = lnk;
-    size = QFileInfo( doc.file() ).size(); 
+    size = QFileInfo( doc.file() ).size();
 }
 Folder::Folder(const QString&tmp_name )
 {
    name = tmp_name;
    nameDisplay = name;
-    
-    for ( int pos = nameDisplay.find( '&' ); pos != -1; 
+    for ( int pos = nameDisplay.find( '&' ); pos != -1;
          pos = nameDisplay.find( '&' ) ) {
        int end = nameDisplay.find( '-' );
        if ( end == -1 || end <= pos ) break;
@@ -32,7 +32,7 @@ Folder::Folder(const QString&tmp_name )
        // TODO: do real base64 decoding here !
        if ( str64.compare( "APw" ) == 0 ) {
            nameDisplay = nameDisplay.replace( pos, end - pos + 1, "ue" );
-        } else if ( str64.compare( "APY" ) == 0 ) { 
+        } else if ( str64.compare( "APY" ) == 0 ) {
            nameDisplay = nameDisplay.replace( pos, end - pos + 1, "oe" );
        }
    }
@@ -90,18 +90,18 @@ QString MailWrapper::mailsmtpError( int errnum )
 mailimf_mailbox *MailWrapper::newMailbox(const QString&name, const QString&mail )
 {
-    return mailimf_mailbox_new( strdup( name.latin1() ), 
+    return mailimf_mailbox_new( strdup( name.latin1() ),
                                strdup( mail.latin1() ) );
 }
 mailimf_address_list *MailWrapper::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++ ) {
@@ -115,7 +115,7 @@ mailimf_address_list *MailWrapper::parseAddresses(const QString&addr )
            qDebug( "Parse success! :)" );
        }
    }
-    
    return addresses;
 }
@@ -128,19 +128,19 @@ mailimf_fields *MailWrapper::createImfFields( Mail *mail )
    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;
@@ -151,14 +151,14 @@ mailimf_fields *MailWrapper::createImfFields( Mail *mail )
    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:
@@ -191,40 +191,40 @@ mailmime *MailWrapper::buildTxtPart( QString str )
    mailmime_parameter *param;
    char *txt = strdup( str.latin1() );
    int err;
-    
-    param = mailmime_parameter_new( strdup( "charset" ), 
+    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->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 ); 
+    mailmime_free( txtPart );
 err_free_fields:
    mailmime_fields_free( fields );
 err_free_content:
-    mailmime_content_free( content ); 
+    mailmime_content_free( content );
 err_free_param:
    mailmime_parameter_free( param );
 err_free:
    free( txt );
    qDebug( "buildTxtPart - error" );
-    
    return NULL;        // Error :(
 }
@@ -235,36 +235,36 @@ mailmime *MailWrapper::buildFilePart( QString filename, QString mimetype )
    mailmime_content * content;
    mailmime_parameter * param = NULL;
    int err;
-    
    int pos = filename.findRev( '/' );
    QString tmp = filename.right( filename.length() - ( pos + 1 ) );
    char *name = strdup( tmp.latin1() );        // just filename
    char *file = strdup( filename.latin1() );   // full name with path
    char *mime = strdup( mimetype.latin1() );   // mimetype -e.g. text/plain
- 
-    fields = mailmime_fields_new_filename( 
+    fields = mailmime_fields_new_filename(
-        MAILMIME_DISPOSITION_TYPE_ATTACHMENT, name, 
+        MAILMIME_DISPOSITION_TYPE_ATTACHMENT, name,
        MAILMIME_MECHANISM_BASE64 );
    if ( fields == NULL ) goto err_free;
-    
    content = mailmime_content_new_with_str( mime );
    if ( content == NULL ) goto err_free_fields;
-    
    if ( mimetype.compare( "text/plain" ) ==  0 ) {
-        param = mailmime_parameter_new( strdup( "charset" ), 
+        param = mailmime_parameter_new( strdup( "charset" ),
                                        strdup( "iso-8859-1" ) );
        if ( param == NULL ) goto err_free_content;
-    
        err = clist_append( content->parameters, param );
        if ( err != MAILIMF_NO_ERROR ) goto err_free_param;
    }
-    
    filePart = mailmime_new_empty( content, fields );
    if ( filePart == NULL ) goto err_free_param;
-    
    err = mailmime_set_body_file( filePart, file );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_filePart;
-    
    return filePart;        // Success :)
 err_free_filePart:
@@ -280,7 +280,7 @@ err_free:
    free( mime );
    free( file );
    qDebug( "buildFilePart - error" );
-    
    return NULL;            // Error :(
 }
@@ -289,17 +289,17 @@ void MailWrapper::addFileParts( mailmime *message, QList<Attachment> files )
    Attachment *it;
    for ( it = files.first(); it; it = files.next() ) {
        qDebug( "Adding file" );
-        mailmime *filePart; 
+        mailmime *filePart;
        int err;
        filePart = buildFilePart( it->getFileName(), it->getMimeType() );
        if ( filePart == NULL ) goto err_free;
-        
        err = mailmime_smart_add_part( message, filePart );
        if ( err != MAILIMF_NO_ERROR ) goto err_free_filePart;
-        
-        continue;           // Success :) 
+        continue;           // Success :)
-        
    err_free_filePart:
        mailmime_free( filePart );
    err_free:
@@ -316,18 +316,18 @@ mailmime *MailWrapper::createMimeMail( Mail *mail )
    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 );
    txtPart = buildTxtPart( 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 :)
@@ -357,18 +357,18 @@ mailimf_field *MailWrapper::getField( mailimf_fields *fields, int type )
        }
        it = it->next;
    }
-    
    return NULL;
 }
 static void addRcpts( clist *list, mailimf_address_list *addr_list )
 {
    clistiter *it, *it2;
-    
    for ( it = clist_begin( addr_list->list ); it; it = it->next ) {
        mailimf_address *addr;
        addr = (mailimf_address *) it->data;
-        
        if ( addr->type == MAILIMF_ADDRESS_MAILBOX ) {
                esmtp_address_list_add( list, addr->mailbox->addr_spec, 0, NULL );
        } else if ( addr->type == MAILIMF_ADDRESS_GROUP ) {
@@ -388,21 +388,21 @@ clist *MailWrapper::createRcptList( mailimf_fields *fields )
    mailimf_field *field;
    rcptList = esmtp_address_list_new();
-    
    field = getField( fields, MAILIMF_FIELD_TO );
-    if ( field && (field->type == MAILIMF_FIELD_TO) 
+    if ( field && (field->type == MAILIMF_FIELD_TO)
         && field->field.to->addr_list ) {
        addRcpts( rcptList, field->field.to->addr_list );
    }
-    
    field = getField( fields, MAILIMF_FIELD_CC );
    if ( field && (field->type == MAILIMF_FIELD_CC)
         && field->field.cc->addr_list ) {
        addRcpts( rcptList, field->field.cc->addr_list );
    }
-    
    field = getField( fields, MAILIMF_FIELD_BCC );
-    if ( field && (field->type == MAILIMF_FIELD_BCC) 
+    if ( field && (field->type == MAILIMF_FIELD_BCC)
         && field->field.bcc->addr_list ) {
        addRcpts( rcptList, field->field.bcc->addr_list );
    }
@@ -416,7 +416,7 @@ char *MailWrapper::getFrom( mailmime *mail )
    mailimf_field *ffrom;
    ffrom = getField( mail->fields, MAILIMF_FIELD_FROM );
-    if ( ffrom && (ffrom->type == MAILIMF_FIELD_FROM) 
+    if ( ffrom && (ffrom->type == MAILIMF_FIELD_FROM)
         && ffrom->field.from->mb_list && ffrom->field.from->mb_list->list ) {
        clist *cl = ffrom->field.from->mb_list->list;
        clistiter *it;
@@ -426,13 +426,13 @@ char *MailWrapper::getFrom( mailmime *mail )
        }
    }
-    return from;    
+    return from;
 }
 SMTPaccount *MailWrapper::getAccount( QString from )
 {
    SMTPaccount *smtp;
-    
    QList<Account> list = settings->getAccounts();
    Account *it;
    for ( it = list.first(); it; it = list.next() ) {
@@ -445,14 +445,14 @@ SMTPaccount *MailWrapper::getAccount( QString from )
            }
        }
    }
-    
    return NULL;
 }
 QString MailWrapper::getTmpFile() {
    int num = 0;
    QString unique;
-    
    QDir dir( "/tmp" );
    QStringList::Iterator it;
@@ -460,7 +460,7 @@ QString MailWrapper::getTmpFile() {
    do {
        unique.setNum( num++ );
    } while ( list.contains( "opiemail-tmp-" + unique ) > 0 );
-    
    return "/tmp/opiemail-tmp-" + unique;
 }
@@ -490,13 +490,13 @@ void MailWrapper::readFromFile( QString file, char **data, size_t *size )
    char *buf;
    struct stat st;
    int fd, count = 0, total = 0;
-    
    fd = open( file.latin1(), O_RDONLY, 0 );
    if ( fd == -1 ) return;
-    
    if ( fstat( fd, &st ) != 0 ) goto err_close;
    if ( !st.st_size )  goto err_close;
-    
    buf = (char *) malloc( st.st_size );
    if ( !buf ) goto err_close;
@@ -508,11 +508,11 @@ void MailWrapper::readFromFile( QString file, char **data, size_t *size )
    *data = buf;
    *size = st.st_size;
-    
    close( fd );
    return;             // Success :)
-        
 err_free:
    free( buf );
 err_close:
@@ -533,7 +533,7 @@ void MailWrapper::smtpSend( mailmime *mail )
    int err;
    bool ssl;
    uint16_t port;
-    
    from = getFrom( mail );
    SMTPaccount *smtp = getAccount( from );
@@ -551,9 +551,9 @@ void MailWrapper::smtpSend( mailmime *mail )
    readFromFile( file, &data, &size );
    QFile f( file );
    f.remove();
-    
    session = mailsmtp_new( 20, &progress );
-    if ( session == NULL ) goto free_mem; 
+    if ( session == NULL ) goto free_mem;
    qDebug( "Servername %s at port %i", server, port );
    if ( ssl ) {
@@ -567,9 +567,9 @@ void MailWrapper::smtpSend( mailmime *mail )
    err = mailsmtp_init( session );
    if ( err != MAILSMTP_NO_ERROR ) goto free_con_session;
-    
    qDebug( "INIT OK" );
-    
    if ( smtp->getLogin() ) {
        if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) {
            // get'em
@@ -591,12 +591,12 @@ void MailWrapper::smtpSend( mailmime *mail )
        if ( err == MAILSMTP_NO_ERROR ) qDebug("auth ok");
        qDebug( "Done auth!" );
    }
-     
    err = mailsmtp_send( session, from, rcpts, data, size );
    if ( err != MAILSMTP_NO_ERROR ) goto free_con_session;
    qDebug( "Mail sent." );
-    
 free_con_session:
    mailsmtp_quit( session );
 free_mem_session:
@@ -622,7 +622,7 @@ void MailWrapper::sendMail( Mail mail )
    } else {
        smtpSend( mimeMail );
        mailmime_free( mimeMail );
-    } 
+    }
 }
 Mail::Mail()
diff --git a/noncore/net/mail/libmailwrapper/mailwrapper.h b/noncore/net/mail/libmailwrapper/mailwrapper.h
index 3de28a0..f45eab7 100644
--- a/noncore/net/mail/libmailwrapper/mailwrapper.h
+++ b/noncore/net/mail/libmailwrapper/mailwrapper.h
@@ -3,12 +3,12 @@
 #include <qpe/applnk.h>
-#include <mailmime.h>
+#include <libetpan/mailmime.h>
-#include <mailimf.h>
+#include <libetpan/mailimf.h>
-#include <mailsmtp.h>
+#include <libetpan/mailsmtp.h>
-#include <mailimap.h>
+#include <libetpan/mailimap.h>
-#include <mailstorage.h>
+#include <libetpan/mailstorage.h>
-#include <maildriver.h>
+#include <libetpan/maildriver.h>
 #include <qbitarray.h>
 #include <qdatetime.h>
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index c913826..46a476d 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -33,7 +33,6 @@ INTERFACES	 = editaccountsui.ui \
               composemailui.ui
 INCLUDEPATH += $(OPIEDIR)/include
-INCLUDEPATH += $(OPIEDIR)/include/libetpan
        LIBS    += -lqpe -lopie -letpan -lssl -lcrypto -ldb
 TARGET       = opiemail
diff --git a/noncore/net/mail/mailwrapper.cpp b/noncore/net/mail/mailwrapper.cpp
index 17bed65..13a3fd9 100644
--- a/noncore/net/mail/mailwrapper.cpp
+++ b/noncore/net/mail/mailwrapper.cpp
@@ -10,21 +10,21 @@
 #include "mailwrapper.h"
 #include "logindialog.h"
-#include "mail.h"
+//#include "mail.h"
 #include "defines.h"
 Attachment::Attachment( DocLnk lnk )
-{ 
+{
-    doc = lnk; 
+    doc = lnk;
-    size = QFileInfo( doc.file() ).size(); 
+    size = QFileInfo( doc.file() ).size();
 }
 Folder::Folder(const QString&tmp_name )
 {
    name = tmp_name;
    nameDisplay = name;
-    
-    for ( int pos = nameDisplay.find( '&' ); pos != -1; 
+    for ( int pos = nameDisplay.find( '&' ); pos != -1;
          pos = nameDisplay.find( '&' ) ) {
        int end = nameDisplay.find( '-' );
        if ( end == -1 || end <= pos ) break;
@@ -32,7 +32,7 @@ Folder::Folder(const QString&tmp_name )
        // TODO: do real base64 decoding here !
        if ( str64.compare( "APw" ) == 0 ) {
            nameDisplay = nameDisplay.replace( pos, end - pos + 1, "ue" );
-        } else if ( str64.compare( "APY" ) == 0 ) { 
+        } else if ( str64.compare( "APY" ) == 0 ) {
            nameDisplay = nameDisplay.replace( pos, end - pos + 1, "oe" );
        }
    }
@@ -90,18 +90,18 @@ QString MailWrapper::mailsmtpError( int errnum )
 mailimf_mailbox *MailWrapper::newMailbox(const QString&name, const QString&mail )
 {
-    return mailimf_mailbox_new( strdup( name.latin1() ), 
+    return mailimf_mailbox_new( strdup( name.latin1() ),
                                strdup( mail.latin1() ) );
 }
 mailimf_address_list *MailWrapper::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++ ) {
@@ -115,7 +115,7 @@ mailimf_address_list *MailWrapper::parseAddresses(const QString&addr )
            qDebug( "Parse success! :)" );
        }
    }
-    
    return addresses;
 }
@@ -128,19 +128,19 @@ mailimf_fields *MailWrapper::createImfFields( Mail *mail )
    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;
@@ -151,14 +151,14 @@ mailimf_fields *MailWrapper::createImfFields( Mail *mail )
    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:
@@ -191,40 +191,40 @@ mailmime *MailWrapper::buildTxtPart( QString str )
    mailmime_parameter *param;
    char *txt = strdup( str.latin1() );
    int err;
-    
-    param = mailmime_parameter_new( strdup( "charset" ), 
+    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->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 ); 
+    mailmime_free( txtPart );
 err_free_fields:
    mailmime_fields_free( fields );
 err_free_content:
-    mailmime_content_free( content ); 
+    mailmime_content_free( content );
 err_free_param:
    mailmime_parameter_free( param );
 err_free:
    free( txt );
    qDebug( "buildTxtPart - error" );
-    
    return NULL;        // Error :(
 }
@@ -235,36 +235,36 @@ mailmime *MailWrapper::buildFilePart( QString filename, QString mimetype )
    mailmime_content * content;
    mailmime_parameter * param = NULL;
    int err;
-    
    int pos = filename.findRev( '/' );
    QString tmp = filename.right( filename.length() - ( pos + 1 ) );
    char *name = strdup( tmp.latin1() );        // just filename
    char *file = strdup( filename.latin1() );   // full name with path
    char *mime = strdup( mimetype.latin1() );   // mimetype -e.g. text/plain
- 
-    fields = mailmime_fields_new_filename( 
+    fields = mailmime_fields_new_filename(
-        MAILMIME_DISPOSITION_TYPE_ATTACHMENT, name, 
+        MAILMIME_DISPOSITION_TYPE_ATTACHMENT, name,
        MAILMIME_MECHANISM_BASE64 );
    if ( fields == NULL ) goto err_free;
-    
    content = mailmime_content_new_with_str( mime );
    if ( content == NULL ) goto err_free_fields;
-    
    if ( mimetype.compare( "text/plain" ) ==  0 ) {
-        param = mailmime_parameter_new( strdup( "charset" ), 
+        param = mailmime_parameter_new( strdup( "charset" ),
                                        strdup( "iso-8859-1" ) );
        if ( param == NULL ) goto err_free_content;
-    
        err = clist_append( content->parameters, param );
        if ( err != MAILIMF_NO_ERROR ) goto err_free_param;
    }
-    
    filePart = mailmime_new_empty( content, fields );
    if ( filePart == NULL ) goto err_free_param;
-    
    err = mailmime_set_body_file( filePart, file );
    if ( err != MAILIMF_NO_ERROR ) goto err_free_filePart;
-    
    return filePart;        // Success :)
 err_free_filePart:
@@ -280,7 +280,7 @@ err_free:
    free( mime );
    free( file );
    qDebug( "buildFilePart - error" );
-    
    return NULL;            // Error :(
 }
@@ -289,17 +289,17 @@ void MailWrapper::addFileParts( mailmime *message, QList<Attachment> files )
    Attachment *it;
    for ( it = files.first(); it; it = files.next() ) {
        qDebug( "Adding file" );
-        mailmime *filePart; 
+        mailmime *filePart;
        int err;
        filePart = buildFilePart( it->getFileName(), it->getMimeType() );
        if ( filePart == NULL ) goto err_free;
-        
        err = mailmime_smart_add_part( message, filePart );
        if ( err != MAILIMF_NO_ERROR ) goto err_free_filePart;
-        
-        continue;           // Success :) 
+        continue;           // Success :)
-        
    err_free_filePart:
        mailmime_free( filePart );
    err_free:
@@ -316,18 +316,18 @@ mailmime *MailWrapper::createMimeMail( Mail *mail )
    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 );
    txtPart = buildTxtPart( 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 :)
@@ -357,18 +357,18 @@ mailimf_field *MailWrapper::getField( mailimf_fields *fields, int type )
        }
        it = it->next;
    }
-    
    return NULL;
 }
 static void addRcpts( clist *list, mailimf_address_list *addr_list )
 {
    clistiter *it, *it2;
-    
    for ( it = clist_begin( addr_list->list ); it; it = it->next ) {
        mailimf_address *addr;
        addr = (mailimf_address *) it->data;
-        
        if ( addr->type == MAILIMF_ADDRESS_MAILBOX ) {
                esmtp_address_list_add( list, addr->mailbox->addr_spec, 0, NULL );
        } else if ( addr->type == MAILIMF_ADDRESS_GROUP ) {
@@ -388,21 +388,21 @@ clist *MailWrapper::createRcptList( mailimf_fields *fields )
    mailimf_field *field;
    rcptList = esmtp_address_list_new();
-    
    field = getField( fields, MAILIMF_FIELD_TO );
-    if ( field && (field->type == MAILIMF_FIELD_TO) 
+    if ( field && (field->type == MAILIMF_FIELD_TO)
         && field->field.to->addr_list ) {
        addRcpts( rcptList, field->field.to->addr_list );
    }
-    
    field = getField( fields, MAILIMF_FIELD_CC );
    if ( field && (field->type == MAILIMF_FIELD_CC)
         && field->field.cc->addr_list ) {
        addRcpts( rcptList, field->field.cc->addr_list );
    }
-    
    field = getField( fields, MAILIMF_FIELD_BCC );
-    if ( field && (field->type == MAILIMF_FIELD_BCC) 
+    if ( field && (field->type == MAILIMF_FIELD_BCC)
         && field->field.bcc->addr_list ) {
        addRcpts( rcptList, field->field.bcc->addr_list );
    }
@@ -416,7 +416,7 @@ char *MailWrapper::getFrom( mailmime *mail )
    mailimf_field *ffrom;
    ffrom = getField( mail->fields, MAILIMF_FIELD_FROM );
-    if ( ffrom && (ffrom->type == MAILIMF_FIELD_FROM) 
+    if ( ffrom && (ffrom->type == MAILIMF_FIELD_FROM)
         && ffrom->field.from->mb_list && ffrom->field.from->mb_list->list ) {
        clist *cl = ffrom->field.from->mb_list->list;
        clistiter *it;
@@ -426,13 +426,13 @@ char *MailWrapper::getFrom( mailmime *mail )
        }
    }
-    return from;    
+    return from;
 }
 SMTPaccount *MailWrapper::getAccount( QString from )
 {
    SMTPaccount *smtp;
-    
    QList<Account> list = settings->getAccounts();
    Account *it;
    for ( it = list.first(); it; it = list.next() ) {
@@ -445,14 +445,14 @@ SMTPaccount *MailWrapper::getAccount( QString from )
            }
        }
    }
-    
    return NULL;
 }
 QString MailWrapper::getTmpFile() {
    int num = 0;
    QString unique;
-    
    QDir dir( "/tmp" );
    QStringList::Iterator it;
@@ -460,7 +460,7 @@ QString MailWrapper::getTmpFile() {
    do {
        unique.setNum( num++ );
    } while ( list.contains( "opiemail-tmp-" + unique ) > 0 );
-    
    return "/tmp/opiemail-tmp-" + unique;
 }
@@ -490,13 +490,13 @@ void MailWrapper::readFromFile( QString file, char **data, size_t *size )
    char *buf;
    struct stat st;
    int fd, count = 0, total = 0;
-    
    fd = open( file.latin1(), O_RDONLY, 0 );
    if ( fd == -1 ) return;
-    
    if ( fstat( fd, &st ) != 0 ) goto err_close;
    if ( !st.st_size )  goto err_close;
-    
    buf = (char *) malloc( st.st_size );
    if ( !buf ) goto err_close;
@@ -508,11 +508,11 @@ void MailWrapper::readFromFile( QString file, char **data, size_t *size )
    *data = buf;
    *size = st.st_size;
-    
    close( fd );
    return;             // Success :)
-        
 err_free:
    free( buf );
 err_close:
@@ -533,7 +533,7 @@ void MailWrapper::smtpSend( mailmime *mail )
    int err;
    bool ssl;
    uint16_t port;
-    
    from = getFrom( mail );
    SMTPaccount *smtp = getAccount( from );
@@ -551,9 +551,9 @@ void MailWrapper::smtpSend( mailmime *mail )
    readFromFile( file, &data, &size );
    QFile f( file );
    f.remove();
-    
    session = mailsmtp_new( 20, &progress );
-    if ( session == NULL ) goto free_mem; 
+    if ( session == NULL ) goto free_mem;
    qDebug( "Servername %s at port %i", server, port );
    if ( ssl ) {
@@ -567,9 +567,9 @@ void MailWrapper::smtpSend( mailmime *mail )
    err = mailsmtp_init( session );
    if ( err != MAILSMTP_NO_ERROR ) goto free_con_session;
-    
    qDebug( "INIT OK" );
-    
    if ( smtp->getLogin() ) {
        if ( smtp->getUser().isEmpty() || smtp->getPassword().isEmpty() ) {
            // get'em
@@ -591,12 +591,12 @@ void MailWrapper::smtpSend( mailmime *mail )
        if ( err == MAILSMTP_NO_ERROR ) qDebug("auth ok");
        qDebug( "Done auth!" );
    }
-     
    err = mailsmtp_send( session, from, rcpts, data, size );
    if ( err != MAILSMTP_NO_ERROR ) goto free_con_session;
    qDebug( "Mail sent." );
-    
 free_con_session:
    mailsmtp_quit( session );
 free_mem_session:
@@ -622,7 +622,7 @@ void MailWrapper::sendMail( Mail mail )
    } else {
        smtpSend( mimeMail );
        mailmime_free( mimeMail );
-    } 
+    }
 }
 Mail::Mail()
diff --git a/noncore/net/mail/mailwrapper.h b/noncore/net/mail/mailwrapper.h
index 3de28a0..f45eab7 100644
--- a/noncore/net/mail/mailwrapper.h
+++ b/noncore/net/mail/mailwrapper.h
@@ -3,12 +3,12 @@
 #include <qpe/applnk.h>
-#include <mailmime.h>
+#include <libetpan/mailmime.h>
-#include <mailimf.h>
+#include <libetpan/mailimf.h>
-#include <mailsmtp.h>
+#include <libetpan/mailsmtp.h>
-#include <mailimap.h>
+#include <libetpan/mailimap.h>
-#include <mailstorage.h>
+#include <libetpan/mailstorage.h>
-#include <maildriver.h>
+#include <libetpan/maildriver.h>
 #include <qbitarray.h>
 #include <qdatetime.h>