#562,#563 fix settings, make sure composing state shows