Try to fix "Message editor problem" (#219)