diff --git a/lib/mailex.ex b/lib/mailex.ex
index 8db767e..fc4f2c7 100644
--- a/lib/mailex.ex
+++ b/lib/mailex.ex
@@ -14,17 +14,17 @@ defmodule Mailex do
     config = Keyword.merge(@config_defaults, config || [])
 
     message = email |> Mailex.Render.render
-    from    = email.from |> Mailex.Address.envelope_format
-    to      = email.to |> Mailex.Address.envelope_format
+    envelope_from = email.from |> Mailex.Address.envelope_format
+    envelope_to = (email.to ++ (email.cc || []) ++ (email.bcc || [])) |> Mailex.Address.envelope_format
 
     if Keyword.get(config, :relay) do
-      envelope = { from, to, message }
+      envelope = { envelope_from, envelope_to, message }
       case :gen_smtp_client.send_blocking(envelope, config) do
         { :error, msg } -> { :error, msg }
                     msg -> { :ok, msg }
       end
     else
-      IO.puts "\n\n[[[ Mailex ]]]\n\nFROM: #{from}\nTO: #{to}\n\nRAW START -------------\n#{message}\nRAW END -------------\n\n"
+      IO.puts "\n\n[[[ Mailex ]]]\n\nFROM: #{envelope_from}\nTO: #{envelope_to}\n\nRAW START -------------\n#{message}\nRAW END -------------\n\n"
       {:ok, "message dumped to console"}
     end
   end
diff --git a/lib/mailex/address.ex b/lib/mailex/address.ex
index 2247bd3..1e51e60 100644
--- a/lib/mailex/address.ex
+++ b/lib/mailex/address.ex
@@ -7,16 +7,19 @@ defmodule Mailex.Address do
 
 
   def rfc_822_format(email) when is_map(email) do
-    if email.name do
-      "#{email.name} <#{email.address}>"
+    email_address = Map.get(email, "address", Map.get(email, :address))
+    email_name = Map.get(email, "name", Map.get(email, :name))
+
+    if email_name do
+      "#{email_name} <#{email_address}>"
     else
-      name = email.address |>
+      name = email_address |>
         String.split("@") |>
         List.first |>
         String.split(~r/([^\w\s]|_)/) |>
         Enum.map(&String.capitalize/1) |>
-        Enum.join " "
-      "#{name} <#{email.address}>"
+        Enum.join(" ")
+      "#{name} <#{email_address}>"
     end
   end
 
@@ -25,8 +28,10 @@ defmodule Mailex.Address do
     emails |> Enum.map(&envelope_format(&1))
 
 
-  def envelope_format(email) when is_map(email), do:
-    "<#{email.address}>"
+  def envelope_format(email) when is_map(email) do
+    email_address = Map.get(email, "address", Map.get(email, :address))
+    "<#{email_address}>"
+  end
 
 
 end
\ No newline at end of file
diff --git a/lib/mailex/email.ex b/lib/mailex/email.ex
index 504db55..d3e1ea0 100644
--- a/lib/mailex/email.ex
+++ b/lib/mailex/email.ex
@@ -1,5 +1,5 @@
 defmodule Mailex.Email do
 
-  defstruct subject: nil, from: nil, reply_to: nil, to: nil, cc: nil, bcc: nil, attachments: nil, html: nil, text: nil
+  defstruct subject: nil, from: nil, reply_to: nil, to: nil, cc: nil, bcc: nil, headers: nil, attachments: nil, html: nil, text: nil
 
 end
diff --git a/lib/mailex/render.ex b/lib/mailex/render.ex
index 026e3fc..7003d95 100644
--- a/lib/mailex/render.ex
+++ b/lib/mailex/render.ex
@@ -112,14 +112,18 @@ defmodule Mailex.Render do
     if email.reply_to && (length(email.reply_to) > 0), do:
       headers = [ { "Reply-To", email.reply_to |> stringify_addresses } ]
 
-    if email.bcc && (length(email.bcc) > 0), do:
-      headers = [ { "Bcc", email.bcc |> stringify_addresses } | headers ]
+    # BCC should not go into headers
 
     if email.cc && (length(email.cc) > 0), do:
       headers = [ { "Cc", email.cc |> stringify_addresses } | headers ]
 
+    if email.to && (length(email.to) > 0), do:
+      headers = [ { "To", email.to |> stringify_addresses } | headers ]
+
+    if email.headers && (length(email.headers) > 0), do:
+      headers = headers ++ email.headers
+
     [ { "From",    email.from |> stringify_addresses },
-      { "To",      email.to   |> stringify_addresses },
       { "Subject", email.subject || "" }  | headers ]
   end