This fix is to allow more than one message to be moved.