patch from wim delvaux. fix from me

28 files changed, 948 insertions, 910 deletions

diff --git a/noncore/net/mailit/addatt.cpp b/noncore/net/mailit/addatt.cpp
index daefac6..19ac58f 100644
--- a/noncore/net/mailit/addatt.cpp
+++ b/noncore/net/mailit/addatt.cpp
@@ -58,3 +58,3 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
 {
-	setCaption("Adding attachments");
+	setCaption(tr("Adding attachments") );
 
@@ -124,3 +124,3 @@ void AddAtt::clear()
 void AddAtt::addattachment()
-{	
+{	// ### FIXME wrong use -zecke
 	OFileDialog ofs("Attachments",this,0,0,"/root/Documents");
diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp
index da1226c..749a4e9 100644
--- a/noncore/net/mailit/emailclient.cpp
+++ b/noncore/net/mailit/emailclient.cpp
@@ -61,6 +61,6 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   
-  connect(emailHandler, SIGNAL(smtpError(int)), this,
-      SLOT(smtpError(int)) );
-  connect(emailHandler, SIGNAL(popError(int)), this,
-      SLOT(popError(int)) );
+  connect(emailHandler, SIGNAL(smtpError(int,const QString &)), this,
+      SLOT(smtpError(int,const QString &)) );
+  connect(emailHandler, SIGNAL(popError(int,const QString &)), this,
+      SLOT(popError(int,const QString &)) );
   
@@ -482,3 +482,3 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
 
-void EmailClient::allMailArrived(int count)
+void EmailClient::allMailArrived(int /*count*/)
 {
@@ -520,3 +520,3 @@ void EmailClient::moveMailFront(Email *mailPtr)
 
-void EmailClient::smtpError(int code)
+void EmailClient::smtpError(int code, const QString & Msg)
 {
@@ -524,11 +524,13 @@ void EmailClient::smtpError(int code)
   
-  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 == ErrUnknownResponse) {
+      temp = tr("<qt>Unknown response from server</qt>");
+     if( ! Msg.isEmpty() )
+       temp += Msg;
+   } else if (code == QSocket::ErrHostNotFound) {
+      temp = tr("<qt>host not found</qt>");
+   } else if (code == QSocket::ErrConnectionRefused) {
+      temp = tr("<qt>connection refused</qt>");
+   } else if (code == QSocket::ErrSocketRead) {
+      temp = tr("<qt>socket packet error</qt>");
+   }
   
@@ -546,3 +548,3 @@ void EmailClient::smtpError(int code)
 
-void EmailClient::popError(int code)
+void EmailClient::popError(int code, const QString & Msg)
 {
@@ -550,16 +552,19 @@ void EmailClient::popError(int code)
   
-  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 == ErrUnknownResponse) {
+      temp = tr("<qt>Unknown response from server</qt>");
+     if( ! Msg.isEmpty() )
+       temp += Msg;
+   } else if (code == ErrLoginFailed) {
+     temp = tr("<qt>Login failed\nCheck user name and password</qt>");
+   } else if (code == QSocket::ErrHostNotFound) {
+     temp = tr("<qt>host not found</qt>");
+   } else if (code == QSocket::ErrConnectionRefused) {
+     temp = tr("<qt>connection refused</qt>");
+   } else if (code == QSocket::ErrSocketRead) {
+     temp = tr("<qt>socket packet error</qt>");
+   } 
+
   if (code != ErrCancel) {
-    QMessageBox::warning(qApp->activeWindow(), "Receiving error", temp, "OK\n");
+      QMessageBox::warning(qApp->activeWindow(), tr("Receiving error"), temp, tr("OK\n"));
+
   } else {
@@ -900,3 +905,3 @@ void EmailClient::setMailSize(int size)
 
-void EmailClient::setTotalSize(int size)
+void EmailClient::setTotalSize(int /*size*/)
 {
@@ -922,3 +927,3 @@ void EmailClient::deleteItem()
   EmailListItem* eli;
-  int pos;
+  //  int pos;
     
@@ -948,3 +953,3 @@ void EmailClient::inboxItemReleased()
 {
-  /*killTimer(timerID);
+  //killTimer(timerID);
   
@@ -993,3 +998,3 @@ void EmailClient::download(Email* mail)
 
-void EmailClient::receive(const QCString& msg, const QByteArray& data)
+void EmailClient::receive(const QCString& /*msg*/, const QByteArray& /*data*/)
 {
@@ -997,3 +1002,3 @@ void EmailClient::receive(const QCString& msg, const QByteArray& data)
   {
-    /*QDialog qd(qApp->activeWindow(),"Getting mail",true);
+    //QDialog qd(qApp->activeWindow(),"Getting mail",true);
     QVBoxLayout *vbProg = new QVBoxLayout( &qd );
diff --git a/noncore/net/mailit/emailclient.h b/noncore/net/mailit/emailclient.h
index c98cfce..80c6d31 100644
--- a/noncore/net/mailit/emailclient.h
+++ b/noncore/net/mailit/emailclient.h
@@ -100,4 +100,4 @@ public slots:
   void getAllNewMail();
-  void smtpError(int code);
-  void popError(int code);
+  void smtpError(int code, const QString & Msg );
+  void popError(int code, const QString & Msg);
   void inboxItemSelected();
diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp
index 39f693d..5b8bda1 100644
--- a/noncore/net/mailit/emailhandler.cpp
+++ b/noncore/net/mailit/emailhandler.cpp
@@ -46,4 +46,4 @@ EmailHandler::EmailHandler()
   
-  connect(smtpClient, SIGNAL(errorOccurred(int)), this,
-      SIGNAL(smtpError(int)) );
+  connect(smtpClient, SIGNAL(errorOccurred(int, const QString &)), this,
+      SIGNAL(smtpError(int, const QString &)) );
   connect(smtpClient, SIGNAL(mailSent()), this, SIGNAL(mailSent()) );
@@ -52,4 +52,4 @@ EmailHandler::EmailHandler()
   
-  connect(popClient, SIGNAL(errorOccurred(int)), this,
-      SIGNAL(popError(int)) );
+  connect(popClient, SIGNAL(errorOccurred(int, const QString &)), this,
+      SIGNAL(popError(int, const QString &)) );
   connect(popClient, SIGNAL(newMessage(const QString &, int, uint, bool)),
@@ -164,3 +164,3 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
   temp = lineShift + "." + lineShift;
-  
+
   if (in.right(temp.length()) != temp) {
diff --git a/noncore/net/mailit/emailhandler.h b/noncore/net/mailit/emailhandler.h
index e4e7f46..74a8e4c 100644
--- a/noncore/net/mailit/emailhandler.h
+++ b/noncore/net/mailit/emailhandler.h
@@ -129,4 +129,4 @@ signals:
   void mailSent();
-  void smtpError(int);
-  void popError(int);
+  void smtpError(int, const QString & Msg );
+  void popError(int, const QString & Msg );
   void mailArrived(const Email &, bool);
diff --git a/noncore/net/mailit/mailit.pro b/noncore/net/mailit/mailit.pro
index cfbda36..5e9a83a 100644
--- a/noncore/net/mailit/mailit.pro
+++ b/noncore/net/mailit/mailit.pro
@@ -1,2 +1,3 @@
 TEMPLATE  = app
+TARGET = mailit
 CONFIG    = qt warn_on release
diff --git a/noncore/net/mailit/mailitwindow.cpp b/noncore/net/mailit/mailitwindow.cpp
index f945a0f..6e298c7 100644
--- a/noncore/net/mailit/mailitwindow.cpp
+++ b/noncore/net/mailit/mailitwindow.cpp
@@ -23,6 +23,6 @@
 
-MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
+MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags /*fl*/)
   : QMainWindow(parent, name, WStyle_ContextHelp)
 {
-  currentCaption = "Mailit";
+  currentCaption = tr("Mailit");
   setCaption(tr(currentCaption));
diff --git a/noncore/net/mailit/maillist.cpp b/noncore/net/mailit/maillist.cpp
index b5325a9..8c34295 100644
--- a/noncore/net/mailit/maillist.cpp
+++ b/noncore/net/mailit/maillist.cpp
@@ -23,5 +23,5 @@ void MailList::clear()
 {
-	sortedList.setAutoDelete(TRUE);
-	sortedList.clear();
-	currentPos = 0;
+  sortedList.setAutoDelete(TRUE);
+  sortedList.clear();
+  currentPos = 0;
 }
@@ -30,3 +30,3 @@ int MailList::count()
 {
-	return sortedList.count();
+  return sortedList.count();
 }
@@ -35,10 +35,10 @@ int* MailList::first()
 {
-	dList *mPtr;
-	
-	if (sortedList.count() == 0)
-		return NULL;
-		
-	mPtr = sortedList.at(0);
-	currentPos = 1;
-	return &(mPtr->serverId);
+  dList *mPtr;
+  
+  if (sortedList.count() == 0)
+    return NULL;
+    
+  mPtr = sortedList.at(0);
+  currentPos = 1;
+  return &(mPtr->serverId);
 }
@@ -47,10 +47,10 @@ int* MailList::next()
 {
-	dList *mPtr;
-	
-	if ( (currentPos) >= sortedList.count())
-		return NULL;
-	
-	mPtr = sortedList.at(currentPos);
-	currentPos++;
-	return &(mPtr->serverId);
+  dList *mPtr;
+  
+  if ( (currentPos) >= sortedList.count())
+    return NULL;
+  
+  mPtr = sortedList.at(currentPos);
+  currentPos++;
+  return &(mPtr->serverId);
 }
@@ -59,41 +59,41 @@ void MailList::sizeInsert(int serverId, uint size)
 {
-	dList *tempPtr;
-	int x;
-	
-	dList *newEntry = new dList;
-	newEntry->serverId = serverId;
-	newEntry->size = size;
-	
-	for (tempPtr = sortedList.first(); tempPtr != NULL; tempPtr = sortedList.next() ) {
-		if (newEntry->size < tempPtr->size) {
-			x = sortedList.at();
-			sortedList.insert(x, newEntry);
-			return;
-		}
-	}
-	sortedList.append(newEntry);
+  dList *tempPtr;
+  int x;
+  
+  dList *newEntry = new dList;
+  newEntry->serverId = serverId;
+  newEntry->size = size;
+  
+  for (tempPtr = sortedList.first(); tempPtr != NULL; tempPtr = sortedList.next() ) {
+    if (newEntry->size < tempPtr->size) {
+      x = sortedList.at();
+      sortedList.insert(x, newEntry);
+      return;
+    }
+  }
+  sortedList.append(newEntry);
 }
 
-void MailList::moveFront(int serverId, uint size)
+void MailList::moveFront(int serverId, uint/* size*/)
 {
-	dList *currentPtr;
-	uint tempPos;
-	QString temp;
-	
-	tempPos = currentPos;
-	if ( tempPos >= sortedList.count() )
-		return;
-	currentPtr = sortedList.at(tempPos);
-	while ( ((tempPos+1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
-		tempPos++;
-		currentPtr = sortedList.at(tempPos);
-	}
-	
-	if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
-		temp.setNum(currentPtr->serverId);
-		qWarning("moved to front, message: " + temp);
-		
-		dList *itemPtr = sortedList.take(tempPos);
-		sortedList.insert(currentPos, itemPtr);
-	}
+  dList *currentPtr;
+  uint tempPos;
+  QString temp;
+  
+  tempPos = currentPos;
+  if ( tempPos >= sortedList.count() )
+    return;
+  currentPtr = sortedList.at(tempPos);
+  while ( ((tempPos+1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
+    tempPos++;
+    currentPtr = sortedList.at(tempPos);
+  }
+  
+  if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
+    temp.setNum(currentPtr->serverId);
+    qWarning("moved to front, message: " + temp);
+    
+    dList *itemPtr = sortedList.take(tempPos);
+    sortedList.insert(currentPos, itemPtr);
+  }
 
@@ -102,30 +102,30 @@ void MailList::moveFront(int serverId, uint size)
 //only works if mail is not already in download
-bool MailList::remove(int serverId, uint size)
+bool MailList::remove(int serverId, uint /*size*/)
 {
-	dList *currentPtr;
-	uint tempPos;
-	QString temp;
-	
-	tempPos = currentPos;
-	if ( tempPos >=sortedList.count() )
-		return FALSE;
-	currentPtr = sortedList.at(tempPos);
-	while ( ((tempPos + 1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
-		tempPos++;
-		currentPtr = sortedList.at(tempPos);
-	}
-	
-	if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
-		temp.setNum(currentPtr->serverId);
-		qWarning("deleted message: " + temp);
-		sortedList.remove(tempPos);
-		
-		return TRUE;
-	}
-	return FALSE;
+  dList *currentPtr;
+  uint tempPos;
+  QString temp;
+  
+  tempPos = currentPos;
+  if ( tempPos >=sortedList.count() )
+    return FALSE;
+  currentPtr = sortedList.at(tempPos);
+  while ( ((tempPos + 1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
+    tempPos++;
+    currentPtr = sortedList.at(tempPos);
+  }
+  
+  if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
+    temp.setNum(currentPtr->serverId);
+    qWarning("deleted message: " + temp);
+    sortedList.remove(tempPos);
+    
+    return TRUE;
+  }
+  return FALSE;
 }
 
-void MailList::insert(int pos, int serverId, uint size)
+void MailList::insert(int /*pos*/, int /*serverId*/, uint/* size*/)
 {
-//	sortedList.insert(pos, mPtr);
+//  sortedList.insert(pos, mPtr);
 }
diff --git a/noncore/net/mailit/popclient.cpp b/noncore/net/mailit/popclient.cpp
index dc0116d..5da3bcb 100644
--- a/noncore/net/mailit/popclient.cpp
+++ b/noncore/net/mailit/popclient.cpp
@@ -65,3 +65,3 @@ void PopClient::newConnection(const QString &target, int port)
     
-  emit updateStatus("DNS lookup");
+  emit updateStatus(tr("DNS lookup"));
 }
@@ -105,4 +105,8 @@ void PopClient::errorHandling(int status)
 {
+  errorHandlingWithMsg( status, QString::null );
+}
+void PopClient::errorHandlingWithMsg(int status, const QString & Msg )
+{
   emit updateStatus(tr("Error Occured"));
-  emit errorOccurred(status);
+  emit errorOccurred(status, Msg);
   socket->close();
@@ -169,3 +173,3 @@ void PopClient::incomingData()
             status = Mcnt;      
-          } else errorHandling(ErrLoginFailed);
+          } else errorHandlingWithMsg(ErrLoginFailed, response);
             break;
@@ -197,3 +201,3 @@ void PopClient::incomingData()
 
-            } else errorHandling(ErrUnknownResponse);
+            } else errorHandlingWithMsg(ErrUnknownResponse, response);
           }
@@ -236,3 +240,3 @@ void PopClient::incomingData()
               //qWarning(response);
-              errorHandling(ErrUnknownResponse);
+              errorHandlingWithMsg(ErrUnknownResponse, response);
             }
@@ -261,3 +265,3 @@ void PopClient::incomingData()
               response = socket->readLine();
-            } else errorHandling(ErrUnknownResponse);
+            } else errorHandlingWithMsg(ErrUnknownResponse, response);
           }
diff --git a/noncore/net/mailit/popclient.h b/noncore/net/mailit/popclient.h
index c58bc48..6774ceb 100644
--- a/noncore/net/mailit/popclient.h
+++ b/noncore/net/mailit/popclient.h
@@ -46,3 +46,3 @@ signals:
   void newMessage(const QString &, int, uint, bool);
-  void errorOccurred(int status);
+  void errorOccurred(int status, const QString & Msg );
   void updateStatus(const QString &);
@@ -55,2 +55,3 @@ public slots:
   void errorHandling(int);
+  void errorHandlingWithMsg(int, const QString & );
 
diff --git a/noncore/net/mailit/smtpclient.cpp b/noncore/net/mailit/smtpclient.cpp
index 2916f45..5b5ef52 100644
--- a/noncore/net/mailit/smtpclient.cpp
+++ b/noncore/net/mailit/smtpclient.cpp
@@ -75,3 +75,8 @@ void SmtpClient::errorHandling(int status)
 {
-  emit errorOccurred(status);
+  errorHandlingWithMsg( status, QString::null );
+}
+
+void SmtpClient::errorHandlingWithMsg(int status, const QString & EMsg )
+{
+  emit errorOccurred(status, EMsg );
   socket->close();
@@ -89,3 +94,2 @@ void SmtpClient::incomingData()
   response = socket->readLine();
-
   switch(status) {
@@ -96,3 +100,3 @@ void SmtpClient::incomingData()
             *stream << "HELO there\r\n";
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
@@ -101,5 +105,6 @@ void SmtpClient::incomingData()
           if (response[0] == '2') {
-            *stream << "MAIL FROM: " << mailPtr->from << "\r\n";
+             qDebug(mailPtr->from);
+            *stream << "MAIL FROM: <" << mailPtr->from << ">\r\n";
             status = Recv;
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse, response );
           break;
@@ -107,9 +112,10 @@ void SmtpClient::incomingData()
     case Recv:  {
-          if (response[0] == '2') {
+       if (response[0] == '2') {
             it = mailPtr->to.begin();
-            if (it == NULL)
-              errorHandling(ErrUnknownResponse);
-            *stream << "RCPT TO: " << *it << ">\r\n";
+            if (it == NULL) {
+              errorHandlingWithMsg(ErrUnknownResponse,response);
+            }
+            *stream << "RCPT TO: <" << *it << ">\r\n";
             status = MRcv;
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
@@ -125,3 +131,3 @@ void SmtpClient::incomingData()
             }
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
         } 
@@ -132,3 +138,4 @@ void SmtpClient::incomingData()
             emit updateStatus(tr("Sending: ") + mailPtr->subject);
-          } else errorHandling(ErrUnknownResponse);
+            
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
@@ -144,3 +151,3 @@ void SmtpClient::incomingData()
             }
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
@@ -158,3 +165,3 @@ void SmtpClient::incomingData()
             socket->close();
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
diff --git a/noncore/net/mailit/smtpclient.h b/noncore/net/mailit/smtpclient.h
index 45c0703..554ba3f 100644
--- a/noncore/net/mailit/smtpclient.h
+++ b/noncore/net/mailit/smtpclient.h
@@ -49,3 +49,3 @@ public:
 signals:
-  void errorOccurred(int);
+  void errorOccurred(int, const QString & LR );
   void updateStatus(const QString &);
@@ -55,2 +55,3 @@ public slots:
   void errorHandling(int);
+  void errorHandlingWithMsg(int, const QString & LastResponse );
 
diff --git a/noncore/net/mailit/viewatt.cpp b/noncore/net/mailit/viewatt.cpp
index 21885c2..293e137 100644
--- a/noncore/net/mailit/viewatt.cpp
+++ b/noncore/net/mailit/viewatt.cpp
@@ -28,3 +28,3 @@ ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
 {
-	setCaption("Exploring attatchments");
+	setCaption(tr("Exploring attatchments"));
 
@@ -37,5 +37,5 @@ ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
 	listView = new QListView(this, "AttView");
-	listView->addColumn( "Attatchment" );
-	listView->addColumn( "Type" );
-	listView->addColumn( "Installed" );
+	listView->addColumn( tr("Attatchment") );
+	listView->addColumn( tr("Type") );
+	listView->addColumn( tr("Installed") );
 	setCentralWidget(listView);
@@ -63,5 +63,5 @@ void ViewAtt::update(Email *mailIn, bool inbox)
 		
-		QString isInstalled = "No";
+		QString isInstalled = tr("No");
 		if (ePtr->installed)
-			isInstalled = "Yes";
+			isInstalled = tr("Yes");
 		item = new QListViewItem(listView, ePtr->originalName, ePtr->contentType, isInstalled);
@@ -118,3 +118,3 @@ void ViewAtt::install()
 		selPtr->installed = TRUE;
-		item->setText(2, "Yes");
+		item->setText(2, tr("Yes"));
 	}
diff --git a/noncore/net/mailit/writemail.cpp b/noncore/net/mailit/writemail.cpp
index 0298cb3..26b9660 100644
--- a/noncore/net/mailit/writemail.cpp
+++ b/noncore/net/mailit/writemail.cpp
@@ -26,6 +26,6 @@ WriteMail::WriteMail( QWidget* parent,  const char* name, WFlags fl ):QMainWindo
 {
-	showingAddressList = FALSE;
-	init();
-	
-	addAtt = new AddAtt(0, "Add Attachments");
+  showingAddressList = FALSE;
+  init();
+  
+  addAtt = new AddAtt(0, "Add Attachments");
 }
@@ -34,3 +34,3 @@ WriteMail::~WriteMail()
 {
-	delete addAtt;
+  delete addAtt;
 }
@@ -39,12 +39,12 @@ void WriteMail::setAddressList(AddressList *list)
 {
-	AContact *cPtr;
-	
-	addressList = list;
-	
-	addressView->clear();
-	QList<AContact> *cListPtr = addressList->getContactList();
-	QListViewItem *item;
-	for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) {
-		item = new QListViewItem(addressView, cPtr->name, cPtr->email);
-	}
+  AContact *cPtr;
+  
+  addressList = list;
+  
+  addressView->clear();
+  QList<AContact> *cListPtr = addressList->getContactList();
+  QListViewItem *item;
+  for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) {
+    item = new QListViewItem(addressView, cPtr->name, cPtr->email);
+  }
 }
@@ -53,91 +53,91 @@ void WriteMail::init()
 {
-	setToolBarsMovable(FALSE);
-	
-	bar = new QToolBar(this);
-	bar->setHorizontalStretchable( TRUE );
+  setToolBarsMovable(FALSE);
+  
+  bar = new QToolBar(this);
+  bar->setHorizontalStretchable( TRUE );
 
-	menu = new QMenuBar( bar );
+  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);
-	attachButton = new QAction(tr("Attachment"), Resource::loadPixmap("mailit/attach"), QString::null, 0, this, 0);
-	attachButton->addTo(bar);
-	attachButton->addTo(addMenu);
-	connect( attachButton, SIGNAL( activated() ), this, SLOT( attachFile() ) );
-	attachButton->setWhatsThis(tr("Click here to attach files to your mail"));
-		
-	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() ) );
-	confirmButton->setWhatsThis(tr("This button puts your mail in the send queue"));
-	
-	newButton = new QAction(tr("New mail"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
-	newButton->addTo(mailMenu);
-	connect( newButton, SIGNAL( activated() ), this, SLOT( newMail() ) );
-	newButton->setWhatsThis(tr("Click here to create a new mail"));
+  mailMenu = new QPopupMenu(menu);
+  menu->insertItem( tr( "&Mail" ), mailMenu);
+  addMenu = new QPopupMenu(menu);
+  menu->insertItem( tr( "&Add" ), addMenu);
+  
+  bar = new QToolBar(this);
+  attachButton = new QAction(tr("Attachment"), Resource::loadPixmap("mailit/attach"), QString::null, 0, this, 0);
+  attachButton->addTo(bar);
+  attachButton->addTo(addMenu);
+  connect( attachButton, SIGNAL( activated() ), this, SLOT( attachFile() ) );
+  attachButton->setWhatsThis(tr("Click here to attach files to your mail"));
+    
+  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() ) );
+  confirmButton->setWhatsThis(tr("This button puts your mail in the send queue"));
+  
+  newButton = new QAction(tr("New mail"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
+  newButton->addTo(mailMenu);
+  connect( newButton, SIGNAL( activated() ), this, SLOT( newMail() ) );
+  newButton->setWhatsThis(tr("Click here to create a new mail"));
 
-	widget = new QWidget(this, "widget");
-	grid = new QGridLayout( widget );
+  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 );
-	connect(recipientsBox,SIGNAL(activated(int)),this, SLOT(changeRecipients(int)));
-	
-	subjetLabel = new QLabel( widget, "subjetLabel" );
-	subjetLabel->setText( tr( "Subject:"  ) );
+  recipientsBox = new QComboBox( FALSE, widget, "toLabel" );
+  recipientsBox->insertItem( tr( "To:"  ) );
+  recipientsBox->insertItem( tr( "CC:"  ) );  
+  recipientsBox->setCurrentItem(0);
+  grid->addWidget( recipientsBox, 0, 0 );
+  connect(recipientsBox,SIGNAL(activated(int)),this, SLOT(changeRecipients(int)));
+  
+  subjetLabel = new QLabel( widget, "subjetLabel" );
+  subjetLabel->setText( tr( "Subject:"  ) );
 
-	grid->addWidget( subjetLabel, 1, 0 );
+  grid->addWidget( subjetLabel, 1, 0 );
 
-	ToolButton13_2 = new QToolButton( widget, "ToolButton13_2" );
-	ToolButton13_2->setText( tr( "..."  ) );
-	grid->addWidget( ToolButton13_2, 1, 2 );
+  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 );
-	QWhatsThis::add(subjectInput,QWidget::tr("The mail subject should be entered here"));
+  subjectInput = new QLineEdit( widget, "subjectInput" );
+  grid->addWidget( subjectInput, 1, 1 );
+  QWhatsThis::add(subjectInput,QWidget::tr("The mail subject should be entered here"));
 
-	toInput = new QLineEdit( widget, "toInput" );
-	grid->addWidget( toInput, 0, 1 );
-	QWhatsThis::add(recipientsBox,QWidget::tr("Recipients can be entered here"));
+  toInput = new QLineEdit( widget, "toInput" );
+  grid->addWidget( toInput, 0, 1 );
+  QWhatsThis::add(recipientsBox,QWidget::tr("Recipients can be entered here"));
 
-	ccInput = new QLineEdit( widget, "ccInput" );
-	ccInput->hide();
-	grid->addWidget( ccInput, 0, 1 );
-	QWhatsThis::add(ccInput,QWidget::tr("If you would like to send copies of your mail they can be entered here"));
+  ccInput = new QLineEdit( widget, "ccInput" );
+  ccInput->hide();
+  grid->addWidget( ccInput, 0, 1 );
+  QWhatsThis::add(ccInput,QWidget::tr("If you would like to send copies of your mail they can be entered here"));
 
-	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()) );
-	QWhatsThis::add(addressButton,QWidget::tr("This button opens the address selector with all mail adresses from your OPIE addressbook"));
+  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()) );
+  QWhatsThis::add(addressButton,QWidget::tr("This button opens the address selector with all mail adresses from your Opie addressbook"));
 
