diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index 7a048a50eb4..ef80774c09c 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -105,17 +105,17 @@ class sale_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
     _columns = {
         'module_crm': fields.boolean('CRM'),
-        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin',
+        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin', readonly= False,
             help="""The plugin allows you archive email and its attachments to the selected
-                OpenERP objects. You can select a partner, a task, a project, an analytical
-                account, or any other object and attach the selected mail as a .eml file in
+                OpenERP objects. You can select a partner, or a lead and 
+                attach the selected mail as a .eml file in
                 the attachment of a selected record. You can create documents for CRM Lead,
-                HR Applicant and Project Issue from the selected emails.
+                Partner from the selected emails.
                 This installs the module plugin_thunderbird."""),
         'module_plugin_outlook': fields.boolean('Outlook Plugin',
             help="""The Outlook plugin 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 archive a selected
+                to your email and its attachments from MS Outlook. You can select a partner, 
+                or a lead object and archive a selected
                 email into an OpenERP mail message with attachments.
                 This installs the module plugin_outlook."""),
     }
diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index 26019e556f9..a23076e858c 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -60,9 +60,9 @@
                             <separator string="Emails"/>
                         </group>
                         <newline/>
-                        <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)],'readonly': [('module_plugin_thunderbird','=',False)]}"/>
-                        <newline/>
-                        <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)],'readonly': [('module_plugin_outlook','=',False)]}"/>
+	                        <field name="module_plugin_thunderbird" attrs="{'invisible': [('module_crm','=',False)]}"/>
+	                        <newline/>
+	                        <field name="module_plugin_outlook" attrs="{'invisible': [('module_crm','=',False)]}"/>
                         <group name="config_crm"/>
                     </group>
                 </sheet>
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml
index b5601e7904a..c535527fc63 100644
--- a/addons/plugin_thunderbird/plugin_thunderbird.xml
+++ b/addons/plugin_thunderbird/plugin_thunderbird.xml
@@ -63,7 +63,7 @@
         <field name="inherit_id" ref="base.view_sale_config_settings"/>
         <field name="arch" type="xml">
             <field name="module_plugin_thunderbird" position="after">
-                <group colspan="2" attrs="{'invisible': [('module_crm','=',False)]}">
+                <group colspan="2" attrs="{'invisible': ['|',('module_crm','=',False),('module_plugin_thunderbird','=',False)]}">
                     <button name="%(action_thunderbird_installer)d" type="action"
                         string="Configure Thunderbird Plugin" icon="gtk-execute"/>
                 </group>