1 files changed, 5 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/mail.rb b/actionmailer/lib/action_mailer/vendor/tmail/mail.rb
index 9111a65042..f4a42df19b 100755
--- a/actionmailer/lib/action_mailer/vendor/tmail/mail.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail/mail.rb
@@ -335,9 +335,13 @@ module TMail
       }
     end
 
+    def normalize_line_endings(text)
+      text.to_s.gsub(/\r\n?/, "\n")
+    end
+
     def body=( str )
       parse_body
-      @body_port.wopen {|f| f.write str }
+      @body_port.wopen {|f| f.write normalize_line_endings(str) }
       str
     end