migrated some otr stuff to new jid classes