Moved the buttons into the header and added the button text as tooltip. This should
look better in general and saves a lots of space.

Also clean up message-manager a bit as there were some strange code paths.