diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index fc2b245f11f..f678d52a496 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -24,7 +24,7 @@
 {
     "name" : "Fetchmail Server",
     "version" : "1.0",
-    "depends" : ["base", "smtpclient"],
+    "depends" : ["base", "mail_gateway"],
     "author" : "Tiny",
     "description": """Fetchail: 
     * Fetch email from Pop / IMAP server
diff --git a/addons/mail_gateway/__openerp__.py b/addons/mail_gateway/__openerp__.py
index 13c69301dda..a07a2595db8 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', 'fetchmail'],
+    'depends': ['smtpclient'],
     'init_xml': [],
     'update_xml': [
         
diff --git a/addons/crm/scripts/__init__.py b/addons/mail_gateway/scripts/__init__.py
similarity index 100%
rename from addons/crm/scripts/__init__.py
rename to addons/mail_gateway/scripts/__init__.py
diff --git a/addons/crm/scripts/openerp_mailgate/__init__.py b/addons/mail_gateway/scripts/openerp_mailgate/__init__.py
similarity index 100%
rename from addons/crm/scripts/openerp_mailgate/__init__.py
rename to addons/mail_gateway/scripts/openerp_mailgate/__init__.py
diff --git a/addons/crm/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py
similarity index 100%
rename from addons/crm/scripts/openerp_mailgate/openerp_mailgate.py
rename to addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py