Fix mailer issue
Merge branch 'master' of https://github.com/ProjectAlex/laughing-adventure