Saved remaining changes to mail.rb.