Fixed export mail unicode issues
Merge branch 'develop'