smtp fix

2 files changed, 8 insertions, 2 deletions

diff --git a/kmicromail/libmailwrapper/abstractmail.cpp b/kmicromail/libmailwrapper/abstractmail.cpp
index ed5c898..870985e 100644
--- a/kmicromail/libmailwrapper/abstractmail.cpp
+++ b/kmicromail/libmailwrapper/abstractmail.cpp
@@ -179,16 +179,19 @@ void AbstractMail::downloadNewMails(const FolderP&fromFolder, AbstractMail*targe
         }
     QValueList<RecMailP> t;
     listMessages(fromFolder->getName(),t,acc->getMaxMailSize() );
     if ( t.count() == 0 ) {
         qDebug("There are no new messages %s", fromFolder->getName().latin1());
         Global::statusMessage(i18n("There are no new messages"));
         return;
     }
+    Global::statusMessage(i18n("%1 :Downloading mails..."). arg(acc->getAccountName()));
+    qDebug(i18n("%1 :Downloading mails..."). arg(acc->getAccountName()));
+    qApp->processEvents();
     QValueList<RecMailP> e;
     targetMail->listMessages(lfName,e,acc->getMaxMailSize() );
     //qDebug("target has mails %d ", e.count());
     QValueList<RecMailP> n; 
     int iii = 0;
     int count = t.count();  
     while (iii < count ) {  
         RecMailP r = (*t.at( iii ));
diff --git a/kmicromail/libmailwrapper/smtpwrapper.cpp b/kmicromail/libmailwrapper/smtpwrapper.cpp
index 845c71c..448a2e9 100644
--- a/kmicromail/libmailwrapper/smtpwrapper.cpp
+++ b/kmicromail/libmailwrapper/smtpwrapper.cpp
@@ -201,16 +201,17 @@ void SMTPwrapper::connect_server()
         return;
     }
     server = m_SmtpAccount->getServer();
     if  ( m_SmtpAccount->ConnectionType() == 3 ) {
         ssl = true;
         try_tls = false;
     } else if (m_SmtpAccount->ConnectionType() == 2) {
         force_tls = true;
+        try_tls = true;
     } else if (m_SmtpAccount->ConnectionType() == 1) {
         try_tls = true;
     }
     int result = 1;
     port = m_SmtpAccount->getPort().toUInt();
 
     m_smtp = mailsmtp_new( 20, &progress );
     if ( m_smtp == NULL ) {
@@ -240,25 +241,27 @@ void SMTPwrapper::connect_server()
         err = mailsmtp_init( m_smtp );
         if (err != MAILSMTP_NO_ERROR) {
             result = 0;
             qDebug("Error init SMTP connection ");
             failuretext = i18n("Error init SMTP connection:\n%1").arg(mailsmtpError(err));
         }
     }
     if (result && try_tls) {
-        qDebug("Smpt: Try tls ");
+        qDebug("Smpt: Try TLS... ");
         err = start_smtp_tls();
         if (err != MAILSMTP_NO_ERROR) {
             try_tls = false;
-            qDebug("no tls ");
+            qDebug("Smpt: No TLS possible ");
         } else {
             err = mailesmtp_ehlo(m_smtp);
             if ( err  != MAILSMTP_NO_ERROR )
                 result = 0;
+            else
+                qDebug("Smpt: Using TLS ");
         }
     }
     //qDebug("mailesmtp_ehlo %d ",err );
     if (!try_tls && force_tls) {
         result = 0;
         failuretext = i18n("Error init SMTP tls:%1").arg(mailsmtpError(err));
     }