Fixed all issues relayed by client in email draft