diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index cce8e7c02d8..c77fe384fbe 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -145,8 +145,8 @@ class crm_helpdesk(base_state, osv.osv):
     # OpenChatter
     # ******************************
     
-	def case_get_note_msg_prefix(self, cr, uid, id, context=None):
-		return 'Helpdesk'
+    def case_get_note_msg_prefix(self, cr, uid, id, context=None):
+        return 'Helpdesk'
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 1dbc58ba047..7063b33c48d 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -37,7 +37,7 @@
                     <button name="case_pending" string="Pending" type="object"
                             states="draft,open"/>
                     <button name="case_reset" string="Reset to Draft" type="object"
-                            states="cancel"/>
+                            states="cancel,done"/>
                     <button name="case_escalate" string="Escalate" type="object"
                             states="open,draft,pending"/>
                     <button name="case_cancel" string="Cancel" type="object"
@@ -132,6 +132,9 @@
                         </page>
                     </notebook>
                 </sheet>
+                <div class="oe_form_bottom">
+                    <field name="message_ids_social" colspan="4" widget="ThreadView" nolabel="1"/>
+                </div>
                 </form>
             </field>
         </record>