-	emailInput = new QMultiLineEdit( widget, "emailInput" );
-	grid->addMultiCellWidget( emailInput, 2, 2, 0, 2);
-	QWhatsThis::add(emailInput,QWidget::tr("Enter your mail text here"));
+  emailInput = new QMultiLineEdit( widget, "emailInput" );
+  grid->addMultiCellWidget( emailInput, 2, 2, 0, 2);
+  QWhatsThis::add(emailInput,QWidget::tr("Enter your mail text here"));
 
-	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);
-	QWhatsThis::add(recipientsBox,QWidget::tr("Choose the recipients from this list"));
+  addressView = new QListView( widget, "addressView");
+  addressView->addColumn(tr("Name"));
+  addressView->addColumn(tr("EMail") );
+  addressView->setAllColumnsShowFocus(TRUE);
+  addressView->setMultiSelection(TRUE);
+  addressView->hide();
+  grid->addMultiCellWidget( addressView, 3, 3, 0, 2);
+  QWhatsThis::add(recipientsBox,QWidget::tr("Choose the recipients from this list"));
 
-	okButton = new QToolButton(bar, "ok");
-	okButton->setPixmap( Resource::loadPixmap("enter") );
-	okButton->hide();
-	connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) );
-	QWhatsThis::add(okButton,QWidget::tr("Queue your mail by clicking here"));
-	
-	setCentralWidget(widget);
+  okButton = new QToolButton(bar, "ok");
+  okButton->setPixmap( Resource::loadPixmap("enter") );
+  okButton->hide();
+  connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) );
+  QWhatsThis::add(okButton,QWidget::tr("Queue your mail by clicking here"));
+  
+  setCentralWidget(widget);
 }
