Message send, showAll and showOne added
merge conflict