Form Builder UI - Customized Email

I have built a “Contact Us” form using the Form Builder UI module. It currently displays all fields when it emails us the values ([submission:values]), even if those fields were not displayed to the person filling out the form because of conditional logic. Therefore, there are a lot of fields without content in the email, which makes it difficult to read. Is there a way to have the form ONLY email us the values that have content?

As an example, this is what our email currently looks like:

Full Name: Michelle Hutchings

Email: michelle.hutchings@yale.edu

I am a(n): Parent/Guardian

If other, please explain:

Child’s Name: TEST

Student’s Name:

Organization (if applicable):

Reference Number (can be found in upper right of application or status page):

Subject: Application - Eligibility

YYGS Session: New Haven 2017

Please list your YYGS Session and Year:

Is your inquiry about a specific New Haven session? (optional): Politics, Law, & Economics

Comments: TEST

Thank you!