diff --git a/addons/account/account_installer.xml b/addons/account/account_installer.xml
index 3d07cdb2694..e71dc6f09c8 100644
--- a/addons/account/account_installer.xml
+++ b/addons/account/account_installer.xml
@@ -11,7 +11,7 @@
                     <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <separator string="title" position="attributes">
-                    <attribute name="string">Configure Your Accounting System</attribute>
+                    <attribute name="string">Configure Your Accounting Chart</attribute>
                 </separator>
                 <xpath expr="//label[@string='description']" position="attributes">
                     <attribute name="string">Configure your accounting system. By default, Chart of Account is matching to your country. If there are not chart of account certified for your county, you can install the generic chart of account.</attribute>
@@ -69,10 +69,14 @@
                         <attribute name="string">Accounting Application Configuration</attribute>
                     </form>
                     <separator string="title" position="attributes">
-                        <attribute name="string">Extra Accounting Applications</attribute>
+                         <attribute name="string">Configure Your Accounting Application</attribute>
+
                     </separator>
                     <xpath expr="//label[@string='description']" position="attributes">
-                        <attribute name="string">From this screen, you can install extra accounting applications in your accounting system. Select the applications to directly install them. If you do not think you need any of these right now, you can easily install them later.</attribute>
+                        <attribute name="string">From this screen, you can install Other Addons in your accounting Application. Select the Addons to directly install them. If you do not think you need any of these right now, you can easily install them later.</attribute>
+                    </xpath>
+                    <xpath expr="//button[@string='Install Modules']" position="attributes">
+                        <attribute name="string">Configure</attribute>
                     </xpath>
                     <xpath expr='//separator[@string="vsep"]' position='attributes'>
                         <attribute name='string'></attribute>
@@ -100,7 +104,7 @@
         </record>
 
         <record id="action_account_installer" model="ir.actions.act_window">
-            <field name="name">Accounting Applications Installation</field>
+            <field name="name">Accounting Application Configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.installer.modules</field>
             <field name="view_id" ref="view_account_modules_installer"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 051817f0462..ccdb929ed38 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -2227,11 +2227,11 @@
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
-                  <attribute name="string">Generate Chart of Accounts from a Chart Template</attribute>
+                  <attribute name="string">Accounting Application Configuration</attribute>
                 </form>
                 <separator string="title" position="attributes">
                 <attribute name="string"
-                       >Generate Chart of Accounts from a Chart Template</attribute>
+                       >Generate Your Accounting Chart from a Chart Template</attribute>
                   </separator>
                   <xpath expr="//label[@string='description']" position="attributes">
                     <attribute name="string">This will automatically configure your chart of accounts, bank accounts, taxes and journals according to the selected template</attribute>
diff --git a/addons/association/profile_association.xml b/addons/association/profile_association.xml
index 0380ba389cb..4a5fb90cbd9 100644
--- a/addons/association/profile_association.xml
+++ b/addons/association/profile_association.xml
@@ -2,14 +2,14 @@
 <openerp>
     <data>
         <record id="view_confirm_install_module_form" model="ir.ui.view">
-            <field name="name">Association Profile : Install extra modules</field>
+            <field name="name">Association Application Configuration</field>
             <field name="model">profile.association.config.install_modules_wizard</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
               <data>
                 <form position="attributes">
-                  <attribute name="string">Association Profile Configuration</attribute>
+                  <attribute name="string">Association Application Configuration</attribute>
                 </form>
                 <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='string'></attribute>
@@ -37,7 +37,7 @@
         </record>
 
         <record id="action_config_install_module" model="ir.actions.act_window">
-            <field name="name">Association Profile : Install Extra Applications</field>
+            <field name="name">Association Application Configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">profile.association.config.install_modules_wizard</field>
             <field name="view_id" ref="view_confirm_install_module_form"/>
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index 92d35f9410c..0b5a508390c 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -8,7 +8,7 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Install OpenERP Applications</attribute>
+            <attribute name="string">Install Applications</attribute>
           </form>
           <xpath expr="//label[@string='description']"
                  position="attributes">
@@ -18,9 +18,13 @@
                     <attribute name='string'></attribute>
                     <attribute name='rowspan'>15</attribute>
           </xpath>
+          <xpath expr="//button[@string='Install Modules']" position="attributes">
+                    <attribute name="string">Install</attribute>
+          </xpath>
           <separator string="title" position="attributes">
