Convert to new iredmail based schema