Better management of the quotes and length of the local part