beauty

hopefull some speedups
obsolete stuff removed
fixed a crasher

10 files changed, 44 insertions, 159 deletions

diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index 0fe8475..c747a8b 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -30,65 +30,64 @@ AccountView::AccountView( QWidget *parent, const char *name, WFlags flags )
 AccountView::~AccountView()
 {
     imapAccounts.clear();
     mhAccounts.clear();
 }
 
 void AccountView::slotContextMenu(int id)
 {
     AccountViewItem *view = static_cast<AccountViewItem *>(currentItem());
     if (!view) return;
     view->contextMenuSelected(id);
 }
 
 void AccountView::slotHold(int button, QListViewItem * item,const QPoint&,int)
 {
     if (button==1) {return;}
     if (!item) return;
     AccountViewItem *view = static_cast<AccountViewItem *>(item);
     QPopupMenu*m = view->getContextMenu();
     if (!m) return;
     connect(m,SIGNAL(activated(int)),this,SLOT(slotContextMenu(int)));
     m->setFocus();
     m->exec( QPoint( QCursor::pos().x(), QCursor::pos().y()) );
     delete m;
 }
 
 void AccountView::populate( QList<Account> list )
 {
     clear();
 
     imapAccounts.clear();
     mhAccounts.clear();
-
     mhAccounts.append(new MHviewItem(AbstractMail::defaultLocalfolder(),this));
 
     Account *it;
     for ( it = list.first(); it; it = list.next() ) {
         if ( it->getType() == MAILLIB::A_IMAP ) {
             IMAPaccount *imap = static_cast<IMAPaccount *>(it);
             odebug << "added IMAP " + imap->getAccountName() << oendl;
             imapAccounts.append(new IMAPviewItem( imap, this ));
         } else if ( it->getType() == MAILLIB::A_POP3 ) {
             POP3account *pop3 = static_cast<POP3account *>(it);
             odebug << "added POP3 " + pop3->getAccountName() << oendl;
             /* must not be hold 'cause it isn't required */
             (void) new POP3viewItem( pop3, this );
         } else if ( it->getType() == MAILLIB::A_NNTP ) {
             NNTPaccount *nntp = static_cast<NNTPaccount *>(it);
             odebug << "added NNTP " + nntp->getAccountName() << oendl;
             /* must not be hold 'cause it isn't required */
             (void) new NNTPviewItem( nntp, this );
         } else if ( it->getType() == MAILLIB::A_MH ) {
         }
     }
 }
 
 void AccountView::refresh(QListViewItem *item)
 {
 
     odebug << "AccountView refresh..." << oendl;
     if ( item )
     {
         m_currentItem = item;
         QValueList<RecMailP> headerlist;
         AccountViewItem *view = static_cast<AccountViewItem *>(item);
diff --git a/noncore/net/mail/mail.pro b/noncore/net/mail/mail.pro
index e394bbf..a1de8b5 100644
--- a/noncore/net/mail/mail.pro
+++ b/noncore/net/mail/mail.pro
@@ -1,72 +1,69 @@
 CONFIG        += qt warn_on  quick-app
 
 HEADERS         = defines.h \
                editaccounts.h \
                composemail.h \
                accountview.h \
                accountitem.h \
                mainwindow.h \
                viewmail.h \
                viewmailbase.h \
                opiemail.h \
                mailistviewitem.h \
                settingsdialog.h \
-               statuswidget.h \
                newmaildir.h \
                selectstore.h \
                selectsmtp.h \
                nntpgroups.h \
                nntpgroupsdlg.h
 
 SOURCES         = main.cpp \
                opiemail.cpp \
                mainwindow.cpp \
                accountview.cpp \
                accountitem.cpp \
                composemail.cpp \
                addresspicker.cpp \
                editaccounts.cpp \
                viewmail.cpp \
                viewmailbase.cpp \
                mailistviewitem.cpp \
                settingsdialog.cpp \
-               statuswidget.cpp \
                newmaildir.cpp \
                selectstore.cpp \
                selectsmtp.cpp \
                nntpgroups.cpp \
                nntpgroupsdlg.cpp
 
 INTERFACES     = editaccountsui.ui \
                selectmailtypeui.ui \
                imapconfigui.ui \
                pop3configui.ui \
                nntpconfigui.ui \
                smtpconfigui.ui \
                addresspickerui.ui \
                composemailui.ui \
                settingsdialogui.ui \
-               statuswidgetui.ui \
                newmaildirui.ui \
                selectstoreui.ui \
                nntpgroupsui.ui
 
 
 INCLUDEPATH += $(OPIEDIR)/include /usr/local/include
 
 CONFTEST = $$system( echo $CONFIG_TARGET_MACOSX )
 contains( CONFTEST, y ){
     LIBS        += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -liconv -lopiemm2
 }else{
     LIBS        += -lqpe -lopieui2 -lopiecore2 -lopiepim2 -lmailwrapper -lopiemm2
 }
 
 TARGET       = opiemail
 
 include( $(OPIEDIR)/include.pro )
 !isEmpty( LIBETPAN_INC_DIR ) {
     INCLUDEPATH = $$LIBETPAN_INC_DIR $$INCLUDEPATH
 }
 !isEmpty( LIBETPAN_LIB_DIR ) {
     LIBS = -Wl,-rpath-link,$$LIBETPAN_LIB_DIR $$LIBS
 }
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 93d80d9..0a45445 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -52,124 +52,122 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
     */
 
     showFolders = new QAction( tr( "Show/Hide folders" ), ICON_SHOWFOLDERS,
                                0, 0, this, 0, true );
     showFolders->addTo( toolBar );
     showFolders->addTo( mailMenu );
     showFolders->setOn( true );
     connect(showFolders, SIGNAL( toggled(bool) ),
             SLOT( slotShowFolders(bool) ) );
 
     /*
       searchMails = new QAction( tr( "Search mails" ), QIconSet( Resource::loadPixmap("find") ),
                                0, 0, this );
     searchMails->addTo( toolBar );
     searchMails->addTo( mailMenu );
     */
 
     deleteMails = new QAction(tr("Delete Mail"), QIconSet( Resource::loadPixmap("trash")), 0, 0, this);
     deleteMails->addTo( toolBar );
     deleteMails->addTo( mailMenu );
     connect( deleteMails, SIGNAL( activated() ),
              SLOT( slotDeleteMail() ) );
 
     editSettings = new QAction( tr( "Edit settings" ), QIconSet( Resource::loadPixmap("SettingsIcon") ) ,
                                 0, 0, this );
     editSettings->addTo( settingsMenu );
     connect( editSettings, SIGNAL( activated() ),
              SLOT( slotEditSettings() ) );
     editAccounts = new QAction( tr( "Configure accounts" ), QIconSet( Resource::loadPixmap("mail/editaccounts") ) ,
                                 0, 0, this );
     editAccounts->addTo( settingsMenu );
 
-    //setCentralWidget( view );
 
-    QVBox* wrapperBox = new QVBox( this );
-    setCentralWidget( wrapperBox );
-
-    QWidget *view = new QWidget( wrapperBox );
+    QWidget *view = new QWidget( this );
+    setCentralWidget( view );
     layout = new QBoxLayout ( view, QBoxLayout::LeftToRight );
 
     folderView = new AccountView( view );
     folderView->header()->hide();
     folderView->setRootIsDecorated( true );
     folderView->addColumn( tr( "Mailbox" ) );
 
     layout->addWidget( folderView );
 
     mailView = new QListView( view );
     mailView->addColumn( "" );
     mailView->addColumn( tr( "Subject" ),QListView::Manual );
     mailView->addColumn( tr( "Sender" ),QListView::Manual );
     mailView->addColumn( tr( "Size" ),QListView::Manual);
     mailView->addColumn( tr( "Date" ));
     mailView->setAllColumnsShowFocus(true);
     mailView->setShowSortIndicator(true);
     mailView->setSorting(4,false);
 
-    statusWidget = new StatusWidget( wrapperBox );
-    statusWidget->hide();
-
     layout->addWidget( mailView );
     layout->setStretchFactor( folderView, 1 );
     layout->setStretchFactor( mailView, 2 );
 
     m_Rotate = (QApplication::desktop()->width() > QApplication::desktop()->height()?0:90);
 
     slotAdjustLayout();
 
     QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold);
     QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold);
 
     connect( mailView, SIGNAL( mouseButtonClicked(int,QListViewItem*,const QPoint&,int) ),this,
              SLOT( mailLeftClicked(int,QListViewItem*,const QPoint&,int) ) );
     connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this,
              SLOT( mailHold(int,QListViewItem*,const QPoint&,int) ) );
