Fix email sending, Fix javascript bug on add and delete event, deleted trailing white spaces

Hi,
just reapplied the push tp the dev branch, sorry I couldn't do it sooner but weekend is dedicated to the family :)