adium/adium

4a5092083b6b
Credit Chenguang Li for his patch, changelog the fix. References #15915.

Also some minor reshuffiing of the other changes.
4151ac3a3b1f9847b8d958f1c7d57a345d442266 1.5