diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 5e27a2e3663..23ad28dcb83 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1002,7 +1002,7 @@ class account_invoice(osv.osv):
             'quantity': x.get('quantity',1.00),
             'product_id': x.get('product_id', False),
             'product_uom_id': x.get('uos_id', False),
-            'analytic_account_id': x.get('analytic_account_id', False),
+            'analytic_account_id': x.get('account_analytic_id', False),
         }
 
     def action_number(self, cr, uid, ids, context=None):
@@ -1691,7 +1691,7 @@ class account_invoice_tax(osv.osv):
                 'account_id': t['account_id'],
                 'tax_code_id': t['tax_code_id'],
                 'tax_amount': t['tax_amount'],
-                'analytic_account_id': t['account_analytic_id'],
+                'account_analytic_id': t['account_analytic_id'],
             })
         return res
 
diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index bc964b787c7..78cdea764f3 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -271,9 +271,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
@@ -406,9 +406,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 2c294fa628c..74da5ac4836 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -111,9 +111,9 @@
                         </page>
                     </notebook>
                   </sheet>
-                    <footer>
-                        <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                  <div class="oe_chatter">
+                      <field name="message_ids" widget="mail_thread"/>
+                  </div>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index c3291fb3bc3..98693a3f531 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -257,9 +257,9 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
@@ -430,9 +430,9 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index adb078fac22..f26dd3ae38d 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -167,9 +167,9 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
@@ -320,9 +320,9 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/analytic/analytic_view.xml b/addons/analytic/analytic_view.xml
index 0c06c90150c..6d6a38b4b44 100644
--- a/addons/analytic/analytic_view.xml
+++ b/addons/analytic/analytic_view.xml
@@ -43,9 +43,9 @@
                             </page>
                         </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index b6365ebc53c..a2f3c2408d7 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -245,9 +245,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 67f2b7e7080..30b0af1dc85 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -212,9 +212,9 @@
                     </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
             </form>
         </field>
         </record>
@@ -520,7 +520,7 @@
                                 <div>
                                     <field name="street" placeholder="Street..."/>
                                     <field name="street2"/>
-                                    <div>
+                                    <div class="address_format">
                                         <field name="city" placeholder="City" style="width: 40%%"/>
                                         <field name="state_id" class="oe_no_button" placeholder="State" style="width: 24%%"/>
                                         <field name="zip" placeholder="ZIP" style="width: 34%%"/>
@@ -564,9 +564,9 @@
                     </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
             </form>
         </field>
     </record>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index a874eeee239..1f15e29263b 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -145,9 +145,9 @@
 
                 <field name="description" placeholder="Description..." />
             </sheet>
-            <footer>
+            <div class="oe_chatter">
                 <field name="message_ids" widget="mail_thread"/>
-            </footer>
+            </div>
             </form>
         </field>
     </record>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index cf803fe6384..676bad59a45 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -168,9 +168,9 @@
                         </notebook>
                     </group>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 26a95c99505..9e67a4001a7 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -128,9 +128,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index 79760a0a9fd..4c2d81f94e3 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -99,9 +99,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 142ba2bb2a4..1b1b5daa9a9 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -189,9 +189,9 @@
                             </page>
                         </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
@@ -484,9 +484,9 @@
                             </group>
                         </group>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index b8868c3319f..de19ed74b09 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -122,9 +122,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index b1bb96c876c..161ca478f36 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -146,9 +146,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
@@ -193,9 +193,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 9118fb05ea1..5569874e269 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -191,9 +191,9 @@
                 <separator string="Application Summary"/>
                 <field name="description" placeholder="Feedback of interviews..."/>
             </sheet>
-            <footer>
+            <div class="oe_chatter">
                 <field name="message_ids" widget="mail_thread"/>
-            </footer>
+            </div>
           </form>
         </field>
     </record>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index 8d7a726f015..ec7f0e6d328 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -80,9 +80,9 @@
                     <label for="description"/><newline/>
                     <field name="description"/>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
             </form>
         </field>
     </record>
diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml
index d4ca2cb471f..f5443fcf0d7 100644
--- a/addons/mail/mail_group_view.xml
+++ b/addons/mail/mail_group_view.xml
@@ -92,10 +92,10 @@
                             </group>
                         </div>
                     </sheet>
-                    <footer class="openerp_mail_group_footer">
+                    <div class="oe_chatter oe_mail_group_footer">
                         <field name="message_ids" widget="mail_thread"
                                 options='{"thread_level": 1}'/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/mail/res_partner_view.xml b/addons/mail/res_partner_view.xml
index 0c7aca1a30d..8b4d89f89f4 100644
--- a/addons/mail/res_partner_view.xml
+++ b/addons/mail/res_partner_view.xml
@@ -9,10 +9,10 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//sheet" position="after">
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread" 
                             options='{"thread_level": 1}'/>
-                    </footer>
+                    </div>
                 </xpath>
             </field>
         </record>
diff --git a/addons/mail/static/src/css/mail_group.css b/addons/mail/static/src/css/mail_group.css
index 048b7a06415..b03be086fc6 100644
--- a/addons/mail/static/src/css/mail_group.css
+++ b/addons/mail/static/src/css/mail_group.css
@@ -16,7 +16,7 @@
 }
 
 /* Resize footer width */
