Move messages to correct place