EMAIL-IMPROVEMENTS