+
     connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)),
             this,SLOT(refreshMailView(const QValueList<RecMailP>&)));
+
     connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) );
     connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) );
+
 //    connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) );
     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&) ) );
     m_sysChannel = new QCopChannel( "QPE/System", this );
     connect( m_sysChannel, SIGNAL( received(const QCString&,const QByteArray&) ),
         this, SLOT( systemMessage(const QCString&,const QByteArray&) ) );
 #endif
 
-    QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) );
+    QTimer::singleShot( 10, this, SLOT( slotAdjustColumns() ) );
 }
 
 MainWindow::~MainWindow()
 {
 }
 
 void MainWindow::systemMessage( const QCString& msg, const QByteArray& data )
 {
     int _newrotation;
     QDataStream stream( data, IO_ReadOnly );
     if ( msg == "setCurrentRotation(int)" )
     {
         stream >> _newrotation;
         if (m_Rotate != _newrotation) {
             slotAdjustLayout();
             m_Rotate = _newrotation;
         }
     }
 }
 
 void MainWindow::appMessage(const QCString &, const QByteArray &)
 {
     odebug << "appMessage not reached" << oendl;
 }
 
 void MainWindow::slotAdjustLayout() {
 
     QWidget *d = QApplication::desktop();
     if ( d->width() < d->height() ) {
         layout->setDirection( QBoxLayout::TopToBottom );
     } else {
         layout->setDirection( QBoxLayout::LeftToRight );
diff --git a/noncore/net/mail/mainwindow.h b/noncore/net/mail/mainwindow.h
index 8cec888..ad71a54 100644
--- a/noncore/net/mail/mainwindow.h
+++ b/noncore/net/mail/mainwindow.h
@@ -1,60 +1,58 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qmainwindow.h>
 #include <qlistview.h>
 #include <qaction.h>
 
 #include <qtoolbar.h>
 #include <qmenubar.h>
 
 #include "accountview.h"
-#include "statuswidget.h"
 
 #include <libmailwrapper/mailtypes.h>
 #include <opie2/osmartpointer.h>
 
 class RecMail;
 class QCopChannel;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
 public:
     MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 );
     virtual ~MainWindow();
 
 public slots:
     virtual void slotAdjustColumns();
     virtual void appMessage(const QCString &msg, const QByteArray &data);
     virtual void slotComposeMail();
     virtual void systemMessage( const QCString&, const QByteArray& );
 
 protected slots:
     virtual void slotSendQueued();
     virtual void slotEditAccounts();
     virtual void slotShowFolders( bool show );
     virtual void refreshMailView(const QValueList<RecMailP>&);
     virtual void displayMail();
     virtual void slotDeleteMail();
     virtual void mailHold(int, QListViewItem *,const QPoint&,int);
     virtual void slotAdjustLayout();
     virtual void slotEditSettings();
     virtual void mailLeftClicked( int, QListViewItem *,const QPoint&,int  );
 
 protected:
     QToolBar *toolBar;
-    StatusWidget *statusWidget;
     QMenuBar *menuBar;
     QPopupMenu *mailMenu, *settingsMenu;
     QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails,
             *editSettings, *editAccounts, *syncFolders;
     AccountView *folderView;
     QListView *mailView;
     QBoxLayout *layout;
     int m_Rotate;
     QCopChannel* m_sysChannel;
 };
 
 #endif
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 2bbc8f1..9eba23e 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -78,72 +78,65 @@ void ValueExplode::splitit()
     m_LastParsed.clear();
     if (mDelemiter.isEmpty()||m2Delemiter.isEmpty()) {
         m_LastParsed.append(tkeyvalues(m_Command,""));
         return;
     }
     int pos,pos2,startpos;
     startpos = 0;
     iLine = m_Command;
     while ( (pos = iLine.find(mDelemiter,startpos))!=-1) {
         pos2 = iLine.find(m2Delemiter,startpos);
         if (pos2==-1||pos2>pos) {
             m_LastParsed.append(tkeyvalues(iLine.mid(startpos,pos-startpos),""));
         } else {
             m_LastParsed.append(tkeyvalues(iLine.mid(startpos,pos2-startpos),iLine.mid(pos2+1,pos-pos2-1)));
         }
         startpos = pos+1;
     }
     if (startpos<iLine.length()) {
         pos2 = iLine.find(m2Delemiter,startpos);
         if (pos2==-1) {
             m_LastParsed.append(tkeyvalues(iLine.mid(startpos),""));
         } else {
             m_LastParsed.append(tkeyvalues(iLine.mid(startpos,pos2-startpos),iLine.mid(pos2+1)));
         }
     }
 }
 
 OpieMail::OpieMail( QWidget *parent, const char *name, WFlags  )
         : MainWindow( parent, name, WStyle_ContextHelp )
 {
     setup_signalblocking();
     settings = new Settings();
-
     folderView->populate( settings->getAccounts() );
-#if 0
-    tvaluelist s = ValueExplode("a=1&b=holladiewaldfee&c=3&d=&e=3450");
-    for (int i = 0; i < s.count();++i) {
-        odebug<<"Key: " << s[i].key << " Value: " << s[i].data << oendl;
-    }
-#endif
 }
 
 OpieMail::~OpieMail()
 {
     if (settings) delete settings;
 }
 
 void OpieMail::setup_signalblocking()
 {
     /* for networking we must block SIGPIPE and Co. */
     struct sigaction blocking_action,temp_action;
     blocking_action.sa_handler = SIG_IGN;
     sigemptyset(&(blocking_action.sa_mask));
     blocking_action.sa_flags = 0;
     sigaction(SIGPIPE,&blocking_action,&temp_action);
 }
 
 void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 {
     // copied from old mail2
     if (msg == "writeMail(QString,QString)")
     {
         QDataStream stream(data,IO_ReadOnly);
         QString name, email;
         stream >> name >> email;
         // removing the whitespaces at beginning and end is needed!
         slotwriteMail(name.stripWhiteSpace(),email.stripWhiteSpace());
     }
     else if (msg == "newMail()")
     {
         slotComposeMail();
     }
@@ -219,68 +212,69 @@ void OpieMail::slotSendQueued()
         if ( QPEApplication::execDialog( &selsmtp ) == QDialog::Accepted )
         {
             smtp = selsmtp.selected_smtp();
         }
     }
     if (smtp)
     {
         SMTPwrapper * wrap = new SMTPwrapper(smtp);
         if ( wrap->flushOutbox() )
         {
             QMessageBox::information(0,tr("Info"),tr("Mail queue flushed"));
         }
         delete wrap;
     }
 }
 
 void OpieMail::slotSearchMails()
 {
     odebug << "Search Mails" << oendl;
 }
 
 void OpieMail::slotEditSettings()
 {
     SettingsDialog settingsDialog( this,  0, true,  WStyle_ContextHelp );
     QPEApplication::execDialog( &settingsDialog );
 }
 
 void OpieMail::slotEditAccounts()
 {
     odebug << "Edit Accounts" << oendl;
     EditAccounts eaDialog( settings, this, 0, true,  WStyle_ContextHelp );
     eaDialog.slotAdjustColumns();
-    QPEApplication::execDialog( &eaDialog );
+    if (QPEApplication::execDialog( &eaDialog )==QDialog::Rejected);// return;
+
     if ( settings ) delete settings;
     settings = new Settings();
-
+    mailView->clear();
     folderView->populate( settings->getAccounts() );
 }
 
 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 | WStyle_ContextHelp  );
     readMail.setBody( body );
     readMail.setMail( mail );
     readMail.showMaximized();
     readMail.exec();
 
     if (  readMail.deleted )
     {
         folderView->refreshCurrent();
     }
     else
     {
         ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "" ) );
     }
 }
 
 void OpieMail::slotDeleteMail()
 {
     if (!mailView->currentItem()) return;
     RecMailP mail = ((MailListViewItem*)mailView->currentItem() )->data();
     if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<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 );
