- SMTP fix preventing authorization with SMTP after POP

- removed debug output
- smaller bug fixes

14 files changed, 42 insertions, 50 deletions

diff --git a/noncore/net/mailit/addresslist.cpp b/noncore/net/mailit/addresslist.cpp
index 9fe558a..8d9ab91 100644
--- a/noncore/net/mailit/addresslist.cpp
+++ b/noncore/net/mailit/addresslist.cpp
@@ -1,161 +1,161 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include <qfile.h>
 #include <qtextstream.h>
 #include <opie/ocontactaccess.h>
 #include <opie/ocontact.h>
 
 #include "addresslist.h"
 
 AddressList::AddressList()
 {
         addresses.setAutoDelete(TRUE);
         read();
         dirty = FALSE;
 }
 
 AddressList::~AddressList()
 {
         addresses.clear();
 }
 
 void AddressList::addContact(QString email, QString name)
 {
         //skip if not a valid email address,
         if (email.find( '@') == -1)
                 return;
                 
         if ( ! containsEmail(email) ) {
                 Contact *in = new Contact;
                 in->email = email;
                 in->name = name;
                 addresses.append(in);
                 dirty = TRUE;
         }
 }
 
 bool AddressList::containsEmail(QString email)
 {
         return ( getEmailRef(email) != -1 );
 }
 
 bool AddressList::containsName(QString name)
 {
         return ( getNameRef(name) != -1 );
 }
 
 QString AddressList::getNameByEmail(QString email)
 {
         int pos = getEmailRef(email);
         if (pos != -1) {
                 Contact *ptr = addresses.at(pos);
                 return ptr->name;
         }
         
         return NULL;
 }
 
 QString AddressList::getEmailByName(QString name)
 {
         int pos = getNameRef(name);
         if (pos != -1) {
                 Contact *ptr = addresses.at(pos);
                 return ptr->email;
         }
         
         return NULL;
 }
 
 int AddressList::getEmailRef(QString email)
 {
         int pos = 0;
         Contact *ptr;
         
         for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) {
                 if (ptr->email == email)
                         return pos;
                 pos++;
         }
         return -1;
 }
 
 int AddressList::getNameRef(QString name)
 {
         int pos = 0;
         Contact *ptr;
         
         for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) {
                 if (ptr->name == name)
                         return pos;
                 pos++;
         }
         return -1;
 }
 
 QList<Contact>* AddressList::getContactList()
 {
         return &addresses;
 }
 
 void AddressList::read()
 {
         OContactAccess::List::Iterator it;
         
         QString lineEmail, lineName, email, name;
         OContactAccess m_contactdb("mailit");
         OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 );
         //OContact* oc;
         
         for ( it = m_list.begin(); it != m_list.end(); ++it )
         {
                 //oc=(OContact*) it;
                 if ((*it).defaultEmail().length()!=0)
-                        addContact((*it).defaultEmail(),(*it).fullName());
+                        addContact((*it).defaultEmail(),(*it).fileAs());
         }
         
         /*if (! f.open(IO_ReadOnly) )
                 return;
         
         QTextStream stream(&f);
         
         while (! stream.atEnd() ) {
                 lineEmail = stream.readLine();
                 if (! stream.atEnd() )
                         lineName = stream.readLine();
                 else return;
                 
                 email = getRightString(lineEmail);
                 name = getRightString(lineName);
                 addContact(email, name);
         }
         f.close();*/
 }
 
 QString AddressList::getRightString(QString in)
 {
         QString out = "";
         
         int pos = in.find('=');
         if (pos != -1) {
                 out = in.mid(pos+1).stripWhiteSpace();
         }
         return out;
 }
 
diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp
index 6612541..0d82a9a 100644
--- a/noncore/net/mailit/emailclient.cpp
+++ b/noncore/net/mailit/emailclient.cpp
@@ -279,572 +279,572 @@ void EmailClient::mailSent()
 void EmailClient::getNewMail() {
   
   if (accountList.count() == 0) {
     QMessageBox::warning(qApp->activeWindow(),"No account selected",
       "You must create an account", "OK\n");
     return;
   }
   
   setMailAccount();
   
   receiving = TRUE;
   previewingMail = TRUE;
   getMailButton->setEnabled(FALSE);
   cancelButton->setEnabled(TRUE);
   selectAccountMenu->setEnabled(FALSE);
   
   status1Label->setText(currentAccount->accountName + " headers");
   progressBar->reset();
     
   //get any previous mails not downloaded and add to queue
   mailDownloadList.clear();
   Email *mailPtr;
   item = (EmailListItem *) inboxView->firstChild();
   while (item != NULL) {
     mailPtr = item->getMail();
     if ( (!mailPtr->downloaded) && (mailPtr->fromAccountId == currentAccount->id) ) {
       mailDownloadList.sizeInsert(mailPtr->serverId, mailPtr->size);
     }
     item = (EmailListItem *) item->nextSibling();
   }
   
   emailHandler->getMailHeaders();
 }
 
 void EmailClient::getAllNewMail()
 {
   allAccounts = TRUE;
   currentAccount = accountList.first();
   getNewMail();
 }
 
 void EmailClient::mailArrived(const Email &mail, bool fromDisk)
 {
   Enclosure *ePtr;
   Email newMail;
   int thisMailId;
   emailHandler->parse(mail.rawMail, lineShift, &newMail);
   
   mailconf->setGroup(newMail.id);
   
   if (fromDisk) {
     newMail.downloaded = mailconf->readBoolEntry("downloaded");
     newMail.size = mailconf->readNumEntry("size");
     newMail.serverId = mailconf->readNumEntry("serverid");
     newMail.fromAccountId = mailconf->readNumEntry("fromaccountid");
   } else {  //mail arrived from server
     newMail.serverId = mail.serverId;
     newMail.size = mail.size;
     newMail.downloaded = mail.downloaded;
     
     newMail.fromAccountId = currentAccount->id;
     mailconf->writeEntry("fromaccountid", newMail.fromAccountId);
   }
   
   //add if read or not
   newMail.read = mailconf->readBoolEntry("mailread");
     
   //check if new mail
   if ( (thisMailId = mailconf->readNumEntry("internalmailid", -1)) == -1) {
     thisMailId = mailIdCount;
     mailIdCount++;
     
     //set server count, so that if the user aborts, the new
     //header is not reloaded
     if (currentAccount->synchronize)
       currentAccount->lastServerMailCount++;
     
     mailconf->writeEntry("internalmailid", thisMailId);
     mailconf->writeEntry("downloaded", newMail.downloaded);
     mailconf->writeEntry("size", (int) newMail.size);
     mailconf->writeEntry("serverid", newMail.serverId);
     
     addressList->addContact(newMail.fromMail, newMail.from);
   } else if (!fromDisk) {   //body to header arrived
     mailconf->writeEntry("downloaded", TRUE);
   }
   QString stringMailId;
   stringMailId.setNum(thisMailId);
   //se if any attatchments needs to be stored
   for ( ePtr=newMail.files.first(); ePtr != 0; ePtr=newMail.files.next() ) {
     QString stringId;
     stringId.setNum(ePtr->id);
     
     int id = mailconf->readNumEntry("enclosureid_" + stringId);
     if (id != ePtr->id) {     //new entry
       mailconf->writeEntry("enclosureid_" + stringId, ePtr->id);
       mailconf->writeEntry("name_" + stringId, ePtr->originalName);
       mailconf->writeEntry("contenttype_" + stringId, ePtr->contentType);
       mailconf->writeEntry("contentattribute_" + stringId, ePtr->contentAttribute);
       mailconf->writeEntry("saved_" + stringId, ePtr->saved);
       mailconf->writeEntry("installed_" + stringId, FALSE);
       
             ePtr->name = stringMailId + "_" + stringId;
             ePtr->path = getPath(TRUE);
             if (emailHandler->getEnclosure(ePtr)) { //file saved
         ePtr->saved = TRUE;
         mailconf->writeEntry("saved_" + stringId, ePtr->saved);
         mailconf->writeEntry("filename_" + stringId, ePtr->name);
         mailconf->writeEntry("path_" + stringId, ePtr->path);
             } else {
               ePtr->saved = FALSE;
         mailconf->writeEntry("saved_" + stringId, ePtr->saved);
             }
     } else {
       ePtr->saved = mailconf->readBoolEntry("saved_" + stringId);
       ePtr->installed = mailconf->readBoolEntry("installed_" + stringId);
       if (ePtr->saved) {
         ePtr->name = mailconf->readEntry("filename_" + stringId);
         ePtr->path = mailconf->readEntry("path_" + stringId);
       }   
     }
   }
   if (!previewingMail && !fromDisk) {
     Email *mailPtr;
     item = (EmailListItem *) inboxView->firstChild();
     while (item != NULL) {
       mailPtr = item->getMail();
       if (mailPtr->id == newMail.id) {
         item->setMail(newMail);
         emit mailUpdated(item->getMail());
       }
       item = (EmailListItem *) item->nextSibling();
     }
   } else {
     item = new EmailListItem(inboxView, newMail, TRUE);
     if (!newMail.downloaded)
       mailDownloadList.sizeInsert(newMail.serverId, newMail.size);
   }
   
 }
 
 void EmailClient::allMailArrived(int count)
 {
   // not previewing means all mailtransfer has been done
   if (!previewingMail) {
     if ( (allAccounts) && ( (currentAccount = accountList.next()) !=0 ) ) {
       emit newCaption("Mailit - " + currentAccount->accountName);
       getNewMail();
       return;
     } else {
       allAccounts = FALSE;
       receiving = FALSE;
       getMailButton->setEnabled(TRUE);
       cancelButton->setEnabled(FALSE);
       selectAccountMenu->setEnabled(TRUE);
       status1Label->setText("Idle");
   
       progressBar->reset();
       return;
     }
   }
   
   // all headers downloaded from server, start downloading remaining mails
   previewingMail = FALSE;
   status1Label->setText(currentAccount->accountName);
   progressBar->reset();
 
   emailHandler->getMailByList(&mailDownloadList);
 }
 
 void EmailClient::moveMailFront(Email *mailPtr)
 {
   if ( (receiving) && (mailPtr->fromAccountId == currentAccount->id) ) {
     mailDownloadList.moveFront(mailPtr->serverId, mailPtr->size);
   }
 }
 
 void EmailClient::smtpError(int code)
 {
   QString temp;
   
   if (code == ErrUnknownResponse)
     temp = "Unknown response from server";
   
   if (code == QSocket::ErrHostNotFound)
     temp = "host not found";
   if (code == QSocket::ErrConnectionRefused)
     temp = "connection refused";
   if (code == QSocket::ErrSocketRead)
     temp = "socket packet error";
   
   if (code != ErrCancel) {
     QMessageBox::warning(qApp->activeWindow(), "Sending error", temp, "OK\n");
   } else {
     status2Label->setText("Aborted by user");
   }
   
   sending = FALSE;
   sendMailButton->setEnabled(TRUE);
   cancelButton->setEnabled(FALSE);
   quedMessages.clear();
 }
 
 void EmailClient::popError(int code)
 {
   QString temp;
   
   if (code == ErrUnknownResponse)
     temp = "Unknown response from server";
   if (code == ErrLoginFailed)
     temp = "Login failed\nCheck user name and password";
   
   if (code == QSocket::ErrHostNotFound)
     temp = "host not found";
   if (code == QSocket::ErrConnectionRefused)
     temp = "connection refused";
   if (code == QSocket::ErrSocketRead)
     temp = "socket packet error";
     
   if (code != ErrCancel) {
     QMessageBox::warning(qApp->activeWindow(), "Receiving error", temp, "OK\n");
   } else {
     status2Label->setText("Aborted by user");
   }
   
   receiving = FALSE;
   getMailButton->setEnabled(TRUE);
   cancelButton->setEnabled(FALSE);
   selectAccountMenu->setEnabled(TRUE);
 }
 
 void EmailClient::inboxItemSelected()
 {
   item = (EmailListItem*) inboxView->selectedItem();
   if (item != NULL) {
     emit viewEmail(inboxView, item->getMail());
   }
 }
 
 void EmailClient::outboxItemSelected()
 {
   item = (EmailListItem*) outboxView->selectedItem();
   if (item != NULL) {
     emit viewEmail(outboxView, item->getMail());
   }
 
 }
 
 void EmailClient::readMail()
 {
   Email mail;
   int start, stop;
   QString s, del;
 
   QFile f(getPath(FALSE) + "inbox.txt");
 //  QFileInfo fi(f);
-  qDebug( f.name());
+  //qDebug( f.name());
 
   if ( f.open(IO_ReadOnly) ) {    // file opened successfully
     QTextStream t( &f );        // use a text stream
     s = t.read();
     f.close();
     
     start = 0;
     del = "\n.\n";
     while ((uint) start < s.length()) {
       stop = s.find(del, start);
       if (stop == -1)
         stop = s.length() - del.length();
     
       mail.rawMail = s.mid(start, stop + del.length() - start );
       start = stop + del.length();
       mailArrived(mail, TRUE);
     }
   }
   
   QFile fo(getPath(FALSE) + "outbox.txt");
   if ( fo.open(IO_ReadOnly) ) {    // file opened successfully
     QTextStream t( &fo );        // use a text stream
     s = t.read();
     fo.close();
     
     start = 0;
     del = "\n.\n";
     while ((uint) start < s.length()) {
       stop = s.find(del, start);
       if (stop == -1)
         stop = s.length() - del.length();
     
       mail.rawMail = s.mid(start, stop + del.length() - start );
       start = stop + del.length();
       emailHandler->parse(mail.rawMail, lineShift, &mail);
       mail.sent = false;
       mail.received = false;
           enqueMail(mail);
       
     }
   }
 }
 
 void EmailClient::saveMail(QString fileName, QListView *view)
 {
   QFile f(fileName);
   Email *mail;
   
   if (! f.open(IO_WriteOnly) ) {
     qWarning("could not open file");
     return;
   }
   item = (EmailListItem *) view->firstChild();
-  qDebug (QString("Write : ") );
+  //qDebug (QString("Write : ") );
   QTextStream t(&f);
   while (item != NULL) {
     mail = item->getMail();
-    qDebug(mail->rawMail);
-    qDebug(mail->recipients.first());
+    //qDebug(mail->rawMail);
+    //qDebug(mail->recipients.first());
     t << mail->rawMail;
     
     mailconf->setGroup(mail->id);
     mailconf->writeEntry("mailread", mail->read);
     
     item = (EmailListItem *) item->nextSibling();
   }
   f.close();
 }
 
 //paths for mailit, is settings, inbox, enclosures
 QString EmailClient::getPath(bool enclosurePath)
 {
   QString basePath = "qtmail";
   QString enclosures = "enclosures";
   
   QDir dir = (QString(getenv("HOME")) + "/Applications/" + basePath);
   if ( !dir.exists() )
     dir.mkdir( dir.path() );
   
   if (enclosurePath) {
     dir = (QString(getenv("HOME")) + "/Applications/" + basePath + "/" + enclosures);
     
     if ( !dir.exists() )
       dir.mkdir( dir.path() );
     
     return (dir.path() + "/");
   
   }
   return (dir.path() + "/");
 }
 
 void EmailClient::readSettings()
 {
   TextParser *p;
   QString s;
   int pos, accountPos, y;
   QFile f( getPath(FALSE) + "settings.txt");
   
   if ( f.open(IO_ReadOnly) ) {    // file opened successfully
     QTextStream t( &f );        // use a text stream
     s = t.read();
     f.close();
     
     p = new TextParser(s, "\n");
     
     accountPos = 0;
     while ( (accountPos = p->find("ACCOUNTSTART",';', accountPos, TRUE)) != -1 ) {
       accountPos++;
       if ( (pos = p->find("ACCOUNTNAME",':', accountPos, TRUE)) != -1 )
         account.accountName = p->getString(& ++pos, 'z', TRUE);
       if ( (pos = p->find("NAME",':', accountPos, TRUE)) != -1)
         account.name = p->getString(& ++pos, 'z', TRUE);
       if ( (pos = p->find("EMAIL",':', accountPos, TRUE)) != -1)
         account.emailAddress = p->getString(& ++pos, 'z', TRUE);
       if ( (pos = p->find("POPUSER",':', accountPos, TRUE)) != -1)
         account.popUserName = p->getString(& ++pos, 'z', TRUE);
       if ( (pos = p->find("POPPASSWORD",':', accountPos, TRUE)) != -1)
         account.popPasswd = p->getString(& ++pos, 'z', TRUE);
       if ( (pos = p->find("POPSERVER",':', accountPos, TRUE)) != -1)
         account.popServer = p->getString(& ++pos, 'z', TRUE);
       if ( (pos = p->find("SMTPSERVER",':', accountPos, TRUE)) != -1)
         account.smtpServer = p->getString(& ++pos, 'z', TRUE);
       if ( (pos = p->find("ACCOUNTID",':', accountPos, TRUE)) != -1) {
         s = p->getString(& ++pos, 'z', TRUE);
         account.id = s.toInt();
       }
     
       account.lastServerMailCount = 0;
       account.synchronize = FALSE;
       if ( (pos = p->find("SYNCHRONIZE",':', accountPos, TRUE)) != -1) {
         if (p->getString(& ++pos, 'z', TRUE).upper() == "YES") {
           account.synchronize = TRUE;
           if ( (pos = p->find("LASTSERVERMAILCOUNT",':', accountPos, TRUE)) != -1) {
             s = p->getString(& ++pos, 'z', TRUE);
             account.lastServerMailCount = s.toInt();
           }
         }
       }
       
       if ( (pos = p->find("SYNCLIMIT",':', accountPos, TRUE)) != -1) {
               account.syncLimit = p->getString(& ++pos, 'z', TRUE).toInt();
       }
 
       
       accountList.append(&account);
     }
     delete p;
   }
   mailconf->setGroup("mailitglobal");
   if ( (y = mailconf->readNumEntry("mailidcount", -1)) != -1) {
     mailIdCount = y;
   }
   if ( (y = mailconf->readNumEntry("accountidcount", -1)) != -1) {
     accountIdCount = y;
   }
 }
 
 void EmailClient::saveSettings()
 {
   QString temp;
   QFile f( getPath(FALSE) + "settings.txt");
   MailAccount *accountPtr;
   
   if (! f.open(IO_WriteOnly) ) {
     qWarning("could not save settings file");
     return;
   }
   QTextStream t(&f);
   t << "#Settings for QPE Mailit program\n";
   
   for (accountPtr = accountList.first(); accountPtr != 0;
       accountPtr = accountList.next()) {
 
     t << "accountStart;\n";
     t << "AccountName: " + accountPtr->accountName + "\n";
     t << "Name: " + accountPtr->name + "\n";
     t << "Email: " + accountPtr->emailAddress + "\n";
     t << "POPUser: " + accountPtr->popUserName + "\n";
     t << "POPPAssword: " + accountPtr->popPasswd + "\n";
     t << "POPServer: " + accountPtr->popServer + "\n";
     t << "SMTPServer: " + accountPtr->smtpServer + "\n";
     t << "AccountId: " << accountPtr->id << "\n";
     if (accountPtr->synchronize) {
       t << "Synchronize: Yes\n";
       t << "LastServerMailCount: ";
       t << accountPtr->lastServerMailCount << "\n";
     } else {
       t << "Synchronize: No\n";
     }
     t << "SyncLimit: ";
     t << accountPtr->syncLimit << "\n";
     t << "accountEnd;\n";
   }
   f.close();
   
   mailconf->setGroup("mailitglobal");
   mailconf->writeEntry("mailidcount", mailIdCount);
   mailconf->writeEntry("accountidcount", accountIdCount);
 }
 
 void EmailClient::selectAccount(int id)
 {
   if (accountList.count() > 0) {
     currentAccount = accountList.at(id);
     emit newCaption("Mailit - " + currentAccount->accountName);
     getNewMail();
   } else {
     emit newCaption("Mailit ! No account defined");
   }
 }
 
 void EmailClient::editAccount(int id)
 {
   MailAccount *newAccount;
     
   editAccountView = new EditAccount(this, "account", TRUE);
   if (id == newAccountId) {   //new account
     newAccount = new MailAccount;
     editAccountView->setAccount(newAccount);
   } else {
     newAccount = accountList.at(id);
     editAccountView->setAccount(newAccount, FALSE);
   }
   
   editAccountView->showMaximized();
   editAccountView->exec();
   
   if (editAccountView->result() == QDialog::Accepted) {
     if (id == newAccountId) {
       newAccount->id = accountIdCount;
       accountIdCount++;
       accountList.append(newAccount);
       updateAccounts();
     } else {
       updateAccounts();
     }
   }
   
   delete editAccountView;
 }
 
 void EmailClient::deleteAccount(int id)
 {
   MailAccount *newAccount;
   QString message;
   
   newAccount = accountList.at(id);
   message = "Delete account:\n" + newAccount->accountName;
   switch( QMessageBox::warning( this, "Mailit", message,
       "Yes", "No", 0, 0, 1 ) ) {
     
     case 0: accountList.remove(id);
         updateAccounts();
         break;
     case 1:
         break;
   }
 }
 
 void EmailClient::updateAccounts()
 {
   MailAccount *accountPtr;
   
   //rebuild menus, clear all first
   editAccountMenu->clear();
   selectAccountMenu->clear();
   deleteAccountMenu->clear();
 
   newAccountId = editAccountMenu->insertItem("New", this,
       SLOT(editAccount(int)) );
   editAccountMenu->insertSeparator();
   
   idCount = 0;
   for (accountPtr = accountList.first(); accountPtr != 0;
       accountPtr = accountList.next()) {
     
     editAccountMenu->insertItem(accountPtr->accountName,
       this, SLOT(editAccount(int)), 0, idCount);
     selectAccountMenu->insertItem(accountPtr->accountName,
       this, SLOT(selectAccount(int)), 0, idCount);
     deleteAccountMenu->insertItem(accountPtr->accountName,
       this, SLOT(deleteAccount(int)), 0, idCount);
     idCount++;
   }
 }
 
 void EmailClient::deleteMail(EmailListItem *mailItem, bool &inbox)
 {
   Email *mPtr;
   Enclosure *ePtr;
   
   if (inbox) {
     mPtr = mailItem->getMail();
     
     //if mail is in queue for download, remove it from
     //queue if possible
     if ( (receiving) && (mPtr->fromAccountId == currentAccount->id) ) {
       if ( !mPtr->downloaded )
         mailDownloadList.remove(mPtr->serverId, mPtr->size);
     }
     
     mailconf->setGroup(mPtr->id);
     mailconf->clearGroup();
     
     //delete any temporary attatchemnts storing
     for ( ePtr=mPtr->files.first(); ePtr != 0; ePtr=mPtr->files.next() ) {
       if (ePtr->saved) {
         QFile::remove( (ePtr->path + ePtr->name) );
       }
     }
     inboxView->takeItem(mailItem);
   } else {
     outboxView->takeItem(mailItem);
   }
 }
diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp
index 9c1c814..03f8a28 100644
--- a/noncore/net/mailit/emailhandler.cpp
+++ b/noncore/net/mailit/emailhandler.cpp
@@ -1,423 +1,421 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include <qfileinfo.h>
 #include <stdlib.h>
 #include <qapplication.h>
 #include <qmessagebox.h>
 #include <qcstring.h>
 #include "emailhandler.h"
 #include <qpe/applnk.h>
 #include <qpe/filemanager.h>
 
 QCollection::Item EnclosureList::newItem(QCollection::Item d)
 {
   return dupl( (Enclosure *) d);
 }
 
 Enclosure* EnclosureList::dupl(Enclosure *in)
 {
   ac = new Enclosure(*in);
   return ac;
 }
 
 EmailHandler::EmailHandler()
 {
   smtpClient = new SmtpClient();
   popClient = new PopClient();
   
   connect(smtpClient, SIGNAL(errorOccurred(int)), this,
       SIGNAL(smtpError(int)) );
   connect(smtpClient, SIGNAL(mailSent()), this, SIGNAL(mailSent()) );
   connect(smtpClient, SIGNAL(updateStatus(const QString &)), this,
       SIGNAL(updateSmtpStatus(const QString &)) );
   
   connect(popClient, SIGNAL(errorOccurred(int)), this,
       SIGNAL(popError(int)) );
   connect(popClient, SIGNAL(newMessage(const QString &, int, uint, bool)),
       this, SLOT(messageArrived(const QString &, int, uint, bool)) );
   connect(popClient, SIGNAL(updateStatus(const QString &)), this,
       SIGNAL(updatePopStatus(const QString &)) );
   connect(popClient, SIGNAL(mailTransfered(int)), this,
       SIGNAL(mailTransfered(int)) );
 
 
   //relaying size information
   connect(popClient, SIGNAL(currentMailSize(int)),
     this, SIGNAL(currentMailSize(int)) );
   connect(popClient, SIGNAL(downloadedSize(int)),
     this, SIGNAL(downloadedSize(int)) );
 }
 
 void EmailHandler::sendMail(QList<Email> *mailList)
 {
   Email *currentMail;
   QString temp;
   QString userName = mailAccount.name;
   userName += " <" + mailAccount.emailAddress + ">";
   
   for (currentMail = mailList->first(); currentMail != 0;
       currentMail = mailList->next()) {
     
     if (encodeMime(currentMail) == 0) {
       smtpClient->addMail(userName, currentMail->subject,
         currentMail->recipients, currentMail->rawMail);
     } else {                    //error
       temp = tr("Could not locate all files in \nmail with subject: ") +
         currentMail->subject;
       temp += tr("\nMail has NOT been sent");
       QMessageBox::warning(qApp->activeWindow(), tr("Attachment error"), temp, tr("OK\n"));
       
     }
   }
   smtpClient->newConnection(mailAccount.smtpServer, 25);
 }
 
 void EmailHandler::setAccount(MailAccount account)
 {
   mailAccount = account;
 }
 
 void EmailHandler::getMail()
 {
   popClient->setAccount(mailAccount.popUserName, mailAccount.popPasswd);
   if (mailAccount.synchronize) {
     popClient->setSynchronize(mailAccount.lastServerMailCount);
   } else {
     popClient->removeSynchronize();
   }
   
   headers = FALSE;
   popClient->headersOnly(headers, 0);
   popClient->newConnection(mailAccount.popServer, 110);
 }
 
 void EmailHandler::getMailHeaders()
 {
   popClient->setAccount(mailAccount.popUserName, mailAccount.popPasswd);
   if (mailAccount.synchronize) {
     popClient->setSynchronize(mailAccount.lastServerMailCount);
   } else {
     popClient->removeSynchronize();
   }
   
   headers = TRUE;
   popClient->headersOnly(headers, mailAccount.syncLimit);  //less than requested syncLimit, download all
   popClient->newConnection(mailAccount.popServer, 110);
 }
 
 void EmailHandler::getMailByList(MailList *mailList)
 {
   if (mailList->count() == 0) { //should not occur though
     emit mailTransfered(0);
     return;
   }
   
   headers = FALSE;
   popClient->headersOnly(FALSE, 0);
   popClient->newConnection(mailAccount.popServer, 110);
   popClient->setSelectedMails(mailList);
 }
 
 void EmailHandler::messageArrived(const QString &message, int id, uint size, bool complete)
 {
   Email mail;
   
   mail.rawMail = message;
   mail.serverId = id;
   mail.size = size;
   mail.downloaded = complete;
   
   emit mailArrived(mail, FALSE);
 }
 
 bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
 {
   QString temp, boundary;
   int pos;
   QString delimiter, header, body, mimeHeader, mimeBody;
   QString content, contentType, contentAttribute, id, encoding;
   QString fileName, storedName;
   int enclosureId = 0;
   
   mail->rawMail = in;
   mail->received = TRUE;
   mail->files.setAutoDelete(TRUE);
   
   temp = lineShift + "." + lineShift;
   
   if (in.right(temp.length()) != temp) {
-    qWarning(in.right(temp.length()));
-    qWarning(" . added at end of email as separator");
     mail->rawMail += temp;
   }
 
   
   delimiter = lineShift + lineShift;  // "\n\n" or "\r\n\r\n"
   pos = in.find(delimiter, 0, FALSE);
   header = in.left(pos);
   body = in.right(in.length() - pos - delimiter.length());
   if ((body.at(body.length()-2) == '.') && (body.at(body.length()-3) == '\n'))
       body.truncate(body.length()-2);
   
   TextParser p(header, lineShift);
   
   if ((pos = p.find("FROM",':', 0, TRUE)) != -1) {
     pos++;
     if (p.separatorAt(pos) == ' ') {
       mail->from = p.getString(&pos, '<', false);
       mail->from = mail->from.stripWhiteSpace();
       if ( (mail->from.length() > 2) && (mail->from[0] == '"') ) {
         mail->from = mail->from.left(mail->from.length() - 1);
         mail->from = mail->from.right(mail->from.length() - 1);
       }
       pos++;
       mail->fromMail = p.getString(&pos, '>', false);
     } else {
       if ((p.separatorAt(pos) == '<')
           || (p.separatorAt(pos) == ' '))       //No name.. nasty
           pos++;
           pos++;
       mail->fromMail = p.getString(&pos, 'z', TRUE);
       if (mail->fromMail.at(mail->fromMail.length()-1) == '>')
       mail->fromMail.truncate(mail->fromMail.length() - 1);
       mail->from=mail->fromMail;
     }
   }
   
   //@@@ToDo: Rewrite the parser as To: stops at the first occurence- which is Delivered-To:
   if (pos = p.find("TO",':', pos, TRUE) != -1)
   {
             pos++;
             mail->recipients.append (p.getString(&pos, 'z', TRUE) );
   }
  
   
   
   if ((pos = p.find("SUBJECT",':', 0, TRUE)) != -1) {
     pos++;
     mail->subject = p.getString(&pos, 'z', TRUE);
   }
   if ((pos = p.find("DATE",':', 0, TRUE)) != -1) {
     pos++;
     mail->date = p.getString(&pos, 'z', true);
   }
   
   
   
   if ((pos = p.find("MESSAGE",'-', 0, TRUE)) != -1) {
     pos++;
     if ( (p.wordAt(pos).upper() == "ID") &&
       (p.separatorAt(pos) == ':') ) {
       
       id = p.getString(&pos, 'z', TRUE);
       mail->id = id;
     }
   }
   
   pos = 0;
   while ( ((pos = p.find("MIME",'-', pos, TRUE)) != -1) ) {
     pos++;
     if ( (p.wordAt(pos).upper() == "VERSION") &&
       (p.separatorAt(pos) == ':') ) {
         pos++;
         if (p.getString(&pos, 'z', true) == "1.0") {
           mail->mimeType = 1;
         }
     }
   }
   
   if (mail->mimeType == 1) {
     boundary = "";
     if ((pos = p.find("BOUNDARY", '=', 0, TRUE)) != -1) {
       pos++;
       boundary = p.getString(&pos, 'z', true);
       if (boundary[0] == '"') {
         boundary = boundary.left(boundary.length() - 1); //strip "
         boundary = boundary.right(boundary.length() - 1); //strip "
       }
       boundary = "--" + boundary;   //create boundary field
     }
     
     if (boundary == "") {     //fooled by Mime-Version
       mail->body = body;
       mail->bodyPlain = body;
       return mail;
     }
     
     while (body.length() > 0) {
       pos = body.find(boundary, 0, FALSE);
       pos = body.find(delimiter, pos, FALSE);
       mimeHeader = body.left(pos);
       mimeBody = body.right(body.length() - pos - delimiter.length());
       TextParser bp(mimeHeader, lineShift);
     
       contentType = "";
       contentAttribute = "";
       fileName = "";
       if ((pos = bp.find("CONTENT",'-', 0, TRUE)) != -1) {
         pos++;
         if ( (bp.wordAt(pos).upper() == "TYPE") &&
           (bp.separatorAt(pos) == ':') ) {
           contentType = bp.nextWord().upper();
           if (bp.nextSeparator() == '/')
             contentAttribute = bp.nextWord().upper();
           content = contentType + "/" + contentAttribute;
         }
         if ((pos = bp.find("ENCODING",':', 0, TRUE)) != -1) {
           pos++;
           encoding = bp.getString(&pos, 'z', TRUE);
         }
         
         if ( (pos = bp.find("FILENAME",'=', 0, TRUE)) != -1) {
           pos++;
           fileName = bp.getString(&pos, 'z', TRUE);
           fileName = fileName.right(fileName.length() - 1);
           fileName = fileName.left(fileName.length() - 1);
         }
 
       }
       pos = mimeBody.find(boundary, 0, FALSE);
       if (pos == -1)            //should not occur, malformed mail
         pos = mimeBody.length();
       body = mimeBody.right(mimeBody.length() - pos);
       mimeBody = mimeBody.left(pos);
         
       if (fileName != "") { //attatchments of some type, audio, image etc.
         
         Enclosure e;
         e.id = enclosureId;
         e.originalName = fileName;
         e.contentType = contentType;
         e.contentAttribute = contentAttribute;
         e.encoding = encoding;
         e.body = mimeBody;
         e.saved = FALSE;
         mail->addEnclosure(&e);
         enclosureId++;
         
       } else if (contentType == "TEXT") {
         if (contentAttribute == "PLAIN") {
           mail->body = mimeBody;
           mail->bodyPlain = mimeBody;
         }
         if (contentAttribute == "HTML") {
           mail->body = mimeBody;
         }
       }
     }
   } else {
     mail->bodyPlain = body;
     mail->body = body;
   }
   return TRUE;
 }
 
 bool EmailHandler::getEnclosure(Enclosure *ePtr)
 {
   QFile f(ePtr->path + ePtr->name);
   char src[4];
   char *destPtr;
   QByteArray buffer;
   uint bufCount, pos, decodedCount, size, x;
   
   if (! f.open(IO_WriteOnly) ) {
     qWarning("could not save: " + ePtr->path + ePtr->name);
     return FALSE;
   }
   
   if (ePtr->encoding.upper() == "BASE64") {
     size = (ePtr->body.length() * 3 / 4); //approximate size (always above)
     buffer.resize(size);
     bufCount = 0;
     pos = 0;
     destPtr = buffer.data();
     
     while (pos < ePtr->body.length()) {
       decodedCount = 4;
       x = 0;
       while ( (x < 4) && (pos < ePtr->body.length()) ) {
         src[x] = ePtr->body[pos].latin1();
         pos++;
         if (src[x] == '\r' || src[x] == '\n' || src[x] == ' ')
           x--;
         x++;
       }
       if (x > 1) {
         decodedCount = parse64base(src, destPtr);
         destPtr += decodedCount;
         bufCount += decodedCount;
       }
     }
     
     buffer.resize(bufCount);  //set correct length of file
     f.writeBlock(buffer);
   } else {
     QTextStream t(&f);
     t << ePtr->body;
   }
   return TRUE;
 }
 
 int EmailHandler::parse64base(char *src, char *bufOut) {
   
   char c, z;
   char li[4];
   int processed;
 
   //conversion table withouth table...
   for (int x = 0; x < 4; x++) {
     c = src[x];
   
     if ( (int) c >= 'A' && (int) c <= 'Z')
       li[x] = (int) c - (int) 'A';
     if ( (int) c >= 'a' && (int) c <= 'z')
       li[x] = (int) c - (int) 'a' + 26;
     if ( (int) c >= '0' && (int) c <= '9')
       li[x] = (int) c - (int) '0' + 52;
     if (c == '+')
       li[x] = 62;
     if (c == '/')
       li[x] = 63;
   }
   
   processed = 1;
   bufOut[0] = (char) li[0] & (32+16+8+4+2+1); //mask out top 2 bits
   bufOut[0] <<= 2;
   z = li[1] >> 4;
   bufOut[0] = bufOut[0] | z;    //first byte retrived
     
   if (src[2] != '=') {
     bufOut[1] = (char) li[1] & (8+4+2+1); //mask out top 4 bits
     bufOut[1] <<= 4;
     z = li[2] >> 2;
     bufOut[1] = bufOut[1] | z;    //second byte retrived
     processed++;
 
     if (src[3] != '=') {
       bufOut[2] = (char) li[2] & (2+1); //mask out top 6 bits
       bufOut[2] <<= 6;
       z = li[3];
       bufOut[2] = bufOut[2] | z;  //third byte retrieved
       processed++;
     }
   }
   return processed;
 }
 
