28 files changed, 200 insertions, 162 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
@@ -56,7 +56,7 @@ FileItem::~FileItem()
 AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
         : QDialog(parent, name, f)
 {
-        setCaption("Adding attachments");
+        setCaption(tr("Adding attachments") );
 
         QGridLayout *top = new QGridLayout(this, 1,1 );
         
@@ -122,7 +122,7 @@ void AddAtt::clear()
 }*/
 
 void AddAtt::addattachment()
-        {
+        {// ### FIXME wrong use -zecke
         OFileDialog ofs("Attachments",this,0,0,"/root/Documents");
         
         ofs.showMaximized();
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
@@ -59,10 +59,10 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   
   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(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 &)) );
   
   connect(inboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(inboxItemSelected()) );
   connect(outboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(outboxItemSelected()) );
@@ -480,7 +480,7 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
   
 }
 
-void EmailClient::allMailArrived(int count)
+void EmailClient::allMailArrived(int /*count*/)
 {
   // not previewing means all mailtransfer has been done
   /*if (!previewingMail) {*/
@@ -518,19 +518,21 @@ void EmailClient::moveMailFront(Email *mailPtr)
   }
 }
 
-void EmailClient::smtpError(int code)
+void EmailClient::smtpError(int code, const QString & Msg)
 {
   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 == 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>");
+   }
   
   if (code != ErrCancel) {
     QMessageBox::warning(qApp->activeWindow(), "Sending error", temp, "OK\n");
@@ -544,24 +546,27 @@ void EmailClient::smtpError(int code)
   quedMessages.clear();
 }
 
-void EmailClient::popError(int code)
+void EmailClient::popError(int code, const QString & Msg)
 {
   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 == 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 {
     status2Label->setText("Aborted by user");
   }
@@ -898,7 +903,7 @@ void EmailClient::setMailSize(int size)
         progressBar->setTotalSteps(size);
 }
 
-void EmailClient::setTotalSize(int size)
+void EmailClient::setTotalSize(int /*size*/)
 {
   
 }
@@ -920,7 +925,7 @@ void EmailClient::deleteItem()
   QListView* box;
   
   EmailListItem* eli;
-  int pos;
+  //  int pos;
     
   inbox ? box=inboxView : box=outboxView;
   
@@ -946,7 +951,7 @@ void EmailClient::inboxItemReleased()
 
 /*void EmailClient::timerEvent(QTimerEvent *e)
 {
-  /*killTimer(timerID);
+  //killTimer(timerID);
   
   
   QPopupMenu *action = new QPopupMenu(this);
@@ -991,11 +996,11 @@ void EmailClient::download(Email* mail)
           tr("No account associated"), tr("There is no active account \nassociated to this mail\n it can not be downloaded"), "Abort\n");
 }
 
-void EmailClient::receive(const QCString& msg, const QByteArray& data)
+void EmailClient::receive(const QCString& /*msg*/, const QByteArray& /*data*/)
 {
   /*if (msg=="getMail()")
   {
-    /*QDialog qd(qApp->activeWindow(),"Getting mail",true);
+    //QDialog qd(qApp->activeWindow(),"Getting mail",true);
     QVBoxLayout *vbProg = new QVBoxLayout( &qd );
   
     initStatusBar(&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
@@ -98,8 +98,8 @@ public slots:
   void deleteItem();
   void getNewMail();
   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();
   void outboxItemSelected();
   void inboxItemPressed();
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
@@ -44,14 +44,14 @@ EmailHandler::EmailHandler()
   smtpClient = new SmtpClient();
   popClient = new PopClient();
   
-  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()) );
   connect(smtpClient, SIGNAL(updateStatus(const QString &)), this,
       SIGNAL(updateSmtpStatus(const QString &)) );
   
-  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)),
       this, SLOT(messageArrived(const QString &, int, uint, bool)) );
   connect(popClient, SIGNAL(updateStatus(const QString &)), this,
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
@@ -127,8 +127,8 @@ public:
   
 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);
   void updatePopStatus(const QString &);
   void updateSmtpStatus(const QString &);
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,4 +1,5 @@
 TEMPLATE  = app
+TARGET = mailit
 CONFIG    = qt warn_on release
 HEADERS   = emailclient.h \
       emailhandler.h \
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
@@ -21,10 +21,10 @@
 #include <qmessagebox.h>
 #include "mailitwindow.h"
 
-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));
   views = new QWidgetStack(this);
   setCentralWidget(views);
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
@@ -74,7 +74,7 @@ void MailList::sizeInsert(int serverId, uint size)
         sortedList.append(newEntry);
 }
 
-void MailList::moveFront(int serverId, uint size)
+void MailList::moveFront(int serverId, uint/* size*/)
 {
         dList *currentPtr;
         uint tempPos;
@@ -100,7 +100,7 @@ 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;
@@ -125,7 +125,7 @@ bool MailList::remove(int serverId, uint size)
         return FALSE;
 }
 
