Fix problems with asynchronous email notifications