@@ -146,3 +146,3 @@ void WriteMail::reject()
 {
-	emit cancelMail();
+  emit cancelMail();
 }
@@ -151,77 +151,77 @@ void WriteMail::accept()
 {
-	QStringList attachedFiles, attachmentsType;
-	int idCount = 0;
-	
-	if (toInput->text() == "") 
-	{
-	 	QMessageBox::warning(this,tr("No recipient"), tr("Send mail to whom?"), tr("OK\n"));
-		return;
-	}
-	
-	if (! getRecipients(false) ) 
-	{
-	 	QMessageBox::warning(this,tr("Incorrect recipient separator"),
-	 			tr("Recipients must be separated by ;\nand be valid emailaddresses"), tr("OK\n"));
-		return;
-	}
-	
-	if ((ccInput->text()!="") && (! getRecipients(true) )) 
-	{
-	 	QMessageBox::warning(this,tr("Incorrect carbon copy separator"),
-	 			tr("CC Recipients must be separated by ;\nand be valid emailaddresses"), tr("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 += "\nCC: ";
-	
-	for (QStringList::Iterator it = mail.carbonCopies.begin();
-		it != mail.carbonCopies.end(); ++it) {
-		
-		mail.rawMail += (*it);
-		mail.rawMail += ",\n";
-	}
+  QStringList attachedFiles, attachmentsType;
+  int idCount = 0;
+  
+  if (toInput->text() == "") 
+  {
+    QMessageBox::warning(this,tr("No recipient"), tr("Send mail to whom?"), tr("OK\n"));
+    return;
+  }
+  
+  if (! getRecipients(false) ) 
+  {
+    QMessageBox::warning(this,tr("Incorrect recipient separator"),
+        tr("Recipients must be separated by ;\nand be valid emailaddresses"), tr("OK\n"));
+    return;
+  }
+  
+  if ((ccInput->text()!="") && (! getRecipients(true) )) 
+  {
+    QMessageBox::warning(this,tr("Incorrect carbon copy separator"),
+        tr("CC Recipients must be separated by ;\nand be valid emailaddresses"), tr("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 += "\nCC: ";
+  
+  for (QStringList::Iterator it = mail.carbonCopies.begin();
+    it != mail.carbonCopies.end(); ++it) {
+    
+    mail.rawMail += (*it);
+    mail.rawMail += ",\n";
+  }
 
-	mail.rawMail += mail.from;
-	mail.rawMail += "\nSubject: ";
-	mail.rawMail += mail.subject;
-	mail.rawMail += "\n\n";
-	
-	attachedFiles = addAtt->returnattachedFiles();
-	attachmentsType = addAtt->returnFileTypes();
+  mail.rawMail += mail.from;
+  mail.rawMail += "\nSubject: ";
+  mail.rawMail += mail.subject;
+  mail.rawMail += "\n\n";
+  
+  attachedFiles = addAtt->returnattachedFiles();
+  attachmentsType = addAtt->returnFileTypes();
 
-	QStringList::Iterator itType = attachmentsType.begin();
-	
-	Enclosure e;
-	for ( QStringList::Iterator it = attachedFiles.begin(); it != attachedFiles.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();
+  QStringList::Iterator itType = attachmentsType.begin();
+  
+  Enclosure e;
+  for ( QStringList::Iterator it = attachedFiles.begin(); it != attachedFiles.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();
 }
@@ -230,14 +230,14 @@ void WriteMail::getAddress()
 {
-	showingAddressList = !showingAddressList;
-	
-	if (showingAddressList) {
-		emailInput->hide();
-		addressView->show();
-		okButton->show();
-		
-	} else {
-		addressView->hide();
-		okButton->hide();
-		emailInput->show();
-	}
+  showingAddressList = !showingAddressList;
+  
+  if (showingAddressList) {
+    emailInput->hide();
+    addressView->show();
+    okButton->show();
+    
+  } else {
+    addressView->hide();
+    okButton->hide();
+    emailInput->show();
+  }
 }
@@ -246,3 +246,3 @@ void WriteMail::attachFile()
 {
-	addAtt->showMaximized();
+  addAtt->showMaximized();
 }
@@ -251,40 +251,40 @@ void WriteMail::reply(Email replyMail, bool replyAll)
 {
-	int pos;
-	QString ccRecipients;
-	
-	mail = replyMail;
-	mail.files.clear();
-	
-	toInput->setText(mail.fromMail);
-	
-	if (replyAll)
-	{	
-		for (QStringList::Iterator it = mail.carbonCopies.begin();it != mail.carbonCopies.end(); ++it) 
-		{
-			ccRecipients.append(*it);
-			ccRecipients.append(";");
-		}
-		ccRecipients.truncate(ccRecipients.length()-1);		//no ; at the end
-		ccInput->setText(ccRecipients);
-	}
-	else ccInput->clear();
-	
-	subjectInput->setText(tr("Re: ") + mail.subject);
-	
-	QString citation=mail.fromMail;
-	citation.append(tr(" wrote on "));
-	citation.append(mail.date);
-	citation.append(":\n");
-	
+  int pos;
+  QString ccRecipients;
+  
+  mail = replyMail;
+  mail.files.clear();
+  
+  toInput->setText(mail.fromMail);
+  
+  if (replyAll)
+  { 
+    for (QStringList::Iterator it = mail.carbonCopies.begin();it != mail.carbonCopies.end(); ++it) 
+    {
+      ccRecipients.append(*it);
+      ccRecipients.append(";");
+    }
+    ccRecipients.truncate(ccRecipients.length()-1);   //no ; at the end
+    ccInput->setText(ccRecipients);
+  }
+  else ccInput->clear();
+  
+  subjectInput->setText(tr("Re: ") + mail.subject);
+  
+  QString citation=mail.fromMail;
+  citation.append(tr(" wrote on "));
+  citation.append(mail.date);
+  citation.append(":\n");
+  
 
-	//mail.body.insert(0,tr("On"));
-	pos = 0;
-	mail.body.insert(pos, ">");
-	while (pos != -1) {
-		pos = mail.body.find('\n', pos);
-		if (pos != -1)
-			mail.body.insert(++pos, ">>");
-	}
-	mail.body.insert(0,citation);	
-	emailInput->setText(mail.body);
+  //mail.body.insert(0,tr("On"));
+  pos = 0;
+  mail.body.insert(pos, ">");
+  while (pos != -1) {
+    pos = mail.body.find('\n', pos);
+    if (pos != -1)
+      mail.body.insert(++pos, ">");
+  }
+  mail.body.insert(0,citation); 
+  emailInput->setText(mail.body);
 }
@@ -293,17 +293,17 @@ void WriteMail::forward(Email forwMail)
 {
-	int pos=0;
-	
-	QString fwdBody=tr("======forwarded message from ");
-	fwdBody.append(forwMail.fromMail);
-	fwdBody.append(tr(" starts======\n\n"));
-	
-	mail=forwMail;
-	toInput->setText("");
-	ccInput->setText("");
-	subjectInput->setText(tr("FWD: ") + mail.subject);
-	
-	fwdBody+=mail.body;
-	fwdBody+=QString(tr("======end of forwarded message======\n\n"));
-	
-	emailInput->setText(fwdBody);
+   // int pos=0;
+  
+  QString fwdBody=tr("======forwarded message from ");
+  fwdBody.append(forwMail.fromMail);
+  fwdBody.append(tr(" starts======\n\n"));
+  
+  mail=forwMail;
+  toInput->setText("");
+  ccInput->setText("");
+  subjectInput->setText(tr("FWD: ") + mail.subject);
+  
+  fwdBody+=mail.body;
+  fwdBody+=QString(tr("======end of forwarded message======\n\n"));
+  
+  emailInput->setText(fwdBody);
 }
@@ -312,31 +312,31 @@ bool WriteMail::getRecipients(bool ccField)
 {
-	QString str, temp;
-	int pos = 0;
-	
-	if (ccField)
-	{
-		mail.carbonCopies.clear();
-	 	temp = ccInput->text();
-	} 
-	else 
-	{
-		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;
-		ccField ? mail.carbonCopies.append(str) : mail.recipients.append(str);
-		//addressList->addContact(str, "");
-	}
-	temp = temp.stripWhiteSpace();
-	if ( temp.find('@') == -1)
-		return false;
-	ccField ? mail.carbonCopies.append(temp) : mail.recipients.append(temp);
-	//addressList->addContact(temp, "");
-	
-	return TRUE;
+  QString str, temp;
+  int pos = 0;
+  
+  if (ccField)
+  {
+    mail.carbonCopies.clear();
+    temp = ccInput->text();
+  } 
+  else 
+  {
+    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;
+    ccField ? mail.carbonCopies.append(str) : mail.recipients.append(str);
+    //addressList->addContact(str, "");
+  }
+  temp = temp.stripWhiteSpace();
+  if ( temp.find('@') == -1)
+    return false;
+  ccField ? mail.carbonCopies.append(temp) : mail.recipients.append(temp);
+  //addressList->addContact(temp, "");
+  
+  return TRUE;
 }
@@ -345,4 +345,4 @@ void WriteMail::addRecipients()
 {
-	toInput->isVisible() ? addRecipients(false) : addRecipients(true);
-}			
+  toInput->isVisible() ? addRecipients(false) : addRecipients(true);
+}     
        
@@ -350,25 +350,25 @@ void WriteMail::addRecipients(bool ccField)
 {
-	QString recipients = "";
-	
-	mail.recipients.clear();
-	
-	QListViewItem *item = addressView->firstChild();
-	while (item != NULL) {
-		if ( item->isSelected() ) {
-			if (recipients == "") {
-				recipients = item->text(1);
-			} else {
-				recipients += "; " + item->text(1);
-			}
-		}
-		item = item->nextSibling();
-	}
-	
-	ccField ? ccInput->setText(recipients):toInput->setText(recipients);
-	
-	addressView->hide();
-	okButton->hide();
-	emailInput->show();
-	addressButton->setOn(FALSE);
-	showingAddressList = !showingAddressList;
+  QString recipients = "";
+  
+  mail.recipients.clear();
+  
+  QListViewItem *item = addressView->firstChild();
+  while (item != NULL) {
+    if ( item->isSelected() ) {
+      if (recipients == "") {
+        recipients = item->text(1);
+      } else {
+        recipients += "; " + item->text(1);
+      }
+    }
+    item = item->nextSibling();
+  }
+  
+  ccField ? ccInput->setText(recipients):toInput->setText(recipients);
+  
+  addressView->hide();
+  okButton->hide();
+  emailInput->show();
+  addressButton->setOn(FALSE);
+  showingAddressList = !showingAddressList;
 }
@@ -377,12 +377,12 @@ void WriteMail::changeRecipients(int selection)
 {
-	if (selection==0)
-	{
-		toInput->show();
-		ccInput->hide();
-	}
-	else if (selection==1)
-	{
-		toInput->hide();
-		ccInput->show();
-	}
+  if (selection==0)
+  {
+    toInput->show();
+    ccInput->hide();
+  }
+  else if (selection==1)
+  {
+    toInput->hide();
+    ccInput->show();
+  }
 }
@@ -396,7 +396,7 @@ void WriteMail::newMail()
 {
-	toInput->clear();
-	ccInput->clear();
-	subjectInput->clear();
-	emailInput->clear();
-	setAddressList(addressList);
+  toInput->clear();
+  ccInput->clear();
+  subjectInput->clear();
+  emailInput->clear();
+  setAddressList(addressList);
 }
diff --git a/noncore/unsupported/mailit/addatt.cpp b/noncore/unsupported/mailit/addatt.cpp
index daefac6..19ac58f 100644
--- a/noncore/unsupported/mailit/addatt.cpp
+++ b/noncore/unsupported/mailit/addatt.cpp
@@ -58,3 +58,3 @@ AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
 {
-	setCaption("Adding attachments");
+	setCaption(tr("Adding attachments") );
 
@@ -124,3 +124,3 @@ void AddAtt::clear()
 void AddAtt::addattachment()
-{	
+{	// ### FIXME wrong use -zecke
 	OFileDialog ofs("Attachments",this,0,0,"/root/Documents");
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index da1226c..749a4e9 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -61,6 +61,6 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   
-  connect(emailHandler, SIGNAL(smtpError(int)), this,
-      SLOT(smtpError(int)) );
-  connect(emailHandler, SIGNAL(popError(int)), this,
-      SLOT(popError(int)) );
+  connect(emailHandler, SIGNAL(smtpError(int,const QString &)), this,
+      SLOT(smtpError(int,const QString &)) );
+  connect(emailHandler, SIGNAL(popError(int,const QString &)), this,
+      SLOT(popError(int,const QString &)) );
   
@@ -482,3 +482,3 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
 
-void EmailClient::allMailArrived(int count)
+void EmailClient::allMailArrived(int /*count*/)
 {
@@ -520,3 +520,3 @@ void EmailClient::moveMailFront(Email *mailPtr)
 
-void EmailClient::smtpError(int code)
+void EmailClient::smtpError(int code, const QString & Msg)
 {
@@ -524,11 +524,13 @@ void EmailClient::smtpError(int code)
   
-  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 == ErrUnknownResponse) {
+      temp = tr("<qt>Unknown response from server</qt>");
+     if( ! Msg.isEmpty() )
+       temp += Msg;
+   } else if (code == QSocket::ErrHostNotFound) {
+      temp = tr("<qt>host not found</qt>");
+   } else if (code == QSocket::ErrConnectionRefused) {
+      temp = tr("<qt>connection refused</qt>");
+   } else if (code == QSocket::ErrSocketRead) {
+      temp = tr("<qt>socket packet error</qt>");
+   }
   
@@ -546,3 +548,3 @@ void EmailClient::smtpError(int code)
 
-void EmailClient::popError(int code)
+void EmailClient::popError(int code, const QString & Msg)
 {
@@ -550,16 +552,19 @@ void EmailClient::popError(int code)
   
-  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 == ErrUnknownResponse) {
+      temp = tr("<qt>Unknown response from server</qt>");
+     if( ! Msg.isEmpty() )
+       temp += Msg;
+   } else if (code == ErrLoginFailed) {
+     temp = tr("<qt>Login failed\nCheck user name and password</qt>");
+   } else if (code == QSocket::ErrHostNotFound) {
+     temp = tr("<qt>host not found</qt>");
+   } else if (code == QSocket::ErrConnectionRefused) {
+     temp = tr("<qt>connection refused</qt>");
+   } else if (code == QSocket::ErrSocketRead) {
+     temp = tr("<qt>socket packet error</qt>");
+   } 
+
   if (code != ErrCancel) {
-    QMessageBox::warning(qApp->activeWindow(), "Receiving error", temp, "OK\n");
+      QMessageBox::warning(qApp->activeWindow(), tr("Receiving error"), temp, tr("OK\n"));
+
   } else {
@@ -900,3 +905,3 @@ void EmailClient::setMailSize(int size)
 
-void EmailClient::setTotalSize(int size)
+void EmailClient::setTotalSize(int /*size*/)
 {
@@ -922,3 +927,3 @@ void EmailClient::deleteItem()
   EmailListItem* eli;
-  int pos;
+  //  int pos;
     
@@ -948,3 +953,3 @@ void EmailClient::inboxItemReleased()
 {
-  /*killTimer(timerID);
+  //killTimer(timerID);
   
@@ -993,3 +998,3 @@ void EmailClient::download(Email* mail)
 
-void EmailClient::receive(const QCString& msg, const QByteArray& data)
+void EmailClient::receive(const QCString& /*msg*/, const QByteArray& /*data*/)
 {
@@ -997,3 +1002,3 @@ void EmailClient::receive(const QCString& msg, const QByteArray& data)
   {
-    /*QDialog qd(qApp->activeWindow(),"Getting mail",true);
+    //QDialog qd(qApp->activeWindow(),"Getting mail",true);
     QVBoxLayout *vbProg = new QVBoxLayout( &qd );
diff --git a/noncore/unsupported/mailit/emailclient.h b/noncore/unsupported/mailit/emailclient.h
index c98cfce..80c6d31 100644
--- a/noncore/unsupported/mailit/emailclient.h
+++ b/noncore/unsupported/mailit/emailclient.h
@@ -100,4 +100,4 @@ public slots:
   void getAllNewMail();
-  void smtpError(int code);
-  void popError(int code);
+  void smtpError(int code, const QString & Msg );
+  void popError(int code, const QString & Msg);
   void inboxItemSelected();
diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp
index 39f693d..5b8bda1 100644
--- a/noncore/unsupported/mailit/emailhandler.cpp
+++ b/noncore/unsupported/mailit/emailhandler.cpp
@@ -46,4 +46,4 @@ EmailHandler::EmailHandler()
   
-  connect(smtpClient, SIGNAL(errorOccurred(int)), this,
-      SIGNAL(smtpError(int)) );
+  connect(smtpClient, SIGNAL(errorOccurred(int, const QString &)), this,
+      SIGNAL(smtpError(int, const QString &)) );
   connect(smtpClient, SIGNAL(mailSent()), this, SIGNAL(mailSent()) );
@@ -52,4 +52,4 @@ EmailHandler::EmailHandler()
   
-  connect(popClient, SIGNAL(errorOccurred(int)), this,
-      SIGNAL(popError(int)) );
+  connect(popClient, SIGNAL(errorOccurred(int, const QString &)), this,
+      SIGNAL(popError(int, const QString &)) );
   connect(popClient, SIGNAL(newMessage(const QString &, int, uint, bool)),
@@ -164,3 +164,3 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
   temp = lineShift + "." + lineShift;
-  
+
   if (in.right(temp.length()) != temp) {
diff --git a/noncore/unsupported/mailit/emailhandler.h b/noncore/unsupported/mailit/emailhandler.h
index e4e7f46..74a8e4c 100644
--- a/noncore/unsupported/mailit/emailhandler.h
+++ b/noncore/unsupported/mailit/emailhandler.h
@@ -129,4 +129,4 @@ signals:
   void mailSent();
-  void smtpError(int);
-  void popError(int);
+  void smtpError(int, const QString & Msg );
+  void popError(int, const QString & Msg );
   void mailArrived(const Email &, bool);
diff --git a/noncore/unsupported/mailit/mailit.pro b/noncore/unsupported/mailit/mailit.pro
index cfbda36..5e9a83a 100644
--- a/noncore/unsupported/mailit/mailit.pro
+++ b/noncore/unsupported/mailit/mailit.pro
@@ -1,2 +1,3 @@
 TEMPLATE  = app
+TARGET = mailit
 CONFIG    = qt warn_on release
diff --git a/noncore/unsupported/mailit/mailitwindow.cpp b/noncore/unsupported/mailit/mailitwindow.cpp
index f945a0f..6e298c7 100644
--- a/noncore/unsupported/mailit/mailitwindow.cpp
+++ b/noncore/unsupported/mailit/mailitwindow.cpp
@@ -23,6 +23,6 @@
 
-MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
+MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags /*fl*/)
   : QMainWindow(parent, name, WStyle_ContextHelp)
 {
-  currentCaption = "Mailit";
+  currentCaption = tr("Mailit");
   setCaption(tr(currentCaption));
diff --git a/noncore/unsupported/mailit/maillist.cpp b/noncore/unsupported/mailit/maillist.cpp
index b5325a9..8c34295 100644
--- a/noncore/unsupported/mailit/maillist.cpp
+++ b/noncore/unsupported/mailit/maillist.cpp
@@ -23,5 +23,5 @@ void MailList::clear()
 {
-	sortedList.setAutoDelete(TRUE);
-	sortedList.clear();
-	currentPos = 0;
+  sortedList.setAutoDelete(TRUE);
+  sortedList.clear();
+  currentPos = 0;
 }
@@ -30,3 +30,3 @@ int MailList::count()
 {
-	return sortedList.count();
+  return sortedList.count();
 }
@@ -35,10 +35,10 @@ int* MailList::first()
 {
-	dList *mPtr;
-	
-	if (sortedList.count() == 0)
-		return NULL;
-		
-	mPtr = sortedList.at(0);
-	currentPos = 1;
-	return &(mPtr->serverId);
+  dList *mPtr;
+  
+  if (sortedList.count() == 0)
+    return NULL;
+    
+  mPtr = sortedList.at(0);
+  currentPos = 1;
+  return &(mPtr->serverId);
 }
@@ -47,10 +47,10 @@ int* MailList::next()
 {
-	dList *mPtr;
-	
-	if ( (currentPos) >= sortedList.count())
-		return NULL;
-	
-	mPtr = sortedList.at(currentPos);
-	currentPos++;
-	return &(mPtr->serverId);
+  dList *mPtr;
+  
+  if ( (currentPos) >= sortedList.count())
+    return NULL;
+  
+  mPtr = sortedList.at(currentPos);
+  currentPos++;
+  return &(mPtr->serverId);
 }
@@ -59,41 +59,41 @@ void MailList::sizeInsert(int serverId, uint size)
 {
-	dList *tempPtr;
-	int x;
-	
-	dList *newEntry = new dList;
-	newEntry->serverId = serverId;
-	newEntry->size = size;
-	
-	for (tempPtr = sortedList.first(); tempPtr != NULL; tempPtr = sortedList.next() ) {
-		if (newEntry->size < tempPtr->size) {
-			x = sortedList.at();
-			sortedList.insert(x, newEntry);
-			return;
-		}
-	}
-	sortedList.append(newEntry);
+  dList *tempPtr;
+  int x;
+  
+  dList *newEntry = new dList;
+  newEntry->serverId = serverId;
+  newEntry->size = size;
+  
+  for (tempPtr = sortedList.first(); tempPtr != NULL; tempPtr = sortedList.next() ) {
+    if (newEntry->size < tempPtr->size) {
+      x = sortedList.at();
+      sortedList.insert(x, newEntry);
+      return;
+    }
+  }
+  sortedList.append(newEntry);
 }
 
-void MailList::moveFront(int serverId, uint size)
+void MailList::moveFront(int serverId, uint/* size*/)
 {
-	dList *currentPtr;
-	uint tempPos;
-	QString temp;
-	
-	tempPos = currentPos;
-	if ( tempPos >= sortedList.count() )
-		return;
-	currentPtr = sortedList.at(tempPos);
-	while ( ((tempPos+1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
-		tempPos++;
-		currentPtr = sortedList.at(tempPos);
-	}
-	
-	if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
-		temp.setNum(currentPtr->serverId);
-		qWarning("moved to front, message: " + temp);
-		
-		dList *itemPtr = sortedList.take(tempPos);
-		sortedList.insert(currentPos, itemPtr);
-	}
+  dList *currentPtr;
+  uint tempPos;
+  QString temp;
+  
+  tempPos = currentPos;
+  if ( tempPos >= sortedList.count() )
+    return;
+  currentPtr = sortedList.at(tempPos);
+  while ( ((tempPos+1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
+    tempPos++;
+    currentPtr = sortedList.at(tempPos);
+  }
+  
+  if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
+    temp.setNum(currentPtr->serverId);
+    qWarning("moved to front, message: " + temp);
+    
+    dList *itemPtr = sortedList.take(tempPos);
+    sortedList.insert(currentPos, itemPtr);
+  }
 
@@ -102,30 +102,30 @@ void MailList::moveFront(int serverId, uint size)
 //only works if mail is not already in download
-bool MailList::remove(int serverId, uint size)
+bool MailList::remove(int serverId, uint /*size*/)
 {
-	dList *currentPtr;
-	uint tempPos;
-	QString temp;
-	
-	tempPos = currentPos;
-	if ( tempPos >=sortedList.count() )
-		return FALSE;
-	currentPtr = sortedList.at(tempPos);
-	while ( ((tempPos + 1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
-		tempPos++;
-		currentPtr = sortedList.at(tempPos);
-	}
-	
-	if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
-		temp.setNum(currentPtr->serverId);
-		qWarning("deleted message: " + temp);
-		sortedList.remove(tempPos);
-		
-		return TRUE;
-	}
-	return FALSE;
+  dList *currentPtr;
+  uint tempPos;
+  QString temp;
+  
+  tempPos = currentPos;
+  if ( tempPos >=sortedList.count() )
+    return FALSE;
+  currentPtr = sortedList.at(tempPos);
+  while ( ((tempPos + 1) < sortedList.count()) && ( currentPtr->serverId != serverId) ) {
+    tempPos++;
+    currentPtr = sortedList.at(tempPos);
+  }
+  
+  if ( (currentPtr != NULL) && (currentPtr->serverId == serverId) ) {
+    temp.setNum(currentPtr->serverId);
+    qWarning("deleted message: " + temp);
+    sortedList.remove(tempPos);
+    
+    return TRUE;
+  }
+  return FALSE;
 }
 
-void MailList::insert(int pos, int serverId, uint size)
+void MailList::insert(int /*pos*/, int /*serverId*/, uint/* size*/)
 {
-//	sortedList.insert(pos, mPtr);
+//  sortedList.insert(pos, mPtr);
 }
diff --git a/noncore/unsupported/mailit/popclient.cpp b/noncore/unsupported/mailit/popclient.cpp
index dc0116d..5da3bcb 100644
--- a/noncore/unsupported/mailit/popclient.cpp
+++ b/noncore/unsupported/mailit/popclient.cpp
@@ -65,3 +65,3 @@ void PopClient::newConnection(const QString &target, int port)
     
-  emit updateStatus("DNS lookup");
+  emit updateStatus(tr("DNS lookup"));
 }
@@ -105,4 +105,8 @@ void PopClient::errorHandling(int status)
 {
+  errorHandlingWithMsg( status, QString::null );
+}
+void PopClient::errorHandlingWithMsg(int status, const QString & Msg )
+{
   emit updateStatus(tr("Error Occured"));
-  emit errorOccurred(status);
+  emit errorOccurred(status, Msg);
   socket->close();
@@ -169,3 +173,3 @@ void PopClient::incomingData()
             status = Mcnt;      
-          } else errorHandling(ErrLoginFailed);
+          } else errorHandlingWithMsg(ErrLoginFailed, response);
             break;
@@ -197,3 +201,3 @@ void PopClient::incomingData()
 
-            } else errorHandling(ErrUnknownResponse);
+            } else errorHandlingWithMsg(ErrUnknownResponse, response);
           }
@@ -236,3 +240,3 @@ void PopClient::incomingData()
               //qWarning(response);
-              errorHandling(ErrUnknownResponse);
+              errorHandlingWithMsg(ErrUnknownResponse, response);
             }
@@ -261,3 +265,3 @@ void PopClient::incomingData()
               response = socket->readLine();
-            } else errorHandling(ErrUnknownResponse);
+            } else errorHandlingWithMsg(ErrUnknownResponse, response);
           }
diff --git a/noncore/unsupported/mailit/popclient.h b/noncore/unsupported/mailit/popclient.h
index c58bc48..6774ceb 100644
--- a/noncore/unsupported/mailit/popclient.h
+++ b/noncore/unsupported/mailit/popclient.h
@@ -46,3 +46,3 @@ signals:
   void newMessage(const QString &, int, uint, bool);
-  void errorOccurred(int status);
+  void errorOccurred(int status, const QString & Msg );
   void updateStatus(const QString &);
@@ -55,2 +55,3 @@ public slots:
   void errorHandling(int);
+  void errorHandlingWithMsg(int, const QString & );
 
diff --git a/noncore/unsupported/mailit/smtpclient.cpp b/noncore/unsupported/mailit/smtpclient.cpp
index 2916f45..5b5ef52 100644
--- a/noncore/unsupported/mailit/smtpclient.cpp
+++ b/noncore/unsupported/mailit/smtpclient.cpp
@@ -75,3 +75,8 @@ void SmtpClient::errorHandling(int status)
 {
-  emit errorOccurred(status);
+  errorHandlingWithMsg( status, QString::null );
+}
+
+void SmtpClient::errorHandlingWithMsg(int status, const QString & EMsg )
+{
+  emit errorOccurred(status, EMsg );
   socket->close();
@@ -89,3 +94,2 @@ void SmtpClient::incomingData()
   response = socket->readLine();
-
   switch(status) {
@@ -96,3 +100,3 @@ void SmtpClient::incomingData()
             *stream << "HELO there\r\n";
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
@@ -101,5 +105,6 @@ void SmtpClient::incomingData()
           if (response[0] == '2') {
-            *stream << "MAIL FROM: " << mailPtr->from << "\r\n";
+             qDebug(mailPtr->from);
+            *stream << "MAIL FROM: <" << mailPtr->from << ">\r\n";
             status = Recv;
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse, response );
           break;
@@ -107,9 +112,10 @@ void SmtpClient::incomingData()
     case Recv:  {
-          if (response[0] == '2') {
+       if (response[0] == '2') {
             it = mailPtr->to.begin();
-            if (it == NULL)
-              errorHandling(ErrUnknownResponse);
-            *stream << "RCPT TO: " << *it << ">\r\n";
+            if (it == NULL) {
+              errorHandlingWithMsg(ErrUnknownResponse,response);
+            }
+            *stream << "RCPT TO: <" << *it << ">\r\n";
             status = MRcv;
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
@@ -125,3 +131,3 @@ void SmtpClient::incomingData()
             }
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
         } 
@@ -132,3 +138,4 @@ void SmtpClient::incomingData()
             emit updateStatus(tr("Sending: ") + mailPtr->subject);
-          } else errorHandling(ErrUnknownResponse);
+            
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
@@ -144,3 +151,3 @@ void SmtpClient::incomingData()
             }
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
@@ -158,3 +165,3 @@ void SmtpClient::incomingData()
             socket->close();
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
diff --git a/noncore/unsupported/mailit/smtpclient.h b/noncore/unsupported/mailit/smtpclient.h
index 45c0703..554ba3f 100644
--- a/noncore/unsupported/mailit/smtpclient.h
+++ b/noncore/unsupported/mailit/smtpclient.h
@@ -49,3 +49,3 @@ public:
 signals:
-  void errorOccurred(int);
+  void errorOccurred(int, const QString & LR );
   void updateStatus(const QString &);
@@ -55,2 +55,3 @@ public slots:
   void errorHandling(int);
+  void errorHandlingWithMsg(int, const QString & LastResponse );
 
diff --git a/noncore/unsupported/mailit/viewatt.cpp b/noncore/unsupported/mailit/viewatt.cpp
index 21885c2..293e137 100644
--- a/noncore/unsupported/mailit/viewatt.cpp
+++ b/noncore/unsupported/mailit/viewatt.cpp
@@ -28,3 +28,3 @@ ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
 {
-	setCaption("Exploring attatchments");
+	setCaption(tr("Exploring attatchments"));
 
@@ -37,5 +37,5 @@ ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
 	listView = new QListView(this, "AttView");
-	listView->addColumn( "Attatchment" );
-	listView->addColumn( "Type" );
-	listView->addColumn( "Installed" );
+	listView->addColumn( tr("Attatchment") );
+	listView->addColumn( tr("Type") );
+	listView->addColumn( tr("Installed") );
 	setCentralWidget(listView);
@@ -63,5 +63,5 @@ void ViewAtt::update(Email *mailIn, bool inbox)
 		
-		QString isInstalled = "No";
+		QString isInstalled = tr("No");
 		if (ePtr->installed)
-			isInstalled = "Yes";
+			isInstalled = tr("Yes");
 		item = new QListViewItem(listView, ePtr->originalName, ePtr->contentType, isInstalled);
@@ -118,3 +118,3 @@ void ViewAtt::install()
 		selPtr->installed = TRUE;
-		item->setText(2, "Yes");
+		item->setText(2, tr("Yes"));
 	}
diff --git a/noncore/unsupported/mailit/writemail.cpp b/noncore/unsupported/mailit/writemail.cpp
index 0298cb3..26b9660 100644
--- a/noncore/unsupported/mailit/writemail.cpp
+++ b/noncore/unsupported/mailit/writemail.cpp
@@ -26,6 +26,6 @@ WriteMail::WriteMail( QWidget* parent,  const char* name, WFlags fl ):QMainWindo
 {
-	showingAddressList = FALSE;
-	init();
-	
-	addAtt = new AddAtt(0, "Add Attachments");
+  showingAddressList = FALSE;
+  init();
+  
+  addAtt = new AddAtt(0, "Add Attachments");
 }
@@ -34,3 +34,3 @@ WriteMail::~WriteMail()
 {
-	delete addAtt;
+  delete addAtt;
 }
@@ -39,12 +39,12 @@ void WriteMail::setAddressList(AddressList *list)
 {
-	AContact *cPtr;
-	
-	addressList = list;
-	
-	addressView->clear();
-	QList<AContact> *cListPtr = addressList->getContactList();
-	QListViewItem *item;
-	for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) {
-		item = new QListViewItem(addressView, cPtr->name, cPtr->email);
-	}
+  AContact *cPtr;
+  
+  addressList = list;
+  
+  addressView->clear();
+  QList<AContact> *cListPtr = addressList->getContactList();
+  QListViewItem *item;
+  for (cPtr = cListPtr->first(); cPtr != 0; cPtr = cListPtr->next() ) {
+    item = new QListViewItem(addressView, cPtr->name, cPtr->email);
+  }
 }
@@ -53,91 +53,91 @@ void WriteMail::init()
 {
-	setToolBarsMovable(FALSE);
-	
-	bar = new QToolBar(this);
-	bar->setHorizontalStretchable( TRUE );
+  setToolBarsMovable(FALSE);
+  
+  bar = new QToolBar(this);
+  bar->setHorizontalStretchable( TRUE );
 
-	menu = new QMenuBar( bar );
+  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);
-	attachButton = new QAction(tr("Attachment"), Resource::loadPixmap("mailit/attach"), QString::null, 0, this, 0);
-	attachButton->addTo(bar);
-	attachButton->addTo(addMenu);
-	connect( attachButton, SIGNAL( activated() ), this, SLOT( attachFile() ) );
-	attachButton->setWhatsThis(tr("Click here to attach files to your mail"));
-		
-	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() ) );
-	confirmButton->setWhatsThis(tr("This button puts your mail in the send queue"));
-	
-	newButton = new QAction(tr("New mail"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
-	newButton->addTo(mailMenu);
-	connect( newButton, SIGNAL( activated() ), this, SLOT( newMail() ) );
-	newButton->setWhatsThis(tr("Click here to create a new mail"));
+  mailMenu = new QPopupMenu(menu);
+  menu->insertItem( tr( "&Mail" ), mailMenu);
+  addMenu = new QPopupMenu(menu);
+  menu->insertItem( tr( "&Add" ), addMenu);
+  
+  bar = new QToolBar(this);
+  attachButton = new QAction(tr("Attachment"), Resource::loadPixmap("mailit/attach"), QString::null, 0, this, 0);
+  attachButton->addTo(bar);
+  attachButton->addTo(addMenu);
+  connect( attachButton, SIGNAL( activated() ), this, SLOT( attachFile() ) );
+  attachButton->setWhatsThis(tr("Click here to attach files to your mail"));
+    
+  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() ) );
+  confirmButton->setWhatsThis(tr("This button puts your mail in the send queue"));
+  
+  newButton = new QAction(tr("New mail"), Resource::loadPixmap("new"), QString::null, 0, this, 0);
+  newButton->addTo(mailMenu);
+  connect( newButton, SIGNAL( activated() ), this, SLOT( newMail() ) );
+  newButton->setWhatsThis(tr("Click here to create a new mail"));
 
-	widget = new QWidget(this, "widget");
-	grid = new QGridLayout( widget );
+  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 );
-	connect(recipientsBox,SIGNAL(activated(int)),this, SLOT(changeRecipients(int)));
-	
-	subjetLabel = new QLabel( widget, "subjetLabel" );
-	subjetLabel->setText( tr( "Subject:"  ) );
+  recipientsBox = new QComboBox( FALSE, widget, "toLabel" );
+  recipientsBox->insertItem( tr( "To:"  ) );
+  recipientsBox->insertItem( tr( "CC:"  ) );  
+  recipientsBox->setCurrentItem(0);
+  grid->addWidget( recipientsBox, 0, 0 );
+  connect(recipientsBox,SIGNAL(activated(int)),this, SLOT(changeRecipients(int)));
+  
+  subjetLabel = new QLabel( widget, "subjetLabel" );
+  subjetLabel->setText( tr( "Subject:"  ) );
 
-	grid->addWidget( subjetLabel, 1, 0 );
+  grid->addWidget( subjetLabel, 1, 0 );
 
-	ToolButton13_2 = new QToolButton( widget, "ToolButton13_2" );
-	ToolButton13_2->setText( tr( "..."  ) );
-	grid->addWidget( ToolButton13_2, 1, 2 );
+  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 );
-	QWhatsThis::add(subjectInput,QWidget::tr("The mail subject should be entered here"));
+  subjectInput = new QLineEdit( widget, "subjectInput" );
+  grid->addWidget( subjectInput, 1, 1 );
+  QWhatsThis::add(subjectInput,QWidget::tr("The mail subject should be entered here"));
 
-	toInput = new QLineEdit( widget, "toInput" );
-	grid->addWidget( toInput, 0, 1 );
-	QWhatsThis::add(recipientsBox,QWidget::tr("Recipients can be entered here"));
+  toInput = new QLineEdit( widget, "toInput" );
+  grid->addWidget( toInput, 0, 1 );
+  QWhatsThis::add(recipientsBox,QWidget::tr("Recipients can be entered here"));
 
-	ccInput = new QLineEdit( widget, "ccInput" );
-	ccInput->hide();
-	grid->addWidget( ccInput, 0, 1 );
-	QWhatsThis::add(ccInput,QWidget::tr("If you would like to send copies of your mail they can be entered here"));
+  ccInput = new QLineEdit( widget, "ccInput" );
+  ccInput->hide();
+  grid->addWidget( ccInput, 0, 1 );
+  QWhatsThis::add(ccInput,QWidget::tr("If you would like to send copies of your mail they can be entered here"));
 
-	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()) );
-	QWhatsThis::add(addressButton,QWidget::tr("This button opens the address selector with all mail adresses from your OPIE addressbook"));
+  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()) );
+  QWhatsThis::add(addressButton,QWidget::tr("This button opens the address selector with all mail adresses from your Opie addressbook"));
 
-	emailInput = new QMultiLineEdit( widget, "emailInput" );
-	grid->addMultiCellWidget( emailInput, 2, 2, 0, 2);
-	QWhatsThis::add(emailInput,QWidget::tr("Enter your mail text here"));
+  emailInput = new QMultiLineEdit( widget, "emailInput" );
+  grid->addMultiCellWidget( emailInput, 2, 2, 0, 2);
+  QWhatsThis::add(emailInput,QWidget::tr("Enter your mail text here"));
 
-	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);
-	QWhatsThis::add(recipientsBox,QWidget::tr("Choose the recipients from this list"));
+  addressView = new QListView( widget, "addressView");
+  addressView->addColumn(tr("Name"));
+  addressView->addColumn(tr("EMail") );
+  addressView->setAllColumnsShowFocus(TRUE);
+  addressView->setMultiSelection(TRUE);
+  addressView->hide();
+  grid->addMultiCellWidget( addressView, 3, 3, 0, 2);
+  QWhatsThis::add(recipientsBox,QWidget::tr("Choose the recipients from this list"));
 
-	okButton = new QToolButton(bar, "ok");
-	okButton->setPixmap( Resource::loadPixmap("enter") );
-	okButton->hide();
-	connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) );
-	QWhatsThis::add(okButton,QWidget::tr("Queue your mail by clicking here"));
-	
-	setCentralWidget(widget);
+  okButton = new QToolButton(bar, "ok");
+  okButton->setPixmap( Resource::loadPixmap("enter") );
+  okButton->hide();
+  connect(okButton, SIGNAL(clicked()), this, SLOT(addRecipients()) );
+  QWhatsThis::add(okButton,QWidget::tr("Queue your mail by clicking here"));
+  
+  setCentralWidget(widget);
 }
