Use ContactEmail to add federated buddies to the AddressBook. Those on Yahoo get Messenger2 type, and the others get Messenger3. I don't know the difference between them, but I'm going by empirical evidence (from many debug logs). I also don't know what the Capability field is, but I set it to 0 for now. This works in my limited testing with one Yahoo buddy. References #6755.