diff --git a/examples/smtp.rs b/examples/smtp.rs
index 8523463..39e64e3 100644
--- a/examples/smtp.rs
+++ b/examples/smtp.rs
@@ -1,4 +1,4 @@
-use async_smtp::{EmailAddress, Envelope, SendableEmail, SmtpClient, Transport};
+use async_smtp::{EmailAddress, Envelope, SendableEmail, SmtpClient};
 
 fn main() {
     env_logger::init();
@@ -19,7 +19,7 @@ fn main() {
             .unwrap()
             .into_transport();
         // Send the email
-        let result = mailer.send(email).await;
+        let result = mailer.connect_and_send(email).await;
 
         if result.is_ok() {
             println!("Email sent");
diff --git a/examples/smtp_gmail.rs b/examples/smtp_gmail.rs
index a7b32cb..82b067c 100644
--- a/examples/smtp_gmail.rs
+++ b/examples/smtp_gmail.rs
@@ -1,5 +1,5 @@
 use async_smtp::smtp::authentication::Credentials;
-use async_smtp::{EmailAddress, Envelope, SendableEmail, SmtpClient, Transport};
+use async_smtp::{EmailAddress, Envelope, SendableEmail, SmtpClient};
 
 fn main() {
     async_std::task::block_on(async move {
@@ -26,7 +26,7 @@ fn main() {
             .into_transport();
 
         // Send the email
-        let result = mailer.send(email).await;
+        let result = mailer.connect_and_send(email).await;
 
         if result.is_ok() {
             println!("Email sent");
diff --git a/src/smtp/smtp_client.rs b/src/smtp/smtp_client.rs
index ffeec4f..b12619b 100644
--- a/src/smtp/smtp_client.rs
+++ b/src/smtp/smtp_client.rs
@@ -411,7 +411,7 @@ impl<'a> SmtpTransport {
 
                 let client = std::mem::replace(&mut self.client, InnerClient::default());
                 let ssl_client = client.upgrade_tls_stream(tls_parameters).await?;
-                std::mem::replace(&mut self.client, ssl_client);
+                self.client = ssl_client;
 
                 debug!("connection encrypted");