diff --git a/data/website_form_mail.xml b/data/website_form_mail.xml
index 081bd674fe0..eb3295eb87e 100644
--- a/data/website_form_mail.xml
+++ b/data/website_form_mail.xml
@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-        <record id="mail.model_mail_mail" model="ir.model">
-            <field name="website_form_default_field_id" ref="mail.field_mail_mail_body_html" />
-            <field name="website_form_access">True</field>
-            <field name="website_form_label">Send an E-mail</field>
-        </record>
-    </data>
-</openerp>
+<odoo>
+  <data>
+    <record id="mail.model_mail_mail" model="ir.model">
+      <field name="website_form_default_field_id" ref="mail.field_mail_mail_body_html" />
+      <field name="website_form_access">True</field>
+      <field name="website_form_label">Send an E-mail</field>
+    </record>
+    <function model="ir.model.fields" name="formbuilder_whitelist">
+      <value>mail.mail</value>
+      <value eval="[
+        'subject',
+        'body_html',
+        'email_to',
+        'email_from',
+        'record_name',
+        'attachment_ids',
+        ]"/>
+    </function>
+  </data>
+</odoo>