Email should now be working, works on my server
Forgot to add a file to the commit, should work now
fixed
Merge branch 'master' into updating
Merge branch 'updating'