Compass & Crow - Email bug fix