emails fixes