Merge branch 'hotfix/archive' into develop
updated send messages, set message type to chat, because (private) cant be logged
Merge branch 'develop'