A proper Email Template is added for better user experience in version 3.10 that works for emails generated by Contact Form, Agent Form and Agency Form.
We have also provided related customization settings. Follow the navigation path based on your version: