reworked. only save email local part