Add mail files
Merge branch 'mail'