some modifications for emails