analysing mail plugin
Merge branch 'mail' into dev