- Buttonlayout changed in attach dialog

- Removed file access for address list (reduces size)
- Added header size sping box for accounts
- mailit shows an icon in the message list if attachments are present
- Added translations in pro file
- Removed resource.* references in header files, uses qpe/resource.h instead

24 files changed, 154 insertions, 84 deletions

diff --git a/noncore/net/mailit/addatt.cpp b/noncore/net/mailit/addatt.cpp
index c8be865..d268f1f 100644
--- a/noncore/net/mailit/addatt.cpp
+++ b/noncore/net/mailit/addatt.cpp
@@ -1,224 +1,224 @@
 /**********************************************************************
 ** 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 <qlayout.h>
 #include <qhbox.h>
 #include <qdir.h>
 #include <qstringlist.h>
-#include "resource.h"
+#include <qpe/resource.h>
 #include "addatt.h"
 
 FileItem::FileItem(QListView *parent, DocLnk* dl)
 		: QListViewItem(parent)
 {
 	/*file = fileInfo;
 	type = fileType;*/
 	
 	doclnk=dl;
 
 	setText(0, doclnk->name());
 	
 /*	if (fileType == "Picture") {
 		setPixmap(0, Resource::loadPixmap("pixmap"));
 	} else if (fileType == "Document") {
 		setPixmap(0, Resource::loadPixmap("txt"));	
 	} else if (fileType == "Sound") {
 		setPixmap(0, Resource::loadPixmap("play"));
 	} else if (fileType == "Movie") {
 		setPixmap(0, Resource::loadPixmap("MPEGPlayer"));
 	} else if (fileType == "File") {
 		setPixmap(0, Resource::loadPixmap("exec"));
 	}*/
 }
 
 FileItem::~FileItem()
 {
 	if (doclnk!=NULL) delete doclnk;
 	doclnk=NULL;
 }
 
 AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
 	: QDialog(parent, name, f)
 {
 	setCaption("Adding attatchments");
 
 	QGridLayout *top = new QGridLayout(this, 1,1 );
 	
 	QHBox *buttons=new QHBox(this);
 	/*fileCategoryButton = new QPushButton(this);*/
-	attatchButton = new QPushButton("Attatch ->", buttons);
-	removeButton = new QPushButton("Remove", buttons);
+	attatchButton = new QPushButton(tr("Attatch..."), buttons);
+	removeButton = new QPushButton(tr("Remove"), buttons);
 
 	/*fileCategories = new QPopupMenu(fileCategoryButton);
 	fileCategoryButton->setPopup(fileCategories);
 	fileCategories->insertItem("Document");
 	fileCategories->insertItem("Picture");
 	fileCategories->insertItem("Sound");
 	fileCategories->insertItem("Movie");
 	fileCategories->insertItem("File");
 
 	fileCategoryButton->setText("Document");
 	top->addWidget(fileCategoryButton, 0, 0);*/
 	
 
 	top->addWidget(buttons,1,0);
 	//buttons->addWidget(attatchButton,0,0);
 	//buttons->addWidget(removeButton,0,1);
 
 	//connect(fileCategories, SIGNAL(activated(int)), this,
     	//	SLOT(fileCategorySelected(int)) );*/
 	connect(attatchButton, SIGNAL(clicked()), this,
 		SLOT(addAttatchment()) );
 	connect(removeButton, SIGNAL(clicked()), this,
 		SLOT(removeAttatchment()) );
 	
 	/*listView = new QListView(this, "AttView");
 	listView->addColumn("Documents");*
 	connect(listView, SIGNAL(doubleClicked(QListViewItem *)), this,
 		SLOT(addAttatchment()) );*/
 	
 	
 	attView = new QListView(this, "Selected");
 	attView->addColumn(tr("Attached"));
 	attView->addColumn(tr("File type"));
 	connect(attView, SIGNAL(doubleClicked(QListViewItem *)), this,
 		SLOT(removeAttatchment()) );
 
 	//top->addWidget(ofs, 0,0);
 	top->addWidget(attView, 0,0);
 	
 	clear();
 	
 
 }
 
 void AddAtt::clear()
 {
 	attView->clear();
 	//getFiles();
 	modified = FALSE;
 }
 
 /*void AddAtt::fileCategorySelected(int id)
 {
 	fileCategoryButton->setText(fileCategories->text(id));
 	getFiles();
 }*/
 
 void AddAtt::addAttatchment()
 {	
 	OFileDialog ofs("Attachments",this,0,0,"/root/Documents");
 	
 	ofs.showMaximized();
 	
 	if (ofs.exec()==QDialog::Accepted)
 	{
 		DocLnk* dl=new DocLnk(ofs.selectedDocument());
 		FileItem* fi=new FileItem(attView,dl);
 		fi->setPixmap(0,dl->pixmap());
 		fi->setText(1,dl->type());
 		attView->insertItem(fi);
 		modified = TRUE;	
 	}
 }
 
 void AddAtt::removeAttatchment()
 {
 	if (attView->selectedItem() != NULL) 
 	{
 		attView->takeItem(attView->selectedItem());
 	}
 	modified = TRUE;
 }
 
 void AddAtt::reject()
 {
 	if (modified) {
 		attView->clear();
 		modified = FALSE;
 	}
 }
 
 void AddAtt::accept()
 {
 	modified = FALSE;
 	hide();
 }
 
 void AddAtt::getFiles()
 {
 	QString path, selected;
 	
 	/*listView->clear();
 	
 	selected = fileCategoryButton->text();
 	if (selected == "Picture") {
 		path = "../pics/";
 	} else if (selected == "Document") {
 		path = ""			;					//sub-dirs not decided
 	} else if (selected == "Sound") {
 		path = "../sounds/";					//sub-dirs not decided
 	} else if (selected == "Movie") {
 		path = "";								//sub-dirs not decided
 	} else if (selected == "File") {
 		path = "";								//sub-dirs not decided
 	}
 
 	dir = new QDir(path);
 	dir->setFilter(QDir::Files);
 	const QFileInfoList *dirInfoList = dir->entryInfoList();
 
 	QFileInfoListIterator it(*dirInfoList);      // create list iterator
 
 	while ( (fi=it.current()) ) {           // for each file...
 		item = new FileItem(lis+ütView, *fi, selected);
 		++it;                               // goto next list element
 	}*/
 }
 
 QStringList AddAtt::returnAttatchedFiles()
 {
 	QFileInfo info;
 	QStringList list;
 	
 	item = (FileItem *) attView->firstChild();
 	
 	
 	while (item != NULL) {
 		DocLnk* dl=item->getDocLnk();
 		list+=dl->file();
 		/*info = item->getFileInfo();
 		list += info.filePath();*/
 		item = (FileItem *) item->nextSibling();
 	}
 	return list;
 }
 
 QStringList AddAtt::returnFileTypes()
 {
 	QStringList list;
 		
 	item = (FileItem *) attView->firstChild();
 			
 	while (item != NULL) {
 		list += item->getDocLnk()->type();
 		item = (FileItem *) item->nextSibling();
 	}
 	return list;
 }
diff --git a/noncore/net/mailit/addresslist.cpp b/noncore/net/mailit/addresslist.cpp
index 43e3830..9fe558a 100644
--- a/noncore/net/mailit/addresslist.cpp
+++ b/noncore/net/mailit/addresslist.cpp
@@ -1,181 +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(QString file)
+AddressList::AddressList()
 {
 	addresses.setAutoDelete(TRUE);
-	filename = file;
 	read();
 	dirty = FALSE;
 }
 
 AddressList::~AddressList()
 {
-	write();
 	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;
 	
-	//QFile f(filename);
 	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());
 	}
 	
 	/*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;
 }
 
-void AddressList::write()
-{
-	if ( (addresses.count() == 0) || (!dirty) )
-		return;
-		
-	QFile f(filename);
-	if (! f.open(IO_WriteOnly) )
-		return;
-	
-	QTextStream stream(&f);
-	Contact *ptr;
-	for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) {
-		stream << "email = " + ptr->email + "\n";
-		stream << "name = " + ptr->name + "\n";
-	}
-	f.close();
-}
diff --git a/noncore/net/mailit/addresslist.h b/noncore/net/mailit/addresslist.h
index e87d6f1..99cef9a 100644
--- a/noncore/net/mailit/addresslist.h
+++ b/noncore/net/mailit/addresslist.h
@@ -1,59 +1,58 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 #ifndef ADDRESSLIST_H
 #define ADDRESSLIST_H
 
 #include <qobject.h>
 #include <qlist.h>
 
 struct Contact
 {
 	QString email;
 	QString name;
 };
 
 class AddressList : public QObject
 {
 	Q_OBJECT
 
 public:
-	AddressList(QString file);
+	AddressList();
 	~AddressList();
 	void addContact(QString email, QString name);
 	bool containsEmail(QString email);
 	bool containsName(QString name);
 	QString getNameByEmail(QString email);
 	QString getEmailByName(QString name);
 	QList<Contact>* getContactList();
-	void write();
 
 private:
 	int getEmailRef(QString email);
 	int getNameRef(QString name);
 	QString getRightString(QString in);
 	void read();
 
 private:
 	QList<Contact> addresses;
 	QString filename;
 	bool dirty;
 };
 
 #endif
diff --git a/noncore/net/mailit/editaccount.cpp b/noncore/net/mailit/editaccount.cpp
index c4f95ea..c0afbb2 100644
--- a/noncore/net/mailit/editaccount.cpp
+++ b/noncore/net/mailit/editaccount.cpp
@@ -1,120 +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 <qhbox.h>
 #include "editaccount.h"
 
 EditAccount::EditAccount( QWidget* parent, const char* name, WFlags fl )
 	: QDialog(parent, name, fl)
 {
 	setCaption( tr("Edit Account") );
 	init();
     popPasswInput->setEchoMode(QLineEdit::Password);
 }
 
 void EditAccount::setAccount(MailAccount *in, bool newOne)
 {
 	account = in;
 	if (newOne) {
 		accountNameInput->setText("");
 		nameInput->setText("");
 		emailInput->setText("");
 		popUserInput->setText("");
 		popPasswInput->setText("");
 		popServerInput->setText("");
 		smtpServerInput->setText("");
 		syncCheckBox->setChecked(TRUE);
+		syncLimitInput->setValue(2);
 	
 		setCaption( tr("Create new Account") );
 	} else {
 		accountNameInput->setText(account->accountName);
 		nameInput->setText(account->name);
 		emailInput->setText(account->emailAddress);
 		popUserInput->setText(account->popUserName);
 		popPasswInput->setText(account->popPasswd);
 		popServerInput->setText(account->popServer);
 		smtpServerInput->setText(account->smtpServer);
 		syncCheckBox->setChecked(account->synchronize);
+		syncLimitInput->setValue(account->syncLimit/1000);
 	}
 }
 
 void EditAccount::init()
 {
     grid = new QGridLayout(this);
     grid->setSpacing( 6 );
     grid->setMargin( 11 );
 
     accountNameInputLabel = new QLabel(tr("Account name"), this);
 	grid->addWidget( accountNameInputLabel, 0, 0 );
     accountNameInput = new QLineEdit( this, "account nameInput" );
     grid->addWidget( accountNameInput, 0, 1 );
 
     nameInputLabel = new QLabel(tr("Your name"), this);
     grid->addWidget( nameInputLabel, 1, 0 );
     nameInput = new QLineEdit( this, "nameInput" );
     grid->addWidget( nameInput, 1, 1 );
 
-    emailInputLabel = new QLabel("Email",  this);
+    emailInputLabel = new QLabel(tr("Email"),  this);
     grid->addWidget(emailInputLabel, 2, 0 );
     emailInput = new QLineEdit( this, "emailInput" );
     grid->addWidget( emailInput, 2, 1 );
 
-    popUserInputLabel = new QLabel("POP username", this);
+    popUserInputLabel = new QLabel(tr("POP username"), this);
     grid->addWidget( popUserInputLabel, 3, 0 );
     popUserInput = new QLineEdit( this, "popUserInput" );
     grid->addWidget( popUserInput, 3, 1 );
 
-    popPasswInputLabel = new QLabel( "POP password", this);
+    popPasswInputLabel = new QLabel( tr("POP password"), this);
     grid->addWidget( popPasswInputLabel, 4, 0 );
     popPasswInput = new QLineEdit( this, "popPasswInput" );
     grid->addWidget( popPasswInput, 4, 1 );
 
-    popServerInputLabel = new QLabel("POP server", this);
+    popServerInputLabel = new QLabel(tr("POP server"), this);
     grid->addWidget( popServerInputLabel, 5, 0 );
     popServerInput = new QLineEdit( this, "popServerInput" );
     grid->addWidget( popServerInput, 5, 1 );
 
-    smtpServerInputLabel = new QLabel("SMTP server", this );
+    smtpServerInputLabel = new QLabel(tr("SMTP server"), this );
     grid->addWidget( smtpServerInputLabel, 6, 0 );
     smtpServerInput = new QLineEdit( this, "smtpServerInput" );
     grid->addWidget( smtpServerInput, 6, 1 );
 
-    syncCheckBox = new QCheckBox( tr( "Synchronize with server"  ), this);
+    QHBox* syncBox=new QHBox(this);
+    grid->addWidget( syncBox, 7, 1 );
+
+    syncCheckBox = new QCheckBox( tr( "Synchronize"  ), this);
     syncCheckBox->setChecked( TRUE );
-    grid->addMultiCellWidget( syncCheckBox, 7, 7, 0, 1 );
+    grid->addWidget( syncCheckBox,7,0);
+    
+    syncLimitInputLabel = new QLabel(tr("Mail Size (k)"), syncBox);
+    //syncBox->addWidget( syncLimitInputLabel);
+    syncLimitInput = new QSpinBox( syncBox, "syncSize" );
+    //syncBox->addWidget(syncLimitInput);
+    
 }
 
 
 void EditAccount::accept()
 {
 	account->accountName = accountNameInput->text();
 	account->name = nameInput->text();
 	account->emailAddress = emailInput->text();
 	account->popUserName = popUserInput->text();
 	account->popPasswd = popPasswInput->text();
 	account->popServer = popServerInput->text();
 	account->smtpServer = smtpServerInput->text();
 	account->synchronize = syncCheckBox->isChecked();
+	account->syncLimit = syncLimitInput->value()*1000;	//Display in kB
 	
 	QDialog::accept();
 }
 
 void EditAccount::reject()
 {
 }
diff --git a/noncore/net/mailit/editaccount.h b/noncore/net/mailit/editaccount.h
index 7a90e50..1e15047 100644
--- a/noncore/net/mailit/editaccount.h
+++ b/noncore/net/mailit/editaccount.h
@@ -1,66 +1,69 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 #ifndef EDITACCOUNT_H
 #define EDITACCOUNT_H
 
 #include <qdialog.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qlayout.h>
+#include <qspinbox.h>
 #include "emailhandler.h"
 
 class EditAccount : public QDialog
 { 
     Q_OBJECT
 
 public:
     EditAccount( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     void setAccount(MailAccount *in, bool newOne = TRUE);
     void init();
 
 public slots:
 	void accept();
 	void reject();
 
 private:
 	MailAccount thisAccount, *account;
 
     QLabel *accountNameInputLabel;
     QLabel *nameInputLabel;
     QLabel *emailInputLabel;
     QLabel *popUserInputLabel;
     QLabel *popPasswInputLabel;
     QLabel *popServerInputLabel;
     QLabel *smtpServerInputLabel;
+    QLabel *syncLimitInputLabel;
 
     QLineEdit *accountNameInput;
     QLineEdit *nameInput;
     QLineEdit *emailInput;
     QLineEdit *popUserInput;
     QLineEdit *popPasswInput;
     QLineEdit *popServerInput;
     QLineEdit *smtpServerInput;
+    QSpinBox *syncLimitInput;    
     QCheckBox *syncCheckBox;
 
     QGridLayout *grid;
 };
 
 #endif
diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp
index 2943986..6612541 100644
--- a/noncore/net/mailit/emailclient.cpp
+++ b/noncore/net/mailit/emailclient.cpp
@@ -1,864 +1,872 @@
 /**********************************************************************
 ** 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 <qapplication.h>
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <qcheckbox.h>
 #include <qmenubar.h>
 #include <qaction.h>
-#include "resource.h"
+#include <qpe/resource.h>
 #include "emailclient.h"
 
 QCollection::Item AccountList::newItem(QCollection::Item d)
 {
   return dupl( (MailAccount *) d);
 }
 
 MailAccount* AccountList::dupl(MailAccount *in)
 {
   ac = new MailAccount(*in);
   return ac;
 }
 
 EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   : QMainWindow( parent, name, fl )
 {
   emailHandler = new EmailHandler();
-  addressList = new AddressList( getPath(FALSE) + "mail_adr");
+  addressList = new AddressList();
   
   sending = FALSE;
   receiving = FALSE;
   previewingMail = FALSE;
   mailIdCount = 1;
   accountIdCount = 1;
   allAccounts = FALSE;
   
   init();
   
   connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) );
   
   connect(emailHandler, SIGNAL(smtpError(int)), this,
       SLOT(smtpError(int)) );
   connect(emailHandler, SIGNAL(popError(int)), this,
       SLOT(popError(int)) );
   
   connect(inboxView, SIGNAL(clicked(QListViewItem *)), this, SLOT(inboxItemSelected()) );
   connect(outboxView, SIGNAL(clicked(QListViewItem *)), this, SLOT(outboxItemSelected()) );
   
   connect(emailHandler, SIGNAL(mailArrived(const Email &, bool)), this,
       SLOT(mailArrived(const Email &, bool)) );
   connect(emailHandler, SIGNAL(mailTransfered(int)), this,
       SLOT(allMailArrived(int)) );
   
   mailconf = new Config("mailit");
   //In case Synchronize is not defined in settings.txt
 
   readSettings();
   
   updateAccounts();
       
   lineShift = "\n";
   readMail();
   lineShift = "\r\n";
   
 }
 
 
 EmailClient::~EmailClient()
 {
   //needs to be moved from destructor to closewindow event
   saveMail(getPath(FALSE) + "inbox.txt", inboxView);
   //does not currently work.  Defining outbox in the same
   //format as inbox is not a good solution as they have
   //different properties
   saveMail(getPath(FALSE) + "outbox.txt", outboxView);
   saveSettings();
   
   mailconf->write();
   delete mailconf;
   
 }
 
 void EmailClient::init()
 {
   statusBar = new QStatusBar(this);
   statusBar->setSizeGripEnabled(FALSE);
   
   status1Label = new QLabel( tr("Idle"), statusBar);
   status2Label = new QLabel("", statusBar);
   connect(emailHandler, SIGNAL(updatePopStatus(const QString &)),
     status2Label, SLOT(setText(const QString &)) );
   connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)),
     status2Label, SLOT(setText(const QString &)) );
   
   progressBar = new QProgressBar(statusBar);
   connect(emailHandler, SIGNAL(mailboxSize(int)),
     this, SLOT(setTotalSize(int)) );
   connect(emailHandler, SIGNAL(currentMailSize(int)),
     this, SLOT(setMailSize(int)) );
   connect(emailHandler, SIGNAL(downloadedSize(int)),
     this, SLOT(setDownloadedSize(int)) );
 
   statusBar->addWidget(status1Label);
   statusBar->addWidget(progressBar);
   statusBar->addWidget(status2Label);
   
   setToolBarsMovable(FALSE);
   
   bar = new QToolBar(this);
   bar->setHorizontalStretchable( TRUE );
 
   mb = new QMenuBar( bar );
 
   QPopupMenu *mail = new QPopupMenu(mb);
   mb->insertItem( tr( "&Mail" ), mail);
 
   QPopupMenu *configure = new QPopupMenu(mb);
   mb->insertItem( tr( "Accounts" ), configure);
   
   selectAccountMenu = new QPopupMenu(mb);
   editAccountMenu = new QPopupMenu(mb);
   deleteAccountMenu = new QPopupMenu(mb);
 
   mail->insertItem(tr("Get Mail in"), selectAccountMenu);
   configure->insertItem(tr("Edit account"), editAccountMenu);
   configure->insertItem(tr("Delete account"), deleteAccountMenu);
 
   bar = new QToolBar(this);
 
   getMailButton = new QAction(tr("Get all mail"), Resource::loadPixmap("mailit/getmail"), QString::null, 0, this, 0);
   connect(getMailButton, SIGNAL(activated()), this, SLOT(getAllNewMail()) );
   getMailButton->addTo(bar);
   getMailButton->addTo(mail);
   
   sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendqueue"), QString::null, 0, this, 0);
   connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) );
   sendMailButton->addTo(bar);
   sendMailButton->addTo(mail);
     
   composeButton = new QAction(tr("Compose"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
   connect(composeButton, SIGNAL(activated()), this, SLOT(compose()) );
   composeButton->addTo(bar);
   composeButton->addTo(mail);
   
   cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("close"), QString::null, 0, this, 0);
   connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) );
   cancelButton->addTo(mail);
   cancelButton->addTo(bar);
   cancelButton->setEnabled(FALSE);
   
   mailboxView = new OTabWidget( this, "mailboxView" );
 
   QWidget* widget = new QWidget( mailboxView, "widget" );
   grid_2 = new QGridLayout( widget );
 //  grid_2->setSpacing(6);
 //  grid_2->setMargin( 11 );
 
   inboxView = new QListView( widget, "inboxView" );
   inboxView->addColumn( tr( "From" ) );
   inboxView->addColumn( tr( "Subject" ) );
   inboxView->addColumn( tr( "Date" ) );
   inboxView->setMinimumSize( QSize( 0, 0 ) );
   inboxView->setAllColumnsShowFocus(TRUE);
 
   grid_2->addWidget( inboxView, 2, 0 );
   mailboxView->addTab( widget, "mailit/inbox", tr( "Inbox" ) );
 
   QWidget* widget_2 = new QWidget( mailboxView, "widget_2" );
   grid_3 = new QGridLayout( widget_2 );
 //  grid_3->setSpacing(6);
 //  grid_3->setMargin( 11 );
 
   outboxView = new QListView( widget_2, "outboxView" );
   outboxView->addColumn( tr( "To" ) );
   outboxView->addColumn( tr( "Subject" ) );
   outboxView->setAllColumnsShowFocus(TRUE);
 
   grid_3->addWidget( outboxView, 0, 0 );
   mailboxView->addTab( widget_2,"mailit/outbox", tr( "Outbox" ) );
   
   setCentralWidget(mailboxView);
 }
 
 void EmailClient::compose()
 {
   emit composeRequested();
 }
 
 void EmailClient::cancel()
 {
   emailHandler->cancel();
 }
 
 AddressList* EmailClient::getAdrListRef()
 {
   return addressList;
 }
 
 //this needs to be rewritten to syncronize with outboxView
 void EmailClient::enqueMail(const Email &mail)
 {
  if (accountList.count() == 0) {
     QMessageBox::warning(qApp->activeWindow(),
       tr("No account selected"), tr("You must create an account"), "OK\n");
     return;
   }
    
   if (accountList.count() > 0) {
     currentAccount = accountList.first();
     qWarning("using account " + currentAccount->name);
   }
   
   Email addMail = mail;
   addMail.from = currentAccount->name;
   addMail.fromMail = currentAccount->emailAddress;
   addMail.rawMail.prepend("From: " + addMail.from + "<" + addMail.fromMail + ">\n");
   item = new EmailListItem(outboxView, addMail, false);
   
 }
 
 void EmailClient::sendQuedMail()
 {
   int count = 0;
 
   if (accountList.count() == 0) {
     QMessageBox::warning(qApp->activeWindow(), "No account selected", "You must create an account", "OK\n");
     return;
   }
   //traverse listview, find messages to send
   if (! sending) {
     item = (EmailListItem *) outboxView->firstChild();
     if (item != NULL) {
       while (item != NULL) {
         quedMessages.append(item->getMail());
         item = (EmailListItem *) item->nextSibling();
         count++;
       }
       setMailAccount();
       emailHandler->sendMail(&quedMessages);
       sending = TRUE;
       sendMailButton->setEnabled(FALSE);
       cancelButton->setEnabled(TRUE);
     } else {
       qWarning("sendQuedMail(): no messages to send");
     }
   }
 }
 
 void EmailClient::setMailAccount()
 {
   emailHandler->setAccount(*currentAccount);
 }
 
 void EmailClient::mailSent()
 {
   sending = FALSE;
   sendMailButton->setEnabled(TRUE);
   
   quedMessages.clear();
   outboxView->clear();    //should be moved to an sentBox
 }
 
 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());
 
   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 : ") );
   QTextStream t(&f);
   while (item != NULL) {
     mail = item->getMail();
     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);
   }
 }
 
 void EmailClient::setMailSize(int size)
 {
         progressBar->reset();
         progressBar->setTotalSteps(size);
 }
 
 void EmailClient::setTotalSize(int size)
 {
   
 }
 
 void EmailClient::setDownloadedSize(int size)
 {
         int total = progressBar->totalSteps();
 
         if (size < total) {
     progressBar->setProgress(size);
         } else {
           progressBar->setProgress(total);
         }
 }
diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp
index 1be16d4..9c1c814 100644
--- a/noncore/net/mailit/emailhandler.cpp
+++ b/noncore/net/mailit/emailhandler.cpp
@@ -1,592 +1,601 @@
 /**********************************************************************
 ** 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, 2000);  //less than 2000, download all
+  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("TO",':', 0, TRUE)) != -1) {
-    pos++;
-    mail->recipients.append (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;
 }
 
 int EmailHandler::encodeMime(Email *mail) 
 {
   
   QString fileName, fileType, contentType, newBody, boundary;
   Enclosure *ePtr;
   
   QString userName = mailAccount.name;
   if (userName.length()>0)	//only embrace it if there is a user name
   	userName += " <" + mailAccount.emailAddress + ">";
   
   //add standard headers
   newBody = "From: " + userName + "\r\nTo: ";
         for (QStringList::Iterator it = mail->recipients.begin(); it != mail->recipients.end(); ++it ) {
     newBody += *it + " ";
   }
   newBody += "\r\nSubject: " + mail->subject + "\r\n";
   
   if (mail->files.count() == 0) {         //just a simple mail
     newBody += "\r\n" + mail->body;
     mail->rawMail = newBody;
     return 0;
   }
 
   //Build mime encoded mail
   boundary = "-----4345=next_bound=0495----";
   
   newBody += "Mime-Version: 1.0\r\n";
   newBody += "Content-Type: multipart/mixed; boundary=\"" +
         boundary + "\"\r\n\r\n";
   
   newBody += "This is a multipart message in Mime 1.0 format\r\n\r\n";
   newBody += "--" + boundary + "\r\nContent-Type: text/plain\r\n\r\n";
   newBody += mail->body;
   
   for ( ePtr=mail->files.first(); ePtr != 0; ePtr=mail->files.next() ) {
     fileName = ePtr->originalName;
     fileType = ePtr->contentType;
     QFileInfo fi(fileName);
     
     // This specification of contentType is temporary
     contentType = "";
     if (fileType == "Picture") {
       contentType = "image/x-image";
     } else if (fileType == "Document") {
       contentType = "text/plain";
     } else if (fileType == "Sound") {
       contentType = "audio/x-wav";
     } else if (fileType == "Movie") {
       contentType = "video/mpeg";
     } else {
       contentType = "application/octet-stream";
     }
     
     newBody += "\r\n\r\n--" + boundary + "\r\n";
     newBody += "Content-Type: " + contentType + "; name=\"" +
           fi.fileName() + "\"\r\n";
     newBody += "Content-Transfer-Encoding: base64\r\n";
     newBody += "Content-Disposition: inline; filename=\"" +
           fi.fileName() + "\"\r\n\r\n";
     
     if (encodeFile(fileName, &newBody) == -1)   //file not found?
       return -1;
   }
   
   newBody += "\r\n\r\n--" + boundary + "--";
   mail->rawMail = newBody;
   
   return 0;
 }
 
 int EmailHandler::encodeFile(QString fileName, QString *toBody)
 {
   char *fileData;
   char *dataPtr;
   QString temp;
   uint dataSize, count;
   QFile f(fileName);
   
   if (! f.open(IO_ReadOnly) ) {
     qWarning("could not open file: " + fileName);
     return -1;
   }
   QTextStream s(&f);
   dataSize = f.size();
   fileData = (char *) malloc(dataSize + 3);
   s.readRawBytes(fileData, dataSize);
   
   temp = "";
   dataPtr = fileData;
   count  = 0;
   while (dataSize > 0) {
     if (dataSize < 3) {
       encode64base(dataPtr, &temp, dataSize);
       dataSize = 0;
     } else {
       encode64base(dataPtr, &temp, 3);
       dataSize -= 3;
       dataPtr += 3;
       count += 4;
     }
     if (count > 72) {
       count = 0;
       temp += "\r\n";
     }
   }
   toBody->append(temp);
   
   delete(fileData);
   f.close();
   return 0;
 }
 
 void EmailHandler::encode64base(char *src, QString *dest, int len)
 {
   QString temp;
   uchar c;
   uchar bufOut[4];
   
   bufOut[0] = src[0];
   bufOut[0] >>= 2;                  //Done byte 0
   
   bufOut[1] = src[0];
   bufOut[1] = bufOut[1] & (1 + 2);            //mask out top 6 bits
   bufOut[1] <<= 4;                  //copy up 4 places
   if (len > 1) {
     c = src[1];
   } else {
     c = 0;
   }
   
   c = c & (16 + 32 + 64 + 128);
   c >>= 4;
   bufOut[1] = bufOut[1] | c;              //Done byte 1
   
   bufOut[2] = src[1];
   bufOut[2] = bufOut[2] & (1 + 2 + 4 + 8);
   bufOut[2] <<= 2;
   if (len > 2) {
     c = src[2];
   } else {
     c = 0;
   }
   c >>= 6;
   bufOut[2] = bufOut[2] | c;
   
   bufOut[3] = src[2];
   bufOut[3] = bufOut[3] & (1 + 2 + 4 + 8 + 16 + 32);
   
   if (len == 1) {
     bufOut[2] = 64;
     bufOut[3] = 64;
   }
   if (len == 2) {
     bufOut[3] = 64;
   }
   for (int x = 0; x < 4; x++) {
     if (bufOut[x] <= 25)
       bufOut[x] += (uint) 'A';
     else if (bufOut[x] >= 26 && bufOut[x] <= 51)
       bufOut[x] += (uint) 'a' - 26;
     else if (bufOut[x] >= 52 && bufOut[x] <= 61)
       bufOut[x] += (uint) '0' - 52;
     else if (bufOut[x] == 62)
       bufOut[x] = '+';
     else if (bufOut[x] == 63)
       bufOut[x] = '/';
     else if (bufOut[x] == 64)
       bufOut[x] = '=';
 
     dest->append(bufOut[x]);
   }
 }
 
 void EmailHandler::cancel()
 {
   popClient->errorHandling(ErrCancel);
   smtpClient->errorHandling(ErrCancel);
 }
diff --git a/noncore/net/mailit/emailhandler.h b/noncore/net/mailit/emailhandler.h
index 17c4414..e47fd9a 100644
--- a/noncore/net/mailit/emailhandler.h
+++ b/noncore/net/mailit/emailhandler.h
@@ -1,147 +1,148 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 #ifndef EmailHandler_H
 #define EmailHandler_H
 
 #include <qobject.h>
 #include <qstring.h>
 #include <qdatetime.h>
 #include <qlist.h>
 #include <qstringlist.h>
 #include <qfile.h>
 #include <qstringlist.h>
 #include <qcollection.h>
 
 #include "smtpclient.h"
 #include "popclient.h"
 #include "textparser.h"
 #include "maillist.h"
 
 struct Enclosure
 {
 	int id;
 	QString originalName;
 	QString name;
 	QString path;
 	QString contentType;
 	QString contentAttribute;
 	QString encoding;
 	QString body;			//might use to much mem. check!!
 	bool saved, installed;
 };
 
 class EnclosureList : public QList<Enclosure>
 {
 public:
 	Item newItem(Item d);
 private:
 	Enclosure* dupl(Enclosure *in);
 	Enclosure *ac;
 };
 
 struct Email
 {
 	QString id;
 	QString from;
 	QString fromMail;
 	QStringList recipients;
 	QStringList carbonCopies;
 	QString date;
 	QString subject;
 	QString body;
 	QString bodyPlain;
 	bool sent, received, read, downloaded;
 	QString rawMail;
 	int mimeType;					//1 = Mime 1.0
 	int serverId;
 	int internalId;
 	int fromAccountId;
 	QString contentType;				//0 = text
 	QString contentAttribute;			//0 = plain, 1 = html
 	EnclosureList files;
 	uint size;
 	
 	void addEnclosure(Enclosure *e)
 	{
 		files.append(e);
 	}
 };
 
 struct MailAccount
 {
 	QString accountName;
 	QString name;
 	QString emailAddress;
 	QString popUserName;
 	QString popPasswd;
 	QString popServer;
 	QString smtpServer;
 	bool synchronize;
+	int syncLimit;
 	int lastServerMailCount;
 	int id;
 };
 
 	const int ErrUnknownResponse = 1001;
 	const int ErrLoginFailed = 1002;
 	const int ErrCancel = 1003;
 	
 
 class EmailHandler : public QObject
 {
 	Q_OBJECT
 
 public:
 	EmailHandler();
 	void setAccount(MailAccount account);
 	void sendMail(QList<Email> *mailList);
 	void getMail();
 	void getMailHeaders();
 	void getMailByList(MailList *mailList);
 	bool parse(QString in, QString lineShift, Email *mail);
 	bool getEnclosure(Enclosure *ePtr);
 	int parse64base(char *src, char *dest);
 	int encodeMime(Email *mail);
 	int encodeFile(QString fileName, QString *toBody);
 	void encode64base(char *src, QString *dest, int len);
 	void cancel();
 	
 signals:
 	void mailSent();
 	void smtpError(int);
 	void popError(int);
 	void mailArrived(const Email &, bool);
 	void updatePopStatus(const QString &);
 	void updateSmtpStatus(const QString &);
 	void mailTransfered(int);
 	void mailboxSize(int);
 	void currentMailSize(int);
 	void downloadedSize(int);
 
 public slots:
 	void messageArrived(const QString &, int id, uint size, bool complete);
 	
 private:
 	MailAccount mailAccount;
 	SmtpClient *smtpClient;
 	PopClient *popClient;
 	bool headers;
 };
 
 #endif
diff --git a/noncore/net/mailit/emaillistitem.cpp b/noncore/net/mailit/emaillistitem.cpp
index d47b0b7..a325766 100644
--- a/noncore/net/mailit/emaillistitem.cpp
+++ b/noncore/net/mailit/emaillistitem.cpp
@@ -1,92 +1,97 @@
 /**********************************************************************
 ** 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 <qstring.h>
+#include <qpe/resource.h>
 #include "emaillistitem.h"
 
 EmailListItem::EmailListItem(QListView *parent, Email mailIn, bool inbox)
 		: QListViewItem(parent)
 {
 	QString temp;
 	
 	mail = mailIn;
 	
 	if (inbox) {
 		setText(0, mail.from);
 	} else {
 		QStringList::Iterator it = mail.recipients.begin();
 		temp = *it;
 		if (mail.recipients.count() > 1)
 			temp += "...";
 		setText(0, temp);
 	}
 	setText(1, mail.subject);
 	
+	if (mailIn.files.count()>0)
+	{
+		setPixmap(0, Resource::loadPixmap("mailit/attach"));
+	}
 	selected = FALSE;
 }
 
 Email* EmailListItem::getMail()
 {
 	return &mail;
 }
 
 void EmailListItem::setMail(Email newMail)
 {
 	mail = newMail;
 	repaint();
 }
 
 void EmailListItem::setItemSelected(bool enable)
 {
 	selected = enable;
 	setSelected(enable);
 	repaint();
 }
 
 bool EmailListItem::isItemSelected()
 {
 	return selected;
 }
 
 void EmailListItem::paintCell( QPainter *p, const QColorGroup &cg,
 				int column, int width, int alignment )
 {
 
 	QColorGroup _cg( cg );
 	QColor c = _cg.text();
 
 	if ( (! mail.read) && (mail.received) )
 		_cg.setColor( QColorGroup::Text, Qt::blue);
 	if (!mail.downloaded)
 		_cg.setColor( QColorGroup::Text, Qt::red);
 	
 /*	if (selected) {
 		_cg.setColor(QColorGroup::Base, Qt::blue);
 		_cg.setColor(QColorGroup::Text, Qt::yellow);
 		if (isSelected()) {
 			_cg.setColor(QColorGroup::HighlightedText, Qt::yellow);
 		} else {
 			_cg.setColor(QColorGroup::Highlight, Qt::blue);
 		}
 	}
 */		
     QListViewItem::paintCell( p, _cg, column, width, alignment );
 
     _cg.setColor( QColorGroup::Text, c );
 }
