Added whitespace trim for message id & domain