Merge pull request mikel#1559 from tablecheck/revert-pull-1495

Revert PR mikel#1495 because it is a dupe of mikel#1470
nevans · Mar 8, 2023 · 10a4443 · 10a4443
2 parents 9c46620 + 0010eee
commit 10a4443
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/lib/mail/message.rb b/lib/mail/message.rb
@@ -2073,11 +2073,7 @@ def add_multipart_alternate_header
 
     def add_boundary
       unless body.boundary && boundary
-        unless header['content-type']
-          _charset = charset
-          header['content-type'] = 'multipart/mixed'
-          header['content-type'].parameters[:charset] = _charset
-        end
+        header['content-type'] = 'multipart/mixed' unless header['content-type']
         header['content-type'].parameters[:boundary] = ContentTypeField.generate_boundary
         body.boundary = boundary
       end