collapse button tweaks
added collapse button to message component
Merge branch 'master' into feature/redesign