Yes, see https://matrix.org/docs/spec/olm.html. An implementation of that spec is in final testing and expected to land into master within a couple of weeks.

It's a double-ratchet, very similar to Signal protocol, but unencumbered by the GPL/iOS licensing issues that Signal's implementation has.