fix: persist custom messages