Some fixes on editing the emails and the lists