diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 8d46bcb225c..84a26d5ec40 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -63,7 +63,7 @@ For more specific needs, you may also assign custom-defined actions
     ],
     'demo': [],
     'installable': True,
-    'auto_install': False,
+    'auto_install': True,
     'images': ['images/1_email_servers.jpeg'],
 }
 
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 66c7e5a7f5c..079312c11fe 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -93,6 +93,20 @@
             <field name="view_id" ref="view_email_server_tree"/>
             <field name="search_view_id" ref="view_email_server_search"/>
         </record>
+        
+        <record id="inherit_view_general_configuration" model="ir.ui.view">
+            <field name="name">General Settings</field>
+            <field name="model">base.config.settings</field>
+              <field name="inherit_id" ref="base_setup.view_general_configuration"/>
+              <field name="arch" type="xml">
+                  <div name="email" position="inside">
+                      <button type="action"
+                            name="%(action_email_server_tree)d"
+                            string="Configure the incoming email gateway" class="oe_link"/>
+                  </div>
+              </field>
+      </record>
+
 
         <menuitem
             parent="base.menu_email"