6 files changed, 42 insertions, 34 deletions

diff --git a/noncore/net/mailit/emailclient.cpp b/noncore/net/mailit/emailclient.cpp
index 2102ba7..da1226c 100644
--- a/noncore/net/mailit/emailclient.cpp
+++ b/noncore/net/mailit/emailclient.cpp
@@ -469,10 +469,10 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
   if ((!found)||(fromDisk)) {
      item = new EmailListItem(inboxView, newMail, TRUE);
   }
-      if (item->getMail()->files.count()>0)
-      {
-      item->setPixmap(0, Resource::loadPixmap("mailit/attach"));
-      }  
+//        if (item->getMail()->files.count()>0)
+//        {
+//        item->setPixmap(0, Resource::loadPixmap("mailit/attach"));
+//        }  
     /*if (!newMail.downloaded)
       mailDownloadList.sizeInsert(newMail.serverId, newMail.size);*/
   
diff --git a/noncore/net/mailit/emailhandler.cpp b/noncore/net/mailit/emailhandler.cpp
index 59ccd90..39f693d 100644
--- a/noncore/net/mailit/emailhandler.cpp
+++ b/noncore/net/mailit/emailhandler.cpp
@@ -175,8 +175,10 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
   if ((body.at(body.length()-2) == '.') && (body.at(body.length()-3) == '\n'))
       body.truncate(body.length()-2);
   
-  TextParser p(header, lineShift);
-  
+  //  TextParser p(header, lineShift);
+  TextParser * lp = new TextParser(header, lineShift);
+#define p (*lp)
+
   if ((pos = p.find("FROM",':', 0, TRUE)) != -1) {
     pos++;
     if (p.separatorAt(pos) == ' ') {
@@ -270,6 +272,7 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
     if (boundary == "") {     //fooled by Mime-Version
       mail->body = body;
       mail->bodyPlain = body;
+     delete lp;
       return mail;
     }
     
@@ -338,6 +341,7 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
     mail->bodyPlain = body;
     mail->body = body;
   }
+  delete lp;
   return TRUE;
 }
 
diff --git a/noncore/net/mailit/mailitwindow.cpp b/noncore/net/mailit/mailitwindow.cpp
index a111241..f945a0f 100644
--- a/noncore/net/mailit/mailitwindow.cpp
+++ b/noncore/net/mailit/mailitwindow.cpp
@@ -122,25 +122,25 @@ void MailItWindow::viewMail(QListView *view, Email *mail)
   
   if ((mail->received)&&(!mail->downloaded))
   {   
-          QMessageBox mb( tr("Mail not downloaded"),
+    QMessageBox mb( tr("Mail not downloaded"),
                     tr("The mail you have clicked \n"
-                    "has not been downloaded yet.\n "
-                    "Would you like to do it now ?"),
+        "has not been downloaded yet.\n "
+        "Would you like to do it now ?"),
                     QMessageBox::Information,
                     QMessageBox::Yes | QMessageBox::Default,
                     QMessageBox::No | QMessageBox::Escape,0 );
-                 
-        result=mb.exec();
-        
-        if (result==QMessageBox::Yes)
-        {
-                emailClient->download(mail);
-        }
+     
+  result=mb.exec();
+  
+  if (result==QMessageBox::Yes)
+  {
+    emailClient->download(mail);
+  }
   }
   
   readMail->update(view, mail);
   views->raiseWidget(readMail);
-  setCaption( tr( "Examine mail"  ) );
+  setCaption( tr( "Read Mail"  ) );
 }
 
 void MailItWindow::updateMailView(Email *mail)
diff --git a/noncore/unsupported/mailit/emailclient.cpp b/noncore/unsupported/mailit/emailclient.cpp
index 2102ba7..da1226c 100644
--- a/noncore/unsupported/mailit/emailclient.cpp
+++ b/noncore/unsupported/mailit/emailclient.cpp
@@ -469,10 +469,10 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
   if ((!found)||(fromDisk)) {
      item = new EmailListItem(inboxView, newMail, TRUE);
   }
-      if (item->getMail()->files.count()>0)
-      {
-      item->setPixmap(0, Resource::loadPixmap("mailit/attach"));
-      }  
+//        if (item->getMail()->files.count()>0)
+//        {
+//        item->setPixmap(0, Resource::loadPixmap("mailit/attach"));
+//        }  
     /*if (!newMail.downloaded)
       mailDownloadList.sizeInsert(newMail.serverId, newMail.size);*/
   
diff --git a/noncore/unsupported/mailit/emailhandler.cpp b/noncore/unsupported/mailit/emailhandler.cpp
index 59ccd90..39f693d 100644
--- a/noncore/unsupported/mailit/emailhandler.cpp
+++ b/noncore/unsupported/mailit/emailhandler.cpp
@@ -175,8 +175,10 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
   if ((body.at(body.length()-2) == '.') && (body.at(body.length()-3) == '\n'))
       body.truncate(body.length()-2);
   
-  TextParser p(header, lineShift);
-  
+  //  TextParser p(header, lineShift);
+  TextParser * lp = new TextParser(header, lineShift);
+#define p (*lp)
+
   if ((pos = p.find("FROM",':', 0, TRUE)) != -1) {
     pos++;
     if (p.separatorAt(pos) == ' ') {
@@ -270,6 +272,7 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
     if (boundary == "") {     //fooled by Mime-Version
       mail->body = body;
       mail->bodyPlain = body;
+     delete lp;
       return mail;
     }
     
@@ -338,6 +341,7 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
     mail->bodyPlain = body;
     mail->body = body;
   }
+  delete lp;
   return TRUE;
 }
 
diff --git a/noncore/unsupported/mailit/mailitwindow.cpp b/noncore/unsupported/mailit/mailitwindow.cpp
index a111241..f945a0f 100644
--- a/noncore/unsupported/mailit/mailitwindow.cpp
+++ b/noncore/unsupported/mailit/mailitwindow.cpp
@@ -122,25 +122,25 @@ void MailItWindow::viewMail(QListView *view, Email *mail)
   
   if ((mail->received)&&(!mail->downloaded))
   {   
-          QMessageBox mb( tr("Mail not downloaded"),
+    QMessageBox mb( tr("Mail not downloaded"),
                     tr("The mail you have clicked \n"
-                    "has not been downloaded yet.\n "
-                    "Would you like to do it now ?"),
+        "has not been downloaded yet.\n "
+        "Would you like to do it now ?"),
                     QMessageBox::Information,
                     QMessageBox::Yes | QMessageBox::Default,
                     QMessageBox::No | QMessageBox::Escape,0 );
-                 
-        result=mb.exec();
-        
-        if (result==QMessageBox::Yes)
-        {
-                emailClient->download(mail);
-        }
+     
+  result=mb.exec();
+  
+  if (result==QMessageBox::Yes)
+  {
+    emailClient->download(mail);
+  }
   }
   
   readMail->update(view, mail);
   views->raiseWidget(readMail);
-  setCaption( tr( "Examine mail"  ) );
+  setCaption( tr( "Read Mail"  ) );
 }
 
 void MailItWindow::updateMailView(Email *mail)