diff --git a/lettre/src/lib.rs b/lettre/src/lib.rs
index 9f6cfd7..9473bde 100644
--- a/lettre/src/lib.rs
+++ b/lettre/src/lib.rs
@@ -86,7 +86,7 @@ impl AsRef<str> for EmailAddress {
 
 impl AsRef<OsStr> for EmailAddress {
     fn as_ref(&self) -> &OsStr {
-        &self.0.as_ref()
+        self.0.as_ref()
     }
 }
 
diff --git a/lettre/src/smtp/client/mod.rs b/lettre/src/smtp/client/mod.rs
index 046e6cd..663c493 100644
--- a/lettre/src/smtp/client/mod.rs
+++ b/lettre/src/smtp/client/mod.rs
@@ -28,9 +28,7 @@ impl ClientCodec {
     pub fn new() -> Self {
         ClientCodec::default()
     }
-}
 
-impl ClientCodec {
     /// Adds transparency
     /// TODO: replace CR and LF by CRLF
     fn encode(&mut self, frame: &[u8], buf: &mut Vec<u8>) -> Result<(), Error> {
diff --git a/lettre/src/smtp/client/net.rs b/lettre/src/smtp/client/net.rs
index 18fa84c..9b1ad1a 100644
--- a/lettre/src/smtp/client/net.rs
+++ b/lettre/src/smtp/client/net.rs
@@ -33,7 +33,7 @@ pub enum NetworkStream {
     /// Plain TCP stream
     Tcp(TcpStream),
     /// Encrypted TCP stream
-    Tls(TlsStream<TcpStream>),
+    Tls(Box<TlsStream<TcpStream>>),
     /// Mock stream
     Mock(MockStream),
 }
@@ -118,7 +118,7 @@ impl Connector for NetworkStream {
             Some(context) => context
                 .connector
                 .connect(context.domain.as_ref(), tcp_stream)
-                .map(NetworkStream::Tls)
+                .map(|tls| NetworkStream::Tls(Box::new(tls)))
                 .map_err(|e| io::Error::new(ErrorKind::Other, e)),
             None => Ok(NetworkStream::Tcp(tcp_stream)),
         }
@@ -131,7 +131,7 @@ impl Connector for NetworkStream {
                 .connector
                 .connect(tls_parameters.domain.as_ref(), stream.try_clone().unwrap())
             {
-                Ok(tls_stream) => NetworkStream::Tls(tls_stream),
+                Ok(tls_stream) => NetworkStream::Tls(Box::new(tls_stream)),
                 Err(err) => return Err(io::Error::new(ErrorKind::Other, err)),
             },
             NetworkStream::Tls(_) => return Ok(()),
diff --git a/lettre/src/smtp/mod.rs b/lettre/src/smtp/mod.rs
index 9018bb9..9ebca28 100644
--- a/lettre/src/smtp/mod.rs
+++ b/lettre/src/smtp/mod.rs
@@ -470,7 +470,7 @@ impl<'a> Transport<'a> for SmtpTransport {
         // Message content
         let result = self.client.message(Box::new(email.message()));
 
-        if result.is_ok() {
+        if let Ok(ref result) = result {
             // Increment the connection reuse counter
             self.state.connection_reuse_count += 1;
 
@@ -480,9 +480,6 @@ impl<'a> Transport<'a> for SmtpTransport {
                 message_id,
                 self.state.connection_reuse_count,
                 result
-                    .as_ref()
-                    .ok()
-                    .unwrap()
                     .message
                     .iter()
                     .next()