diff --git a/noncore/net/mailit/mailit.pro b/noncore/net/mailit/mailit.pro
index a404884..b262f9a 100644
--- a/noncore/net/mailit/mailit.pro
+++ b/noncore/net/mailit/mailit.pro
@@ -1,43 +1,60 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 HEADERS   = emailclient.h \
       emailhandler.h \
       emaillistitem.h \
       mailitwindow.h \
       md5.h \
       popclient.h \
       readmail.h \
       smtpclient.h \
       writemail.h \
       textparser.h \
       viewatt.h \
       addatt.h \
       editaccount.h \
       maillist.h \
       addresslist.h
 SOURCES   = emailclient.cpp \
       emailhandler.cpp \
       emaillistitem.cpp \
       mailitwindow.cpp \
       main.cpp \
       md5.c \
       popclient.cpp \
       readmail.cpp \
       smtpclient.cpp \
       writemail.cpp \
       textparser.cpp \
       viewatt.cpp \
       addatt.cpp \
       editaccount.cpp \
       maillist.cpp \
       addresslist.cpp
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include 
 LIBS            += -lqpe -lopie
 # -lssl
 MOC_DIR=qpeobj
 OBJECTS_DIR=qpeobj
 DESTDIR=$(OPIEDIR)/bin
 
+TRANSLATIONS = ../../../i18n/de/mailit.ts \
+	 ../../../i18n/da/mailit.ts \
+	 ../../../i18n/xx/mailit.ts \
+	 ../../../i18n/en/mailit.ts \
+	 ../../../i18n/es/mailit.ts \
+	 ../../../i18n/fr/mailit.ts \
+	 ../../../i18n/hu/mailit.ts \
+	 ../../../i18n/ja/mailit.ts \
+	 ../../../i18n/ko/mailit.ts \
+	 ../../../i18n/no/mailit.ts \
+	 ../../../i18n/pl/mailit.ts \
+	 ../../../i18n/pt/mailit.ts \
+	 ../../../i18n/pt_BR/mailit.ts \
+	 ../../../i18n/sl/mailit.ts \
+	 ../../../i18n/zh_CN/mailit.ts \
+	 ../../../i18n/zh_TW/mailit.ts
+
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/net/mailit/readmail.cpp b/noncore/net/mailit/readmail.cpp
index 2011ecf..a5e7147 100644
--- a/noncore/net/mailit/readmail.cpp
+++ b/noncore/net/mailit/readmail.cpp
@@ -1,326 +1,326 @@
 /**********************************************************************
 ** 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 "resource.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/writemail.cpp b/noncore/net/mailit/writemail.cpp
index a45cfd2..38a2596 100644
--- a/noncore/net/mailit/writemail.cpp
+++ b/noncore/net/mailit/writemail.cpp
@@ -1,298 +1,298 @@
 /**********************************************************************
 ** 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 <qmessagebox.h>
 #include "writemail.h"
-#include "resource.h"
+#include <qpe/resource.h>
 
 WriteMail::WriteMail( QWidget* parent,  const char* name, WFlags fl )
 	: QMainWindow( parent, name, fl )
 {
 	showingAddressList = FALSE;
 	init();
 	
 	addAtt = new AddAtt(0, "Add Attatchments");
 }
 
 WriteMail::~WriteMail()
 {
 	delete addAtt;
 }
 
 void WriteMail::setAddressList(AddressList *list)
 {
 	Contact *cPtr;
 	
 	addressList = list;
 	
 	addressView->clear();
 	QList<Contact> *cListPtr = addressList->getContactList();
 	QListViewItem *item;
 	for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) {
 		item = new QListViewItem(addressView, cPtr->name, cPtr->email);
 	}
 }
 
 void WriteMail::init()
 {
 	setToolBarsMovable(FALSE);
 	
 	bar = new QToolBar(this);
 	bar->setHorizontalStretchable( TRUE );
 
 	menu = new QMenuBar( bar );
 
 	mailMenu = new QPopupMenu(menu);
 	menu->insertItem( tr( "&Mail" ), mailMenu);
 	addMenu = new QPopupMenu(menu);
 	menu->insertItem( tr( "&Add" ), addMenu);
 	
 	bar = new QToolBar(this);
 	attatchButton = new QAction(tr("Attatchment"), Resource::loadPixmap("mailit/attach"), QString::null, 0, this, 0);
 	attatchButton->addTo(bar);
 	attatchButton->addTo(addMenu);
 	connect( attatchButton, SIGNAL( activated() ), this, SLOT( attatchFile() ) );
 	
 	confirmButton = new QAction(tr("Enque mail"), Resource::loadPixmap("OKButton"), QString::null, 0, this, 0);
 	confirmButton->addTo(bar);
 	confirmButton->addTo(mailMenu);
 	connect( confirmButton, SIGNAL( activated() ), this, SLOT( accept() ) );
 	
 	newButton = new QAction(tr("New mail"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
 	newButton->addTo(mailMenu);
 	connect( newButton, SIGNAL( activated() ), this, SLOT( newMail() ) );
 	
 	widget = new QWidget(this, "widget");
 	grid = new QGridLayout( widget );
 
 	recipientsBox = new QComboBox( FALSE, widget, "toLabel" );
 	recipientsBox->insertItem( tr( "To:"  ) );
 	recipientsBox->insertItem( tr( "CC:"  ) );
 	recipientsBox->setCurrentItem(0);
 	grid->addWidget( recipientsBox, 0, 0 );
 	
 	subjetLabel = new QLabel( widget, "subjetLabel" );
 	subjetLabel->setText( tr( "Subject:"  ) );
 
 	grid->addWidget( subjetLabel, 1, 0 );
 
 	ToolButton13_2 = new QToolButton( widget, "ToolButton13_2" );
 	ToolButton13_2->setText( tr( "..."  ) );
 	grid->addWidget( ToolButton13_2, 1, 2 );
 
 	subjectInput = new QLineEdit( widget, "subjectInput" );
 	grid->addWidget( subjectInput, 1, 1 );
 
 	toInput = new QLineEdit( widget, "toInput" );
 	grid->addWidget( toInput, 0, 1 );
 
 	addressButton = new QToolButton( widget, "addressButton" );
 	addressButton->setPixmap( Resource::loadPixmap("AddressBook") );
 	addressButton->setToggleButton(TRUE);
 	grid->addWidget( addressButton, 0, 2 );
 	connect(addressButton, SIGNAL(clicked()), this, SLOT(getAddress()) );
 
 	emailInput = new QMultiLineEdit( widget, "emailInput" );
 	grid->addMultiCellWidget( emailInput, 2, 2, 0, 2);
 
 	
 	addressView = new QListView( widget, "addressView");
 	addressView->addColumn("Name");
 	addressView->addColumn("EMail");
 	addressView->setAllColumnsShowFocus(TRUE);
 	addressView->setMultiSelection(TRUE);
 	addressView->hide();
 	grid->addMultiCellWidget( addressView, 3, 3, 0, 2);
 	
 	okButton = new QToolButton(bar, "ok");
 	okButton->setPixmap( Resource::loadPixmap("enter") );
 	okButton->hide();
 	connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) );
 	
 	setCentralWidget(widget);
 }
 
 void WriteMail::reject()
 {
 	emit cancelMail();
 }
 
 // need to insert date
 void WriteMail::accept()
 {
 	QStringList attatchedFiles, attatchmentsType;
 	int idCount = 0;
 	
 	if (toInput->text() == "") {
 	 	QMessageBox::warning(this,"No recipient", "Send mail to whom?", "OK\n");
 		return;
 	}
 	if (! getRecipients() ) {
 	 	QMessageBox::warning(this,"Incorrect recipient separator",
 	 			"Recipients must be separated by ;\nand be valid emailaddresses", "OK\n");
 		return;
 	}
 	mail.subject = subjectInput->text();
 	mail.body = emailInput->text();
 	mail.sent = false;
 	mail.received = false;
 	mail.rawMail = "To: ";
 	
 	for (QStringList::Iterator it = mail.recipients.begin();
 		it != mail.recipients.end(); ++it) {
 		
 		mail.rawMail += (*it);
 		mail.rawMail += ",\n";
 	}
 	mail.rawMail.truncate(mail.rawMail.length()-2);
 	mail.rawMail += mail.from;
 	mail.rawMail += "\nSubject: ";
 	mail.rawMail += mail.subject;
 	mail.rawMail += "\n\n";
 	
 	attatchedFiles = addAtt->returnAttatchedFiles();
 	attatchmentsType = addAtt->returnFileTypes();
 
 	QStringList::Iterator itType = attatchmentsType.begin();
 	
 	Enclosure e;
 	for ( QStringList::Iterator it = attatchedFiles.begin(); it != attatchedFiles.end(); ++it ) {
 		e.id = idCount;
 		e.originalName = (*it).latin1();
 		e.contentType = (*itType).latin1();
 		e.contentAttribute = (*itType).latin1();
 		e.saved = TRUE;
 		mail.addEnclosure(&e);
 		
 		itType++;
 		idCount++;
 	}
 	mail.rawMail += mail.body;
 	mail.rawMail += "\n";
 	mail.rawMail += ".\n";
 	emit sendMailRequested(mail);
 	addAtt->clear();
 }
 
 void WriteMail::getAddress()
 {
 	showingAddressList = !showingAddressList;
 	
 	if (showingAddressList) {
 		emailInput->hide();
 		addressView->show();
 		okButton->show();
 		
 	} else {
 		addressView->hide();
 		okButton->hide();
 		emailInput->show();
 	}
 }
 
 void WriteMail::attatchFile()
 {
 	addAtt->showMaximized();
 }
 
 void WriteMail::reply(Email replyMail)
 {
 	int pos;
 	
 	mail = replyMail;
 	mail.files.clear();
 	
 	toInput->setText(mail.fromMail);
 	subjectInput->setText("Re: " + mail.subject);
 	
 	pos = 0;
 	mail.body.insert(pos, ">>");
 	while (pos != -1) {
 		pos = mail.body.find('\n', pos);
 		if (pos != -1)
 			mail.body.insert(++pos, ">>");
 	}
 	
 	emailInput->setText(mail.body);
 }
 
 bool WriteMail::getRecipients()
 {
 	QString str, temp;
 	int pos = 0;
 	
 	mail.recipients.clear();
 	
 	temp = toInput->text();
 	while ( (pos = temp.find(';')) != -1) {
 		str = temp.left(pos).stripWhiteSpace();
 		temp = temp.right(temp.length() - (pos + 1));
 		if ( str.find('@') == -1)
 			return false;
 		mail.recipients.append(str);
 		addressList->addContact(str, "");
 	}
 	temp = temp.stripWhiteSpace();
 	if ( temp.find('@') == -1)
 		return false;
 	mail.recipients.append(temp);
 	addressList->addContact(temp, "");
 	
 	return TRUE;
 }
 			
 
 void WriteMail::addRecipients()
 {
 	QString recipients = "";
 	
 	mail.recipients.clear();
 	QListViewItem *item = addressView->firstChild();
 	while (item != NULL) {
 		if ( item->isSelected() ) {
 			if (recipients == "") {
 				recipients = item->text(0);
 			} else {
 				recipients += "; " + item->text(0);
 			}
 		}
 		item = item->nextSibling();
 	}
 	toInput->setText(recipients);
 	
 	addressView->hide();
 	okButton->hide();
 	emailInput->show();
 	addressButton->setOn(FALSE);
 	showingAddressList = !showingAddressList;
 }
 
 void WriteMail::setRecipient(const QString &recipient)
 {
     toInput->setText(recipient);
 }
 
 void WriteMail::newMail()
 {
 	toInput->clear();
 	subjectInput->clear();
 	emailInput->clear();
 	//to clear selected
 	setAddressList(addressList);
 }
diff --git a/noncore/unsupported/mailit/addatt.cpp b/noncore/unsupported/mailit/addatt.cpp
index c8be865..d268f1f 100644
--- a/noncore/unsupported/mailit/addatt.cpp
+++ b/noncore/unsupported/mailit/addatt.cpp
@@ -1,224 +1,224 @@
 /**********************************************************************
 ** 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 <qlayout.h>
 #include <qhbox.h>
 #include <qdir.h>
 #include <qstringlist.h>
-#include "resource.h"
+#include <qpe/resource.h>
 #include "addatt.h"
 
 FileItem::FileItem(QListView *parent, DocLnk* dl)
 		: QListViewItem(parent)
 {
 	/*file = fileInfo;
 	type = fileType;*/
 	
 	doclnk=dl;
 
 	setText(0, doclnk->name());
 	
 /*	if (fileType == "Picture") {
 		setPixmap(0, Resource::loadPixmap("pixmap"));
 	} else if (fileType == "Document") {
 		setPixmap(0, Resource::loadPixmap("txt"));	
 	} else if (fileType == "Sound") {
 		setPixmap(0, Resource::loadPixmap("play"));
 	} else if (fileType == "Movie") {
 		setPixmap(0, Resource::loadPixmap("MPEGPlayer"));
 	} else if (fileType == "File") {
 		setPixmap(0, Resource::loadPixmap("exec"));
 	}*/
 }
 
 FileItem::~FileItem()
 {
 	if (doclnk!=NULL) delete doclnk;
 	doclnk=NULL;
 }
 
 AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
 	: QDialog(parent, name, f)
 {
 	setCaption("Adding attatchments");
 
 	QGridLayout *top = new QGridLayout(this, 1,1 );
 	
 	QHBox *buttons=new QHBox(this);
 	/*fileCategoryButton = new QPushButton(this);*/
-	attatchButton = new QPushButton("Attatch ->", buttons);
-	removeButton = new QPushButton("Remove", buttons);
+	attatchButton = new QPushButton(tr("Attatch..."), buttons);
+	removeButton = new QPushButton(tr("Remove"), buttons);
 
 	/*fileCategories = new QPopupMenu(fileCategoryButton);
 	fileCategoryButton->setPopup(fileCategories);
 	fileCategories->insertItem("Document");
 	fileCategories->insertItem("Picture");
 	fileCategories->insertItem("Sound");
 	fileCategories->insertItem("Movie");
 	fileCategories->insertItem("File");
 
 	fileCategoryButton->setText("Document");
 	top->addWidget(fileCategoryButton, 0, 0);*/
 	
 
 	top->addWidget(buttons,1,0);
 	//buttons->addWidget(attatchButton,0,0);
 	//buttons->addWidget(removeButton,0,1);
 
 	//connect(fileCategories, SIGNAL(activated(int)), this,
     	//	SLOT(fileCategorySelected(int)) );*/
 	connect(attatchButton, SIGNAL(clicked()), this,
 		SLOT(addAttatchment()) );
 	connect(removeButton, SIGNAL(clicked()), this,
 		SLOT(removeAttatchment()) );
 	
 	/*listView = new QListView(this, "AttView");
 	listView->addColumn("Documents");*
 	connect(listView, SIGNAL(doubleClicked(QListViewItem *)), this,
 		SLOT(addAttatchment()) );*/
 	
 	
 	attView = new QListView(this, "Selected");
 	attView->addColumn(tr("Attached"));
 	attView->addColumn(tr("File type"));
 	connect(attView, SIGNAL(doubleClicked(QListViewItem *)), this,
 		SLOT(removeAttatchment()) );
 
 	//top->addWidget(ofs, 0,0);
 	top->addWidget(attView, 0,0);
 	
 	clear();
 	
 
 }
 
 void AddAtt::clear()
 {
 	attView->clear();
 	//getFiles();
 	modified = FALSE;
 }
 
 /*void AddAtt::fileCategorySelected(int id)
 {
 	fileCategoryButton->setText(fileCategories->text(id));
 	getFiles();
 }*/
 
 void AddAtt::addAttatchment()
 {	
 	OFileDialog ofs("Attachments",this,0,0,"/root/Documents");
 	
 	ofs.showMaximized();
 	
 	if (ofs.exec()==QDialog::Accepted)
 	{
 		DocLnk* dl=new DocLnk(ofs.selectedDocument());
 		FileItem* fi=new FileItem(attView,dl);
 		fi->setPixmap(0,dl->pixmap());
 		fi->setText(1,dl->type());
 		attView->insertItem(fi);
 		modified = TRUE;	
 	}
 }
 
 void AddAtt::removeAttatchment()
 {
 	if (attView->selectedItem() != NULL) 
 	{
 		attView->takeItem(attView->selectedItem());
 	}
 	modified = TRUE;
 }
 
 void AddAtt::reject()
 {
 	if (modified) {
 		attView->clear();
 		modified = FALSE;
 	}
 }
 
 void AddAtt::accept()
 {
 	modified = FALSE;
 	hide();
 }
 
 void AddAtt::getFiles()
 {
 	QString path, selected;
 	
 	/*listView->clear();
 	
 	selected = fileCategoryButton->text();
 	if (selected == "Picture") {
 		path = "../pics/";
 	} else if (selected == "Document") {
 		path = ""			;					//sub-dirs not decided
 	} else if (selected == "Sound") {
 		path = "../sounds/";					//sub-dirs not decided
 	} else if (selected == "Movie") {
 		path = "";								//sub-dirs not decided
 	} else if (selected == "File") {
 		path = "";								//sub-dirs not decided
 	}
 
 	dir = new QDir(path);
 	dir->setFilter(QDir::Files);
 	const QFileInfoList *dirInfoList = dir->entryInfoList();
 
 	QFileInfoListIterator it(*dirInfoList);      // create list iterator
 
 	while ( (fi=it.current()) ) {           // for each file...
 		item = new FileItem(lis+ütView, *fi, selected);
 		++it;                               // goto next list element
 	}*/
 }
 
 QStringList AddAtt::returnAttatchedFiles()
 {
 	QFileInfo info;
 	QStringList list;
 	
 	item = (FileItem *) attView->firstChild();
 	
 	
 	while (item != NULL) {
 		DocLnk* dl=item->getDocLnk();
 		list+=dl->file();
 		/*info = item->getFileInfo();
 		list += info.filePath();*/
 		item = (FileItem *) item->nextSibling();
 	}
 	return list;
 }
 
 QStringList AddAtt::returnFileTypes()
 {
 	QStringList list;
 		
 	item = (FileItem *) attView->firstChild();
 			
 	while (item != NULL) {
 		list += item->getDocLnk()->type();
 		item = (FileItem *) item->nextSibling();
 	}
 	return list;
 }
