5 files changed, 34 insertions, 3 deletions
diff --git a/kmicromail/libmailwrapper/settings.cpp b/kmicromail/libmailwrapper/settings.cpp
index 04afe7c..19093b1 100644
--- a/kmicromail/libmailwrapper/settings.cpp
+++ b/kmicromail/libmailwrapper/settings.cpp
@@ -1,501 +1,501 @@
 #include <stdlib.h>
 #include <qdir.h>
 //#include <opie2/odebug.h>
 #include <kconfig.h>
 #include <kstandarddirs.h>
 #include "settings.h"
 //#include "defines.h"
 #define IMAP_PORT           "143"
 #define IMAP_SSL_PORT       "993"
 #define SMTP_PORT           "25"
 #define SMTP_SSL_PORT       "465"
 #define POP3_PORT           "110"
 #define POP3_SSL_PORT       "995"
 #define NNTP_PORT           "119"
 #define NNTP_SSL_PORT       "563"
 Settings::Settings()
    : QObject()
 {  
    accounts.setAutoDelete( true ); ;
   updateAccounts();
   //qDebug("++++++++++++++++++new settings ");
 }
 void Settings::checkDirectory()
 {
    return;
    locateLocal("data", "kopiemail" );
    /*
    if ( !QDir( (QString) getenv( "HOME" ) + "/Applications/opiemail/" ).exists() ) {
        system( "mkdir -p $HOME/Applications/opiemail" );
        qDebug("$HOME/Applications/opiemail created ");
    }
    */
 }
 QList<Account> Settings::getAccounts()
 {
    return accounts;
 }
 void Settings::addAccount( Account *account )
 {
    accounts.append( account );
 }
 void Settings::delAccount( Account *account )
 {
-    accounts.remove( account );
    account->remove();
+    accounts.remove( account );
 }
 void Settings::updateAccounts()
 {
    accounts.clear();
    QDir dir( locateLocal("data", "kopiemail" ) );
    QStringList::Iterator it;
    QStringList imap = dir.entryList( "imap-*" );
    for ( it = imap.begin(); it != imap.end(); it++ ) {
        IMAPaccount *account = new IMAPaccount( (*it).replace(0, 5, "") );
        accounts.append( account );
    }
    QStringList pop3 = dir.entryList( "pop3-*" );
    for ( it = pop3.begin(); it != pop3.end(); it++ ) {
        POP3account *account = new POP3account( (*it).replace(0, 5, "") );
        accounts.append( account );
    }
    QStringList smtp = dir.entryList( "smtp-*" );
    for ( it = smtp.begin(); it != smtp.end(); it++ ) {
        SMTPaccount *account = new SMTPaccount( (*it).replace(0, 5, "") );
        accounts.append( account );
    }
    QStringList nntp = dir.entryList( "nntp-*" );
    for ( it = nntp.begin(); it != nntp.end(); it++ ) {
        NNTPaccount *account = new NNTPaccount( (*it).replace(0, 5, "") );
        accounts.append( account );
    }
    readAccounts();
 }
 void Settings::saveAccounts()
 {
    checkDirectory();
    Account *it;
    for ( it = accounts.first(); it; it = accounts.next() ) {
        it->save();
    }
 }
 void Settings::readAccounts()
 {
    checkDirectory();
    Account *it;
    for ( it = accounts.first(); it; it = accounts.next() ) {
        it->read();
    }
 }
 Account::Account()
 {
    accountName = "changeMe";
    type = MAILLIB::A_UNDEFINED;
    ssl = false;
    connectionType = 1;
    offline = false;  
    maxMailSize = 0;
    lastFetch;
    leaveOnServer = false;
 }
 void Account::remove()
 {
    QFile file( getFileName() );
    file.remove();
 }
 void Account::setPasswordList(const QStringList &str)
 {
    password = "";
    int i;
    for ( i = 0; i < str.count()  ; ++i ) {
        QChar c ( (str[i].toUInt()-131)/(str.count()- (i%3)));
        password.append( c );
    }
    //qDebug("password %s ", password.latin1());
 }
 QStringList Account::getPasswordList()
 {
    int i;
    int len = password.length();
    QStringList str;
    
    for ( i = 0; i < len  ; ++i ) {
        int val = password.at(i).unicode()*(len-(i%3))+131;
        str.append( QString::number( val ) );
        // qDebug("append %s ", str[i].latin1());
    }
    return str;
 }
 IMAPaccount::IMAPaccount()
    : Account()
 {
    file = IMAPaccount::getUniqueFileName();
    accountName = "New IMAP Account";
    ssl = false;
    connectionType = 1;
    type = MAILLIB::A_IMAP;
    port = IMAP_PORT;
 }
 IMAPaccount::IMAPaccount( QString filename )
    : Account()
 {
    file = filename;
    accountName = "New IMAP Account";
    ssl = false;
    connectionType = 1;
    type = MAILLIB::A_IMAP;
    port = IMAP_PORT;
 }
 QString IMAPaccount::getUniqueFileName()
 {
    int num = 0;
    QString unique;
    QDir dir( locateLocal("data", "kopiemail" ) );
    QStringList imap = dir.entryList( "imap-*" );
    do {
        unique.setNum( num++ );
    } while ( imap.contains( "imap-" + unique ) > 0 );
    return unique;
 }
 void IMAPaccount::read()
 {
    KConfig *conf = new KConfig( getFileName() );
    conf->setGroup( "IMAP Account" );
    accountName = conf->readEntry( "Account","" );
    if (accountName.isNull()) accountName = "";
    server = conf->readEntry( "Server","" );
    if (server.isNull()) server="";
    port = conf->readEntry( "Port","" );
    if (port.isNull()) port="143";
    connectionType = conf->readNumEntry( "ConnectionType" );
    ssl = conf->readBoolEntry( "SSL",false );
    user = conf->readEntry( "User","" );
    if (user.isNull()) user = "";
    //password = conf->readEntryCrypt( "Password","" );
    setPasswordList( conf->readListEntry( "FolderHistory"));
    if (password.isNull()) password = "";
    prefix = conf->readEntry("MailPrefix","");
    if (prefix.isNull()) prefix = "";
    offline = conf->readBoolEntry("Offline",false);
    localFolder = conf->readEntry( "LocalFolder" );
    maxMailSize = conf->readNumEntry( "MaxSize",0 );
    int lf = conf->readNumEntry( "LastFetch",0 );
    QDateTime dt ( QDate ( 2004, 1, 1 ), QTime( 0,0,0) );
    leaveOnServer = conf->readBoolEntry("LeaveOnServer",false);
    if ( lf < 0 ) lf = 0;
    lastFetch = dt.addSecs( lf );
    delete conf;
 }
 void IMAPaccount::save()
 {
 
    Settings::checkDirectory();
    KConfig *conf = new KConfig( getFileName() );
    conf->setGroup( "IMAP Account" );
    conf->writeEntry( "Account", accountName );
    conf->writeEntry( "Server", server );
    conf->writeEntry( "Port", port );
    conf->writeEntry( "SSL", ssl );
    conf->writeEntry( "ConnectionType", connectionType );
    conf->writeEntry( "User", user );
    //conf->writeEntryCrypt( "Password", password );
    conf->writeEntry( "FolderHistory",getPasswordList() );
    conf->writeEntry( "MailPrefix",prefix);
    conf->writeEntry( "Offline",offline);
    conf->writeEntry( "LocalFolder", localFolder );
    conf->writeEntry( "MaxSize", maxMailSize );
    QDateTime dt ( QDate ( 2004, 1, 1 ), QTime( 0,0,0) );
    int lf = dt.secsTo ( lastFetch );
    conf->writeEntry( "LastFetch", lf );
    conf->writeEntry( "LeaveOnServer", leaveOnServer);
    conf->sync();
    delete conf;
 }
 QString IMAPaccount::getFileName()
 {
    return locateLocal("data", "kopiemail" ) +"/imap-" + file;
 }
 POP3account::POP3account()
    : Account()
 {
    file = POP3account::getUniqueFileName();
    accountName = "New POP3 Account";
    ssl = false;
    connectionType = 1;
    type = MAILLIB::A_POP3;
    port = POP3_PORT;
 }
 POP3account::POP3account( QString filename )
    : Account()
 {
    file = filename;
    accountName = "New POP3 Account";
    ssl = false;
    connectionType = 1;
    type = MAILLIB::A_POP3;
    port = POP3_PORT;
 }
 QString POP3account::getUniqueFileName()
 {
    int num = 0;
    QString unique;
    QDir dir( locateLocal("data", "kopiemail" ) );
    QStringList imap = dir.entryList( "pop3-*" );
    do {
        unique.setNum( num++ );
    } while ( imap.contains( "pop3-" + unique ) > 0 );
    return unique;
 }
 void POP3account::read()
 {
    KConfig *conf = new KConfig( getFileName());
    conf->setGroup( "POP3 Account" );
    accountName = conf->readEntry( "Account" );
    server = conf->readEntry( "Server" );
    port = conf->readEntry( "Port" );
    ssl = conf->readBoolEntry( "SSL" );
    connectionType = conf->readNumEntry( "ConnectionType" );
    user = conf->readEntry( "User" );
    //password = conf->readEntryCrypt( "Password" );
    setPasswordList( conf->readListEntry( "FolderHistory"));
    offline = conf->readBoolEntry("Offline",false);
    localFolder = conf->readEntry( "LocalFolder" );
    maxMailSize = conf->readNumEntry( "MaxSize",0 );
    int lf = conf->readNumEntry( "LastFetch",0 );
    QDateTime dt ( QDate ( 2004, 1, 1 ), QTime( 0,0,0) );
    leaveOnServer = conf->readBoolEntry("LeaveOnServer",false);
    lastFetch = dt.addSecs( lf );
    delete conf;
 }
 void POP3account::save()
 {
    Settings::checkDirectory();
    KConfig *conf = new KConfig( getFileName() );
    conf->setGroup( "POP3 Account" );
    conf->writeEntry( "Account", accountName );
    conf->writeEntry( "Server", server );
    conf->writeEntry( "Port", port );
    conf->writeEntry( "SSL", ssl );
    conf->writeEntry( "ConnectionType", connectionType );
    conf->writeEntry( "User", user );
    //conf->writeEntryCrypt( "Password", password );
    conf->writeEntry( "FolderHistory",getPasswordList() );
    conf->writeEntry( "Offline",offline);
    conf->writeEntry( "LocalFolder", localFolder );
    conf->writeEntry( "MaxSize", maxMailSize );
    QDateTime dt ( QDate ( 2004, 1, 1 ), QTime( 0,0,0) );
    int lf = dt.secsTo ( lastFetch );
    conf->writeEntry( "LastFetch", lf );
    conf->writeEntry( "LeaveOnServer", leaveOnServer);
    conf->sync();
    delete conf;
 }
 QString POP3account::getFileName()
 {
    return locateLocal("data", "kopiemail" ) +"/pop3-" + file;
 }
 SMTPaccount::SMTPaccount()
    : Account()
 {
    file = SMTPaccount::getUniqueFileName();
    accountName = "New SMTP Account";
    ssl = false;
    connectionType = 1;
    login = false;
    useCC = false;
    useBCC = false;
    useReply = false;
    type = MAILLIB::A_SMTP;
    port = SMTP_PORT;
 }
 SMTPaccount::SMTPaccount( QString filename )
    : Account()
 {
    file = filename;
    accountName = "New SMTP Account";
    ssl = false;
    connectionType = 1;
    login = false;
    type = MAILLIB::A_SMTP;
    port = SMTP_PORT;
 }
 QString SMTPaccount::getUniqueFileName()
 {
    int num = 0;
    QString unique;
    QDir dir( locateLocal("data", "kopiemail" ) );
    QStringList imap = dir.entryList( "smtp-*" );
    do {
        unique.setNum( num++ );
    } while ( imap.contains( "smtp-" + unique ) > 0 );
    return unique;
 }
 void SMTPaccount::read()
 {
    KConfig *conf = new KConfig( getFileName() );
    conf->setGroup( "SMTP Account" );
    accountName = conf->readEntry( "Account" );
    server = conf->readEntry( "Server" );
    port = conf->readEntry( "Port" );
    ssl = conf->readBoolEntry( "SSL" );
    connectionType = conf->readNumEntry( "ConnectionType" );
    login = conf->readBoolEntry( "Login" );
    user = conf->readEntry( "User" );
    //password = conf->readEntryCrypt( "Password" );
    setPasswordList( conf->readListEntry( "FolderHistory"));
    delete conf;
 }
 void SMTPaccount::save()
 {
    Settings::checkDirectory();
    KConfig *conf = new KConfig( getFileName() );
    conf->setGroup( "SMTP Account" );
    conf->writeEntry( "Account", accountName );
    conf->writeEntry( "Server", server );
    conf->writeEntry( "Port", port );
    conf->writeEntry( "SSL", ssl );
    conf->writeEntry( "ConnectionType", connectionType );
    conf->writeEntry( "Login", login );
    conf->writeEntry( "User", user );
    //conf->writeEntryCrypt( "Password", password );
    conf->writeEntry( "FolderHistory",getPasswordList() );
    conf->sync();
    delete conf;
 }
 QString SMTPaccount::getFileName()
 {
    return locateLocal("data", "kopiemail" ) +"/smtp-" + file;
 }
 NNTPaccount::NNTPaccount()
    : Account()
 {
    file = NNTPaccount::getUniqueFileName();
    accountName = "New NNTP Account";
    ssl = false;
    login = false;
    type = MAILLIB::A_NNTP;
    port = NNTP_PORT;
 }
 NNTPaccount::NNTPaccount( QString filename )
    : Account()
 {
    file = filename;
    accountName = "New NNTP Account";
    ssl = false;
    login = false;
    type = MAILLIB::A_NNTP;
    port = NNTP_PORT;
 }
 QString NNTPaccount::getUniqueFileName()
 {
    int num = 0;
    QString unique;
    QDir dir( locateLocal("data", "kopiemail" ) );
    QStringList imap = dir.entryList( "nntp-*" );
    do {
        unique.setNum( num++ );
    } while ( imap.contains( "nntp-" + unique ) > 0 );
    return unique;
 }
 void NNTPaccount::read()
 {
    KConfig *conf = new KConfig( getFileName() );
    conf->setGroup( "NNTP Account" );
    accountName = conf->readEntry( "Account" );
    server = conf->readEntry( "Server" );
    port = conf->readEntry( "Port" );
    ssl = conf->readBoolEntry( "SSL" );
    login = conf->readBoolEntry( "Login" );
    user = conf->readEntry( "User" );
    //password = conf->readEntryCrypt( "Password" );
    setPasswordList( conf->readListEntry( "FolderHistory"));
    subscribedGroups = conf->readListEntry( "Subscribed");
    delete conf;
 }
 void NNTPaccount::save()
 {
    Settings::checkDirectory();
    KConfig *conf = new KConfig( getFileName() );
    conf->setGroup( "NNTP Account" );
    conf->writeEntry( "Account", accountName );
    conf->writeEntry( "Server", server );
    conf->writeEntry( "Port", port );
    conf->writeEntry( "SSL", ssl );
    conf->writeEntry( "Login", login );
    conf->writeEntry( "User", user );
    //conf->writeEntryCrypt( "Password", password );
    conf->writeEntry( "FolderHistory",getPasswordList() );
    conf->writeEntry( "Subscribed" , subscribedGroups );
    conf->sync();
    delete conf;
 }
 QString NNTPaccount::getFileName()
 {
    return locateLocal("data", "kopiemail" ) +"/nntp-" + file;
 }
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index ec192ea..915b3e8 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -1,560 +1,587 @@
 // CHANGED 2004-09-31 Lutz Rogowski
 // CHANGED 2004-08-06 Lutz Rogowski
 #include "koprefsdialog.h"
 #include <kapplication.h>
 #include <libkdepim/externalapphandler.h>
 #include <libkdepim/kpimglobalprefs.h>
 #ifdef  MINIKDE_KDIALOG_H
 #undef MINIKDE_KDIALOG_H
 #endif
 #include "settingsdialog.h"
 #include "opiemail.h"
 #include "editaccounts.h"
 #include "composemail.h"
 #include "mailistviewitem.h"
 #include "viewmail.h"
 #include "selectstore.h"
 #include "selectsmtp.h"
 #include "accountitem.h"
 #include "klocale.h"
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qcursor.h>
 #include <qregexp.h>
 #include <qpe/global.h>
 #ifdef DESKTOP_VERSION
 #include <qapplication.h>
 #else
 #include <qpe/qpeapplication.h>
 #endif
 #include <libmailwrapper/smtpwrapper.h>
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/abstractmail.h>
 #include "koprefs.h"
 //using namespace Opie::Core;
 OpieMail::OpieMail( QWidget *parent, const char *name )
    : MainWindow( parent, name) //, WStyle_ContextHelp )
 {
    settings = new Settings();
    setIcon(SmallIcon( "kmicromail" )  );
    folderView->populate( settings->getAccounts() );
  
 }
 OpieMail::~OpieMail()
 {
    if (settings) delete settings;
 }
 void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 {
    
 }
 #include <stdlib.h>
 void OpieMail::message(const QCString &msg, const QByteArray &data)
 {
    // copied from old mail2
    static int ii = 0;
    //qDebug("QCOP CALL ############################# %d ", ii);
    //QString mess ( msg  );
    //qDebug("Message = %s ",mess.latin1());
    ++ii;
    //qDebug("KM:appMessage %d *%s* %x", ii, msg.data(), this);
    mPendingEmail = QString::null;
    mPendingName = QString::null;
    if (msg == "writeMail(QString,QString)")
    {
        //qDebug("writeMail(QString,QString) ");
        QDataStream stream(data,IO_ReadOnly);
        stream >> mPendingName >> mPendingEmail;
        // removing the whitespaces at beginning and end is needed!
        QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); 
    }
    else if (msg == "newMail()")
    {
        //qDebug("slotComposeMail() ");
        // we cannot call slotComposeMail(); directly, because may be executing a QCOP call
        // and a QCOP call does not like a processevents in his execution
        // with the Qtimer we call slotComposeMail() after we reached the main event loop
        QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); 
        // slotComposeMail();
    }
    else if (msg == "newMail(QString)")
    {
        //qDebug(" newMail(QString)");
        QDataStream stream(data,IO_ReadOnly);
        stream >> mPendingName;
        // the format is 
        //  NAME <EMAIL>:SUBJECT
        QTimer::singleShot ( 50, this, SLOT(slotComposeMail() ) ); 
    } else {
        mPendingData = data;
        mPendingMessage = msg;
        QTimer::singleShot ( 50, this, SLOT(slotExtAppHandler() ) ); 
    }
    //qDebug("END OpieMail::message ");
 }
 void OpieMail::slotExtAppHandler()
 {
    ExternalAppHandler::instance()->appMessage ( mPendingMessage, mPendingData );
 }
 void OpieMail::slotwriteMail2(const QString& namemail )
 {
    //qDebug("OpieMail::slotwriteMail2 ");
    //qApp->processEvents();
     ComposeMail compose( settings, this, 0, true );
    if ( !namemail.isEmpty() ) {
        QString to = namemail;
        if ( namemail.find( " <") > 1 ) {
            to = "\"" +to.replace( QRegExp( " <"), "\" <") ;
        } else 
        if ( namemail.find( "<") > 1 ) {
            to = "\"" +to.replace( QRegExp( "<"), "\" <") ;
        }
        int sub = to.find( ">:");
        if ( sub > 0 ) {
            compose.setTo( to.left(sub+1)  );
            compose.setSubject( to.mid(sub+2) );
        } else
            compose.setTo( to );
     }
    compose.slotAdjustColumns();
 #ifndef DESKTOP_VERSION
    compose.showMaximized();
 #endif
    compose.exec();
    raise();
    //qDebug("retttich ");
 }
 void OpieMail::slotwriteMail(const QString&name,const QString&email)
 {
    // qDebug("OpieMail::slotwriteMail ");
    ComposeMail compose( settings, this, 0, true );
    if (!email.isEmpty())
    {
        if (!name.isEmpty())
        {
            compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">");
        }
        else
        {
            compose.setTo(email);
        }
    }
    compose.slotAdjustColumns();
 #ifndef DESKTOP_VERSION
    compose.showMaximized();
 #endif
    compose.exec();
    raise();
 }
 void OpieMail::slotComposeMail()
 {
    if ( mPendingEmail == QString::null && mPendingName == QString::null)
        slotwriteMail2( QString () );
    else {
        if ( mPendingEmail == QString::null )
            slotwriteMail2( mPendingName );
        else
            slotwriteMail( mPendingName, mPendingEmail );   
    }
    //slotwriteMail(0l,0l);
 }
 void OpieMail::slotSendQueued()
 {
    SMTPaccount *smtp = 0;
    QList<Account> list = settings->getAccounts();
    QList<SMTPaccount> smtpList;
    smtpList.setAutoDelete(false);
    Account *it;
    for ( it = list.first(); it; it = list.next() )
    {
        if ( it->getType() == MAILLIB::A_SMTP )
        {
            smtp = static_cast<SMTPaccount *>(it);
            smtpList.append(smtp);
        }
    }
    if (smtpList.count()==0)
    {
        QMessageBox::information(0,i18n("Info"),i18n("Define a smtp account first!\n"));
        return;
    }
    if ( QMessageBox::warning(this, i18n("Sending all mails"), i18n("Do you really want to send\nall queued mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No )
        return;
    if (smtpList.count()==1)
    {
        smtp = smtpList.at(0);
    }
    else
    {
        smtp = 0;
        selectsmtp selsmtp;
        selsmtp.setSelectionlist(&smtpList);
 #ifndef DESKTOP_VERSION
        selsmtp.showMaximized();
 #endif
        if (  selsmtp.exec() == QDialog::Accepted )
        {
            smtp = selsmtp.selected_smtp();
        }
    }
    if (smtp)
    {
     
        Global::statusMessage("Sending mails...!");
        SMTPwrapper * wrap = new SMTPwrapper(smtp);
        if ( wrap->flushOutbox() )
        {
            Global::statusMessage("Mails sent!");
        } 
        delete wrap;
    }
    // pending refresh list view, if outgoing is displayed
 }
 void OpieMail::slotSearchMails()
 {
    qDebug("OpieMail::slotSearchMails():not implemented ");
 }
 void OpieMail::slotEditSettings()
 {
    KOPrefsDialog settingsDialog( this,  "koprefs", true );
 #ifndef DESKTOP_VERSION
    settingsDialog.showMaximized();
 #endif
    settingsDialog.exec();
   slotSetCodec( KOPrefs::instance()->mCurrentCodec );
    //    KApplication::execDialog(settingsDialog);
 }
 void OpieMail::slotEditAccounts()
 {
    EditAccounts eaDialog( settings, this, 0, true );
    eaDialog.slotAdjustColumns();
 #ifndef DESKTOP_VERSION
    eaDialog.showMaximized();
 #endif
    eaDialog.exec();
    if ( settings ) delete settings;
    settings = new Settings();
    folderView->populate( settings->getAccounts() );
 }
 void OpieMail::replyMail()
 {
    QListViewItem*item = mailView->currentItem();
    if (!item) return;
    RecMailP mail = ((MailListViewItem*)item)->data();
    RecBodyP body = folderView->fetchBody(mail);
    QString rtext;
    rtext += QString("* %1 wrote on %2:\n")        // no i18n on purpose
        .arg(  mail->getFrom())
             .arg( mail->getDate());
    QString text = body->Bodytext();
    QStringList lines = QStringList::split(QRegExp("\\n"), text);
    QStringList::Iterator it;
    for (it = lines.begin(); it != lines.end(); it++)
    {
        rtext += "> " + *it + "\n";
    }
    rtext += "\n";
    QString prefix;
    if ( mail->getSubject().find(QRegExp("^Re: .*$")) != -1) prefix = "";
    else prefix = "Re: ";                // no i18n on purpose
    Settings *settings = new Settings();
    ComposeMail composer( settings ,this, 0, true);
    if (mail->Replyto().isEmpty()) {
        composer.setTo( mail->getFrom());
    } else {
        composer.setTo( mail->Replyto());
    }
    composer.setSubject( prefix + mail->getSubject());
    composer.setMessage( rtext );
    composer.setInReplyTo( mail->Msgid());
    composer.setCharset( body->getCharset() );
    if ( QDialog::Accepted == KApplication::execDialog( &composer ) )
    {
        mail->Wrapper()->answeredMail(mail);
    }
    delete settings;
 }
+void OpieMail::closeViewMail(ViewMail * vm)
+{
+    vm->hide();
+}
+void OpieMail::deleteAndDisplayNextMail(ViewMail * vm)
+{
+    QListViewItem*item = mailView->currentItem();
+    if (!item ) {
+        closeViewMail(vm);
+        return;
+    }
+    RecMailP mail = ((MailListViewItem*)item)->data();
+    mail->Wrapper()->deleteMail( mail );
+    item = item->itemBelow();
+    if (!item ) {
+        closeViewMail(vm);
+        return;
+    }
+    mailView->setCurrentItem(item);
+    mail = ((MailListViewItem*)item)->data();
+    RecBodyP body = folderView->fetchBody(mail);
+    vm->setBody( body );
+    vm->setMail( mail );
+}
 void OpieMail::displayNextMail(ViewMail * vm)
 {
    QListViewItem*item = mailView->currentItem();
    if (!item) return;
+    ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() );
    item = item->itemBelow();
    if (!item) {
        vm->setCaption(i18n("End of List" ));
        return;
    }
    mailView->setCurrentItem(item);
    RecMailP mail = ((MailListViewItem*)item)->data();
    RecBodyP body = folderView->fetchBody(mail);
    vm->setBody( body );
    vm->setMail( mail );
 }
 void OpieMail::displayMail()
 {
    QListViewItem*item = mailView->currentItem();
    if (!item) return;
    RecMailP mail = ((MailListViewItem*)item)->data();
    RecBodyP body = folderView->fetchBody(mail);
    ViewMail readMail( this,"", Qt::WType_Modal   );
    readMail.setBody( body );
    readMail.setMail( mail );
 #ifndef DESKTOP_VERSION
    readMail.showMaximized();
 #else
    readMail.resize( 640, 480);
 #endif
    connect(  &readMail,SIGNAL( showNextMail(ViewMail *)  ), this, SLOT( displayNextMail(ViewMail *) ) );
+    connect(  &readMail,SIGNAL( deleteAndDisplayNextMail(ViewMail *) ), this, SLOT(deleteAndDisplayNextMail(ViewMail *) ) );
    readMail.exec();
    if (  readMail.deleted )
    {
        folderView->refreshCurrent();
    }
    else
    {
        ( (MailListViewItem*)item )->setPixmap( 0, QPixmap() );
    }
 }
 void OpieMail::slotGetAllMail()
 {
    QListViewItem * item = folderView->firstChild();
    while ( item ){
        ((AccountViewItem *)item)->contextMenuSelected( 101 );
        item = item->nextSibling ();
    }
 }
 void OpieMail::slotGetMail()
 {
    QListViewItem * item = folderView->currentItem();
    if ( ! item ) return;
    ((AccountViewItem *)item)->contextMenuSelected( 101 );
 }
 void OpieMail::slotDeleteMail()
 {
    if (!mailView->currentItem()) return;
    RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data();
    if ( QMessageBox::warning(this, i18n("Delete Mail"), QString( i18n("<p>Do you really want to delete this mail? <br><br>" ) + mail->getFrom() + " - " + mail->getSubject() ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
    {
        mail->Wrapper()->deleteMail( mail );
        folderView->refreshCurrent();
    }
 }
 void OpieMail::slotDeleteAllMail()
 {
    QValueList<RecMailP> t;
    if ( QMessageBox::warning(this, i18n("Delete All Mails"), i18n("Do you really want to delete\nall selected mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
        {
            MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
            while ( item ) {
                if ( item->isSelected() ) {
                    t.append( item->data() );
                }
                item = (MailListViewItem*)item->nextSibling();
            }
        }
    else
        return;
    if ( t.count() == 0 )
        return;
    RecMailP mail = t.first();
    mail->Wrapper()->deleteMailList(t);
    folderView->refreshCurrent();
 }
 void OpieMail::clearSelection()
 {
    mailView->clearSelection();
  
 }
 void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
 {
    if (!mailView->currentItem()) return;
    MAILLIB::ATYPE mailtype = ((MailListViewItem*)mailView->currentItem() )->wrapperType();
    /* just the RIGHT button - or hold on pda */
    if (button!=2) {return;}
    if (!item) return;
    QPopupMenu *m = new QPopupMenu(0);
    if (m)
    {
        if (mailtype==MAILLIB::A_NNTP) {
            m->insertItem(i18n("Read this posting"),this,SLOT(displayMail()));
            m->insertItem(i18n("Copy this posting"),this,SLOT(slotMoveCopyMail()));
            m->insertSeparator();
            m->insertItem(i18n("Copy all selected postings"),this,SLOT(slotMoveCopyAllMail()));
            m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection()));
        } else {
            if (folderView->currentisDraft()) {
                m->insertItem(i18n("Edit this mail"),this,SLOT(reEditMail()));
            }
            m->insertItem(i18n("Reply to this mail"),this,SLOT(replyMail()));
            m->insertSeparator();
            m->insertItem(i18n("Read this mail"),this,SLOT(displayMail()));
            m->insertItem(i18n("Move/Copy this mail"),this,SLOT(slotMoveCopyMail()));
            m->insertItem(i18n("Delete this mail"),this,SLOT(slotDeleteMail()));
            m->insertSeparator();
            m->insertItem(i18n("Move/Copy all selected mail"),this,SLOT(slotMoveCopyAllMail()));
            m->insertItem(i18n("Delete all selected mails"),this,SLOT(slotDeleteAllMail()));
            m->insertItem(i18n("Clear selection"),this,SLOT(clearSelection()));
        }
        m->setFocus();
        m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
        delete m;
    }
 }
 void OpieMail::slotShowFolders( bool show )
 {
    if ( show && folderView->isHidden() )
    {
        folderView->show();
    }
    else if ( !show && !folderView->isHidden() )
    {
        folderView->hide();
    }
 }
 void OpieMail::refreshMailView(const QValueList<RecMailP>&list)
 {
    MailListViewItem*item = 0;
    mailView->clear();
    QValueList<RecMailP>::ConstIterator it;
    for (it = list.begin(); it != list.end();++it)
    {
        item = new MailListViewItem(mailView,item);
        item->storeData((*it));
        item->showEntry();
    }
    mailView->setSorting ( 4, false );
 }
 void OpieMail::mailLeftClicked( QListViewItem *item )
 {
    mailView->clearSelection();
    /* just LEFT button - or tap with stylus on pda */
    //if (button!=1) return;
    if (!item) return;
    if (folderView->currentisDraft()) {
        reEditMail();
    } else {
        displayMail();
    }
 }
 void OpieMail::slotMoveCopyMail()
 {
    if (!mailView->currentItem()) return;
    RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data();
    AbstractMail*targetMail = 0;
    QString targetFolder = "";
    Selectstore sels;
    folderView->setupFolderselect(&sels);
    if (!sels.exec()) return;
    targetMail = sels.currentMail();
    targetFolder = sels.currentFolder();
    if ( (mail->Wrapper()==targetMail && mail->getMbox()==targetFolder) ||
            targetFolder.isEmpty())
    {
        return;
    }
    if (sels.newFolder() && !targetMail->createMbox(targetFolder))
    {
        QMessageBox::critical(0,i18n("Error creating new Folder"),
                              i18n("<center>Error while creating<br>new folder - breaking.</center>"));
        return;
    }
    sels.hide();
    qApp->processEvents();
    // qDebug("hiding sels ");
    mail->Wrapper()->mvcpMail(mail,targetFolder,targetMail,sels.moveMails());
    folderView->refreshCurrent();
 }
 void OpieMail::slotMoveCopyAllMail()
 {
    if (!mailView->currentItem()) return;
    QValueList<RecMailP> t;
    // if ( QMessageBox::warning(this, i18n("Move/Copy all selected mails"), i18n("Do you really want to copy/move\nall selected mails?" )  , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
    {
        MailListViewItem* item = (MailListViewItem*)mailView->firstChild ();
        while ( item ) {
            if ( item->isSelected() ) {
                t.append( item->data() );
            }
            item = (MailListViewItem*)item->nextSibling();
        }
    }
    // else
    //  return;
    if ( t.count() == 0 )
        return;
    RecMailP mail = t.first();
    AbstractMail*targetMail = 0;
    QString targetFolder = "";
    Selectstore sels;
    folderView->setupFolderselect(&sels);
    if (!sels.exec()) return;
    targetMail = sels.currentMail();
    targetFolder = sels.currentFolder();
    if ( (mail->Wrapper()==targetMail && mail->getMbox()==targetFolder) ||
            targetFolder.isEmpty())
    {
        return;
    }
    if (sels.newFolder() && !targetMail->createMbox(targetFolder))
    {
        QMessageBox::critical(0,i18n("Error creating new Folder"),
                              i18n("<center>Error while creating<br>new folder - breaking.</center>"));
        return;
    }
    sels.hide();
    qApp->processEvents();
    //qDebug("hiding sels ");
    mail->Wrapper()->mvcpMailList(t,targetFolder,targetMail,sels.moveMails());
    folderView->refreshCurrent();
 }
 void OpieMail::reEditMail()
 {
    if (!mailView->currentItem()) return;
    ComposeMail compose( settings, this, 0, true );
    compose.reEditMail(((MailListViewItem*)mailView->currentItem() )->data());
    compose.slotAdjustColumns();
 #ifndef DESKTOP_VERSION
    compose.showMaximized();
 #else
    compose.resize(640,480);
 #endif
    compose.exec();
 }
diff --git a/kmicromail/opiemail.h b/kmicromail/opiemail.h
index 30968a7..a81a34c 100644
--- a/kmicromail/opiemail.h
+++ b/kmicromail/opiemail.h
@@ -1,58 +1,60 @@
 // CHANGED 2004-09-31 Lutz Rogowski
 #ifndef OPIEMAIL_H
 #define OPIEMAIL_H
 #include "mainwindow.h"
 #include <libmailwrapper/settings.h>
 #include <opie2/osmartpointer.h>
 #include <libmailwrapper/mailtypes.h>
 #include <viewmail.h>
 class OpieMail : public MainWindow
 {
    Q_OBJECT
 public:
    OpieMail( QWidget *parent = 0, const char *name = 0 );
    virtual ~OpieMail();
    static QString appName() { return QString::fromLatin1("kopiemail"); }
 public slots:
    virtual void slotwriteMail(const QString&name,const QString&email);
    virtual void slotwriteMail2(const QString&nameemail);
    virtual void slotComposeMail();
    virtual void slotExtAppHandler();
    virtual void appMessage(const QCString &msg, const QByteArray &data);
    virtual void message(const QCString &msg, const QByteArray &data);
 protected slots:
+    virtual void deleteAndDisplayNextMail(ViewMail * vm);
    virtual void displayNextMail(ViewMail * vm);
    virtual void slotSendQueued();
    virtual void slotSearchMails();
    virtual void slotEditSettings();
    virtual void slotEditAccounts();
    virtual void displayMail();
    virtual void replyMail();
    virtual void slotDeleteMail();
    virtual void slotGetMail();
    virtual void slotGetAllMail();
    virtual void slotDeleteAllMail();
    virtual void mailHold(int, QListViewItem *,const QPoint&,int);
    virtual void slotShowFolders( bool show );
    virtual void refreshMailView(const QValueList<RecMailP>&);
    virtual void mailLeftClicked(  QListViewItem * );
    virtual void slotMoveCopyMail();
    virtual void slotMoveCopyAllMail();
    virtual void reEditMail();
    void clearSelection();
 private:
+    void closeViewMail(ViewMail * vm);
    QString mPendingEmail;
    QString mPendingName;
    QByteArray mPendingData;
    QCString mPendingMessage;
    Settings *settings;
 };
 #endif
diff --git a/kmicromail/viewmail.cpp b/kmicromail/viewmail.cpp
index 60c764c..6d88cad 100644
--- a/kmicromail/viewmail.cpp
+++ b/kmicromail/viewmail.cpp
@@ -1,533 +1,534 @@
 // CHANGED 2004-08-06 Lutz Rogowski
 #include <kfiledialog.h>
 #include "koprefs.h"
 #include <klocale.h>
 #include <kglobal.h>
 #include <kapplication.h>
 #ifdef  MINIKDE_KDIALOG_H
 #undef MINIKDE_KDIALOG_H
 #endif
 #include "composemail.h"
 #include "viewmail.h"
 #include <libmailwrapper/settings.h>
 #include <libmailwrapper/abstractmail.h>
 #include <libmailwrapper/mailtypes.h>
 #include <qdialog.h>
 #include <qpe/qpeapplication.h>
 /* QT */
 #include <qtextbrowser.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include <qfile.h>
 #include <qlayout.h>
 //using namespace Opie::Ui;
 //using namespace Opie::Core;
 AttachItem::AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
                       const QString&fsize,int num,const QValueList<int>&path)
        : QListViewItem(parent,after),_partNum(num)
 {
    _path=path;
    setText(0, mime);
    setText(1, desc);
    setText(2, file);
    setText(3, fsize);
 }
 AttachItem::AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
                       const QString&fsize,int num,const QValueList<int>&path)
        : QListViewItem(parent,after),_partNum(num)
 {
    _path=path;
    setText(0, mime);
    setText(1, desc);
    setText(2, file);
    setText(3, fsize);
 }
 bool AttachItem::isParentof(const QValueList<int>&path)
 {
    /* if not set, then no parent */
    if (path.count()==0||_path.count()==0) return false;
    /* the parent must have one digit less then a child */
    if (path.count()!=_path.count()+1) return false;
    for (unsigned int i=0; i < _path.count();++i)
    {
        if (_path[i]!=path[i]) return false;
    }
    return true;
 }
 AttachItem* ViewMail::searchParent(const QValueList<int>&path)
 {
    QListViewItemIterator it( attachments );
    for ( ; it.current(); ++it )
    {
        AttachItem*ati = (AttachItem*)it.current();
        if (ati->isParentof(path)) return ati;
    }
    return 0;
 }
 AttachItem* ViewMail::lastChild(AttachItem*parent)
 {
    if (!parent) return 0;
    AttachItem* item = (AttachItem*)parent->firstChild();
    if (!item) return item;
    AttachItem*temp=0;
    while( (temp=(AttachItem*)item->nextSibling()))
    {
        item = temp;
    }
    return item;
 }
 void ViewMail::setBody(const RecBodyP&body )
 {
    m_body = body;
    m_mail[2] = body->Bodytext();
    // qDebug("********text %s ",m_mail[2].latin1() );
    attachbutton->setEnabled(body->Parts().count()>0);
    attachments->setEnabled(body->Parts().count()>0);
    if (body->Parts().count()==0)
    {
        return;
    }
    AttachItem * curItem=0;
    AttachItem * parentItem = 0;
    QString type=body->Description()->Type()+"/"+body->Description()->Subtype();
    QString desc,fsize;
    double s = body->Description()->Size();
    int w;
    w=0;
    while (s>1024)
    {
        s/=1024;
        ++w;
        if (w>=2) break;
    }
    QString q="";
    switch(w)
    {
    case 1:
        q="k";
        break;
    case 2:
        q="M";
        break;
    default:
        break;
    }
    {
        /* I did not found a method to make a CONTENT reset on a QTextStream
           so I use this construct that the stream will re-constructed in each
           loop. To let it work, the textstream is packed into a own area of
           code is it will be destructed after finishing its small job.
        */
        QTextOStream o(&fsize);
        if (w>0) o.precision(2); else o.precision(0);
        o.setf(QTextStream::fixed);
        o << s << " " << q << "Byte";
    }
    curItem=new AttachItem(attachments,curItem,type,"Mailbody","",fsize,-1,body->Description()->Positionlist());
    QString filename = "";
    for (unsigned int i = 0; i < body->Parts().count();++i)
    {
        filename = "";
        type = body->Parts()[i]->Type()+"/"+body->Parts()[i]->Subtype();
        part_plist_t::ConstIterator it = body->Parts()[i]->Parameters().begin();
        for (;it!=body->Parts()[i]->Parameters().end();++it)
        {
            if (it.key().lower()=="name")
            {
                filename=it.data();
            }
        }
        s = body->Parts()[i]->Size();
        w = 0;
        while (s>1024)
        {
            s/=1024;
            ++w;
            if (w>=2) break;
        }
        switch(w)
        {
        case 1:
            q="k";
            break;
        case 2:
            q="M";
            break;
        default:
            q="";
            break;
        }
        QTextOStream o(&fsize);
        if (w>0) o.precision(2); else o.precision(0);
        o.setf(QTextStream::fixed);
        o << s << " " << q << "Byte";
        desc = body->Parts()[i]->Description();
        parentItem = searchParent(body->Parts()[i]->Positionlist());
        if (parentItem)
        {
            AttachItem*temp = lastChild(parentItem);
            if (temp) curItem = temp;
            curItem=new AttachItem(parentItem,curItem,type,desc,filename,fsize,i,body->Parts()[i]->Positionlist());
            attachments->setRootIsDecorated(true);
            curItem = parentItem;
        }
        else
        {
            curItem=new AttachItem(attachments,curItem,type,desc,filename,fsize,i,body->Parts()[i]->Positionlist());
        }
    }
 }
 void ViewMail::slotShowHtml( bool state )
 {
    m_showHtml = state;
    setText();
 }
 void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int )
 {
    if (!item )
        return;
    if (  ( ( AttachItem* )item )->Partnumber() == -1 )
    {
        setText();
        return;
    }
    QPopupMenu *menu = new QPopupMenu();
    int ret=0;
    if ( item->text( 0 ).left( 5 ) == "text/" || item->text(0)=="message/rfc822" )
    {
        menu->insertItem( i18n( "Show Text" ), 1 );
    }
    if (item->text(0).left(6)=="image/") {
        menu->insertItem(i18n("Display image preview"),2);
    }
    menu->insertItem( i18n( "Save Attachment" ),  0 );
    menu->insertSeparator(1);
    ret = menu->exec( point, 0 );
    switch(ret)
    {
    case 0:
        {
            //MimeTypes types;
            //types.insert( "all", "*" );
            QString str = KFileDialog::getSaveFileName( "/", item->text( 2 ), this );
            if( !str.isEmpty() )
            {
                encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
                if (content)
                {
                    QFile output(str);
                    output.open(IO_WriteOnly);
                    output.writeBlock(content->Content(),content->Length());
                    output.close();
                    delete content;
                }
            }
        }
        break ;
    case 2: 
        {
 #ifdef DESKTOP_VERSION
            QString tmpfile = locateLocal( "tmp", "opiemail-image");
 #else
            QString tmpfile = "/tmp/opiemail-image";
 #endif
            encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
            if (content) {
                QFile output(tmpfile);
                output.open(IO_WriteOnly);
                output.writeBlock(content->Content(),content->Length());
                output.close();
                delete content;
                MailImageDlg iview("");
                iview.setName(tmpfile);
                KApplication::execDialog(&iview);
                output.remove();
            }
        }
        break;
    case 1:
        if (  ( ( AttachItem* )item )->Partnumber() == -1 )
        {
            setText();
        }
        else
        {
            if (  m_recMail->Wrapper() != 0l )
            { // make sure that there is a wrapper , even after delete or simular actions
                browser->setText( m_recMail->Wrapper()->fetchTextPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] ) );
            }
        }
        break;
    }
    delete menu;
 }
 void ViewMail::setMail(const RecMailP&mail )
 {
    m_recMail = mail;
    m_mail[0] = mail->getFrom();
    m_mail[1] = mail->getSubject();
    m_mail[3] = mail->getDate();
    m_mail[4] = mail->Msgid();
    m_mail2[0] = mail->To();
    m_mail2[1] = mail->CC();
    m_mail2[2] = mail->Bcc();
    setText();
 }
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
        : ViewMailBase(parent, name, fl), _inLoop(false)
 {
    m_gotBody = false;
    deleted = false;
    connect( reply, SIGNAL(activated()), SLOT(slotReply()));
    connect( forward, SIGNAL(activated()), SLOT(slotForward()));
    connect( deleteMail, SIGNAL( activated() ),  SLOT( slotDeleteMail() ) );
    connect( showHtml, SIGNAL( toggled(bool) ), SLOT( slotShowHtml(bool) ) ); 
    connect( closeMail, SIGNAL( activated() ), SLOT( close() ) ); 
    connect( nextMail, SIGNAL( activated() ), SLOT( slotNextMail() ) );
    attachments->setEnabled(m_gotBody);
    connect( attachments,  SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) );
    readConfig();
    attachments->setSorting(-1);
 }
 void ViewMail::readConfig()
 {
 
    setFont ( KOPrefs::instance()->mReadFont );
    m_showHtml =  KOPrefs::instance()->mViewAsHtml;
    showHtml->setOn( m_showHtml );
 }
 void ViewMail::setText()
 {
    QString toString;
    QString ccString;
    QString bccString;
   
    toString = m_mail2[0].join(",");
    ccString  = m_mail2[1].join(",");
    bccString = m_mail2[2].join(",");
  
    setCaption( i18n("E-Mail by %1").arg( m_mail[0] ) );
    m_mailHtml = "<html><body>"
                 "<table width=\"100%\" border=\"0\"><tr bgcolor=\"#FFDD76\"><td>"
                 "<div align=left><b>" + deHtml( m_mail[1] ) + "</b></div>"
                 "</td></tr><tr bgcolor=\"#EEEEE6\"><td>"
                 "<b>" + i18n( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
                 "<b>" + i18n(  "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
                 i18n( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
                 "<b>" + i18n( "Date" ) + ": </b> " +  m_mail[3] +
                 "</td></tr></table><font>";
    if ( !m_showHtml )
    {
        browser->setText( QString( m_mailHtml) + deHtml( m_mail[2] ) + "</font></html>" );
    }
    else
    {
        browser->setText( QString( m_mailHtml) + m_mail[2] + "</font></html>" );
    }
    // remove later in favor of a real handling
    m_gotBody = true;
 }
 ViewMail::~ViewMail()
 {
    m_recMail->Wrapper()->cleanMimeCache();
    hide();
 }
 void ViewMail::hide()
 {
    QWidget::hide();
    if (_inLoop)
    {
        _inLoop = false;
        qApp->exit_loop();
    }
 }
 void ViewMail::exec()
 {
    show();
    if (!_inLoop)
    {
        _inLoop = true;
        qApp->enter_loop();
    }
 }
 QString ViewMail::deHtml(const QString &string)
 {
    QString string_ = string;
    string_.replace(QRegExp("&"), "&amp;");
    string_.replace(QRegExp("<"), "&lt;");
    string_.replace(QRegExp(">"), "&gt;");
    string_.replace(QRegExp("\\n"), "<br>");
    return string_;
 }
 void ViewMail::slotReply()
 {
    if (!m_gotBody)
    {
        QMessageBox::information(this, i18n("Error"), i18n("<p>The mail body is not yet downloaded, so you cannot reply yet."), i18n("Ok"));
        return;
    }
    QString rtext;
    rtext += QString("* %1 wrote on %2:\n")        // no i18n on purpose
             .arg(  m_mail[0] )
             .arg( m_mail[3] );
    QString text = m_mail[2];
    QStringList lines = QStringList::split(QRegExp("\\n"), text);
    QStringList::Iterator it;
    for (it = lines.begin(); it != lines.end(); it++)
    {
        rtext += "> " + *it + "\n";
    }
    rtext += "\n";
    QString prefix;
    if ( m_mail[1].find(QRegExp("^Re: .*$")) != -1) prefix = "";
    else prefix = "Re: ";                // no i18n on purpose
    Settings *settings = new Settings();
    ComposeMail composer( settings ,this, 0, true);
    if (m_recMail->Replyto().isEmpty()) {
        composer.setTo(m_recMail->getFrom());
    } else {
        composer.setTo(m_recMail->Replyto());
    }
    composer.setSubject( prefix + m_mail[1] );
    composer.setMessage( rtext );
    composer.setInReplyTo(m_recMail->Msgid());
    composer.setCharset( m_body->getCharset()  );
    if ( QDialog::Accepted == KApplication::execDialog( &composer ) )
    {
        m_recMail->Wrapper()->answeredMail(m_recMail);
    }
    delete settings;
 }
  
 void ViewMail::slotForward()
 {
    if (!m_gotBody)
    {
        QMessageBox::information(this, i18n("Error"), i18n("<p>The mail body is not yet downloaded, so you cannot forward yet."), i18n("Ok"));
        return;
    }
    QString ftext;
    ftext += QString("\n----- Forwarded message from %1 -----\n\n")
             .arg( m_mail[0] );
    if (!m_mail[3].isNull())
        ftext += QString("Date: %1\n")
                 .arg( m_mail[3] );
    if (!m_mail[0].isNull())
        ftext += QString("From: %1\n")
                 .arg( m_mail[0] );
    if (!m_mail[1].isNull())
        ftext += QString("Subject: %1\n")
                 .arg( m_mail[1] );
    ftext += QString("\n%1\n")
             .arg( m_mail[2]);
    ftext += QString("----- End forwarded message -----\n");
    Settings *settings = new Settings();
    ComposeMail composer( settings ,this, 0, true);
    composer.setSubject( "Fwd: " + m_mail[1] );
    composer.setMessage( ftext );
    if ( QDialog::Accepted == KApplication::execDialog( &composer ))
    {
    }
 }
 void ViewMail::slotDeleteMail( )
 {
    if ( QMessageBox::warning(this, i18n("Delete Mail"), QString( i18n("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes )
    {
-        m_recMail->Wrapper()->deleteMail( m_recMail );
+        emit deleteAndDisplayNextMail( this);
-        hide();
+        //m_recMail->Wrapper()->deleteMail( m_recMail );
+        //hide();
        deleted = true;
    }
 }
 MailImageDlg::MailImageDlg(const QString&fname,QWidget *parent, const char *name, bool modal, WFlags f)
    : QDialog(parent,name,modal)
 {
    QVBoxLayout*dlglayout = new QVBoxLayout(this);
    dlglayout->setSpacing(2);
    dlglayout->setMargin(1);
    //m_imageview = new Opie::MM::OImageScrollView(this);
    //dlglayout->addWidget(m_imageview);
 }
 MailImageDlg::~MailImageDlg()
 {
 }
 void MailImageDlg::setName(const QString&fname)
 {
    qDebug("viewmail.cpp: MailImageDlg::setName Pending");
    // m_imageview->setImage(fname);
 }
diff --git a/kmicromail/viewmail.h b/kmicromail/viewmail.h
index c2c2ce3..d85b8b2 100644
--- a/kmicromail/viewmail.h
+++ b/kmicromail/viewmail.h
@@ -1,88 +1,89 @@
 #ifndef VIEWMAIL_H
 #define VIEWMAIL_H
 #include "viewmailbase.h"
 #include <libmailwrapper/mailtypes.h>
 #include <qdialog.h>
 #include <qlistview.h>
 #include <qmap.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
 //namespace Opie { namespace MM { class OImageScrollView; } }
 class AttachItem : public QListViewItem
 {
 public:
    AttachItem(QListView * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
        const QString&fsize,int num,const QValueList<int>&path);
    AttachItem(QListViewItem * parent,QListViewItem *after, const QString&mime,const QString&desc,const QString&file,
        const QString&fsize,int num,const QValueList<int>&path);
    int Partnumber() { return _partNum; }
    bool isParentof(const QValueList<int>&path);
 private:
    int _partNum;
    /* needed for a better display of attachments */
    QValueList<int> _path;
 };
 class ViewMail : public ViewMailBase
 {
    Q_OBJECT
 public:
    ViewMail(  QWidget *parent = 0, const char *name = 0, WFlags fl = 0);
    ~ViewMail();
    void hide();
    void exec();
    void setMail(const RecMailP&mail );
    void setBody(const RecBodyP&body);
    bool deleted;
 signals:
    void showNextMail(ViewMail*);
+    void deleteAndDisplayNextMail(ViewMail *);
 protected:
    QString deHtml(const QString &string);
    AttachItem* searchParent(const QValueList<int>&path);
    AttachItem* lastChild(AttachItem*parent);
 protected slots:
    void slotNextMail() { emit  showNextMail(this); };
    void slotReply();
    void slotForward();
    void setText();
    void slotItemClicked( QListViewItem * item , const QPoint & point, int c );
    void slotDeleteMail( );
    void slotShowHtml( bool );
 private:
    void readConfig();
    bool _inLoop;
    QString m_mailHtml;
    bool m_gotBody;
    RecBodyP m_body;
    RecMailP m_recMail;
    bool m_showHtml;
    // 0 from  1 subject  2 bodytext 3 date
    QMap <int,QString>  m_mail;
    // 0 to 1 cc 2 bcc
    QMap <int,QStringList> m_mail2;
 };
 class MailImageDlg:public QDialog
 {
    Q_OBJECT
 public:
    MailImageDlg(const QString&,QWidget *parent = 0, const char *name = 0, bool modal = true, WFlags f = 0);
    ~MailImageDlg();
    void setName(const QString&);
 protected:
    //Opie::MM::OImageScrollView*m_imageview;
 };
 #endif