builtin-mailinfo.c infrastrcture changes