Use the same folder for old and new Email package