diff --git a/mail_attach_existing_attachment/README.rst b/mail_attach_existing_attachment/README.rst
index d81fb5879..a3eea1475 100644
--- a/mail_attach_existing_attachment/README.rst
+++ b/mail_attach_existing_attachment/README.rst
@@ -31,7 +31,7 @@ To configure this module, you need to:
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/205/9.0
+   :target: https://runbot.odoo-community.org/runbot/205/10.0
 
 Known issues / Roadmap
 ======================
diff --git a/mail_attach_existing_attachment/__openerp__.py b/mail_attach_existing_attachment/__manifest__.py
similarity index 98%
rename from mail_attach_existing_attachment/__openerp__.py
rename to mail_attach_existing_attachment/__manifest__.py
index 58f1642dd..fbc2b424a 100644
--- a/mail_attach_existing_attachment/__openerp__.py
+++ b/mail_attach_existing_attachment/__manifest__.py
@@ -31,7 +31,7 @@
               "Odoo Community Association (OCA)",
     'website': "http://acsone.eu",
     'category': 'Social Network',
-    'version': '9.0.1.0.0',
+    'version': '10.0.1.0.0',
     'license': 'AGPL-3',
     'depends': [
         'mail',
diff --git a/mail_attach_existing_attachment/i18n/de.po b/mail_attach_existing_attachment/i18n/de.po
index 98e6791e8..022273015 100644
--- a/mail_attach_existing_attachment/i18n/de.po
+++ b/mail_attach_existing_attachment/i18n/de.po
@@ -3,14 +3,16 @@
 # * mail_attach_existing_attachment
 # 
 # Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2016
+# Niki Waibel <niki.waibel@gmail.com>, 2016
 msgid ""
 msgstr ""
-"Project-Id-Version: social (9.0)\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-13 02:44+0000\n"
-"PO-Revision-Date: 2016-06-12 23:57+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: German (http://www.transifex.com/oca/OCA-social-9-0/language/de/)\n"
+"POT-Creation-Date: 2016-11-29 14:24+0000\n"
+"PO-Revision-Date: 2016-11-29 14:24+0000\n"
+"Last-Translator: Niki Waibel <niki.waibel@gmail.com>, 2016\n"
+"Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
@@ -20,12 +22,12 @@ msgstr ""
 #. module: mail_attach_existing_attachment
 #: model:ir.model.fields,field_description:mail_attach_existing_attachment.field_mail_compose_message_object_attachment_ids
 msgid "Attachments"
-msgstr ""
+msgstr "Anhänge"
 
 #. module: mail_attach_existing_attachment
 #: model:ir.model.fields,field_description:mail_attach_existing_attachment.field_mail_compose_message_can_attach_attachment
 msgid "Can Attach Attachment"
-msgstr ""
+msgstr "Kann Anhang anhängen"
 
 #. module: mail_attach_existing_attachment
 #: model:ir.model,name:mail_attach_existing_attachment.model_mail_compose_message
diff --git a/mail_attach_existing_attachment/i18n/es.po b/mail_attach_existing_attachment/i18n/es.po
index 3db638d9c..015f08a39 100644
--- a/mail_attach_existing_attachment/i18n/es.po
+++ b/mail_attach_existing_attachment/i18n/es.po
@@ -3,14 +3,16 @@
 # * mail_attach_existing_attachment
 # 
 # Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2017
+# Pedro M. Baeza <pedro.baeza@gmail.com>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: social (9.0)\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-13 02:44+0000\n"
-"PO-Revision-Date: 2016-06-12 23:57+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: Spanish (http://www.transifex.com/oca/OCA-social-9-0/language/es/)\n"
+"POT-Creation-Date: 2017-12-01 02:19+0000\n"
+"PO-Revision-Date: 2017-12-01 02:19+0000\n"
+"Last-Translator: Pedro M. Baeza <pedro.baeza@gmail.com>, 2017\n"
+"Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
@@ -20,12 +22,12 @@ msgstr ""
 #. module: mail_attach_existing_attachment
 #: model:ir.model.fields,field_description:mail_attach_existing_attachment.field_mail_compose_message_object_attachment_ids
 msgid "Attachments"
-msgstr ""
+msgstr "Adjuntos"
 
 #. module: mail_attach_existing_attachment
 #: model:ir.model.fields,field_description:mail_attach_existing_attachment.field_mail_compose_message_can_attach_attachment
 msgid "Can Attach Attachment"
-msgstr ""
+msgstr "Puede adjuntar adjuntos"
 
 #. module: mail_attach_existing_attachment
 #: model:ir.model,name:mail_attach_existing_attachment.model_mail_compose_message
diff --git a/mail_attach_existing_attachment/i18n/fr.po b/mail_attach_existing_attachment/i18n/fr.po
index b84642276..0220407d3 100644
--- a/mail_attach_existing_attachment/i18n/fr.po
+++ b/mail_attach_existing_attachment/i18n/fr.po
@@ -3,14 +3,16 @@
 # * mail_attach_existing_attachment
 # 
 # Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2016
+# Quentin THEURET <odoo@kerpeo.com>, 2017
 msgid ""
 msgstr ""
-"Project-Id-Version: social (9.0)\n"
+"Project-Id-Version: Odoo Server 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-13 02:44+0000\n"
-"PO-Revision-Date: 2016-06-12 23:57+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: French (http://www.transifex.com/oca/OCA-social-9-0/language/fr/)\n"
+"POT-Creation-Date: 2017-07-22 09:45+0000\n"
+"PO-Revision-Date: 2017-07-22 09:45+0000\n"
+"Last-Translator: Quentin THEURET <odoo@kerpeo.com>, 2017\n"
+"Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
@@ -20,12 +22,12 @@ msgstr ""
 #. module: mail_attach_existing_attachment
 #: model:ir.model.fields,field_description:mail_attach_existing_attachment.field_mail_compose_message_object_attachment_ids
 msgid "Attachments"
-msgstr ""
+msgstr "Pièces jointes"
 
 #. module: mail_attach_existing_attachment
 #: model:ir.model.fields,field_description:mail_attach_existing_attachment.field_mail_compose_message_can_attach_attachment
 msgid "Can Attach Attachment"
-msgstr ""
+msgstr "Il est possible d'attacher des pièces jointes"
 
 #. module: mail_attach_existing_attachment
 #: model:ir.model,name:mail_attach_existing_attachment.model_mail_compose_message
diff --git a/mail_attach_existing_attachment/i18n/it.po b/mail_attach_existing_attachment/i18n/it.po
new file mode 100644
index 000000000..ed7ee33a6
--- /dev/null
+++ b/mail_attach_existing_attachment/i18n/it.po
@@ -0,0 +1,35 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * mail_attach_existing_attachment
+# 
+# Translators:
+# OCA Transbot <transbot@odoo-community.org>, 2016
+# Marius Marolla <mariusmarolla@gmail.com>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 10.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-05-17 01:02+0000\n"
+"PO-Revision-Date: 2017-05-17 01:02+0000\n"
+"Last-Translator: Marius Marolla <mariusmarolla@gmail.com>, 2017\n"
+"Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. module: mail_attach_existing_attachment
+#: model:ir.model.fields,field_description:mail_attach_existing_attachment.field_mail_compose_message_object_attachment_ids
+msgid "Attachments"
+msgstr "Allegati"
+
+#. module: mail_attach_existing_attachment
+#: model:ir.model.fields,field_description:mail_attach_existing_attachment.field_mail_compose_message_can_attach_attachment
+msgid "Can Attach Attachment"
+msgstr "Inserimento Allegati Ammesso"
+
+#. module: mail_attach_existing_attachment
+#: model:ir.model,name:mail_attach_existing_attachment.model_mail_compose_message
+msgid "Email composition wizard"
+msgstr "Wizard Creazione Email"
diff --git a/mail_attach_existing_attachment/wizard/mail_compose_message.py b/mail_attach_existing_attachment/wizard/mail_compose_message.py
index 6e154a14e..a86e4a802 100644
--- a/mail_attach_existing_attachment/wizard/mail_compose_message.py
+++ b/mail_attach_existing_attachment/wizard/mail_compose_message.py
@@ -23,7 +23,7 @@
 #
 ##############################################################################
 
-from openerp import models, fields, api
+from odoo import models, fields, api
 
 
 class MailComposeMessage(models.TransientModel):
diff --git a/mail_attach_existing_attachment/wizard/mail_compose_message_view.xml b/mail_attach_existing_attachment/wizard/mail_compose_message_view.xml
index aa10025b9..d79a03429 100644
--- a/mail_attach_existing_attachment/wizard/mail_compose_message_view.xml
+++ b/mail_attach_existing_attachment/wizard/mail_compose_message_view.xml
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="0">
-        <record model="ir.ui.view" id="email_compose_message_wizard_inherit_form">
-            <field name="name">mail.compose.message.form (mail_attach_existing_attachment)</field>
-            <field name="model">mail.compose.message</field>
-            <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
-            <field name="arch" type="xml">
-                <xpath expr="//field[@name='attachment_ids']" position="after">
-                    <field name="can_attach_attachment" invisible="1"/>
-                    <div attrs="{'invisible': [('can_attach_attachment', '=', False)]}">
-                        <br />
-                        <field name="object_attachment_ids" widget="many2many_checkboxes" domain="[('res_model', '=', model), ('res_id', '=', res_id)]" />
-                    </div>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</openerp>
\ No newline at end of file
+<odoo>
+    <record model="ir.ui.view" id="email_compose_message_wizard_inherit_form">
+        <field name="name">mail.compose.message.form (mail_attach_existing_attachment)</field>
+        <field name="model">mail.compose.message</field>
+        <field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='attachment_ids']" position="after">
+                <field name="can_attach_attachment" invisible="1"/>
+                <div attrs="{'invisible': [('can_attach_attachment', '=', False)]}">
+                    <br />
+                    <field name="object_attachment_ids" widget="many2many_checkboxes" domain="[('res_model', '=', model), ('res_id', '=', res_id)]" />
+                </div>
+            </xpath>
+        </field>
+    </record>
+</odoo>