Fix issue with re-entering wizzard after message creation