-void MailList::insert(int pos, int serverId, uint size)
+void MailList::insert(int /*pos*/, int /*serverId*/, uint/* size*/)
 {
         //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
@@ -63,7 +63,7 @@ void PopClient::newConnection(const QString &target, int port)
   receiving = TRUE;
   //selected = FALSE;
     
-  emit updateStatus("DNS lookup");
+  emit updateStatus(tr("DNS lookup"));
 }
 
 void PopClient::setAccount(const QString &popUser, const QString &popPasswd)
@@ -103,8 +103,12 @@ void PopClient::connectionEstablished()
 
 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();
   receiving = FALSE;
 }
@@ -167,7 +171,7 @@ void PopClient::incomingData()
           if (response[0] == '+') {
             *stream << "STAT" << "\r\n";
             status = Mcnt;      
-          } else errorHandling(ErrLoginFailed);
+          } else errorHandlingWithMsg(ErrLoginFailed, response);
             break;
           }
     //get count of messages, eg "+OK 4 900.." -> int 4
@@ -195,7 +199,7 @@ void PopClient::incomingData()
                 } else newMessages = 0; 
         }
 
-            } else errorHandling(ErrUnknownResponse);
+            } else errorHandlingWithMsg(ErrUnknownResponse, response);
           }
     //Read message number x, count upwards to messageCount
     case List:  {
@@ -234,7 +238,7 @@ void PopClient::incomingData()
               status = Retr;
             } else {
               //qWarning(response);
-              errorHandling(ErrUnknownResponse);
+              errorHandlingWithMsg(ErrUnknownResponse, response);
             }
           }
         } 
@@ -259,7 +263,7 @@ void PopClient::incomingData()
               if (!socket->canReadLine()) //sync. problems
                 break;
               response = socket->readLine();
-            } else errorHandling(ErrUnknownResponse);
+            } else errorHandlingWithMsg(ErrUnknownResponse, response);
           }
         }
     //add all incoming lines to body.  When size is reached, send
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
@@ -44,7 +44,7 @@ public:
   
 signals:
   void newMessage(const QString &, int, uint, bool);
-  void errorOccurred(int status);
+  void errorOccurred(int status, const QString & Msg );
   void updateStatus(const QString &);
   void mailTransfered(int);
   void mailboxSize(int);
@@ -53,6 +53,7 @@ signals:
     
 public slots:
   void errorHandling(int);
+  void errorHandlingWithMsg(int, const QString & );
 
 protected slots:
   void connectionEstablished();
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
@@ -73,7 +73,12 @@ void SmtpClient::connectionEstablished()
 
 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();
   mailList.clear();
   sending = FALSE;
@@ -87,31 +92,32 @@ void SmtpClient::incomingData()
     return;
   
   response = socket->readLine();
