move tags into message body as their own fields