fixed getting messages bug
merge conflict resolved