Ajustment to message notification logic.