The message id format is more restrictive than I anticipated.   This fixes it for new ids