diff --git a/MANIFEST.in b/MANIFEST.in
index 5594cc6..054635b 100755
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,5 +6,6 @@ include COPYRIGHT
 include LICENSE
 include tryton.cfg
 include *.xml
+include view/*.xml
 include locale/*.po
 include doc/*
diff --git a/electronic_mail_wizard.xml b/electronic_mail_wizard.xml
index b5fe8df..8aaa07c 100755
--- a/electronic_mail_wizard.xml
+++ b/electronic_mail_wizard.xml
@@ -6,29 +6,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
         <record model="ir.ui.view" id="templateemail_start">
             <field name="model">electronic.mail.wizard.templateemail.start</field>
             <field name="type">form</field>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <form string="Send Email" col="2">
-                    <label name="from_"/>
-                    <field name="from_"/>
-                    <label name="to"/>
-                    <field name="to"/>
-                    <label name="cc"/>
-                    <field name="cc"/>
-                    <label name="bcc"/>
-                    <field name="bcc"/>
-                    <label name="subject"/>
-                    <field name="subject"/>
-                    <label name="plain"/>
-                    <field name="plain"/>
-                    <separator name="total" colspan="2"/>
-                    <field name="total" colspan="2"/>
-                    <newline/>
-                    <field name="template" invisible="1"/>
-                    <field name="model" invisible="1"/>
-                </form>
-                ]]>
-            </field>
+            <field name="name">electronic_mail_wizard_templateemail</field>
         </record>
     </data>
 </tryton>
diff --git a/setup.py b/setup.py
index a3f6c33..658c537 100755
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ setup(name='trytonzz_electronic_mail_wizard',
     ],
     package_data={
         'trytond.modules.electronic_mail_wizard': info.get('xml', []) \
-            + ['tryton.cfg', 'locale/*.po'],
+            + ['tryton.cfg', 'view/*.xml', 'locale/*.po'],
     },
     classifiers=[
         'Development Status :: 5 - Production/Stable',
diff --git a/template.xml b/template.xml
index 045081b..8474c6d 100644
--- a/template.xml
+++ b/template.xml
@@ -6,18 +6,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyrig
         <record model="ir.ui.view" id="template_view_form">
             <field name="model">electronic.mail.template</field>
             <field name="inherit" ref="electronic_mail_template.template_view_form"/>
-            <field name="arch" type="xml">
-                <![CDATA[
-                <data>
-                    <xpath
-                        expr="/form/notebook/page[@id='advanced']/field[@name='engine']"
-                        position="after">
-                            <label name="wizard"/>
-                            <field name="wizard"/>
-                    </xpath>
-                </data>
-                ]]>
-            </field>
+            <field name="name">electronic_mail_template_form</field>
         </record>
   </data>
 </tryton>
diff --git a/view/electronic_mail_template_form.xml b/view/electronic_mail_template_form.xml
new file mode 100644
index 0000000..04ab16c
--- /dev/null
+++ b/view/electronic_mail_template_form.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<!-- This file is part electronic_mail_template module for Tryton.
+The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
+<data>
+    <xpath
+        expr="/form/notebook/page[@id='advanced']/field[@name='engine']"
+        position="after">
+            <label name="wizard"/>
+            <field name="wizard"/>
+    </xpath>
+</data>
diff --git a/view/electronic_mail_wizard_templateemail.xml b/view/electronic_mail_wizard_templateemail.xml
new file mode 100644
index 0000000..b749323
--- /dev/null
+++ b/view/electronic_mail_wizard_templateemail.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!-- This file is part electronic_mail_template module for Tryton.
+The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. -->
+<form string="Send Email" col="2">
+    <label name="from_"/>
+    <field name="from_"/>
+    <label name="to"/>
+    <field name="to"/>
+    <label name="cc"/>
+    <field name="cc"/>
+    <label name="bcc"/>
+    <field name="bcc"/>
+    <label name="subject"/>
+    <field name="subject"/>
+    <label name="plain"/>
+    <field name="plain"/>
+    <separator name="total" colspan="2"/>
+    <field name="total" colspan="2"/>
+    <newline/>
+    <field name="template" invisible="1"/>
+    <field name="model" invisible="1"/>
+</form>