diff --git a/noncore/net/mail/statuswidget.cpp b/noncore/net/mail/statuswidget.cpp
deleted file mode 100644
index 19cf635..0000000
--- a/noncore/net/mail/statuswidget.cpp
+++ b/dev/null
@@ -1,33 +0,0 @@
-#include <qtimer.h>
-#include <qprogressbar.h>
-#include <qlabel.h>
-
-#include "statuswidget.h"
-
-// the current problem I see is "locking": used exclusive by one sender
-
-
-StatusWidget::StatusWidget( QWidget* parent, const char* name,WFlags fl )
-    : StatusWidgetUI( parent, name, fl ) {
-
-        setMaximumHeight( 15 );
-        // hide for now since nothing reports decent progress data yet.
-        statusProgress->hide();
-    }
-
-StatusWidget::~StatusWidget() {
-}
-
-void StatusWidget::setText( const QString& text ) {
-    show();
-    statusText->setText(  text );
-    QTimer::singleShot( 5000, this, SLOT( hide() ) );
-}
-
-void StatusWidget::setProgress( int progress ) {
-    show();
-    statusProgress->setProgress( progress );
-    if ( progress == 100 ) {
-        hide();
-    }
-}
diff --git a/noncore/net/mail/statuswidget.h b/noncore/net/mail/statuswidget.h
deleted file mode 100644
index 73f0d75..0000000
--- a/noncore/net/mail/statuswidget.h
+++ b/dev/null
@@ -1,24 +0,0 @@
-#ifndef STATUS_WIDGET_H
-#define STATUS_WIDGET_H
-
-#include <qwidget.h>
-#include "statuswidgetui.h"
-
-class StatusWidget : public StatusWidgetUI {
-
-Q_OBJECT
-
-public:
-    StatusWidget( QWidget* parent = 0, const char* name = 0,WFlags fl = 0 );
-    ~StatusWidget();
-    
-
-public slots:
-
-    void setText( const QString& text );
-    void setProgress( int progress );
-};
-
-
-#endif
-
diff --git a/noncore/net/mail/statuswidgetui.ui b/noncore/net/mail/statuswidgetui.ui
deleted file mode 100644
index ffe3528..0000000
--- a/noncore/net/mail/statuswidgetui.ui
+++ b/dev/null
@@ -1,71 +0,0 @@
-<!DOCTYPE UI><UI>
-<class>StatusWidgetUI</class>
-<widget>
-    <class>QWidget</class>
-    <property stdset="1">
-        <name>name</name>
-        <cstring>StatusWidgetUI</cstring>
-    </property>
-    <property stdset="1">
-        <name>geometry</name>
-        <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>596</width>
-            <height>480</height>
-        </rect>
-    </property>
-    <property stdset="1">
-        <name>caption</name>
-        <string>Form1</string>
-    </property>
-    <property>
-        <name>layoutMargin</name>
-    </property>
-    <property>
-        <name>layoutSpacing</name>
-    </property>
-    <hbox>
-        <property stdset="1">
-            <name>margin</name>
-            <number>3</number>
-        </property>
-        <property stdset="1">
-            <name>spacing</name>
-            <number>3</number>
-        </property>
-        <widget>
-            <class>QProgressBar</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>statusProgress</cstring>
-            </property>
-            <property stdset="1">
-                <name>sizePolicy</name>
-                <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>0</vsizetype>
-                </sizepolicy>
-            </property>
-        </widget>
-        <widget>
-            <class>QLabel</class>
-            <property stdset="1">
-                <name>name</name>
-                <cstring>statusText</cstring>
-            </property>
-            <property stdset="1">
-                <name>sizePolicy</name>
-                <sizepolicy>
-                    <hsizetype>5</hsizetype>
-                    <vsizetype>1</vsizetype>
-                </sizepolicy>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>TextLabel1</string>
-            </property>
-        </widget>
-    </hbox>
-</widget>
-</UI>
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index a64a168..5206220 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -167,240 +167,265 @@ void ViewMail::setBody(const RecBodyP&body )
         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();
