Cloned from https://git.sr.ht/~rjarry/aerc, patched, committed, released, reverted. Please, use the original version.