Trimed the format and added a message ID