diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 30aa9598102b9048c54c9f46513fcac8e0f8fd7c..59310f2246fec4b35932501d589a1dddced1dcf5 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -42,6 +42,7 @@ This release includes the following bugfixes:
  o curl_easy_pause: suggest one way to unpause
  o imap: Fixed calculation of transfer when partial FETCH received [16]
  o pingpong: Check SSL library buffers for already read data [16]
+ o imap/pop3/smtp: Speed up SSL connection initialization
 
 This release includes the following known bugs:
 
diff --git a/lib/imap.c b/lib/imap.c
index 17e9eb0b0347d535906a119c622d47483952fb99..6a3b364493232df8a34409056dcd1abd692b887a 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -1704,11 +1704,13 @@ static CURLcode imap_multi_statemach(struct connectdata *conn, bool *done)
   CURLcode result = CURLE_OK;
   struct imap_conn *imapc = &conn->proto.imapc;
 
-  if((conn->handler->flags & PROTOPT_SSL) && !imapc->ssldone)
+  if((conn->handler->flags & PROTOPT_SSL) && !imapc->ssldone) {
     result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &imapc->ssldone);
-  else
-    result = Curl_pp_statemach(&imapc->pp, FALSE);
+    if(result || !imapc->ssldone)
+      return result;
+  }
 
+  result = Curl_pp_statemach(&imapc->pp, FALSE);
   *done = (imapc->state == IMAP_STOP) ? TRUE : FALSE;
 
   return result;
diff --git a/lib/pop3.c b/lib/pop3.c
index 5b49b1af7bca39209148ea5f5db0914fb67061d1..f33b189d1428d5bd99c54f063352c4857c4d6d6e 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -1368,11 +1368,13 @@ static CURLcode pop3_multi_statemach(struct connectdata *conn, bool *done)
   CURLcode result = CURLE_OK;
   struct pop3_conn *pop3c = &conn->proto.pop3c;
 
-  if((conn->handler->flags & PROTOPT_SSL) && !pop3c->ssldone)
+  if((conn->handler->flags & PROTOPT_SSL) && !pop3c->ssldone) {
     result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &pop3c->ssldone);
-  else
-    result = Curl_pp_statemach(&pop3c->pp, FALSE);
+    if(result || !pop3c->ssldone)
+      return result;
+  }
 
+  result = Curl_pp_statemach(&pop3c->pp, FALSE);
   *done = (pop3c->state == POP3_STOP) ? TRUE : FALSE;
 
   return result;
diff --git a/lib/smtp.c b/lib/smtp.c
index 7ba2ba4644bd3a182326b33297d02f8479dcdcc3..2d4055c24f397be7753e71468e5e7d7a8d1263e4 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -1392,11 +1392,13 @@ static CURLcode smtp_multi_statemach(struct connectdata *conn, bool *done)
   CURLcode result = CURLE_OK;
   struct smtp_conn *smtpc = &conn->proto.smtpc;
 
-  if((conn->handler->flags & PROTOPT_SSL) && !smtpc->ssldone)
+  if((conn->handler->flags & PROTOPT_SSL) && !smtpc->ssldone) {
     result = Curl_ssl_connect_nonblocking(conn, FIRSTSOCKET, &smtpc->ssldone);
-  else
-    result = Curl_pp_statemach(&smtpc->pp, FALSE);
+    if(result || !smtpc->ssldone)
+      return result;
+  }
 
+  result = Curl_pp_statemach(&smtpc->pp, FALSE);
   *done = (smtpc->state == SMTP_STOP) ? TRUE : FALSE;
 
   return result;