improve support for BigScreen

6 files changed, 763 insertions, 523 deletions

diff --git a/noncore/net/mail/accountitem.cpp b/noncore/net/mail/accountitem.cpp
index 2d3cd4b..c8f6ec4 100644
--- a/noncore/net/mail/accountitem.cpp
+++ b/noncore/net/mail/accountitem.cpp
@@ -1,28 +1,37 @@
+
 #include "accountitem.h"
 #include "accountview.h"
-#include <qpopupmenu.h>
-#include <qmessagebox.h>
 #include "selectstore.h"
 #include "newmaildir.h"
+#include "defines.h"
+
+/* OPIE */
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/abstractmail.h>
 #include <libmailwrapper/mailwrapper.h>
-#include "defines.h"
+#include <qpe/qpeapplication.h>
+
+/* QT */
+#include <qpopupmenu.h>
+#include <qmessagebox.h>
 
 #define SETPIX(x) if (!account->getOffline()) {setPixmap( 0,x);} else {setPixmap( 0, PIXMAP_OFFLINE );}
 /**
  * POP3 Account stuff
  */
 POP3viewItem::POP3viewItem( POP3account *a, AccountView *parent )
-    : AccountViewItem( parent )
+        : AccountViewItem( parent )
 {
     account = a;
     wrapper = AbstractMail::getWrapper( account );
     SETPIX(PIXMAP_POP3FOLDER);
 #if 0
-    if (!account->getOffline()) {
+    if (!account->getOffline())
+    {
         setPixmap( 0,  );
-    } else {
+    }
+    else
+    {
         setPixmap( 0, PIXMAP_OFFLINE );
     }
 #endif
@@ -50,14 +59,16 @@ void POP3viewItem::refresh()
     if (account->getOffline()) return;
     QList<Folder> *folders = wrapper->listFolders();
     QListViewItem *child = firstChild();
-    while ( child ) {
+    while ( child )
+    {
         QListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
     }
     Folder *it;
     QListViewItem*item = 0;
-    for ( it = folders->first(); it; it = folders->next() ) {
+    for ( it = folders->first(); it; it = folders->next() )
+    {
         item = new POP3folderItem( it, this , item );
         item->setSelectable(it->may_select());
     }
@@ -75,11 +86,15 @@ RecBody POP3viewItem::fetchBody( const RecMail &mail )
 QPopupMenu * POP3viewItem::getContextMenu()
 {
     QPopupMenu *m = new QPopupMenu(0);
-    if (m) {
-        if (!account->getOffline()) {
+    if (m)
+    {
+        if (!account->getOffline())
+        {
             m->insertItem(QObject::tr("Disconnect",contextName),0);
             m->insertItem(QObject::tr("Set offline",contextName),1);
-        } else {
+        }
+        else
+        {
             m->insertItem(QObject::tr("Set online",contextName),1);
         }
     }
@@ -89,7 +104,8 @@ QPopupMenu * POP3viewItem::getContextMenu()
 void POP3viewItem::disconnect()
 {
     QListViewItem *child = firstChild();
-    while ( child ) {
+    while ( child )
+    {
         QListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
@@ -99,7 +115,8 @@ void POP3viewItem::disconnect()
 
 void POP3viewItem::setOnOffline()
 {
-    if (!account->getOffline()) {
+    if (!account->getOffline())
+    {
         disconnect();
     }
     account->setOffline(!account->getOffline());
@@ -110,7 +127,8 @@ void POP3viewItem::setOnOffline()
 
 void POP3viewItem::contextMenuSelected(int which)
 {
-    switch (which) {
+    switch (which)
+    {
     case 0:
         disconnect();
         break;
@@ -121,17 +139,19 @@ void POP3viewItem::contextMenuSelected(int which)
 }
 
 POP3folderItem::~POP3folderItem()
-{
-}
+{}
 
 POP3folderItem::POP3folderItem( Folder *folderInit, POP3viewItem *parent , QListViewItem*after  )
-    : AccountViewItem( parent,after )
+        : AccountViewItem( parent,after )
 {
     folder = folderInit;
     pop3 = parent;
-    if (folder->getDisplayName().lower()!="inbox") {
+    if (folder->getDisplayName().lower()!="inbox")
+    {
         setPixmap( 0, PIXMAP_POP3FOLDER );
-    } else {
+    }
+    else
+    {
         setPixmap( 0, PIXMAP_INBOXFOLDER);
     }
     setText( 0, folder->getDisplayName() );
@@ -151,7 +171,8 @@ RecBody POP3folderItem::fetchBody(const RecMail&aMail)
 QPopupMenu * POP3folderItem::getContextMenu()
 {
     QPopupMenu *m = new QPopupMenu(0);
-    if (m) {
+    if (m)
+    {
         m->insertItem(QObject::tr("Refresh header list",contextName),0);
         m->insertItem(QObject::tr("Delete all mails",contextName),1);
         m->insertItem(QObject::tr("Move/Copie all mails",contextName),2);
@@ -169,7 +190,8 @@ void POP3folderItem::downloadMails()
 void POP3folderItem::contextMenuSelected(int which)
 {
     AccountView * view = (AccountView*)listView();
-    switch (which) {
+    switch (which)
+    {
     case 0:
         /* must be 'cause pop3 lists are cached */
         pop3->getWrapper()->logout();
@@ -190,7 +212,7 @@ void POP3folderItem::contextMenuSelected(int which)
  * IMAP Account stuff
  */
 IMAPviewItem::IMAPviewItem( IMAPaccount *a, AccountView *parent )
-    : AccountViewItem( parent )
+        : AccountViewItem( parent )
 {
     account = a;
     wrapper = AbstractMail::getWrapper( account );
@@ -222,7 +244,7 @@ const QStringList&IMAPviewItem::subFolders()
 void IMAPviewItem::refreshFolders(bool force)
 {
     if (childCount()>0 && force==false) return;
-    if (account->getOffline()) return;   
+    if (account->getOffline()) return;
 
     removeChilds();
     currentFolders.clear();
@@ -236,29 +258,36 @@ void IMAPviewItem::refreshFolders(bool force)
     // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     folders->setAutoDelete(false);
 
-    for ( it = folders->first(); it; it = folders->next() ) {
-        if (it->getDisplayName().lower()=="inbox") {
+    for ( it = folders->first(); it; it = folders->next() )
+    {
+        if (it->getDisplayName().lower()=="inbox")
+        {
             item = new IMAPfolderItem( it, this , item );
             folders->remove(it);
             qDebug("inbox found");
             break;
         }
     }
-    for ( it = folders->first(); it; it = folders->next() ) {
+    for ( it = folders->first(); it; it = folders->next() )
+    {
         fname = it->getDisplayName();
         currentFolders.append(it->getName());
         pos = fname.findRev(it->Separator());
-        if (pos != -1) {
+        if (pos != -1)
+        {
             fname = fname.left(pos);
         }
         IMAPfolderItem*pitem = (IMAPfolderItem*)findSubItem(fname);
-        if (pitem) {
+        if (pitem)
+        {
             titem = item;
             item = new IMAPfolderItem(it,pitem,pitem->firstChild(),this);
             /* setup the short name */
             item->setText(0,it->getDisplayName().right(it->getDisplayName().length()-pos-1));
             item = titem;
-        } else {
+        }
+        else
+        {
             item = new IMAPfolderItem( it, this , item );
         }
     }
@@ -268,14 +297,18 @@ void IMAPviewItem::refreshFolders(bool force)
 QPopupMenu * IMAPviewItem::getContextMenu()
 {
     QPopupMenu *m = new QPopupMenu(0);
-    if (m) {
-        if (!account->getOffline()) {
+    if (m)
+    {
+        if (!account->getOffline())
+        {
             m->insertItem(QObject::tr("Refresh folder list",contextName),0);
             m->insertItem(QObject::tr("Create new folder",contextName),1);
             m->insertSeparator();
             m->insertItem(QObject::tr("Disconnect",contextName),2);
             m->insertItem(QObject::tr("Set offline",contextName),3);
-        } else {
+        }
+        else
+        {
             m->insertItem(QObject::tr("Set online",contextName),3);
         }
     }
@@ -285,16 +318,18 @@ QPopupMenu * IMAPviewItem::getContextMenu()
 void IMAPviewItem::createNewFolder()
 {
     Newmdirdlg ndirdlg;
-    ndirdlg.showMaximized();
-    if (ndirdlg.exec()) {
+    if ( QPEApplication::execDialog( &ndirdlg ))
+    {
         QString ndir = ndirdlg.Newdir();
         bool makesubs = ndirdlg.subpossible();
         QString delemiter = "/";
         IMAPfolderItem*item = (IMAPfolderItem*)firstChild();
-        if (item) {
+        if (item)
+        {
             delemiter = item->Delemiter();
         }
-        if (wrapper->createMbox(ndir,0,delemiter,makesubs)) {
+        if (wrapper->createMbox(ndir,0,delemiter,makesubs))
+        {
             refreshFolders(true);
         }
     }
@@ -303,7 +338,8 @@ void IMAPviewItem::createNewFolder()
 void IMAPviewItem::contextMenuSelected(int id)
 {
     qDebug("Id selected: %i",id);
-    switch (id) {
+    switch (id)
+    {
     case 0:
         refreshFolders(true);
         break;
@@ -315,7 +351,8 @@ void IMAPviewItem::contextMenuSelected(int id)
         wrapper->logout();
         break;
     case 3:
-        if (account->getOffline()==false) {
+        if (account->getOffline()==false)
+        {
             removeChilds();
             wrapper->logout();
         }
@@ -323,7 +360,7 @@ void IMAPviewItem::contextMenuSelected(int id)
         account->save();
         SETPIX(PIXMAP_IMAPFOLDER);
         refreshFolders(false);
-    break;
+        break;
     default:
         break;
     }
@@ -340,34 +377,39 @@ bool IMAPviewItem::offline()
 }
 
 IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPviewItem *parent , QListViewItem*after )
-    : AccountViewItem( parent , after )
+        : AccountViewItem( parent , after )
 {
     folder = folderInit;
     imap = parent;
-    if (folder->getDisplayName().lower()!="inbox") {
+    if (folder->getDisplayName().lower()!="inbox")
+    {
         setPixmap( 0, PIXMAP_IMAPFOLDER );
-    } else {
+    }
+    else
+    {
         setPixmap( 0, PIXMAP_INBOXFOLDER);
     }
     setText( 0, folder->getDisplayName() );
 }
 
 IMAPfolderItem::IMAPfolderItem( Folder *folderInit, IMAPfolderItem *parent , QListViewItem*after, IMAPviewItem *master  )
-    : AccountViewItem( parent,after )
+        : AccountViewItem( parent,after )
 {
     folder = folderInit;
     imap = master;
-    if (folder->getDisplayName().lower()!="inbox") {
+    if (folder->getDisplayName().lower()!="inbox")
+    {
         setPixmap( 0, PIXMAP_IMAPFOLDER );
-    } else {
+    }
+    else
+    {
         setPixmap( 0, PIXMAP_INBOXFOLDER);
     }
     setText( 0, folder->getDisplayName() );
 }
 
 IMAPfolderItem::~IMAPfolderItem()
-{
-}
+{}
 
 const QString& IMAPfolderItem::Delemiter()const
 {
@@ -376,9 +418,12 @@ const QString& IMAPfolderItem::Delemiter()const
 
 void IMAPfolderItem::refresh(QList<RecMail>&target)
 {
-    if (folder->may_select()) {
+    if (folder->may_select())
+    {
         imap->getWrapper()->listMessages( folder->getName(),target );
-    } else {
+    }
+    else
+    {
         target.clear();
     }
 }
@@ -391,16 +436,20 @@ RecBody IMAPfolderItem::fetchBody(const RecMail&aMail)
 QPopupMenu * IMAPfolderItem::getContextMenu()
 {
     QPopupMenu *m = new QPopupMenu(0);
-    if (m) {
-        if (folder->may_select()) {
+    if (m)
+    {
+        if (folder->may_select())
+        {
             m->insertItem(QObject::tr("Refresh header list",contextName),0);
             m->insertItem(QObject::tr("Move/Copie all mails",contextName),4);
             m->insertItem(QObject::tr("Delete all mails",contextName),1);
         }
-        if (folder->no_inferior()==false) {
+        if (folder->no_inferior()==false)
+        {
             m->insertItem(QObject::tr("Create new subfolder",contextName),2);
         }
-        if (folder->getDisplayName().lower()!="inbox") {
+        if (folder->getDisplayName().lower()!="inbox")
+        {
             m->insertItem(QObject::tr("Delete folder",contextName),3);
         }
     }
@@ -410,12 +459,13 @@ QPopupMenu * IMAPfolderItem::getContextMenu()
 void IMAPfolderItem::createNewFolder()
 {
     Newmdirdlg ndirdlg;
-    ndirdlg.showMaximized();
-    if (ndirdlg.exec()) {
+    if ( QPEApplication::execDialog( &ndirdlg ) )
+    {
         QString ndir = ndirdlg.Newdir();
         bool makesubs = ndirdlg.subpossible();
         QString delemiter = Delemiter();
-        if (imap->wrapper->createMbox(ndir,folder,delemiter,makesubs)) {
+        if (imap->wrapper->createMbox(ndir,folder,delemiter,makesubs))
+        {
             imap->refreshFolders(true);
         }
     }
@@ -424,18 +474,21 @@ void IMAPfolderItem::createNewFolder()
 void IMAPfolderItem::deleteFolder()
 {
     int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName),
-        QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
-        QObject::tr("Yes",contextName),
-        QObject::tr("No",contextName),QString::null,1,1);
+                                     QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
+                                     QObject::tr("Yes",contextName),
+                                     QObject::tr("No",contextName),QString::null,1,1);
     qDebug("Auswahl: %i",yesno);
-    if (yesno == 0) {
-        if (imap->getWrapper()->deleteMbox(folder)) {
+    if (yesno == 0)
+    {
+        if (imap->getWrapper()->deleteMbox(folder))
+        {
             QListView*v=listView();
             IMAPviewItem * box = imap;
             /* be carefull - after that this object is destroyd so don't use
              * any member of it after that call!!*/
             imap->refreshFolders(true);
-            if (v) {
+            if (v)
+            {
                 v->setSelected(box,true);
             }
         }
@@ -453,7 +506,8 @@ void IMAPfolderItem::contextMenuSelected(int id)
 {
     qDebug("Selected id: %i",id);
     AccountView * view = (AccountView*)listView();
-    switch(id) {
+    switch(id)
+    {
     case 0:
         view->refreshCurrent();
         break;
@@ -480,7 +534,7 @@ void IMAPfolderItem::contextMenuSelected(int id)
 /* MH is a little bit different - the top folder can contains messages other than in IMAP and
    POP3 and MBOX */
 MHviewItem::MHviewItem( const QString&aPath, AccountView *parent )
-    : AccountViewItem( parent )
+        : AccountViewItem( parent )
 {
     m_Path = aPath;
     /* be carefull - the space within settext is wanted - thats why the string twice */
@@ -518,25 +572,33 @@ void MHviewItem::refresh(bool force)
     MHfolderItem*pmaster = 0;
     QString fname = "";
     int pos;
-    for ( it = folders->first(); it; it = folders->next() ) {
+    for ( it = folders->first(); it; it = folders->next() )
+    {
         fname = it->getDisplayName();
         /* this folder itself */
-        if (fname=="/") {
+        if (fname=="/")
+        {
             currentFolders.append(fname);
             folder = it;
             continue;
         }
         currentFolders.append(fname);
         pos = fname.findRev("/");
-        if (pos > 0) {
+        if (pos > 0)
+        {
             fname = fname.left(pos);
             pmaster = (MHfolderItem*)findSubItem(fname);
-        } else {
+        }
+        else
+        {
             pmaster = 0;
         }
-        if (pmaster) {
+        if (pmaster)
+        {
             item = new MHfolderItem( it, pmaster, item, this );
-        } else {
+        }
+        else
+        {
             item = new MHfolderItem( it, this , item );
         }
         item->setSelectable(it->may_select());
@@ -555,7 +617,8 @@ RecBody MHviewItem::fetchBody( const RecMail &mail )
 QPopupMenu * MHviewItem::getContextMenu()
 {
     QPopupMenu *m = new QPopupMenu(0);
-    if (m) {
+    if (m)
+    {
         m->insertItem(QObject::tr("Refresh folder list",contextName),0);
         m->insertItem(QObject::tr("Create new folder",contextName),1);
         m->insertItem(QObject::tr("Delete all mails",contextName),2);
@@ -567,10 +630,11 @@ QPopupMenu * MHviewItem::getContextMenu()
 void MHviewItem::createFolder()
 {
     Newmdirdlg ndirdlg(0,0,true);
-    ndirdlg.showMaximized();
-    if (ndirdlg.exec()) {
+    if ( QPEApplication::execDialog( &ndirdlg ) )
+    {
         QString ndir = ndirdlg.Newdir();
-        if (wrapper->createMbox(ndir)) {
+        if (wrapper->createMbox(ndir))
+        {
             refresh(true);
         }
     }
@@ -590,7 +654,8 @@ QStringList MHviewItem::subFolders()
 
 void MHviewItem::contextMenuSelected(int which)
 {
-    switch (which) {
+    switch (which)
+    {
     case 0:
         refresh(true);
         break;
@@ -609,11 +674,10 @@ void MHviewItem::contextMenuSelected(int which)
 }
 
 MHfolderItem::~MHfolderItem()
-{
-}
+{}
 
 MHfolderItem::MHfolderItem( Folder *folderInit, MHviewItem *parent , QListViewItem*after  )
-    : AccountViewItem( parent,after )
+        : AccountViewItem( parent,after )
 {
     folder = folderInit;
     mbox = parent;
@@ -621,7 +685,7 @@ MHfolderItem::MHfolderItem( Folder *folderInit, MHviewItem *parent , QListViewIt
 }
 
 MHfolderItem::MHfolderItem( Folder *folderInit, MHfolderItem *parent, QListViewItem*after, MHviewItem*master)
-    : AccountViewItem( parent,after )
+        : AccountViewItem( parent,after )
 {
     folder = folderInit;
     mbox = master;
@@ -631,20 +695,27 @@ MHfolderItem::MHfolderItem( Folder *folderInit, MHfolderItem *parent, QListViewI
 void MHfolderItem::initName()
 {
     QString bName = folder->getDisplayName();
-    if (bName.startsWith("/")&&bName.length()>1) {
+    if (bName.startsWith("/")&&bName.length()>1)
+    {
         bName.replace(0,1,"");
     }
     int pos = bName.findRev("/");
-    if (pos > 0) {
+    if (pos > 0)
+    {
         bName.replace(0,pos+1,"");
     }
-    if (bName.lower() == "outgoing") {
+    if (bName.lower() == "outgoing")
+    {
         setPixmap( 0, PIXMAP_OUTBOXFOLDER );
-    } else if (bName.lower() == "inbox") {
+    }
+    else if (bName.lower() == "inbox")
+    {
         setPixmap( 0, PIXMAP_INBOXFOLDER);
-    } else {
+    }
+    else
+    {
         setPixmap( 0, PIXMAP_MBOXFOLDER );
-	}
+    }
     setText( 0, bName );
 }
 
@@ -667,18 +738,21 @@ RecBody MHfolderItem::fetchBody(const RecMail&aMail)
 void MHfolderItem::deleteFolder()
 {
     int yesno = QMessageBox::warning(0,QObject::tr("Delete folder",contextName),
-        QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
-        QObject::tr("Yes",contextName),
-        QObject::tr("No",contextName),QString::null,1,1);
+                                     QObject::tr("<center>Realy delete folder <br><b>%1</b><br>and all if it content?</center>",contextName).arg(folder->getDisplayName()),
+                                     QObject::tr("Yes",contextName),
+                                     QObject::tr("No",contextName),QString::null,1,1);
     qDebug("Auswahl: %i",yesno);
-    if (yesno == 0) {
-        if (mbox->getWrapper()->deleteMbox(folder)) {
+    if (yesno == 0)
+    {
+        if (mbox->getWrapper()->deleteMbox(folder))
+        {
             QListView*v=listView();
             MHviewItem * box = mbox;
             /* be carefull - after that this object is destroyd so don't use
              * any member of it after that call!!*/
             mbox->refresh(true);
-            if (v) {
+            if (v)
+            {
                 v->setSelected(box,true);
             }
         }
@@ -688,7 +762,8 @@ void MHfolderItem::deleteFolder()
 QPopupMenu * MHfolderItem::getContextMenu()
 {
     QPopupMenu *m = new QPopupMenu(0);
-    if (m) {
+    if (m)
+    {
         m->insertItem(QObject::tr("Move/Copie all mails",contextName),2);
         m->insertItem(QObject::tr("Delete all mails",contextName),0);
         m->insertItem(QObject::tr("Create new subfolder",contextName),3);
@@ -707,16 +782,18 @@ void MHfolderItem::downloadMails()
 void MHfolderItem::createFolder()
 {
     Newmdirdlg ndirdlg(0,0,true);
-    ndirdlg.showMaximized();
-    if (ndirdlg.exec()) {
+    if ( QPEApplication::execDialog( &ndirdlg ) )
+    {
         QString ndir = ndirdlg.Newdir();
-        if (mbox->getWrapper()->createMbox(ndir,folder)) {
+        if (mbox->getWrapper()->createMbox(ndir,folder))
+        {
             QListView*v=listView();
             MHviewItem * box = mbox;
             /* be carefull - after that this object is destroyd so don't use
              * any member of it after that call!!*/
             mbox->refresh(true);
-            if (v) {
+            if (v)
+            {
                 v->setSelected(box,true);
             }
         }
@@ -725,7 +802,8 @@ void MHfolderItem::createFolder()
 
 void MHfolderItem::contextMenuSelected(int which)
 {
-    switch(which) {
+    switch(which)
+    {
     case 0:
         deleteAllMail(mbox->getWrapper(),folder);
         break;
@@ -749,21 +827,21 @@ void MHfolderItem::contextMenuSelected(int which)
 
 const QString AccountViewItem::contextName="AccountViewItem";
 
-AccountViewItem::AccountViewItem( AccountView *parent ) 
-    : QListViewItem( parent )
+AccountViewItem::AccountViewItem( AccountView *parent )
+        : QListViewItem( parent )
 {
     init();
     m_Backlink = parent;
 }
 
 AccountViewItem::AccountViewItem( QListViewItem *parent)
-    : QListViewItem( parent) 
+        : QListViewItem( parent)
 {
     init();
 }
 
 AccountViewItem::AccountViewItem( QListViewItem *parent , QListViewItem*after  )
-    :QListViewItem( parent,after )
+        :QListViewItem( parent,after )
 {
     init();
 }
@@ -790,13 +868,15 @@ void AccountViewItem::deleteAllMail(AbstractMail*wrapper,Folder*folder)
     QString fname="";
     if (folder) fname = folder->getDisplayName();
     int yesno = QMessageBox::warning(0,QObject::tr("Delete all mails",contextName),
-        QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName).
-            arg(fname),
-        QObject::tr("Yes",contextName),
-        QObject::tr("No",contextName),QString::null,1,1);
+                                     QObject::tr("<center>Realy delete all mails in box <br>%1</center>",contextName).
+                                     arg(fname),
+                                     QObject::tr("Yes",contextName),
+                                     QObject::tr("No",contextName),QString::null,1,1);
     qDebug("Auswahl: %i",yesno);
-    if (yesno == 0) {
-        if (wrapper->deleteAllMail(folder)) {
+    if (yesno == 0)
+    {
+        if (wrapper->deleteAllMail(folder))
+        {
             AccountView * view = (AccountView*)listView();
             if (view) view->refreshCurrent();
         }
@@ -806,7 +886,8 @@ void AccountViewItem::deleteAllMail(AbstractMail*wrapper,Folder*folder)
 void AccountViewItem::removeChilds()
 {
     QListViewItem *child = firstChild();
-    while ( child ) {
+    while ( child )
+    {
         QListViewItem *tmp = child;
         child = child->nextSibling();
         delete tmp;
@@ -825,13 +906,17 @@ AccountViewItem*AccountViewItem::findSubItem(const QString&path,AccountViewItem*
     AccountViewItem*pitem,*sitem;
     if (!start) pitem = (AccountViewItem*)firstChild();
     else pitem = (AccountViewItem*)start->firstChild();
-    while (pitem) {
-        if (pitem->matchName(path)) {
+    while (pitem)
+    {
+        if (pitem->matchName(path))
+        {
             break;
         }
-        if (pitem->childCount()>0) {
+        if (pitem->childCount()>0)
+        {
             sitem = findSubItem(path,pitem);
-            if (sitem) {
+            if (sitem)
+            {
                 pitem = sitem;
                 break;
             }
diff --git a/noncore/net/mail/accountview.cpp b/noncore/net/mail/accountview.cpp
index d9792d4..2ddf834 100644
--- a/noncore/net/mail/accountview.cpp
+++ b/noncore/net/mail/accountview.cpp
@@ -1,21 +1,26 @@
+
 #include "accountview.h"
 #include "accountitem.h"
 #include "selectstore.h"
-#include <qmessagebox.h>
-#include <qpopupmenu.h>
+
+/* OPIE */
 #include <libmailwrapper/settings.h>
 #include <libmailwrapper/mailwrapper.h>
 #include <libmailwrapper/mailtypes.h>
 #include <libmailwrapper/abstractmail.h>
+#include <qpe/qpeapplication.h>
 
+/* QT */
+#include <qmessagebox.h>
+#include <qpopupmenu.h>
 
 AccountView::AccountView( QWidget *parent, const char *name, WFlags flags )
-    : QListView( parent, name, flags )
+        : QListView( parent, name, flags )
 {
     connect( this, SIGNAL( selectionChanged( QListViewItem * ) ),
-            SLOT( refresh( QListViewItem * ) ) );
+             SLOT( refresh( QListViewItem * ) ) );
     connect( this, SIGNAL( mouseButtonPressed(int, QListViewItem *,const QPoint&,int  ) ),this,
-            SLOT( slotHold( int, QListViewItem *,const QPoint&,int  ) ) );
+             SLOT( slotHold( int, QListViewItem *,const QPoint&,int  ) ) );
     setSorting(0);
 }
 
@@ -55,12 +60,16 @@ void AccountView::populate( QList<Account> list )
     mhAccounts.append(new MHviewItem(AbstractMail::defaultLocalfolder(),this));
 
     Account *it;
-    for ( it = list.first(); it; it = list.next() ) {
-        if ( it->getType().compare( "IMAP" ) == 0 ) {
+    for ( it = list.first(); it; it = list.next() )
+    {
+        if ( it->getType().compare( "IMAP" ) == 0 )
+        {
             IMAPaccount *imap = static_cast<IMAPaccount *>(it);
             qDebug( "added IMAP " + imap->getAccountName() );
             imapAccounts.append(new IMAPviewItem( imap, this ));
-        } else if ( it->getType().compare( "POP3" ) == 0 ) {
+        }
+        else if ( it->getType().compare( "POP3" ) == 0 )
+        {
             POP3account *pop3 = static_cast<POP3account *>(it);
             qDebug( "added POP3 " + pop3->getAccountName() );
             /* must not be hold 'cause it isn't required */
@@ -69,10 +78,12 @@ void AccountView::populate( QList<Account> list )
     }
 }
 
-void AccountView::refresh(QListViewItem *item) {
+void AccountView::refresh(QListViewItem *item)
+{
 
     qDebug("AccountView refresh...");
-    if ( item ) {
+    if ( item )
+    {
         m_currentItem = item;
         QList<RecMail> headerlist;
         headerlist.setAutoDelete(true);
@@ -95,7 +106,6 @@ void AccountView::refreshCurrent()
 
 void AccountView::refreshAll()
 {
-
 }
 
 RecBody AccountView::fetchBody(const RecMail&aMail)
@@ -108,15 +118,17 @@ RecBody AccountView::fetchBody(const RecMail&aMail)
 
 void AccountView::setupFolderselect(Selectstore*sels)
 {
-    sels->showMaximized();
+    QPEApplication::showDialog( sels );
     QStringList sFolders;
     unsigned int i = 0;
-    for (i=0; i < mhAccounts.count();++i) {
+    for (i=0; i < mhAccounts.count();++i)
+    {
         mhAccounts[i]->refresh(false);
         sFolders = mhAccounts[i]->subFolders();
         sels->addAccounts(mhAccounts[i]->getWrapper(),sFolders);
     }
-    for (i=0; i < imapAccounts.count();++i) {
+    for (i=0; i < imapAccounts.count();++i)
+    {
         if (imapAccounts[i]->offline())
             continue;
         imapAccounts[i]->refreshFolders(false);
@@ -134,12 +146,14 @@ void AccountView::downloadMails(Folder*fromFolder,AbstractMail*fromWrapper)
     targetMail = sels.currentMail();
     targetFolder = sels.currentFolder();
     if ( (fromWrapper==targetMail && fromFolder->getName()==targetFolder) ||
-        targetFolder.isEmpty()) {
+            targetFolder.isEmpty())
+    {
         return;
     }
-    if (sels.newFolder() && !targetMail->createMbox(targetFolder)) {
+    if (sels.newFolder() && !targetMail->createMbox(targetFolder))
+    {
         QMessageBox::critical(0,tr("Error creating new Folder"),
-            tr("<center>Error while creating<br>new folder - breaking.</center>"));
+                              tr("<center>Error while creating<br>new folder - breaking.</center>"));
         return;
     }
     qDebug("Targetfolder: %s",targetFolder.latin1());
diff --git a/noncore/net/mail/addresspicker.cpp b/noncore/net/mail/addresspicker.cpp
index f4f4cea..8cdabde 100644
--- a/noncore/net/mail/addresspicker.cpp
+++ b/noncore/net/mail/addresspicker.cpp
@@ -1,20 +1,24 @@
+
+#include "composemail.h"
+
+/* OPIE */
+#include <opie2/ocontactaccess.h>
+#include <opie2/ocontact.h>
+#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
 #include <qpushbutton.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qlistbox.h>
 #include <qfile.h>
 
-#include <qpe/resource.h>
-#include <opie2/ocontactaccess.h>
-#include <opie2/ocontact.h>
-
-
+/* STD */
 #include <stdlib.h>
 
-#include "composemail.h"
-
-AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFlags flags ) 
-    : AddressPickerUI( parent, name, modal, flags )
+AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFlags flags )
+        : AddressPickerUI( parent, name, modal, flags )
 {
     okButton->setIconSet( Resource::loadPixmap( "enter" ) );
     cancelButton->setIconSet( Resource::loadPixmap( "editdelete" ) );
@@ -26,75 +30,85 @@ AddressPicker::AddressPicker( QWidget *parent, const char *name, bool modal, WFl
     QString lineEmail, lineName, contactLine;
     /* what name has to set here???? */
     Opie::OContactAccess m_contactdb("opiemail");
-    
+
     QStringList mails;
     QString pre,suf;
     Opie::OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 );
-    for ( it = m_list.begin(); it != m_list.end(); ++it ) {
-        if ((*it).defaultEmail().length()!=0) {
+    for ( it = m_list.begin(); it != m_list.end(); ++it )
+    {
+        if ((*it).defaultEmail().length()!=0)
+        {
             mails = (*it).emailList();
-            if ((*it).fileAs().length()>0) {
+            if ((*it).fileAs().length()>0)
+            {
                 pre = "\""+(*it).firstName()+" "+(*it).lastName()+"\" <";
                 suf = ">";
-            } else {
+            }
+            else
+            {
                 pre = "";
                 suf = "";
             }
             QStringList::ConstIterator sit = mails.begin();
-            for (;sit!=mails.end();++sit) {
+            for (;sit!=mails.end();++sit)
+            {
                 contactLine=pre+(*sit)+suf;
                 addressList->insertItem(contactLine);
-            }            
+            }
         }
     }
-	if ( addressList->count() <= 0 ) {
+    if ( addressList->count() <= 0 )
+    {
 #if 0
-    // makes this realy sense??
-		addressList->insertItem( 
+        // makes this realy sense??
+        addressList->insertItem(
             tr( "There are no entries in the addressbook." ) );
 #endif
-		addressList->setEnabled( false );
-		okButton->setEnabled( false );
-	} else {
-//        addressList->sort();
+        addressList->setEnabled( false );
+        okButton->setEnabled( false );
+    }
+    else
+    {
+        //        addressList->sort();
     }
 }
 
 void AddressPicker::accept()
 {
-	QListBoxItem *item = addressList->firstItem();
-	QString names;
-
-	while ( item ) {
-		if ( item->selected() )
-			names += item->text() + ", ";
-		item = item->next();
-	}
-	names.replace( names.length() - 2, 2, "" );
-
-	if ( names.isEmpty() ) {
-		QMessageBox::information(this, tr("Error"), tr("<p>You have to select"
-			" at least one address entry.</p>"), tr("Ok"));
-		return;
-	}
-
-	selectedNames = names;
-	QDialog::accept();
+    QListBoxItem *item = addressList->firstItem();
+    QString names;
+
+    while ( item )
+    {
+        if ( item->selected() )
+            names += item->text() + ", ";
+        item = item->next();
+    }
+    names.replace( names.length() - 2, 2, "" );
+
+    if ( names.isEmpty() )
+    {
+        QMessageBox::information(this, tr("Error"), tr("<p>You have to select"
+                                 " at least one address entry.</p>"), tr("Ok"));
+        return;
+    }
+
+    selectedNames = names;
+    QDialog::accept();
 }
 
 QString AddressPicker::getNames()
 {
-	QString names = 0;
-	
-	AddressPicker picker(0, 0, true);
-	picker.showMaximized();
-	picker.show();
-
-	int ret = picker.exec();
-	if ( QDialog::Accepted == ret ) {
-		return picker.selectedNames;
-	}
-
-	return 0;
+    QString names = 0;
+
+    AddressPicker picker(0, 0, true);
+
+    int ret = QPEApplication::execDialog( &picker );
+    if ( QDialog::Accepted == ret )
+    {
+        return picker.selectedNames;
+    }
+
+    return 0;
 }
 
diff --git a/noncore/net/mail/editaccounts.cpp b/noncore/net/mail/editaccounts.cpp
index 1cb202e..60bffa5 100644
--- a/noncore/net/mail/editaccounts.cpp
+++ b/noncore/net/mail/editaccounts.cpp
@@ -1,10 +1,15 @@
-#include <qt.h>
 
 #include "defines.h"
 #include "editaccounts.h"
 
+/* OPIE */
+#include <qpe/qpeapplication.h>
+
+/* QT */
+#include <qt.h>
+
 AccountListItem::AccountListItem( QListView *parent, Account *a)
-    : QListViewItem( parent )
+        : QListViewItem( parent )
 {
     account = a;
     setText( 0, account->getAccountName() );
@@ -12,7 +17,7 @@ AccountListItem::AccountListItem( QListView *parent, Account *a)
 }
 
 EditAccounts::EditAccounts( Settings *s, QWidget *parent, const char *name, bool modal, WFlags flags )
-    : EditAccountsUI( parent, name, modal, flags )
+        : EditAccountsUI( parent, name, modal, flags )
 {
     qDebug( "New Account Configuration Widget" );
     settings = s;
@@ -39,10 +44,14 @@ void EditAccounts::slotFillLists()
 
     QList<Account> accounts = settings->getAccounts();
     Account *it;
-    for ( it = accounts.first(); it; it = accounts.next() ) {
-        if ( it->getType().compare( "NNTP" ) == 0 ) {
+    for ( it = accounts.first(); it; it = accounts.next() )
+    {
+        if ( it->getType().compare( "NNTP" ) == 0 )
+        {
             (void) new AccountListItem( newsList, it );
-        } else {
+        }
+        else
+        {
             (void) new AccountListItem( mailList, it );
         }
     }
@@ -54,60 +63,76 @@ void EditAccounts::slotNewMail()
     QString *selection = new QString();
     SelectMailType selType( selection, this, 0, true );
     selType.show();
-    if ( QDialog::Accepted == selType.exec() ) {
+    if ( QDialog::Accepted == selType.exec() )
+    {
         slotNewAccount( *selection );
     }
 }
 
 void EditAccounts::slotNewAccount( const QString &type )
 {
-    if ( type.compare( "IMAP" ) == 0 ) {
+    if ( type.compare( "IMAP" ) == 0 )
+    {
         qDebug( "-> config IMAP" );
         IMAPaccount *account = new IMAPaccount();
         IMAPconfig imap( account, this, 0, true );
-        imap.showMaximized();
-        if ( QDialog::Accepted == imap.exec() ) {
+        if ( QDialog::Accepted == QPEApplication::execDialog( &imap ) )
+        {
             settings->addAccount( account );
             account->save();
             slotFillLists();
-          } else {
+        }
+        else
+        {
             account->remove();
         }
-    } else if ( type.compare( "POP3" ) == 0 ) {
+    }
+    else if ( type.compare( "POP3" ) == 0 )
+    {
         qDebug( "-> config POP3" );
         POP3account *account = new POP3account();
         POP3config pop3( account, this, 0, true, WStyle_ContextHelp );
-        pop3.showMaximized();
-        if ( QDialog::Accepted == pop3.exec() ) {
+        if ( QDialog::Accepted == QPEApplication::execDialog( &pop3 ) )
+        {
             settings->addAccount( account );
             account->save();
             slotFillLists();
-        } else {
+        }
+        else
+        {
             account->remove();
         }
-    } else if ( type.compare( "SMTP" ) == 0 ) {
+    }
+    else if ( type.compare( "SMTP" ) == 0 )
+    {
         qDebug( "-> config SMTP" );
         SMTPaccount *account = new SMTPaccount();
         SMTPconfig smtp( account, this, 0, true, WStyle_ContextHelp );
-        smtp.showMaximized();
-        if ( QDialog::Accepted == smtp.exec() ) {
+        if ( QDialog::Accepted == QPEApplication::execDialog( &smtp ) )
+        {
             settings->addAccount( account );
             account->save();
             slotFillLists();
 
-        } else {
+        }
+        else
+        {
             account->remove();
         }
-    } else if ( type.compare( "NNTP" ) == 0 ) {
+    }
+    else if ( type.compare( "NNTP" ) == 0 )
+    {
         qDebug( "-> config NNTP" );
         NNTPaccount *account = new NNTPaccount();
         NNTPconfig nntp( account, this, 0, true, WStyle_ContextHelp );
-        nntp.showMaximized();
-        if ( QDialog::Accepted == nntp.exec() ) {
+        if ( QDialog::Accepted == QPEApplication::execDialog( &nntp ) )
+        {
             settings->addAccount( account );
             account->save();
             slotFillLists();
-        } else {
+        }
+        else
+        {
             account->remove();
         }
     }
@@ -115,33 +140,40 @@ void EditAccounts::slotNewAccount( const QString &type )
 
 void EditAccounts::slotEditAccount( Account *account )
 {
-    if ( account->getType().compare( "IMAP" ) == 0 ) {
+    if ( account->getType().compare( "IMAP" ) == 0 )
+    {
         IMAPaccount *imapAcc = static_cast<IMAPaccount *>(account);
         IMAPconfig imap( imapAcc, this, 0, true, WStyle_ContextHelp );
-        imap.showMaximized();
-        if ( QDialog::Accepted == imap.exec() ) {
-           slotFillLists();
+        if ( QDialog::Accepted == QPEApplication::execDialog( &imap ) )
+        {
+            slotFillLists();
         }
-    } else if ( account->getType().compare( "POP3" ) == 0 ) {
+    }
+    else if ( account->getType().compare( "POP3" ) == 0 )
+    {
         POP3account *pop3Acc = static_cast<POP3account *>(account);
         POP3config pop3( pop3Acc, this, 0, true, WStyle_ContextHelp );
-        pop3.showMaximized();
-        if ( QDialog::Accepted == pop3.exec() ) {
-           slotFillLists();
+        if ( QDialog::Accepted == QPEApplication::execDialog( &pop3 ) )
+        {
+            slotFillLists();
         }
-    } else if ( account->getType().compare( "SMTP" ) == 0 ) {
+    }
+    else if ( account->getType().compare( "SMTP" ) == 0 )
+    {
         SMTPaccount *smtpAcc = static_cast<SMTPaccount *>(account);
         SMTPconfig smtp( smtpAcc, this, 0, true, WStyle_ContextHelp );
-        smtp.showMaximized();
-        if ( QDialog::Accepted == smtp.exec() ) {
-           slotFillLists();
+        if ( QDialog::Accepted == QPEApplication::execDialog( &smtp ) )
+        {
+            slotFillLists();
         }
-    } else if ( account->getType().compare( "NNTP" ) == 0 ) {
+    }
+    else if ( account->getType().compare( "NNTP" ) == 0 )
+    {
         NNTPaccount *nntpAcc = static_cast<NNTPaccount *>(account);
         NNTPconfig nntp( nntpAcc, this, 0, true, WStyle_ContextHelp );
-        nntp.showMaximized();
-        if ( QDialog::Accepted == nntp.exec() ) {
-           slotFillLists();
+        if ( QDialog::Accepted == QPEApplication::execDialog( &nntp ) )
+        {
+            slotFillLists();
         }
     }
 }
@@ -149,8 +181,9 @@ void EditAccounts::slotEditAccount( Account *account )
 void EditAccounts::slotDeleteAccount( Account *account )
 {
     if ( QMessageBox::information( this, tr( "Question" ),
-         tr( "<p>Do you really want to delete the selected Account?</p>" ),
-         tr( "Yes" ), tr( "No" ) ) == 0 ) {
+                                   tr( "<p>Do you really want to delete the selected Account?</p>" ),
+                                   tr( "Yes" ), tr( "No" ) ) == 0 )
+    {
         settings->delAccount( account );
         slotFillLists();
     }
@@ -159,7 +192,8 @@ void EditAccounts::slotDeleteAccount( Account *account )
 void EditAccounts::slotEditMail()
 {
     qDebug( "Edit Mail Account" );
-    if ( !mailList->currentItem() ) {
+    if ( !mailList->currentItem() )
+    {
         QMessageBox::information( this, tr( "Error" ),
                                   tr( "<p>Please select an account.</p>" ),
                                   tr( "Ok" ) );
@@ -172,7 +206,8 @@ void EditAccounts::slotEditMail()
 
 void EditAccounts::slotDeleteMail()
 {
-    if ( !mailList->currentItem() ) {
+    if ( !mailList->currentItem() )
+    {
         QMessageBox::information( this, tr( "Error" ),
                                   tr( "<p>Please select an account.</p>" ),
                                   tr( "Ok" ) );
@@ -192,7 +227,8 @@ void EditAccounts::slotNewNews()
 void EditAccounts::slotEditNews()
 {
     qDebug( "Edit News Account" );
-    if ( !newsList->currentItem() ) {
+    if ( !newsList->currentItem() )
+    {
         QMessageBox::information( this, tr( "Error" ),
                                   tr( "<p>Please select an account.</p>" ),
                                   tr( "Ok" ) );
@@ -206,7 +242,8 @@ void EditAccounts::slotEditNews()
 void EditAccounts::slotDeleteNews()
 {
     qDebug( "Delete News Account" );
-    if ( !newsList->currentItem() ) {
+    if ( !newsList->currentItem() )
+    {
         QMessageBox::information( this, tr( "Error" ),
                                   tr( "<p>Please select an account.</p>" ),
                                   tr( "Ok" ) );
@@ -243,7 +280,7 @@ void EditAccounts::accept()
  */
 
 SelectMailType::SelectMailType( QString *selection, QWidget *parent, const char *name, bool modal, WFlags flags )
-    : SelectMailTypeUI( parent, name, modal, flags )
+        : SelectMailTypeUI( parent, name, modal, flags )
 {
     selected = selection;
     selected->replace( 0, selected->length(), typeBox->currentText() );
@@ -260,7 +297,7 @@ void SelectMailType::slotSelection( const QString &sel )
  */
 
 IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
-    : IMAPconfigUI( parent, name, modal, flags )
+        : IMAPconfigUI( parent, name, modal, flags )
 {
     data = account;
 
@@ -277,12 +314,17 @@ IMAPconfig::IMAPconfig( IMAPaccount *account, QWidget *parent, const char *name,
 
 void IMAPconfig::slotConnectionToggle( int index )
 {
-    if ( index == 2 ) {
-       portLine->setText( IMAP_SSL_PORT );
-    } else if (  index == 3 ) {
+    if ( index == 2 )
+    {
+        portLine->setText( IMAP_SSL_PORT );
+    }
+    else if (  index == 3 )
+    {
         portLine->setText( IMAP_PORT );
         CommandEdit->show();
-    } else {
+    }
+    else
+    {
         portLine->setText( IMAP_PORT );
     }
 }
@@ -316,7 +358,7 @@ void IMAPconfig::accept()
  */
 
 POP3config::POP3config( POP3account *account, QWidget *parent, const char *name, bool modal, WFlags flags )
-    : POP3configUI( parent, name, modal, flags )
+        : POP3configUI( parent, name, modal, flags )
 {
     data = account;
     fillValues();
@@ -333,12 +375,17 @@ POP3config::POP3config( POP3account *account, QWidget *parent, const char *name,
 void POP3config::slotConnectionToggle( int index )
 {
     // 2 is ssl connection
-    if ( index == 2 ) {
-       portLine->setText( POP3_SSL_PORT );
-    } else if (  index == 3 ) {
+    if ( index == 2 )
+    {
+        portLine->setText( POP3_SSL_PORT );
+    }
+    else if (  index == 3 )
+    {
         portLine->setText( POP3_PORT );
         CommandEdit->show();
-    } else {
+    }
+    else
+    {
         portLine->setText( POP3_PORT );
     }
 }
@@ -370,7 +417,7 @@ void POP3config::accept()
  */
 
 SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
-    : SMTPconfigUI( parent, name, modal, flags )
+        : SMTPconfigUI( parent, name, modal, flags )
 {
     data = account;
 
@@ -391,12 +438,17 @@ SMTPconfig::SMTPconfig( SMTPaccount *account, QWidget *parent, const char *name,
 void SMTPconfig::slotConnectionToggle( int index )
 {
     // 2 is ssl connection
-    if ( index == 2 ) {
-       portLine->setText( SMTP_SSL_PORT );
-    } else if (  index == 3 ) {
+    if ( index == 2 )
+    {
+        portLine->setText( SMTP_SSL_PORT );
+    }
+    else if (  index == 3 )
+    {
         portLine->setText( SMTP_PORT );
         CommandEdit->show();
-    } else {
+    }
+    else
+    {
         portLine->setText( SMTP_PORT );
     }
 }
@@ -430,7 +482,7 @@ void SMTPconfig::accept()
  */
 
 NNTPconfig::NNTPconfig( NNTPaccount *account, QWidget *parent, const char *name, bool modal, WFlags flags )
-    : NNTPconfigUI( parent, name, modal, flags )
+        : NNTPconfigUI( parent, name, modal, flags )
 {
     data = account;
 
@@ -444,9 +496,12 @@ NNTPconfig::NNTPconfig( NNTPaccount *account, QWidget *parent, const char *name,
 
 void NNTPconfig::slotSSL( bool enabled )
 {
-    if ( enabled ) {
+    if ( enabled )
+    {
         portLine->setText( NNTP_SSL_PORT );
-    } else {
+    }
+    else
+    {
         portLine->setText( NNTP_PORT );
     }
 }
diff --git a/noncore/net/mail/opiemail.cpp b/noncore/net/mail/opiemail.cpp
index 0795436..abf93dc 100644
--- a/noncore/net/mail/opiemail.cpp
+++ b/noncore/net/mail/opiemail.cpp
@@ -1,22 +1,28 @@
-#include <qmessagebox.h>
+
 #include "settingsdialog.h"
 #include "opiemail.h"
 #include "editaccounts.h"
 #include "composemail.h"
+#include "mailistviewitem.h"
+#include "viewmail.h"
+#include "selectstore.h"
+#include "selectsmtp.h"
+
+/* OPIE */
 #include <libmailwrapper/smtpwrapper.h>
+#include <libmailwrapper/mailtypes.h>
+#include <libmailwrapper/abstractmail.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
+#include <qmessagebox.h>
 #include <qaction.h>
 #include <qapplication.h>
-#include <libmailwrapper/mailtypes.h>
-#include <libmailwrapper/abstractmail.h>
-#include "mailistviewitem.h"
-#include "viewmail.h"
-#include "selectstore.h"
-#include "selectsmtp.h"
 
 OpieMail::OpieMail( QWidget *parent, const char *name, WFlags flags )
-    : MainWindow( parent, name, WStyle_ContextHelp )
+        : MainWindow( parent, name, WStyle_ContextHelp )
 {
     settings = new Settings();
 
@@ -31,13 +37,16 @@ OpieMail::~OpieMail()
 void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 {
     // copied from old mail2
-    if (msg == "writeMail(QString,QString)") {
+    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()") {
+    }
+    else if (msg == "newMail()")
+    {
         slotComposeMail();
     }
 }
@@ -45,16 +54,19 @@ void OpieMail::appMessage(const QCString &msg, const QByteArray &data)
 void OpieMail::slotwriteMail(const QString&name,const QString&email)
 {
     ComposeMail compose( settings, this, 0, true , WStyle_ContextHelp );
-    if (!email.isEmpty()) {
-        if (!name.isEmpty()) {
+    if (!email.isEmpty())
+    {
+        if (!name.isEmpty())
+        {
             compose.setTo("\"" + name + "\"" + " " + "<"+ email + ">");
-        } else {
+        }
+        else
+        {
             compose.setTo(email);
         }
     }
-    compose.showMaximized();
     compose.slotAdjustColumns();
-    compose.exec();
+    QPEApplication::execDialog( &compose );
 }
 
 void OpieMail::slotComposeMail()
@@ -72,30 +84,38 @@ void OpieMail::slotSendQueued()
     QList<SMTPaccount> smtpList;
     smtpList.setAutoDelete(false);
     Account *it;
-    for ( it = list.first(); it; it = list.next() ) {
-        if ( it->getType().compare( "SMTP" ) == 0 ) {
+    for ( it = list.first(); it; it = list.next() )
+    {
+        if ( it->getType().compare( "SMTP" ) == 0 )
+        {
             smtp = static_cast<SMTPaccount *>(it);
             smtpList.append(smtp);
         }
     }
-    if (smtpList.count()==0) {
+    if (smtpList.count()==0)
+    {
         QMessageBox::information(0,tr("Info"),tr("Define a smtp account first"));
         return;
     }
-    if (smtpList.count()==1) {
+    if (smtpList.count()==1)
+    {
         smtp = smtpList.at(0);
-    } else {
+    }
+    else
+    {
         smtp = 0;
         selectsmtp selsmtp;
         selsmtp.setSelectionlist(&smtpList);
-        selsmtp.showMaximized();
-        if (selsmtp.exec()==QDialog::Accepted) {
+        if ( QPEApplication::execDialog( &selsmtp ) == QDialog::Accepted )
+        {
             smtp = selsmtp.selected_smtp();
         }
     }
-    if (smtp) {
+    if (smtp)
+    {
         SMTPwrapper * wrap = new SMTPwrapper(smtp);
-        if ( wrap->flushOutbox() ) {
+        if ( wrap->flushOutbox() )
+        {
             QMessageBox::information(0,tr("Info"),tr("Mail queue flushed"));
         }
         delete wrap;
@@ -110,17 +130,15 @@ void OpieMail::slotSearchMails()
 void OpieMail::slotEditSettings()
 {
     SettingsDialog settingsDialog( this,  0, true,  WStyle_ContextHelp );
-    settingsDialog.showMaximized();
-    settingsDialog.exec();
+    QPEApplication::execDialog( &settingsDialog );
 }
 
 void OpieMail::slotEditAccounts()
 {
     qDebug( "Edit Accounts" );
     EditAccounts eaDialog( settings, this, 0, true,  WStyle_ContextHelp );
-    eaDialog.showMaximized();
     eaDialog.slotAdjustColumns();
-    eaDialog.exec();
+    QPEApplication::execDialog( &eaDialog );
     if ( settings ) delete settings;
     settings = new Settings();
 
@@ -139,9 +157,12 @@ void OpieMail::displayMail()
     readMail.showMaximized();
     readMail.exec();
 
-    if (  readMail.deleted ) {
-         folderView->refreshCurrent();
-    } else {
+    if (  readMail.deleted )
+    {
+        folderView->refreshCurrent();
+    }
+    else
+    {
         ( (MailListViewItem*)item )->setPixmap( 0, Resource::loadPixmap( "" ) );
     }
 }
@@ -150,9 +171,10 @@ void OpieMail::slotDeleteMail()
 {
     if (!mailView->currentItem()) return;
     RecMail 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 );
-       folderView->refreshCurrent();
+    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 );
+        folderView->refreshCurrent();
     }
 }
 
@@ -163,7 +185,8 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
     qDebug("Event right/hold");
     if (!item) return;
     QPopupMenu *m = new QPopupMenu(0);
-    if (m) {
+    if (m)
+    {
         m->insertItem(tr("Read this mail"),this,SLOT(displayMail()));
         m->insertItem(tr("Delete this mail"),this,SLOT(slotDeleteMail()));
         m->insertItem(tr("Copy/Move this mail"),this,SLOT(slotMoveCopyMail()));
@@ -175,11 +198,14 @@ void OpieMail::mailHold(int button, QListViewItem *item,const QPoint&,int  )
 
 void OpieMail::slotShowFolders( bool show )
 {
-   qDebug( "Show Folders" );
-    if ( show && folderView->isHidden() ) {
+    qDebug( "Show Folders" );
+    if ( show && folderView->isHidden() )
+    {
         qDebug( "-> showing" );
         folderView->show();
-    } else if ( !show && !folderView->isHidden() ) {
+    }
+    else if ( !show && !folderView->isHidden() )
+    {
         qDebug( "-> hiding" );
         folderView->hide();
     }
@@ -189,7 +215,8 @@ void OpieMail::refreshMailView(QList<RecMail>*list)
 {
     MailListViewItem*item = 0;
     mailView->clear();
-    for (unsigned int i = 0; i < list->count();++i) {
+    for (unsigned int i = 0; i < list->count();++i)
+    {
         item = new MailListViewItem(mailView,item);
         item->storeData(*(list->at(i)));
         item->showEntry();
@@ -216,12 +243,14 @@ void OpieMail::slotMoveCopyMail()
     targetMail = sels.currentMail();
     targetFolder = sels.currentFolder();
     if ( (mail.Wrapper()==targetMail && mail.getMbox()==targetFolder) ||
-        targetFolder.isEmpty()) {
+            targetFolder.isEmpty())
+    {
         return;
     }
-    if (sels.newFolder() && !targetMail->createMbox(targetFolder)) {
+    if (sels.newFolder() && !targetMail->createMbox(targetFolder))
+    {
         QMessageBox::critical(0,tr("Error creating new Folder"),
-            tr("<center>Error while creating<br>new folder - breaking.</center>"));
+                              tr("<center>Error while creating<br>new folder - breaking.</center>"));
         return;
     }
     mail.Wrapper()->mvcpMail(mail,targetFolder,targetMail,sels.moveMails());
diff --git a/noncore/net/mail/viewmail.cpp b/noncore/net/mail/viewmail.cpp
index 99965d4..f015228 100644
--- a/noncore/net/mail/viewmail.cpp
+++ b/noncore/net/mail/viewmail.cpp
@@ -1,3 +1,17 @@
+#include "composemail.h"
+#include "viewmail.h"
+#include "accountview.h"
+
+/* OPIE */
+#include <libmailwrapper/settings.h>
+#include <libmailwrapper/abstractmail.h>
+#include <libmailwrapper/mailtypes.h>
+
+#include <opie2/ofiledialog.h>
+#include <qpe/config.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
 #include <qtextbrowser.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
@@ -7,36 +21,25 @@
 #include <qapplication.h>
 #include <qvaluelist.h>
 
-#include <qpe/config.h>
-
-#include <opie2/ofiledialog.h>
-
-#include <libmailwrapper/settings.h>
-#include "composemail.h"
-#include "viewmail.h"
-#include <libmailwrapper/abstractmail.h>
-#include "accountview.h"
-#include <libmailwrapper/mailtypes.h>
-
 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)
+                       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(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)
+                       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(0, mime);
+    setText(1, desc);
+    setText(2, file);
     setText(3, fsize);
 }
 
@@ -46,7 +49,8 @@ bool AttachItem::isParentof(const QValueList<int>&path)
     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) {
+    for (unsigned int i=0; i < _path.count();++i)
+    {
         if (_path[i]!=path[i]) return false;
     }
     return true;
@@ -55,7 +59,8 @@ bool AttachItem::isParentof(const QValueList<int>&path)
 AttachItem* ViewMail::searchParent(const QValueList<int>&path)
 {
     QListViewItemIterator it( attachments );
-    for ( ; it.current(); ++it ) {
+    for ( ; it.current(); ++it )
+    {
         AttachItem*ati = (AttachItem*)it.current();
         if (ati->isParentof(path)) return ati;
     }
@@ -68,79 +73,42 @@ AttachItem* ViewMail::lastChild(AttachItem*parent)
     AttachItem* item = (AttachItem*)parent->firstChild();
     if (!item) return item;
     AttachItem*temp=0;
-    while( (temp=(AttachItem*)item->nextSibling())) {
+    while( (temp=(AttachItem*)item->nextSibling()))
+    {
         item = temp;
     }
     return item;
 }
 
-void ViewMail::setBody( RecBody body ) {
-
-m_body = body;
-m_mail[2] = body.Bodytext();
-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;
-}
-
+void ViewMail::setBody( RecBody body )
 {
-    /* 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) {
-    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) {
-        qDebug(it.key());
-        if (it.key().lower()=="name") {
-            filename=it.data();
-        }
+    m_body = body;
+    m_mail[2] = body.Bodytext();
+    attachbutton->setEnabled(body.Parts().count()>0);
+    attachments->setEnabled(body.Parts().count()>0);
+    if (body.Parts().count()==0)
+    {
+        return;
     }
-    s = body.Parts()[i].Size();
-    w = 0;
-    while (s>1024) {
+    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;
     }
-    switch(w) {
+
+    QString q="";
+    switch(w)
+    {
     case 1:
         q="k";
         break;
@@ -148,87 +116,150 @@ for (unsigned int i = 0; i < body.Parts().count();++i) {
         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());
+
+    {
+        /* 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)
+    {
+        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)
+        {
+            qDebug(it.key());
+            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 ) {
+void ViewMail::slotShowHtml( bool state )
+{
     m_showHtml = state;
     setText();
 }
 
-void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int ) {
+void ViewMail::slotItemClicked( QListViewItem * item , const QPoint & point, int )
+{
     if (!item )
         return;
 
-    if (  ( ( AttachItem* )item )->Partnumber() == -1 ) {
+    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( tr( "Show Text" ), 1 );
-  }
-  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 = Opie::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;
-               }
-             }
-             }
+    int ret=0;
+
+    if ( item->text( 0 ).left( 5 ) == "text/" || item->text(0)=="message/rfc822" )
+    {
+        menu->insertItem( tr( "Show Text" ), 1 );
+    }
+    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 = Opie::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 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
+    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;
+    }
+    delete menu;
 }
 
 
-void ViewMail::setMail( RecMail mail ) {
+void ViewMail::setMail( RecMail mail )
+{
 
     m_recMail = mail;
 
@@ -247,24 +278,25 @@ void ViewMail::setMail( RecMail mail ) {
 
 
 ViewMail::ViewMail( QWidget *parent, const char *name, WFlags fl)
-	: ViewMailBase(parent, name, fl), _inLoop(false)
+        : ViewMailBase(parent, name, fl), _inLoop(false)
 {
-	m_gotBody = false;
-        deleted = 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( 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 ) ) );
 
-	attachments->setEnabled(m_gotBody);
-        connect( attachments,  SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked(  QListViewItem *,  const QPoint & , int ) ) );
+    attachments->setEnabled(m_gotBody);
+    connect( attachments,  SIGNAL( clicked ( QListViewItem *, const QPoint & , int ) ), SLOT( slotItemClicked(  QListViewItem *,  const QPoint & , int ) ) );
 
-        readConfig();
+    readConfig();
     attachments->setSorting(-1);
 }
 
-void ViewMail::readConfig() {
+void ViewMail::readConfig()
+{
     Config cfg( "mail" );
     cfg.setGroup( "Settings" );
     m_showHtml =  cfg.readBoolEntry( "showHtml", false );
@@ -278,13 +310,16 @@ void ViewMail::setText()
     QString ccString;
     QString bccString;
 
-    for ( QStringList::Iterator it = ( m_mail2[0] ).begin(); it != ( m_mail2[0] ).end(); ++it ) {
+    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 ) {
+    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 ) {
+    for ( QStringList::Iterator it = ( m_mail2[2] ).begin(); it != ( m_mail2[2] ).end(); ++it )
+    {
         bccString += (*it);
     }
 
@@ -300,10 +335,13 @@ void ViewMail::setText()
                  "<b>" + tr( "Date" ) + ": </b> " +  m_mail[3] +
                  "</td></tr></table><font face=fixed>";
 
-    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>" );
+    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;
@@ -313,115 +351,120 @@ void ViewMail::setText()
 ViewMail::~ViewMail()
 {
     m_recMail.Wrapper()->cleanMimeCache();
-	hide();
+    hide();
 }
 
 void ViewMail::hide()
 {
-	QWidget::hide();
+    QWidget::hide();
 
-	if (_inLoop) {
-		_inLoop = false;
-		qApp->exit_loop();
+    if (_inLoop)
+    {
+        _inLoop = false;
+        qApp->exit_loop();
 
-        }
+    }
 
 }
 
 void ViewMail::exec()
 {
-	show();
+    show();
 
-	if (!_inLoop) {
-		_inLoop = true;
-		qApp->enter_loop();
-	}
+    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_;
+    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, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("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);
-        composer.setTo( m_mail[0] );
-        composer.setSubject( "Re: " + m_mail[1] );
-	composer.setMessage( rtext );
-	composer.showMaximized();
-    if ( QDialog::Accepted==composer.exec()) {
+    if (!m_gotBody)
+    {
+        QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot reply yet."), tr("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);
+    composer.setTo( m_mail[0] );
+    composer.setSubject( "Re: " + m_mail[1] );
+    composer.setMessage( rtext );
+    if ( QDialog::Accepted == QPEApplication::execDialog( &composer ) )
+    {
         m_recMail.Wrapper()->answeredMail(m_recMail);
     }
 }
 
 void ViewMail::slotForward()
 {
-	if (!m_gotBody) {
-		QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("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 );
-	composer.showMaximized();
-    if ( QDialog::Accepted==composer.exec()) {
+    if (!m_gotBody)
+    {
+        QMessageBox::information(this, tr("Error"), tr("<p>The mail body is not yet downloaded, so you cannot forward yet."), tr("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 == QPEApplication::execDialog( &composer ))
+    {
     }
 }
 
 void ViewMail::slotDeleteMail( )
 {
-    if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<p>Do you really want to delete this mail? <br><br>" ) + m_mail[0] + " - " + m_mail[1] ) , QMessageBox::Yes, QMessageBox::No ) == QMessageBox::Yes ) {
+    if ( QMessageBox::warning(this, tr("Delete Mail"), QString( tr("<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 );
         hide();
         deleted = true;