Another option would be to try this hydroxide patch (that i need to find time to review...):

https://github.com/emersion/hydroxide/pull/282