Fixed up message id parsing