fix OTR_QUERY_RE

allow the otr query string ("?OTR?...") to appear anywhere within the
message as per the spec
Merge branch 'query-lineending'