LILY-492: Clean up sender of email
Merge branch 'feature/LILY-492-cleanup-sender-in-email-list' into develop