1 files changed, 26 insertions, 39 deletions

diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index 23059cf..dff1888 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -359,13 +359,13 @@ 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;
     
-    newMail.fromAccountId = currentAccount->id;
+    newMail.fromAccountId = emailHandler->getAccount()->id;
     mailconf->writeEntry("fromaccountid", newMail.fromAccountId);
   }
   
   //add if read or not
   newMail.read = mailconf->readBoolEntry("mailread");
     
@@ -477,17 +477,17 @@ void EmailClient::allMailArrived(int count)
   
   // all headers downloaded from server, start downloading remaining mails
   previewingMail = FALSE;
   status1Label->setText(currentAccount->accountName);
   progressBar->reset();
 
-  //emailHandler->getMailByList(&mailDownloadList);
   
   mailboxView->setCurrentTab(0);
 }
 
+
 void EmailClient::moveMailFront(Email *mailPtr)
 {
   if ( (receiving) && (mailPtr->fromAccountId == currentAccount->id) ) {
     mailDownloadList.moveFront(mailPtr->serverId, mailPtr->size);
   }
 }
@@ -661,13 +661,13 @@ QString EmailClient::getPath(bool enclosurePath)
   }
   return (dir.path() + "/");
 }
 
 void EmailClient::readSettings()
 {
-  int y,acc_count, accountPos=0;
+  int y,acc_count;
     
     mailconf->setGroup("mailitglobal");
     acc_count=mailconf->readNumEntry("Accounts",0);
     
     for (int accountPos = 0;accountPos<acc_count ; accountPos++) 
     {
@@ -888,19 +888,27 @@ void EmailClient::setDownloadedSize(int size)
         }
 }
 
 void EmailClient::deleteItem()
 {
         bool inbox=mailboxView->currentTab()==0;
+        QListView* box;
         
         EmailListItem* eli;
+        int pos;
+                
+        inbox ? box=inboxView : box=outboxView;
         
-        inbox ? eli=(EmailListItem*)inboxView->selectedItem():eli=(EmailListItem*)outboxView->selectedItem();
+        eli=(EmailListItem*)box->selectedItem();
         
         if (eli)
-                deleteMail(eli,(bool&)inbox);
+        {
+                        box->setSelected(eli->itemBelow(),true);//select the previous item
+                
+                        deleteMail(eli,(bool&)inbox);   //remove mail entry
+        }
 }
 
 void EmailClient::inboxItemPressed()
 {
         //timerID=startTimer(500);
 }
@@ -936,46 +944,25 @@ Email* EmailClient::getCurrentMail()
         if (eli!=NULL)
                 return eli->getMail();
         else
                 return NULL;
 }
   
-/*
-void EmailClient::reply()
-{
-  Email* mail=getCurrentMail();
-  
-  if (mail!=NULL)
+void EmailClient::download(Email* mail)
   {
-        emit reply(*mail);
-  }
-}
+        MailAccount* acc=0;
                         
-void EmailClient::replyAll()
-{
-  Email* mail=getCurrentMail();
+        tempMailDownloadList.clear();
+        tempMailDownloadList.sizeInsert(mail->serverId, mail->size);
+        if (accountList.count()>0)
+                qDebug("Accounts present");
   
-  if (mail!=NULL)
+        acc=accountList.at(mail->fromAccountId-1);
+        if (acc)
   {
-        emit replyAll(*mail);
-  }
+                emailHandler->setAccount(*acc);
+                emailHandler->getMailByList(&tempMailDownloadList);
 }
-
-void EmailClient::forward()
-{
-  Email* mail=getCurrentMail();
-  
-  if (mail!=NULL)
-  {
-        emit reply(*mail);
-  }
-}
-
-void EmailClient::remove()
-{
-  Email* mail=getCurrentMail();
-  
-  if (mail!=NULL)
-  {
-        emit remove(*mail);
+        else 
+                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");
   }
-}*/