18 files changed, 412 insertions, 148 deletions

diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp
index dff1888..2cedc51 100644
--- a/noncore/net/mailit/emailclient.cpp
+++ b/noncore/net/mailit/emailclient.cpp
@@ -19,6 +19,7 @@
 **********************************************************************/
 #include <qapplication.h>
 #include <qmessagebox.h>
+#include <qvbox.h>
 #include <qfile.h>
 #include <qcheckbox.h>
 #include <qmenubar.h>
@@ -26,6 +27,7 @@
 #include <qwhatsthis.h>
 #include <qpe/resource.h>
 #include "emailclient.h"
+#include "writemail.h"
 
 QCollection::Item AccountList::newItem(QCollection::Item d)
 {
@@ -40,7 +42,7 @@ MailAccount* AccountList::dupl(MailAccount *in)
 
 EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   : QMainWindow( parent, name, fl )
-{
+{ 
   emailHandler = new EmailHandler();
   addressList = new AddressList();
   
@@ -53,6 +55,8 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   
   init();
   
+ 
+  
   connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) );
   
   connect(emailHandler, SIGNAL(smtpError(int)), this,
@@ -65,8 +69,7 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   
   connect(inboxView, SIGNAL(pressed(QListViewItem *)), this, SLOT(inboxItemPressed()) );
   connect(inboxView, SIGNAL(clicked(QListViewItem *)), this, SLOT(inboxItemReleased()) );
-  
-  
+
   connect(emailHandler, SIGNAL(mailArrived(const Email &, bool)), this,
       SLOT(mailArrived(const Email &, bool)) );
   connect(emailHandler, SIGNAL(mailTransfered(int)), this,
@@ -84,6 +87,11 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   lineShift = "\r\n";
   
   mailboxView->setCurrentTab(0);  //ensure that inbox has focus
+  
+  /*channel = new QCopChannel( "QPE/Application/mailit", this );
+  connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
+        this, SLOT(receive(const QCString&, const QByteArray&)) );*/
+
 }
 
 
@@ -104,29 +112,8 @@ EmailClient::~EmailClient()
 
 void EmailClient::init()
 {
-  statusBar = new QStatusBar(this);
-  statusBar->setSizeGripEnabled(FALSE);
-  
-  status1Label = new QLabel( tr("Idle"), statusBar);
-  status2Label = new QLabel("", statusBar);
-  connect(emailHandler, SIGNAL(updatePopStatus(const QString &)),
-    status2Label, SLOT(setText(const QString &)) );
-  connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)),
-    status2Label, SLOT(setText(const QString &)) );
-  
-  progressBar = new QProgressBar(statusBar);
-
-  connect(emailHandler, SIGNAL(mailboxSize(int)),
-    this, SLOT(setTotalSize(int)) );
-  connect(emailHandler, SIGNAL(currentMailSize(int)),
-    this, SLOT(setMailSize(int)) );
-  connect(emailHandler, SIGNAL(downloadedSize(int)),
-    this, SLOT(setDownloadedSize(int)) );
-
-  statusBar->addWidget(status1Label);
-  statusBar->addWidget(progressBar);
-  statusBar->addWidget(status2Label);
-  
+  initStatusBar(this);
+   
   setToolBarsMovable(FALSE);
   
   bar = new QToolBar(this);
@@ -194,8 +181,11 @@ void EmailClient::init()
   inboxView->addColumn( tr( "Date" ) );
   inboxView->setMinimumSize( QSize( 0, 0 ) );
   inboxView->setAllColumnsShowFocus(TRUE);
-  QWhatsThis::add(inboxView,QWidget::tr("This is the inbox view.\n It keeps the fetched mail which can be viewed by double clicking the entry.\n"
-          "                             A blue attachment icon shows whether this mail has attachments."));
+  QWhatsThis::add(inboxView,QWidget::tr("This is the inbox view.\n"
+  "It keeps the fetched mail which can be \n"
+  "viewed by double clicking the entry.\n"
+  "blue attachment icon shows whether this \n"
+  "mailhas attachments.\n"));
 
   grid_2->addWidget( inboxView, 2, 0 );
   mailboxView->addTab( widget, "mailit/inbox", tr( "Inbox" ) );
@@ -210,7 +200,9 @@ void EmailClient::init()
   outboxView->addColumn( tr( "Subject" ) );
   outboxView->setAllColumnsShowFocus(TRUE);
 
-  QWhatsThis::add(outboxView,QWidget::tr("This is the oubox view.\n It keeps the queued mails to send which can be reviewed by double clicking the entry."));
+  QWhatsThis::add(outboxView,QWidget::tr("This is the outbox view.\n"
+  "It keeps the queued mails to send which can be \n"
+  "reviewed by double clicking the entry."));
   grid_3->addWidget( outboxView, 0, 0 );
   mailboxView->addTab( widget_2,"mailit/outbox", tr( "Outbox" ) );
   
@@ -218,6 +210,33 @@ void EmailClient::init()
   
 }
 
