Resolved an issue where the Custom Message in guest email notifications was not being saved in certain scenarios.