diff --git a/addons/hr_livechat/__init__.py b/addons/hr_livechat/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/addons/hr_livechat/__manifest__.py b/addons/hr_livechat/__manifest__.py
new file mode 100644
index 00000000000..9d75a8652bc
--- /dev/null
+++ b/addons/hr_livechat/__manifest__.py
@@ -0,0 +1,13 @@
+{
+    'name': 'HR - Livechat',
+    'version': '1.0',
+    'category': 'Human Resources',
+    'description': """
+        Bridge between HR and Livechat.""",
+    'depends': ['hr', 'im_livechat'],
+    'data': [
+        'views/discuss_channel_views.xml',
+    ],
+    'auto_install': True,
+    'license': 'LGPL-3',
+}
diff --git a/addons/hr_livechat/views/discuss_channel_views.xml b/addons/hr_livechat/views/discuss_channel_views.xml
new file mode 100644
index 00000000000..c0bbf14d7e0
--- /dev/null
+++ b/addons/hr_livechat/views/discuss_channel_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<odoo>
+    <data>
+        <record id="discuss_channel_view_search" model="ir.ui.view">
+            <field name="name">discuss.channel.search.inherit.hr.livechat</field>
+            <field name="model">discuss.channel</field>
+            <field name="inherit_id" ref="im_livechat.discuss_channel_view_search"/>
+            <field name="arch" type="xml">
+                <xpath expr="//*[@name='filter_my_sessions']" position="after">
+                    <filter name="filter_my_team" domain="[('channel_member_ids.partner_id.user_ids.employee_id.member_of_department', '=', True)]" string="My Team"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/im_livechat/__init__.py b/addons/im_livechat/__init__.py
index 2da4912a4ba..b8980e258a2 100644
--- a/addons/im_livechat/__init__.py
+++ b/addons/im_livechat/__init__.py
@@ -2,3 +2,4 @@
 from . import controllers
 from . import models
 from . import report
+from . import demo
diff --git a/addons/im_livechat/__manifest__.py b/addons/im_livechat/__manifest__.py
index 353d419e4d2..e72519d3ee0 100644
--- a/addons/im_livechat/__manifest__.py
+++ b/addons/im_livechat/__manifest__.py
@@ -40,8 +40,19 @@ Help your customers with this chat, and analyse their feedback.
         "report/im_livechat_report_operator_views.xml"
     ],
     'demo': [
-        "data/im_livechat_channel_demo.xml",
-        'data/discuss_shortcode_demo.xml',
+        "demo/im_livechat_channel/im_livechat_channel.xml",
+        "demo/im_livechat_channel/im_livechat_session_1.xml",
+        "demo/im_livechat_channel/im_livechat_session_2.xml",
+        "demo/im_livechat_channel/im_livechat_session_3.xml",
+        "demo/im_livechat_channel/im_livechat_session_4.xml",
+        "demo/im_livechat_channel/im_livechat_session_5.xml",
+        "demo/im_livechat_channel/im_livechat_session_6.xml",
+        "demo/im_livechat_channel/im_livechat_session_7.xml",
+        "demo/im_livechat_channel/im_livechat_session_8.xml",
+        "demo/im_livechat_channel/im_livechat_session_9.xml",
+        "demo/im_livechat_channel/im_livechat_session_10.xml",
+        "demo/im_livechat_channel/im_livechat_session_11.xml",
+        "demo/discuss_shortcode/discuss_shortcode_demo.xml",
     ],
     'depends': ["mail", "rating", "digest", "utm"],
     'installable': True,
