Reverted previous changes in setup_mail.rb