Email bug fixed