Fix up the XEP-0280 carbons support.

My initial port of this wasn't great, this is much better.

Testing Done:
sent messages between pidgin2 with gkdr/carbons, conversations on my phone, and pidgin3. I sent messages from all clients and received them on all three clients.

Reviewed at https://reviews.imfreedom.org/r/462/