1 files changed, 29 insertions, 13 deletions

diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp
index f6c6d60..b180051 100644
--- a/noncore/unsupported/mailit/emailhandler.cpp
+++ b/noncore/unsupported/mailit/emailhandler.cpp
@@ -105,5 +105,5 @@ void EmailHandler::getMail()
   
   headers = FALSE;
-  popClient->headersOnly(headers, 0);
+  //popClient->headersOnly(headers, 0);
   popClient->newConnection(mailAccount.popServer, 110);
 }
@@ -112,9 +112,5 @@ void EmailHandler::getMailHeaders()
 {
   popClient->setAccount(mailAccount.popUserName, mailAccount.popPasswd);
-  if (mailAccount.synchronize) {
-    popClient->setSynchronize(mailAccount.lastServerMailCount);
-  } else {
-    popClient->removeSynchronize();
-  }
+  mailAccount.synchronize ? popClient->setSynchronize(mailAccount.lastServerMailCount): popClient->removeSynchronize();
   
   headers = TRUE;
@@ -136,5 +132,5 @@ void EmailHandler::getMailByList(MailList *mailList)
 }
 
-void EmailHandler::messageArrived(const QString &message, int id, uint size, bool complete)
+void EmailHandler::messageArrived(const QString &message, int id, uint size, bool incomplete)
 {
   Email mail;
@@ -143,5 +139,5 @@ void EmailHandler::messageArrived(const QString &message, int id, uint size, boo
   mail.serverId = id;
   mail.size = size;
-  mail.downloaded = complete;
+  mail.downloaded = incomplete;
   
   emit mailArrived(mail, FALSE);
@@ -187,4 +183,5 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
       }
       pos++;
+
       mail->fromMail = p.getString(&pos, '>', false);
     } else {
@@ -200,12 +197,31 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
   }
   
-  //@@@ToDo: Rewrite the parser as To: stops at the first occurence- which is Delivered-To:
-  if ((pos = p.find("TO",':', 0, TRUE)) != -1)
+  pos=0;
+  
+  //Search for To: after the FROM: attribute to prevent hitting the Delivered-To:
+  while((pos = p.find("TO",':', pos+1, TRUE))!=-1)
+  {
+          QString rec;
+        
+                if (p.separatorAt(pos-1)!='-')
   {
             pos++;
+                mail->recipients.append(p.getString(&pos, '\r', TRUE));
+              } 
+        /*else {
+                if ((p.separatorAt(pos) == '<')|| (p.separatorAt(pos) == ' '))       //No name.. nasty
+                        pos++;
+                        pos++;
+                        mail->fromMail = p.getString(&pos, 'z', TRUE);
+                        if (mail->fromMail.at(mail->fromMail.length()-1) == '>')
+                        mail->fromMail.truncate(mail->fromMail.length() - 1);
+                        mail->from=mail->fromMail;
+                }
             mail->recipients.append (p.getString(&pos, 'z', TRUE) );
+        }*/
   }
+  //
+  //if (pos==-1) mail->recipients.append (tr("undisclosed recipients") ); 
  
-  //@@@ToDo: Rewrite the parser as To: stops at the first occurence- which is Delivered-To:
   if ((pos = p.find("CC",':', 0, TRUE)) != -1)
   {
@@ -214,12 +230,12 @@ bool EmailHandler::parse(QString in, QString lineShift, Email *mail)
   }
  
-  
   if ((pos = p.find("SUBJECT",':', 0, TRUE)) != -1) {
     pos++;
     mail->subject = p.getString(&pos, 'z', TRUE);
   }
+  
   if ((pos = p.find("DATE",':', 0, TRUE)) != -1) {
     pos++;
-    mail->date = p.getString(&pos, 'z', true);
+    mail->date = p.getString(&pos, 'z', TRUE);
   }