Added reply-to and simplified mail config