diff --git a/noncore/unsupported/mailit/addresslist.cpp b/noncore/unsupported/mailit/addresslist.cpp
index 43e3830..9fe558a 100644
--- a/noncore/unsupported/mailit/addresslist.cpp
+++ b/noncore/unsupported/mailit/addresslist.cpp
@@ -1,181 +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(QString file)
+AddressList::AddressList()
 {
 	addresses.setAutoDelete(TRUE);
-	filename = file;
 	read();
 	dirty = FALSE;
 }
 
 AddressList::~AddressList()
 {
-	write();
 	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;
 	
-	//QFile f(filename);
 	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());
 	}
 	
 	/*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;
 }
 
-void AddressList::write()
-{
-	if ( (addresses.count() == 0) || (!dirty) )
-		return;
-		
-	QFile f(filename);
-	if (! f.open(IO_WriteOnly) )
-		return;
-	
-	QTextStream stream(&f);
-	Contact *ptr;
-	for (ptr = addresses.first(); ptr != 0; ptr = addresses.next() ) {
-		stream << "email = " + ptr->email + "\n";
-		stream << "name = " + ptr->name + "\n";
-	}
-	f.close();
-}
diff --git a/noncore/unsupported/mailit/addresslist.h b/noncore/unsupported/mailit/addresslist.h
index e87d6f1..99cef9a 100644
--- a/noncore/unsupported/mailit/addresslist.h
+++ b/noncore/unsupported/mailit/addresslist.h
@@ -1,59 +1,58 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 #ifndef ADDRESSLIST_H
 #define ADDRESSLIST_H
 
 #include <qobject.h>
 #include <qlist.h>
 
 struct Contact
 {
 	QString email;
 	QString name;
 };
 
 class AddressList : public QObject
 {
 	Q_OBJECT
 
 public:
-	AddressList(QString file);
+	AddressList();
 	~AddressList();
 	void addContact(QString email, QString name);
 	bool containsEmail(QString email);
 	bool containsName(QString name);
 	QString getNameByEmail(QString email);
 	QString getEmailByName(QString name);
 	QList<Contact>* getContactList();
-	void write();
 
 private:
 	int getEmailRef(QString email);
 	int getNameRef(QString name);
 	QString getRightString(QString in);
 	void read();
 
 private:
 	QList<Contact> addresses;
 	QString filename;
 	bool dirty;
 };
 
 #endif
diff --git a/noncore/unsupported/mailit/editaccount.cpp b/noncore/unsupported/mailit/editaccount.cpp
index c4f95ea..c0afbb2 100644
--- a/noncore/unsupported/mailit/editaccount.cpp
+++ b/noncore/unsupported/mailit/editaccount.cpp
@@ -1,120 +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 <qhbox.h>
 #include "editaccount.h"
 
 EditAccount::EditAccount( QWidget* parent, const char* name, WFlags fl )
 	: QDialog(parent, name, fl)
 {
 	setCaption( tr("Edit Account") );
 	init();
     popPasswInput->setEchoMode(QLineEdit::Password);
 }
 
 void EditAccount::setAccount(MailAccount *in, bool newOne)
 {
 	account = in;
 	if (newOne) {
 		accountNameInput->setText("");
 		nameInput->setText("");
 		emailInput->setText("");
 		popUserInput->setText("");
 		popPasswInput->setText("");
 		popServerInput->setText("");
 		smtpServerInput->setText("");
 		syncCheckBox->setChecked(TRUE);
+		syncLimitInput->setValue(2);
 	
 		setCaption( tr("Create new Account") );
 	} else {
 		accountNameInput->setText(account->accountName);
 		nameInput->setText(account->name);
 		emailInput->setText(account->emailAddress);
 		popUserInput->setText(account->popUserName);
 		popPasswInput->setText(account->popPasswd);
 		popServerInput->setText(account->popServer);
 		smtpServerInput->setText(account->smtpServer);
 		syncCheckBox->setChecked(account->synchronize);
+		syncLimitInput->setValue(account->syncLimit/1000);
 	}
 }
 
 void EditAccount::init()
 {
     grid = new QGridLayout(this);
     grid->setSpacing( 6 );
     grid->setMargin( 11 );
 
     accountNameInputLabel = new QLabel(tr("Account name"), this);
 	grid->addWidget( accountNameInputLabel, 0, 0 );
     accountNameInput = new QLineEdit( this, "account nameInput" );
     grid->addWidget( accountNameInput, 0, 1 );
 
     nameInputLabel = new QLabel(tr("Your name"), this);
     grid->addWidget( nameInputLabel, 1, 0 );
     nameInput = new QLineEdit( this, "nameInput" );
     grid->addWidget( nameInput, 1, 1 );
 
-    emailInputLabel = new QLabel("Email",  this);
+    emailInputLabel = new QLabel(tr("Email"),  this);
     grid->addWidget(emailInputLabel, 2, 0 );
     emailInput = new QLineEdit( this, "emailInput" );
     grid->addWidget( emailInput, 2, 1 );
 
-    popUserInputLabel = new QLabel("POP username", this);
+    popUserInputLabel = new QLabel(tr("POP username"), this);
     grid->addWidget( popUserInputLabel, 3, 0 );
     popUserInput = new QLineEdit( this, "popUserInput" );
     grid->addWidget( popUserInput, 3, 1 );
 
-    popPasswInputLabel = new QLabel( "POP password", this);
+    popPasswInputLabel = new QLabel( tr("POP password"), this);
     grid->addWidget( popPasswInputLabel, 4, 0 );
     popPasswInput = new QLineEdit( this, "popPasswInput" );
     grid->addWidget( popPasswInput, 4, 1 );
 
-    popServerInputLabel = new QLabel("POP server", this);
+    popServerInputLabel = new QLabel(tr("POP server"), this);
     grid->addWidget( popServerInputLabel, 5, 0 );
     popServerInput = new QLineEdit( this, "popServerInput" );
     grid->addWidget( popServerInput, 5, 1 );
 
-    smtpServerInputLabel = new QLabel("SMTP server", this );
+    smtpServerInputLabel = new QLabel(tr("SMTP server"), this );
     grid->addWidget( smtpServerInputLabel, 6, 0 );
     smtpServerInput = new QLineEdit( this, "smtpServerInput" );
     grid->addWidget( smtpServerInput, 6, 1 );
 
-    syncCheckBox = new QCheckBox( tr( "Synchronize with server"  ), this);
+    QHBox* syncBox=new QHBox(this);
+    grid->addWidget( syncBox, 7, 1 );
+
+    syncCheckBox = new QCheckBox( tr( "Synchronize"  ), this);
     syncCheckBox->setChecked( TRUE );
-    grid->addMultiCellWidget( syncCheckBox, 7, 7, 0, 1 );
+    grid->addWidget( syncCheckBox,7,0);
+    
+    syncLimitInputLabel = new QLabel(tr("Mail Size (k)"), syncBox);
+    //syncBox->addWidget( syncLimitInputLabel);
+    syncLimitInput = new QSpinBox( syncBox, "syncSize" );
+    //syncBox->addWidget(syncLimitInput);
+    
 }
 
 
 void EditAccount::accept()
 {
 	account->accountName = accountNameInput->text();
 	account->name = nameInput->text();
 	account->emailAddress = emailInput->text();
 	account->popUserName = popUserInput->text();
 	account->popPasswd = popPasswInput->text();
 	account->popServer = popServerInput->text();
 	account->smtpServer = smtpServerInput->text();
 	account->synchronize = syncCheckBox->isChecked();
+	account->syncLimit = syncLimitInput->value()*1000;	//Display in kB
 	
 	QDialog::accept();
 }
 
 void EditAccount::reject()
 {
 }
diff --git a/noncore/unsupported/mailit/editaccount.h b/noncore/unsupported/mailit/editaccount.h
index 7a90e50..1e15047 100644
--- a/noncore/unsupported/mailit/editaccount.h
+++ b/noncore/unsupported/mailit/editaccount.h
@@ -1,66 +1,69 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 #ifndef EDITACCOUNT_H
 #define EDITACCOUNT_H
 
 #include <qdialog.h>
 #include <qlabel.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
 #include <qlayout.h>
+#include <qspinbox.h>
 #include "emailhandler.h"
 
 class EditAccount : public QDialog
 { 
     Q_OBJECT
 
 public:
     EditAccount( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
     void setAccount(MailAccount *in, bool newOne = TRUE);
     void init();
 
 public slots:
 	void accept();
 	void reject();
 
 private:
 	MailAccount thisAccount, *account;
 
     QLabel *accountNameInputLabel;
     QLabel *nameInputLabel;
     QLabel *emailInputLabel;
     QLabel *popUserInputLabel;
     QLabel *popPasswInputLabel;
     QLabel *popServerInputLabel;
     QLabel *smtpServerInputLabel;
+    QLabel *syncLimitInputLabel;
 
     QLineEdit *accountNameInput;
     QLineEdit *nameInput;
     QLineEdit *emailInput;
     QLineEdit *popUserInput;
     QLineEdit *popPasswInput;
     QLineEdit *popServerInput;
     QLineEdit *smtpServerInput;
+    QSpinBox *syncLimitInput;    
     QCheckBox *syncCheckBox;
 
     QGridLayout *grid;
 };
 
 #endif
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index 2943986..6612541 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -1,864 +1,872 @@
 /**********************************************************************
 ** 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 <qapplication.h>
 #include <qmessagebox.h>
 #include <qfile.h>
 #include <qcheckbox.h>
 #include <qmenubar.h>
 #include <qaction.h>
-#include "resource.h"
+#include <qpe/resource.h>
 #include "emailclient.h"
 
 QCollection::Item AccountList::newItem(QCollection::Item d)
 {
   return dupl( (MailAccount *) d);
 }
 
 MailAccount* AccountList::dupl(MailAccount *in)
 {
   ac = new MailAccount(*in);
   return ac;
 }
 
 EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   : QMainWindow( parent, name, fl )
 {
   emailHandler = new EmailHandler();
-  addressList = new AddressList( getPath(FALSE) + "mail_adr");
+  addressList = new AddressList();
   
   sending = FALSE;
   receiving = FALSE;
   previewingMail = FALSE;
   mailIdCount = 1;
   accountIdCount = 1;
   allAccounts = FALSE;
   
   init();
   
   connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) );
   
   connect(emailHandler, SIGNAL(smtpError(int)), this,
       SLOT(smtpError(int)) );
   connect(emailHandler, SIGNAL(popError(int)), this,
       SLOT(popError(int)) );
   
   connect(inboxView, SIGNAL(clicked(QListViewItem *)), this, SLOT(inboxItemSelected()) );
   connect(outboxView, SIGNAL(clicked(QListViewItem *)), this, SLOT(outboxItemSelected()) );
   
   connect(emailHandler, SIGNAL(mailArrived(const Email &, bool)), this,
       SLOT(mailArrived(const Email &, bool)) );
   connect(emailHandler, SIGNAL(mailTransfered(int)), this,
       SLOT(allMailArrived(int)) );
   
   mailconf = new Config("mailit");
   //In case Synchronize is not defined in settings.txt
 
   readSettings();
   
   updateAccounts();
       
   lineShift = "\n";
   readMail();
   lineShift = "\r\n";
   
 }
 
 
 EmailClient::~EmailClient()
 {
   //needs to be moved from destructor to closewindow event
   saveMail(getPath(FALSE) + "inbox.txt", inboxView);
   //does not currently work.  Defining outbox in the same
   //format as inbox is not a good solution as they have
   //different properties
   saveMail(getPath(FALSE) + "outbox.txt", outboxView);
   saveSettings();
   
   mailconf->write();
   delete mailconf;
   
 }
 
 void EmailClient::init()
 {
   statusBar = new QStatusBar(this);
   statusBar->setSizeGripEnabled(FALSE);
   
   status1Label = new QLabel( tr("Idle"), statusBar);
   status2Label = new QLabel("", statusBar);
   connect(emailHandler, SIGNAL(updatePopStatus(const QString &)),
     status2Label, SLOT(setText(const QString &)) );
   connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)),
     status2Label, SLOT(setText(const QString &)) );
   
   progressBar = new QProgressBar(statusBar);
   connect(emailHandler, SIGNAL(mailboxSize(int)),
     this, SLOT(setTotalSize(int)) );
   connect(emailHandler, SIGNAL(currentMailSize(int)),
     this, SLOT(setMailSize(int)) );
   connect(emailHandler, SIGNAL(downloadedSize(int)),
     this, SLOT(setDownloadedSize(int)) );
 
   statusBar->addWidget(status1Label);
   statusBar->addWidget(progressBar);
   statusBar->addWidget(status2Label);
   
   setToolBarsMovable(FALSE);
   
   bar = new QToolBar(this);
   bar->setHorizontalStretchable( TRUE );
 
   mb = new QMenuBar( bar );
 
   QPopupMenu *mail = new QPopupMenu(mb);
   mb->insertItem( tr( "&Mail" ), mail);
 
   QPopupMenu *configure = new QPopupMenu(mb);
   mb->insertItem( tr( "Accounts" ), configure);
   
   selectAccountMenu = new QPopupMenu(mb);
   editAccountMenu = new QPopupMenu(mb);
   deleteAccountMenu = new QPopupMenu(mb);
 
   mail->insertItem(tr("Get Mail in"), selectAccountMenu);
   configure->insertItem(tr("Edit account"), editAccountMenu);
   configure->insertItem(tr("Delete account"), deleteAccountMenu);
 
   bar = new QToolBar(this);
 
   getMailButton = new QAction(tr("Get all mail"), Resource::loadPixmap("mailit/getmail"), QString::null, 0, this, 0);
   connect(getMailButton, SIGNAL(activated()), this, SLOT(getAllNewMail()) );
   getMailButton->addTo(bar);
   getMailButton->addTo(mail);
   
   sendMailButton = new QAction(tr("Send mail"), Resource::loadPixmap("mailit/sendqueue"), QString::null, 0, this, 0);
   connect(sendMailButton, SIGNAL(activated()), this, SLOT(sendQuedMail()) );
   sendMailButton->addTo(bar);
   sendMailButton->addTo(mail);
     
   composeButton = new QAction(tr("Compose"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
   connect(composeButton, SIGNAL(activated()), this, SLOT(compose()) );
   composeButton->addTo(bar);
   composeButton->addTo(mail);
   
   cancelButton = new QAction(tr("Cancel transfer"), Resource::loadPixmap("close"), QString::null, 0, this, 0);
   connect(cancelButton, SIGNAL(activated()), this, SLOT(cancel()) );
   cancelButton->addTo(mail);
   cancelButton->addTo(bar);
   cancelButton->setEnabled(FALSE);
   
   mailboxView = new OTabWidget( this, "mailboxView" );
 
   QWidget* widget = new QWidget( mailboxView, "widget" );
   grid_2 = new QGridLayout( widget );
 //  grid_2->setSpacing(6);
 //  grid_2->setMargin( 11 );
 
   inboxView = new QListView( widget, "inboxView" );
   inboxView->addColumn( tr( "From" ) );
   inboxView->addColumn( tr( "Subject" ) );
   inboxView->addColumn( tr( "Date" ) );
   inboxView->setMinimumSize( QSize( 0, 0 ) );
   inboxView->setAllColumnsShowFocus(TRUE);
 
   grid_2->addWidget( inboxView, 2, 0 );
   mailboxView->addTab( widget, "mailit/inbox", tr( "Inbox" ) );
 
   QWidget* widget_2 = new QWidget( mailboxView, "widget_2" );
   grid_3 = new QGridLayout( widget_2 );
 //  grid_3->setSpacing(6);
 //  grid_3->setMargin( 11 );
 
   outboxView = new QListView( widget_2, "outboxView" );
   outboxView->addColumn( tr( "To" ) );
   outboxView->addColumn( tr( "Subject" ) );
   outboxView->setAllColumnsShowFocus(TRUE);
 
   grid_3->addWidget( outboxView, 0, 0 );
   mailboxView->addTab( widget_2,"mailit/outbox", tr( "Outbox" ) );
   
   setCentralWidget(mailboxView);
 }
 
 void EmailClient::compose()
 {
   emit composeRequested();
 }
 
 void EmailClient::cancel()
 {
   emailHandler->cancel();
 }
 
 AddressList* EmailClient::getAdrListRef()
 {
   return addressList;
 }
 
 //this needs to be rewritten to syncronize with outboxView
 void EmailClient::enqueMail(const Email &mail)
 {
  if (accountList.count() == 0) {
     QMessageBox::warning(qApp->activeWindow(),
       tr("No account selected"), tr("You must create an account"), "OK\n");
     return;
   }
    
   if (accountList.count() > 0) {
     currentAccount = accountList.first();
     qWarning("using account " + currentAccount->name);
   }
   
   Email addMail = mail;
   addMail.from = currentAccount->name;
   addMail.fromMail = currentAccount->emailAddress;
   addMail.rawMail.prepend("From: " + addMail.from + "<" + addMail.fromMail + ">\n");
   item = new EmailListItem(outboxView, addMail, false);
   
 }
 
 void EmailClient::sendQuedMail()
 {
   int count = 0;
 
   if (accountList.count() == 0) {
     QMessageBox::warning(qApp->activeWindow(), "No account selected", "You must create an account", "OK\n");
     return;
   }
   //traverse listview, find messages to send
   if (! sending) {
     item = (EmailListItem *) outboxView->firstChild();
     if (item != NULL) {
       while (item != NULL) {
         quedMessages.append(item->getMail());
         item = (EmailListItem *) item->nextSibling();
         count++;
       }
       setMailAccount();
       emailHandler->sendMail(&quedMessages);
       sending = TRUE;
       sendMailButton->setEnabled(FALSE);
       cancelButton->setEnabled(TRUE);
     } else {
       qWarning("sendQuedMail(): no messages to send");
     }
   }
 }
 
 void EmailClient::setMailAccount()
 {
   emailHandler->setAccount(*currentAccount);
 }
 
 void EmailClient::mailSent()
 {
   sending = FALSE;
   sendMailButton->setEnabled(TRUE);
   
   quedMessages.clear();
   outboxView->clear();    //should be moved to an sentBox
 }
 
 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());
 
   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 : ") );
   QTextStream t(&f);
   while (item != NULL) {
     mail = item->getMail();
     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);
   }
 }
 
 void EmailClient::setMailSize(int size)
 {
         progressBar->reset();
         progressBar->setTotalSteps(size);
 }
 
 void EmailClient::setTotalSize(int size)
 {
   
 }
 
 void EmailClient::setDownloadedSize(int size)
 {
         int total = progressBar->totalSteps();
 
         if (size < total) {
     progressBar->setProgress(size);
         } else {
           progressBar->setProgress(total);
         }
 }
diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp
index 1be16d4..9c1c814 100644
--- a/noncore/unsupported/mailit/emailhandler.cpp
+++ b/noncore/unsupported/mailit/emailhandler.cpp
@@ -1,592 +1,601 @@
 /**********************************************************************
 ** 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, 2000);  //less than 2000, download all
+  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("TO",':', 0, TRUE)) != -1) {
-    pos++;
-    mail->recipients.append (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;
 }
 
 int EmailHandler::encodeMime(Email *mail) 
 {
   
   QString fileName, fileType, contentType, newBody, boundary;
   Enclosure *ePtr;
   
   QString userName = mailAccount.name;
   if (userName.length()>0)	//only embrace it if there is a user name
   	userName += " <" + mailAccount.emailAddress + ">";
   
   //add standard headers
   newBody = "From: " + userName + "\r\nTo: ";
         for (QStringList::Iterator it = mail->recipients.begin(); it != mail->recipients.end(); ++it ) {
     newBody += *it + " ";
   }
   newBody += "\r\nSubject: " + mail->subject + "\r\n";
   
   if (mail->files.count() == 0) {         //just a simple mail
     newBody += "\r\n" + mail->body;
     mail->rawMail = newBody;
     return 0;
   }
 
   //Build mime encoded mail
   boundary = "-----4345=next_bound=0495----";
   
   newBody += "Mime-Version: 1.0\r\n";
   newBody += "Content-Type: multipart/mixed; boundary=\"" +
         boundary + "\"\r\n\r\n";
   
   newBody += "This is a multipart message in Mime 1.0 format\r\n\r\n";
   newBody += "--" + boundary + "\r\nContent-Type: text/plain\r\n\r\n";
   newBody += mail->body;
   
   for ( ePtr=mail->files.first(); ePtr != 0; ePtr=mail->files.next() ) {
     fileName = ePtr->originalName;
     fileType = ePtr->contentType;
     QFileInfo fi(fileName);
     
     // This specification of contentType is temporary
     contentType = "";
     if (fileType == "Picture") {
       contentType = "image/x-image";
     } else if (fileType == "Document") {
       contentType = "text/plain";
     } else if (fileType == "Sound") {
       contentType = "audio/x-wav";
     } else if (fileType == "Movie") {
       contentType = "video/mpeg";
     } else {
       contentType = "application/octet-stream";
     }
     
     newBody += "\r\n\r\n--" + boundary + "\r\n";
     newBody += "Content-Type: " + contentType + "; name=\"" +
           fi.fileName() + "\"\r\n";
     newBody += "Content-Transfer-Encoding: base64\r\n";
     newBody += "Content-Disposition: inline; filename=\"" +
           fi.fileName() + "\"\r\n\r\n";
     
     if (encodeFile(fileName, &newBody) == -1)   //file not found?
       return -1;
   }
   
   newBody += "\r\n\r\n--" + boundary + "--";
   mail->rawMail = newBody;
   
   return 0;
 }
 
 int EmailHandler::encodeFile(QString fileName, QString *toBody)
 {
   char *fileData;
   char *dataPtr;
   QString temp;
   uint dataSize, count;
   QFile f(fileName);
   
   if (! f.open(IO_ReadOnly) ) {
     qWarning("could not open file: " + fileName);
     return -1;
   }
   QTextStream s(&f);
   dataSize = f.size();
   fileData = (char *) malloc(dataSize + 3);
   s.readRawBytes(fileData, dataSize);
   
   temp = "";
   dataPtr = fileData;
   count  = 0;
   while (dataSize > 0) {
     if (dataSize < 3) {
       encode64base(dataPtr, &temp, dataSize);
       dataSize = 0;
     } else {
       encode64base(dataPtr, &temp, 3);
       dataSize -= 3;
       dataPtr += 3;
       count += 4;
     }
     if (count > 72) {
       count = 0;
       temp += "\r\n";
     }
   }
   toBody->append(temp);
   
   delete(fileData);
   f.close();
   return 0;
 }
 
 void EmailHandler::encode64base(char *src, QString *dest, int len)
 {
   QString temp;
   uchar c;
   uchar bufOut[4];
   
   bufOut[0] = src[0];
   bufOut[0] >>= 2;                  //Done byte 0
   
   bufOut[1] = src[0];
   bufOut[1] = bufOut[1] & (1 + 2);            //mask out top 6 bits
   bufOut[1] <<= 4;                  //copy up 4 places
   if (len > 1) {
     c = src[1];
   } else {
     c = 0;
   }
   
   c = c & (16 + 32 + 64 + 128);
   c >>= 4;
   bufOut[1] = bufOut[1] | c;              //Done byte 1
   
   bufOut[2] = src[1];
   bufOut[2] = bufOut[2] & (1 + 2 + 4 + 8);
   bufOut[2] <<= 2;
   if (len > 2) {
     c = src[2];
   } else {
     c = 0;
   }
   c >>= 6;
   bufOut[2] = bufOut[2] | c;
   
   bufOut[3] = src[2];
   bufOut[3] = bufOut[3] & (1 + 2 + 4 + 8 + 16 + 32);
   
   if (len == 1) {
     bufOut[2] = 64;
     bufOut[3] = 64;
   }
   if (len == 2) {
     bufOut[3] = 64;
   }
   for (int x = 0; x < 4; x++) {
     if (bufOut[x] <= 25)
       bufOut[x] += (uint) 'A';
     else if (bufOut[x] >= 26 && bufOut[x] <= 51)
       bufOut[x] += (uint) 'a' - 26;
     else if (bufOut[x] >= 52 && bufOut[x] <= 61)
       bufOut[x] += (uint) '0' - 52;
     else if (bufOut[x] == 62)
       bufOut[x] = '+';
     else if (bufOut[x] == 63)
       bufOut[x] = '/';
     else if (bufOut[x] == 64)
       bufOut[x] = '=';
 
     dest->append(bufOut[x]);
   }
 }
 
 void EmailHandler::cancel()
 {
   popClient->errorHandling(ErrCancel);
   smtpClient->errorHandling(ErrCancel);
 }
diff --git a/noncore/unsupported/mailit/emailhandler.h b/noncore/unsupported/mailit/emailhandler.h
index 17c4414..e47fd9a 100644
--- a/noncore/unsupported/mailit/emailhandler.h
+++ b/noncore/unsupported/mailit/emailhandler.h
@@ -1,147 +1,148 @@
 /**********************************************************************
 ** 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.
 **
 **********************************************************************/
 #ifndef EmailHandler_H
 #define EmailHandler_H
 
 #include <qobject.h>
 #include <qstring.h>
 #include <qdatetime.h>
 #include <qlist.h>
 #include <qstringlist.h>
 #include <qfile.h>
 #include <qstringlist.h>
 #include <qcollection.h>
 
 #include "smtpclient.h"
 #include "popclient.h"
 #include "textparser.h"
 #include "maillist.h"
 
 struct Enclosure
 {
 	int id;
 	QString originalName;
 	QString name;
 	QString path;
 	QString contentType;
 	QString contentAttribute;
 	QString encoding;
 	QString body;			//might use to much mem. check!!
 	bool saved, installed;
 };
 
 class EnclosureList : public QList<Enclosure>
 {
 public:
 	Item newItem(Item d);
 private:
 	Enclosure* dupl(Enclosure *in);
 	Enclosure *ac;
 };
 
 struct Email
 {
 	QString id;
 	QString from;
 	QString fromMail;
 	QStringList recipients;
 	QStringList carbonCopies;
 	QString date;
 	QString subject;
 	QString body;
 	QString bodyPlain;
 	bool sent, received, read, downloaded;
 	QString rawMail;
 	int mimeType;					//1 = Mime 1.0
 	int serverId;
 	int internalId;
 	int fromAccountId;
 	QString contentType;				//0 = text
 	QString contentAttribute;			//0 = plain, 1 = html
 	EnclosureList files;
 	uint size;
 	
 	void addEnclosure(Enclosure *e)
 	{
 		files.append(e);
 	}
 };
 
 struct MailAccount
 {
 	QString accountName;
 	QString name;
 	QString emailAddress;
 	QString popUserName;
 	QString popPasswd;
 	QString popServer;
 	QString smtpServer;
 	bool synchronize;
+	int syncLimit;
 	int lastServerMailCount;
 	int id;
 };
 
 	const int ErrUnknownResponse = 1001;
 	const int ErrLoginFailed = 1002;
 	const int ErrCancel = 1003;
 	
 
 class EmailHandler : public QObject
 {
 	Q_OBJECT
 
 public:
 	EmailHandler();
 	void setAccount(MailAccount account);
 	void sendMail(QList<Email> *mailList);
 	void getMail();
 	void getMailHeaders();
 	void getMailByList(MailList *mailList);
 	bool parse(QString in, QString lineShift, Email *mail);
 	bool getEnclosure(Enclosure *ePtr);
 	int parse64base(char *src, char *dest);
 	int encodeMime(Email *mail);
 	int encodeFile(QString fileName, QString *toBody);
 	void encode64base(char *src, QString *dest, int len);
 	void cancel();
 	
 signals:
 	void mailSent();
 	void smtpError(int);
 	void popError(int);
 	void mailArrived(const Email &, bool);
 	void updatePopStatus(const QString &);
 	void updateSmtpStatus(const QString &);
 	void mailTransfered(int);
 	void mailboxSize(int);
 	void currentMailSize(int);
 	void downloadedSize(int);
 
 public slots:
 	void messageArrived(const QString &, int id, uint size, bool complete);
 	
 private:
 	MailAccount mailAccount;
 	SmtpClient *smtpClient;
 	PopClient *popClient;
 	bool headers;
 };
 
 #endif
