More work on toast messages