6 files changed, 20 insertions, 12 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
@@ -471,6 +471,6 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
   }
-      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)
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
@@ -177,3 +177,5 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
   
-  TextParser p(header, lineShift);
+  //  TextParser p(header, lineShift);
+  TextParser * lp = new TextParser(header, lineShift);
+#define p (*lp)
   
@@ -272,2 +274,3 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
       mail->bodyPlain = body;
+     delete lp;
       return mail;
@@ -340,2 +343,3 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
   }
+  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
@@ -142,3 +142,3 @@ void MailItWindow::viewMail(QListView *view, Email *mail)
   views->raiseWidget(readMail);
-  setCaption( tr( "Examine mail"  ) );
+  setCaption( tr( "Read 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
@@ -471,6 +471,6 @@ void EmailClient::mailArrived(const Email &mail, bool fromDisk)
   }
-      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)
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
@@ -177,3 +177,5 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
   
-  TextParser p(header, lineShift);
+  //  TextParser p(header, lineShift);
+  TextParser * lp = new TextParser(header, lineShift);
+#define p (*lp)
   
@@ -272,2 +274,3 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
       mail->bodyPlain = body;
+     delete lp;
       return mail;
@@ -340,2 +343,3 @@ bool EmailHandler::parse(const QString &in, const QString &lineShift, Email *mai
   }
+  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
@@ -142,3 +142,3 @@ void MailItWindow::viewMail(QListView *view, Email *mail)
   views->raiseWidget(readMail);
-  setCaption( tr( "Examine mail"  ) );
+  setCaption( tr( "Read Mail"  ) );
 }