Cleanup message menu

I wanted to gather some feedback whether this is wanted behaviour prior to merging.

Rationale is given in the commit messages.