+    setMainText();
 }
 
 void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int )
 {
     if (!item )
         return;
 
     if (  ( ( AttachItem* )item )->Partnumber() == -1 )
     {
-        setText();
+        setMainText();
         return;
     }
     QPopupMenu *menu = new QPopupMenu();
     int ret=0;
 
     if ( item->text( 0 ).left( 5 ) == "text/" || item->text(0)=="message/rfc822" )
     {
         menu->insertItem( tr( "Show Text" ), 1 );
     }
     if (item->text(0).left(6)=="image/") {
         menu->insertItem(tr("Display image preview"),2);
     }
     menu->insertItem( tr( "Save Attachment" ),  0 );
     menu->insertSeparator(1);
 
     ret = menu->exec( point, 0 );
 
     switch(ret)
     {
     case 0:
         {
             MimeTypes types;
             types.insert( "all", "*" );
             QString str = OFileDialog::getSaveFileName( 1,
                           "/", item->text( 2 )  , types, 0 );
 
             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:
         {
+            if (m_lastimagepart== (( AttachItem* )item )->Partnumber()) {
+                if (m_lastdlg) {
+                    setUpdatesEnabled(false);
+                    browser->hide();
+                    m_lastdlg->show();
+                    setUpdatesEnabled(true);
+                    return;
+                }
+            }
             QString tmpfile = QString("/tmp/opiemail-image-%1").arg(_icounter++);
             encodedString*content = m_recMail->Wrapper()->fetchDecodedPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] );
             if (content && content->Length()) {
                 QFile output(tmpfile);
                 output.open(IO_WriteOnly);
                 output.writeBlock(content->Content(),content->Length());
                 output.close();
                 delete content;
                 if (!m_PicsInline) {
                     MailImageDlg iview("");
                     iview.setName(tmpfile);
                     QPEApplication::execDialog(&iview);
                 } else {
                     if (!m_lastdlg) {
                         m_lastdlg=new Opie::MM::OImageScrollView("",browser->parentWidget(),false);
                         m_lastdlg->setAutoScale(true);
                     }
                     //m_lastdlg->setImage("");
                     m_lastdlg->setImage(tmpfile);
                     browser->hide();
                     m_lastdlg->show();
                 }
                 output.remove();
             } else {
                 QMessageBox::critical(this, tr("Reading attachment"), tr("Could not read content of attachment"));
             }
+            m_lastimagepart=(( AttachItem* )item )->Partnumber();
         }
         break;
     case 1:
         if (  ( ( AttachItem* )item )->Partnumber() == -1 )
         {
-            setText();
+            setMainText();
         }
         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() ] ) );
