mailer fix for localhost
Merge branch 'EmilRojewski'