Uncommented setting the encoding in application.rb
Commented out ActionMailer::Base.default_charset in mail.rb as this is not defined in Rails 3.