3.0: fix sip to header, update omnipresence logging and partial revert