+void EmailClient::initStatusBar(QWidget* parent)
+{
+  statusBar = new QStatusBar(parent);
+  statusBar->setSizeGripEnabled(FALSE);
+  
+  status1Label = new QLabel( tr("Idle"), statusBar);
+  status2Label = new QLabel("", statusBar);
+  connect(emailHandler, SIGNAL(updatePopStatus(const QString &)),
+    status2Label, SLOT(setText(const QString &)) );
+  connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)),
+    status2Label, SLOT(setText(const QString &)) );
+  
+  progressBar = new QProgressBar(statusBar);
+
+  connect(emailHandler, SIGNAL(mailboxSize(int)),
+    this, SLOT(setTotalSize(int)) );
+  connect(emailHandler, SIGNAL(currentMailSize(int)),
+    this, SLOT(setMailSize(int)) );
+  connect(emailHandler, SIGNAL(downloadedSize(int)),
+    this, SLOT(setDownloadedSize(int)) );
+
+  statusBar->addWidget(status1Label);
+  statusBar->addWidget(progressBar);
+  statusBar->addWidget(status2Label);
+
+}
+
 void EmailClient::compose()
 {
   emit composeRequested();
@@ -319,7 +338,7 @@ void EmailClient::getNewMail() {
   progressBar->reset();
     
   //get any previous mails not downloaded and add to queue
-  mailDownloadList.clear();
+  /*mailDownloadList.clear();
   Email *mailPtr;
   item = (EmailListItem *) inboxView->firstChild();
   while (item != NULL) {
@@ -328,7 +347,7 @@ void EmailClient::getNewMail() {
       mailDownloadList.sizeInsert(mailPtr->serverId, mailPtr->size);
     }
     item = (EmailListItem *) item->nextSibling();
-  }
+  }*/
   
   emailHandler->getMailHeaders();
   
@@ -338,7 +357,7 @@ void EmailClient::getAllNewMail()
 {
   allAccounts = TRUE;
   currentAccount = accountList.first();
-  getNewMail();
+  getNewMail();  
 }
 
 void EmailClient::mailArrived(const Email &mail, bool fromDisk)
@@ -348,9 +367,10 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
   int thisMailId;
   emailHandler->parse(mail.rawMail, lineShift, &newMail);
   mailconf->setGroup(newMail.id);
-    
+  
   if (fromDisk) 
   {
+    
     newMail.downloaded = mailconf->readBoolEntry("downloaded");
     newMail.size = mailconf->readNumEntry("size");
     newMail.serverId = mailconf->readNumEntry("serverid");
@@ -358,6 +378,7 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
   } 
   else 
   {  //mail arrived from server
+  
     newMail.serverId = mail.serverId;
     newMail.size = mail.size;
     newMail.downloaded = mail.downloaded;
@@ -918,7 +939,7 @@ void EmailClient::inboxItemReleased()
           //killTimer(timerID);
 }
 
-void EmailClient::timerEvent(QTimerEvent *e)
+/*void EmailClient::timerEvent(QTimerEvent *e)
 {
   /*killTimer(timerID);
   
@@ -935,8 +956,8 @@ void EmailClient::timerEvent(QTimerEvent *e)
   action->exec(QCursor::pos());
   
   if (action) delete action;
-  */  
-}
+   
+}*/
 
 Email* EmailClient::getCurrentMail()
 {
@@ -953,8 +974,6 @@ void EmailClient::download(Email* mail)
         
         tempMailDownloadList.clear();
         tempMailDownloadList.sizeInsert(mail->serverId, mail->size);
-        if (accountList.count()>0)
-                qDebug("Accounts present");
         
         acc=accountList.at(mail->fromAccountId-1);
         if (acc)
@@ -966,3 +985,48 @@ void EmailClient::download(Email* mail)
                 QMessageBox::warning(qApp->activeWindow(),
                 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)
+{
+        /*if (msg=="getMail()")
+        {
+                /*QDialog qd(qApp->activeWindow(),"Getting mail",true);
+                QVBoxLayout *vbProg = new QVBoxLayout( &qd );
+        
+                initStatusBar(&qd);
+                
+                if (statusBar==0)
+                {
+                        qDebug("No Bar ...");
+                        //statusBar=new ProgressBar(&qd);
+                }
+                statusBar->show();
+                vbProg->addWidget(statusBar);
+                qd.showMaximized();
+                qd.show();
+                emit getAllNewMail();
+                //qd.exec();
+        }
+        else if (msg=="compose()")
+                {
+                QDialog qd(qApp->activeWindow(),"Getting mail",true);
+                
+                WriteMail wm(&qd,"write new mail");
+                QVBoxLayout vbProg( &qd );
+                
+                wm.showMaximized();
+                vbProg.addWidget(&wm);
+                
+                qd.showMaximized();
+                
+                emit composeRequested();
+                qd.exec();
+                
+                QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n");
+        }
+                
+        else if (msg=="dialog()")
+        {
+            QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n");
+        }*/
+}
diff --git a/noncore/net/mailit/emailclient.h b/noncore/net/mailit/emailclient.h
index 549683b..994fec5 100644
--- a/noncore/net/mailit/emailclient.h
+++ b/noncore/net/mailit/emailclient.h
@@ -41,6 +41,7 @@
 #include <qdir.h>
 #include <stdlib.h>
 #include <opie/otabwidget.h>
+#include <qpe/qcopenvelope_qws.h>
 #include <qtimer.h>
 
 #include "emailhandler.h"
@@ -70,10 +71,9 @@ public:
   EmailClient( QWidget* parent, const char* name, WFlags fl = 0 );
   ~EmailClient();
   AddressList* getAdrListRef();
-  void download(Email*);
 
 protected:
-  void timerEvent(QTimerEvent*);
+  //void timerEvent(QTimerEvent*);
   
 signals:
   void composeRequested();
@@ -116,13 +116,18 @@ public slots:
   void setMailSize(int);
   void setDownloadedSize(int);
   void moveMailFront(Email *mailPtr);
+  void download(Email*);
 /*  void reply();
   void replyAll();
   void forward();
   void remove();*/
 
+private slots:
+  void receive(const QCString&, const QByteArray&);
+  
 private:
   void init();
+  void initStatusBar(QWidget*);
   void readMail();
   QString getPath(bool enclosurePath);
   void readSettings();
@@ -146,6 +151,8 @@ private:
   QString lineShift;
   MailAccount account, *currentAccount;
   
+  QCopChannel* channel;
+  
   QToolBar *bar;
   QProgressBar *progressBar;
   QStatusBar *statusBar;
diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp
index fbbada7..c7b27a0 100644
--- a/noncore/net/mailit/emailhandler.cpp
+++ b/noncore/net/mailit/emailhandler.cpp
@@ -39,6 +39,8 @@ Enclosure* EnclosureList::dupl(Enclosure *in)
 
 EmailHandler::EmailHandler()
 {
+        qDebug("EMailHandler::EmailHandler");
+
   smtpClient = new SmtpClient();
   popClient = new PopClient();
   
@@ -115,6 +117,7 @@ void EmailHandler::getMailHeaders()
   
   headers = TRUE;
   popClient->headersOnly(headers, mailAccount.syncLimit);  //less than requested syncLimit, download all
+  qDebug("Initiating connection");
   popClient->newConnection(mailAccount.popServer, 110);
 }
 
@@ -626,3 +629,4 @@ void EmailHandler::cancel()
   popClient->errorHandling(ErrCancel);
   smtpClient->errorHandling(ErrCancel);
 }
