This fixes #2 and also resolves #1 by devrandom: When OTR refresh is initiated by remote, we don't go through state=PLAINTEXT, and the current code doesn't execute important steps if the state doesn't change, even when setting state=ENCRYPTED.