-
   switch(status) {
     case Init:  {
           if (response[0] == '2') {
             status = From;
             mailPtr = mailList.first();
             *stream << "HELO there\r\n";
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
         } 
     case From:  {
           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;
         } 
     case Recv:  {
           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;
         } 
     case MRcv:  {
@@ -123,14 +129,15 @@ void SmtpClient::incomingData()
             } else  {
               status = Data;
             }
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
         } 
     case Data:  {
           if (response[0] == '2') {
             *stream << "DATA\r\n";
             status = Body;
             emit updateStatus(tr("Sending: ") + mailPtr->subject);
-          } else errorHandling(ErrUnknownResponse);
+            
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
         } 
     case Body:  {
@@ -142,7 +149,7 @@ void SmtpClient::incomingData()
             } else {
               status = Quit;
             }
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
         } 
     case Quit:  {
@@ -156,7 +163,7 @@ void SmtpClient::incomingData()
             mailList.clear();
             sending = FALSE;
             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
@@ -47,12 +47,13 @@ public:
   void addMail(const QString &from, const QString &subject, const QStringList &to, const QString &body);
 
 signals:
-  void errorOccurred(int);
+  void errorOccurred(int, const QString & LR );
   void updateStatus(const QString &);
   void mailSent();
   
 public slots:
   void errorHandling(int);
+  void errorHandlingWithMsg(int, const QString & LastResponse );
 
 protected slots:
   void connectionEstablished();
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
@@ -26,7 +26,7 @@
 ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
         : QMainWindow(parent, name, f)
 {
-        setCaption("Exploring attatchments");
+        setCaption(tr("Exploring attatchments"));
 
         setToolBarsMovable( FALSE );
         bar = new QToolBar(this);
@@ -35,9 +35,9 @@ ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
         installButton->setWhatsThis(tr("Click here to install the attachment to your Documents"));
         
         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);
         QWhatsThis::add(listView,QWidget::tr("This is an overview about all attachments in the mail"));
 }
@@ -61,9 +61,9 @@ void ViewAtt::update(Email *mailIn, bool inbox)
         mail = mailIn;
         for ( ePtr=mail->files.first(); ePtr != 0; ePtr=mail->files.next() ) {
                 
-                QString isInstalled = "No";
+                QString isInstalled = tr("No");
                 if (ePtr->installed)
-                        isInstalled = "Yes";
+                        isInstalled = tr("Yes");
                 item = new QListViewItem(listView, ePtr->originalName, ePtr->contentType, isInstalled);
                 
                 const QString& mtypeDef=(const QString&) ePtr->contentType+"/"+ePtr->contentAttribute;
@@ -116,6 +116,6 @@ void ViewAtt::install()
                 d.setType(selPtr->contentType + "/" + selPtr->contentAttribute);
                 d.writeLink();
                 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
@@ -118,15 +118,15 @@ void WriteMail::init()
         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"));
+  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"));
 
         addressView = new QListView( widget, "addressView");
-        addressView->addColumn("Name");
-        addressView->addColumn("EMail");
+  addressView->addColumn(tr("Name"));
+  addressView->addColumn(tr("EMail") );
         addressView->setAllColumnsShowFocus(TRUE);
         addressView->setMultiSelection(TRUE);
         addressView->hide();
@@ -283,7 +283,7 @@ void WriteMail::reply(Email replyMail, bool replyAll)
         while (pos != -1) {
                 pos = mail.body.find('\n', pos);
                 if (pos != -1)
-                        mail.body.insert(++pos, ">>");
+      mail.body.insert(++pos, ">");
         }
                 mail.body.insert(0,citation);
         emailInput->setText(mail.body);
@@ -291,7 +291,7 @@ void WriteMail::reply(Email replyMail, bool replyAll)
 
 void WriteMail::forward(Email forwMail)
 {
-        int pos=0;
+   // int pos=0;
         
         QString fwdBody=tr("======forwarded message from ");
         fwdBody.append(forwMail.fromMail);
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
@@ -56,7 +56,7 @@ FileItem::~FileItem()
 AddAtt::AddAtt(QWidget *parent, const char *name, WFlags f)
         : QDialog(parent, name, f)
 {
-        setCaption("Adding attachments");
+        setCaption(tr("Adding attachments") );
 
         QGridLayout *top = new QGridLayout(this, 1,1 );
         
@@ -122,7 +122,7 @@ void AddAtt::clear()
 }*/
 
 void AddAtt::addattachment()
-        {
+        {// ### FIXME wrong use -zecke
         OFileDialog ofs("Attachments",this,0,0,"/root/Documents");
         
         ofs.showMaximized();
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
@@ -59,10 +59,10 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   
   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(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 &)) );
   
   connect(inboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(inboxItemSelected()) );
   connect(outboxView, SIGNAL(doubleClicked(QListViewItem *)), this, SLOT(outboxItemSelected()) );
@@ -480,7 +480,7 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
   
 }
 
-void EmailClient::allMailArrived(int count)
+void EmailClient::allMailArrived(int /*count*/)
 {
   // not previewing means all mailtransfer has been done
   /*if (!previewingMail) {*/
@@ -518,19 +518,21 @@ void EmailClient::moveMailFront(Email *mailPtr)
   }
 }
 
