Mend failing email cases, more email cases