-            <attribute name="string">Install Generic Applications</attribute>
+            <attribute name="string">Install Applications</attribute>
           </separator>
+            
           <group colspan="8">
             <field name="crm" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="sale" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
             <field name="project" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/> <field name="knowledge" on_change="onchange_moduleselection(crm,sale,project,knowledge,stock,mrp,account,purchase,hr,point_of_sale,marketing,profile_tools,report_designer,association,auction)"/>
@@ -39,7 +43,7 @@
     </record>
 
     <record id="action_base_setup_installer" model="ir.actions.act_window">
-      <field name="name">Base Setup Applications Installation</field>
+      <field name="name">Install Applications</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">base.setup.installer</field>
       <field name="view_id" ref="view_base_setup_installer"/>
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index ff43935e767..6f276fc2afc 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -12,11 +12,11 @@
           </form>
 
           <separator string="title" position="attributes">
-            <attribute name="string">Configure Your CRM System</attribute>
+            <attribute name="string">Configure Your CRM Application</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
-            <attribute name="string">You can enhance OpenERP's basic CRM support with a few additional OpenERP applications</attribute>
+            <attribute name="string">You can enhance OpenERP's basic CRM support with a few additional OpenERP modules</attribute>
           </xpath>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
               <attribute name='rowspan'>13</attribute>
@@ -49,7 +49,7 @@
     </record>
 
     <record id="action_crm_installer" model="ir.actions.act_window">
-      <field name="name">CRM Applications Installation</field>
+      <field name="name">CRM Application Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">crm.installer</field>
       <field name="view_id" ref="view_crm_installer"/>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index a032f3a1db3..ef7e3e4aad7 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -13,13 +13,13 @@
                 <attribute name="string">Human Resources Application Configuration</attribute>
             </form>
             <separator string="title" position="attributes">
-                <attribute name="string">Select Human Resources Applications To Install</attribute>
+                <attribute name="string">Configure Your Human Resources Application</attribute>
             </separator>
             <xpath expr='//separator[@string="vsep"]' position='attributes'>
                 <attribute name='string'></attribute>
             </xpath>
             <xpath expr="//label[@string='description']" position="attributes">
-                <attribute name="string">You can enhance the base HR addon by installing few HR-related applications.</attribute>
+                <attribute name="string">You can enhance the base HR Application by installing few HR-related modules.</attribute>
             </xpath>
           <group colspan="8">
             <field name="hr_holidays"/>
@@ -40,7 +40,7 @@
     </record>
 
     <record id="action_hr_installer" model="ir.actions.act_window">
-      <field name="name">Human Resources Applications Installation</field>
+      <field name="name">Human Resources Application Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">hr.installer</field>
       <field name="view_id" ref="view_hr_installer"/>
diff --git a/addons/knowledge/knowledge_installer.xml b/addons/knowledge/knowledge_installer.xml
index 4db9f26faa1..e184c8b8933 100644
--- a/addons/knowledge/knowledge_installer.xml
+++ b/addons/knowledge/knowledge_installer.xml
@@ -13,7 +13,7 @@
 
           <separator string="title" position="attributes">
             <attribute name="string"
-                       >Knowledge Management</attribute>
+                       >Configure Your Knowledge Application</attribute>
           </separator>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                       <attribute name='string'></attribute>
@@ -40,7 +40,7 @@
     </record>
 
     <record id="action_knowledge_installer" model="ir.actions.act_window">
-      <field name="name">Knowledge Applications Installation</field>
+      <field name="name">Knowledge Application Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">knowledge.installer</field>
       <field name="view_id" ref="view_knowledge_installer"/>
diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml
index ca91326a5e3..3c5950b355f 100644
--- a/addons/marketing/marketing_view.xml
+++ b/addons/marketing/marketing_view.xml
@@ -15,7 +15,7 @@
                     <attribute name="string">Marketing Application Configuration</attribute>
                   </form>
                   <separator string="title" position="attributes">
-                    <attribute name="string">Select Marketing Applications to Install</attribute>
+                    <attribute name="string">Configure Your Marketing Application</attribute>
                   </separator>
                   <xpath expr="//label[@string='description']"
                          position="attributes">
@@ -39,7 +39,7 @@
         </record>
 
         <record id="action_marketing_installer" model="ir.actions.act_window">
-            <field name="name">Marketing Applications Installation</field>
+            <field name="name">Marketing Applications Configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">marketing.installer</field>
             <field name="view_id" ref="view_marketing_installer"/>
