Fix bogus context on crypto state mixing (issue #620)
Fix breakage in message composition, caused by cache fixes (issue #620)