Fix bugs
Merge branch 'master' of github.com:artoale/betteremail-server