filter attachment text parts

DockYard · Jul 5, 2021 · c0d91b7 · c0d91b7
1 parent a839f66
commit c0d91b7
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/mail/renderers/rfc_2822.ex b/lib/mail/renderers/rfc_2822.ex
@@ -1,5 +1,5 @@
 defmodule Mail.Renderers.RFC2822 do
-  import Mail.Message, only: [match_content_type?: 2]
+  import Mail.Message, only: [match_content_type?: 2, is_attachment?: 1]
 
   @days ~w(Mon Tue Wed Thu Fri Sat Sun)
   @months ~w(Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec)
@@ -119,7 +119,8 @@ defmodule Mail.Renderers.RFC2822 do
   end
 
   defp render_header_value(_key, [value | subtypes]),
-    do: Enum.join([encode_header_value(value, :quoted_printable) | render_subtypes(subtypes)], "; ")
+    do:
+      Enum.join([encode_header_value(value, :quoted_printable) | render_subtypes(subtypes)], "; ")
 
   defp render_header_value(key, value),
     do: render_header_value(key, List.wrap(value))
@@ -210,7 +211,12 @@ defmodule Mail.Renderers.RFC2822 do
     content_type = Mail.Message.get_content_type(message)
 
     if Mail.Message.has_attachment?(message) do
-      text_parts = Enum.filter(message.parts, &match_content_type?(&1, ~r/text\/(plain|html)/))
+      text_parts =
+        Enum.filter(
+          message.parts,
+          &(match_content_type?(&1, ~r/text\/(plain|html)/) and not is_attachment?(&1))
+        )
+
       content_type = List.replace_at(content_type, 0, "multipart/mixed")
       message = Mail.Message.put_content_type(message, content_type)