Feature/mail updates