From fe8e2dfbe91d397f820d92ce6aa50c8a715dcd03 Mon Sep 17 00:00:00 2001
From: Dejan Strbac <dejan.strbac@gmail.com>
Date: Sun, 21 Feb 2016 22:29:07 +0100
Subject: [PATCH] bcc / cc in envelope

---
 lib/mailex.ex         | 8 ++++----
 lib/mailex/address.ex | 2 +-
 lib/mailex/render.ex  | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/mailex.ex b/lib/mailex.ex
index 8db767e..1674204 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 || [])
 
     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 1cac119..1e51e60 100644
--- a/lib/mailex/address.ex
+++ b/lib/mailex/address.ex
@@ -18,7 +18,7 @@ defmodule Mailex.Address do
         List.first |>
         String.split(~r/([^\w\s]|_)/) |>
         Enum.map(&String.capitalize/1) |>
-        Enum.join " "
+        Enum.join(" ")
       "#{name} <#{email_address}>"
     end
   end
diff --git a/lib/mailex/render.ex b/lib/mailex/render.ex
index be78136..7003d95 100644
--- a/lib/mailex/render.ex
+++ b/lib/mailex/render.ex
@@ -112,8 +112,7 @@ 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 ]