Moving to draft-storey-smtp-client-id-16 ...