-void EmailClient::smtpError(int code)
+void EmailClient::smtpError(int code, const QString & Msg)
 {
   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 == 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>");
+   }
   
   if (code != ErrCancel) {
     QMessageBox::warning(qApp->activeWindow(), "Sending error", temp, "OK\n");
@@ -544,24 +546,27 @@ void EmailClient::smtpError(int code)
   quedMessages.clear();
 }
 
-void EmailClient::popError(int code)
+void EmailClient::popError(int code, const QString & Msg)
 {
   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 == 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 {
     status2Label->setText("Aborted by user");
   }
@@ -898,7 +903,7 @@ void EmailClient::setMailSize(int size)
         progressBar->setTotalSteps(size);
 }
 
-void EmailClient::setTotalSize(int size)
+void EmailClient::setTotalSize(int /*size*/)
 {
   
 }
@@ -920,7 +925,7 @@ void EmailClient::deleteItem()
   QListView* box;
   
   EmailListItem* eli;
-  int pos;
+  //  int pos;
     
   inbox ? box=inboxView : box=outboxView;
   
@@ -946,7 +951,7 @@ void EmailClient::inboxItemReleased()
 
 /*void EmailClient::timerEvent(QTimerEvent *e)
 {
-  /*killTimer(timerID);
+  //killTimer(timerID);
   
   
   QPopupMenu *action = new QPopupMenu(this);
@@ -991,11 +996,11 @@ void EmailClient::download(Email* mail)
           tr("No account associated"), tr("There is no active account \nassociated to this mail\n it can not be downloaded"), "Abort\n");
 }
 
-void EmailClient::receive(const QCString& msg, const QByteArray& data)
+void EmailClient::receive(const QCString& /*msg*/, const QByteArray& /*data*/)
 {
   /*if (msg=="getMail()")
   {
-    /*QDialog qd(qApp->activeWindow(),"Getting mail",true);
+    //QDialog qd(qApp->activeWindow(),"Getting mail",true);
     QVBoxLayout *vbProg = new QVBoxLayout( &qd );
   
     initStatusBar(&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
@@ -98,8 +98,8 @@ public slots:
   void deleteItem();
   void getNewMail();
   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();
   void outboxItemSelected();
   void inboxItemPressed();
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
@@ -44,14 +44,14 @@ EmailHandler::EmailHandler()
   smtpClient = new SmtpClient();
   popClient = new PopClient();
   
-  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()) );
   connect(smtpClient, SIGNAL(updateStatus(const QString &)), this,
       SIGNAL(updateSmtpStatus(const QString &)) );
   
-  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)),
       this, SLOT(messageArrived(const QString &, int, uint, bool)) );
   connect(popClient, SIGNAL(updateStatus(const QString &)), this,
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
@@ -127,8 +127,8 @@ public:
   
 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);
   void updatePopStatus(const QString &);
   void updateSmtpStatus(const QString &);
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,4 +1,5 @@
 TEMPLATE  = app
+TARGET = mailit
 CONFIG    = qt warn_on release
 HEADERS   = emailclient.h \
       emailhandler.h \
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
@@ -21,10 +21,10 @@
 #include <qmessagebox.h>
 #include "mailitwindow.h"
 
-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));
   views = new QWidgetStack(this);
   setCentralWidget(views);
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
@@ -74,7 +74,7 @@ void MailList::sizeInsert(int serverId, uint size)
         sortedList.append(newEntry);
 }
 
-void MailList::moveFront(int serverId, uint size)
+void MailList::moveFront(int serverId, uint/* size*/)
 {
         dList *currentPtr;
         uint tempPos;
@@ -100,7 +100,7 @@ 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;
@@ -125,7 +125,7 @@ bool MailList::remove(int serverId, uint size)
         return FALSE;
 }
 
