Bug/emailstorage

Small fixes regarding email sending.