Add support for [cid:], [uid:], and enhanced [au:]