message retry added and tested