+                if (m_lastdlg) {
+                    m_lastdlg->hide();
+                    browser->show();
+                }
+                if (m_lasttextpart == ( ( AttachItem* )item )->Partnumber() ) return;
+                m_lasttextpart = ( ( AttachItem* )item )->Partnumber();
+                QString s = m_recMail->Wrapper()->fetchTextPart( m_recMail, m_body->Parts()[ ( ( AttachItem* )item )->Partnumber() ] );;
+                if (item->text(0).right(4)!="html") {
+                    s = QString("<html><body>\n<font face=fixed>%1</font></body></html>").arg(QStyleSheet::convertFromPlainText(s));
+                }
+                browser->setText(s);
             }
         }
         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->getStringDate();
     m_mail[4] = mail->Msgid();
 
     m_mail2[0] = mail->To();
     m_mail2[1] = mail->CC();
     m_mail2[2] = mail->Bcc();
 
     setCaption(tr("E-Mail by %1").arg( m_mail[0] ) );
-    setText();
+    setMainText();
 }
 
 
 
 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( showPicsInline, SIGNAL( toggled(bool) ), SLOT( slotImageInline(bool) ) );
 
     attachments->setEnabled(m_gotBody);
     connect( attachments,  SIGNAL( clicked(QListViewItem*,const QPoint&, int) ), SLOT( slotItemClicked(QListViewItem*,const QPoint&, int) ) );
     m_lastdlg = 0;
     _icounter = 0;
