diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py
index ef80774c09c..dd9bed97327 100644
--- a/addons/base_setup/base_setup.py
+++ b/addons/base_setup/base_setup.py
@@ -105,7 +105,7 @@ class sale_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
     _columns = {
         'module_crm': fields.boolean('CRM'),
-        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin', readonly= False,
+        'module_plugin_thunderbird': fields.boolean('Thunderbird Plugin',
             help="""The plugin allows you archive email and its attachments to the selected
                 OpenERP objects. You can select a partner, or a lead and 
                 attach the selected mail as a .eml file in
diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index b40ed78bb16..563da4bd137 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -26,7 +26,7 @@ class crm_configuration(osv.osv_memory):
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_lead': fields.boolean("Create Leads from Incoming Mails", readonly=True,
+        'fetchmail_lead': fields.boolean("Create Leads from Incoming Mails",
             fetchmail_model='crm.lead', fetchmail_name='Incoming Leads',
             help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
         'module_crm_caldav': fields.boolean("Caldav Synchronization",
diff --git a/addons/crm/res_config_view.xml b/addons/crm/res_config_view.xml
index a09f333076f..53cdb0a873c 100644
--- a/addons/crm/res_config_view.xml
+++ b/addons/crm/res_config_view.xml
@@ -10,7 +10,9 @@
             <field name="arch" type="xml">
                 <group name="config_fetchmail" position="after">
                     <field name="fetchmail_lead"/>
-                    <button colspan="2" type="object" name="configure_fetchmail_lead" string="Configure" icon="gtk-execute"/>
+                    <group attrs="{'invisible': [('fetchmail_lead','=',False)]}">
+                    	<button colspan="2" type="object" name="configure_fetchmail_lead" string="Configure" icon="gtk-execute"/>
+                    </group>
                 </group>
 
                 <group name="config_crm" position="after">