Fix the save message button, using new functionality marc introduced yesterday.