6B - Asynchronous emails-fix