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
@@ -82,80 +82,80 @@ QString AddressList::getEmailByName(QString name)
         
         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
@@ -487,156 +487,156 @@ void EmailClient::popError(int code)
     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 ) {
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
@@ -118,98 +118,96 @@ void EmailHandler::getMailHeaders()
   }
   
   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);
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,111 +1,108 @@
 /**********************************************************************
 ** 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"  ) );
 }
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
@@ -74,264 +74,264 @@ void PopClient::setAccount(QString popUser, QString 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"));
           }
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
@@ -44,96 +44,97 @@ void ReadMail::init()
         
         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>" +
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
@@ -42,130 +42,130 @@ SmtpClient::~SmtpClient()
 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
@@ -82,80 +82,80 @@ QString AddressList::getEmailByName(QString name)
         
         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
@@ -487,156 +487,156 @@ void EmailClient::popError(int code)
     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 ) {
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
@@ -118,98 +118,96 @@ void EmailHandler::getMailHeaders()
   }
   
   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);
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,111 +1,108 @@
 /**********************************************************************
 ** 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"  ) );
 }
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
@@ -74,264 +74,264 @@ void PopClient::setAccount(QString popUser, QString 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"));
           }
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
@@ -44,96 +44,97 @@ void ReadMail::init()
         
         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>" +
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
@@ -42,130 +42,130 @@ SmtpClient::~SmtpClient()
 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;
         }
   }
 }