diff --git a/addons/mail/mail_demo.xml b/addons/mail/mail_demo.xml
index 1adec42a910..6c25b59e35d 100644
--- a/addons/mail/mail_demo.xml
+++ b/addons/mail/mail_demo.xml
@@ -28,7 +28,7 @@
             <field name="subject">Internal company announce</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
-            <field name="subtype">html</field>
+            <field name="content_subtype">html</field>
             <field name="body_html"><![CDATA[Lorem ipsum dolor <b>sit amet</b>, consectetur <em>adipiscing elit</em>. Pellentesque et quam sapien, in sagittis tellus. 
             Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla. 
 
@@ -44,7 +44,7 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in
             <field name="subject">Reply</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
-            <field name="subtype">html</field>
+            <field name="content_subtype">html</field>
             <field name="body_html"><![CDATA[That was such a <b>tremendous</b> blogpost !  (first comment)]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
             <field name="type">comment</field>
@@ -55,7 +55,7 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in
             <field name="subject">Reply</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
-            <field name="subtype">html</field>
+            <field name="content_subtype">html</field>
             <field name="body_html"><![CDATA[Agreed !  
 Would it be possible to learn more about the author ?  (second comment)]]></field>
             <field name="parent_id" ref="message_blogpost0"/>
@@ -78,7 +78,7 @@ Would it be possible to learn more about the author ?  (second comment)]]></fiel
             <field name="subject">Reply</field>
             <field name="model">mail.group</field>
             <field name="res_id" ref="group_all_company"/>
-            <field name="subtype">html</field>
+            <field name="content_subtype">html</field>
             <field name="body_html"><![CDATA[Sure: Curabitur tempor bibendum diam, et euismod ante rutrum vel. 
 
 In quis purus neque. Integer sodales dolor eu elit fringilla blandit. Maecenas lacus nisi, facilisis sit amet viverra eu, tristique vel augue.