In the e-mail body settings, add buttons for inserting tags for the names of the fields.

When setting up e-mail body, you can currently add as tags the content of the fields, but not their names (questions). This is in case of long form or long questions quite hassle, and also, if you change the title/question later, it is not updated in the e-mail body and you have to do that manually. Tags for the field names would solve all this.