diff --git a/addons/im_livechat/data/im_livechat_channel_demo.xml b/addons/im_livechat/data/im_livechat_channel_demo.xml
deleted file mode 100644
index 588264ff41c..00000000000
--- a/addons/im_livechat/data/im_livechat_channel_demo.xml
+++ /dev/null
@@ -1,502 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <data>
-        <record id="im_livechat_channel_rule_demo" model="im_livechat.channel.rule">
-            <field name="regex_url">/im_livechat/</field>
-            <field name="action">auto_popup</field>
-            <field name="auto_popup_timer">3</field>
-            <field name="channel_id" ref="im_livechat_channel_data"/>
-        </record>
-        <record id="im_livechat.im_livechat_group_user" model="res.groups">
-            <field eval="[(4, ref('base.user_demo'))]" name="users"/>
-        </record>
-        <record id="im_livechat_channel_data" model="im_livechat.channel">
-            <field eval="[(4, ref('base.user_admin'))]" name="user_ids"/>
-        </record>
-        <record id="im_livechat_channel_data" model="im_livechat.channel">
-            <field eval="[(4, ref('base.user_demo'))]" name="user_ids"/>
-        </record>
-        <!-- Session 0 -->
-        <record id="im_livechat_discuss_channel_data_0" model="discuss.channel">
-            <field name="channel_type">livechat</field>
-            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
-            <field name="livechat_operator_id" ref="base.partner_admin"/>
-            <field name="name">Visitor #234, Mitchell Admin</field>
-            <field name="anonymous_name">Visitor #234, Mitchell Admin</field>
-        </record>
-        <record id="im_livechat_rating_1" model="rating.rating">
-            <field name="access_token">LIVECHAT_1</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_0"/>
-            <field name="res_model_id" ref="mail.model_discuss_channel"/>
-            <field name="rated_partner_id" ref="base.partner_admin"/>
-            <field eval="False" name="partner_id"/>
-            <field eval="True" name="consumed"/>
-        </record>
-        <function model="discuss.channel" name="rating_apply"
-            eval="([ref('im_livechat.im_livechat_discuss_channel_data_0')], 5, 'LIVECHAT_1', None, 'Good Job')"/>
-        <record id="im_livechat_mail_message_5_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_0"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_admin"/>
-            <field name="body">You're welcome, have a nice day!</field>
-            <field eval="DateTime.today() + relativedelta(months=-1, days=-0, minutes=5)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_4_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_0"/>
-            <field name="message_type">email</field>
-            <field eval="False" name="author_id"/>
-            <field name="body">Great! Thanks for the info</field>
-            <field eval="DateTime.today() + relativedelta(months=-1, days=-0, minutes=4)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_3_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_0"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_admin"/>
-            <field name="body">Yes, you can use our Timesheets application to record your time efficiently!</field>
-            <field eval="DateTime.today() + relativedelta(months=-1, days=-0, minutes=3)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_2_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_0"/>
-            <field name="message_type">email</field>
-            <field eval="False" name="author_id"/>
-            <field name="body">I'm looking for an application to record my timesheet, any tips?</field>
-            <field eval="DateTime.today() + relativedelta(months=-1, days=-0, minutes=2)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_1_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_0"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_admin"/>
-            <field name="body">Hello, how may I help you?</field>
-            <field eval="DateTime.today() + relativedelta(months=-1, days=-0, minutes=1)" name="date"/>
-        </record>
-        <!-- Session 1 -->
-        <record id="im_livechat_discuss_channel_data_1" model="discuss.channel">
-            <field name="channel_type">livechat</field>
-            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
-            <field name="livechat_operator_id" ref="base.partner_demo"/>
-            <field name="name">Visitor #323, Marc Demo</field>
-            <field name="anonymous_name">Visitor #323, Marc Demo</field>
-        </record>
-        <record id="im_livechat_rating_2" model="rating.rating">
-            <field name="access_token">LIVECHAT_2</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_1"/>
-            <field name="res_model_id" ref="mail.model_discuss_channel"/>
-            <field name="rated_partner_id" ref="base.partner_demo"/>
-            <field eval="False" name="partner_id"/>
-            <field eval="True" name="consumed"/>
-        </record>
-        <function model="discuss.channel" name="rating_apply"
-            eval="([ref('im_livechat.im_livechat_discuss_channel_data_1')], 5, 'LIVECHAT_2', None, 'Super Job')"/>
-        <record id="im_livechat_mail_message_10_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_1"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_demo"/>
-            <field name="body">You're welcome, enjoy Odoo!</field>
-            <field eval="DateTime.today() + relativedelta(months=-1, days=-1, minutes=10)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_9_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_1"/>
-            <field name="message_type">email</field>
-            <field eval="False" name="author_id"/>
-            <field name="body">Awesome, thanks!</field>
-            <field eval="DateTime.today() + relativedelta(months=-1, days=-1, minutes=9)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_8_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_1"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_demo"/>
-            <field name="body">Yes, we just released a new application called Social Marketing that should fit your needs! Check it out :)</field>
-            <field eval="DateTime.today() + relativedelta(months=-1, days=-1, minutes=8)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_7_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_1"/>
-            <field name="message_type">email</field>
-            <field eval="False" name="author_id"/>
-            <field name="body">I was wondering if Odoo has an application to easily manage social media for my business..</field>
-            <field eval="DateTime.today() + relativedelta(months=-1, days=-1, minutes=7)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_6_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_1"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_demo"/>
-            <field name="body">Hello, how may I help you?</field>
-            <field eval="DateTime.today() + relativedelta(months=-1, days=-1, minutes=6)" name="date"/>
-        </record>
-        <!-- Session 2 -->
-        <record id="im_livechat_discuss_channel_data_2" model="discuss.channel">
-            <field name="channel_type">livechat</field>
-            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
-            <field name="livechat_operator_id" ref="base.partner_admin"/>
-            <field name="name">Joel Willis, Mitchell Admin</field>
-            <field name="anonymous_name">Joel Willis, Mitchell Admin</field>
-        </record>
-        <record id="im_livechat_rating_3" model="rating.rating">
-            <field name="access_token">LIVECHAT_3</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_2"/>
-            <field name="res_model_id" ref="mail.model_discuss_channel"/>
-            <field name="rated_partner_id" ref="base.partner_admin"/>
-            <field name="partner_id" ref="base.partner_demo_portal"/>
-            <field eval="True" name="consumed"/>
-        </record>
-        <function model="discuss.channel" name="rating_apply"
-            eval="([ref('im_livechat.im_livechat_discuss_channel_data_2')], 5, 'LIVECHAT_3', None, 'Mega Job')"/>
-
-        <record id="im_livechat_mail_message_14_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_2"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_demo_portal"/>
-            <field name="body">Oh :(</field>
-            <field eval="DateTime.today() + relativedelta(months=-1, days=-2, minutes=14)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_13_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_2"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_admin"/>
-            <field name="body">Nope, sorry to disappoint :(</field>
-            <field eval="DateTime.today() + relativedelta(months=-1, days=-2, minutes=13)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_12_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_2"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_demo_portal"/>
-            <field name="body">Hello, are you single?</field>
-            <field eval="DateTime.today() + relativedelta(months=-1, days=-2, minutes=12)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_11_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_2"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_admin"/>
-            <field name="body">Hello, how may I help you?</field>
-            <field eval="DateTime.today() + relativedelta(months=-1, days=-2, minutes=11)" name="date"/>
-        </record>
-        <!-- Session 3 -->
-        <record id="im_livechat_discuss_channel_data_3" model="discuss.channel">
-            <field name="channel_type">livechat</field>
-            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
-            <field name="livechat_operator_id" ref="base.partner_demo"/>
-            <field name="name">Joel Willis, Marc Demo</field>
-            <field name="anonymous_name">Joel Willis, Marc Demo</field>
-        </record>
-        <record id="im_livechat_rating_4" model="rating.rating">
-            <field name="access_token">LIVECHAT_4</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_3"/>
-            <field name="res_model_id" ref="mail.model_discuss_channel"/>
-            <field name="rated_partner_id" ref="base.partner_demo"/>
-            <field name="partner_id" ref="base.partner_demo_portal"/>
-            <field eval="True" name="consumed"/>
-        </record>
-        <function model="discuss.channel" name="rating_apply"
-            eval="([ref('im_livechat.im_livechat_discuss_channel_data_3')], 5, 'LIVECHAT_4', None, 'Good Job')"/>
-
-        <record id="im_livechat_mail_message_17_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_3"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_demo_portal"/>
-            <field name="body">Thanks for the info, I'll look into it!</field>
-            <field eval="DateTime.today() + relativedelta(months=-2, days=-3, minutes=17)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_16_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_3"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_demo"/>
-            <field name="body">Hello Joel Willis, you're at the right place! You can customize Odoo using our Studio application in just a few clicks.</field>
-            <field eval="DateTime.today() + relativedelta(months=-2, days=-3, minutes=16)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_15_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_3"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_demo_portal"/>
-            <field name="body">Hello, I'm looking for a software that can be easily updated with my needs.</field>
-            <field eval="DateTime.today() + relativedelta(months=-2, days=-3, minutes=15)" name="date"/>
-        </record>
-        <!-- Session 4 -->
-        <record id="im_livechat_discuss_channel_data_4" model="discuss.channel">
-            <field name="channel_type">livechat</field>
-            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
-            <field name="livechat_operator_id" ref="base.partner_admin"/>
-            <field name="name">Visitor #532, Mitchell Admin</field>
-            <field name="anonymous_name">Visitor #532, Mitchell Admin</field>
-        </record>
-        <record id="im_livechat_rating_5" model="rating.rating">
-            <field name="access_token">LIVECHAT_5</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_4"/>
-            <field name="res_model_id" ref="mail.model_discuss_channel"/>
-            <field name="rated_partner_id" ref="base.partner_admin"/>
-            <field eval="False" name="partner_id"/>
-            <field eval="True" name="consumed"/>
-        </record>
-        <function model="discuss.channel" name="rating_apply"
-            eval="([ref('im_livechat.im_livechat_discuss_channel_data_4')], 5, 'LIVECHAT_5', None, 'Super Job')"/>
-        <record id="im_livechat_mail_message_21_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_4"/>
-            <field name="message_type">email</field>
-            <field eval="False" name="author_id"/>
-            <field name="body">Ok.. Will do, thanks</field>
-            <field eval="DateTime.today() + relativedelta(months=-2, days=-4, minutes=21)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_20_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_4"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_admin"/>
-            <field name="body">Hi, if you need help with your database, feel free to contact our support via http://www.odoo.com/help</field>
-            <field eval="DateTime.today() + relativedelta(months=-2, days=-4, minutes=20)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_19_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_4"/>
-            <field name="message_type">email</field>
-            <field eval="False" name="author_id"/>
-            <field name="body">Hello, it seems that I can't log in to my database. Can you help?</field>
-            <field eval="DateTime.today() + relativedelta(months=-2, days=-4, minutes=19)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_18_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_4"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_admin"/>
-            <field name="body">Hello, how may I help you?</field>
-            <field eval="DateTime.today() + relativedelta(months=-2, days=-4, minutes=18)" name="date"/>
-        </record>
-        <!-- Session 5 -->
-        <record id="im_livechat_discuss_channel_data_5" model="discuss.channel">
-            <field name="channel_type">livechat</field>
-            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
-            <field name="livechat_operator_id" ref="base.partner_admin"/>
-            <field name="name">Visitor #649, Mitchell Admin</field>
-            <field name="anonymous_name">Visitor #649, Mitchell Admin</field>
-        </record>
-        <record id="im_livechat_rating_6" model="rating.rating">
-            <field name="access_token">LIVECHAT_6</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_5"/>
-            <field name="res_model_id" ref="mail.model_discuss_channel"/>
-            <field name="rated_partner_id" ref="base.partner_admin"/>
-            <field eval="False" name="partner_id"/>
-            <field eval="True" name="consumed"/>
-        </record>
-        <function model="discuss.channel" name="rating_apply"
-            eval="([ref('im_livechat.im_livechat_discuss_channel_data_5')], 5, 'LIVECHAT_6', None, 'Good Job')"/>
-        <record id="im_livechat_mail_message_25_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_5"/>
-            <field name="message_type">email</field>
-            <field eval="False" name="author_id"/>
-            <field name="body">Thanks!</field>
-            <field eval="DateTime.today() + relativedelta(months=-3, days=-5, minutes=25)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_24_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_5"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_admin"/>
-            <field name="body">Yes, of course, you can find it here: https://www.odoo.com/documentation/master/</field>
-            <field eval="DateTime.today() + relativedelta(months=-3, days=-5, minutes=24)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_23_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_5"/>
-            <field name="message_type">email</field>
-            <field eval="False" name="author_id"/>
-            <field name="body">Hello, I'm a bit lost in the Invetory module, is there some documentation I could find?</field>
-            <field eval="DateTime.today() + relativedelta(months=-3, days=-5, minutes=23)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_22_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_5"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_admin"/>
-            <field name="body">Hello, how may I help you?</field>
-            <field eval="DateTime.today() + relativedelta(months=-3, days=-5, minutes=22)" name="date"/>
-        </record>
-        <!-- Session 6 -->
-        <record id="im_livechat_discuss_channel_data_6" model="discuss.channel">
-            <field name="channel_type">livechat</field>
-            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
-            <field name="livechat_operator_id" ref="base.partner_admin"/>
-            <field name="name">Joel Willis, Mitchell Admin</field>
-            <field name="anonymous_name">Joel Willis, Mitchell Admin</field>
-        </record>
-        <record id="im_livechat_rating_7" model="rating.rating">
-            <field name="access_token">LIVECHAT_7</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_6"/>
-            <field name="res_model_id" ref="mail.model_discuss_channel"/>
-            <field name="rated_partner_id" ref="base.partner_admin"/>
-            <field name="partner_id" ref="base.partner_demo_portal"/>
-            <field eval="True" name="consumed"/>
-        </record>
-        <function model="discuss.channel" name="rating_apply"
-            eval="([ref('im_livechat.im_livechat_discuss_channel_data_6')], 5, 'LIVECHAT_7', None, 'Super Job')"/>
-        <record id="im_livechat_mail_message_29_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_6"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_demo_portal"/>
-            <field name="body">Good to hear, thanks!</field>
-            <field eval="DateTime.today() + relativedelta(months=-3, days=-6, minutes=29)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_28_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_6"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_admin"/>
-            <field name="body">Joel Willis, you'll need our Inventory and Sales application to do so. You can try them for 15 days, FOR FREE :)</field>
-            <field eval="DateTime.today() + relativedelta(months=-3, days=-6, minutes=28)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_27_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_6"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_demo_portal"/>
-            <field name="body">Hi, I need a software to easily manage my stock, and generate sales orders.</field>
-            <field eval="DateTime.today() + relativedelta(months=-3, days=-6, minutes=27)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_26_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_6"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_admin"/>
-            <field name="body">Hello, how may I help you?</field>
-            <field eval="DateTime.today() + relativedelta(months=-3, days=-6, minutes=26)" name="date"/>
-        </record>
-        <!-- Session 7 -->
-        <record id="im_livechat_discuss_channel_data_7" model="discuss.channel">
-            <field name="channel_type">livechat</field>
-            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
-            <field name="livechat_operator_id" ref="base.partner_demo"/>
-            <field name="name">Visitor #722, Marc Demo</field>
-            <field name="anonymous_name">Visitor #722, Marc Demo</field>
-        </record>
-        <record id="im_livechat_rating_8" model="rating.rating">
-            <field name="access_token">LIVECHAT_8</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_7"/>
-            <field name="res_model_id" ref="mail.model_discuss_channel"/>
-            <field name="rated_partner_id" ref="base.partner_demo"/>
-            <field eval="False" name="partner_id"/>
-            <field eval="True" name="consumed"/>
-        </record>
-        <function model="discuss.channel" name="rating_apply"
-            eval="([ref('im_livechat.im_livechat_discuss_channel_data_7')], 5, 'LIVECHAT_8', None, 'Super Job')"/>
-        <record id="im_livechat_mail_message_33_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_7"/>
-            <field name="message_type">email</field>
-            <field eval="False" name="author_id"/>
-            <field name="body">I'm great, thanks for asking!</field>
-            <field eval="DateTime.today() + relativedelta(months=-3, days=-7, minutes=33)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_32_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_7"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_demo"/>
-            <field name="body">I'm fine, and you?</field>
-            <field eval="DateTime.today() + relativedelta(months=-3, days=-7, minutes=32)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_31_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_7"/>
-            <field name="message_type">email</field>
-            <field eval="False" name="author_id"/>
-            <field name="body">Heeeey Marc, how are you?</field>
-            <field eval="DateTime.today() + relativedelta(months=-3, days=-7, minutes=31)" name="date"/>
-        </record>
-        <record id="im_livechat_mail_message_30_data" model="mail.message">
-            <field name="model">discuss.channel</field>
-            <field name="res_id" ref="im_livechat.im_livechat_discuss_channel_data_7"/>
-            <field name="message_type">email</field>
-            <field name="author_id" ref="base.partner_demo"/>
-            <field name="body">Hello, how may I help you?</field>
-            <field eval="DateTime.today() + relativedelta(months=-3, days=-7, minutes=30)" name="date"/>
-        </record>
-
-        <record id="discuss_channel_livechat_1" model="discuss.channel">
-            <field name="name">Visitor, Mitchell Admin</field>
-            <field name="livechat_operator_id" ref="base.partner_admin"/>
-            <field name="livechat_channel_id" ref="im_livechat.im_livechat_channel_data"/>
-            <field name="create_date" eval="datetime.now() - timedelta(days=1)"/>
-            <field name="channel_type">livechat</field>
-        </record>
-
-        <record id="mail_message_livechat_1" model="mail.message">
-            <field name="author_id" eval="False"/>
-            <field name="record_name">Visitor</field>
-            <field name="date" eval="datetime.now() - timedelta(days=1)"/>
-            <field name="create_date" eval="datetime.now() - timedelta(days=1)"/>
-            <field name="body">Hi</field>
-            <field name="res_id" ref="im_livechat.discuss_channel_livechat_1"/>
-            <field name="model">discuss.channel</field>
-        </record>
-        <record id="mail_message_livechat_2" model="mail.message">
-            <field name="author_id" ref="base.partner_admin"/>
-            <field name="date" eval="datetime.now() - timedelta(days=1, seconds=-15)"/>
-            <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-15)"/>
-            <field name="body">Hello, how may I help you?</field>
-            <field name="res_id" ref="im_livechat.discuss_channel_livechat_1"/>
-            <field name="model">discuss.channel</field>
-        </record>
-        <record id="mail_message_livechat_3" model="mail.message">
-            <field name="author_id" eval="False"/>
-            <field name="record_name">Visitor</field>
-            <field name="date" eval="datetime.now() - timedelta(days=1, seconds=-25)"/>
-            <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-25)"/>
-            <field name="body">I would like to know more about the CRM application</field>
-            <field name="res_id" ref="im_livechat.discuss_channel_livechat_1"/>
-            <field name="model">discuss.channel</field>
-        </record>
-        <record id="mail_message_livechat_4" model="mail.message">
-            <field name="author_id" ref="base.partner_admin"/>
-            <field name="date" eval="datetime.now() - timedelta(days=1, seconds=-33)"/>
-            <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-33)"/>
-            <field name="body">The CRM application helps you to track leads, close opportunities and get accurate forecasts. You can test it for free on our website.</field>
-            <field name="res_id" ref="im_livechat.discuss_channel_livechat_1"/>
-            <field name="model">discuss.channel</field>
-        </record>
-        <record id="mail_message_livechat_5" model="mail.message">
-            <field name="author_id" eval="False"/>
-            <field name="record_name">Visitor</field>
-            <field name="date" eval="datetime.now() - timedelta(days=1, seconds=-42)"/>
-            <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-42)"/>
-            <field name="body">Great, thanks!</field>
-            <field name="res_id" ref="im_livechat.discuss_channel_livechat_1"/>
-            <field name="model">discuss.channel</field>
-        </record>
-        <record id="mail_message_livechat_6" model="mail.message">
-            <field name="author_id" eval="False"/>
-            <field name="record_name">Visitor</field>
-            <field name="date" eval="datetime.now() - timedelta(days=1, seconds=-53)"/>
-            <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-53)"/>
-            <field name="body">Rating: :-)</field>
-            <field name="res_id" ref="im_livechat.discuss_channel_livechat_1"/>
-            <field name="model">discuss.channel</field>
-        </record>
-        <record id="rating_rating_livechat_1" model="rating.rating">
-            <field name="access_token">LIVECHAT_9</field>
-            <field name="res_model_id" ref="mail.model_discuss_channel"/>
-            <field name="rated_partner_id" ref="base.partner_admin"/>
-            <field name="partner_id" ref="base.partner_admin"/>
-            <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-53)"/>
-            <field name="res_id" ref="im_livechat.discuss_channel_livechat_1"/>
-        </record>
-        <function model="discuss.channel" name="rating_apply"
-            eval="([ref('im_livechat.discuss_channel_livechat_1')], 5, 'LIVECHAT_9', None, 'Super Job')"/>
-
-    </data>
-</odoo>
diff --git a/addons/im_livechat/data/discuss_shortcode_demo.xml b/addons/im_livechat/demo/discuss_shortcode/discuss_shortcode_demo.xml
similarity index 100%
rename from addons/im_livechat/data/discuss_shortcode_demo.xml
rename to addons/im_livechat/demo/discuss_shortcode/discuss_shortcode_demo.xml
diff --git a/addons/im_livechat/demo/im_livechat_channel/im_livechat_channel.xml b/addons/im_livechat/demo/im_livechat_channel/im_livechat_channel.xml
new file mode 100644
index 00000000000..cca8bf9e3ad
--- /dev/null
+++ b/addons/im_livechat/demo/im_livechat_channel/im_livechat_channel.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<odoo>
+    <data>
+        <record id="im_livechat_channel_rule_demo" model="im_livechat.channel.rule">
+            <field name="regex_url">/im_livechat/</field>
+            <field name="action">auto_popup</field>
+            <field name="auto_popup_timer">3</field>
+            <field name="channel_id" ref="im_livechat_channel_data"/>
+        </record>
+        <record id="im_livechat.im_livechat_group_user" model="res.groups">
+            <field eval="[(4, ref('base.user_demo'))]" name="users"/>
+        </record>
+        <record id="im_livechat_channel_data" model="im_livechat.channel">
+            <field eval="[(4, ref('base.user_admin')), (4, ref('base.user_demo'))]" name="user_ids"/>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_1.xml b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_1.xml
new file mode 100644
index 00000000000..66e76983449
--- /dev/null
+++ b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_1.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<odoo>
+    <data>
+        <record id="livechat_channel_session_1" model="discuss.channel">
+            <field name="channel_type">livechat</field>
+            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
+            <field name="livechat_operator_id" ref="base.partner_admin"/>
+            <field name="name">Visitor #234, Mitchell Admin</field>
+            <field name="anonymous_name">Visitor #234, Mitchell Admin</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_1_member_admin" model="discuss.channel.member">
+            <field name="partner_id" ref="base.partner_admin"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_1"/>
+            <field name="is_pinned">False</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_1_member_public" model="discuss.channel.member">
+            <field name="partner_id" ref="base.public_partner"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_1"/>
+        </record>
+
+        <record id="livechat_channel_session_1_message_1" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_1"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="body">Hello, how may I help you?</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-0, minutes=1)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_1_message_2" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_1"/>
+            <field name="message_type">email</field>
+            <field eval="False" name="author_id"/>
+            <field name="email_from">Visitor</field>
+            <field name="body">I'm looking for an application to record my timesheet, any tips?</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-0, minutes=2)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_1_message_3" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_1"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="body">Yes, you can use our Timesheets application to record your time efficiently!</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-0, minutes=3)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_1_message_4" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_1"/>
+            <field name="message_type">email</field>
+            <field eval="False" name="author_id"/>
+            <field name="email_from">Visitor</field>
+            <field name="body">Great! Thanks for the info</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-0, minutes=4)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_1_message_5" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_1"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="body">You're welcome, have a nice day!</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-0, minutes=5)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_1_rating_message" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_1"/>
+            <field name="author_id" ref="base.public_partner"/>
+            <field name="subtype_id" ref="mail.mt_note"/>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-0, minutes=5, seconds=25)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_1_rating" model="rating.rating">
+            <field name="access_token">LIVECHAT_1</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_1"/>
+            <field name="res_model_id" ref="mail.model_discuss_channel"/>
+            <field name="message_id" ref="livechat_channel_session_1_rating_message"/>
+            <field name="rated_partner_id" ref="base.partner_admin"/>
+            <field eval="False" name="partner_id"/>
+            <field eval="True" name="consumed"/>
+        </record>
+        <function model="discuss.channel" name="rating_apply"
+            eval="([ref('im_livechat.livechat_channel_session_1')], 5, 'LIVECHAT_1', None, 'Good Job')"/>
+    </data>
+</odoo>
diff --git a/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_10.xml b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_10.xml
new file mode 100644
index 00000000000..5fe63ec605e
--- /dev/null
+++ b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_10.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0"?>
+<odoo>
+    <data>
+        <record id="livechat_channel_session_10" model="discuss.channel">
+            <field name="name">Visitor, Mitchell Admin</field>
+            <field name="livechat_operator_id" ref="base.partner_admin"/>
+            <field name="livechat_channel_id" ref="im_livechat.im_livechat_channel_data"/>
+            <field name="create_date" eval="datetime.now() - timedelta(days=1)"/>
+            <field name="channel_type">livechat</field>
+            <field name="country_id" ref="base.be"/>
+        </record>
+        <record id="im_livechat.livechat_channel_session_10_member_admin" model="discuss.channel.member">
+            <field name="partner_id" ref="base.partner_admin"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_10"/>
+            <field name="is_pinned">False</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_10_member_public" model="discuss.channel.member">
+            <field name="partner_id" ref="base.public_partner"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_10"/>
+        </record>
+
+        <record id="livechat_channel_session_10_message_1" model="mail.message">
+            <field name="author_id" eval="False"/>
+            <field name="email_from">Visitor</field>
+            <field name="record_name">Visitor</field>
+            <field name="date" eval="datetime.now() - timedelta(days=1)"/>
+            <field name="create_date" eval="datetime.now() - timedelta(days=1)"/>
+            <field name="write_date" eval="datetime.now() - timedelta(days=1)"/>
+            <field name="body">Hi</field>
+            <field name="message_type">comment</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_10"/>
+            <field name="model">discuss.channel</field>
+        </record>
+        <record id="livechat_channel_session_10_message_2" model="mail.message">
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="date" eval="datetime.now() - timedelta(days=1, seconds=-15)"/>
+            <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-15)"/>
+            <field name="write_date" eval="datetime.now() - timedelta(days=1, seconds=-15)"/>
+            <field name="body">Hello, how may I help you?</field>
+            <field name="message_type">comment</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_10"/>
+            <field name="model">discuss.channel</field>
+        </record>
+        <record id="livechat_channel_session_10_message_3" model="mail.message">
+            <field name="author_id" eval="False"/>
+            <field name="email_from">Visitor</field>
+            <field name="record_name">Visitor</field>
+            <field name="date" eval="datetime.now() - timedelta(days=1, seconds=-25)"/>
+            <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-25)"/>
+            <field name="write_date" eval="datetime.now() - timedelta(days=1, seconds=-25)"/>
+            <field name="body">I would like to know more about the discuss application</field>
+            <field name="message_type">comment</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_10"/>
+            <field name="model">discuss.channel</field>
+        </record>
+        <record id="livechat_channel_session_10_rating_message" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_10"/>
+            <field name="author_id" ref="base.public_partner"/>
+            <field name="subtype_id" ref="mail.mt_note"/>
+            <field eval="datetime.now() - timedelta(days=1, seconds=-60)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_10_rating" model="rating.rating">
+            <field name="access_token">LIVECHAT_10</field>
+            <field name="res_model_id" ref="mail.model_discuss_channel"/>
+            <field name="message_id" ref="im_livechat.livechat_channel_session_10_rating_message"/>
+            <field name="rated_partner_id" ref="base.partner_admin"/>
+            <field name="partner_id" ref="base.partner_admin"/>
+            <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-53)"/>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_10"/>
+        </record>
+        <function model="discuss.channel" name="rating_apply"
+            eval="([ref('im_livechat.livechat_channel_session_10')], 2, 'LIVECHAT_10', None, 'Not so good')"/>
+    </data>
+</odoo>
diff --git a/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_11.xml b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_11.xml
new file mode 100644
index 00000000000..b1e45057de9
--- /dev/null
+++ b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_11.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0"?>
+<odoo>
+    <data>
+        <record id="livechat_channel_session_11" model="discuss.channel">
+            <field name="name">Visitor, Mitchell Admin</field>
+            <field name="livechat_operator_id" ref="base.partner_admin"/>
+            <field name="livechat_channel_id" ref="im_livechat.im_livechat_channel_data"/>
+            <field name="create_date" eval="datetime.now()"/>
+            <field name="channel_type">livechat</field>
+            <field name="country_id" ref="base.us"/>
+        </record>
+        <record id="im_livechat.livechat_channel_session_11_member_admin" model="discuss.channel.member">
+            <field name="partner_id" ref="base.partner_admin"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_11"/>
+        </record>
+        <record id="im_livechat.livechat_channel_session_11_member_public" model="discuss.channel.member">
+            <field name="partner_id" ref="base.public_partner"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_11"/>
+        </record>
+
+        <record id="livechat_channel_session_11_message_1" model="mail.message">
+            <field name="author_id" eval="False"/>
+            <field name="record_name">Visitor</field>
+            <field name="date" eval="datetime.now()"/>
+            <field name="create_date" eval="datetime.now()"/>
+            <field name="write_date" eval="datetime.now()"/>
+            <field name="body">Hi</field>
+            <field name="email_from">Visitor</field>
+            <field name="message_type">comment</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_11"/>
+            <field name="model">discuss.channel</field>
+        </record>
+        <record id="livechat_channel_session_11_message_2" model="mail.message">
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="date" eval="datetime.now() - timedelta(seconds=-15)"/>
+            <field name="create_date" eval="datetime.now() - timedelta(seconds=-15)"/>
+            <field name="write_date" eval="datetime.now() - timedelta(seconds=-15)"/>
+            <field name="body">Hello, how may I help you?</field>
+            <field name="message_type">comment</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_11"/>
+            <field name="model">discuss.channel</field>
+        </record>
+        <record id="livechat_channel_session_11_message_3" model="mail.message">
+            <field name="author_id" eval="False"/>
+            <field name="record_name">Visitor</field>
+            <field name="date" eval="datetime.now() - timedelta(seconds=-25)"/>
+            <field name="create_date" eval="datetime.now() - timedelta(seconds=-25)"/>
+            <field name="write_date" eval="datetime.now() - timedelta(seconds=-25)"/>
+            <field name="email_from">Visitor</field>
+            <field name="body">I would like to know more about the Discuss application</field>
+            <field name="message_type">comment</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_11"/>
+            <field name="model">discuss.channel</field>
+        </record>
+    </data>
+</odoo>
diff --git a/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_2.xml b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_2.xml
new file mode 100644
index 00000000000..ae9b8773ee8
--- /dev/null
+++ b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_2.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0"?>
+<odoo>
+    <data>
+        <record id="livechat_channel_session_2" model="discuss.channel">
+            <field name="channel_type">livechat</field>
+            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
+            <field name="livechat_operator_id" ref="base.partner_demo"/>
+            <field name="name">Visitor #323, Marc Demo</field>
+            <field name="anonymous_name">Visitor #323, Marc Demo</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_2_member_demo" model="discuss.channel.member">
+            <field name="partner_id" ref="base.partner_demo"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_2"/>
+            <field name="is_pinned">False</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_2_member_public" model="discuss.channel.member">
+            <field name="partner_id" ref="base.public_partner"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_2"/>
+        </record>
+
+        <record id="livechat_channel_session_2_message_1" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_2"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="body">Hello, how may I help you?</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-1, minutes=6)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_2_message_2" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_2"/>
+            <field name="message_type">email</field>
+            <field name="author_id" eval="False"/>
+            <field name="email_from">Visitor</field>
+            <field name="body">I was wondering if Odoo has an application to easily manage social media for my business..</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-1, minutes=7)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_2_message_3" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_2"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="body">Yes, we just released a new application called Social Marketing that should fit your needs! Check it out :)</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-1, minutes=8)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_2_message_4" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_2"/>
+            <field name="message_type">email</field>
+            <field name="author_id" eval="False"/>
+            <field name="email_from">Visitor</field>
+            <field name="body">Awesome, thanks!</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-1, minutes=9)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_2_message_5" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_2"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="body">You're welcome, enjoy Odoo!</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-1, minutes=10)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_2_rating_message" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_2"/>
+            <field name="author_id" ref="base.public_partner"/>
+            <field name="subtype_id" ref="mail.mt_note"/>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-1, minutes=11)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_2_rating" model="rating.rating">
+            <field name="access_token">LIVECHAT_2</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_2"/>
+            <field name="res_model_id" ref="mail.model_discuss_channel"/>
+            <field name="rated_partner_id" ref="base.partner_demo"/>
+            <field name="message_id" ref="im_livechat.livechat_channel_session_2_rating_message"/>
+            <field eval="False" name="partner_id"/>
+            <field eval="True" name="consumed"/>
+        </record>
+        <function model="discuss.channel" name="rating_apply"
+            eval="([ref('im_livechat.livechat_channel_session_2')], 5, 'LIVECHAT_2', None, 'Super Job')"/>
+    </data>
+</odoo>
diff --git a/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_3.xml b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_3.xml
new file mode 100644
index 00000000000..0af655c96f2
--- /dev/null
+++ b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_3.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<odoo>
+    <data>
+        <record id="livechat_channel_session_3" model="discuss.channel">
+            <field name="channel_type">livechat</field>
+            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
+            <field name="livechat_operator_id" ref="base.partner_admin"/>
+            <field name="name">Joel Willis, Mitchell Admin</field>
+            <field name="anonymous_name">Joel Willis, Mitchell Admin</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_3_member_admin" model="discuss.channel.member">
+            <field name="partner_id" ref="base.partner_admin"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_3"/>
+            <field name="is_pinned">False</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_3_member_portal" model="discuss.channel.member">
+            <field name="partner_id" ref="base.partner_demo_portal"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_3"/>
+        </record>
+
+        <record id="livechat_channel_session_3_message_1" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_3"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="body">Hello, how may I help you?</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-2, minutes=11)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_3_message_2" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_3"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_demo_portal"/>
+            <field name="body">Hello, are you single?</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-2, minutes=12)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_3_message_3" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_3"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="body">Nope, sorry to disappoint :(</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-2, minutes=13)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_3_message_4" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_3"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_demo_portal"/>
+            <field name="body">Oh :(</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-2, minutes=14)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_3_rating_message" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_3"/>
+            <field name="author_id" ref="base.public_partner"/>
+            <field name="subtype_id" ref="mail.mt_note"/>
+            <field eval="DateTime.today() + relativedelta(months=-1, days=-2, minutes=15)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_3_rating" model="rating.rating">
+            <field name="access_token">LIVECHAT_3</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_3"/>
+            <field name="message_id" ref="im_livechat.livechat_channel_session_3_rating_message"/>
+            <field name="res_model_id" ref="mail.model_discuss_channel"/>
+            <field name="rated_partner_id" ref="base.partner_admin"/>
+            <field name="partner_id" ref="base.partner_demo_portal"/>
+            <field eval="True" name="consumed"/>
+        </record>
+        <function model="discuss.channel" name="rating_apply"
+            eval="([ref('im_livechat.livechat_channel_session_3')], 5, 'LIVECHAT_3', None, 'Mega Job')"/>
+    </data>
+</odoo>
diff --git a/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_4.xml b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_4.xml
new file mode 100644
index 00000000000..9540e31ef94
--- /dev/null
+++ b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_4.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0"?>
+<odoo>
+    <data>
+        <record id="livechat_channel_session_4" model="discuss.channel">
+            <field name="channel_type">livechat</field>
+            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
+            <field name="livechat_operator_id" ref="base.partner_demo"/>
+            <field name="name">Joel Willis, Marc Demo</field>
+            <field name="anonymous_name">Joel Willis, Marc Demo</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_4_member_demo" model="discuss.channel.member">
+            <field name="partner_id" ref="base.partner_demo"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_4"/>
+            <field name="is_pinned">False</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_4_member_portal" model="discuss.channel.member">
+            <field name="partner_id" ref="base.partner_demo_portal"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_4"/>
+        </record>
+
+        <record id="livechat_channel_session_4_message_1" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_4"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_demo_portal"/>
+            <field name="body">Hello, I'm looking for a software that can be easily updated with my needs.</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-2, days=-3, minutes=15)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_4_message_2" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_4"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="body">Hello Joel Willis, you're at the right place! You can customize Odoo using our Studio application in just a few clicks.</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-2, days=-3, minutes=16)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_4_message_3" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_4"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_demo_portal"/>
+            <field name="body">Thanks for the info, I'll look into it!</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-2, days=-3, minutes=17)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_4_rating_message" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_4"/>
+            <field name="author_id" ref="base.public_partner"/>
+            <field name="subtype_id" ref="mail.mt_note"/>
+            <field eval="DateTime.today() + relativedelta(months=-2, days=-3, minutes=20)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_4_rating" model="rating.rating">
+            <field name="access_token">LIVECHAT_4</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_4"/>
+            <field name="res_model_id" ref="mail.model_discuss_channel"/>
+            <field name="message_id" ref="im_livechat.livechat_channel_session_4_rating_message"/>
+            <field name="rated_partner_id" ref="base.partner_demo"/>
+            <field name="partner_id" ref="base.partner_demo_portal"/>
+            <field eval="True" name="consumed"/>
+        </record>
+        <function model="discuss.channel" name="rating_apply"
+            eval="([ref('im_livechat.livechat_channel_session_4')], 5, 'LIVECHAT_4', None, 'Good Job')"/>
+    </data>
+</odoo>
diff --git a/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_5.xml b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_5.xml
new file mode 100644
index 00000000000..087ef6f60f8
--- /dev/null
+++ b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_5.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<odoo>
+    <data>
+        <record id="livechat_channel_session_5" model="discuss.channel">
+            <field name="channel_type">livechat</field>
+            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
+            <field name="livechat_operator_id" ref="base.partner_admin"/>
+            <field name="name">Visitor #532, Mitchell Admin</field>
+            <field name="anonymous_name">Visitor #532, Mitchell Admin</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_5_member_admin" model="discuss.channel.member">
+            <field name="partner_id" ref="base.partner_admin"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_5"/>
+            <field name="is_pinned">False</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_5_member_public" model="discuss.channel.member">
+            <field name="partner_id" ref="base.public_partner"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_5"/>
+        </record>
+
+        <record id="livechat_channel_session_5_message_1" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_5"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="body">Hello, how may I help you?</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-2, days=-4, minutes=18)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_5_message_2" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_5"/>
+            <field name="message_type">email</field>
+            <field eval="False" name="author_id"/>
+            <field name="email_from">Visitor</field>
+            <field name="body">Hello, it seems that I can't log in to my database. Can you help?</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-2, days=-4, minutes=19)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_5_message_3" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_5"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="body">Hi, if you need help with your database, feel free to contact our support via http://www.odoo.com/help</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-2, days=-4, minutes=20)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_5_message_4" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_5"/>
+            <field name="message_type">email</field>
+            <field eval="False" name="author_id"/>
+            <field name="email_from">Visitor</field>
+            <field name="body">Ok.. Will do, thanks</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-2, days=-4, minutes=21)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_5_rating_message" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_5"/>
+            <field name="author_id" ref="base.public_partner"/>
+            <field name="subtype_id" ref="mail.mt_note"/>
+            <field eval="DateTime.today() + relativedelta(months=-2, days=-4, minutes=33)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_5_rating" model="rating.rating">
+            <field name="access_token">LIVECHAT_5</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_5"/>
+            <field name="res_model_id" ref="mail.model_discuss_channel"/>
+            <field name="message_id" ref="im_livechat.livechat_channel_session_5_rating_message"/>
+            <field name="rated_partner_id" ref="base.partner_admin"/>
+            <field eval="False" name="partner_id"/>
+            <field eval="True" name="consumed"/>
+        </record>
+        <function model="discuss.channel" name="rating_apply"
+            eval="([ref('im_livechat.livechat_channel_session_5')], 5, 'LIVECHAT_5', None, 'Super Job')"/>
+    </data>
+</odoo>
diff --git a/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_6.xml b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_6.xml
new file mode 100644
index 00000000000..799afb253c0
--- /dev/null
+++ b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_6.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<odoo>
+    <data>
+        <record id="livechat_channel_session_6" model="discuss.channel">
+            <field name="channel_type">livechat</field>
+            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
+            <field name="livechat_operator_id" ref="base.partner_admin"/>
+            <field name="name">Visitor #649, Mitchell Admin</field>
+            <field name="anonymous_name">Visitor #649, Mitchell Admin</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_6_member_admin" model="discuss.channel.member">
+            <field name="partner_id" ref="base.partner_admin"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_6"/>
+            <field name="is_pinned">False</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_6_member_public" model="discuss.channel.member">
+            <field name="partner_id" ref="base.public_partner"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_6"/>
+        </record>
+
+        <record id="livechat_channel_session_6_message_1" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_6"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="body">Hello, how may I help you?</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-3, days=-5, minutes=22)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_6_message_2" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_6"/>
+            <field name="message_type">email</field>
+            <field eval="False" name="author_id"/>
+            <field name="email_from">Visitor</field>
+            <field name="body">Hello, I'm a bit lost in the Invetory module, is there some documentation I could find?</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-3, days=-5, minutes=23)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_6_message_3" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_6"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="body">Yes, of course, you can find it here: https://www.odoo.com/documentation/master/</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-3, days=-5, minutes=24)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_6_message_4" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_6"/>
+            <field name="message_type">email</field>
+            <field eval="False" name="author_id"/>
+            <field name="email_from">Visitor</field>
+            <field name="body">Thanks!</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-3, days=-5, minutes=25)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_6_rating_message" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_6"/>
+            <field name="author_id" ref="base.public_partner"/>
+            <field name="subtype_id" ref="mail.mt_note"/>
+            <field eval="DateTime.today() + relativedelta(months=-3, days=-5, minutes=35)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_6_rating" model="rating.rating">
+            <field name="access_token">LIVECHAT_6</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_6"/>
+            <field name="res_model_id" ref="mail.model_discuss_channel"/>
+            <field name="message_id" ref="livechat_channel_session_6_rating_message"/>
+            <field name="rated_partner_id" ref="base.partner_admin"/>
+            <field eval="False" name="partner_id"/>
+            <field eval="True" name="consumed"/>
+        </record>
+        <function model="discuss.channel" name="rating_apply"
+            eval="([ref('im_livechat.livechat_channel_session_6')], 5, 'LIVECHAT_6', None, 'Good Job')"/>
+    </data>
+</odoo>
diff --git a/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_7.xml b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_7.xml
new file mode 100644
index 00000000000..3f9869e8c82
--- /dev/null
+++ b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_7.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<odoo>
+    <data>
+        <record id="livechat_channel_session_7" model="discuss.channel">
+            <field name="channel_type">livechat</field>
+            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
+            <field name="livechat_operator_id" ref="base.partner_admin"/>
+            <field name="name">Joel Willis, Mitchell Admin</field>
+            <field name="anonymous_name">Joel Willis, Mitchell Admin</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_7_member_admin" model="discuss.channel.member">
+            <field name="partner_id" ref="base.partner_admin"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_7"/>
+            <field name="is_pinned">False</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_7_member_portal" model="discuss.channel.member">
+            <field name="partner_id" ref="base.partner_demo_portal"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_7"/>
+        </record>
+
+        <record id="livechat_channel_session_7_message_1" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_7"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="body">Hello, how may I help you?</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-3, days=-6, minutes=26)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_7_message_2" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_7"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_demo_portal"/>
+            <field name="body">Hi, I need a software to easily manage my stock, and generate sales orders.</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-3, days=-6, minutes=27)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_7_message_3" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_7"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="body">Joel Willis, you'll need our Inventory and Sales application to do so. You can try them for 15 days, FOR FREE :)</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-3, days=-6, minutes=28)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_7_message_4" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_7"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_demo_portal"/>
+            <field name="body">Good to hear, thanks!</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-3, days=-6, minutes=29)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_7_rating_message" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_7"/>
+            <field name="author_id" ref="base.public_partner"/>
+            <field name="subtype_id" ref="mail.mt_note"/>
+            <field eval="DateTime.today() + relativedelta(months=-3, days=-6, minutes=50)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_7_rating" model="rating.rating">
+            <field name="access_token">LIVECHAT_7</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_7"/>
+            <field name="res_model_id" ref="mail.model_discuss_channel"/>
+            <field name="message_id" ref="im_livechat.livechat_channel_session_7_rating_message"/>
+            <field name="rated_partner_id" ref="base.partner_admin"/>
+            <field name="partner_id" ref="base.partner_demo_portal"/>
+            <field eval="True" name="consumed"/>
+        </record>
+        <function model="discuss.channel" name="rating_apply"
+            eval="([ref('im_livechat.livechat_channel_session_7')], 5, 'LIVECHAT_7', None, 'Super Job')"/>
+    </data>
+</odoo>
diff --git a/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_8.xml b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_8.xml
new file mode 100644
index 00000000000..cf8a7eb124d
--- /dev/null
+++ b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_8.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<odoo>
+    <data>
+        <record id="livechat_channel_session_8" model="discuss.channel">
+            <field name="channel_type">livechat</field>
+            <field name="livechat_channel_id" ref="im_livechat_channel_data"/>
+            <field name="livechat_operator_id" ref="base.partner_demo"/>
+            <field name="name">Visitor #722, Marc Demo</field>
+            <field name="anonymous_name">Visitor #722, Marc Demo</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_8_member_demo" model="discuss.channel.member">
+            <field name="partner_id" ref="base.partner_demo"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_8"/>
+            <field name="is_pinned">False</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_8_member_public" model="discuss.channel.member">
+            <field name="partner_id" ref="base.public_partner"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_8"/>
+        </record>
+
+        <record id="livechat_channel_session_8_message_1" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_8"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="body">Hello, how may I help you?</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-3, days=-7, minutes=30)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_8_message_2" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_8"/>
+            <field name="message_type">email</field>
+            <field eval="False" name="author_id"/>
+            <field name="body">Heeeey Marc, how are you?</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-3, days=-7, minutes=31)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_8_message_3" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_8"/>
+            <field name="message_type">email</field>
+            <field name="author_id" ref="base.partner_demo"/>
+            <field name="body">I'm fine, and you?</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-3, days=-7, minutes=32)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_8_message_4" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_8"/>
+            <field name="message_type">email</field>
+            <field eval="False" name="author_id"/>
+            <field name="body">I'm great, thanks for asking!</field>
+            <field name="message_type">comment</field>
+            <field eval="DateTime.today() + relativedelta(months=-3, days=-7, minutes=33)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_8_rating_message" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_8"/>
+            <field name="author_id" ref="base.public_partner"/>
+            <field name="subtype_id" ref="mail.mt_note"/>
+            <field eval="DateTime.today() + relativedelta(months=-3, days=-7, minutes=52)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_8_rating" model="rating.rating">
+            <field name="access_token">LIVECHAT_8</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_8"/>
+            <field name="res_model_id" ref="mail.model_discuss_channel"/>
+            <field name="message_id" ref="livechat_channel_session_8_rating_message"/>
+            <field name="rated_partner_id" ref="base.partner_demo"/>
+            <field eval="False" name="partner_id"/>
+            <field eval="True" name="consumed"/>
+        </record>
+        <function model="discuss.channel" name="rating_apply"
+            eval="([ref('im_livechat.livechat_channel_session_8')], 5, 'LIVECHAT_8', None, 'Super Job')"/>
+    </data>
+</odoo>
diff --git a/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_9.xml b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_9.xml
new file mode 100644
index 00000000000..24a2f1a2bb4
--- /dev/null
+++ b/addons/im_livechat/demo/im_livechat_channel/im_livechat_session_9.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0"?>
+<odoo>
+    <data>
+        <record id="livechat_channel_session_9" model="discuss.channel">
+            <field name="name">Visitor, Mitchell Admin</field>
+            <field name="livechat_operator_id" ref="base.partner_admin"/>
+            <field name="livechat_channel_id" ref="im_livechat.im_livechat_channel_data"/>
+            <field name="create_date" eval="datetime.now() - timedelta(days=1)"/>
+            <field name="channel_type">livechat</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_9_member_admin" model="discuss.channel.member">
+            <field name="partner_id" ref="base.partner_admin"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_9"/>
+            <field name="is_pinned">False</field>
+        </record>
+        <record id="im_livechat.livechat_channel_session_9_member_public" model="discuss.channel.member">
+            <field name="partner_id" ref="base.public_partner"/>
+            <field name="channel_id" ref="im_livechat.livechat_channel_session_9"/>
+        </record>
+
+        <record id="livechat_channel_session_9_message_1" model="mail.message">
+            <field name="author_id" eval="False"/>
+            <field name="record_name">Visitor</field>
+            <field name="date" eval="datetime.now() - timedelta(days=1)"/>
+            <field name="create_date" eval="datetime.now() - timedelta(days=1)"/>
+            <field name="write_date" eval="datetime.now() - timedelta(days=1)"/>
+            <field name="body">Hi</field>
+            <field name="message_type">comment</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_9"/>
+            <field name="model">discuss.channel</field>
+        </record>
+        <record id="livechat_channel_session_9_message_2" model="mail.message">
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="date" eval="datetime.now() - timedelta(days=1, seconds=-15)"/>
+            <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-15)"/>
+            <field name="write_date" eval="datetime.now() - timedelta(days=1, seconds=-15)"/>
+            <field name="body">Hello, how may I help you?</field>
+            <field name="message_type">comment</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_9"/>
+            <field name="model">discuss.channel</field>
+        </record>
+        <record id="livechat_channel_session_9_message_3" model="mail.message">
+            <field name="author_id" eval="False"/>
+            <field name="record_name">Visitor</field>
+            <field name="date" eval="datetime.now() - timedelta(days=1, seconds=-25)"/>
+            <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-25)"/>
+            <field name="write_date" eval="datetime.now() - timedelta(days=1, seconds=-25)"/>
+            <field name="body">I would like to know more about the CRM application</field>
+            <field name="message_type">comment</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_9"/>
+            <field name="model">discuss.channel</field>
+        </record>
+        <record id="livechat_channel_session_9_message_4" model="mail.message">
+            <field name="author_id" ref="base.partner_admin"/>
+            <field name="date" eval="datetime.now() - timedelta(days=1, seconds=-33)"/>
+            <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-33)"/>
+            <field name="write_date" eval="datetime.now() - timedelta(days=1, seconds=-33)"/>
+            <field name="body">The CRM application helps you to track leads, close opportunities and get accurate forecasts. You can test it for free on our website.</field>
+            <field name="message_type">comment</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_9"/>
+            <field name="model">discuss.channel</field>
+        </record>
+        <record id="livechat_channel_session_9_message_5" model="mail.message">
+            <field name="author_id" eval="False"/>
+            <field name="record_name">Visitor</field>
+            <field name="date" eval="datetime.now() - timedelta(days=1, seconds=-42)"/>
+            <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-42)"/>
+            <field name="write_date" eval="datetime.now() - timedelta(days=1, seconds=-42)"/>
+            <field name="body">Great, thanks!</field>
+            <field name="message_type">comment</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_9"/>
+            <field name="model">discuss.channel</field>
+        </record>
+        <record id="livechat_channel_session_9_message_6" model="mail.message">
+            <field name="author_id" eval="False"/>
+            <field name="record_name">Visitor</field>
+            <field name="date" eval="datetime.now() - timedelta(days=1, seconds=-53)"/>
+            <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-53)"/>
+            <field name="write_date" eval="datetime.now() - timedelta(days=1, seconds=-53)"/>
+            <field name="body">Rating: :-)</field>
+            <field name="message_type">comment</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_9"/>
+            <field name="model">discuss.channel</field>
+        </record>
+        <record id="livechat_channel_session_9_rating_message" model="mail.message">
+            <field name="model">discuss.channel</field>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_9"/>
+            <field name="author_id" ref="base.public_partner"/>
+            <field name="subtype_id" ref="mail.mt_note"/>
+            <field eval="datetime.now() - timedelta(days=1, seconds=-60)" name="date"/>
+        </record>
+        <record id="livechat_channel_session_9_rating" model="rating.rating">
+            <field name="access_token">LIVECHAT_9</field>
+            <field name="res_model_id" ref="mail.model_discuss_channel"/>
+            <field name="message_id" ref="im_livechat.livechat_channel_session_9_rating_message"/>
+            <field name="rated_partner_id" ref="base.partner_admin"/>
+            <field name="partner_id" ref="base.partner_admin"/>
+            <field name="create_date" eval="datetime.now() - timedelta(days=1, seconds=-53)"/>
+            <field name="res_id" ref="im_livechat.livechat_channel_session_9"/>
+        </record>
+        <function model="discuss.channel" name="rating_apply"
+            eval="([ref('im_livechat.livechat_channel_session_9')], 5, 'LIVECHAT_9', None, 'Super Job')"/>
+    </data>
+</odoo>
diff --git a/addons/im_livechat/views/discuss_channel_views.xml b/addons/im_livechat/views/discuss_channel_views.xml
index a6ec0f30eaa..bd20b5bb117 100644
--- a/addons/im_livechat/views/discuss_channel_views.xml
+++ b/addons/im_livechat/views/discuss_channel_views.xml
@@ -7,11 +7,18 @@
             <field name="model">discuss.channel</field>
             <field name="arch" type="xml">
                 <search string="Search history">
