it turns out we just need to rewrite the ipadress and not the port. There was some discussion on here some time back of a variant of fix_nated_contact_f that would allow a rewrite of ipaddress only, did this get implemented? If not is there a patch.
Thanks