Fix emails image. Issue #464.
Merge branch 'master' into dev-cleanup