Merge "Tweak message header actions."