reverting changes to ActionMailer

actionmailer/lib/action_mailer/base.rb

@@ -307,6 +307,10 @@ class Base
     # Specify the CC addresses for the message.
     adv_attr_accessor :cc
 
+    # Specify the charset to use for the message. This defaults to the
+    # +default_charset+ specified for ActionMailer::Base.
+    adv_attr_accessor :charset
+
     # Specify the content type for the message. This defaults to <tt>text/plain</tt>
     # in most cases, but can be automatically set in some situations.
     adv_attr_accessor :content_type
@@ -513,6 +517,7 @@ def deliver!(mail = @mail)
       # mailer. Subclasses may override this method to provide different
       # defaults.
       def initialize_defaults(method_name)
+        @charset ||= @@default_charset.dup
         @content_type ||= @@default_content_type.dup
         @implicit_parts_order ||= @@default_implicit_parts_order.dup
         @template ||= method_name