2 files changed, 14 insertions, 4 deletions

diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index 89ec7ab..ab20249 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -24,26 +24,31 @@ void IMAPwrapper::imap_progress( size_t current, size_t maximum )
     qDebug( "IMAP: %i of %i", current, maximum );
 }
 
 void IMAPwrapper::login()
 {
     const char *server, *user, *pass;
     uint16_t port;
     int err = MAILIMAP_NO_ERROR;
 
     /* we are connected this moment */
     /* TODO: setup a timer holding the line or if connection closed - delete the value */
     if (m_imap) {
-        mailstream_flush(m_imap->imap_stream);
-        return;
+        err = mailimap_noop(m_imap);
+        if (err!=MAILIMAP_NO_ERROR) {
+            logout();
+        } else {
+            mailstream_flush(m_imap->imap_stream);
+            return;
+        }
     }
     server = account->getServer().latin1();
     port = account->getPort().toUInt();
         if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) {
           LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
           login.show();
           if ( QDialog::Accepted == login.exec() ) {
                 // ok
                 user = strdup( login.getUser().latin1() );
                 pass = strdup( login.getPassword().latin1() );
           } else {
                 // cancel
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index 89ec7ab..ab20249 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -24,26 +24,31 @@ void IMAPwrapper::imap_progress( size_t current, size_t maximum )
     qDebug( "IMAP: %i of %i", current, maximum );
 }
 
 void IMAPwrapper::login()
 {
     const char *server, *user, *pass;
     uint16_t port;
     int err = MAILIMAP_NO_ERROR;
 
     /* we are connected this moment */
     /* TODO: setup a timer holding the line or if connection closed - delete the value */
     if (m_imap) {
-        mailstream_flush(m_imap->imap_stream);
-        return;
+        err = mailimap_noop(m_imap);
+        if (err!=MAILIMAP_NO_ERROR) {
+            logout();
+        } else {
+            mailstream_flush(m_imap->imap_stream);
+            return;
+        }
     }
     server = account->getServer().latin1();
     port = account->getPort().toUInt();
         if ( account->getUser().isEmpty() || account->getPassword().isEmpty() ) {
           LoginDialog login( account->getUser(), account->getPassword(), NULL, 0, true );
           login.show();
           if ( QDialog::Accepted == login.exec() ) {
                 // ok
                 user = strdup( login.getUser().latin1() );
                 pass = strdup( login.getPassword().latin1() );
           } else {
                 // cancel