diff --git a/noncore/unsupported/mailit/emaillistitem.cpp b/noncore/unsupported/mailit/emaillistitem.cpp
index d47b0b7..a325766 100644
--- a/noncore/unsupported/mailit/emaillistitem.cpp
+++ b/noncore/unsupported/mailit/emaillistitem.cpp
@@ -1,92 +1,97 @@
 /**********************************************************************
 ** 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 <qstring.h>
+#include <qpe/resource.h>
 #include "emaillistitem.h"
 
 EmailListItem::EmailListItem(QListView *parent, Email mailIn, bool inbox)
 		: QListViewItem(parent)
 {
 	QString temp;
 	
 	mail = mailIn;
 	
 	if (inbox) {
 		setText(0, mail.from);
 	} else {
 		QStringList::Iterator it = mail.recipients.begin();
 		temp = *it;
 		if (mail.recipients.count() > 1)
 			temp += "...";
 		setText(0, temp);
 	}
 	setText(1, mail.subject);
 	
+	if (mailIn.files.count()>0)
+	{
+		setPixmap(0, Resource::loadPixmap("mailit/attach"));
+	}
 	selected = FALSE;
 }
 
 Email* EmailListItem::getMail()
 {
 	return &mail;
 }
 
 void EmailListItem::setMail(Email newMail)
 {
 	mail = newMail;
 	repaint();
 }
 
 void EmailListItem::setItemSelected(bool enable)
 {
 	selected = enable;
 	setSelected(enable);
 	repaint();
 }
 
 bool EmailListItem::isItemSelected()
 {
 	return selected;
 }
 
 void EmailListItem::paintCell( QPainter *p, const QColorGroup &cg,
 				int column, int width, int alignment )
 {
 
 	QColorGroup _cg( cg );
 	QColor c = _cg.text();
 
 	if ( (! mail.read) && (mail.received) )
 		_cg.setColor( QColorGroup::Text, Qt::blue);
 	if (!mail.downloaded)
 		_cg.setColor( QColorGroup::Text, Qt::red);
 	
 /*	if (selected) {
 		_cg.setColor(QColorGroup::Base, Qt::blue);
 		_cg.setColor(QColorGroup::Text, Qt::yellow);
 		if (isSelected()) {
 			_cg.setColor(QColorGroup::HighlightedText, Qt::yellow);
 		} else {
 			_cg.setColor(QColorGroup::Highlight, Qt::blue);
 		}
 	}
 */		
     QListViewItem::paintCell( p, _cg, column, width, alignment );
 
     _cg.setColor( QColorGroup::Text, c );
 }