-.openerp .oe_form footer.openerp_mail_group_footer {
+.openerp .oe_form div.oe_mail_group_footer {
   max-width: 80%;
 }
 
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index 0f2ad6836c8..9c566a69bde 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -52,38 +52,41 @@
             <field name="model">product.product</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Membership products">
-                  <group col="6">
-                      <field name="name"/>
-                      <field name="default_code"/>
-                      <field name="active"/>
-                      <field name="membership" invisible="1"/>
-                      <field name="membership_date_from" required="1"/>
-                      <field name="membership_date_to" required="1"/>
-                      <field name="company_id" groups="base.group_multi_company" widget="selection"/>
-                    </group>
-                    <notebook colspan="4">
-                      <page string="General">
-                        <separator string="Accounting Info" colspan="2"/>
-                        <separator string="Categorization" colspan="2"/>
-                        <field name="list_price" string="Membership Fee"/>
-                        <field name="type" />
-                        <field name="property_account_income" domain="[('type', '!=', 'view')]"/>
-                        <field name="categ_id"/>
-                        <separator string="Sale Taxes" colspan="2"/>
-                        <newline/>
-                        <field name="taxes_id" nolabel="1" colspan="4"/>
-                      </page>
-                      <page string="Description">
-                            <separator string="Description"/>
-                            <field colspan="4" name="description" nolabel="1"/>
-                            <separator string="Sale Description"/>
-                            <field colspan="4" name="description_sale" nolabel="1"/>
-                            <separator string="Purchase Description"/>
-                            <field colspan="4" name="description_purchase" nolabel="1"/>
-                      </page>
-                    </notebook>
-                </form>
+                <form string="Membership products" version="7.0">
+                    <sheet>
+                        <label for="name" class="oe_edit_only"/>
+                        <h1>
+                            <field name="name"/>
+                        </h1>
+                        <group>
+                            <group>
+                                <field name="default_code"/>
+                                <field name="categ_id"/>
+                                <field name="membership" invisible="1"/>
+                                <field name="company_id"
+                                    groups="base.group_multi_company"
+                                    widget="selection"/>
+                                <field name="active"/>
+                            </group>
+                            <group>
+                                <label for="membership_date_from" string="Membership Duration"/>
+                                <div>
+                                    <field name="membership_date_from" required="1" class="oe_inline"/> - 
+                                    <field name="membership_date_to" required="1" class="oe_inline"/>
+                                </div>
+                                <field name="list_price" string="Membership Fee"/>
+                                <field
+                                    name="property_account_income"
+                                    domain="[('type', '!=', 'view')]"/>
+                                <field name="taxes_id" widget="many2many_tags" string="Taxes"/>
+                            </group>
+                        </group>
+                        <label for="description"/>
+                        <field colspan="4" name="description" placeholder="Add a description..."/>
+                        <label for="description_sale"/>
+                        <field colspan="4" name="description_sale" placeholder="This note will be displayed on quotations..."/>
+                    </sheet>
+                 </form>
             </field>
         </record>
 
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 6fe3d61a804..86b0fcee0d5 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -795,9 +795,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 85cbaca0cbc..0a16626ecd9 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -111,9 +111,9 @@
                 </page>
                 </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
             </form>
         </field>
     </record>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 3b0404d376b..4c45f90b904 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -93,9 +93,9 @@
                     </page>
                     </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index cdf4d48c904..e4158a88ae0 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -183,9 +183,9 @@
                             </page>
                         </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index d2edef8d7a8..9e4f3c44a27 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -143,9 +143,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
@@ -486,9 +486,9 @@
                         </page>
                     </notebook>
                     </sheet>
-                    <footer>
+                    <div class="oe_chatter">
                         <field name="message_ids" widget="mail_thread"/>
-                    </footer>
+                    </div>
                 </form>
             </field>
         </record>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index 13e60ccd7be..e730805fb46 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -169,9 +169,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 0be6b8ddf8c..88d9595ac08 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -256,9 +256,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                    <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index d8c2d0124b6..c1fc14c29bf 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -104,9 +104,9 @@
                     </page>
                 </notebook>
             </sheet>
-            <footer>
+            <div class="oe_chatter">
                   <field name="message_ids" widget="mail_thread"/>
-            </footer> 
+            </div> 
             </form>
         </field>
     </record>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index f586305573b..acfd1516c55 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -318,9 +318,9 @@
                         </page>
                     </notebook>
                 </sheet>
-                <footer>
+                <div class="oe_chatter">
                     <field name="message_ids" widget="mail_thread"/>
-                </footer>
+                </div>
                 </form>
             </field>
         </record>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 55be1fdc267..432b3ce365b 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -977,9 +977,9 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Customer"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
-                        <footer>
+                        <div class="oe_chatter">
                             <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                        </footer>
+                        </div>
                     </xpath>
                 </data>
             </field>
@@ -1090,9 +1090,9 @@
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
                     </xpath>
                     <xpath expr="/form/sheet" position="after">
-                        <footer>
+                        <div class="oe_chatter">
                             <field name="message_ids" colspan="4" widget="mail_thread" nolabel="1"/>
-                        </footer>
+                        </div>
                     </xpath>
                 </data>
             </field>