Removed mail interceptor, corrected From email address