diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py
index 2611bcee042..57818dddc5c 100644
--- a/addons/base_action_rule/__openerp__.py
+++ b/addons/base_action_rule/__openerp__.py
@@ -26,7 +26,7 @@
     'description': "This module allows to implement action rules for any object.",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'email'],
+    'depends': ['base', 'emails'],
     'init_xml': [
         'base_action_rule_data.xml'
     ],
diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py
index 4b6cceb5f9c..9c0e4857d13 100644
--- a/addons/base_calendar/__openerp__.py
+++ b/addons/base_calendar/__openerp__.py
@@ -22,7 +22,7 @@
 {
     "name" : "Basic Calendar Functionality",
     "version" : "1.0",
-    "depends" : ["base", "email"],
+    "depends" : ["base", "emails"],
     'description': """Full featured calendar system that supports:
     - Calendar of events
     - Alerts (create requests)
diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py
index 210d1a61de9..510d270aeda 100644
--- a/addons/crm/__openerp__.py
+++ b/addons/crm/__openerp__.py
@@ -54,7 +54,7 @@ Create dashboard for CRM that includes:
     'website': 'http://www.openerp.com',
     'depends': [
         'base',
-        'email',
+        'emails',
         'base_action_rule',
         'process',
         'email_gateway',
diff --git a/addons/email_gateway/__openerp__.py b/addons/email_gateway/__openerp__.py
index 96a459b946e..efef4153d79 100644
--- a/addons/email_gateway/__openerp__.py
+++ b/addons/email_gateway/__openerp__.py
@@ -28,7 +28,7 @@
     * Easy Integration with any Module""",
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
-    'depends': ['base','email'],
+    'depends': ['base','emails'],
     'init_xml': [],
     'update_xml': [
         "email_gateway_view.xml",
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index 296a2993a28..2f21631b7d7 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -26,7 +26,7 @@
     "author" : "Openlabs",
     "website" : "http://openerp.com",
     "category" : "Added functionality",
-    "depends" : [ 'email'],
+    "depends" : [ 'emails'],
     "description": """
     Email Template is extraction of Power Email basically just to send the emails.
     """,
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index cedd418a002..019d6d1ff1f 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -153,14 +153,14 @@
         </record>
 
         <menuitem name="Email Templates" id="menu_email_template_all_tools"
-            parent="email.menu_config_email" action="action_email_template_tree_all" />
+            parent="emails.menu_config_email" action="action_email_template_tree_all" />
 
         <!-- Inherit email.message view -->
 
         <record model="ir.ui.view" id="view_email_message_template_form">
             <field name="name">email.message.template.form</field>
             <field name="model">email.message</field>
-            <field name="inherit_id" ref="email.view_email_message_form"/>
+            <field name="inherit_id" ref="emails.view_email_message_form"/>
             <field name="type">form</field>
             <field name="arch" type="xml">
 	            <field name="debug" position="after">
diff --git a/addons/email/__init__.py b/addons/emails/__init__.py
similarity index 100%
rename from addons/email/__init__.py
rename to addons/emails/__init__.py
diff --git a/addons/email/__openerp__.py b/addons/emails/__openerp__.py
similarity index 100%
rename from addons/email/__openerp__.py
rename to addons/emails/__openerp__.py
diff --git a/addons/email/email_data.xml b/addons/emails/email_data.xml
similarity index 100%
rename from addons/email/email_data.xml
rename to addons/emails/email_data.xml
diff --git a/addons/email/email_message.py b/addons/emails/email_message.py
similarity index 100%
rename from addons/email/email_message.py
rename to addons/emails/email_message.py
diff --git a/addons/email/email_smtp_server.py b/addons/emails/email_smtp_server.py
similarity index 100%
rename from addons/email/email_smtp_server.py
rename to addons/emails/email_smtp_server.py
diff --git a/addons/email/email_view.xml b/addons/emails/email_view.xml
similarity index 100%
rename from addons/email/email_view.xml
rename to addons/emails/email_view.xml
diff --git a/addons/email/i18n/de.po b/addons/emails/i18n/de.po
similarity index 100%
rename from addons/email/i18n/de.po
rename to addons/emails/i18n/de.po
diff --git a/addons/email/i18n/es.po b/addons/emails/i18n/es.po
similarity index 100%
rename from addons/email/i18n/es.po
rename to addons/emails/i18n/es.po
diff --git a/addons/email/i18n/fr.po b/addons/emails/i18n/fr.po
similarity index 100%
rename from addons/email/i18n/fr.po
rename to addons/emails/i18n/fr.po
diff --git a/addons/email/i18n/hu.po b/addons/emails/i18n/hu.po
similarity index 100%
rename from addons/email/i18n/hu.po
rename to addons/emails/i18n/hu.po
diff --git a/addons/email/i18n/it.po b/addons/emails/i18n/it.po
similarity index 100%
rename from addons/email/i18n/it.po
rename to addons/emails/i18n/it.po
diff --git a/addons/email/i18n/lt.po b/addons/emails/i18n/lt.po
similarity index 100%
rename from addons/email/i18n/lt.po
rename to addons/emails/i18n/lt.po
diff --git a/addons/email/i18n/lv.po b/addons/emails/i18n/lv.po
similarity index 100%
rename from addons/email/i18n/lv.po
rename to addons/emails/i18n/lv.po
diff --git a/addons/email/i18n/mail_gateway.pot b/addons/emails/i18n/mail_gateway.pot
similarity index 100%
rename from addons/email/i18n/mail_gateway.pot
rename to addons/emails/i18n/mail_gateway.pot
diff --git a/addons/email/i18n/nl.po b/addons/emails/i18n/nl.po
similarity index 100%
rename from addons/email/i18n/nl.po
rename to addons/emails/i18n/nl.po
diff --git a/addons/email/i18n/pl.po b/addons/emails/i18n/pl.po
similarity index 100%
rename from addons/email/i18n/pl.po
rename to addons/emails/i18n/pl.po
diff --git a/addons/email/i18n/pt.po b/addons/emails/i18n/pt.po
similarity index 100%
rename from addons/email/i18n/pt.po
rename to addons/emails/i18n/pt.po
diff --git a/addons/email/i18n/pt_BR.po b/addons/emails/i18n/pt_BR.po
similarity index 100%
rename from addons/email/i18n/pt_BR.po
rename to addons/emails/i18n/pt_BR.po
diff --git a/addons/email/i18n/ro.po b/addons/emails/i18n/ro.po
similarity index 100%
rename from addons/email/i18n/ro.po
rename to addons/emails/i18n/ro.po
diff --git a/addons/email/i18n/ru.po b/addons/emails/i18n/ru.po
similarity index 100%
rename from addons/email/i18n/ru.po
rename to addons/emails/i18n/ru.po
diff --git a/addons/email/i18n/sl.po b/addons/emails/i18n/sl.po
similarity index 100%
rename from addons/email/i18n/sl.po
rename to addons/emails/i18n/sl.po
diff --git a/addons/email/i18n/sr@latin.po b/addons/emails/i18n/sr@latin.po
similarity index 100%
rename from addons/email/i18n/sr@latin.po
rename to addons/emails/i18n/sr@latin.po
diff --git a/addons/email/i18n/sv.po b/addons/emails/i18n/sv.po
similarity index 100%
rename from addons/email/i18n/sv.po
rename to addons/emails/i18n/sv.po
diff --git a/addons/email/i18n/zh_CN.po b/addons/emails/i18n/zh_CN.po
similarity index 100%
rename from addons/email/i18n/zh_CN.po
rename to addons/emails/i18n/zh_CN.po
diff --git a/addons/email/res_partner.py b/addons/emails/res_partner.py
similarity index 100%
rename from addons/email/res_partner.py
rename to addons/emails/res_partner.py
diff --git a/addons/email/res_partner_view.xml b/addons/emails/res_partner_view.xml
similarity index 100%
rename from addons/email/res_partner_view.xml
rename to addons/emails/res_partner_view.xml
diff --git a/addons/email/security/ir.model.access.csv b/addons/emails/security/ir.model.access.csv
similarity index 100%
rename from addons/email/security/ir.model.access.csv
rename to addons/emails/security/ir.model.access.csv
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 35685e46e4c..591fe944111 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -102,7 +102,7 @@
         </record>
 
         <menuitem
-            parent="email.menu_email_message_tools"
+            parent="emails.menu_email_message_tools"
             id="menu_action_fetchmail_server_tree"
             action="action_email_server_tree"
             name="Email Servers"
@@ -112,7 +112,7 @@
 	      <field name="name">email.message.tree</field>
 	      <field name="model">email.message</field>
 	      <field name="type">tree</field>
-	      <field name="inherit_id" ref="email.view_email_message_tree"/>
+	      <field name="inherit_id" ref="emails.view_email_message_tree"/>
 	      <field name="arch" type="xml">
 	          <field name="user_id" position="after">
 	              <field name="server_id" select="1"/>
@@ -124,7 +124,7 @@
 	      <field name="name">email.message.inherit.search</field>
 	      <field name="model">email.message</field>
 	      <field name="type">search</field>
-	      <field name="inherit_id" ref="email.view_email_message_search"/>
+	      <field name="inherit_id" ref="emails.view_email_message_search"/>
 	      <field name="arch" type="xml">
 			<xpath expr="/search/field[@name='name']" position="before">
 			     <filter string="Emails" name="emails" domain="[('server_id','!=',False)]" icon="terp-mail-message-new"/>
@@ -146,7 +146,7 @@
       </record>
 
       <menuitem id="base.menu_email_gateway_form"
-               parent="email.menu_email_message_tools" action="action_view_mail_message_emails" />
+               parent="emails.menu_email_message_tools" action="action_view_mail_message_emails" />
 
       <act_window
             context="{'server_id': active_id}"