4 files changed, 16 insertions, 4 deletions

diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp
index d8a36e7..bf91c63 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.cpp
+++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp
@@ -324,12 +324,21 @@ void encodedString::setContent(const char*nContent,int nSize)
     if (nSize>0 && nContent) {
         content = (char*)malloc(nSize*sizeof(char));
         memcpy(content,nContent,nSize);
         size = nSize;    
     }
 }
 
 void encodedString::setContent(char*nContent,int nSize)
 {
     content = nContent;
     size = nSize;
 }
+
+folderStat&folderStat::operator=(const folderStat&old)
+{
+    message_count = old.message_count;
+    message_unseen = old.message_unseen;
+    message_recent = old.message_recent;
+    return *this;
+}
+
diff --git a/noncore/net/mail/libmailwrapper/mailtypes.h b/noncore/net/mail/libmailwrapper/mailtypes.h
index 05c4816..b2047cb 100644
--- a/noncore/net/mail/libmailwrapper/mailtypes.h
+++ b/noncore/net/mail/libmailwrapper/mailtypes.h
@@ -178,15 +178,16 @@ protected:
     unsigned int size;
     
     void init();
     void copy_old(const encodedString&old);
     void clean();
 };
 
 struct folderStat
 {
     unsigned int message_count;
     unsigned int message_unseen;
     unsigned int message_recent;
+    folderStat&operator=(const folderStat&old);
 };
 
 #endif
diff --git a/noncore/net/mail/libmailwrapper/statusmail.cpp b/noncore/net/mail/libmailwrapper/statusmail.cpp
index 98f6204..1d7d559 100644
--- a/noncore/net/mail/libmailwrapper/statusmail.cpp
+++ b/noncore/net/mail/libmailwrapper/statusmail.cpp
@@ -31,31 +31,33 @@ void StatusMail::initAccounts(QList<Account>&accounts)
             IMAPaccount*ima = static_cast<IMAPaccount *>(it);
             current = AbstractMail::getWrapper(ima);
             connectionList.append(current);
             current->statusFolder(currentStat);
             currentImapStat.message_count+=currentStat.message_unseen;
             currentImapStat.message_count+=currentStat.message_recent;
             currentImapStat.message_count+=currentStat.message_count;
         } else if ( it->getType().compare( "POP3" ) == 0 ) {
             POP3account *pop3 = static_cast<POP3account *>(it);
             current = AbstractMail::getWrapper(pop3);
             connectionList.append(current);
             current->statusFolder(currentStat);
-            currentPop3Stat.message_count+=currentStat.message_unseen;
-            currentPop3Stat.message_count+=currentStat.message_recent;
             currentPop3Stat.message_count+=currentStat.message_count;
         }
         current->logout();
     }
-    lastPop3Stat = currentPop3Stat;
+    qDebug("Pop3 init count: %i",currentPop3Stat.message_count);
+    currentPop3Stat.message_recent = currentPop3Stat.message_unseen = 0;
+    lastPop3Stat.message_unseen = currentPop3Stat.message_unseen;
+    lastPop3Stat.message_recent = currentPop3Stat.message_recent;
+    lastPop3Stat.message_count = currentPop3Stat.message_count;
 }
 
 void StatusMail::reset_status()
 {
     lastPop3Stat = currentPop3Stat;
 }
 
 void StatusMail::check_current_stat(folderStat&targetStat)
 {
     AbstractMail*it = 0;
     folderStat currentStat;
     currentPop3Stat.message_recent = 0;
diff --git a/noncore/net/mail/taskbarapplet/mailapplet.cpp b/noncore/net/mail/taskbarapplet/mailapplet.cpp
index 991b5fb..6078013 100644
--- a/noncore/net/mail/taskbarapplet/mailapplet.cpp
+++ b/noncore/net/mail/taskbarapplet/mailapplet.cpp
@@ -61,25 +61,25 @@ void MailApplet::mouseReleaseEvent( QMouseEvent* e ) {
 
 void MailApplet::slotClicked() {
     QCopEnvelope e( "QPE/System", "execute(QString)" );
     e << QString( "opiemail" );
 
     ODevice *device = ODevice::inst();
     if ( !device-> ledList().isEmpty() ) {
         OLed led = ( device->ledList().contains( Led_Mail ) ) ? Led_Mail : device->ledList()[0];
 
         device->setLedState( led, Led_Off );
     }
 
-    // m_statusMails->reset_status();
+    if (m_statusMail) m_statusMail->reset_status();
 }
 
 void MailApplet::startup() {
     Settings *settings = new Settings();
     QList<Account> ma = settings->getAccounts();
     m_statusMail = new StatusMail( ma );
     delete settings;
 
     m_intervalMs = m_config->readNumEntry( "CheckEvery", 5 ) * 60000;
     m_intervalTimer = new QTimer();
     m_intervalTimer->start( m_intervalMs );
     connect( m_intervalTimer, SIGNAL( timeout() ), this, SLOT( slotCheck() ) );