Feature/email scripts update

The new commits are b89337a and 5e46ed8