-void MailList::insert(int pos, int serverId, uint size)
+void MailList::insert(int /*pos*/, int /*serverId*/, uint/* size*/)
 {
         //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
@@ -63,7 +63,7 @@ void PopClient::newConnection(const QString &target, int port)
   receiving = TRUE;
   //selected = FALSE;
     
-  emit updateStatus("DNS lookup");
+  emit updateStatus(tr("DNS lookup"));
 }
 
 void PopClient::setAccount(const QString &popUser, const QString &popPasswd)
@@ -103,8 +103,12 @@ void PopClient::connectionEstablished()
 
 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();
   receiving = FALSE;
 }
@@ -167,7 +171,7 @@ void PopClient::incomingData()
           if (response[0] == '+') {
             *stream << "STAT" << "\r\n";
             status = Mcnt;      
-          } else errorHandling(ErrLoginFailed);
+          } else errorHandlingWithMsg(ErrLoginFailed, response);
             break;
           }
     //get count of messages, eg "+OK 4 900.." -> int 4
@@ -195,7 +199,7 @@ void PopClient::incomingData()
                 } else newMessages = 0; 
         }
 
-            } else errorHandling(ErrUnknownResponse);
+            } else errorHandlingWithMsg(ErrUnknownResponse, response);
           }
     //Read message number x, count upwards to messageCount
     case List:  {
@@ -234,7 +238,7 @@ void PopClient::incomingData()
               status = Retr;
             } else {
               //qWarning(response);
-              errorHandling(ErrUnknownResponse);
+              errorHandlingWithMsg(ErrUnknownResponse, response);
             }
           }
         } 
@@ -259,7 +263,7 @@ void PopClient::incomingData()
               if (!socket->canReadLine()) //sync. problems
                 break;
               response = socket->readLine();
-            } else errorHandling(ErrUnknownResponse);
+            } else errorHandlingWithMsg(ErrUnknownResponse, response);
           }
         }
     //add all incoming lines to body.  When size is reached, send
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
@@ -44,7 +44,7 @@ public:
   
 signals:
   void newMessage(const QString &, int, uint, bool);
-  void errorOccurred(int status);
+  void errorOccurred(int status, const QString & Msg );
   void updateStatus(const QString &);
   void mailTransfered(int);
   void mailboxSize(int);
@@ -53,6 +53,7 @@ signals:
     
 public slots:
   void errorHandling(int);
+  void errorHandlingWithMsg(int, const QString & );
 
 protected slots:
   void connectionEstablished();
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
@@ -73,7 +73,12 @@ void SmtpClient::connectionEstablished()
 
 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();
   mailList.clear();
   sending = FALSE;
@@ -87,31 +92,32 @@ void SmtpClient::incomingData()
     return;
   
   response = socket->readLine();
