diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 00d3d120e41..41ec434921f 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -631,8 +631,8 @@
             <field name="model">mrp.production</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Manufacturing Orders">
-                    <group colspan="4" col="7">
+                <form string="Manufacturing Orders" layout="auto">
+                    <group colspan="6" col="7">
                         <field name="name" string="Reference"/>
                         <field name="date_planned"/>
                         <field name="origin"/>
@@ -644,6 +644,8 @@
                             icon="terp-accessories-archiver+"
                             name="%(mrp.action_change_production_qty)d"
                             string="Change Qty" states="ready,confirmed" />
+                    </group>
+                    <group colspan="4" col="4">
                         <label string="" colspan="2"/>
                         <field name="product_uos_qty" groups="product.group_uos"/>
                         <field name="product_uos" groups="product.group_uos"/>
@@ -786,7 +788,9 @@
                             <field name="move_prod_id"/>
                         </page>
                     </notebook>
+                    <div class="oe_form_sheet_width">
                     <field name="message_ids" colspan="4" widget="ThreadView" nolabel="1"/>
+                    </div>
                 </form>
             </field>
         </record>