+    m_lastimagepart = -1;
+    m_lasttextpart = -2;
 
     readConfig();
     attachments->setSorting(-1);
 }
 
 void ViewMail::slotImageInline(bool how)
 {
     Config cfg( "mail" );
     cfg.writeEntry( "showPicsInline", how);
     m_PicsInline = how;
     if (m_lastdlg&&!how) {
         browser->show();
         m_lastdlg->hide();
         m_lastdlg->reparent(0,QPoint(0,0),false);
         delete m_lastdlg;
         m_lastdlg = 0;
+        m_lastimagepart = -1;
     }
 }
 
 void ViewMail::readConfig()
 {
     Config cfg( "mail" );
     cfg.setGroup( "Settings" );
     m_showHtml =  cfg.readBoolEntry( "showHtml", false );
     m_PicsInline = cfg.readBoolEntry( "showPicsInline", true );
     showPicsInline->setOn(m_PicsInline);
     showHtml->setOn( m_showHtml );
 }
 
-void ViewMail::setText()
+void ViewMail::setMainText()
 {
     QString toString;
     QString ccString;
     QString bccString;
     QString mailHtml;
 
     if (m_lastdlg) {
         m_lastdlg->hide();
     }
     browser->show();
+    if (m_lasttextpart == -1) return;
+    m_lasttextpart = -1;
     for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it )
     {
         toString += (*it);
     }
     for ( QStringList::Iterator it = ( m_mail2[1] ).begin(); it != ( m_mail2[1] ).end(); ++it )
     {
         ccString += (*it);
     }
     for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it )
     {
         bccString += (*it);
     }
     browser->setTextFormat(Qt::RichText);
     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>" + tr( "From" ) + ": </b><font color=#6C86C0>" + deHtml( m_mail[0] ) + "</font><br>"
                  "<b>" + tr(  "To" ) + ": </b><font color=#6C86C0>" + deHtml( toString ) + "</font><br><b>" +
                  tr( "Cc" ) + ": </b>" + deHtml( ccString ) + "<br>"
                  "<b>" + tr( "Date" ) + ": </b> " +  m_mail[3] +
                  "</td></tr></table>";
     if ( !m_showHtml ) {
         browser->setText( mailHtml+"<font face=fixed>" + QStyleSheet::convertFromPlainText(m_mail[2]) + "</font></body></html>" );
     } else {
         browser->setText(mailHtml+m_mail[2].simplifyWhiteSpace()+"</html>");
     }
     // remove later in favor of a real handling
     m_gotBody = true;
 }
 
 
diff --git a/noncore/net/mail/viewmail.h b/noncore/net/mail/viewmail.h
index f5033f0..18b1796 100644
--- a/noncore/net/mail/viewmail.h
+++ b/noncore/net/mail/viewmail.h
@@ -26,68 +26,70 @@ public:
     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;
 
 protected:
     QString deHtml(const QString &string);
     AttachItem* searchParent(const QValueList<int>&path);
     AttachItem* lastChild(AttachItem*parent);
 
     Opie::MM::OImageScrollView*m_lastdlg;
 
 protected slots:
     void slotReply();
     void slotForward();
-    void setText();
+    void setMainText();
     void slotItemClicked( QListViewItem * item , const QPoint & point, int c );
     void slotDeleteMail( );
     void slotShowHtml( bool );
     void slotImageInline(bool);
 
 private:
     void readConfig();
 
     bool _inLoop;
     QString m_mailHtml;
     bool m_gotBody;
     RecBodyP m_body;
     RecMailP m_recMail;
     bool m_showHtml:1;
     bool m_PicsInline:1;
     unsigned int _icounter;
+    int m_lastimagepart;
+    int m_lasttextpart;
 
     // 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 Opie::Ui::ODialog
 {
     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