diff --git a/addons/mrp/mrp_installer.xml b/addons/mrp/mrp_installer.xml
index 1562d819af4..4ba15e03f0e 100644
--- a/addons/mrp/mrp_installer.xml
+++ b/addons/mrp/mrp_installer.xml
@@ -12,7 +12,7 @@
           </form>
 
           <separator string="title" position="attributes">
-            <attribute name="string">Manufacturing Resource Planning</attribute>
+            <attribute name="string">Configure Your Manufacturing Resource Planning Application</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
@@ -36,7 +36,7 @@
     </record>
 
     <record id="action_mrp_installer" model="ir.actions.act_window">
-      <field name="name">MRP Applications Installation</field>
+      <field name="name">MRP Applications Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">mrp.installer</field>
       <field name="view_id" ref="view_mrp_installer"/>
diff --git a/addons/outlook/installer.py b/addons/outlook/installer.py
index 984b7f67a34..f042ce9c94e 100755
--- a/addons/outlook/installer.py
+++ b/addons/outlook/installer.py
@@ -40,7 +40,7 @@ class outlook_installer(osv.osv_memory):
     _columns = {
         'name':fields.char('File name', size=34),
         'doc_name':fields.char('File name', size=64),
-        'outlook':fields.boolean('Outlook Application ', help="Allows you to select an object that you’d like to add to your email and its attachments."),
+        'outlook':fields.boolean('Outlook Plug-in ', help="Allows you to select an object that you’d like to add to your email and its attachments."),
         'plugin_file':fields.binary('Outlook Plug-in', readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
         'doc_file':fields.binary('Installation Manual', help="The documentation file :- how to install Outlook Plug-in.", readonly=True),
         'description':fields.text('Description', readonly=True)
diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml
index 8197d78f9fc..99b440bf89a 100755
--- a/addons/outlook/outlook_installer.xml
+++ b/addons/outlook/outlook_installer.xml
@@ -12,13 +12,19 @@
                         <attribute name="string">Outlook Plug-In Configuration</attribute>
                     </form>
                     <separator string="title" position="attributes">
-                        <attribute name="string">Outlook</attribute>
+                        <attribute name="string">Outlook Plug-In</attribute>
                     </separator>
                     <xpath expr="//label[@string='description']" position="attributes">
                         <attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
                     </xpath>
-                    <xpath expr="//button[@string='Install Modules']" position="attributes">
-                        <attribute name="string">Configure</attribute>
+                    <xpath expr="//button[@string='Install Modules']" position="replace">
+                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
+                        <button name="action_next" icon="gtk-go-forward"
+                                type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+                    </xpath>
+                    <xpath expr="//button[@string='Skip']" position="replace">
+                        <button name="action_skip" icon="gtk-jump-to" special="cancel"
+                                type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
                     </xpath>
                     <xpath expr='//separator[@string="vsep"]' position='attributes'>
                         <attribute name='string'></attribute>
@@ -43,7 +49,7 @@
         </record>
 
         <record id="action_outlook_installer" model="ir.actions.act_window">
-            <field name="name">Outlook Application Installation</field>
+            <field name="name">Outlook Plug-In Configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">outlook.installer</field>
             <field name="view_id" ref="view_outlook_installer"/>
@@ -57,53 +63,15 @@
             <field name="sequence">4</field>
         </record>
 
-    <!--	  Configuration wizard.  -->
-
-        <record id="view_outlook_wizard" model="ir.ui.view">
-        <field name="name">outlook.wizard</field>
-        <field name="model">outlook.installer</field>
-        <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string= "Outlook Plug-In Configuration">
-                    <group colspan="4">
-                        <separator string="Configure Outlook Application" colspan="4"/>
-                        <group colspan="4" col="10">
-                            <group colspan="2">
-                                <image name="gtk-dialog-info"/>
-                                    <newline/>
-                                <label align="0.0" string="This Application allows you to select an object that you would like to add to your email and its attachments from MS Outlook. You can select a partner, a task, a project, an analytical account, or any other object and Archived selected mail in mailgate.messages with attachments" width="200"/>
-                            </group>
-                            <group colspan="8">
-                                <field name="outlook" invisible="1"/>
-                                <field name="name" invisible="1"/>
-                                <field name="doc_name" invisible="1"/>
-                                    <newline/>
-                                <field name="plugin_file" filename="name"/>
-                                    <newline/>
-                                <field name="doc_file" filename="doc_name"/>
-                                    <newline/>
-                                <separator string="Outlook plugin installation note." colspan="4"/>
-                                <field name="description" nolabel="1" colspan="8"/>
-                            </group>
-                        </group>
-                    </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="4">
-                        <label align="0.0" string="" colspan="3"/>
-                        <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
-                    </group>
-                </form>
-            </field>
-        </record>
-
         <record id="action_outlook_wizard" model="ir.actions.act_window">
-            <field name="name">Outlook Application Installation</field>
+            <field name="name">Outlook Plug-In Configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">outlook.installer</field>
-            <field name="view_id" ref="view_outlook_wizard"/>
+            <field name="view_id" ref="view_outlook_installer"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
+            <field name="context">{'menu':True}</field>
         </record>
 
         <menuitem id="base.menu_base_config_mail" 
@@ -118,7 +86,7 @@
                   
         <menuitem id="menu_base_config_plugins_outlook" 
                   action="action_outlook_wizard" 
-                  name="Outlook" 
+                  name="Outlook Plug-In" 
                   parent="base.menu_base_config_plugins" 
                   sequence="10" />
     </data>
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index 8589229ead4..a99319cb6ce 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -8,14 +8,14 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Tools Application Configuration</attribute>
+            <attribute name="string">Tools Configuration</attribute>
           </form>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                 <attribute name='string'></attribute>
           </xpath>
 
           <separator string="title" position="attributes">
-            <attribute name="string">Tools</attribute>
+            <attribute name="string">Configure Tools</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
@@ -36,7 +36,7 @@
     </record>
 
     <record id="action_misc_tools_installer" model="ir.actions.act_window">
-      <field name="name">Tools Applications Installation</field>
+      <field name="name">Tools Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">misc_tools.installer</field>
       <field name="view_id" ref="view_misc_tools_installer"/>
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 2f0e2197654..e12fa4d3815 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -12,7 +12,7 @@
             <attribute name="string">Project Application Configuration</attribute>
           </form>
           <separator string="title" position="attributes">
-            <attribute name="string">Project Management</attribute>
+            <attribute name="string">Configure Your Project Management Application</attribute>
           </separator>
            <xpath expr='//separator[@string="vsep"]' position='attributes'>
                 <attribute name='string'></attribute>
@@ -40,7 +40,7 @@
     </record>
 
     <record id="action_project_installer" model="ir.actions.act_window">
-      <field name="name">Project Applications Installation</field>
+      <field name="name">Project Application Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">project.installer</field>
       <field name="view_id" ref="view_project_installer"/>
diff --git a/addons/purchase/wizard/purchase_installer.xml b/addons/purchase/wizard/purchase_installer.xml
index aa392402596..f1a19c58c27 100644
--- a/addons/purchase/wizard/purchase_installer.xml
+++ b/addons/purchase/wizard/purchase_installer.xml
@@ -2,25 +2,25 @@
 <openerp>
     <data>
         <record id="view_purchase_install_module_form" model="ir.ui.view">
-            <field name="name">Purchase Requisition</field>
+            <field name="name">Purchases Application Configuration</field>
             <field name="model">purchase.installer</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="base.res_config_installer"/>
             <field name="arch" type="xml">
               <data>
               <form position="attributes">
-                <attribute name="string"> Purchase Application Configuration</attribute>
+                <attribute name="string">Purchases Application Configuration</attribute>
               </form>
               <xpath expr='//separator[@string="vsep"]' position='attributes'>
                     <attribute name='string'></attribute>
                   </xpath>
               <separator string="title" position="attributes">
                 <attribute name="string"
-                           >Configure Your Purchase System</attribute>
+                           >Configure Your Purchases Management Application</attribute>
               </separator>
               <xpath expr="//label[@string='description']"
                      position="attributes">
-                <attribute name="string">In this page, you can extend your purchase system with purchase requisition facility and analytic distribution of purchase orders.</attribute>
+                <attribute name="string">In this page, you can extend your purchases Application with purchase requisition facility and analytic distribution of purchase orders.</attribute>
               </xpath>
               <xpath expr="//button[@string='Install Modules']" position="attributes">
                    <attribute name="string">Configure</attribute>
@@ -34,7 +34,7 @@
         </record>
 
         <record id="action_purchase_install_module" model="ir.actions.act_window">
-            <field name="name">Purchase  Profile : Install Extra Applications</field>
+            <field name="name">Purchases Application Configuration</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">purchase.installer</field>
             <field name="view_id" ref="view_purchase_install_module_form"/>
diff --git a/addons/report_designer/report_designer_installer.xml b/addons/report_designer/report_designer_installer.xml
index 842bf049163..907cdaad06d 100644
--- a/addons/report_designer/report_designer_installer.xml
+++ b/addons/report_designer/report_designer_installer.xml
@@ -8,14 +8,14 @@
       <field name="arch" type="xml">
         <data>
           <form position="attributes">
-            <attribute name="string">Reporting Application Configuration</attribute>
+            <attribute name="string">Reporting Tools Configuration</attribute>
           </form>
           <xpath expr='//separator[@string="vsep"]' position='attributes'>
                   <attribute name='string'></attribute>
           </xpath>
           <separator string="title" position="attributes">
             <attribute name="string"
-                       >Reporting Tools</attribute>
+                       >Configure Reporting Tools</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
@@ -35,7 +35,7 @@
     </record>
 
     <record id="action_report_designer_installer" model="ir.actions.act_window">
-      <field name="name">Report Applications Installation</field>
+      <field name="name">Reporting Tools Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">report_designer.installer</field>
       <field name="view_id" ref="view_report_designer_installer"/>
diff --git a/addons/sale/sale_installer.xml b/addons/sale/sale_installer.xml
index bf957bfe1d0..5231e5e0fc5 100644
--- a/addons/sale/sale_installer.xml
+++ b/addons/sale/sale_installer.xml
@@ -12,7 +12,7 @@
           </form>
 
           <separator string="title" position="attributes">
-            <attribute name="string">Sales Management</attribute>
+            <attribute name="string">Configure Your Sales Management Application</attribute>
           </separator>
           <xpath expr="//label[@string='description']"
                  position="attributes">
@@ -36,7 +36,7 @@
     </record>
 
     <record id="action_sale_installer" model="ir.actions.act_window">
-      <field name="name">Sale Management Applications Installation</field>
+      <field name="name">Sales Application Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">sale.installer</field>
       <field name="view_id" ref="view_sale_installer"/>
diff --git a/addons/survey/survey.py b/addons/survey/survey.py
index 5a080e5bfb4..d1d392c5479 100644
--- a/addons/survey/survey.py
+++ b/addons/survey/survey.py
@@ -125,7 +125,8 @@ class survey(osv.osv):
                 'type': 'ir.actions.report.xml',
                 'report_name': 'survey.browse.response',
                 'datas': datas,
-                'context' : context
+                'context' : context,
+                'nodestroy':True,
             }
         else:
 
@@ -135,7 +136,8 @@ class survey(osv.osv):
                 'type': 'ir.actions.report.xml',
                 'report_name': 'survey.form',
                 'datas': datas,
-                'context' : context
+                'context' : context,
+                'nodestroy':True,
             }
         return report
 survey()
