1 files changed, 5 insertions, 6 deletions

diff --git a/imap.go b/imap.go
index e70a394..ebdd2c8 100644
--- a/imap.go
+++ b/imap.go
@@ -32,18 +32,17 @@ func (s *Server) dialIMAP() (*imapclient.Client, error) {
 		if err != nil {
 			return nil, fmt.Errorf("failed to connect to IMAPS server: %v", err)
 		}
+	} else if !s.imap.insecure {
+		c, err = imapclient.DialStartTLS(s.imap.host, options)
+		if err != nil {
+			return nil, fmt.Errorf("failed to connect to IMAP server: %v", err)
+		}
 	} else {
 		conn, err := net.Dial("tcp", s.imap.host)
 		if err != nil {
 			return nil, fmt.Errorf("failed to connect to IMAP server: %v", err)
 		}
 		c = imapclient.New(conn, options)
-		if !s.imap.insecure {
-			if err := c.StartTLS(nil); err != nil {
-				c.Close()
-				return nil, fmt.Errorf("STARTTLS failed: %v", err)
-			}
-		}
 	}
 
 	return c, err