add messages view
merge