-                    <field name="name"/>
+                    <field name="name" string="Attendees"/>
+                    <filter name="filter_my_sessions" domain="[('channel_member_ids.partner_id.user_ids.id', 'in', [uid])]" string="My Sessions"/>
+                    <separator/>
+                    <filter name="filter_session_date" date="create_date" string="Session Date"/>
+                    <separator/>
+                    <filter name="filter_session_bad_rating" domain="[('rating_ids', '!=', False), ('rating_avg', '&lt;', 2.5)]" string="Bad Ratings"/>
+                    <filter name="filter_session_good_rating" domain="[('rating_ids', '!=', False), ('rating_avg', '&gt;=', 2.5)]" string="Good Ratings"/>
+                    <filter name="fiter_session_unrated" domain="[('rating_ids', '=', False)]" string="Unrated"/>
                     <group expand="0" string="Group By...">
                         <filter name="group_by_channel" string="Channel" domain="[]" context="{'group_by':'livechat_channel_id'}"/>
                         <separator orientation="vertical"/>
-                        <filter name="group_by_month" string="Creation Date" domain="[]" context="{'group_by':'create_date:month'}"/>
+                        <filter name="group_by_month" string="Session Date" domain="[]" context="{'group_by':'create_date:month'}"/>
                     </group>
                 </search>
             </field>