diff --git a/examples/client.rs b/examples/client.rs
index 62200e4..4339443 100644
--- a/examples/client.rs
+++ b/examples/client.rs
@@ -13,7 +13,7 @@ extern crate env_logger;
 extern crate smtp;
 
 use smtp::sender::{Sender, SenderBuilder};
-use smtp::mailer::EmailBuilder;
+use smtp::email::EmailBuilder;
 
 fn main() {
     env_logger::init().unwrap();
diff --git a/src/mailer/mod.rs b/src/email.rs
similarity index 98%
rename from src/mailer/mod.rs
rename to src/email.rs
index 82e8556..c222001 100644
--- a/src/mailer/mod.rs
+++ b/src/email.rs
@@ -11,7 +11,7 @@
 
 use std::fmt::{Display, Formatter, Result};
 
-use email::{MimeMessage, Header, Mailbox};
+use email_format::{MimeMessage, Header, Mailbox};
 use time::{now, Tm};
 use uuid::Uuid;
 
@@ -224,7 +224,7 @@ mod test {
     use time::now;
 
     use uuid::Uuid;
-    use email::{MimeMessage, Header};
+    use email_format::{MimeMessage, Header};
 
     use sendable_email::SendableEmail;
     use super::{EmailBuilder, Email};
diff --git a/src/lib.rs b/src/lib.rs
index e9c80ae..cfdc21f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -29,7 +29,7 @@
 //!
 //! * client: a low level SMTP client providing all SMTP commands
 //! * sender: a high level SMTP client providing an easy method to send emails
-//! * mailer: generates the email to be sent with the sender
+//! * email: generates the email to be sent with the sender
 //!
 //! ## Usage
 //!
@@ -39,7 +39,7 @@
 //!
 //! ```rust,no_run
 //! use smtp::sender::{Sender, SenderBuilder};
-//! use smtp::mailer::EmailBuilder;
+//! use smtp::email::EmailBuilder;
 //!
 //! // Create an email
 //! let email = EmailBuilder::new()
@@ -63,7 +63,7 @@
 //!
 //! ```rust,no_run
 //! use smtp::sender::{Sender, SenderBuilder};
-//! use smtp::mailer::EmailBuilder;
+//! use smtp::email::EmailBuilder;
 //!
 //! let mut builder = EmailBuilder::new();
 //! builder = builder.to(("user@example.org", "Alias name"));
@@ -145,7 +145,7 @@ extern crate rustc_serialize as serialize;
 extern crate crypto;
 extern crate time;
 extern crate uuid;
-extern crate email;
+extern crate email as email_format;
 extern crate bufstream;
 
 mod extension;
@@ -154,7 +154,7 @@ pub mod sender;
 pub mod response;
 pub mod error;
 pub mod sendable_email;
-pub mod mailer;
+pub mod email;
 
 // Registrated port numbers:
 // https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml