Refined failing message handling and splitted responsibilities (move messages and retry messages)