+
diff --git a/noncore/net/mailit/emailhandler.h b/noncore/net/mailit/emailhandler.h
index b645868..5b59f65 100644
--- a/noncore/net/mailit/emailhandler.h
+++ b/noncore/net/mailit/emailhandler.h
@@ -28,6 +28,7 @@
 #include <qfile.h>
 #include <qstringlist.h>
 #include <qcollection.h>
+#include <qpe/qcopenvelope_qws.h>
 
 #include "smtpclient.h"
 #include "popclient.h"
diff --git a/noncore/net/mailit/mailitwindow.cpp b/noncore/net/mailit/mailitwindow.cpp
index ffee67e..a111241 100644
--- a/noncore/net/mailit/mailitwindow.cpp
+++ b/noncore/net/mailit/mailitwindow.cpp
@@ -61,6 +61,9 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
   
   connect(emailClient, SIGNAL(newCaption(const QString &)),
     this, SLOT(updateCaption(const QString &)) );
+    
+  connect(readMail, SIGNAL(download(Email *)), emailClient, SLOT(download(Email*)) );
+  
   viewingMail = FALSE;  
 }
 
diff --git a/noncore/net/mailit/popclient.cpp b/noncore/net/mailit/popclient.cpp
index 6105d09..fedc4e2 100644
--- a/noncore/net/mailit/popclient.cpp
+++ b/noncore/net/mailit/popclient.cpp
@@ -29,6 +29,7 @@ extern "C" {
 
 PopClient::PopClient()
 {
+  
   socket = new QSocket(this, "popClient");
   connect(socket, SIGNAL(error(int)), this, SLOT(errorHandling(int)));
   connect(socket, SIGNAL(connected()), this, SLOT(connectionEstablished()));
@@ -117,6 +118,7 @@ void PopClient::incomingData()
   char md5Digest[16];
 //  if ( !socket->canReadLine() )
 //    return;
+
   
   response = socket->readLine();
   
@@ -151,19 +153,20 @@ void PopClient::incomingData()
           status = Pass;
        }
           
-          break;
+        break;
         }
     
     case Pass:  {
           *stream << "PASS " << popPassword << "\r\n";
-          status = Stat;
+          status = Stat;
+          
           break;
         }
     //ask for number of messages
     case Stat:  {
           if (response[0] == '+') {
             *stream << "STAT" << "\r\n";
-            status = Mcnt;
+                    status = Mcnt;    
           } else errorHandling(ErrLoginFailed);
             break;
           }
@@ -179,8 +182,8 @@ void PopClient::incomingData()
               
             if (synchronize) {
               //messages deleted from server, reload all
-              if (newMessages < lastSync)
-                lastSync = 0;
+                      if (newMessages < lastSync)
+                        lastSync = 0;
                 messageCount = 1;
               }
               
