LILY-357: Fixed email body not loading and cleaned up some code
Merge branch 'feature/LILY-357-fix-email-body-not-loading' into develop