diff --git a/src/lib.rs b/src/lib.rs
index fbbea1b..1178488 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -52,19 +52,15 @@ pub mod transport;
 #[macro_use]
 extern crate hyperx;
 
+pub use crate::address::Address;
 use crate::address::Envelope;
 use crate::error::Error;
 #[cfg(feature = "builder")]
-pub use crate::message::{
-    header::{self, Headers},
-    EmailFormat, Mailbox, Mailboxes, Message,
-};
+pub use crate::message::Message;
 #[cfg(feature = "file-transport")]
 pub use crate::transport::file::FileTransport;
 #[cfg(feature = "sendmail-transport")]
 pub use crate::transport::sendmail::SendmailTransport;
-#[cfg(all(feature = "smtp-transport", feature = "connection-pool"))]
-pub use crate::transport::smtp::r2d2::SmtpConnectionManager;
 #[cfg(all(
     feature = "smtp-transport",
     any(feature = "tokio02", feature = "tokio03")
@@ -76,7 +72,6 @@ pub use crate::transport::smtp::SmtpTransport;
 pub use crate::transport::smtp::Tokio02Connector;
 #[cfg(all(feature = "smtp-transport", feature = "tokio03"))]
 pub use crate::transport::smtp::Tokio03Connector;
-pub use crate::{address::Address, transport::stub::StubTransport};
 #[cfg(any(feature = "async-std1", feature = "tokio02", feature = "tokio03"))]
 use async_trait::async_trait;
 
diff --git a/src/message/mailbox/types.rs b/src/message/mailbox/types.rs
index 8bbb1ad..43c0cca 100644
--- a/src/message/mailbox/types.rs
+++ b/src/message/mailbox/types.rs
@@ -20,7 +20,7 @@ use std::{
 /// You can create a `Mailbox` from a string and an [`Address`]:
 ///
 /// ```
-/// # use lettre::{Address, Mailbox};
+/// # use lettre::{Address, message::Mailbox};
 /// let address = Address::new("example", "email.com").unwrap();
 /// let mailbox = Mailbox::new(None, address);
 /// ```
@@ -28,7 +28,7 @@ use std::{
 /// You can also create one from a string literal:
 ///
 /// ```
-/// # use lettre::Mailbox;
+/// # use lettre::message::Mailbox;
 /// let mailbox: Mailbox = "John Smith <example@email.com>".parse().unwrap();
 /// ```
 #[derive(Debug, Clone, PartialOrd, Ord, PartialEq, Eq, Hash)]
@@ -46,7 +46,7 @@ impl Mailbox {
     /// # Examples
     ///
     /// ```
-    /// use lettre::{Address, Mailbox};
+    /// use lettre::{Address, message::Mailbox};
     ///
     /// let address = Address::new("example", "email.com").unwrap();
     /// let mailbox = Mailbox::new(None, address);
@@ -139,7 +139,7 @@ impl Mailboxes {
     /// # Examples
     ///
     /// ```
-    /// use lettre::Mailboxes;
+    /// use lettre::message::Mailboxes;
     /// let mailboxes = Mailboxes::new();
     /// ```
     pub fn new() -> Self {
@@ -151,7 +151,7 @@ impl Mailboxes {
     /// # Examples
     ///
     /// ```
-    /// use lettre::{Address, Mailbox, Mailboxes};
+    /// use lettre::{Address, message::{Mailbox, Mailboxes}};
     ///
     /// let address = Address::new("example", "email.com").unwrap();
     /// let mut mailboxes = Mailboxes::new().with(Mailbox::new(None, address));
@@ -166,7 +166,7 @@ impl Mailboxes {
     /// # Examples
     ///
     /// ```
-    /// use lettre::{Address, Mailbox, Mailboxes};
+    /// use lettre::{Address, message::{Mailbox, Mailboxes}};
     ///
     /// let address = Address::new("example", "email.com").unwrap();
     /// let mut mailboxes = Mailboxes::new();
@@ -181,7 +181,7 @@ impl Mailboxes {
     /// # Examples
     ///
     /// ```
-    /// use lettre::{Address, Mailbox, Mailboxes};
+    /// use lettre::{Address, message::{Mailbox, Mailboxes}};
     ///
     /// let empty = Mailboxes::new();
     /// assert!(empty.into_single().is_none());
@@ -201,7 +201,7 @@ impl Mailboxes {
     /// # Examples
     ///
     /// ```
-    /// use lettre::{Address, Mailbox, Mailboxes};
+    /// use lettre::{Address, message::{Mailbox, Mailboxes}};
     ///
     /// let mut mailboxes = Mailboxes::new();
     ///
diff --git a/src/transport/stub/mod.rs b/src/transport/stub/mod.rs
index 92359ef..f34c3e6 100644
--- a/src/transport/stub/mod.rs
+++ b/src/transport/stub/mod.rs
@@ -7,7 +7,8 @@
 //! testing purposes.
 //!
 //! ```rust
-//! use lettre::{Message, Transport, StubTransport};
+//! use lettre::{Message, Transport};
+//! use lettre::transport::stub::StubTransport;
 //!
 //! let email = Message::builder()
 //!     .from("NoBody <nobody@domain.tld>".parse().unwrap())