[WIP] Add saving message to buttons

Because the old PR was hell to rebase.