diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index 992fe2464c5..091114a77b3 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -332,7 +332,6 @@ class crm_case_section(osv.osv):
         'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
         'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
         'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
-        'server_id':fields.many2one('email.smtpclient', 'Server ID'),
         'note': fields.text('Description'),
     }
 
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index 3f308f3cd6d..63454ad2848 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -30,7 +30,6 @@
                             </group>
                             <group col="2" colspan="1">
                                 <separator string="Contact Information" colspan="2"/>
-                                <field name="server_id" select="2"/>
                                 <field name="reply_to" select="2"/>
                             </group>
                             <group col="2" colspan="1">
diff --git a/addons/crm/wizard/crm_send_email.py b/addons/crm/wizard/crm_send_email.py
index f9b3a2e64dc..87537ebc240 100644
--- a/addons/crm/wizard/crm_send_email.py
+++ b/addons/crm/wizard/crm_send_email.py
@@ -115,28 +115,17 @@ class crm_send_new_email(osv.osv_memory):
                 x_headers['References'] = "%s" % (message_id)
 
             flag = False
-            if case.section_id and case.section_id.server_id:
-                flag = smtp_pool.send_email(
-                    cr=cr,
-                    uid=uid, 
-                    server_id=case.section_id.server_id.id,
-                    emailto=emails,
-                    subject=obj.subject,
-                    body="<pre>%s</pre>" % body,
-                    attachments=attach,
-                    headers=x_headers
-                )
-            else:
-                flag = tools.email_send(
-                    email_from,
-                    emails,
-                    obj.subject,
-                    body,
-                    attach=attach,
-                    reply_to=case.section_id.reply_to,
-                    openobject_id=str(case.id),
-                    x_headers=x_headers
-                )
+            
+            flag = tools.email_send(
+                email_from,
+                emails,
+                obj.subject,
+                body,
+                attach=attach,
+                reply_to=case.section_id.reply_to,
+                openobject_id=str(case.id),
+                x_headers=x_headers
+            )
             
             if flag:
                 if obj.state == 'unchanged':
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index f678d52a496..aad88a7ef50 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -24,7 +24,7 @@
 {
     "name" : "Fetchmail Server",
     "version" : "1.0",
-    "depends" : ["base", "mail_gateway"],
+    "depends" : ["base"],
     "author" : "Tiny",
     "description": """Fetchail: 
     * Fetch email from Pop / IMAP server
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index ced787408b3..510b31b6131 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -74,9 +74,15 @@
             <field name="context">{'type':'pop'}</field>
             <field name="domain">[('type','=','pop')]</field>
         </record>
+
+        <menuitem 
+            parent="base.menu_config" 
+            id="menu_action_fetchmail_server_tree" 
+            name="Fetchmail Services"
+        />
         
         <menuitem 
-            parent="smtpclient.menu_smtpclient_administration_server" 
+            parent="menu_action_fetchmail_server_tree" 
             id="menu_action_email_server_tree" 
             action="action_email_server_tree"
         />
@@ -92,7 +98,7 @@
         </record>
         
         <menuitem 
-            parent="smtpclient.menu_smtpclient_administration_server" 
+            parent="menu_action_fetchmail_server_tree" 
             id="menu_action_email_server_tree_imap" 
             action="action_email_server_tree_imap"
         />
diff --git a/addons/mail_gateway/__openerp__.py b/addons/mail_gateway/__openerp__.py
index b2d78324fe5..27f596a53b6 100644
--- a/addons/mail_gateway/__openerp__.py
+++ b/addons/mail_gateway/__openerp__.py
@@ -32,7 +32,7 @@
     * Easy Integration with any Module""",
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['smtpclient'],
+    'depends': ['base','fetchmail'],
     'init_xml': [],
     'update_xml': [
         "mail_gateway_view.xml"