diff options
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 61bc74a81c..89c202fd01 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -1,6 +1,7 @@ require 'action_mailer/adv_attr_accessor' require 'action_mailer/part' require 'action_mailer/part_container' +require 'action_mailer/utils' require 'tmail/net' module ActionMailer #:nodoc: @@ -293,11 +294,11 @@ module ActionMailer #:nodoc: if @parts.empty? m.set_content_type content_type, nil, { "charset" => charset } - m.body = body + m.body = Utils.normalize_new_lines(body) else if String === body part = TMail::Mail.new - part.body = body + part.body = Utils.normalize_new_lines(body) part.set_content_type content_type, nil, { "charset" => charset } part.set_content_disposition "inline" m.parts << part |