@@ -273,7 +276,6 @@ void PopClient::incomingData()
             if (x == -1) {
               break;
             } else {  //message reach entire size
-              
               if ( (selected)||(mailSize <= headerLimit)) //mail size limit is not used if late download is active
               {
                     emit newMessage(message, messageCount-1, mailSize, TRUE);
diff --git a/noncore/net/mailit/readmail.cpp b/noncore/net/mailit/readmail.cpp
index 4eae7f6..1682675 100644
--- a/noncore/net/mailit/readmail.cpp
+++ b/noncore/net/mailit/readmail.cpp
@@ -19,8 +19,10 @@
 **********************************************************************/
 #include "readmail.h"
 #include <qimage.h>
+#include <qwhatsthis.h>
 #include <qmime.h>
 #include <qaction.h>
+#include <qpopupmenu.h>
 #include <qpe/resource.h>
 
 ReadMail::ReadMail( QWidget* parent,  const char* name, WFlags fl )
@@ -42,6 +44,8 @@ void ReadMail::init()
 {
         setToolBarsMovable(FALSE);
         
+        QPopupMenu* mailaction=new QPopupMenu(this);
+        
         bar = new QToolBar(this);
         bar->setHorizontalStretchable( TRUE );
 
@@ -55,17 +59,11 @@ void ReadMail::init()
 
         bar = new QToolBar(this);
         
-            //reply dependant on viewing inbox
-        replyButton = new QAction( tr( "Reply" ), Resource::loadPixmap( "mailit/reply" ),
-                QString::null, 0, this, 0 );
-        connect(replyButton, SIGNAL(activated()), this, SLOT(reply()) );
-          replyButton->setWhatsThis(tr("Click here to reply to the selected mail"));
-                
-        forwardButton = new QAction( tr( "Forward" ), Resource::loadPixmap( "mailit/forward" ),
-        QString::null, 0, this, 0 );
-        connect(forwardButton, SIGNAL(activated()), this, SLOT(forward()) );
-        forwardButton->setWhatsThis(tr("Click here to forward the selected mail"));
+        downloadButton = new QAction( tr( "Download" ), Resource::loadPixmap( "mailit/download" ),QString::null, 0, this, 0 );
+        connect(downloadButton, SIGNAL(activated()), this, SLOT(download()) );
+          downloadButton->setWhatsThis(tr("Click here to download the selected mail"));
         
+                
         previousButton = new QAction( tr( "Previous" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
         connect( previousButton, SIGNAL( activated() ), this, SLOT( previous() ) );
         previousButton->addTo(bar);
@@ -94,6 +92,23 @@ void ReadMail::init()
         "<LI><B>Plain</B> shows the mail as standard plain text</LI>"
         "Click here to switch between those view modes" ));
 
+            //reply dependant on viewing inbox
+        replyButton = new QToolButton(Resource::loadPixmap("mailit/reply"),tr("reply"),tr("reply to mail"), this,SLOT(reply()),bar);
+        QWhatsThis::add(replyButton,tr("Click here to reply to the selected mail\nPress and hold for more options."));
+        replyButton->setPopup(mailaction);
+                
+        replyAllButton = new QAction( tr( "Reply all" ), Resource::loadPixmap( "mailit/reply" ),QString::null, 0, this, 0 );
+        connect(replyAllButton, SIGNAL(activated()), this, SLOT(replyAll()));
+        replyAllButton->setWhatsThis(tr("Click here to reply to the selected mail to CC: addresses also"));
+                replyAllButton->addTo(mailaction);
+        
+        forwardButton = new QAction( tr( "Forward" ), Resource::loadPixmap( "mailit/forward" ),
+        QString::null, 0, this, 0 );
+        connect(forwardButton, SIGNAL(activated()), this, SLOT(forward()));
+        forwardButton->setWhatsThis(tr("Click here to forward the selected mail"));
+        forwardButton->addTo(mailaction);
+        
+        
         deleteButton = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 0, this, 0 );
         connect( deleteButton, SIGNAL( activated() ), this, SLOT( deleteItem() ) );
         deleteButton->addTo(bar);
@@ -119,19 +134,26 @@ void ReadMail::updateView()
                 mail->read = TRUE;              //mark as read
         inbox = mail->received;
         
-        replyButton->removeFrom(mailMenu);
-        replyButton->removeFrom(bar);
+        replyButton->setEnabled(false);
+        /*replyButton->removeFrom(bar);
         forwardButton->removeFrom(mailMenu);
-        forwardButton->removeFrom(bar);
+        forwardButton->removeFrom(bar);*/
+        downloadButton->removeFrom(bar);
+        
+        //downloadButton->setEnabled(!mail->downloaded);
         
+                
         if (inbox == TRUE) {
-                replyButton->addTo(bar);
-                replyButton->addTo(mailMenu);
+                replyButton->setEnabled(true);
+                /*replyButton->addTo(mailMenu);
                 forwardButton->addTo(bar);
-                forwardButton->addTo(mailMenu);
+                forwardButton->addTo(mailMenu);*/
 
                                 
                 if (!mail->downloaded) {
+                        
+                        downloadButton->addTo(bar);
+                        
                         //report currently viewed mail so that it will be
                         //placed first in the queue of new mails to download
                         emit viewingMail(mail);
@@ -357,6 +379,11 @@ void ReadMail::viewAttachments()
 
 void ReadMail::reply()
 {
+        emit replyRequested(*mail, (bool&)FALSE);
+}
+
+void ReadMail::replyAll()
+{
         emit replyRequested(*mail, (bool&)TRUE);
 }
 
@@ -365,3 +392,8 @@ void ReadMail::forward()
         emit forwardRequested(*mail);
 }
 
+void ReadMail::download()
+{
+        emit download(mail);
+}
+
diff --git a/noncore/net/mailit/readmail.h b/noncore/net/mailit/readmail.h
index df32c34..6700595 100644
--- a/noncore/net/mailit/readmail.h
+++ b/noncore/net/mailit/readmail.h
@@ -28,6 +28,7 @@
 #include <qlistview.h>
 #include <qlayout.h>
 #include <qtextview.h>
+#include <qtoolbutton.h>
 
 #include "emailhandler.h"
 #include "emaillistitem.h"
@@ -50,6 +51,7 @@ signals:
         void forwardRequested(Email&);
         void removeItem(EmailListItem *, bool &);
         void viewingMail(Email *);
+        void download (Email*);
 
 public slots:
         void close();
@@ -59,7 +61,9 @@ public slots:
         void shiftText();
         void viewAttachments();
         void reply();
+        void replyAll();
         void forward();
+        void download();
         
 private:
         void init();
@@ -82,8 +86,10 @@ private:
         QTextView *emailView;
         QAction *attachmentButton;
         QAction *previousButton;
-        QAction *replyButton;
+        QToolButton *replyButton;
         QAction *forwardButton;
+        QAction *replyAllButton;
+        QAction *downloadButton;
 };
 
 #endif // READMAIL_H
diff --git a/noncore/net/mailit/writemail.cpp b/noncore/net/mailit/writemail.cpp
index dcf0c6e..c75494e 100644
--- a/noncore/net/mailit/writemail.cpp
+++ b/noncore/net/mailit/writemail.cpp
@@ -22,8 +22,7 @@
 #include "writemail.h"
 #include <qpe/resource.h>
 
-WriteMail::WriteMail( QWidget* parent,  const char* name, WFlags fl )
-        : QMainWindow( parent, name, fl )
+WriteMail::WriteMail( QWidget* parent,  const char* name, WFlags fl ):QMainWindow( parent, name, fl )
 {
         showingAddressList = FALSE;
         init();
@@ -259,7 +258,7 @@ void WriteMail::reply(Email replyMail, bool replyAll)
         toInput->setText(mail.fromMail);
         
         if (replyAll)
-        {
+                {
                 for (QStringList::Iterator it = mail.carbonCopies.begin();it != mail.carbonCopies.end(); ++it) 
                 {
                         ccRecipients.append(*it);
@@ -268,11 +267,17 @@ void WriteMail::reply(Email replyMail, bool replyAll)
                         ccRecipients.truncate(ccRecipients.length()-1);         //no ; at the end
                 ccInput->setText(ccRecipients);
         }
-                
-        addRecipients(replyAll);
+        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) {
@@ -280,7 +285,7 @@ void WriteMail::reply(Email replyMail, bool replyAll)
                 if (pos != -1)
                         mail.body.insert(++pos, ">>");
         }
-        
+                mail.body.insert(0,citation);
         emailInput->setText(mail.body);
 }
 
@@ -308,9 +313,16 @@ bool WriteMail::getRecipients(bool ccField)
         QString str, temp;
         int pos = 0;
         
-        mail.recipients.clear();
-        
-        ccField ? temp = ccInput->text() : temp=toInput->text() ;
+        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();
@@ -318,13 +330,13 @@ bool WriteMail::getRecipients(bool ccField)
                 if ( str.find('@') == -1)
                         return false;
                 ccField ? mail.carbonCopies.append(str) : mail.recipients.append(str);
-                addressList->addContact(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, "");
+        //addressList->addContact(temp, "");
         
         return TRUE;
 }
@@ -383,6 +395,7 @@ void WriteMail::setRecipient(const QString &recipient)
 void WriteMail::newMail()
 {
         toInput->clear();
+        ccInput->clear();
         subjectInput->clear();
         emailInput->clear();
         setAddressList(addressList);
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index dff1888..2cedc51 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -19,6 +19,7 @@
 **********************************************************************/
 #include <qapplication.h>
 #include <qmessagebox.h>
+#include <qvbox.h>
 #include <qfile.h>
 #include <qcheckbox.h>
 #include <qmenubar.h>
@@ -26,6 +27,7 @@
 #include <qwhatsthis.h>
 #include <qpe/resource.h>
 #include "emailclient.h"
+#include "writemail.h"
 
 QCollection::Item AccountList::newItem(QCollection::Item d)
 {
@@ -40,7 +42,7 @@ MailAccount* AccountList::dupl(MailAccount *in)
 
 EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   : QMainWindow( parent, name, fl )
-{
+{ 
   emailHandler = new EmailHandler();
   addressList = new AddressList();
   
@@ -53,6 +55,8 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   
   init();
   
+ 
+  
   connect(emailHandler, SIGNAL(mailSent()), this, SLOT(mailSent()) );
   
   connect(emailHandler, SIGNAL(smtpError(int)), this,
@@ -65,8 +69,7 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   
   connect(inboxView, SIGNAL(pressed(QListViewItem *)), this, SLOT(inboxItemPressed()) );
   connect(inboxView, SIGNAL(clicked(QListViewItem *)), this, SLOT(inboxItemReleased()) );
-  
-  
+
   connect(emailHandler, SIGNAL(mailArrived(const Email &, bool)), this,
       SLOT(mailArrived(const Email &, bool)) );
   connect(emailHandler, SIGNAL(mailTransfered(int)), this,
@@ -84,6 +87,11 @@ EmailClient::EmailClient( QWidget* parent,  const char* name, WFlags fl )
   lineShift = "\r\n";
   
   mailboxView->setCurrentTab(0);  //ensure that inbox has focus
+  
+  /*channel = new QCopChannel( "QPE/Application/mailit", this );
+  connect( channel, SIGNAL(received(const QCString&, const QByteArray&)),
+        this, SLOT(receive(const QCString&, const QByteArray&)) );*/
+
 }
 
 
@@ -104,29 +112,8 @@ EmailClient::~EmailClient()
 
 void EmailClient::init()
 {
-  statusBar = new QStatusBar(this);
-  statusBar->setSizeGripEnabled(FALSE);
-  
-  status1Label = new QLabel( tr("Idle"), statusBar);
-  status2Label = new QLabel("", statusBar);
-  connect(emailHandler, SIGNAL(updatePopStatus(const QString &)),
-    status2Label, SLOT(setText(const QString &)) );
-  connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)),
-    status2Label, SLOT(setText(const QString &)) );
-  
-  progressBar = new QProgressBar(statusBar);
-
-  connect(emailHandler, SIGNAL(mailboxSize(int)),
-    this, SLOT(setTotalSize(int)) );
-  connect(emailHandler, SIGNAL(currentMailSize(int)),
-    this, SLOT(setMailSize(int)) );
-  connect(emailHandler, SIGNAL(downloadedSize(int)),
-    this, SLOT(setDownloadedSize(int)) );
-
-  statusBar->addWidget(status1Label);
-  statusBar->addWidget(progressBar);
-  statusBar->addWidget(status2Label);
-  
+  initStatusBar(this);
+   
   setToolBarsMovable(FALSE);
   
   bar = new QToolBar(this);
@@ -194,8 +181,11 @@ void EmailClient::init()
   inboxView->addColumn( tr( "Date" ) );
   inboxView->setMinimumSize( QSize( 0, 0 ) );
   inboxView->setAllColumnsShowFocus(TRUE);
-  QWhatsThis::add(inboxView,QWidget::tr("This is the inbox view.\n It keeps the fetched mail which can be viewed by double clicking the entry.\n"
-          "                             A blue attachment icon shows whether this mail has attachments."));
+  QWhatsThis::add(inboxView,QWidget::tr("This is the inbox view.\n"
+  "It keeps the fetched mail which can be \n"
+  "viewed by double clicking the entry.\n"
+  "blue attachment icon shows whether this \n"
+  "mailhas attachments.\n"));
 
   grid_2->addWidget( inboxView, 2, 0 );
   mailboxView->addTab( widget, "mailit/inbox", tr( "Inbox" ) );
@@ -210,7 +200,9 @@ void EmailClient::init()
   outboxView->addColumn( tr( "Subject" ) );
   outboxView->setAllColumnsShowFocus(TRUE);
 
-  QWhatsThis::add(outboxView,QWidget::tr("This is the oubox view.\n It keeps the queued mails to send which can be reviewed by double clicking the entry."));
+  QWhatsThis::add(outboxView,QWidget::tr("This is the outbox view.\n"
+  "It keeps the queued mails to send which can be \n"
+  "reviewed by double clicking the entry."));
   grid_3->addWidget( outboxView, 0, 0 );
   mailboxView->addTab( widget_2,"mailit/outbox", tr( "Outbox" ) );
   
@@ -218,6 +210,33 @@ void EmailClient::init()
   
 }
 
+void EmailClient::initStatusBar(QWidget* parent)
+{
+  statusBar = new QStatusBar(parent);
+  statusBar->setSizeGripEnabled(FALSE);
+  
+  status1Label = new QLabel( tr("Idle"), statusBar);
+  status2Label = new QLabel("", statusBar);
+  connect(emailHandler, SIGNAL(updatePopStatus(const QString &)),
+    status2Label, SLOT(setText(const QString &)) );
+  connect(emailHandler, SIGNAL(updateSmtpStatus(const QString &)),
+    status2Label, SLOT(setText(const QString &)) );
+  
+  progressBar = new QProgressBar(statusBar);
+
+  connect(emailHandler, SIGNAL(mailboxSize(int)),
+    this, SLOT(setTotalSize(int)) );
+  connect(emailHandler, SIGNAL(currentMailSize(int)),
+    this, SLOT(setMailSize(int)) );
+  connect(emailHandler, SIGNAL(downloadedSize(int)),
+    this, SLOT(setDownloadedSize(int)) );
+
+  statusBar->addWidget(status1Label);
+  statusBar->addWidget(progressBar);
+  statusBar->addWidget(status2Label);
+
+}
+
 void EmailClient::compose()
 {
   emit composeRequested();
@@ -319,7 +338,7 @@ void EmailClient::getNewMail() {
   progressBar->reset();
     
   //get any previous mails not downloaded and add to queue
-  mailDownloadList.clear();
+  /*mailDownloadList.clear();
   Email *mailPtr;
   item = (EmailListItem *) inboxView->firstChild();
   while (item != NULL) {
@@ -328,7 +347,7 @@ void EmailClient::getNewMail() {
       mailDownloadList.sizeInsert(mailPtr->serverId, mailPtr->size);
     }
     item = (EmailListItem *) item->nextSibling();
-  }
+  }*/
   
   emailHandler->getMailHeaders();
   
@@ -338,7 +357,7 @@ void EmailClient::getAllNewMail()
 {
   allAccounts = TRUE;
   currentAccount = accountList.first();
-  getNewMail();
+  getNewMail();  
 }
 
 void EmailClient::mailArrived(const Email &mail, bool fromDisk)
@@ -348,9 +367,10 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
   int thisMailId;
   emailHandler->parse(mail.rawMail, lineShift, &newMail);
   mailconf->setGroup(newMail.id);
-    
+  
   if (fromDisk) 
   {
+    
     newMail.downloaded = mailconf->readBoolEntry("downloaded");
     newMail.size = mailconf->readNumEntry("size");
     newMail.serverId = mailconf->readNumEntry("serverid");
@@ -358,6 +378,7 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
   } 
   else 
   {  //mail arrived from server
+  
     newMail.serverId = mail.serverId;
     newMail.size = mail.size;
     newMail.downloaded = mail.downloaded;
@@ -918,7 +939,7 @@ void EmailClient::inboxItemReleased()
           //killTimer(timerID);
 }
 
-void EmailClient::timerEvent(QTimerEvent *e)
+/*void EmailClient::timerEvent(QTimerEvent *e)
 {
   /*killTimer(timerID);
   
@@ -935,8 +956,8 @@ void EmailClient::timerEvent(QTimerEvent *e)
   action->exec(QCursor::pos());
   
   if (action) delete action;
-  */  
-}
+   
+}*/
 
 Email* EmailClient::getCurrentMail()
 {
@@ -953,8 +974,6 @@ void EmailClient::download(Email* mail)
         
         tempMailDownloadList.clear();
         tempMailDownloadList.sizeInsert(mail->serverId, mail->size);
-        if (accountList.count()>0)
-                qDebug("Accounts present");
         
         acc=accountList.at(mail->fromAccountId-1);
         if (acc)
@@ -966,3 +985,48 @@ void EmailClient::download(Email* mail)
                 QMessageBox::warning(qApp->activeWindow(),
                 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)
+{
+        /*if (msg=="getMail()")
+        {
+                /*QDialog qd(qApp->activeWindow(),"Getting mail",true);
+                QVBoxLayout *vbProg = new QVBoxLayout( &qd );
+        
+                initStatusBar(&qd);
+                
+                if (statusBar==0)
+                {
+                        qDebug("No Bar ...");
+                        //statusBar=new ProgressBar(&qd);
+                }
+                statusBar->show();
+                vbProg->addWidget(statusBar);
+                qd.showMaximized();
+                qd.show();
+                emit getAllNewMail();
+                //qd.exec();
+        }
+        else if (msg=="compose()")
+                {
+                QDialog qd(qApp->activeWindow(),"Getting mail",true);
+                
+                WriteMail wm(&qd,"write new mail");
+                QVBoxLayout vbProg( &qd );
+                
+                wm.showMaximized();
+                vbProg.addWidget(&wm);
+                
+                qd.showMaximized();
+                
+                emit composeRequested();
+                qd.exec();
+                
+                QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n");
+        }
+                
+        else if (msg=="dialog()")
+        {
+            QMessageBox::warning(qApp->activeWindow(),tr("Info"), tr("Info"), "OK\n");
+        }*/
+}
diff --git a/noncore/unsupported/mailit/emailclient.h b/noncore/unsupported/mailit/emailclient.h
index 549683b..994fec5 100644
--- a/noncore/unsupported/mailit/emailclient.h
+++ b/noncore/unsupported/mailit/emailclient.h
@@ -41,6 +41,7 @@
 #include <qdir.h>
 #include <stdlib.h>
 #include <opie/otabwidget.h>
+#include <qpe/qcopenvelope_qws.h>
 #include <qtimer.h>
 
 #include "emailhandler.h"
@@ -70,10 +71,9 @@ public:
   EmailClient( QWidget* parent, const char* name, WFlags fl = 0 );
   ~EmailClient();
   AddressList* getAdrListRef();
-  void download(Email*);
 
 protected:
-  void timerEvent(QTimerEvent*);
+  //void timerEvent(QTimerEvent*);
   
 signals:
   void composeRequested();
@@ -116,13 +116,18 @@ public slots:
   void setMailSize(int);
   void setDownloadedSize(int);
   void moveMailFront(Email *mailPtr);
+  void download(Email*);
 /*  void reply();
   void replyAll();
   void forward();
   void remove();*/
 
+private slots:
+  void receive(const QCString&, const QByteArray&);
+  
 private:
   void init();
+  void initStatusBar(QWidget*);
   void readMail();
   QString getPath(bool enclosurePath);
   void readSettings();
@@ -146,6 +151,8 @@ private:
   QString lineShift;
   MailAccount account, *currentAccount;
   
+  QCopChannel* channel;
+  
   QToolBar *bar;
   QProgressBar *progressBar;
   QStatusBar *statusBar;
diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp
index fbbada7..c7b27a0 100644
--- a/noncore/unsupported/mailit/emailhandler.cpp
+++ b/noncore/unsupported/mailit/emailhandler.cpp
@@ -39,6 +39,8 @@ Enclosure* EnclosureList::dupl(Enclosure *in)
 
 EmailHandler::EmailHandler()
 {
+        qDebug("EMailHandler::EmailHandler");
+
   smtpClient = new SmtpClient();
   popClient = new PopClient();
   
@@ -115,6 +117,7 @@ void EmailHandler::getMailHeaders()
   
   headers = TRUE;
   popClient->headersOnly(headers, mailAccount.syncLimit);  //less than requested syncLimit, download all
+  qDebug("Initiating connection");
   popClient->newConnection(mailAccount.popServer, 110);
 }
 
@@ -626,3 +629,4 @@ void EmailHandler::cancel()
   popClient->errorHandling(ErrCancel);
   smtpClient->errorHandling(ErrCancel);
 }
+
diff --git a/noncore/unsupported/mailit/emailhandler.h b/noncore/unsupported/mailit/emailhandler.h
index b645868..5b59f65 100644
--- a/noncore/unsupported/mailit/emailhandler.h
+++ b/noncore/unsupported/mailit/emailhandler.h
@@ -28,6 +28,7 @@
 #include <qfile.h>
 #include <qstringlist.h>
 #include <qcollection.h>
+#include <qpe/qcopenvelope_qws.h>
 
 #include "smtpclient.h"
 #include "popclient.h"
diff --git a/noncore/unsupported/mailit/mailitwindow.cpp b/noncore/unsupported/mailit/mailitwindow.cpp
index ffee67e..a111241 100644
--- a/noncore/unsupported/mailit/mailitwindow.cpp
+++ b/noncore/unsupported/mailit/mailitwindow.cpp
@@ -61,6 +61,9 @@ MailItWindow::MailItWindow(QWidget *parent, const char *name, WFlags fl)
   
   connect(emailClient, SIGNAL(newCaption(const QString &)),
     this, SLOT(updateCaption(const QString &)) );
+    
+  connect(readMail, SIGNAL(download(Email *)), emailClient, SLOT(download(Email*)) );
+  
   viewingMail = FALSE;  
 }
 
diff --git a/noncore/unsupported/mailit/popclient.cpp b/noncore/unsupported/mailit/popclient.cpp
index 6105d09..fedc4e2 100644
--- a/noncore/unsupported/mailit/popclient.cpp
+++ b/noncore/unsupported/mailit/popclient.cpp
@@ -29,6 +29,7 @@ extern "C" {
 
 PopClient::PopClient()
 {
+  
   socket = new QSocket(this, "popClient");
   connect(socket, SIGNAL(error(int)), this, SLOT(errorHandling(int)));
   connect(socket, SIGNAL(connected()), this, SLOT(connectionEstablished()));
@@ -117,6 +118,7 @@ void PopClient::incomingData()
   char md5Digest[16];
 //  if ( !socket->canReadLine() )
 //    return;
+
   
   response = socket->readLine();
   
@@ -151,19 +153,20 @@ void PopClient::incomingData()
           status = Pass;
        }
           
-          break;
+        break;
         }
     
     case Pass:  {
           *stream << "PASS " << popPassword << "\r\n";
-          status = Stat;
+          status = Stat;
+          
           break;
         }
     //ask for number of messages
     case Stat:  {
           if (response[0] == '+') {
             *stream << "STAT" << "\r\n";
-            status = Mcnt;
+                    status = Mcnt;    
           } else errorHandling(ErrLoginFailed);
             break;
           }
@@ -179,8 +182,8 @@ void PopClient::incomingData()
               
             if (synchronize) {
               //messages deleted from server, reload all
-              if (newMessages < lastSync)
-                lastSync = 0;
+                      if (newMessages < lastSync)
+                        lastSync = 0;
                 messageCount = 1;
               }
               
@@ -273,7 +276,6 @@ void PopClient::incomingData()
             if (x == -1) {
               break;
             } else {  //message reach entire size
-              
               if ( (selected)||(mailSize <= headerLimit)) //mail size limit is not used if late download is active
               {
                     emit newMessage(message, messageCount-1, mailSize, TRUE);
diff --git a/noncore/unsupported/mailit/readmail.cpp b/noncore/unsupported/mailit/readmail.cpp
index 4eae7f6..1682675 100644
--- a/noncore/unsupported/mailit/readmail.cpp
+++ b/noncore/unsupported/mailit/readmail.cpp
@@ -19,8 +19,10 @@
 **********************************************************************/
 #include "readmail.h"
 #include <qimage.h>
+#include <qwhatsthis.h>
 #include <qmime.h>
 #include <qaction.h>
+#include <qpopupmenu.h>
 #include <qpe/resource.h>
 
 ReadMail::ReadMail( QWidget* parent,  const char* name, WFlags fl )
@@ -42,6 +44,8 @@ void ReadMail::init()
 {
         setToolBarsMovable(FALSE);
         
+        QPopupMenu* mailaction=new QPopupMenu(this);
+        
         bar = new QToolBar(this);
         bar->setHorizontalStretchable( TRUE );
 
@@ -55,17 +59,11 @@ void ReadMail::init()
 
         bar = new QToolBar(this);
         
-            //reply dependant on viewing inbox
-        replyButton = new QAction( tr( "Reply" ), Resource::loadPixmap( "mailit/reply" ),
-                QString::null, 0, this, 0 );
-        connect(replyButton, SIGNAL(activated()), this, SLOT(reply()) );
-          replyButton->setWhatsThis(tr("Click here to reply to the selected mail"));
-                
-        forwardButton = new QAction( tr( "Forward" ), Resource::loadPixmap( "mailit/forward" ),
-        QString::null, 0, this, 0 );
-        connect(forwardButton, SIGNAL(activated()), this, SLOT(forward()) );
-        forwardButton->setWhatsThis(tr("Click here to forward the selected mail"));
+        downloadButton = new QAction( tr( "Download" ), Resource::loadPixmap( "mailit/download" ),QString::null, 0, this, 0 );
+        connect(downloadButton, SIGNAL(activated()), this, SLOT(download()) );
+          downloadButton->setWhatsThis(tr("Click here to download the selected mail"));
         
+                
         previousButton = new QAction( tr( "Previous" ), Resource::loadPixmap( "back" ), QString::null, 0, this, 0 );
         connect( previousButton, SIGNAL( activated() ), this, SLOT( previous() ) );
         previousButton->addTo(bar);
@@ -94,6 +92,23 @@ void ReadMail::init()
         "<LI><B>Plain</B> shows the mail as standard plain text</LI>"
         "Click here to switch between those view modes" ));
 
+            //reply dependant on viewing inbox
+        replyButton = new QToolButton(Resource::loadPixmap("mailit/reply"),tr("reply"),tr("reply to mail"), this,SLOT(reply()),bar);
+        QWhatsThis::add(replyButton,tr("Click here to reply to the selected mail\nPress and hold for more options."));
+        replyButton->setPopup(mailaction);
+                
+        replyAllButton = new QAction( tr( "Reply all" ), Resource::loadPixmap( "mailit/reply" ),QString::null, 0, this, 0 );
+        connect(replyAllButton, SIGNAL(activated()), this, SLOT(replyAll()));
+        replyAllButton->setWhatsThis(tr("Click here to reply to the selected mail to CC: addresses also"));
+                replyAllButton->addTo(mailaction);
+        
+        forwardButton = new QAction( tr( "Forward" ), Resource::loadPixmap( "mailit/forward" ),
+        QString::null, 0, this, 0 );
+        connect(forwardButton, SIGNAL(activated()), this, SLOT(forward()));
+        forwardButton->setWhatsThis(tr("Click here to forward the selected mail"));
+        forwardButton->addTo(mailaction);
+        
+        
         deleteButton = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, 0, this, 0 );
         connect( deleteButton, SIGNAL( activated() ), this, SLOT( deleteItem() ) );
         deleteButton->addTo(bar);
@@ -119,19 +134,26 @@ void ReadMail::updateView()
                 mail->read = TRUE;              //mark as read
         inbox = mail->received;
         
-        replyButton->removeFrom(mailMenu);
-        replyButton->removeFrom(bar);
+        replyButton->setEnabled(false);
+        /*replyButton->removeFrom(bar);
         forwardButton->removeFrom(mailMenu);
-        forwardButton->removeFrom(bar);
+        forwardButton->removeFrom(bar);*/
+        downloadButton->removeFrom(bar);
+        
+        //downloadButton->setEnabled(!mail->downloaded);
         
+                
         if (inbox == TRUE) {
-                replyButton->addTo(bar);
-                replyButton->addTo(mailMenu);
+                replyButton->setEnabled(true);
+                /*replyButton->addTo(mailMenu);
                 forwardButton->addTo(bar);
-                forwardButton->addTo(mailMenu);
+                forwardButton->addTo(mailMenu);*/
 
                                 
                 if (!mail->downloaded) {
+                        
+                        downloadButton->addTo(bar);
+                        
                         //report currently viewed mail so that it will be
                         //placed first in the queue of new mails to download
                         emit viewingMail(mail);
@@ -357,6 +379,11 @@ void ReadMail::viewAttachments()
 
 void ReadMail::reply()
 {
+        emit replyRequested(*mail, (bool&)FALSE);
+}
+
+void ReadMail::replyAll()
+{
         emit replyRequested(*mail, (bool&)TRUE);
 }
 
@@ -365,3 +392,8 @@ void ReadMail::forward()
         emit forwardRequested(*mail);
 }
 
+void ReadMail::download()
+{
+        emit download(mail);
+}
+
diff --git a/noncore/unsupported/mailit/readmail.h b/noncore/unsupported/mailit/readmail.h
index df32c34..6700595 100644
--- a/noncore/unsupported/mailit/readmail.h
+++ b/noncore/unsupported/mailit/readmail.h
@@ -28,6 +28,7 @@
 #include <qlistview.h>
 #include <qlayout.h>
 #include <qtextview.h>
+#include <qtoolbutton.h>
 
 #include "emailhandler.h"
 #include "emaillistitem.h"
@@ -50,6 +51,7 @@ signals:
         void forwardRequested(Email&);
         void removeItem(EmailListItem *, bool &);
         void viewingMail(Email *);
+        void download (Email*);
 
 public slots:
         void close();
@@ -59,7 +61,9 @@ public slots:
         void shiftText();
         void viewAttachments();
         void reply();
+        void replyAll();
         void forward();
+        void download();
         
 private:
         void init();
@@ -82,8 +86,10 @@ private:
         QTextView *emailView;
         QAction *attachmentButton;
         QAction *previousButton;
-        QAction *replyButton;
+        QToolButton *replyButton;
         QAction *forwardButton;
+        QAction *replyAllButton;
+        QAction *downloadButton;
 };
 
 #endif // READMAIL_H
diff --git a/noncore/unsupported/mailit/writemail.cpp b/noncore/unsupported/mailit/writemail.cpp
index dcf0c6e..c75494e 100644
--- a/noncore/unsupported/mailit/writemail.cpp
+++ b/noncore/unsupported/mailit/writemail.cpp
@@ -22,8 +22,7 @@
 #include "writemail.h"
 #include <qpe/resource.h>
 
-WriteMail::WriteMail( QWidget* parent,  const char* name, WFlags fl )
-        : QMainWindow( parent, name, fl )
+WriteMail::WriteMail( QWidget* parent,  const char* name, WFlags fl ):QMainWindow( parent, name, fl )
 {
         showingAddressList = FALSE;
         init();
@@ -259,7 +258,7 @@ void WriteMail::reply(Email replyMail, bool replyAll)
         toInput->setText(mail.fromMail);
         
         if (replyAll)
-        {
+                {
                 for (QStringList::Iterator it = mail.carbonCopies.begin();it != mail.carbonCopies.end(); ++it) 
                 {
                         ccRecipients.append(*it);
@@ -268,11 +267,17 @@ void WriteMail::reply(Email replyMail, bool replyAll)
                         ccRecipients.truncate(ccRecipients.length()-1);         //no ; at the end
                 ccInput->setText(ccRecipients);
         }
-                
-        addRecipients(replyAll);
+        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) {
@@ -280,7 +285,7 @@ void WriteMail::reply(Email replyMail, bool replyAll)
                 if (pos != -1)
                         mail.body.insert(++pos, ">>");
         }
-        
+                mail.body.insert(0,citation);
         emailInput->setText(mail.body);
 }
 
@@ -308,9 +313,16 @@ bool WriteMail::getRecipients(bool ccField)
         QString str, temp;
         int pos = 0;
         
-        mail.recipients.clear();
-        
-        ccField ? temp = ccInput->text() : temp=toInput->text() ;
+        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();
@@ -318,13 +330,13 @@ bool WriteMail::getRecipients(bool ccField)
                 if ( str.find('@') == -1)
                         return false;
                 ccField ? mail.carbonCopies.append(str) : mail.recipients.append(str);
-                addressList->addContact(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, "");
+        //addressList->addContact(temp, "");
         
         return TRUE;
 }
@@ -383,6 +395,7 @@ void WriteMail::setRecipient(const QString &recipient)
 void WriteMail::newMail()
 {
         toInput->clear();
+        ccInput->clear();
         subjectInput->clear();
         emailInput->clear();
         setAddressList(addressList);