Messages update

not works correctly, do not judge me