Neah/email_changes.diff