diff --git a/noncore/net/mailit/mailitwindow.cpp b/noncore/net/mailit/mailitwindow.cpp
index fd49c1f..2bf1dcb 100644
--- a/noncore/net/mailit/mailitwindow.cpp
+++ b/noncore/net/mailit/mailitwindow.cpp
@@ -1,136 +1,133 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "mailitwindow.h"
 
 MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
   : QMainWindow(parent, name, fl)
 {
   currentCaption = "Mailit";
   setCaption(tr(currentCaption));
   views = new QWidgetStack(this);
   setCentralWidget(views);
   
-  qWarning("***Starting writeMail");
  emailClient = new EmailClient(views, "client");
   writeMail = new WriteMail(views, "writing");
   readMail = new ReadMail(views, "reading");
-  qWarning("***Finished readMail");
 
   views->raiseWidget(emailClient);
                         
   connect(emailClient, SIGNAL(composeRequested()),
     this, SLOT(compose()) );
   connect(emailClient, SIGNAL(viewEmail(QListView *, Email *)), this,
       SLOT(viewMail(QListView *, Email *)) );
   connect(emailClient, SIGNAL(mailUpdated(Email *)), this,
       SLOT(updateMailView(Email *)) );
 
   connect(writeMail, SIGNAL(cancelMail()), this, SLOT(showEmailClient()) );
   connect(writeMail, SIGNAL(sendMailRequested(const Email &)), this,
       SLOT(showEmailClient()) );
   connect(writeMail, SIGNAL(sendMailRequested(const Email &)), emailClient,
       SLOT(enqueMail(const Email &)) );
   
   connect(readMail, SIGNAL(cancelView()), this, SLOT(showEmailClient()) );
   connect(readMail, SIGNAL(replyRequested(Email &)), this,
     SLOT(composeReply(Email &)) );
   connect(readMail, SIGNAL(removeItem(EmailListItem *, bool &)), emailClient,
     SLOT(deleteMail(EmailListItem *, bool &)) );
   connect(readMail, SIGNAL(viewingMail(Email *)), emailClient,
     SLOT(moveMailFront(Email *)) );
   
   connect(emailClient, SIGNAL(newCaption(const QString &)),
     this, SLOT(updateCaption(const QString &)) );
   viewingMail = FALSE;
   
-  qWarning("***Finished MailitWindow");
 }
 
 MailItWindow::~MailItWindow()
 {
 }
 
 void MailItWindow::closeEvent(QCloseEvent *e)
 {
   if (views->visibleWidget() == emailClient) {
     e->accept();
   } else {
     showEmailClient();
   }
 }
 
 void MailItWindow::compose()
 {
   viewingMail = FALSE;
   emailClient->hide();
   readMail->hide();
   views->raiseWidget(writeMail);
   writeMail->setAddressList(emailClient->getAdrListRef());
   setCaption( tr( "Write mail"  ) );
 }
 
 void MailItWindow::composeReply(Email &mail)
 {
   compose();
   writeMail->reply(mail);
 }
 
 void MailItWindow::showEmailClient()
 {
   viewingMail = FALSE;
   writeMail->hide();
   readMail->hide();
   views->raiseWidget(emailClient);
   setCaption( tr(currentCaption) );
 }
 
 void MailItWindow::viewMail(QListView *view, Email *mail)
 {
   viewingMail = TRUE;
   emailClient->hide();
   readMail->update(view, mail);
   views->raiseWidget(readMail);
   setCaption( tr( "Examine mail"  ) );
 }
 
 void MailItWindow::updateMailView(Email *mail)
 {
   if (viewingMail) {
     readMail->mailUpdated(mail);
   }
 }
 
 void MailItWindow::updateCaption(const QString &newCaption)
 {
   currentCaption = newCaption;
   setCaption(tr(currentCaption));
 }
 
 void MailItWindow::setDocument(const QString &_address)
 {
     // strip leading 'mailto:'
     QString address = _address;
     if (address.startsWith("mailto:"))
         address = address.mid(6);
  
     compose();
     writeMail->setRecipient(address);
 }
 
diff --git a/noncore/net/mailit/popclient.cpp b/noncore/net/mailit/popclient.cpp
index 2f14ed2..f9cc337 100644
--- a/noncore/net/mailit/popclient.cpp
+++ b/noncore/net/mailit/popclient.cpp
@@ -1,375 +1,375 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "popclient.h"
 #include "emailhandler.h"
 //#define APOP_TEST
 
 extern "C" {
 #include "md5.h"
 }
 
 #include <qcstring.h>
 
 PopClient::PopClient()
 {
   socket = new QSocket(this, "popClient");
   connect(socket, SIGNAL(error(int)), this, SLOT(errorHandling(int)));
   connect(socket, SIGNAL(connected()), this, SLOT(connectionEstablished()));
   connect(socket, SIGNAL(readyRead()), this, SLOT(incomingData()));
   
   stream = new QTextStream(socket);
   
   receiving = FALSE;
   synchronize = FALSE;
   lastSync = 0;
   headerLimit = 0;
   preview = FALSE;
 }
 
 PopClient::~PopClient()
 {
   delete socket;
   delete stream;
 }
 
 void PopClient::newConnection(QString target, int port)
 {
   if (receiving) {
     qWarning("socket in use, connection refused");
     return;
   }
   
   status = Init;
   
   socket->connectToHost(target, port);
   receiving = TRUE;
   selected = FALSE;
     
   emit updateStatus("DNS lookup");
 }
 
 void PopClient::setAccount(QString popUser, QString popPasswd)
 {
   popUserName = popUser;
   popPassword = popPasswd;
 }             
 
 void PopClient::setSynchronize(int lastCount)
 {
   synchronize = TRUE;
   lastSync = lastCount;
 }
 
 void PopClient::removeSynchronize()
 {
   synchronize = FALSE;
   lastSync = 0;
 }
 
 void PopClient::headersOnly(bool headers, int limit)
 {
   preview = headers;
   headerLimit = limit;
 }
 
 void PopClient::setSelectedMails(MailList *list)
 {
   selected = TRUE;
   mailList = list;
 }
 
 void PopClient::connectionEstablished()
 {
   emit updateStatus(tr("Connection established"));
 }
 
 void PopClient::errorHandling(int status)
 {
   emit updateStatus(tr("Error Occured"));
   emit errorOccurred(status);
   socket->close();
   receiving = FALSE;
 }
 
 void PopClient::incomingData()
 {
   QString response, temp, temp2, timeStamp;
   QString md5Source;
   int start, end;
 //  char *md5Digest;
   char md5Digest[16];
 //  if ( !socket->canReadLine() )
 //    return;
   
   response = socket->readLine();
-  qDebug(response +" %d", status);
+  //qDebug(response +" %d", status);
   
   switch(status) {
     //logging in
     case Init:  {
 #ifdef APOP_TEST
        start = response.find('<',0);
        end = response.find('>', start);
        if( start >= 0 && end > start )
        {
           timeStamp = response.mid( start , end - start + 1);
           md5Source = timeStamp + popPassword;
-          qDebug( md5Source);
+          //qDebug( md5Source);
 //           for( int i = 0; i < md5Source.length(); i++) {
 //              buff[i] = (QChar)md5Source[i];
 //           }
           
           md5_buffer( (char const *)md5Source, md5Source.length(),&md5Digest[0]);
 //          md5_buffer(char const *buffer, unsigned int len, char *digest);
  
 //           MD5_Init( &ctx);
 //           MD5_Update( &ctx, buff, sizeof( buff) );
 //           MD5_Final( md5Digest, &ctx);
 //          MD5( buff, md5Source.length(), md5Digest);
 
            for(int j =0;j < MD5_DIGEST_LENGTH ;j++)
            {
               printf("%x", md5Digest[j]);
            }
            printf("\n");          
 //          qDebug(md5Digest);
           *stream << "APOP " <<  popUserName << " " << md5Digest << "\r\n";
           //    qDebug("%s", stream);
           status = Stat;
        }
        else
 #endif
        {
           timeStamp = "";
           *stream << "USER " << popUserName << "\r\n";
           status = Pass;
        }
           
           break;
         }
     //password shhh. don't tell anyone (implement APOP...)
     case Pass:  {
           *stream << "PASS " << popPassword << "\r\n";
           status = Stat;
           break;
         }
     //ask for number of messages
     case Stat:  {
           if (response[0] == '+') {
             *stream << "STAT" << "\r\n";
             status = Mcnt;
           } else errorHandling(ErrLoginFailed);
             break;
           }
     //get count of messages, eg "+OK 4 900.." -> int 4
     case Mcnt:  {
           if (response[0] == '+') {
             temp = response.replace(0, 4, "");
             int x = temp.find(" ", 0);
             temp.truncate((uint) x);
             newMessages = temp.toInt();
             messageCount = 1;
             status = List;
               
             if (synchronize) {
               //messages deleted from server, reload all
               if (newMessages < lastSync)
                 lastSync = 0;
-                messageCount = lastSync + 1;
+                messageCount = 1;
               }
               
               if (selected) {
                 int *ptr = mailList->first();
                 if (ptr != 0) {
                   newMessages++;  //to ensure no early jumpout
                   messageCount = *(mailList->first());
                 } else newMessages = 0;
               }
             } else errorHandling(ErrUnknownResponse);
           }
     //Read message number x, count upwards to messageCount
     case List:  {
           if (messageCount <= newMessages) {
             *stream << "LIST " << messageCount << "\r\n";
             status = Size;
             temp2.setNum(newMessages - lastSync);
             temp.setNum(messageCount - lastSync);
             if (!selected) {
               emit updateStatus(tr("Retrieving ") + temp + "/" + temp2);
             } else {
               //completing a previously closed transfer
               if ( (messageCount - lastSync) <= 0) {
                 temp.setNum(messageCount);
                 emit updateStatus(tr("Previous message ") + temp);
               } else {
                 emit updateStatus(tr("Completing message ") + temp);
               }
             }
             break;
           } else {
             emit updateStatus(tr("No new Messages"));
             status = Quit;
           }
         } 
     //get size of message, eg "500 characters in message.." -> int 500
     case Size:  {
           if (status != Quit) { //because of idiotic switch
             if (response[0] == '+') {
               temp = response.replace(0, 4, "");
               int x = temp.find(" ", 0);
               temp = temp.right(temp.length() - ((uint) x + 1) );
               mailSize = temp.toInt();
               emit currentMailSize(mailSize);
               
               status = Retr;
             } else {
-              qWarning(response);
+              //qWarning(response);
               errorHandling(ErrUnknownResponse);
             }
           }
         } 
     //Read message number x, count upwards to messageCount
     case Retr:  {
           if (status != Quit) {
             if (!preview || mailSize <= headerLimit) {
               *stream << "RETR " << messageCount << "\r\n";
             } else {        //only header
               *stream << "TOP " << messageCount << " 0\r\n";
             }
             messageCount++;
             status = Ignore;
             break;
           }         } 
     case Ignore:  {
           if (status != Quit) { //because of idiotic switch
             if (response[0] == '+') {
               message = "";
               status = Read;
               if (!socket->canReadLine()) //sync. problems
                 break;
               response = socket->readLine();
             } else errorHandling(ErrUnknownResponse);
           }
         }
     //add all incoming lines to body.  When size is reached, send
     //message, and go back to read new message
     case Read:  {
           if (status != Quit) { //because of idiotic switch
             message += response;
             while ( socket->canReadLine() ) {
               response = socket->readLine();
               message += response;
             }
             emit downloadedSize(message.length());
             int x = message.find("\r\n.\r\n",-5);
             if (x == -1) {
               break;
             } else {  //message reach entire size
               //complete mail downloaded
               if ( (!preview ) || ((preview) && (mailSize <= headerLimit)) ){
                 emit newMessage(message, messageCount-1, mailSize, TRUE);
               } else {  //incomplete mail downloaded
-                emit newMessage(message, messageCount-1, mailSize, FALSE);
+                emit newMessage(message, messageCount-1, mailSize, FALSE);
               }
               if (messageCount > newMessages) //that was the last message
                 status = Quit;
               else {        //ask for new message
                 if (selected) {   //grab next from queue
                   int *ptr = mailList->next();
                   if (ptr != 0) {
                     messageCount = *ptr;
                     *stream << "LIST " << messageCount << "\r\n";
                     status = Size;
                     //completing a previously closed transfer
                     if ( (messageCount - lastSync) <= 0) {
                       temp.setNum(messageCount);
                       emit updateStatus(tr("Previous message ") + temp);
                     } else {
                       temp.setNum(messageCount - lastSync);
                       emit updateStatus(tr("Completing message ") + temp);
                     }
                     break;
                   } else {
                     newMessages--;
                     status = Quit;
                   }
                 } else {
                   *stream << "LIST " << messageCount << "\r\n";
                   status = Size;
                   temp2.setNum(newMessages - lastSync);
                   temp.setNum(messageCount - lastSync);
                   emit updateStatus(tr("Retrieving ") + temp + "/" + temp2);
                   
                   break;
                 }
               }
             }
             if (status != Quit)
               break;
           }
         }
     case Quit:  {
           *stream << "Quit\r\n";
           status = Done;
           int newM = newMessages - lastSync;
           if (newM > 0) {
             temp.setNum(newM);
             emit updateStatus(temp + tr(" new messages"));
           } else {
             emit updateStatus(tr("No new messages"));
           }
           
           socket->close();
           receiving = FALSE;
           emit mailTransfered(newM);
           break;
         }
   }
 
 }
 
 // if( bAPOPAuthentication )
 //  {
 //    if( m_strTimeStamp.IsEmpty() )
 //    {
 //      SetLastError("Apop error!");
 //      return false;
 //    }
 //    strMD5Source = m_strTimeStamp+pszPassword;
 //    strMD5Dst = MD5_GetMD5( (BYTE*)(const char*)strMD5Source , strMD5Source.GetLength() );
 //    sprintf(msg , "apop %s %s\r\n" , pszUser , strMD5Dst);
 //    ret = send(m_sPop3Socket , msg , strlen(msg) , NULL);
 //    if(ret == SOCKET_ERROR)
 //    {
 //      SetLastError("Socket error!");
 //      m_bSocketOK = false;
 //      m_bConnected = false;
 //      return false;
 //    }
 //    if( !GetSocketResult(&strResult , COMMAND_END_FLAG) )
 //      return false;
 //    if( 0 == strResult.Find('-' , 0) )
 //    {
 //      SetLastError("Username or Password error!");
 //      return false;
 //    }
 //    m_bConnected = true;
 
 //  }
