Better handling of persistent messages