-
   switch(status) {
     case Init:  {
           if (response[0] == '2') {
             status = From;
             mailPtr = mailList.first();
             *stream << "HELO there\r\n";
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
         } 
     case From:  {
           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;
         } 
     case Recv:  {
           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;
         } 
     case MRcv:  {
@@ -123,14 +129,15 @@ void SmtpClient::incomingData()
             } else  {
               status = Data;
             }
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
         } 
     case Data:  {
           if (response[0] == '2') {
             *stream << "DATA\r\n";
             status = Body;
             emit updateStatus(tr("Sending: ") + mailPtr->subject);
-          } else errorHandling(ErrUnknownResponse);
+            
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
         } 
     case Body:  {
@@ -142,7 +149,7 @@ void SmtpClient::incomingData()
             } else {
               status = Quit;
             }
-          } else errorHandling(ErrUnknownResponse);
+          } else errorHandlingWithMsg(ErrUnknownResponse,response);
           break;
         } 
     case Quit:  {
@@ -156,7 +163,7 @@ void SmtpClient::incomingData()
             mailList.clear();
             sending = FALSE;
             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
@@ -47,12 +47,13 @@ public:
   void addMail(const QString &from, const QString &subject, const QStringList &to, const QString &body);
 
 signals:
-  void errorOccurred(int);
+  void errorOccurred(int, const QString & LR );
   void updateStatus(const QString &);
   void mailSent();
   
 public slots:
   void errorHandling(int);
+  void errorHandlingWithMsg(int, const QString & LastResponse );
 
 protected slots:
   void connectionEstablished();
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
@@ -26,7 +26,7 @@
 ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
         : QMainWindow(parent, name, f)
 {
-        setCaption("Exploring attatchments");
+        setCaption(tr("Exploring attatchments"));
 
         setToolBarsMovable( FALSE );
         bar = new QToolBar(this);
@@ -35,9 +35,9 @@ ViewAtt::ViewAtt(QWidget *parent, const char *name, WFlags f)
         installButton->setWhatsThis(tr("Click here to install the attachment to your Documents"));
         
         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);
         QWhatsThis::add(listView,QWidget::tr("This is an overview about all attachments in the mail"));
 }
@@ -61,9 +61,9 @@ void ViewAtt::update(Email *mailIn, bool inbox)
         mail = mailIn;
         for ( ePtr=mail->files.first(); ePtr != 0; ePtr=mail->files.next() ) {
                 
-                QString isInstalled = "No";
+                QString isInstalled = tr("No");
                 if (ePtr->installed)
-                        isInstalled = "Yes";
+                        isInstalled = tr("Yes");
                 item = new QListViewItem(listView, ePtr->originalName, ePtr->contentType, isInstalled);
                 
                 const QString& mtypeDef=(const QString&) ePtr->contentType+"/"+ePtr->contentAttribute;
@@ -116,6 +116,6 @@ void ViewAtt::install()
                 d.setType(selPtr->contentType + "/" + selPtr->contentAttribute);
                 d.writeLink();
                 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
@@ -118,15 +118,15 @@ void WriteMail::init()
         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"));
+  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"));
 
         addressView = new QListView( widget, "addressView");
-        addressView->addColumn("Name");
-        addressView->addColumn("EMail");
+  addressView->addColumn(tr("Name"));
+  addressView->addColumn(tr("EMail") );
         addressView->setAllColumnsShowFocus(TRUE);
         addressView->setMultiSelection(TRUE);
         addressView->hide();
@@ -283,7 +283,7 @@ void WriteMail::reply(Email replyMail, bool replyAll)
         while (pos != -1) {
                 pos = mail.body.find('\n', pos);
                 if (pos != -1)
-                        mail.body.insert(++pos, ">>");
+      mail.body.insert(++pos, ">");
         }
                 mail.body.insert(0,citation);
         emailInput->setText(mail.body);
@@ -291,7 +291,7 @@ void WriteMail::reply(Email replyMail, bool replyAll)
 
 void WriteMail::forward(Email forwMail)
 {
-        int pos=0;
+   // int pos=0;
         
         QString fwdBody=tr("======forwarded message from ");
         fwdBody.append(forwMail.fromMail);