diff --git a/noncore/unsupported/mailit/mailit.pro b/noncore/unsupported/mailit/mailit.pro
index a404884..b262f9a 100644
--- a/noncore/unsupported/mailit/mailit.pro
+++ b/noncore/unsupported/mailit/mailit.pro
@@ -1,43 +1,60 @@
 TEMPLATE  = app
 CONFIG    = qt warn_on release
 HEADERS   = emailclient.h \
       emailhandler.h \
       emaillistitem.h \
       mailitwindow.h \
       md5.h \
       popclient.h \
       readmail.h \
       smtpclient.h \
       writemail.h \
       textparser.h \
       viewatt.h \
       addatt.h \
       editaccount.h \
       maillist.h \
       addresslist.h
 SOURCES   = emailclient.cpp \
       emailhandler.cpp \
       emaillistitem.cpp \
       mailitwindow.cpp \
       main.cpp \
       md5.c \
       popclient.cpp \
       readmail.cpp \
       smtpclient.cpp \
       writemail.cpp \
       textparser.cpp \
       viewatt.cpp \
       addatt.cpp \
       editaccount.cpp \
       maillist.cpp \
       addresslist.cpp
 
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include 
 LIBS            += -lqpe -lopie
 # -lssl
 MOC_DIR=qpeobj
 OBJECTS_DIR=qpeobj
 DESTDIR=$(OPIEDIR)/bin
 
