Merge pull request from p2pu/2019-05-message-i18n Add language logic for message sending