Fixes to dock to implement new message viewing