2 Commits (feature/addNonDirectMsg)