Fixed formatting and jid handling of 3rd end-to-end