whisper: re-insert #16757 that has been lost during a merge#16889

gballet merged 1 commit intoethereum:masterethereum/go-ethereum:masterfrom

gballet:enforce-16757gballet/go-ethereum:enforce-16757Copy head branch name to clipboard