diff --git a/addons/warning/warning.py b/addons/warning/warning.py
index be2c3f74ca1..fb7a91de9ec 100644
--- a/addons/warning/warning.py
+++ b/addons/warning/warning.py
@@ -35,13 +35,13 @@ class res_partner(osv.osv):
     _inherit = 'res.partner'
     _columns = {
         'sale_warn' : fields.boolean('Sale Order'),
-        'sale_warn_msg' : fields.char('Message for Sale Order', size=64),
+        'sale_warn_msg' : fields.text('Message for Sale Order'),
         'purchase_warn' : fields.boolean('Purchase Order'),
-        'purchase_warn_msg' : fields.char('Message for Purchase Order', size=64),
+        'purchase_warn_msg' : fields.text('Message for Purchase Order'),
         'picking_warn' : fields.boolean('Stock Picking'),
-        'picking_warn_msg' : fields.char('Message for Stock Picking', size=64),
+        'picking_warn_msg' : fields.text('Message for Stock Picking'),
         'invoice_warn' : fields.boolean('Invoice'),
-        'invoice_warn_msg' : fields.char('Message for Invoice', size=64),
+        'invoice_warn_msg' : fields.text('Message for Invoice'),
     }
 res_partner()
 
@@ -131,11 +131,11 @@ stock_picking()
 class product_product(osv.osv):
     _inherit = 'product.product'
     _columns = {
-                 'sale_line_warn' : fields.boolean('Sale Order Line'),
-                 'sale_line_warn_msg' : fields.char('Message for Sale Order Line', size=64),
-                 'purchase_line_warn' : fields.boolean('Purchase Order Line'),
-                 'purchase_line_warn_msg' : fields.char('Message for Purchase Order Line', size=64),
-                 }
+         'sale_line_warn' : fields.boolean('Sale Order Line'),
+         'sale_line_warn_msg' : fields.text('Message for Sale Order Line'),
+         'purchase_line_warn' : fields.boolean('Purchase Order Line'),
+         'purchase_line_warn_msg' : fields.text('Message for Purchase Order Line'),
+    }
 product_product()
 
 class sale_order_line(osv.osv):
diff --git a/addons/warning/warning_view.xml b/addons/warning/warning_view.xml
index 769ddc8d5d2..2adba29c996 100644
--- a/addons/warning/warning_view.xml
+++ b/addons/warning/warning_view.xml
@@ -1,30 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
+
          <record id="view_partner_warning_form" model="ir.ui.view">
             <field name="name">res.partner.warning.form.inherit</field>
             <field name="model">res.partner</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
-                <notebook>
-                    <page string="Messages" position="inside">
-                        <newline/>
-                            <field name="sale_warn"/>
-                            <field name="sale_warn_msg"/>
-                             <field name="purchase_warn"/>
-                            <field name="purchase_warn_msg"/>
-                             <field name="picking_warn"/>
-                            <field name="picking_warn_msg"/>
-                             <field name="invoice_warn"/>
-                            <field name="invoice_warn_msg"/>
-                </page>
+                <notebook position="inside">
+                    <page string="Warnings">
+                        <separator string="Warning on the sale order" colspan="4"/>
+                        <field name="sale_warn"/>
+                        <field name="sale_warn_msg" colspan="4" nolabel="1"/>
+                        <separator string="Warning on the sale order" colspan="4"/>
+                        <field name="purchase_warn"/>
+                        <field name="purchase_warn_msg" colspan="4" nolabel="1"/>
+                        <separator string="Warning on the picking" colspan="4"/>
+                        <field name="picking_warn"/>
+                        <field name="picking_warn_msg" colspan="4" nolabel="1"/>
+                        <separator string="Warning on the invoice" colspan="4"/>
+                        <field name="invoice_warn"/>
+                        <field name="invoice_warn_msg" colspan="4" nolabel="1"/>
+                    </page>
                 </notebook>
             </field>
         </record>
-        
-        
+
         <record id="product_warning_form_view" model="ir.ui.view">
             <field name="name">product.warning.form.inherit</field>
             <field name="model">product.product</field>
@@ -32,15 +34,17 @@
             <field name="inherit_id" ref="product.product_normal_form_view"/>
             <field name="arch" type="xml">
                 <notebook position="inside">
-                    <page string="Messages">
-                    	 <field name="sale_line_warn"/>
-                         <field name="sale_line_warn_msg"/>
-                         <field name="purchase_line_warn"/>
-                         <field name="purchase_line_warn_msg"/>
+                    <page string="Warnings">
+                        <separator string="Warning when selling this product" colspan="4"/>
+                        <field name="sale_line_warn"/>
+                        <field name="sale_line_warn_msg" colspan="4" nolabel="1"/>
+                        <separator string="Warning when puchasing this product" colspan="4"/>
+                        <field name="purchase_line_warn"/>
+                        <field name="purchase_line_warn_msg" colspan="4" nolabel="1"/>
                     </page>
                 </notebook>
             </field>
         </record>
-        
+
     </data>
 </openerp>