Messages view cleanup

WIP