diff --git a/addons/thunderbird/installer.py b/addons/thunderbird/installer.py
index fd600f49f21..cb963831218 100644
--- a/addons/thunderbird/installer.py
+++ b/addons/thunderbird/installer.py
@@ -41,7 +41,7 @@ class thunderbird_installer(osv.osv_memory):
     _columns = {
         'name':fields.char('File name', size=34),
         'pdf_name':fields.char('File name', size=64),
-        'thunderbird':fields.boolean('Thunderbird Application ', help="Allows you to select an object that you’d like to add to your email and its attachments."),
+        'thunderbird':fields.boolean('Thunderbird Plug-in', help="Allows you to select an object that you’d like to add to your email and its attachments."),
         'plugin_file':fields.binary('Thunderbird Plug-in', readonly=True, help="Thunderbird plug-in file. Save as this file and install this plug-in in thunderbird."),
         'pdf_file':fields.binary('Installation Manual', help="The documentation file :- how to install Thunderbird Plug-in.", readonly=True),
         'description':fields.text('Description', readonly=True)
diff --git a/addons/thunderbird/thunderbird_installer.xml b/addons/thunderbird/thunderbird_installer.xml
index f8972196c44..622ca3ed127 100644
--- a/addons/thunderbird/thunderbird_installer.xml
+++ b/addons/thunderbird/thunderbird_installer.xml
@@ -12,14 +12,20 @@
                   <attribute name="string">Thunderbird Plug-In Configuration</attribute>
               </form>
               <separator string="title" position="attributes">
-                   <attribute name="string">Thunderbird</attribute>
+                   <attribute name="string">Thunderbird Plug-In</attribute>
               </separator>
               <xpath expr="//label[@string='description']" position="attributes">
                   <attribute name="string">This plug-in allows you to link your e-mail to OpenERP's documents. You can attach it to any existing one in OpenERP or create a new one.</attribute>
               </xpath>
-	      <xpath expr="//button[@string='Install Modules']" position="attributes">
-	        <attribute name="string">Configure</attribute>
-	      </xpath>
+	          <xpath expr="//button[@string='Install Modules']" position="replace">
+                <button colspan="1" icon="gtk-close" special="cancel" string="_Close" invisible="not context.get('menu',False)"/>
+                <button name="action_next" icon="gtk-go-forward"
+                        type="object" string="Configure" colspan="1" invisible="context.get('menu',False)"/>
+              </xpath>
+              <xpath expr="//button[@string='Skip']" position="replace">
+                <button name="action_skip" icon="gtk-jump-to" special="cancel"
+                        type="object" string="Skip" colspan="1" invisible="context.get('menu',False)"/>
+              </xpath>
               <xpath expr='//separator[@string="vsep"]' position='attributes'>
 		  		<attribute name='string'></attribute>
 		  		<attribute name='rowspan'>15</attribute>
@@ -44,7 +50,7 @@
     </record>
 
     <record id="action_thunderbird_installer" model="ir.actions.act_window">
-      <field name="name">Thunderbird Application Installation</field>
+      <field name="name">Thunderbird Plug-In Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">thunderbird.installer</field>
       <field name="view_id" ref="view_thunderbird_installer"/>
@@ -58,59 +64,21 @@
       <field name="sequence">3</field>
     </record>
 
-	<!--  Configuration wizard.  -->
-
-    <record id="view_thunderbird_wizard" model="ir.ui.view">
-      <field name="name">thunderbird.wizard</field>
-      <field name="model">thunderbird.installer</field>
-      <field name="type">form</field>
-      <field name="arch" type="xml">
-          <form string= "Thunderbird Installation">
-              <group colspan="4">
-                  <separator string="Configure Thunderbird Application" colspan="4"/>
-                  <group colspan="4" col="10">
-                      <group colspan="2">
-                          <image name="gtk-dialog-info"/>
-                          <newline/>
-                          <label align="0.0" string="This Application allows you to archive an e-mail on one or more objects of OpenERP. You can attach an email to a partner, a task, an analytic account or any other object. You can also create a new object like a lead, a phone call, claim and many more." width="200"/>
-                       </group>
-                       <group colspan="8">
-		                  <field name="thunderbird" invisible="1"/>
-		                  <field name="name" invisible="1"/>
-		                  <field name="pdf_name" invisible="1"/>
-		                  <newline/>
-
-		                  <field name="plugin_file" filename="name"/>
-		                  <newline/>
-		                  <field name="pdf_file" filename="pdf_name"/>
-		                  <newline/>
-		                  <separator string="Installation and Configuration Steps" colspan="4"/>
-		                  <field name="description" nolabel="1" colspan="8"/>
-		               </group>
-                   </group>
-             </group>
-             <separator string="" colspan="4"/>
-             <group colspan="4">
-                 <label align="0.0" string="" colspan="3"/>
-                 <button colspan="1" icon="gtk-close" special="cancel" string="_Close"/>
-             </group>
-         </form>
-      </field>
-    </record>
 
     <record id="action_thunderbird_wizard" model="ir.actions.act_window">
-      <field name="name">Thunderbird Application Installation</field>
+      <field name="name">Thunderbird Plug-In Configuration</field>
       <field name="type">ir.actions.act_window</field>
       <field name="res_model">thunderbird.installer</field>
-      <field name="view_id" ref="view_thunderbird_wizard"/>
+      <field name="view_id" ref="view_thunderbird_installer"/>
       <field name="view_type">form</field>
       <field name="view_mode">form</field>
       <field name="target">new</field>
+      <field name="context">{'menu':True}</field>
     </record>
 
     <menuitem id="base.menu_base_config_mail" name="Mail" parent="base.menu_base_config" sequence="10"/>
 	<menuitem id="base.menu_base_config_plugins" name="Plugins" parent="base.menu_base_config_mail" sequence="10" />
-	<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Thunderbird" parent="base.menu_base_config_plugins" sequence="10" />
+	<menuitem id="menu_base_config_plugins_thunderbird" action="action_thunderbird_wizard" name="Thunderbird Plug-In" parent="base.menu_base_config_plugins" sequence="10" />
 
   </data>
 </openerp>