diff --git a/golem_resource/__manifest__.py b/golem_resource/__manifest__.py
index c99e531a..e3a6ebb9 100644
--- a/golem_resource/__manifest__.py
+++ b/golem_resource/__manifest__.py
@@ -20,7 +20,7 @@
     'name': 'GOLEM non-profit resources',
     'summary': 'GOLEM resources management',
     'description': ''' GOLEM resources management ''',
-    'version': '10.0.1.5.0',
+    'version': '10.0.1.6.0',
     'category': 'GOLEM',
     'author': 'Youssef El Ouahby, Fabien Bourgeois',
     'license': 'AGPL-3',
diff --git a/golem_resource/models/golem_resource.py b/golem_resource/models/golem_resource.py
index 97740041..a529e992 100644
--- a/golem_resource/models/golem_resource.py
+++ b/golem_resource/models/golem_resource.py
@@ -25,6 +25,7 @@ class GolemResource(models.Model):
     """ GOLEM Resource Model """
     _name = 'golem.resource'
     _description = 'GOLEM Resource Model'
+    _inherit = 'mail.thread'
 
     name = fields.Char(required=True, index=True)
     active = fields.Boolean(default=True)
diff --git a/golem_resource/models/golem_resource_reservation.py b/golem_resource/models/golem_resource_reservation.py
index a57da76e..a461ced4 100644
--- a/golem_resource/models/golem_resource_reservation.py
+++ b/golem_resource/models/golem_resource_reservation.py
@@ -27,6 +27,7 @@ class GolemResourceReservation(models.Model):
     """ GOLEM Resource Reservation Model """
     _name = 'golem.resource.reservation'
     _description = 'GOLEM Reservation Model'
+    _inherit = 'mail.thread'
 
     name = fields.Char(compute='_compute_name', store=True)
     # TODO: handle multiple days reservation
@@ -41,6 +42,7 @@ class GolemResourceReservation(models.Model):
 
     resource_id = fields.Many2one('golem.resource', required=True, index=True,
                                   string='Resource', readonly=True,
+                                  track_visibility='onchange',
                                   states={'draft': [('readonly', False)]})
     resource_avaibility_start = fields.Date(related='resource_id.avaibility_start')
     resource_avaibility_stop = fields.Date(related='resource_id.avaibility_stop')
@@ -51,16 +53,16 @@ class GolemResourceReservation(models.Model):
                               states={'draft': [('readonly', False)]})
     partner_id = fields.Many2one('res.partner', string='On behalf of',
                                  required=True, index=True, readonly=True,
+                                 track_visibility='onchange',
                                  states={'draft': [('readonly', False)]})
-    state = fields.Selection([
-        ('canceled', 'Canceled'),
-        ('draft', 'Draft'),
-        ('confirmed', 'Confirmed'),
-        ('validated', 'Validated'),
-        ('rejected', 'Rejected')
-    ], default='draft')
+    state = fields.Selection([('canceled', 'Canceled'),
+                              ('draft', 'Draft'),
+                              ('confirmed', 'Confirmed'),
+                              ('validated', 'Validated'),
+                              ('rejected', 'Rejected')],
+                             default='draft', track_visibility='onchange')
 
-    rejection_reason = fields.Text(readonly=True)
+    rejection_reason = fields.Text(readonly=True, track_visibility='onchange')
 
     @api.depends('resource_id', 'date')
     def _compute_name(self):
diff --git a/golem_resource/views/golem_resource_reservation_views.xml b/golem_resource/views/golem_resource_reservation_views.xml
index 877bb3bd..0ed86a17 100644
--- a/golem_resource/views/golem_resource_reservation_views.xml
+++ b/golem_resource/views/golem_resource_reservation_views.xml
@@ -91,6 +91,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
               </group>
             </group>
           </sheet>
+          <div class="oe_chatter">
+              <field name="message_follower_ids" widget="mail_followers" />
+              <field name="message_ids" widget="mail_thread" />
+          </div>
         </form>
       </field>
     </record>
diff --git a/golem_resource/views/golem_resource_views.xml b/golem_resource/views/golem_resource_views.xml
index d3f959bf..8b56051f 100644
--- a/golem_resource/views/golem_resource_views.xml
+++ b/golem_resource/views/golem_resource_views.xml
@@ -77,6 +77,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                 </group>
             </group>
           </sheet>
+          <div class="oe_chatter">
+              <field name="message_follower_ids" widget="mail_followers" />
+              <field name="message_ids" widget="mail_thread" />
+          </div>
         </form>
       </field>
     </record>