Feature/messages

Need a quick code review, if everything looks ok, please merge. @natea @littleq0903