Auto negotiate OTR and resend requests

Not quite clean yet.