diff --git a/noncore/net/mailit/readmail.cpp b/noncore/net/mailit/readmail.cpp
index a5e7147..7cd3e09 100644
--- a/noncore/net/mailit/readmail.cpp
+++ b/noncore/net/mailit/readmail.cpp
@@ -1,326 +1,327 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "readmail.h"
 #include <qimage.h>
 #include <qmime.h>
 #include <qaction.h>
 #include <qpe/resource.h>
 
 ReadMail::ReadMail( QWidget* parent,  const char* name, WFlags fl )
         : QMainWindow(parent, name, fl)
 {
         plainTxt = FALSE;
         
         init();
         viewAtt = new ViewAtt(0, "View Attatchments");
 }
 
 ReadMail::~ReadMail()
 {
         delete emailView->mimeSourceFactory();
         delete viewAtt;
 }
 
 void ReadMail::init()
 {
         setToolBarsMovable(FALSE);
         
         bar = new QToolBar(this);
         bar->setHorizontalStretchable( TRUE );
 
         menu = new QMenuBar( bar );
 
         viewMenu = new QPopupMenu(menu);
         menu->insertItem( tr( "&View" ), viewMenu);
 
         mailMenu = new QPopupMenu(menu);
         menu->insertItem( tr( "&Mail" ), mailMenu);
 
         bar = new QToolBar(this);
         
             //reply dependant on viewing inbox
         replyButton = new QAction( tr( "Reply" ), Resource::loadPixmap( "mailit/reply" ),
                 QString::null, 0, this, 0 );
         connect(replyButton, SIGNAL(activated()), this, SLOT(reply()) );
 
         previousButton = new QAction( tr( "Previous" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
         connect( previousButton, SIGNAL( activated() ), this, SLOT( previous() ) );
         previousButton->addTo(bar);
         previousButton->addTo(viewMenu);
 
         nextButton = new QAction( tr( "Next" ), Resource::loadPixmap( "forward" ), QString::null, 0, this, 0 );
         connect( nextButton, SIGNAL( activated() ), this, SLOT( next() ) );
         nextButton->addTo(bar);
         nextButton->addTo(viewMenu);
 
         attatchmentsButton = new QAction( tr( "Attatchments" ), Resource::loadPixmap( "mailit/attach" ), QString::null, 0, this, 0 );
         connect( attatchmentsButton, SIGNAL( activated() ), this,
                 SLOT( viewAttatchments() ) );
         attatchmentsButton->addTo(bar);
         attatchmentsButton->addTo(viewMenu);
         
         plainTextButton = new QAction( tr( "Text Format" ), Resource::loadPixmap( "DocsIcon" ), QString::null, 0, this, 0, TRUE);
         connect( plainTextButton, SIGNAL( activated() ), this, SLOT( shiftText() ) );
         plainTextButton->addTo(bar);
         plainTextButton->addTo(viewMenu);
 
         deleteButton = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 0, this, 0 );
         connect( deleteButton, SIGNAL( activated() ), this, SLOT( deleteItem() ) );
         deleteButton->addTo(bar);
         deleteButton->addTo(mailMenu);
 
         viewMenu->insertItem(Resource::loadPixmap("close"), "Close", this, SLOT(close()));
                 
         emailView = new QTextView( this, "emailView" );
+        
         setCentralWidget(emailView);
 
         mime = new QMimeSourceFactory();
         emailView->setMimeSourceFactory(mime);
 }
 
 void ReadMail::updateView()
 {
         Enclosure *ePtr;
         QString mailStringSize;
         QString text, temp;
         
                 mail->read = TRUE;              //mark as read
         inbox = mail->received;
         
         replyButton->removeFrom(mailMenu);
         replyButton->removeFrom(bar);
         
         if (inbox == TRUE) {
                 replyButton->addTo(bar);
                 replyButton->addTo(mailMenu);
                 
                 if (!mail->downloaded) {
                         //report currently viewed mail so that it will be
                         //placed first in the queue of new mails to download
                         emit viewingMail(mail);
                         
                         double mailSize = (double) mail->size;
                         if (mailSize < 1024) {
                                 mailStringSize.setNum(mailSize);
                                 mailStringSize += " Bytes";
                         } else if (mailSize < 1024*1024) {
                                 mailStringSize.setNum( (mailSize / 1024), 'g', 2 );
                                 mailStringSize += " Kb";
                         } else {
                                 mailStringSize.setNum( (mailSize / (1024*1024)), 'g', 3);
                                 mailStringSize += " Mb";
                         }
                 }
         }
 
         QMimeSourceFactory *mime = emailView->mimeSourceFactory();
         
                 if (! plainTxt) {                                       //use RichText, inline pics etc.
                 emailView->setTextFormat(QTextView::RichText);
                 text = "<b><big><center><font color=\"blue\">" + mail->subject
                         +"</font></center></big></b><br>";
                 text += "<b>From: </b>" + mail->from + " <i>" +
                         mail->fromMail + "</i><br>";
         
                 text +="<b>To: </b>";
                 for (QStringList::Iterator it = mail->recipients.begin();
                         it != mail->recipients.end(); ++it ) {
                         text += *it + " ";
                 }
                 text += "<br>"  + mail->date;
         
                 if (mail->files.count() > 0) {
                         text += "<br><b>Attatchments: </b>";
                         
                         for ( ePtr=mail->files.first(); ePtr != 0; ePtr=mail->files.next() ) {
                                 text += ePtr->originalName + " ";
                         }
                         text += "<hr><br>" + mail->body;
                 
                         if (inbox) {
                                 for ( ePtr=mail->files.first(); ePtr != 0; ePtr=mail->files.next() ) {
 
                                         text += "<br><hr><b>Attatchment: </b>" +
                                                 ePtr->originalName + "<hr>";
                                 
                                         if (ePtr->contentType == "TEXT") {
                                                 QFile f(ePtr->path + ePtr->name);
                                         
                                                 if (f.open(IO_ReadOnly) ) {
                                                         QTextStream t(&f);
                                                         temp = t.read();
                                                         text += temp + "<br>";
                                                         f.close();
                                                 } else {
                                                         text += "<b>Could not locate file</b><br>";
                                                 }
                                         
                                         }
                                         if (ePtr->contentType == "IMAGE") {
         //                                              temp.setNum(emailView->width());//get display width
         //                                      text += "<img width=" + temp +" src =""" +
         //                                              ePtr->originalName + """> </img>";
                                                 text += "<img src =""" +
                                                         ePtr->originalName + """> </img>";
                                                 mime->setPixmap(ePtr->originalName, QPixmap( (ePtr->path + ePtr->name) ));
                                         }
                                 }
                         }
                 } else {
                         if (mail->downloaded || !inbox) {
                                 text += "<hr><br>" + mail->body;
                         } else {
                                 text += "<hr><br><b> Awaiting download </b><br>";
                                 text += "Size of mail: " + mailStringSize;
                         }
                 }
                 emailView->setText(text);
                 } else {                                                                        // show plain txt mail
                 emailView->setTextFormat(QTextView::PlainText);
                 text = "Subject: " + mail->subject + "\n";
                 text += "From: " + mail->from + " " + mail->fromMail + "\n";
                 text += "To: ";
                 for (QStringList::Iterator it = mail->recipients.begin();
                         it != mail->recipients.end(); ++it ) {
                         text += *it + " ";
                 }
                 text += "\nDate: " + mail->date + "\n";
                 if (mail->files.count() > 0) {
                         text += "Attatchments: ";
                         for ( ePtr=mail->files.first(); ePtr != 0; ePtr=mail->files.next() ) {
                                 text += ePtr->originalName + " ";
                         }
                         text += "\n\n";
                 } else text += "\n";
                 
                 if (!inbox) {
                         text += mail->body;
                 } else if (mail->downloaded) {
                         text += mail->bodyPlain;
                 } else {
                         text += "\nAwaiting download\n";
                         text += "Size of mail: " + mailStringSize;
                 }
                 
                 emailView->setText(text);
         }
         
         if (mail->files.count() == 0)
                 attatchmentsButton->setEnabled(FALSE);
         else attatchmentsButton->setEnabled(TRUE);
         
         setCaption("Examining mail: " + mail->subject);
 }
 
 //update view with current EmailListItem (item)
 void ReadMail::update(QListView *thisView, Email *mailIn)
 {
         view = thisView;
         item = (EmailListItem *) view->selectedItem();
         mail = mailIn;
         updateView();
                 updateButtons();
 }
 
 void ReadMail::mailUpdated(Email *mailIn)
 {
         if (mailIn == mail) {
                 updateView();
         } else {
                 updateButtons();
         }
 }
 
 void ReadMail::close()
 {
         emit cancelView();
 }
 
 //gets next item in listview, exits if there is no next
 void ReadMail::next()
 {
         item = (EmailListItem *) item->nextSibling();
         if (item != NULL) {
                 mail = item->getMail();
                 updateView();
         }
         updateButtons();
 }
 
 //gets previous item in listview, exits if there is no previous
 void ReadMail::previous()
 {
         item = (EmailListItem *) item->itemAbove();
         if (item != NULL) {
                 mail = item->getMail();
                 updateView();
         }
         updateButtons();
 }
 
 //deletes item, tries bringing up next or previous, exits if unsucessful
 void ReadMail::deleteItem()
 {
         EmailListItem *temp = item;
                 temp = (EmailListItem *) item->nextSibling();//trybelow
         if (temp == NULL)
                 temp = (EmailListItem *) item->itemAbove(); //try above
         
         emit removeItem(item, inbox);
         
         item = temp;
                 if (item != NULL) {                                                     //more items in list
                 mail = item->getMail();
                 updateView();
                 updateButtons();
                 } else close();                                                         //no more items to see
 }
 
 void ReadMail::updateButtons()
 {
         EmailListItem *temp;
         
         temp = item;
         if ((EmailListItem *) temp->nextSibling() == NULL)
                 nextButton->setEnabled(FALSE);
         else nextButton->setEnabled(TRUE);
         
         temp = item;
         if ((EmailListItem *) temp->itemAbove() == NULL)
                 previousButton->setEnabled(FALSE);
         else previousButton->setEnabled(TRUE);
 }
 
 void ReadMail::shiftText()
 {
         plainTxt = ! plainTxt;
         updateView();
 }
 
 void ReadMail::viewAttatchments()
 {
         viewAtt->update(mail, inbox);
         viewAtt->showMaximized();
 }
 
 void ReadMail::reply()
 {
         emit replyRequested(*mail);
 }
diff --git a/noncore/net/mailit/smtpclient.cpp b/noncore/net/mailit/smtpclient.cpp
index 6699a90..b2e38e5 100644
--- a/noncore/net/mailit/smtpclient.cpp
+++ b/noncore/net/mailit/smtpclient.cpp
@@ -1,171 +1,171 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "smtpclient.h"
 #include "emailhandler.h"
 
 SmtpClient::SmtpClient()
 {
   socket = new QSocket(this, "smtpClient");
   stream = new QTextStream(socket);
   mailList.setAutoDelete(TRUE);
   
   connect(socket, SIGNAL(error(int)), this, SLOT(errorHandling(int)));
   connect(socket, SIGNAL(connected()), this, SLOT(connectionEstablished()));
   connect(socket, SIGNAL(readyRead()), this, SLOT(incomingData()));
   
   sending = FALSE;
 }
 
 SmtpClient::~SmtpClient()
 {
   delete socket;
   delete stream;
 }
 
 void SmtpClient::newConnection(QString target, int port)
 {
   if (sending) {
     qWarning("socket in use, connection refused");
     return;
   }
 
   status = Init;
   sending = TRUE;
   socket->connectToHost(target, port);
   
   emit updateStatus(tr("DNS lookup"));
 }
 
 void SmtpClient::addMail(QString from, QString subject, QStringList to, QString body)
 {
   RawEmail *mail = new RawEmail;
   
   mail->from = from;
   mail->subject = subject;
   mail->to = to;
   mail->body = body;
   
   mailList.append(mail);
 }
 
 void SmtpClient::connectionEstablished()
 {
   emit updateStatus(tr("Connection established"));
 
 }
 
 void SmtpClient::errorHandling(int status)
 {
   emit errorOccurred(status);
   socket->close();
   mailList.clear();
   sending = FALSE;
 }
 
 void SmtpClient::incomingData()
 {
   QString response;
   
   if (!socket->canReadLine())
     return;
   
   response = socket->readLine();
-  qDebug(response);
+  //qDebug(response);
 
   switch(status) {
     case Init:  {
           if (response[0] == '2') {
             status = From;
             mailPtr = mailList.first();
             *stream << "HELO there\r\n";
-            qDebug("HELO");
+            //qDebug("HELO");
           } else errorHandling(ErrUnknownResponse);
           break;
         } 
     case From:  {
           if (response[0] == '2') {
-            *stream << "MAIL FROM: <" << mailPtr->from << ">\r\n";
+            *stream << "MAIL FROM: " << mailPtr->from << "\r\n";
             status = Recv;
-            qDebug("MAIL FROM: "+mailPtr->from);
+            //qDebug("MAIL FROM: "+mailPtr->from);
           } else errorHandling(ErrUnknownResponse);
           break;
         } 
     case Recv:  {
           if (response[0] == '2') {
             it = mailPtr->to.begin();
             if (it == NULL)
               errorHandling(ErrUnknownResponse);
-            *stream << "RCPT TO: <" << *it << ">\r\n";
-            qDebug("RCPT TO: "+ *it);
+            *stream << "RCPT TO: " << *it << ">\r\n";
+            //qDebug("RCPT TO: "+ *it);
             status = MRcv;
           } else errorHandling(ErrUnknownResponse);
           break;
         } 
     case MRcv:  {
           if (response[0] == '2') {
             it++;
             if ( it != mailPtr->to.end() ) {
               *stream << "RCPT TO: <" << *it << ">\r\n";
-            qDebug("RCPT TO: "+ *it);
+            //qDebug("RCPT TO: "+ *it);
               break;
             } else  {
               status = Data;
             }
           } else errorHandling(ErrUnknownResponse);
         } 
     case Data:  {
           if (response[0] == '2') {
             *stream << "DATA\r\n";
             status = Body;
-            qDebug("DATA");
+            //qDebug("DATA");
             emit updateStatus(tr("Sending: ") + mailPtr->subject);
           } else errorHandling(ErrUnknownResponse);
           break;
         } 
     case Body:  {
           if (response[0] == '3') {
             *stream << mailPtr->body << "\r\n.\r\n";
             mailPtr = mailList.next();
             if (mailPtr != NULL) {
               status = From;
             } else {
               status = Quit;
             }
-            qDebug("BODY");
+            //qDebug("BODY");
           } else errorHandling(ErrUnknownResponse);
           break;
         } 
     case Quit:  {
           if (response[0] == '2') {
             *stream << "QUIT\r\n";
             status = Done;
             QString temp;
             temp.setNum(mailList.count());
             emit updateStatus(tr("Sent ") + temp + tr(" messages"));
             emit mailSent();
             mailList.clear();
             sending = FALSE;
             socket->close();
-            qDebug("QUIT");
+            //qDebug("QUIT");
           } else errorHandling(ErrUnknownResponse);
           break;
         }
   }
 }
diff --git a/noncore/unsupported/mailit/addresslist.cpp b/noncore/unsupported/mailit/addresslist.cpp
index 9fe558a..8d9ab91 100644
--- a/noncore/unsupported/mailit/addresslist.cpp
+++ b/noncore/unsupported/mailit/addresslist.cpp
@@ -1,161 +1,161 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include <qfile.h>
 #include <qtextstream.h>
 #include <opie/ocontactaccess.h>
 #include <opie/ocontact.h>
 
 #include "addresslist.h"
 
 AddressList::AddressList()
 {
         addresses.setAutoDelete(TRUE);
         read();
         dirty = FALSE;
 }
 
 AddressList::~AddressList()
 {
         addresses.clear();
 }
 
 void AddressList::addContact(QString email, QString name)
 {
         //skip if not a valid email address,
         if (email.find( '@') == -1)
                 return;
                 
         if ( ! containsEmail(email) ) {
                 Contact *in = new Contact;
                 in->email = email;
                 in->name = name;
                 addresses.append(in);
                 dirty = TRUE;
         }
 }
 
 bool AddressList::containsEmail(QString email)
 {
         return ( getEmailRef(email) != -1 );
 }
 
 bool AddressList::containsName(QString name)
 {
         return ( getNameRef(name) != -1 );
 }
 
 QString AddressList::getNameByEmail(QString email)
 {
         int pos = getEmailRef(email);
         if (pos != -1) {
                 Contact *ptr = addresses.at(pos);
                 return ptr->name;
         }
         
         return NULL;
 }
 
 QString AddressList::getEmailByName(QString name)
 {
         int pos = getNameRef(name);
         if (pos != -1) {
                 Contact *ptr = addresses.at(pos);
                 return ptr->email;
         }
         
         return NULL;
 }
 
 int AddressList::getEmailRef(QString email)
 {
         int pos = 0;
         Contact *ptr;
         
         for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) {
                 if (ptr->email == email)
                         return pos;
                 pos++;
         }
         return -1;
 }
 
 int AddressList::getNameRef(QString name)
 {
         int pos = 0;
         Contact *ptr;
         
         for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) {
                 if (ptr->name == name)
                         return pos;
                 pos++;
         }
         return -1;
 }
 
 QList<Contact>* AddressList::getContactList()
 {
         return &addresses;
 }
 
 void AddressList::read()
 {
         OContactAccess::List::Iterator it;
         
         QString lineEmail, lineName, email, name;
         OContactAccess m_contactdb("mailit");
         OContactAccess::List m_list = m_contactdb.sorted( true, 0, 0, 0 );
         //OContact* oc;
         
         for ( it = m_list.begin(); it != m_list.end(); ++it )
         {
                 //oc=(OContact*) it;
                 if ((*it).defaultEmail().length()!=0)
-                        addContact((*it).defaultEmail(),(*it).fullName());
+                        addContact((*it).defaultEmail(),(*it).fileAs());
         }
         
         /*if (! f.open(IO_ReadOnly) )
                 return;
         
         QTextStream stream(&f);
         
         while (! stream.atEnd() ) {
                 lineEmail = stream.readLine();
                 if (! stream.atEnd() )
                         lineName = stream.readLine();
                 else return;
                 
                 email = getRightString(lineEmail);
                 name = getRightString(lineName);
                 addContact(email, name);
         }
         f.close();*/
 }
 
 QString AddressList::getRightString(QString in)
 {
         QString out = "";
         
         int pos = in.find('=');
         if (pos != -1) {
                 out = in.mid(pos+1).stripWhiteSpace();
         }
         return out;
 }
 
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index 6612541..0d82a9a 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -279,572 +279,572 @@ void EmailClient::mailSent()
 void EmailClient::getNewMail() {
   
   if (accountList.count() == 0) {
     QMessageBox::warning(qApp->activeWindow(),"No account selected",
       "You must create an account", "OK\n");
     return;
   }
   
   setMailAccount();
   
   receiving = TRUE;
   previewingMail = TRUE;
   getMailButton->setEnabled(FALSE);
   cancelButton->setEnabled(TRUE);
   selectAccountMenu->setEnabled(FALSE);
   
   status1Label->setText(currentAccount->accountName + " headers");
   progressBar->reset();
     
   //get any previous mails not downloaded and add to queue
   mailDownloadList.clear();
   Email *mailPtr;
   item = (EmailListItem *) inboxView->firstChild();
   while (item != NULL) {
     mailPtr = item->getMail();
     if ( (!mailPtr->downloaded) && (mailPtr->fromAccountId == currentAccount->id) ) {
       mailDownloadList.sizeInsert(mailPtr->serverId, mailPtr->size);
     }
     item = (EmailListItem *) item->nextSibling();
   }
   
   emailHandler->getMailHeaders();
 }
 
 void EmailClient::getAllNewMail()
 {
   allAccounts = TRUE;
   currentAccount = accountList.first();
   getNewMail();
 }
 
 void EmailClient::mailArrived(const Email &mail, bool fromDisk)
 {
   Enclosure *ePtr;
   Email newMail;
   int thisMailId;
   emailHandler->parse(mail.rawMail, lineShift, &newMail);
   
   mailconf->setGroup(newMail.id);
   
   if (fromDisk) {
     newMail.downloaded = mailconf->readBoolEntry("downloaded");
     newMail.size = mailconf->readNumEntry("size");
     newMail.serverId = mailconf->readNumEntry("serverid");
     newMail.fromAccountId = mailconf->readNumEntry("fromaccountid");
   } else {  //mail arrived from server
     newMail.serverId = mail.serverId;
     newMail.size = mail.size;
     newMail.downloaded = mail.downloaded;
     
     newMail.fromAccountId = currentAccount->id;
     mailconf->writeEntry("fromaccountid", newMail.fromAccountId);
   }
   
   //add if read or not
   newMail.read = mailconf->readBoolEntry("mailread");
     
   //check if new mail
   if ( (thisMailId = mailconf->readNumEntry("internalmailid", -1)) == -1) {
     thisMailId = mailIdCount;
     mailIdCount++;
     
     //set server count, so that if the user aborts, the new
     //header is not reloaded
     if (currentAccount->synchronize)
       currentAccount->lastServerMailCount++;
     
     mailconf->writeEntry("internalmailid", thisMailId);
     mailconf->writeEntry("downloaded", newMail.downloaded);
     mailconf->writeEntry("size", (int) newMail.size);
     mailconf->writeEntry("serverid", newMail.serverId);
     
     addressList->addContact(newMail.fromMail, newMail.from);
   } else if (!fromDisk) {   //body to header arrived
     mailconf->writeEntry("downloaded", TRUE);
   }
   QString stringMailId;
   stringMailId.setNum(thisMailId);
   //se if any attatchments needs to be stored
   for ( ePtr=newMail.files.first(); ePtr != 0; ePtr=newMail.files.next() ) {
     QString stringId;
     stringId.setNum(ePtr->id);
     
     int id = mailconf->readNumEntry("enclosureid_" + stringId);
     if (id != ePtr->id) {     //new entry
       mailconf->writeEntry("enclosureid_" + stringId, ePtr->id);
       mailconf->writeEntry("name_" + stringId, ePtr->originalName);
       mailconf->writeEntry("contenttype_" + stringId, ePtr->contentType);
       mailconf->writeEntry("contentattribute_" + stringId, ePtr->contentAttribute);
       mailconf->writeEntry("saved_" + stringId, ePtr->saved);
       mailconf->writeEntry("installed_" + stringId, FALSE);
       
             ePtr->name = stringMailId + "_" + stringId;
             ePtr->path = getPath(TRUE);
             if (emailHandler->getEnclosure(ePtr)) { //file saved
         ePtr->saved = TRUE;
         mailconf->writeEntry("saved_" + stringId, ePtr->saved);
         mailconf->writeEntry("filename_" + stringId, ePtr->name);
         mailconf->writeEntry("path_" + stringId, ePtr->path);
             } else {
               ePtr->saved = FALSE;
         mailconf->writeEntry("saved_" + stringId, ePtr->saved);
             }
     } else {
       ePtr->saved = mailconf->readBoolEntry("saved_" + stringId);
       ePtr->installed = mailconf->readBoolEntry("installed_" + stringId);
       if (ePtr->saved) {
         ePtr->name = mailconf->readEntry("filename_" + stringId);
         ePtr->path = mailconf->readEntry("path_" + stringId);
       }   
     }
   }
   if (!previewingMail && !fromDisk) {
     Email *mailPtr;
     item = (EmailListItem *) inboxView->firstChild();
     while (item != NULL) {
       mailPtr = item->getMail();
       if (mailPtr->id == newMail.id) {
         item->setMail(newMail);
         emit mailUpdated(item->getMail());
       }
       item = (EmailListItem *) item->nextSibling();
     }
   } else {
     item = new EmailListItem(inboxView, newMail, TRUE);
     if (!newMail.downloaded)
       mailDownloadList.sizeInsert(newMail.serverId, newMail.size);
   }
   
 }
 
 void EmailClient::allMailArrived(int count)
 {
   // not previewing means all mailtransfer has been done
   if (!previewingMail) {
     if ( (allAccounts) && ( (currentAccount = accountList.next()) !=0 ) ) {
       emit newCaption("Mailit - " + currentAccount->accountName);
       getNewMail();
       return;
     } else {
       allAccounts = FALSE;
       receiving = FALSE;
       getMailButton->setEnabled(TRUE);
       cancelButton->setEnabled(FALSE);
       selectAccountMenu->setEnabled(TRUE);
       status1Label->setText("Idle");
   
       progressBar->reset();
       return;
     }
   }
   
   // all headers downloaded from server, start downloading remaining mails
   previewingMail = FALSE;
   status1Label->setText(currentAccount->accountName);
   progressBar->reset();
 
   emailHandler->getMailByList(&mailDownloadList);
 }
 
 void EmailClient::moveMailFront(Email *mailPtr)
 {
   if ( (receiving) && (mailPtr->fromAccountId == currentAccount->id) ) {
     mailDownloadList.moveFront(mailPtr->serverId, mailPtr->size);
   }
 }
 
 void EmailClient::smtpError(int code)
 {
   QString temp;
   
   if (code == ErrUnknownResponse)
     temp = "Unknown response from server";
   
   if (code == QSocket::ErrHostNotFound)
     temp = "host not found";
   if (code == QSocket::ErrConnectionRefused)
     temp = "connection refused";
   if (code == QSocket::ErrSocketRead)
     temp = "socket packet error";
   
   if (code != ErrCancel) {
     QMessageBox::warning(qApp->activeWindow(), "Sending error", temp, "OK\n");
   } else {
     status2Label->setText("Aborted by user");
   }
   
   sending = FALSE;
   sendMailButton->setEnabled(TRUE);
   cancelButton->setEnabled(FALSE);
   quedMessages.clear();
 }
 
 void EmailClient::popError(int code)
 {
   QString temp;
   
   if (code == ErrUnknownResponse)
     temp = "Unknown response from server";
   if (code == ErrLoginFailed)
     temp = "Login failed\nCheck user name and password";
   
   if (code == QSocket::ErrHostNotFound)
     temp = "host not found";
   if (code == QSocket::ErrConnectionRefused)
     temp = "connection refused";
   if (code == QSocket::ErrSocketRead)
     temp = "socket packet error";
     
   if (code != ErrCancel) {
     QMessageBox::warning(qApp->activeWindow(), "Receiving error", temp, "OK\n");
   } else {
     status2Label->setText("Aborted by user");
   }
   
   receiving = FALSE;
   getMailButton->setEnabled(TRUE);
   cancelButton->setEnabled(FALSE);
   selectAccountMenu->setEnabled(TRUE);
 }
 
 void EmailClient::inboxItemSelected()
 {
   item = (EmailListItem*) inboxView->selectedItem();
   if (item != NULL) {
     emit viewEmail(inboxView, item->getMail());
   }
 }
 
 void EmailClient::outboxItemSelected()
 {
   item = (EmailListItem*) outboxView->selectedItem();
   if (item != NULL) {
     emit viewEmail(outboxView, item->getMail());
   }
 
 }
 
 void EmailClient::readMail()
 {
   Email mail;
   int start, stop;
   QString s, del;
 
   QFile f(getPath(FALSE) + "inbox.txt");
 //  QFileInfo fi(f);
-  qDebug( f.name());
+  //qDebug( f.name());
 
   if ( f.open(IO_ReadOnly) ) {    // file opened successfully
     QTextStream t( &f );        // use a text stream
     s = t.read();
     f.close();
     
     start = 0;
     del = "\n.\n";
     while ((uint) start < s.length()) {
       stop = s.find(del, start);
       if (stop == -1)
         stop = s.length() - del.length();
     
       mail.rawMail = s.mid(start, stop + del.length() - start );
       start = stop + del.length();
       mailArrived(mail, TRUE);
     }
   }
   
   QFile fo(getPath(FALSE) + "outbox.txt");
   if ( fo.open(IO_ReadOnly) ) {    // file opened successfully
     QTextStream t( &fo );        // use a text stream
     s = t.read();
     fo.close();
     
     start = 0;
     del = "\n.\n";
     while ((uint) start < s.length()) {
       stop = s.find(del, start);
       if (stop == -1)
         stop = s.length() - del.length();
     
       mail.rawMail = s.mid(start, stop + del.length() - start );
       start = stop + del.length();
       emailHandler->parse(mail.rawMail, lineShift, &mail);
       mail.sent = false;
       mail.received = false;
           enqueMail(mail);
       
     }
   }
 }
 
 void EmailClient::saveMail(QString fileName, QListView *view)
 {
   QFile f(fileName);
   Email *mail;
   
   if (! f.open(IO_WriteOnly) ) {
     qWarning("could not open file");
     return;
   }
   item = (EmailListItem *) view->firstChild();
-  qDebug (QString("Write : ") );
+  //qDebug (QString("Write : ") );
   QTextStream t(&f);
   while (item != NULL) {
     mail = item->getMail();
-    qDebug(mail->rawMail);
-    qDebug(mail->recipients.first());
+    //qDebug(mail->rawMail);
+    //qDebug(mail->recipients.first());
     t << mail->rawMail;
     
     mailconf->setGroup(mail->id);
     mailconf->writeEntry("mailread", mail->read);
     
     item = (EmailListItem *) item->nextSibling();
   }
   f.close();
 }
 
 //paths for mailit, is settings, inbox, enclosures
 QString EmailClient::getPath(bool enclosurePath)
 {
   QString basePath = "qtmail";
   QString enclosures = "enclosures";
   
   QDir dir = (QString(getenv("HOME")) + "/Applications/" + basePath);
   if ( !dir.exists() )
     dir.mkdir( dir.path() );
   
   if (enclosurePath) {
     dir = (QString(getenv("HOME")) + "/Applications/" + basePath + "/" + enclosures);
     
     if ( !dir.exists() )
       dir.mkdir( dir.path() );
     
     return (dir.path() + "/");
   
   }
   return (dir.path() + "/");
 }
 
 void EmailClient::readSettings()
 {
   TextParser *p;
   QString s;
   int pos, accountPos, y;
   QFile f( getPath(FALSE) + "settings.txt");
   
   if ( f.open(IO_ReadOnly) ) {    // file opened successfully
     QTextStream t( &f );        // use a text stream
     s = t.read();
     f.close();
     
     p = new TextParser(s, "\n");
     
     accountPos = 0;
     while ( (accountPos = p->find("ACCOUNTSTART",';', accountPos, TRUE)) != -1 ) {
       accountPos++;
       if ( (pos = p->find("ACCOUNTNAME",':', accountPos, TRUE)) != -1 )
         account.accountName = p->getString(& ++pos, 'z', TRUE);
       if ( (pos = p->find("NAME",':', accountPos, TRUE)) != -1)
         account.name = p->getString(& ++pos, 'z', TRUE);
       if ( (pos = p->find("EMAIL",':', accountPos, TRUE)) != -1)
         account.emailAddress = p->getString(& ++pos, 'z', TRUE);
       if ( (pos = p->find("POPUSER",':', accountPos, TRUE)) != -1)
         account.popUserName = p->getString(& ++pos, 'z', TRUE);
       if ( (pos = p->find("POPPASSWORD",':', accountPos, TRUE)) != -1)
         account.popPasswd = p->getString(& ++pos, 'z', TRUE);
       if ( (pos = p->find("POPSERVER",':', accountPos, TRUE)) != -1)
         account.popServer = p->getString(& ++pos, 'z', TRUE);
       if ( (pos = p->find("SMTPSERVER",':', accountPos, TRUE)) != -1)
         account.smtpServer = p->getString(& ++pos, 'z', TRUE);
       if ( (pos = p->find("ACCOUNTID",':', accountPos, TRUE)) != -1) {
         s = p->getString(& ++pos, 'z', TRUE);
         account.id = s.toInt();
       }
     
       account.lastServerMailCount = 0;
       account.synchronize = FALSE;
       if ( (pos = p->find("SYNCHRONIZE",':', accountPos, TRUE)) != -1) {
         if (p->getString(& ++pos, 'z', TRUE).upper() == "YES") {
           account.synchronize = TRUE;
           if ( (pos = p->find("LASTSERVERMAILCOUNT",':', accountPos, TRUE)) != -1) {
             s = p->getString(& ++pos, 'z', TRUE);
             account.lastServerMailCount = s.toInt();
           }
         }
       }
       
       if ( (pos = p->find("SYNCLIMIT",':', accountPos, TRUE)) != -1) {
               account.syncLimit = p->getString(& ++pos, 'z', TRUE).toInt();
       }
 
       
       accountList.append(&account);
     }
     delete p;
   }
   mailconf->setGroup("mailitglobal");
   if ( (y = mailconf->readNumEntry("mailidcount", -1)) != -1) {
     mailIdCount = y;
   }
   if ( (y = mailconf->readNumEntry("accountidcount", -1)) != -1) {
     accountIdCount = y;
   }
 }
 
 void EmailClient::saveSettings()
 {
   QString temp;
   QFile f( getPath(FALSE) + "settings.txt");
   MailAccount *accountPtr;
   
   if (! f.open(IO_WriteOnly) ) {
     qWarning("could not save settings file");
     return;
   }
   QTextStream t(&f);
   t << "#Settings for QPE Mailit program\n";
   
   for (accountPtr = accountList.first(); accountPtr != 0;
       accountPtr = accountList.next()) {
 
     t << "accountStart;\n";
     t << "AccountName: " + accountPtr->accountName + "\n";
     t << "Name: " + accountPtr->name + "\n";
     t << "Email: " + accountPtr->emailAddress + "\n";
     t << "POPUser: " + accountPtr->popUserName + "\n";
     t << "POPPAssword: " + accountPtr->popPasswd + "\n";
     t << "POPServer: " + accountPtr->popServer + "\n";
     t << "SMTPServer: " + accountPtr->smtpServer + "\n";
     t << "AccountId: " << accountPtr->id << "\n";
     if (accountPtr->synchronize) {
       t << "Synchronize: Yes\n";
       t << "LastServerMailCount: ";
       t << accountPtr->lastServerMailCount << "\n";
     } else {
       t << "Synchronize: No\n";
     }
     t << "SyncLimit: ";
     t << accountPtr->syncLimit << "\n";
     t << "accountEnd;\n";
   }
   f.close();
   
   mailconf->setGroup("mailitglobal");
   mailconf->writeEntry("mailidcount", mailIdCount);
   mailconf->writeEntry("accountidcount", accountIdCount);
 }
 
 void EmailClient::selectAccount(int id)
 {
   if (accountList.count() > 0) {
     currentAccount = accountList.at(id);
     emit newCaption("Mailit - " + currentAccount->accountName);
     getNewMail();
   } else {
     emit newCaption("Mailit ! No account defined");
   }
 }
 
 void EmailClient::editAccount(int id)
 {
   MailAccount *newAccount;
     
   editAccountView = new EditAccount(this, "account", TRUE);
   if (id == newAccountId) {   //new account
     newAccount = new MailAccount;
     editAccountView->setAccount(newAccount);
   } else {
     newAccount = accountList.at(id);
     editAccountView->setAccount(newAccount, FALSE);
   }
   
   editAccountView->showMaximized();
   editAccountView->exec();
   
   if (editAccountView->result() == QDialog::Accepted) {
     if (id == newAccountId) {
       newAccount->id = accountIdCount;
       accountIdCount++;
       accountList.append(newAccount);
       updateAccounts();
     } else {
       updateAccounts();
     }
   }
   
   delete editAccountView;
 }
 
 void EmailClient::deleteAccount(int id)
 {
   MailAccount *newAccount;
   QString message;
   
   newAccount = accountList.at(id);
   message = "Delete account:\n" + newAccount->accountName;
   switch( QMessageBox::warning( this, "Mailit", message,
       "Yes", "No", 0, 0, 1 ) ) {
     
     case 0: accountList.remove(id);
         updateAccounts();
         break;
     case 1:
         break;
   }
 }
 
 void EmailClient::updateAccounts()
 {
   MailAccount *accountPtr;
   
   //rebuild menus, clear all first
   editAccountMenu->clear();
   selectAccountMenu->clear();
   deleteAccountMenu->clear();
 
   newAccountId = editAccountMenu->insertItem("New", this,
       SLOT(editAccount(int)) );
   editAccountMenu->insertSeparator();
   
   idCount = 0;
   for (accountPtr = accountList.first(); accountPtr != 0;
       accountPtr = accountList.next()) {
     
     editAccountMenu->insertItem(accountPtr->accountName,
       this, SLOT(editAccount(int)), 0, idCount);
     selectAccountMenu->insertItem(accountPtr->accountName,
       this, SLOT(selectAccount(int)), 0, idCount);
     deleteAccountMenu->insertItem(accountPtr->accountName,
       this, SLOT(deleteAccount(int)), 0, idCount);
     idCount++;
   }
 }
 
 void EmailClient::deleteMail(EmailListItem *mailItem, bool &inbox)
 {
   Email *mPtr;
   Enclosure *ePtr;
   
   if (inbox) {
     mPtr = mailItem->getMail();
     
     //if mail is in queue for download, remove it from
     //queue if possible
     if ( (receiving) && (mPtr->fromAccountId == currentAccount->id) ) {
       if ( !mPtr->downloaded )
         mailDownloadList.remove(mPtr->serverId, mPtr->size);
     }
     
     mailconf->setGroup(mPtr->id);
     mailconf->clearGroup();
     
     //delete any temporary attatchemnts storing
     for ( ePtr=mPtr->files.first(); ePtr != 0; ePtr=mPtr->files.next() ) {
       if (ePtr->saved) {
         QFile::remove( (ePtr->path + ePtr->name) );
       }
     }
     inboxView->takeItem(mailItem);
   } else {
     outboxView->takeItem(mailItem);
   }
 }
diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp
index 9c1c814..03f8a28 100644
--- a/noncore/unsupported/mailit/emailhandler.cpp
+++ b/noncore/unsupported/mailit/emailhandler.cpp
@@ -1,423 +1,421 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include <qfileinfo.h>
 #include <stdlib.h>
 #include <qapplication.h>
 #include <qmessagebox.h>
 #include <qcstring.h>
 #include "emailhandler.h"
 #include <qpe/applnk.h>
 #include <qpe/filemanager.h>
 
 QCollection::Item EnclosureList::newItem(QCollection::Item d)
 {
   return dupl( (Enclosure *) d);
 }
 
 Enclosure* EnclosureList::dupl(Enclosure *in)
 {
   ac = new Enclosure(*in);
   return ac;
 }
 
 EmailHandler::EmailHandler()
 {
   smtpClient = new SmtpClient();
   popClient = new PopClient();
   
   connect(smtpClient, SIGNAL(errorOccurred(int)), this,
       SIGNAL(smtpError(int)) );
   connect(smtpClient, SIGNAL(mailSent()), this, SIGNAL(mailSent()) );
   connect(smtpClient, SIGNAL(updateStatus(const QString &)), this,
       SIGNAL(updateSmtpStatus(const QString &)) );
   
   connect(popClient, SIGNAL(errorOccurred(int)), this,
       SIGNAL(popError(int)) );
   connect(popClient, SIGNAL(newMessage(const QString &, int, uint, bool)),
       this, SLOT(messageArrived(const QString &, int, uint, bool)) );
   connect(popClient, SIGNAL(updateStatus(const QString &)), this,
       SIGNAL(updatePopStatus(const QString &)) );
   connect(popClient, SIGNAL(mailTransfered(int)), this,
       SIGNAL(mailTransfered(int)) );
 
 
   //relaying size information
   connect(popClient, SIGNAL(currentMailSize(int)),
     this, SIGNAL(currentMailSize(int)) );
   connect(popClient, SIGNAL(downloadedSize(int)),
     this, SIGNAL(downloadedSize(int)) );
 }
 
 void EmailHandler::sendMail(QList<Email> *mailList)
 {
   Email *currentMail;
   QString temp;
   QString userName = mailAccount.name;
   userName += " <" + mailAccount.emailAddress + ">";
   
   for (currentMail = mailList->first(); currentMail != 0;
       currentMail = mailList->next()) {
     
     if (encodeMime(currentMail) == 0) {
       smtpClient->addMail(userName, currentMail->subject,
         currentMail->recipients, currentMail->rawMail);
     } else {                    //error
       temp = tr("Could not locate all files in \nmail with subject: ") +
         currentMail->subject;
       temp += tr("\nMail has NOT been sent");
       QMessageBox::warning(qApp->activeWindow(), tr("Attachment error"), temp, tr("OK\n"));
       
     }
   }
   smtpClient->newConnection(mailAccount.smtpServer, 25);
 }
 
 void EmailHandler::setAccount(MailAccount account)
 {
   mailAccount = account;
 }
 
 void EmailHandler::getMail()
 {
   popClient->setAccount(mailAccount.popUserName, mailAccount.popPasswd);
   if (mailAccount.synchronize) {
     popClient->setSynchronize(mailAccount.lastServerMailCount);
   } else {
     popClient->removeSynchronize();
   }
   
   headers = FALSE;
   popClient->headersOnly(headers, 0);
   popClient->newConnection(mailAccount.popServer, 110);
 }
 
 void EmailHandler::getMailHeaders()
 {
   popClient->setAccount(mailAccount.popUserName, mailAccount.popPasswd);
   if (mailAccount.synchronize) {
     popClient->setSynchronize(mailAccount.lastServerMailCount);
   } else {
     popClient->removeSynchronize();
   }
   
   headers = TRUE;
   popClient->headersOnly(headers, mailAccount.syncLimit);  //less than requested syncLimit, download all
   popClient->newConnection(mailAccount.popServer, 110);
 }
 
 void EmailHandler::getMailByList(MailList *mailList)
 {
   if (mailList->count() == 0) { //should not occur though
     emit mailTransfered(0);
     return;
   }
   
   headers = FALSE;
   popClient->headersOnly(FALSE, 0);
   popClient->newConnection(mailAccount.popServer, 110);
   popClient->setSelectedMails(mailList);
 }
 
 void EmailHandler::messageArrived(const QString &message, int id, uint size, bool complete)
 {
   Email mail;
   
   mail.rawMail = message;
   mail.serverId = id;
   mail.size = size;
   mail.downloaded = complete;
   
   emit mailArrived(mail, FALSE);
 }
 
 bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
 {
   QString temp, boundary;
   int pos;
   QString delimiter, header, body, mimeHeader, mimeBody;
   QString content, contentType, contentAttribute, id, encoding;
   QString fileName, storedName;
   int enclosureId = 0;
   
   mail->rawMail = in;
   mail->received = TRUE;
   mail->files.setAutoDelete(TRUE);
   
   temp = lineShift + "." + lineShift;
   
   if (in.right(temp.length()) != temp) {
-    qWarning(in.right(temp.length()));
-    qWarning(" . added at end of email as separator");
     mail->rawMail += temp;
   }
 
   
   delimiter = lineShift + lineShift;  // "\n\n" or "\r\n\r\n"
   pos = in.find(delimiter, 0, FALSE);
   header = in.left(pos);
   body = in.right(in.length() - pos - delimiter.length());
   if ((body.at(body.length()-2) == '.') && (body.at(body.length()-3) == '\n'))
       body.truncate(body.length()-2);
   
   TextParser p(header, lineShift);
   
   if ((pos = p.find("FROM",':', 0, TRUE)) != -1) {
     pos++;
     if (p.separatorAt(pos) == ' ') {
       mail->from = p.getString(&pos, '<', false);
       mail->from = mail->from.stripWhiteSpace();
       if ( (mail->from.length() > 2) && (mail->from[0] == '"') ) {
         mail->from = mail->from.left(mail->from.length() - 1);
         mail->from = mail->from.right(mail->from.length() - 1);
       }
       pos++;
       mail->fromMail = p.getString(&pos, '>', false);
     } else {
       if ((p.separatorAt(pos) == '<')
           || (p.separatorAt(pos) == ' '))       //No name.. nasty
           pos++;
           pos++;
       mail->fromMail = p.getString(&pos, 'z', TRUE);
       if (mail->fromMail.at(mail->fromMail.length()-1) == '>')
       mail->fromMail.truncate(mail->fromMail.length() - 1);
       mail->from=mail->fromMail;
     }
   }
   
   //@@@ToDo: Rewrite the parser as To: stops at the first occurence- which is Delivered-To:
   if (pos = p.find("TO",':', pos, TRUE) != -1)
   {
             pos++;
             mail->recipients.append (p.getString(&pos, 'z', TRUE) );
   }
  
   
   
   if ((pos = p.find("SUBJECT",':', 0, TRUE)) != -1) {
     pos++;
     mail->subject = p.getString(&pos, 'z', TRUE);
   }
   if ((pos = p.find("DATE",':', 0, TRUE)) != -1) {
     pos++;
     mail->date = p.getString(&pos, 'z', true);
   }
   
   
   
   if ((pos = p.find("MESSAGE",'-', 0, TRUE)) != -1) {
     pos++;
     if ( (p.wordAt(pos).upper() == "ID") &&
       (p.separatorAt(pos) == ':') ) {
       
       id = p.getString(&pos, 'z', TRUE);
       mail->id = id;
     }
   }
   
   pos = 0;
   while ( ((pos = p.find("MIME",'-', pos, TRUE)) != -1) ) {
     pos++;
     if ( (p.wordAt(pos).upper() == "VERSION") &&
       (p.separatorAt(pos) == ':') ) {
         pos++;
         if (p.getString(&pos, 'z', true) == "1.0") {
           mail->mimeType = 1;
         }
     }
   }
   
   if (mail->mimeType == 1) {
     boundary = "";
     if ((pos = p.find("BOUNDARY", '=', 0, TRUE)) != -1) {
       pos++;
       boundary = p.getString(&pos, 'z', true);
       if (boundary[0] == '"') {
         boundary = boundary.left(boundary.length() - 1); //strip "
         boundary = boundary.right(boundary.length() - 1); //strip "
       }
       boundary = "--" + boundary;   //create boundary field
     }
     
     if (boundary == "") {     //fooled by Mime-Version
       mail->body = body;
       mail->bodyPlain = body;
       return mail;
     }
     
     while (body.length() > 0) {
       pos = body.find(boundary, 0, FALSE);
       pos = body.find(delimiter, pos, FALSE);
       mimeHeader = body.left(pos);
       mimeBody = body.right(body.length() - pos - delimiter.length());
       TextParser bp(mimeHeader, lineShift);
     
       contentType = "";
       contentAttribute = "";
       fileName = "";
       if ((pos = bp.find("CONTENT",'-', 0, TRUE)) != -1) {
         pos++;
         if ( (bp.wordAt(pos).upper() == "TYPE") &&
           (bp.separatorAt(pos) == ':') ) {
           contentType = bp.nextWord().upper();
           if (bp.nextSeparator() == '/')
             contentAttribute = bp.nextWord().upper();
           content = contentType + "/" + contentAttribute;
         }
         if ((pos = bp.find("ENCODING",':', 0, TRUE)) != -1) {
           pos++;
           encoding = bp.getString(&pos, 'z', TRUE);
         }
         
         if ( (pos = bp.find("FILENAME",'=', 0, TRUE)) != -1) {
           pos++;
           fileName = bp.getString(&pos, 'z', TRUE);
           fileName = fileName.right(fileName.length() - 1);
           fileName = fileName.left(fileName.length() - 1);
         }
 
       }
       pos = mimeBody.find(boundary, 0, FALSE);
       if (pos == -1)            //should not occur, malformed mail
         pos = mimeBody.length();
       body = mimeBody.right(mimeBody.length() - pos);
       mimeBody = mimeBody.left(pos);
         
       if (fileName != "") { //attatchments of some type, audio, image etc.
         
         Enclosure e;
         e.id = enclosureId;
         e.originalName = fileName;
         e.contentType = contentType;
         e.contentAttribute = contentAttribute;
         e.encoding = encoding;
         e.body = mimeBody;
         e.saved = FALSE;
         mail->addEnclosure(&e);
         enclosureId++;
         
       } else if (contentType == "TEXT") {
         if (contentAttribute == "PLAIN") {
           mail->body = mimeBody;
           mail->bodyPlain = mimeBody;
         }
         if (contentAttribute == "HTML") {
           mail->body = mimeBody;
         }
       }
     }
   } else {
     mail->bodyPlain = body;
     mail->body = body;
   }
   return TRUE;
 }
 
 bool EmailHandler::getEnclosure(Enclosure *ePtr)
 {
   QFile f(ePtr->path + ePtr->name);
   char src[4];
   char *destPtr;
   QByteArray buffer;
   uint bufCount, pos, decodedCount, size, x;
   
   if (! f.open(IO_WriteOnly) ) {
     qWarning("could not save: " + ePtr->path + ePtr->name);
     return FALSE;
   }
   
   if (ePtr->encoding.upper() == "BASE64") {
     size = (ePtr->body.length() * 3 / 4); //approximate size (always above)
     buffer.resize(size);
     bufCount = 0;
     pos = 0;
     destPtr = buffer.data();
     
     while (pos < ePtr->body.length()) {
       decodedCount = 4;
       x = 0;
       while ( (x < 4) && (pos < ePtr->body.length()) ) {
         src[x] = ePtr->body[pos].latin1();
         pos++;
         if (src[x] == '\r' || src[x] == '\n' || src[x] == ' ')
           x--;
         x++;
       }
       if (x > 1) {
         decodedCount = parse64base(src, destPtr);
         destPtr += decodedCount;
         bufCount += decodedCount;
       }
     }
     
     buffer.resize(bufCount);  //set correct length of file
     f.writeBlock(buffer);
   } else {
     QTextStream t(&f);
     t << ePtr->body;
   }
   return TRUE;
 }
 
 int EmailHandler::parse64base(char *src, char *bufOut) {
   
   char c, z;
   char li[4];
   int processed;
 
   //conversion table withouth table...
   for (int x = 0; x < 4; x++) {
     c = src[x];
   
     if ( (int) c >= 'A' && (int) c <= 'Z')
       li[x] = (int) c - (int) 'A';
     if ( (int) c >= 'a' && (int) c <= 'z')
       li[x] = (int) c - (int) 'a' + 26;
     if ( (int) c >= '0' && (int) c <= '9')
       li[x] = (int) c - (int) '0' + 52;
     if (c == '+')
       li[x] = 62;
     if (c == '/')
       li[x] = 63;
   }
   
   processed = 1;
   bufOut[0] = (char) li[0] & (32+16+8+4+2+1); //mask out top 2 bits
   bufOut[0] <<= 2;
   z = li[1] >> 4;
   bufOut[0] = bufOut[0] | z;    //first byte retrived
     
   if (src[2] != '=') {
     bufOut[1] = (char) li[1] & (8+4+2+1); //mask out top 4 bits
     bufOut[1] <<= 4;
     z = li[2] >> 2;
     bufOut[1] = bufOut[1] | z;    //second byte retrived
     processed++;
 
     if (src[3] != '=') {
       bufOut[2] = (char) li[2] & (2+1); //mask out top 6 bits
       bufOut[2] <<= 6;
       z = li[3];
       bufOut[2] = bufOut[2] | z;  //third byte retrieved
       processed++;
     }
   }
   return processed;
 }
 
diff --git a/noncore/unsupported/mailit/mailitwindow.cpp b/noncore/unsupported/mailit/mailitwindow.cpp
index fd49c1f..2bf1dcb 100644
--- a/noncore/unsupported/mailit/mailitwindow.cpp
+++ b/noncore/unsupported/mailit/mailitwindow.cpp
@@ -1,136 +1,133 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "mailitwindow.h"
 
 MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
   : QMainWindow(parent, name, fl)
 {
   currentCaption = "Mailit";
   setCaption(tr(currentCaption));
   views = new QWidgetStack(this);
   setCentralWidget(views);
   
-  qWarning("***Starting writeMail");
  emailClient = new EmailClient(views, "client");
   writeMail = new WriteMail(views, "writing");
   readMail = new ReadMail(views, "reading");
-  qWarning("***Finished readMail");
 
   views->raiseWidget(emailClient);
                         
   connect(emailClient, SIGNAL(composeRequested()),
     this, SLOT(compose()) );
   connect(emailClient, SIGNAL(viewEmail(QListView *, Email *)), this,
       SLOT(viewMail(QListView *, Email *)) );
   connect(emailClient, SIGNAL(mailUpdated(Email *)), this,
       SLOT(updateMailView(Email *)) );
 
   connect(writeMail, SIGNAL(cancelMail()), this, SLOT(showEmailClient()) );
   connect(writeMail, SIGNAL(sendMailRequested(const Email &)), this,
       SLOT(showEmailClient()) );
   connect(writeMail, SIGNAL(sendMailRequested(const Email &)), emailClient,
       SLOT(enqueMail(const Email &)) );
   
   connect(readMail, SIGNAL(cancelView()), this, SLOT(showEmailClient()) );
   connect(readMail, SIGNAL(replyRequested(Email &)), this,
     SLOT(composeReply(Email &)) );
   connect(readMail, SIGNAL(removeItem(EmailListItem *, bool &)), emailClient,
     SLOT(deleteMail(EmailListItem *, bool &)) );
   connect(readMail, SIGNAL(viewingMail(Email *)), emailClient,
     SLOT(moveMailFront(Email *)) );
   
   connect(emailClient, SIGNAL(newCaption(const QString &)),
     this, SLOT(updateCaption(const QString &)) );
   viewingMail = FALSE;
   
-  qWarning("***Finished MailitWindow");
 }
 
 MailItWindow::~MailItWindow()
 {
 }
 
 void MailItWindow::closeEvent(QCloseEvent *e)
 {
   if (views->visibleWidget() == emailClient) {
     e->accept();
   } else {
     showEmailClient();
   }
 }
 
 void MailItWindow::compose()
 {
   viewingMail = FALSE;
   emailClient->hide();
   readMail->hide();
   views->raiseWidget(writeMail);
   writeMail->setAddressList(emailClient->getAdrListRef());
   setCaption( tr( "Write mail"  ) );
 }
 
 void MailItWindow::composeReply(Email &mail)
 {
   compose();
   writeMail->reply(mail);
 }
 
 void MailItWindow::showEmailClient()
 {
   viewingMail = FALSE;
   writeMail->hide();
   readMail->hide();
   views->raiseWidget(emailClient);
   setCaption( tr(currentCaption) );
 }
 
 void MailItWindow::viewMail(QListView *view, Email *mail)
 {
   viewingMail = TRUE;
   emailClient->hide();
   readMail->update(view, mail);
   views->raiseWidget(readMail);
   setCaption( tr( "Examine mail"  ) );
 }
 
 void MailItWindow::updateMailView(Email *mail)
 {
   if (viewingMail) {
     readMail->mailUpdated(mail);
   }
 }
 
 void MailItWindow::updateCaption(const QString &newCaption)
 {
   currentCaption = newCaption;
   setCaption(tr(currentCaption));
 }
 
 void MailItWindow::setDocument(const QString &_address)
 {
     // strip leading 'mailto:'
     QString address = _address;
     if (address.startsWith("mailto:"))
         address = address.mid(6);
  
     compose();
     writeMail->setRecipient(address);
 }
 
diff --git a/noncore/unsupported/mailit/popclient.cpp b/noncore/unsupported/mailit/popclient.cpp
index 2f14ed2..f9cc337 100644
--- a/noncore/unsupported/mailit/popclient.cpp
+++ b/noncore/unsupported/mailit/popclient.cpp
@@ -1,375 +1,375 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "popclient.h"
 #include "emailhandler.h"
 //#define APOP_TEST
 
 extern "C" {
 #include "md5.h"
 }
 
 #include <qcstring.h>
 
 PopClient::PopClient()
 {
   socket = new QSocket(this, "popClient");
   connect(socket, SIGNAL(error(int)), this, SLOT(errorHandling(int)));
   connect(socket, SIGNAL(connected()), this, SLOT(connectionEstablished()));
   connect(socket, SIGNAL(readyRead()), this, SLOT(incomingData()));
   
   stream = new QTextStream(socket);
   
   receiving = FALSE;
   synchronize = FALSE;
   lastSync = 0;
   headerLimit = 0;
   preview = FALSE;
 }
 
 PopClient::~PopClient()
 {
   delete socket;
   delete stream;
 }
 
 void PopClient::newConnection(QString target, int port)
 {
   if (receiving) {
     qWarning("socket in use, connection refused");
     return;
   }
   
   status = Init;
   
   socket->connectToHost(target, port);
   receiving = TRUE;
   selected = FALSE;
     
   emit updateStatus("DNS lookup");
 }
 
 void PopClient::setAccount(QString popUser, QString popPasswd)
 {
   popUserName = popUser;
   popPassword = popPasswd;
 }             
 
 void PopClient::setSynchronize(int lastCount)
 {
   synchronize = TRUE;
   lastSync = lastCount;
 }
 
 void PopClient::removeSynchronize()
 {
   synchronize = FALSE;
   lastSync = 0;
 }
 
 void PopClient::headersOnly(bool headers, int limit)
 {
   preview = headers;
   headerLimit = limit;
 }
 
 void PopClient::setSelectedMails(MailList *list)
 {
   selected = TRUE;
   mailList = list;
 }
 
 void PopClient::connectionEstablished()
 {
   emit updateStatus(tr("Connection established"));
 }
 
 void PopClient::errorHandling(int status)
 {
   emit updateStatus(tr("Error Occured"));
   emit errorOccurred(status);
   socket->close();
   receiving = FALSE;
 }
 
 void PopClient::incomingData()
 {
   QString response, temp, temp2, timeStamp;
   QString md5Source;
   int start, end;
 //  char *md5Digest;
   char md5Digest[16];
 //  if ( !socket->canReadLine() )
 //    return;
   
   response = socket->readLine();
-  qDebug(response +" %d", status);
+  //qDebug(response +" %d", status);
   
   switch(status) {
     //logging in
     case Init:  {
 #ifdef APOP_TEST
        start = response.find('<',0);
        end = response.find('>', start);
        if( start >= 0 && end > start )
        {
           timeStamp = response.mid( start , end - start + 1);
           md5Source = timeStamp + popPassword;
-          qDebug( md5Source);
+          //qDebug( md5Source);
 //           for( int i = 0; i < md5Source.length(); i++) {
 //              buff[i] = (QChar)md5Source[i];
 //           }
           
           md5_buffer( (char const *)md5Source, md5Source.length(),&md5Digest[0]);
 //          md5_buffer(char const *buffer, unsigned int len, char *digest);
  
 //           MD5_Init( &ctx);
 //           MD5_Update( &ctx, buff, sizeof( buff) );
 //           MD5_Final( md5Digest, &ctx);
 //          MD5( buff, md5Source.length(), md5Digest);
 
            for(int j =0;j < MD5_DIGEST_LENGTH ;j++)
            {
               printf("%x", md5Digest[j]);
            }
            printf("\n");          
 //          qDebug(md5Digest);
           *stream << "APOP " <<  popUserName << " " << md5Digest << "\r\n";
           //    qDebug("%s", stream);
           status = Stat;
        }
        else
 #endif
        {
           timeStamp = "";
           *stream << "USER " << popUserName << "\r\n";
           status = Pass;
        }
           
           break;
         }
     //password shhh. don't tell anyone (implement APOP...)
     case Pass:  {
           *stream << "PASS " << popPassword << "\r\n";
           status = Stat;
           break;
         }
     //ask for number of messages
     case Stat:  {
           if (response[0] == '+') {
             *stream << "STAT" << "\r\n";
             status = Mcnt;
           } else errorHandling(ErrLoginFailed);
             break;
           }
     //get count of messages, eg "+OK 4 900.." -> int 4
     case Mcnt:  {
           if (response[0] == '+') {
             temp = response.replace(0, 4, "");
             int x = temp.find(" ", 0);
             temp.truncate((uint) x);
             newMessages = temp.toInt();
             messageCount = 1;
             status = List;
               
             if (synchronize) {
               //messages deleted from server, reload all
               if (newMessages < lastSync)
                 lastSync = 0;
-                messageCount = lastSync + 1;
+                messageCount = 1;
               }
               
               if (selected) {
                 int *ptr = mailList->first();
                 if (ptr != 0) {
                   newMessages++;  //to ensure no early jumpout
                   messageCount = *(mailList->first());
                 } else newMessages = 0;
               }
             } else errorHandling(ErrUnknownResponse);
           }
     //Read message number x, count upwards to messageCount
     case List:  {
           if (messageCount <= newMessages) {
             *stream << "LIST " << messageCount << "\r\n";
             status = Size;
             temp2.setNum(newMessages - lastSync);
             temp.setNum(messageCount - lastSync);
             if (!selected) {
               emit updateStatus(tr("Retrieving ") + temp + "/" + temp2);
             } else {
               //completing a previously closed transfer
               if ( (messageCount - lastSync) <= 0) {
                 temp.setNum(messageCount);
                 emit updateStatus(tr("Previous message ") + temp);
               } else {
                 emit updateStatus(tr("Completing message ") + temp);
               }
             }
             break;
           } else {
             emit updateStatus(tr("No new Messages"));
             status = Quit;
           }
         } 
     //get size of message, eg "500 characters in message.." -> int 500
     case Size:  {
           if (status != Quit) { //because of idiotic switch
             if (response[0] == '+') {
               temp = response.replace(0, 4, "");
               int x = temp.find(" ", 0);
               temp = temp.right(temp.length() - ((uint) x + 1) );
               mailSize = temp.toInt();
               emit currentMailSize(mailSize);
               
               status = Retr;
             } else {
-              qWarning(response);
+              //qWarning(response);
               errorHandling(ErrUnknownResponse);
             }
           }
         } 
     //Read message number x, count upwards to messageCount
     case Retr:  {
           if (status != Quit) {
             if (!preview || mailSize <= headerLimit) {
               *stream << "RETR " << messageCount << "\r\n";
             } else {        //only header
               *stream << "TOP " << messageCount << " 0\r\n";
             }
             messageCount++;
             status = Ignore;
             break;
           }         } 
     case Ignore:  {
           if (status != Quit) { //because of idiotic switch
             if (response[0] == '+') {
               message = "";
               status = Read;
               if (!socket->canReadLine()) //sync. problems
                 break;
               response = socket->readLine();
             } else errorHandling(ErrUnknownResponse);
           }
         }
     //add all incoming lines to body.  When size is reached, send
     //message, and go back to read new message
     case Read:  {
           if (status != Quit) { //because of idiotic switch
             message += response;
             while ( socket->canReadLine() ) {
               response = socket->readLine();
               message += response;
             }
             emit downloadedSize(message.length());
             int x = message.find("\r\n.\r\n",-5);
             if (x == -1) {
               break;
             } else {  //message reach entire size
               //complete mail downloaded
               if ( (!preview ) || ((preview) && (mailSize <= headerLimit)) ){
                 emit newMessage(message, messageCount-1, mailSize, TRUE);
               } else {  //incomplete mail downloaded
-                emit newMessage(message, messageCount-1, mailSize, FALSE);
+                emit newMessage(message, messageCount-1, mailSize, FALSE);
               }
               if (messageCount > newMessages) //that was the last message
                 status = Quit;
               else {        //ask for new message
                 if (selected) {   //grab next from queue
                   int *ptr = mailList->next();
                   if (ptr != 0) {
                     messageCount = *ptr;
                     *stream << "LIST " << messageCount << "\r\n";
                     status = Size;
                     //completing a previously closed transfer
                     if ( (messageCount - lastSync) <= 0) {
                       temp.setNum(messageCount);
                       emit updateStatus(tr("Previous message ") + temp);
                     } else {
                       temp.setNum(messageCount - lastSync);
                       emit updateStatus(tr("Completing message ") + temp);
                     }
                     break;
                   } else {
                     newMessages--;
                     status = Quit;
                   }
                 } else {
                   *stream << "LIST " << messageCount << "\r\n";
                   status = Size;
                   temp2.setNum(newMessages - lastSync);
                   temp.setNum(messageCount - lastSync);
                   emit updateStatus(tr("Retrieving ") + temp + "/" + temp2);
                   
                   break;
                 }
               }
             }
             if (status != Quit)
               break;
           }
         }
     case Quit:  {
           *stream << "Quit\r\n";
           status = Done;
           int newM = newMessages - lastSync;
           if (newM > 0) {
             temp.setNum(newM);
             emit updateStatus(temp + tr(" new messages"));
           } else {
             emit updateStatus(tr("No new messages"));
           }
           
           socket->close();
           receiving = FALSE;
           emit mailTransfered(newM);
           break;
         }
   }
 
 }
 
 // if( bAPOPAuthentication )
 //  {
 //    if( m_strTimeStamp.IsEmpty() )
 //    {
 //      SetLastError("Apop error!");
 //      return false;
 //    }
 //    strMD5Source = m_strTimeStamp+pszPassword;
 //    strMD5Dst = MD5_GetMD5( (BYTE*)(const char*)strMD5Source , strMD5Source.GetLength() );
 //    sprintf(msg , "apop %s %s\r\n" , pszUser , strMD5Dst);
 //    ret = send(m_sPop3Socket , msg , strlen(msg) , NULL);
 //    if(ret == SOCKET_ERROR)
 //    {
 //      SetLastError("Socket error!");
 //      m_bSocketOK = false;
 //      m_bConnected = false;
 //      return false;
 //    }
 //    if( !GetSocketResult(&strResult , COMMAND_END_FLAG) )
 //      return false;
 //    if( 0 == strResult.Find('-' , 0) )
 //    {
 //      SetLastError("Username or Password error!");
 //      return false;
 //    }
 //    m_bConnected = true;
 
 //  }
diff --git a/noncore/unsupported/mailit/readmail.cpp b/noncore/unsupported/mailit/readmail.cpp
index a5e7147..7cd3e09 100644
--- a/noncore/unsupported/mailit/readmail.cpp
+++ b/noncore/unsupported/mailit/readmail.cpp
@@ -1,326 +1,327 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "readmail.h"
 #include <qimage.h>
 #include <qmime.h>
 #include <qaction.h>
 #include <qpe/resource.h>
 
 ReadMail::ReadMail( QWidget* parent,  const char* name, WFlags fl )
         : QMainWindow(parent, name, fl)
 {
         plainTxt = FALSE;
         
         init();
         viewAtt = new ViewAtt(0, "View Attatchments");
 }
 
 ReadMail::~ReadMail()
 {
         delete emailView->mimeSourceFactory();
         delete viewAtt;
 }
 
 void ReadMail::init()
 {
         setToolBarsMovable(FALSE);
         
         bar = new QToolBar(this);
         bar->setHorizontalStretchable( TRUE );
 
         menu = new QMenuBar( bar );
 
         viewMenu = new QPopupMenu(menu);
         menu->insertItem( tr( "&View" ), viewMenu);
 
         mailMenu = new QPopupMenu(menu);
         menu->insertItem( tr( "&Mail" ), mailMenu);
 
         bar = new QToolBar(this);
         
             //reply dependant on viewing inbox
         replyButton = new QAction( tr( "Reply" ), Resource::loadPixmap( "mailit/reply" ),
                 QString::null, 0, this, 0 );
         connect(replyButton, SIGNAL(activated()), this, SLOT(reply()) );
 
         previousButton = new QAction( tr( "Previous" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
         connect( previousButton, SIGNAL( activated() ), this, SLOT( previous() ) );
         previousButton->addTo(bar);
         previousButton->addTo(viewMenu);
 
         nextButton = new QAction( tr( "Next" ), Resource::loadPixmap( "forward" ), QString::null, 0, this, 0 );
         connect( nextButton, SIGNAL( activated() ), this, SLOT( next() ) );
         nextButton->addTo(bar);
         nextButton->addTo(viewMenu);
 
         attatchmentsButton = new QAction( tr( "Attatchments" ), Resource::loadPixmap( "mailit/attach" ), QString::null, 0, this, 0 );
         connect( attatchmentsButton, SIGNAL( activated() ), this,
                 SLOT( viewAttatchments() ) );
         attatchmentsButton->addTo(bar);
         attatchmentsButton->addTo(viewMenu);
         
         plainTextButton = new QAction( tr( "Text Format" ), Resource::loadPixmap( "DocsIcon" ), QString::null, 0, this, 0, TRUE);
         connect( plainTextButton, SIGNAL( activated() ), this, SLOT( shiftText() ) );
         plainTextButton->addTo(bar);
         plainTextButton->addTo(viewMenu);
 
         deleteButton = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 0, this, 0 );
         connect( deleteButton, SIGNAL( activated() ), this, SLOT( deleteItem() ) );
         deleteButton->addTo(bar);
         deleteButton->addTo(mailMenu);
 
         viewMenu->insertItem(Resource::loadPixmap("close"), "Close", this, SLOT(close()));
                 
         emailView = new QTextView( this, "emailView" );
+        
         setCentralWidget(emailView);
 
         mime = new QMimeSourceFactory();
         emailView->setMimeSourceFactory(mime);
 }
 
 void ReadMail::updateView()
 {
         Enclosure *ePtr;
         QString mailStringSize;
         QString text, temp;
         
                 mail->read = TRUE;              //mark as read
         inbox = mail->received;
         
         replyButton->removeFrom(mailMenu);
         replyButton->removeFrom(bar);
         
         if (inbox == TRUE) {
                 replyButton->addTo(bar);
                 replyButton->addTo(mailMenu);
                 
                 if (!mail->downloaded) {
                         //report currently viewed mail so that it will be
                         //placed first in the queue of new mails to download
                         emit viewingMail(mail);
                         
                         double mailSize = (double) mail->size;
                         if (mailSize < 1024) {
                                 mailStringSize.setNum(mailSize);
                                 mailStringSize += " Bytes";
                         } else if (mailSize < 1024*1024) {
                                 mailStringSize.setNum( (mailSize / 1024), 'g', 2 );
                                 mailStringSize += " Kb";
                         } else {
                                 mailStringSize.setNum( (mailSize / (1024*1024)), 'g', 3);
                                 mailStringSize += " Mb";
                         }
                 }
         }
 
         QMimeSourceFactory *mime = emailView->mimeSourceFactory();
         
                 if (! plainTxt) {                                       //use RichText, inline pics etc.
                 emailView->setTextFormat(QTextView::RichText);
                 text = "<b><big><center><font color=\"blue\">" + mail->subject
                         +"</font></center></big></b><br>";
                 text += "<b>From: </b>" + mail->from + " <i>" +
                         mail->fromMail + "</i><br>";
         
                 text +="<b>To: </b>";
                 for (QStringList::Iterator it = mail->recipients.begin();
                         it != mail->recipients.end(); ++it ) {
                         text += *it + " ";
                 }
                 text += "<br>"  + mail->date;
         
                 if (mail->files.count() > 0) {
                         text += "<br><b>Attatchments: </b>";
                         
                         for ( ePtr=mail->files.first(); ePtr != 0; ePtr=mail->files.next() ) {
                                 text += ePtr->originalName + " ";
                         }
                         text += "<hr><br>" + mail->body;
                 
                         if (inbox) {
                                 for ( ePtr=mail->files.first(); ePtr != 0; ePtr=mail->files.next() ) {
 
                                         text += "<br><hr><b>Attatchment: </b>" +
                                                 ePtr->originalName + "<hr>";
                                 
                                         if (ePtr->contentType == "TEXT") {
                                                 QFile f(ePtr->path + ePtr->name);
                                         
                                                 if (f.open(IO_ReadOnly) ) {
                                                         QTextStream t(&f);
                                                         temp = t.read();
                                                         text += temp + "<br>";
                                                         f.close();
                                                 } else {
                                                         text += "<b>Could not locate file</b><br>";
                                                 }
                                         
                                         }
                                         if (ePtr->contentType == "IMAGE") {
         //                                              temp.setNum(emailView->width());//get display width
         //                                      text += "<img width=" + temp +" src =""" +
         //                                              ePtr->originalName + """> </img>";
                                                 text += "<img src =""" +
                                                         ePtr->originalName + """> </img>";
                                                 mime->setPixmap(ePtr->originalName, QPixmap( (ePtr->path + ePtr->name) ));
                                         }
                                 }
                         }
                 } else {
                         if (mail->downloaded || !inbox) {
                                 text += "<hr><br>" + mail->body;
                         } else {
                                 text += "<hr><br><b> Awaiting download </b><br>";
                                 text += "Size of mail: " + mailStringSize;
                         }
                 }
                 emailView->setText(text);
                 } else {                                                                        // show plain txt mail
                 emailView->setTextFormat(QTextView::PlainText);
                 text = "Subject: " + mail->subject + "\n";
                 text += "From: " + mail->from + " " + mail->fromMail + "\n";
                 text += "To: ";
                 for (QStringList::Iterator it = mail->recipients.begin();
                         it != mail->recipients.end(); ++it ) {
                         text += *it + " ";
                 }
                 text += "\nDate: " + mail->date + "\n";
                 if (mail->files.count() > 0) {
                         text += "Attatchments: ";
                         for ( ePtr=mail->files.first(); ePtr != 0; ePtr=mail->files.next() ) {
                                 text += ePtr->originalName + " ";
                         }
                         text += "\n\n";
                 } else text += "\n";
                 
                 if (!inbox) {
                         text += mail->body;
                 } else if (mail->downloaded) {
                         text += mail->bodyPlain;
                 } else {
                         text += "\nAwaiting download\n";
                         text += "Size of mail: " + mailStringSize;
                 }
                 
                 emailView->setText(text);
         }
         
         if (mail->files.count() == 0)
                 attatchmentsButton->setEnabled(FALSE);
         else attatchmentsButton->setEnabled(TRUE);
         
         setCaption("Examining mail: " + mail->subject);
 }
 
 //update view with current EmailListItem (item)
 void ReadMail::update(QListView *thisView, Email *mailIn)
 {
         view = thisView;
         item = (EmailListItem *) view->selectedItem();
         mail = mailIn;
         updateView();
                 updateButtons();
 }
 
 void ReadMail::mailUpdated(Email *mailIn)
 {
         if (mailIn == mail) {
                 updateView();
         } else {
                 updateButtons();
         }
 }
 
 void ReadMail::close()
 {
         emit cancelView();
 }
 
 //gets next item in listview, exits if there is no next
 void ReadMail::next()
 {
         item = (EmailListItem *) item->nextSibling();
         if (item != NULL) {
                 mail = item->getMail();
                 updateView();
         }
         updateButtons();
 }
 
 //gets previous item in listview, exits if there is no previous
 void ReadMail::previous()
 {
         item = (EmailListItem *) item->itemAbove();
         if (item != NULL) {
                 mail = item->getMail();
                 updateView();
         }
         updateButtons();
 }
 
 //deletes item, tries bringing up next or previous, exits if unsucessful
 void ReadMail::deleteItem()
 {
         EmailListItem *temp = item;
                 temp = (EmailListItem *) item->nextSibling();//trybelow
         if (temp == NULL)
                 temp = (EmailListItem *) item->itemAbove(); //try above
         
         emit removeItem(item, inbox);
         
         item = temp;
                 if (item != NULL) {                                                     //more items in list
                 mail = item->getMail();
                 updateView();
                 updateButtons();
                 } else close();                                                         //no more items to see
 }
 
 void ReadMail::updateButtons()
 {
         EmailListItem *temp;
         
         temp = item;
         if ((EmailListItem *) temp->nextSibling() == NULL)
                 nextButton->setEnabled(FALSE);
         else nextButton->setEnabled(TRUE);
         
         temp = item;
         if ((EmailListItem *) temp->itemAbove() == NULL)
                 previousButton->setEnabled(FALSE);
         else previousButton->setEnabled(TRUE);
 }
 
 void ReadMail::shiftText()
 {
         plainTxt = ! plainTxt;
         updateView();
 }
 
 void ReadMail::viewAttatchments()
 {
         viewAtt->update(mail, inbox);
         viewAtt->showMaximized();
 }
 
 void ReadMail::reply()
 {
         emit replyRequested(*mail);
 }
diff --git a/noncore/unsupported/mailit/smtpclient.cpp b/noncore/unsupported/mailit/smtpclient.cpp
index 6699a90..b2e38e5 100644
--- a/noncore/unsupported/mailit/smtpclient.cpp
+++ b/noncore/unsupported/mailit/smtpclient.cpp
@@ -1,171 +1,171 @@
 /**********************************************************************
 ** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qt Palmtop Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "smtpclient.h"
 #include "emailhandler.h"
 
 SmtpClient::SmtpClient()
 {
   socket = new QSocket(this, "smtpClient");
   stream = new QTextStream(socket);
   mailList.setAutoDelete(TRUE);
   
   connect(socket, SIGNAL(error(int)), this, SLOT(errorHandling(int)));
   connect(socket, SIGNAL(connected()), this, SLOT(connectionEstablished()));
   connect(socket, SIGNAL(readyRead()), this, SLOT(incomingData()));
   
   sending = FALSE;
 }
 
 SmtpClient::~SmtpClient()
 {
   delete socket;
   delete stream;
 }
 
 void SmtpClient::newConnection(QString target, int port)
 {
   if (sending) {
     qWarning("socket in use, connection refused");
     return;
   }
 
   status = Init;
   sending = TRUE;
   socket->connectToHost(target, port);
   
   emit updateStatus(tr("DNS lookup"));
 }
 
 void SmtpClient::addMail(QString from, QString subject, QStringList to, QString body)
 {
   RawEmail *mail = new RawEmail;
   
   mail->from = from;
   mail->subject = subject;
   mail->to = to;
   mail->body = body;
   
   mailList.append(mail);
 }
 
 void SmtpClient::connectionEstablished()
 {
   emit updateStatus(tr("Connection established"));
 
 }
 
 void SmtpClient::errorHandling(int status)
 {
   emit errorOccurred(status);
   socket->close();
   mailList.clear();
   sending = FALSE;
 }
 
 void SmtpClient::incomingData()
 {
   QString response;
   
   if (!socket->canReadLine())
     return;
   
   response = socket->readLine();
-  qDebug(response);
+  //qDebug(response);
 
   switch(status) {
     case Init:  {
           if (response[0] == '2') {
             status = From;
             mailPtr = mailList.first();
             *stream << "HELO there\r\n";
-            qDebug("HELO");
+            //qDebug("HELO");
           } else errorHandling(ErrUnknownResponse);
           break;
         } 
     case From:  {
           if (response[0] == '2') {
-            *stream << "MAIL FROM: <" << mailPtr->from << ">\r\n";
+            *stream << "MAIL FROM: " << mailPtr->from << "\r\n";
             status = Recv;
-            qDebug("MAIL FROM: "+mailPtr->from);
+            //qDebug("MAIL FROM: "+mailPtr->from);
           } else errorHandling(ErrUnknownResponse);
           break;
         } 
     case Recv:  {
           if (response[0] == '2') {
             it = mailPtr->to.begin();
             if (it == NULL)
               errorHandling(ErrUnknownResponse);
-            *stream << "RCPT TO: <" << *it << ">\r\n";
-            qDebug("RCPT TO: "+ *it);
+            *stream << "RCPT TO: " << *it << ">\r\n";
+            //qDebug("RCPT TO: "+ *it);
             status = MRcv;
           } else errorHandling(ErrUnknownResponse);
           break;
         } 
     case MRcv:  {
           if (response[0] == '2') {
             it++;
             if ( it != mailPtr->to.end() ) {
               *stream << "RCPT TO: <" << *it << ">\r\n";
-            qDebug("RCPT TO: "+ *it);
+            //qDebug("RCPT TO: "+ *it);
               break;
             } else  {
               status = Data;
             }
           } else errorHandling(ErrUnknownResponse);
         } 
     case Data:  {
           if (response[0] == '2') {
             *stream << "DATA\r\n";
             status = Body;
-            qDebug("DATA");
+            //qDebug("DATA");
             emit updateStatus(tr("Sending: ") + mailPtr->subject);
           } else errorHandling(ErrUnknownResponse);
           break;
         } 
     case Body:  {
           if (response[0] == '3') {
             *stream << mailPtr->body << "\r\n.\r\n";
             mailPtr = mailList.next();
             if (mailPtr != NULL) {
               status = From;
             } else {
               status = Quit;
             }
-            qDebug("BODY");
+            //qDebug("BODY");
           } else errorHandling(ErrUnknownResponse);
           break;
         } 
     case Quit:  {
           if (response[0] == '2') {
             *stream << "QUIT\r\n";
             status = Done;
             QString temp;
             temp.setNum(mailList.count());
             emit updateStatus(tr("Sent ") + temp + tr(" messages"));
             emit mailSent();
             mailList.clear();
             sending = FALSE;
             socket->close();
-            qDebug("QUIT");
+            //qDebug("QUIT");
           } else errorHandling(ErrUnknownResponse);
           break;
         }
   }
 }