3 files changed, 15 insertions, 7 deletions

diff --git a/kmicromail/accountview.cpp b/kmicromail/accountview.cpp
index 3ad3e9b..e9be224 100644
--- a/kmicromail/accountview.cpp
+++ b/kmicromail/accountview.cpp
@@ -112,10 +112,13 @@ void AccountView::refreshOutgoing()
     if (pos > 0)
     {
         bName.replace(0,pos+1,"");
     }
-    if ( bName.lower() == "outgoing" )
+    //qDebug("name *%s* ",bName.lower().latin1() );
+    if ( bName.lower() == "outgoing" || bName.lower() == "sent" ||  bName.lower() == "sendfailed" ) {
         refreshCurrent();
+        // qDebug("refresh ");
+    }
 }
 
 void AccountView::refreshCurrent()
 {
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp
index 24f4786..5096f67 100644
--- a/kmicromail/libmailwrapper/smtpwrapper.cpp
+++ b/kmicromail/libmailwrapper/smtpwrapper.cpp
@@ -41,10 +41,11 @@ SMTPwrapper::~SMTPwrapper()
 }
 
 void SMTPwrapper::emitQCop( int queued ) {
 #ifndef DESKTOP_VERSION
-    QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" );
-    env << queued;
+    // LR : not used in kde-pim
+    //QCopEnvelope env( "QPE/Pim", "outgoingMails(int)" );
+    //env << queued;
 #endif
 }
 
 QString SMTPwrapper::mailsmtpError( int errnum ) {
@@ -440,14 +441,13 @@ bool SMTPwrapper::flushOutbox() {
     sendProgress = new progressMailSend();
     sendProgress->show();
     sendProgress->setMaxMails(mailsToSend.count());
 
-    while (mailsToSend.count()>0) {
+    while (returnValue && mailsToSend.count()>0) {
         if (sendQueuedMail(wrap, (*mailsToSend.begin()))==0) {
             QMessageBox::critical(0,i18n("Error sending mail"),
-                                  i18n("Error sending queued mail - breaking"));
+                                  i18n("Error sending queued mail.\nBreaking."));
             returnValue = false;
-            break;
         }
         mailsToRemove.append((*mailsToSend.begin()));
         mailsToSend.remove(mailsToSend.begin());
         sendProgress->setCurrentMails(mailsToRemove.count());
@@ -457,9 +457,9 @@ bool SMTPwrapper::flushOutbox() {
         m_SmtpAccount->setPassword(oldPw);
     }
     KConfig cfg( locateLocal("config", "kopiemailrc" ) );
     cfg.setGroup( "Status" );
-    m_queuedMail = 0;
+    m_queuedMail = mailsToSend.count();
     cfg.writeEntry( "outgoing", m_queuedMail );
     emit queuedMails( m_queuedMail );
     sendProgress->hide();
     delete sendProgress;
diff --git a/kmicromail/opiemail.cpp b/kmicromail/opiemail.cpp
index f68467c..197f7ec 100644
--- a/kmicromail/opiemail.cpp
+++ b/kmicromail/opiemail.cpp
@@ -142,8 +142,9 @@ void OpieMail::slotwriteMail2(const QString& namemail )
 #endif
     mCurrentComposer = &compose;
     compose.exec();
     mCurrentComposer = 0;
+    folderView->refreshOutgoing();
     raise();
     //qDebug("retttich ");
 }
 void OpieMail::slotwriteMail(const QString&name,const QString&email)
@@ -168,8 +169,9 @@ void OpieMail::slotwriteMail(const QString&name,const QString&email)
 
     mCurrentComposer = &compose;
     compose.exec();
     mCurrentComposer = 0;
+    folderView->refreshOutgoing();
     raise();
 }
 
 void OpieMail::slotComposeMail()
@@ -313,8 +315,9 @@ void OpieMail::replyMail()
     {
         mail->Wrapper()->answeredMail(mail);
     }
     mCurrentComposer = 0;
+    folderView->refreshOutgoing();
     delete settings;
 
 }
 void OpieMail::closeViewMail(ViewMail * vm)
@@ -648,8 +651,9 @@ void OpieMail::reEditMail()
     compose.resize(640,480);
 #endif
     mCurrentComposer = &compose;
     compose.exec();
+    folderView->refreshOutgoing();
     mCurrentComposer = 0;
 }
 
 void OpieMail::insertAttendees(const QString& uid,const QStringList& nameList,const QStringList& emailList,const QStringList& uidList)
@@ -666,7 +670,8 @@ void OpieMail::insertAttendees(const QString& uid,const QStringList& nameList,co
         mCurrentComposer = &compose;
         mCurrentComposer->insertAttendees(uid,nameList,emailList,uidList);
         compose.exec();
         mCurrentComposer = 0;
+        folderView->refreshOutgoing();
         raise();
     }
 }