Modify mail message
Merge branch 'develop'

* develop:
  Modify mail message