Updated html_email_handler and moved hook to notification_messages