Fix regression in replying due to draft refactor