Fixing smoke i.e. handling save message on approve screen