Message module updated
Merge pull request #658 from sexnothing/user

Message module updated