Updated setup_mail initializer