Improve message recovery