@@ -146,3 +146,3 @@ void WriteMail::reject()
 {
-	emit cancelMail();
+  emit cancelMail();
 }
@@ -151,77 +151,77 @@ void WriteMail::accept()
 {
-	QStringList attachedFiles, attachmentsType;
-	int idCount = 0;
-	
-	if (toInput->text() == "") 
-	{
-	 	QMessageBox::warning(this,tr("No recipient"), tr("Send mail to whom?"), tr("OK\n"));
-		return;
-	}
-	
-	if (! getRecipients(false) ) 
-	{
-	 	QMessageBox::warning(this,tr("Incorrect recipient separator"),
-	 			tr("Recipients must be separated by ;\nand be valid emailaddresses"), tr("OK\n"));
-		return;
-	}
-	
-	if ((ccInput->text()!="") && (! getRecipients(true) )) 
-	{
-	 	QMessageBox::warning(this,tr("Incorrect carbon copy separator"),
-	 			tr("CC Recipients must be separated by ;\nand be valid emailaddresses"), tr("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 += "\nCC: ";
-	
-	for (QStringList::Iterator it = mail.carbonCopies.begin();
-		it != mail.carbonCopies.end(); ++it) {
-		
-		mail.rawMail += (*it);
-		mail.rawMail += ",\n";
-	}
+  QStringList attachedFiles, attachmentsType;
+  int idCount = 0;
+  
+  if (toInput->text() == "") 
+  {
+    QMessageBox::warning(this,tr("No recipient"), tr("Send mail to whom?"), tr("OK\n"));
+    return;
+  }
+  
+  if (! getRecipients(false) ) 
+  {
+    QMessageBox::warning(this,tr("Incorrect recipient separator"),
+        tr("Recipients must be separated by ;\nand be valid emailaddresses"), tr("OK\n"));
+    return;
+  }
+  
+  if ((ccInput->text()!="") && (! getRecipients(true) )) 
+  {
+    QMessageBox::warning(this,tr("Incorrect carbon copy separator"),
+        tr("CC Recipients must be separated by ;\nand be valid emailaddresses"), tr("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 += "\nCC: ";
+  
+  for (QStringList::Iterator it = mail.carbonCopies.begin();
+    it != mail.carbonCopies.end(); ++it) {
+    
+    mail.rawMail += (*it);
+    mail.rawMail += ",\n";
+  }
 
-	mail.rawMail += mail.from;
-	mail.rawMail += "\nSubject: ";
-	mail.rawMail += mail.subject;
-	mail.rawMail += "\n\n";
-	
-	attachedFiles = addAtt->returnattachedFiles();
-	attachmentsType = addAtt->returnFileTypes();
+  mail.rawMail += mail.from;
+  mail.rawMail += "\nSubject: ";
+  mail.rawMail += mail.subject;
+  mail.rawMail += "\n\n";
+  
+  attachedFiles = addAtt->returnattachedFiles();
+  attachmentsType = addAtt->returnFileTypes();
 
-	QStringList::Iterator itType = attachmentsType.begin();
-	
-	Enclosure e;
-	for ( QStringList::Iterator it = attachedFiles.begin(); it != attachedFiles.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();
+  QStringList::Iterator itType = attachmentsType.begin();
+  
+  Enclosure e;
+  for ( QStringList::Iterator it = attachedFiles.begin(); it != attachedFiles.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();
 }
@@ -230,14 +230,14 @@ void WriteMail::getAddress()
 {
-	showingAddressList = !showingAddressList;
-	
-	if (showingAddressList) {
-		emailInput->hide();
-		addressView->show();
-		okButton->show();
-		
-	} else {
-		addressView->hide();
-		okButton->hide();
-		emailInput->show();
-	}
+  showingAddressList = !showingAddressList;
+  
+  if (showingAddressList) {
+    emailInput->hide();
+    addressView->show();
+    okButton->show();
+    
+  } else {
+    addressView->hide();
+    okButton->hide();
+    emailInput->show();
+  }
 }
@@ -246,3 +246,3 @@ void WriteMail::attachFile()
 {
-	addAtt->showMaximized();
+  addAtt->showMaximized();
 }
@@ -251,40 +251,40 @@ void WriteMail::reply(Email replyMail, bool replyAll)
 {
-	int pos;
-	QString ccRecipients;
-	
-	mail = replyMail;
-	mail.files.clear();
-	
-	toInput->setText(mail.fromMail);
-	
-	if (replyAll)
-	{	
-		for (QStringList::Iterator it = mail.carbonCopies.begin();it != mail.carbonCopies.end(); ++it) 
-		{
-			ccRecipients.append(*it);
-			ccRecipients.append(";");
-		}
-		ccRecipients.truncate(ccRecipients.length()-1);		//no ; at the end
-		ccInput->setText(ccRecipients);
-	}
-	else ccInput->clear();
-	
-	subjectInput->setText(tr("Re: ") + mail.subject);
-	
-	QString citation=mail.fromMail;
-	citation.append(tr(" wrote on "));
-	citation.append(mail.date);
-	citation.append(":\n");
-	
+  int pos;
+  QString ccRecipients;
+  
+  mail = replyMail;
+  mail.files.clear();
+  
+  toInput->setText(mail.fromMail);
+  
+  if (replyAll)
+  { 
+    for (QStringList::Iterator it = mail.carbonCopies.begin();it != mail.carbonCopies.end(); ++it) 
+    {
+      ccRecipients.append(*it);
+      ccRecipients.append(";");
+    }
+    ccRecipients.truncate(ccRecipients.length()-1);   //no ; at the end
+    ccInput->setText(ccRecipients);
+  }
+  else ccInput->clear();
+  
+  subjectInput->setText(tr("Re: ") + mail.subject);
+  
+  QString citation=mail.fromMail;
+  citation.append(tr(" wrote on "));
+  citation.append(mail.date);
+  citation.append(":\n");
+  
 
-	//mail.body.insert(0,tr("On"));
-	pos = 0;
-	mail.body.insert(pos, ">");
-	while (pos != -1) {
-		pos = mail.body.find('\n', pos);
-		if (pos != -1)
-			mail.body.insert(++pos, ">>");
-	}
-	mail.body.insert(0,citation);	
-	emailInput->setText(mail.body);
+  //mail.body.insert(0,tr("On"));
+  pos = 0;
+  mail.body.insert(pos, ">");
+  while (pos != -1) {
+    pos = mail.body.find('\n', pos);
+    if (pos != -1)
+      mail.body.insert(++pos, ">");
+  }
+  mail.body.insert(0,citation); 
+  emailInput->setText(mail.body);
 }
@@ -293,17 +293,17 @@ void WriteMail::forward(Email forwMail)
 {
-	int pos=0;
-	
-	QString fwdBody=tr("======forwarded message from ");
-	fwdBody.append(forwMail.fromMail);
-	fwdBody.append(tr(" starts======\n\n"));
-	
-	mail=forwMail;
-	toInput->setText("");
-	ccInput->setText("");
-	subjectInput->setText(tr("FWD: ") + mail.subject);
-	
-	fwdBody+=mail.body;
-	fwdBody+=QString(tr("======end of forwarded message======\n\n"));
-	
-	emailInput->setText(fwdBody);
+   // int pos=0;
+  
+  QString fwdBody=tr("======forwarded message from ");
+  fwdBody.append(forwMail.fromMail);
+  fwdBody.append(tr(" starts======\n\n"));
+  
+  mail=forwMail;
+  toInput->setText("");
+  ccInput->setText("");
+  subjectInput->setText(tr("FWD: ") + mail.subject);
+  
+  fwdBody+=mail.body;
+  fwdBody+=QString(tr("======end of forwarded message======\n\n"));
+  
+  emailInput->setText(fwdBody);
 }
@@ -312,31 +312,31 @@ bool WriteMail::getRecipients(bool ccField)
 {
-	QString str, temp;
-	int pos = 0;
-	
-	if (ccField)
-	{
-		mail.carbonCopies.clear();
-	 	temp = ccInput->text();
-	} 
-	else 
-	{
-		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;
-		ccField ? mail.carbonCopies.append(str) : mail.recipients.append(str);
-		//addressList->addContact(str, "");
-	}
-	temp = temp.stripWhiteSpace();
-	if ( temp.find('@') == -1)
-		return false;
-	ccField ? mail.carbonCopies.append(temp) : mail.recipients.append(temp);
-	//addressList->addContact(temp, "");
-	
-	return TRUE;
+  QString str, temp;
+  int pos = 0;
+  
+  if (ccField)
+  {
+    mail.carbonCopies.clear();
+    temp = ccInput->text();
+  } 
+  else 
+  {
+    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;
+    ccField ? mail.carbonCopies.append(str) : mail.recipients.append(str);
+    //addressList->addContact(str, "");
+  }
+  temp = temp.stripWhiteSpace();
+  if ( temp.find('@') == -1)
+    return false;
+  ccField ? mail.carbonCopies.append(temp) : mail.recipients.append(temp);
+  //addressList->addContact(temp, "");
+  
+  return TRUE;
 }
@@ -345,4 +345,4 @@ void WriteMail::addRecipients()
 {
-	toInput->isVisible() ? addRecipients(false) : addRecipients(true);
-}			
+  toInput->isVisible() ? addRecipients(false) : addRecipients(true);
+}     
        
@@ -350,25 +350,25 @@ void WriteMail::addRecipients(bool ccField)
 {
-	QString recipients = "";
-	
-	mail.recipients.clear();
-	
-	QListViewItem *item = addressView->firstChild();
-	while (item != NULL) {
-		if ( item->isSelected() ) {
-			if (recipients == "") {
-				recipients = item->text(1);
-			} else {
-				recipients += "; " + item->text(1);
-			}
-		}
-		item = item->nextSibling();
-	}
-	
-	ccField ? ccInput->setText(recipients):toInput->setText(recipients);
-	
-	addressView->hide();
-	okButton->hide();
-	emailInput->show();
-	addressButton->setOn(FALSE);
-	showingAddressList = !showingAddressList;
+  QString recipients = "";
+  
+  mail.recipients.clear();
+  
+  QListViewItem *item = addressView->firstChild();
+  while (item != NULL) {
+    if ( item->isSelected() ) {
+      if (recipients == "") {
+        recipients = item->text(1);
+      } else {
+        recipients += "; " + item->text(1);
+      }
+    }
+    item = item->nextSibling();
+  }
+  
+  ccField ? ccInput->setText(recipients):toInput->setText(recipients);
+  
+  addressView->hide();
+  okButton->hide();
+  emailInput->show();
+  addressButton->setOn(FALSE);
+  showingAddressList = !showingAddressList;
 }
@@ -377,12 +377,12 @@ void WriteMail::changeRecipients(int selection)
 {
-	if (selection==0)
-	{
-		toInput->show();
-		ccInput->hide();
-	}
-	else if (selection==1)
-	{
-		toInput->hide();
-		ccInput->show();
-	}
+  if (selection==0)
+  {
+    toInput->show();
+    ccInput->hide();
+  }
+  else if (selection==1)
+  {
+    toInput->hide();
+    ccInput->show();
+  }
 }
@@ -396,7 +396,7 @@ void WriteMail::newMail()
 {
-	toInput->clear();
-	ccInput->clear();
-	subjectInput->clear();
-	emailInput->clear();
-	setAddressList(addressList);
+  toInput->clear();
+  ccInput->clear();
+  subjectInput->clear();
+  emailInput->clear();
+  setAddressList(addressList);
 }