contact message sending refactoring
unused 'use'
code formating
Merge branch 'develop'