I've checked and doublechecked http://hg.adiumx.com/adium/rev/6d66254ee722 , as well as tested it, but this code makes me nervous. If people could take a look that'd be awesome. David