3 files changed, 13 insertions, 1 deletions

diff --git a/noncore/net/mail/imapwrapper.cpp b/noncore/net/mail/imapwrapper.cpp
index eae85a7..dc02780 100644
--- a/noncore/net/mail/imapwrapper.cpp
+++ b/noncore/net/mail/imapwrapper.cpp
@@ -37,3 +37,9 @@ void IMAPwrapper::login()
     /* connect */
+  //  err = mailimap_socket_connect( m_imap, (char*)server, port );
+  if (account->getSSL()) {
+        err = mailimap_ssl_connect( m_imap, (char*)server, port );
+    } else {
     err = mailimap_socket_connect( m_imap, (char*)server, port );
+    }
+
     if ( err != MAILIMAP_NO_ERROR &&  
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
index eae85a7..dc02780 100644
--- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp
@@ -37,3 +37,9 @@ void IMAPwrapper::login()
     /* connect */
+  //  err = mailimap_socket_connect( m_imap, (char*)server, port );
+  if (account->getSSL()) {
+        err = mailimap_ssl_connect( m_imap, (char*)server, port );
+    } else {
     err = mailimap_socket_connect( m_imap, (char*)server, port );
+    }
+
     if ( err != MAILIMAP_NO_ERROR &&  
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp
index 3edfff1..6d13a8b 100644
--- a/noncore/net/mail/mainwindow.cpp
+++ b/noncore/net/mail/mainwindow.cpp
@@ -17,3 +17,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags )
 {
-    setCaption( tr( "Opie-Mail" ) );
+    setCaption( tr( "Mail" ) );
     setToolBarsMovable( false );