Interim design, fixes disposable messages bug.