Forgot a file
Some mail fixes
Create websocket dir if necessary
Saving
Merge branch 'master' into dev-fak