That's certainly a better state of affairs. So you just need to fix the default setting and not display the message text in notifications to prevent this issue

That's certainly a better state of affairs. So you just need to fix the default setting and not display the message text in notifications to prevent this issue in the future?