+TRANSLATIONS = ../../../i18n/de/mailit.ts \
+	 ../../../i18n/da/mailit.ts \
+	 ../../../i18n/xx/mailit.ts \
+	 ../../../i18n/en/mailit.ts \
+	 ../../../i18n/es/mailit.ts \
+	 ../../../i18n/fr/mailit.ts \
+	 ../../../i18n/hu/mailit.ts \
+	 ../../../i18n/ja/mailit.ts \
+	 ../../../i18n/ko/mailit.ts \
+	 ../../../i18n/no/mailit.ts \
+	 ../../../i18n/pl/mailit.ts \
+	 ../../../i18n/pt/mailit.ts \
+	 ../../../i18n/pt_BR/mailit.ts \
+	 ../../../i18n/sl/mailit.ts \
+	 ../../../i18n/zh_CN/mailit.ts \
+	 ../../../i18n/zh_TW/mailit.ts
+
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/unsupported/mailit/readmail.cpp b/noncore/unsupported/mailit/readmail.cpp
index 2011ecf..a5e7147 100644
--- a/noncore/unsupported/mailit/readmail.cpp
+++ b/noncore/unsupported/mailit/readmail.cpp
@@ -1,326 +1,326 @@
 /**********************************************************************
 ** 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 "resource.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/writemail.cpp b/noncore/unsupported/mailit/writemail.cpp
index a45cfd2..38a2596 100644
--- a/noncore/unsupported/mailit/writemail.cpp
+++ b/noncore/unsupported/mailit/writemail.cpp
@@ -1,298 +1,298 @@
 /**********************************************************************
 ** 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 <qmessagebox.h>
 #include "writemail.h"
-#include "resource.h"
+#include <qpe/resource.h>
 
 WriteMail::WriteMail( QWidget* parent,  const char* name, WFlags fl )
 	: QMainWindow( parent, name, fl )
 {
 	showingAddressList = FALSE;
 	init();
 	
 	addAtt = new AddAtt(0, "Add Attatchments");
 }
 
 WriteMail::~WriteMail()
 {
 	delete addAtt;
 }
 
 void WriteMail::setAddressList(AddressList *list)
 {
 	Contact *cPtr;
 	
 	addressList = list;
 	
 	addressView->clear();
 	QList<Contact> *cListPtr = addressList->getContactList();
 	QListViewItem *item;
 	for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) {
 		item = new QListViewItem(addressView, cPtr->name, cPtr->email);
 	}
 }
 
 void WriteMail::init()
 {
 	setToolBarsMovable(FALSE);
 	
 	bar = new QToolBar(this);
 	bar->setHorizontalStretchable( TRUE );
 
 	menu = new QMenuBar( bar );
 
 	mailMenu = new QPopupMenu(menu);
 	menu->insertItem( tr( "&Mail" ), mailMenu);
 	addMenu = new QPopupMenu(menu);
 	menu->insertItem( tr( "&Add" ), addMenu);
 	
 	bar = new QToolBar(this);
 	attatchButton = new QAction(tr("Attatchment"), Resource::loadPixmap("mailit/attach"), QString::null, 0, this, 0);
 	attatchButton->addTo(bar);
 	attatchButton->addTo(addMenu);
 	connect( attatchButton, SIGNAL( activated() ), this, SLOT( attatchFile() ) );
 	
 	confirmButton = new QAction(tr("Enque mail"), Resource::loadPixmap("OKButton"), QString::null, 0, this, 0);
 	confirmButton->addTo(bar);
 	confirmButton->addTo(mailMenu);
 	connect( confirmButton, SIGNAL( activated() ), this, SLOT( accept() ) );
 	
 	newButton = new QAction(tr("New mail"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
 	newButton->addTo(mailMenu);
 	connect( newButton, SIGNAL( activated() ), this, SLOT( newMail() ) );
 	
 	widget = new QWidget(this, "widget");
 	grid = new QGridLayout( widget );
 
 	recipientsBox = new QComboBox( FALSE, widget, "toLabel" );
 	recipientsBox->insertItem( tr( "To:"  ) );
 	recipientsBox->insertItem( tr( "CC:"  ) );
 	recipientsBox->setCurrentItem(0);
 	grid->addWidget( recipientsBox, 0, 0 );
 	
 	subjetLabel = new QLabel( widget, "subjetLabel" );
 	subjetLabel->setText( tr( "Subject:"  ) );
 
 	grid->addWidget( subjetLabel, 1, 0 );
 
 	ToolButton13_2 = new QToolButton( widget, "ToolButton13_2" );
 	ToolButton13_2->setText( tr( "..."  ) );
 	grid->addWidget( ToolButton13_2, 1, 2 );
 
 	subjectInput = new QLineEdit( widget, "subjectInput" );
 	grid->addWidget( subjectInput, 1, 1 );
 
 	toInput = new QLineEdit( widget, "toInput" );
 	grid->addWidget( toInput, 0, 1 );
 
 	addressButton = new QToolButton( widget, "addressButton" );
 	addressButton->setPixmap( Resource::loadPixmap("AddressBook") );
 	addressButton->setToggleButton(TRUE);
 	grid->addWidget( addressButton, 0, 2 );
 	connect(addressButton, SIGNAL(clicked()), this, SLOT(getAddress()) );
 
 	emailInput = new QMultiLineEdit( widget, "emailInput" );
 	grid->addMultiCellWidget( emailInput, 2, 2, 0, 2);
 
 	
 	addressView = new QListView( widget, "addressView");
 	addressView->addColumn("Name");
 	addressView->addColumn("EMail");
 	addressView->setAllColumnsShowFocus(TRUE);
 	addressView->setMultiSelection(TRUE);
 	addressView->hide();
 	grid->addMultiCellWidget( addressView, 3, 3, 0, 2);
 	
 	okButton = new QToolButton(bar, "ok");
 	okButton->setPixmap( Resource::loadPixmap("enter") );
 	okButton->hide();
 	connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) );
 	
 	setCentralWidget(widget);
 }
 
 void WriteMail::reject()
 {
 	emit cancelMail();
 }
 
 // need to insert date
 void WriteMail::accept()
 {
 	QStringList attatchedFiles, attatchmentsType;
 	int idCount = 0;
 	
 	if (toInput->text() == "") {
 	 	QMessageBox::warning(this,"No recipient", "Send mail to whom?", "OK\n");
 		return;
 	}
 	if (! getRecipients() ) {
 	 	QMessageBox::warning(this,"Incorrect recipient separator",
 	 			"Recipients must be separated by ;\nand be valid emailaddresses", "OK\n");
 		return;
 	}
 	mail.subject = subjectInput->text();
 	mail.body = emailInput->text();
 	mail.sent = false;
 	mail.received = false;
 	mail.rawMail = "To: ";
 	
 	for (QStringList::Iterator it = mail.recipients.begin();
 		it != mail.recipients.end(); ++it) {
 		
 		mail.rawMail += (*it);
 		mail.rawMail += ",\n";
 	}
 	mail.rawMail.truncate(mail.rawMail.length()-2);
 	mail.rawMail += mail.from;
 	mail.rawMail += "\nSubject: ";
 	mail.rawMail += mail.subject;
 	mail.rawMail += "\n\n";
 	
 	attatchedFiles = addAtt->returnAttatchedFiles();
 	attatchmentsType = addAtt->returnFileTypes();
 
 	QStringList::Iterator itType = attatchmentsType.begin();
 	
 	Enclosure e;
 	for ( QStringList::Iterator it = attatchedFiles.begin(); it != attatchedFiles.end(); ++it ) {
 		e.id = idCount;
 		e.originalName = (*it).latin1();
 		e.contentType = (*itType).latin1();
 		e.contentAttribute = (*itType).latin1();
 		e.saved = TRUE;
 		mail.addEnclosure(&e);
 		
 		itType++;
 		idCount++;
 	}
 	mail.rawMail += mail.body;
 	mail.rawMail += "\n";
 	mail.rawMail += ".\n";
 	emit sendMailRequested(mail);
 	addAtt->clear();
 }
 
 void WriteMail::getAddress()
 {
 	showingAddressList = !showingAddressList;
 	
 	if (showingAddressList) {
 		emailInput->hide();
 		addressView->show();
 		okButton->show();
 		
 	} else {
 		addressView->hide();
 		okButton->hide();
 		emailInput->show();
 	}
 }
 
 void WriteMail::attatchFile()
 {
 	addAtt->showMaximized();
 }
 
 void WriteMail::reply(Email replyMail)
 {
 	int pos;
 	
 	mail = replyMail;
 	mail.files.clear();
 	
 	toInput->setText(mail.fromMail);
 	subjectInput->setText("Re: " + mail.subject);
 	
 	pos = 0;
 	mail.body.insert(pos, ">>");
 	while (pos != -1) {
 		pos = mail.body.find('\n', pos);
 		if (pos != -1)
 			mail.body.insert(++pos, ">>");
 	}
 	
 	emailInput->setText(mail.body);
 }
 
 bool WriteMail::getRecipients()
 {
 	QString str, temp;
 	int pos = 0;
 	
 	mail.recipients.clear();
 	
 	temp = toInput->text();
 	while ( (pos = temp.find(';')) != -1) {
 		str = temp.left(pos).stripWhiteSpace();
 		temp = temp.right(temp.length() - (pos + 1));
 		if ( str.find('@') == -1)
 			return false;
 		mail.recipients.append(str);
 		addressList->addContact(str, "");
 	}
 	temp = temp.stripWhiteSpace();
 	if ( temp.find('@') == -1)
 		return false;
 	mail.recipients.append(temp);
 	addressList->addContact(temp, "");
 	
 	return TRUE;
 }
 			
 
 void WriteMail::addRecipients()
 {
 	QString recipients = "";
 	
 	mail.recipients.clear();
 	QListViewItem *item = addressView->firstChild();
 	while (item != NULL) {
 		if ( item->isSelected() ) {
 			if (recipients == "") {
 				recipients = item->text(0);
 			} else {
 				recipients += "; " + item->text(0);
 			}
 		}
 		item = item->nextSibling();
 	}
 	toInput->setText(recipients);
 	
 	addressView->hide();
 	okButton->hide();
 	emailInput->show();
 	addressButton->setOn(FALSE);
 	showingAddressList = !showingAddressList;
 }
 
 void WriteMail::setRecipient(const QString &recipient)
 {
     toInput->setText(recipient);
 }
 
 void WriteMail::newMail()
 {
 	toInput->clear();
 	subjectInput->clear();
 	emailInput->clear();
 	//to clear selected
 	setAddressList(addressList);
 }