diff --git a/mass_mailing_custom_unsubscribe/__manifest__.py b/mass_mailing_custom_unsubscribe/__manifest__.py
index f87dedd2e..04041d084 100644
--- a/mass_mailing_custom_unsubscribe/__manifest__.py
+++ b/mass_mailing_custom_unsubscribe/__manifest__.py
@@ -6,7 +6,7 @@
     "name": "Customizable unsubscription process on mass mailing emails",
     "summary": "Know and track (un)subscription reasons, GDPR compliant",
     "category": "Marketing",
-    "version": "13.0.1.0.0",
+    "version": "13.0.1.0.1",
     "depends": ["mass_mailing"],
     "data": [
         "security/ir.model.access.csv",
diff --git a/mass_mailing_custom_unsubscribe/i18n/am.po b/mass_mailing_custom_unsubscribe/i18n/am.po
index d78fc4a3d..99e2078cf 100644
--- a/mass_mailing_custom_unsubscribe/i18n/am.po
+++ b/mass_mailing_custom_unsubscribe/i18n/am.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/ar.po b/mass_mailing_custom_unsubscribe/i18n/ar.po
index bf224f036..a3af528ea 100644
--- a/mass_mailing_custom_unsubscribe/i18n/ar.po
+++ b/mass_mailing_custom_unsubscribe/i18n/ar.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "التاريخ"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "المعرف"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "الاسم"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr "السبب"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "مسلسل"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr "سنة"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/bg.po b/mass_mailing_custom_unsubscribe/i18n/bg.po
index 94dd4bf48..5d979c96e 100644
--- a/mass_mailing_custom_unsubscribe/i18n/bg.po
+++ b/mass_mailing_custom_unsubscribe/i18n/bg.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "Дата"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "Име"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Последователност"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/bs.po b/mass_mailing_custom_unsubscribe/i18n/bs.po
index 94481f0f5..abbc800d0 100644
--- a/mass_mailing_custom_unsubscribe/i18n/bs.po
+++ b/mass_mailing_custom_unsubscribe/i18n/bs.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Ime"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Razlog"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Sekvenca"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr "Godina"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/ca.po b/mass_mailing_custom_unsubscribe/i18n/ca.po
index 8474e0425..167a9725e 100644
--- a/mass_mailing_custom_unsubscribe/i18n/ca.po
+++ b/mass_mailing_custom_unsubscribe/i18n/ca.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "Data"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -248,7 +234,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr "Llista d'enviament"
 
@@ -264,7 +250,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr "Correu massiu"
 
@@ -321,7 +307,7 @@ msgid "Name"
 msgstr "Nom"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -332,7 +318,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -356,13 +342,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -378,13 +364,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Raó"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Seqüència"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -409,7 +400,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -458,30 +449,28 @@ msgstr "Any"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -490,7 +479,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -499,7 +488,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/cs.po b/mass_mailing_custom_unsubscribe/i18n/cs.po
index 623738c6b..d345ca085 100644
--- a/mass_mailing_custom_unsubscribe/i18n/cs.po
+++ b/mass_mailing_custom_unsubscribe/i18n/cs.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "Název"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Důvod"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Číselná řada"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr "Rok"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/da.po b/mass_mailing_custom_unsubscribe/i18n/da.po
index 20de16dcd..d0d9ee164 100644
--- a/mass_mailing_custom_unsubscribe/i18n/da.po
+++ b/mass_mailing_custom_unsubscribe/i18n/da.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "Id"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "Navn"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Rækkefølge"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/de.po b/mass_mailing_custom_unsubscribe/i18n/de.po
index 7dabd7eae..64cc7db21 100644
--- a/mass_mailing_custom_unsubscribe/i18n/de.po
+++ b/mass_mailing_custom_unsubscribe/i18n/de.po
@@ -49,27 +49,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -80,7 +69,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -109,7 +98,7 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -188,23 +177,20 @@ msgstr "Ich bin nicht interessiert"
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -256,7 +242,7 @@ msgid "Mail unsubscription reason"
 msgstr "Abmeldungsgründe"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr "Mailingliste"
 
@@ -272,7 +258,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr "Massenmailing"
 
@@ -329,7 +315,7 @@ msgid "Name"
 msgstr "Bezeichnung"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -340,7 +326,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -364,13 +350,13 @@ msgid "Other reason"
 msgstr "Anderer Grund"
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -386,13 +372,18 @@ msgstr "Position des Grundes in der Liste."
 msgid "Reason"
 msgstr "Grund"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Reihenfolge"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 #, fuzzy
 msgid "Subscription"
 msgstr "Abmeldungen"
@@ -418,7 +409,7 @@ msgid "Unsubscribe now"
 msgstr "Jetzt abmelden"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 #, fuzzy
 msgid "Unsubscription"
 msgstr "Abmeldungen"
@@ -469,30 +460,28 @@ msgstr "Jahr"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -501,7 +490,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -510,7 +499,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/el_GR.po b/mass_mailing_custom_unsubscribe/i18n/el_GR.po
index c7ac96e54..ef5f31c49 100644
--- a/mass_mailing_custom_unsubscribe/i18n/el_GR.po
+++ b/mass_mailing_custom_unsubscribe/i18n/el_GR.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Ημερομηνία"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -186,23 +175,20 @@ msgstr ""
 msgid "ID"
 msgstr "Κωδικός"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -248,7 +234,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -263,7 +249,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -319,7 +305,7 @@ msgid "Name"
 msgstr "Ονομασία"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -330,7 +316,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -354,13 +340,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -376,13 +362,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Ιεράρχηση"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -407,7 +398,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -456,30 +447,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -488,7 +477,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -497,7 +486,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/en_GB.po b/mass_mailing_custom_unsubscribe/i18n/en_GB.po
index 1bdf7c552..3e657487e 100644
--- a/mass_mailing_custom_unsubscribe/i18n/en_GB.po
+++ b/mass_mailing_custom_unsubscribe/i18n/en_GB.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Date"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Name"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Reason"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Sequence"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr "Year"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/es.po b/mass_mailing_custom_unsubscribe/i18n/es.po
index 16adb7024..2479e0d11 100644
--- a/mass_mailing_custom_unsubscribe/i18n/es.po
+++ b/mass_mailing_custom_unsubscribe/i18n/es.po
@@ -50,27 +50,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, fuzzy, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr "Los cambios no se han guardado, vuelva a intentarlo."
@@ -81,7 +70,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -109,7 +98,7 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -188,23 +177,20 @@ msgstr "No estoy interesado"
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -256,7 +242,7 @@ msgid "Mail unsubscription reason"
 msgstr "mail.unsubscription.reason"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr "Lista de correo"
 
@@ -272,7 +258,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr "Envío masivo"
 
@@ -329,7 +315,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -340,7 +326,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -364,13 +350,13 @@ msgid "Other reason"
 msgstr "Otro motivo"
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, fuzzy, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr "Por favor, indique más detalles de por qué se da de baja."
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr "Por favor, indique más detalles de por qué se da de baja."
@@ -386,13 +372,18 @@ msgstr "Posición del motivo en la lista."
 msgid "Reason"
 msgstr "Motivo"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 #, fuzzy
 msgid "Subscription"
 msgstr "Dados de baja"
@@ -418,7 +409,7 @@ msgid "Unsubscribe now"
 msgstr "Darse de baja ahora"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 #, fuzzy
 msgid "Unsubscription"
 msgstr "Dados de baja"
@@ -469,30 +460,28 @@ msgstr "Año"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -501,7 +490,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -510,7 +499,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr "Se han guardado los cambios"
diff --git a/mass_mailing_custom_unsubscribe/i18n/es_AR.po b/mass_mailing_custom_unsubscribe/i18n/es_AR.po
index 32c74c349..80094f333 100644
--- a/mass_mailing_custom_unsubscribe/i18n/es_AR.po
+++ b/mass_mailing_custom_unsubscribe/i18n/es_AR.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/es_CL.po b/mass_mailing_custom_unsubscribe/i18n/es_CL.po
index f02bd224a..2109271c4 100644
--- a/mass_mailing_custom_unsubscribe/i18n/es_CL.po
+++ b/mass_mailing_custom_unsubscribe/i18n/es_CL.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID (identificación)"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/es_CO.po b/mass_mailing_custom_unsubscribe/i18n/es_CO.po
index 3adcd5732..fecc28f52 100644
--- a/mass_mailing_custom_unsubscribe/i18n/es_CO.po
+++ b/mass_mailing_custom_unsubscribe/i18n/es_CO.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/es_CR.po b/mass_mailing_custom_unsubscribe/i18n/es_CR.po
index 6c5207b61..956729b55 100644
--- a/mass_mailing_custom_unsubscribe/i18n/es_CR.po
+++ b/mass_mailing_custom_unsubscribe/i18n/es_CR.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Razón"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr "Año"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/es_DO.po b/mass_mailing_custom_unsubscribe/i18n/es_DO.po
index 2ac9d7e46..28e885696 100644
--- a/mass_mailing_custom_unsubscribe/i18n/es_DO.po
+++ b/mass_mailing_custom_unsubscribe/i18n/es_DO.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/es_EC.po b/mass_mailing_custom_unsubscribe/i18n/es_EC.po
index 7eb9a1fcb..e9d3db926 100644
--- a/mass_mailing_custom_unsubscribe/i18n/es_EC.po
+++ b/mass_mailing_custom_unsubscribe/i18n/es_EC.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID (identificación)"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Motivo"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr "Año"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/es_ES.po b/mass_mailing_custom_unsubscribe/i18n/es_ES.po
index c875df12e..ce14bcce8 100644
--- a/mass_mailing_custom_unsubscribe/i18n/es_ES.po
+++ b/mass_mailing_custom_unsubscribe/i18n/es_ES.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/es_MX.po b/mass_mailing_custom_unsubscribe/i18n/es_MX.po
index 8c72719a6..813cc6844 100644
--- a/mass_mailing_custom_unsubscribe/i18n/es_MX.po
+++ b/mass_mailing_custom_unsubscribe/i18n/es_MX.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Razón"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr "Año"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/es_PE.po b/mass_mailing_custom_unsubscribe/i18n/es_PE.po
index 36ff89879..1dfc2be3f 100644
--- a/mass_mailing_custom_unsubscribe/i18n/es_PE.po
+++ b/mass_mailing_custom_unsubscribe/i18n/es_PE.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/es_PY.po b/mass_mailing_custom_unsubscribe/i18n/es_PY.po
index feb1dbf28..6de3df94f 100644
--- a/mass_mailing_custom_unsubscribe/i18n/es_PY.po
+++ b/mass_mailing_custom_unsubscribe/i18n/es_PY.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/es_VE.po b/mass_mailing_custom_unsubscribe/i18n/es_VE.po
index c47c46eaa..987729cbd 100644
--- a/mass_mailing_custom_unsubscribe/i18n/es_VE.po
+++ b/mass_mailing_custom_unsubscribe/i18n/es_VE.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Fecha"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nombre"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Razón"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/et.po b/mass_mailing_custom_unsubscribe/i18n/et.po
index e6c3543a3..18fbdb639 100644
--- a/mass_mailing_custom_unsubscribe/i18n/et.po
+++ b/mass_mailing_custom_unsubscribe/i18n/et.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "Kuupäev"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "Nimi"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/eu.po b/mass_mailing_custom_unsubscribe/i18n/eu.po
index 3c1949349..ef1f76c10 100644
--- a/mass_mailing_custom_unsubscribe/i18n/eu.po
+++ b/mass_mailing_custom_unsubscribe/i18n/eu.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "Izena"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Sekuentzia"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr "Urtea"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/fa.po b/mass_mailing_custom_unsubscribe/i18n/fa.po
index 988ae0b3d..1a9130d3c 100644
--- a/mass_mailing_custom_unsubscribe/i18n/fa.po
+++ b/mass_mailing_custom_unsubscribe/i18n/fa.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "شناسه"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "نام"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "دنباله"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/fi.po b/mass_mailing_custom_unsubscribe/i18n/fi.po
index 9731c1a23..e42de7c1e 100644
--- a/mass_mailing_custom_unsubscribe/i18n/fi.po
+++ b/mass_mailing_custom_unsubscribe/i18n/fi.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "Päivämäärä"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nimi"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Syy"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Sekvenssi"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr "Vuosi"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/fr.po b/mass_mailing_custom_unsubscribe/i18n/fr.po
index 93f5ae762..02bda92d0 100644
--- a/mass_mailing_custom_unsubscribe/i18n/fr.po
+++ b/mass_mailing_custom_unsubscribe/i18n/fr.po
@@ -51,27 +51,16 @@ msgstr "Action"
 msgid "Action Needed"
 msgstr "Action"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, fuzzy, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -83,7 +72,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -113,7 +102,7 @@ msgid "Date"
 msgstr "Date"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -191,23 +180,20 @@ msgstr "Je ne suis pas intéressé"
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -259,7 +245,7 @@ msgid "Mail unsubscription reason"
 msgstr "Motifs de désabonnement"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr "Liste de diffusion"
 
@@ -275,7 +261,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr "Publipostage"
 
@@ -332,7 +318,7 @@ msgid "Name"
 msgstr "Nom"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -343,7 +329,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -367,13 +353,13 @@ msgid "Other reason"
 msgstr "Autre motif:"
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, fuzzy, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr "Merci de fournir des détails sur les raisons de votre désinscription."
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr "Merci de fournir des détails sur les raisons de votre désinscription."
@@ -389,13 +375,18 @@ msgstr "Classement du motif dans la liste."
 msgid "Reason"
 msgstr "Motif"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Séquence"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 #, fuzzy
 msgid "Subscription"
 msgstr "Désabonnements"
@@ -421,7 +412,7 @@ msgid "Unsubscribe now"
 msgstr "Se désabonner maintenant"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 #, fuzzy
 msgid "Unsubscription"
 msgstr "Désabonnements"
@@ -472,30 +463,28 @@ msgstr "Année"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -504,7 +493,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -513,7 +502,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr "Vos modifications ont bien été enregistrées."
diff --git a/mass_mailing_custom_unsubscribe/i18n/fr_CA.po b/mass_mailing_custom_unsubscribe/i18n/fr_CA.po
index 95762d2ac..f25a89305 100644
--- a/mass_mailing_custom_unsubscribe/i18n/fr_CA.po
+++ b/mass_mailing_custom_unsubscribe/i18n/fr_CA.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Date"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "Identifiant"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nom"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr "Année"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/fr_CH.po b/mass_mailing_custom_unsubscribe/i18n/fr_CH.po
index 3940ade6c..421823c27 100644
--- a/mass_mailing_custom_unsubscribe/i18n/fr_CH.po
+++ b/mass_mailing_custom_unsubscribe/i18n/fr_CH.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nom"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/fr_FR.po b/mass_mailing_custom_unsubscribe/i18n/fr_FR.po
index 2ae7539ae..f49ea6ba5 100644
--- a/mass_mailing_custom_unsubscribe/i18n/fr_FR.po
+++ b/mass_mailing_custom_unsubscribe/i18n/fr_FR.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Date"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/gl.po b/mass_mailing_custom_unsubscribe/i18n/gl.po
index 340eaf4f2..9b4b9fbee 100644
--- a/mass_mailing_custom_unsubscribe/i18n/gl.po
+++ b/mass_mailing_custom_unsubscribe/i18n/gl.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "Data"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Secuencia"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr "Ano"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/gl_ES.po b/mass_mailing_custom_unsubscribe/i18n/gl_ES.po
index 91e958a98..5acd357ac 100644
--- a/mass_mailing_custom_unsubscribe/i18n/gl_ES.po
+++ b/mass_mailing_custom_unsubscribe/i18n/gl_ES.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/he.po b/mass_mailing_custom_unsubscribe/i18n/he.po
index 6e8fb24d2..6132f3b69 100644
--- a/mass_mailing_custom_unsubscribe/i18n/he.po
+++ b/mass_mailing_custom_unsubscribe/i18n/he.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "מזהה"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "שם"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "רצף"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/hr.po b/mass_mailing_custom_unsubscribe/i18n/hr.po
index 97ad74e9e..77c69e9a3 100644
--- a/mass_mailing_custom_unsubscribe/i18n/hr.po
+++ b/mass_mailing_custom_unsubscribe/i18n/hr.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -186,23 +175,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -249,7 +235,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr "Mailing lista"
 
@@ -265,7 +251,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -321,7 +307,7 @@ msgid "Name"
 msgstr "Naziv"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -332,7 +318,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -356,13 +342,13 @@ msgid "Other reason"
 msgstr "Drugi razlog"
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -378,13 +364,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Razlog"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Redoslijed"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -409,7 +400,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -458,30 +449,28 @@ msgstr "Godina"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -490,7 +479,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -499,7 +488,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/hr_HR.po b/mass_mailing_custom_unsubscribe/i18n/hr_HR.po
index 36cc4b886..b80267ec2 100644
--- a/mass_mailing_custom_unsubscribe/i18n/hr_HR.po
+++ b/mass_mailing_custom_unsubscribe/i18n/hr_HR.po
@@ -49,27 +49,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -80,7 +69,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -108,7 +97,7 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -186,23 +175,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -248,7 +234,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -263,7 +249,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -319,7 +305,7 @@ msgid "Name"
 msgstr "Naziv"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -330,7 +316,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -354,13 +340,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -376,13 +362,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -407,7 +398,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -456,30 +447,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -488,7 +477,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -497,7 +486,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/hu.po b/mass_mailing_custom_unsubscribe/i18n/hu.po
index 8b8977a5f..5f606f6b7 100644
--- a/mass_mailing_custom_unsubscribe/i18n/hu.po
+++ b/mass_mailing_custom_unsubscribe/i18n/hu.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "Dátum"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "Név"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Indoklás"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Sorszám"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr "Év"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/id.po b/mass_mailing_custom_unsubscribe/i18n/id.po
index 84d291c42..c5f58067f 100644
--- a/mass_mailing_custom_unsubscribe/i18n/id.po
+++ b/mass_mailing_custom_unsubscribe/i18n/id.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "Tanggal"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "Nama"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Berurutan"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/it.po b/mass_mailing_custom_unsubscribe/i18n/it.po
index a5a1cda37..fb461ca59 100644
--- a/mass_mailing_custom_unsubscribe/i18n/it.po
+++ b/mass_mailing_custom_unsubscribe/i18n/it.po
@@ -49,27 +49,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -80,7 +69,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -108,7 +97,7 @@ msgid "Date"
 msgstr "Data"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -187,23 +176,20 @@ msgstr "Non sono interessato"
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -252,7 +238,7 @@ msgid "Mail unsubscription reason"
 msgstr "Motivi Disiscrizione"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr "Mailing List"
 
@@ -268,7 +254,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -324,7 +310,7 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -335,7 +321,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -359,13 +345,13 @@ msgid "Other reason"
 msgstr "Altra motivo"
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -381,13 +367,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Motivo"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Sequenza"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 #, fuzzy
 msgid "Subscription"
 msgstr "Disiscrizioni"
@@ -413,7 +404,7 @@ msgid "Unsubscribe now"
 msgstr "Disiscrivi adesso"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 #, fuzzy
 msgid "Unsubscription"
 msgstr "Disiscrizioni"
@@ -464,30 +455,28 @@ msgstr "Anno"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -505,7 +494,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/ja.po b/mass_mailing_custom_unsubscribe/i18n/ja.po
index 168844886..48221184a 100644
--- a/mass_mailing_custom_unsubscribe/i18n/ja.po
+++ b/mass_mailing_custom_unsubscribe/i18n/ja.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "日付"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "名称"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr "理由"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "順序"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr "年"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/ko.po b/mass_mailing_custom_unsubscribe/i18n/ko.po
index 73afeead4..eac2bc448 100644
--- a/mass_mailing_custom_unsubscribe/i18n/ko.po
+++ b/mass_mailing_custom_unsubscribe/i18n/ko.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "날짜"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "이름"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "순서"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/lt.po b/mass_mailing_custom_unsubscribe/i18n/lt.po
index 8d4bbae58..9de084832 100644
--- a/mass_mailing_custom_unsubscribe/i18n/lt.po
+++ b/mass_mailing_custom_unsubscribe/i18n/lt.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Data"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Pavadinimas"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Priežastis"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Seka"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr "Metai"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/lt_LT.po b/mass_mailing_custom_unsubscribe/i18n/lt_LT.po
index ed7023931..6ce02b548 100644
--- a/mass_mailing_custom_unsubscribe/i18n/lt_LT.po
+++ b/mass_mailing_custom_unsubscribe/i18n/lt_LT.po
@@ -49,27 +49,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -80,7 +69,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -108,7 +97,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -186,23 +175,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -248,7 +234,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -263,7 +249,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -319,7 +305,7 @@ msgid "Name"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -330,7 +316,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -354,13 +340,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -376,13 +362,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -407,7 +398,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -456,30 +447,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -488,7 +477,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -497,7 +486,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/lv.po b/mass_mailing_custom_unsubscribe/i18n/lv.po
index 07aa562fc..e63575621 100644
--- a/mass_mailing_custom_unsubscribe/i18n/lv.po
+++ b/mass_mailing_custom_unsubscribe/i18n/lv.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Datums"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nosaukums"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Secība"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/mass_mailing_custom_unsubscribe.pot b/mass_mailing_custom_unsubscribe/i18n/mass_mailing_custom_unsubscribe.pot
index 4f233b724..a9d04bc36 100644
--- a/mass_mailing_custom_unsubscribe/i18n/mass_mailing_custom_unsubscribe.pot
+++ b/mass_mailing_custom_unsubscribe/i18n/mass_mailing_custom_unsubscribe.pot
@@ -414,6 +414,16 @@ msgid ""
 "subscriptions"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__action
 msgid "What did the (un)subscriber choose to do."
diff --git a/mass_mailing_custom_unsubscribe/i18n/mk.po b/mass_mailing_custom_unsubscribe/i18n/mk.po
index 6f6a4a4b8..b8307a4b7 100644
--- a/mass_mailing_custom_unsubscribe/i18n/mk.po
+++ b/mass_mailing_custom_unsubscribe/i18n/mk.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "Датум"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "Име"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Причина"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Секвенца"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr "Година"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/mn.po b/mass_mailing_custom_unsubscribe/i18n/mn.po
index 459802f5f..5f537fcc4 100644
--- a/mass_mailing_custom_unsubscribe/i18n/mn.po
+++ b/mass_mailing_custom_unsubscribe/i18n/mn.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "Огноо"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "Нэр"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Шалтгаан"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Дараалал"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr "Жил"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/nb.po b/mass_mailing_custom_unsubscribe/i18n/nb.po
index ddd044b6b..dcc9fa0f0 100644
--- a/mass_mailing_custom_unsubscribe/i18n/nb.po
+++ b/mass_mailing_custom_unsubscribe/i18n/nb.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Dato"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Navn"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Grunn"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Sekvens"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr "År"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/nb_NO.po b/mass_mailing_custom_unsubscribe/i18n/nb_NO.po
index 779b126bd..d706853ac 100644
--- a/mass_mailing_custom_unsubscribe/i18n/nb_NO.po
+++ b/mass_mailing_custom_unsubscribe/i18n/nb_NO.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/nl.po b/mass_mailing_custom_unsubscribe/i18n/nl.po
index 09ddd184c..7373571eb 100644
--- a/mass_mailing_custom_unsubscribe/i18n/nl.po
+++ b/mass_mailing_custom_unsubscribe/i18n/nl.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Naam"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Oorzaak"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Reeks"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr "Jaar"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/nl_BE.po b/mass_mailing_custom_unsubscribe/i18n/nl_BE.po
index 95439536f..98bf0b9ea 100644
--- a/mass_mailing_custom_unsubscribe/i18n/nl_BE.po
+++ b/mass_mailing_custom_unsubscribe/i18n/nl_BE.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Naam:"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Reden"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Volgorde"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr "Jaar"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/nl_NL.po b/mass_mailing_custom_unsubscribe/i18n/nl_NL.po
index 0ba5ac0fd..03e8e2684 100644
--- a/mass_mailing_custom_unsubscribe/i18n/nl_NL.po
+++ b/mass_mailing_custom_unsubscribe/i18n/nl_NL.po
@@ -49,27 +49,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -80,7 +69,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -108,7 +97,7 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -187,23 +176,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -249,7 +235,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -264,7 +250,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -320,7 +306,7 @@ msgid "Name"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -331,7 +317,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -355,13 +341,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -377,13 +363,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -408,7 +399,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -457,30 +448,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -489,7 +478,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -498,7 +487,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/pl.po b/mass_mailing_custom_unsubscribe/i18n/pl.po
index 5fc97ff58..42f01c8bc 100644
--- a/mass_mailing_custom_unsubscribe/i18n/pl.po
+++ b/mass_mailing_custom_unsubscribe/i18n/pl.po
@@ -49,27 +49,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -80,7 +69,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -108,7 +97,7 @@ msgid "Date"
 msgstr "Data"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -186,23 +175,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -248,7 +234,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -263,7 +249,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -319,7 +305,7 @@ msgid "Name"
 msgstr "Nazwa"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -330,7 +316,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -354,13 +340,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -376,13 +362,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Przyczyna"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Numeracja"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -407,7 +398,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -456,30 +447,28 @@ msgstr "Rok"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -488,7 +477,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -497,7 +486,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/pt.po b/mass_mailing_custom_unsubscribe/i18n/pt.po
index 7b285da69..281e70d29 100644
--- a/mass_mailing_custom_unsubscribe/i18n/pt.po
+++ b/mass_mailing_custom_unsubscribe/i18n/pt.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Data"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -319,7 +305,7 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -330,7 +316,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -354,13 +340,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -376,13 +362,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Motivo"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Sequência"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -407,7 +398,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -456,30 +447,28 @@ msgstr "Ano"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -488,7 +477,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -497,7 +486,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/pt_BR.po b/mass_mailing_custom_unsubscribe/i18n/pt_BR.po
index 29205caec..4ab31d36a 100644
--- a/mass_mailing_custom_unsubscribe/i18n/pt_BR.po
+++ b/mass_mailing_custom_unsubscribe/i18n/pt_BR.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Data"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -186,23 +175,20 @@ msgstr ""
 msgid "ID"
 msgstr "Identificação"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -248,7 +234,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -263,7 +249,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -319,7 +305,7 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -330,7 +316,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -354,13 +340,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -376,13 +362,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Razão"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Sequência"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -407,7 +398,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -456,30 +447,28 @@ msgstr "Ano"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -488,7 +477,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -497,7 +486,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/pt_PT.po b/mass_mailing_custom_unsubscribe/i18n/pt_PT.po
index a85c916ae..f7a7009f9 100644
--- a/mass_mailing_custom_unsubscribe/i18n/pt_PT.po
+++ b/mass_mailing_custom_unsubscribe/i18n/pt_PT.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Data"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Nome"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Motivo"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr "Ano"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/ro.po b/mass_mailing_custom_unsubscribe/i18n/ro.po
index 40f497447..8c0343734 100644
--- a/mass_mailing_custom_unsubscribe/i18n/ro.po
+++ b/mass_mailing_custom_unsubscribe/i18n/ro.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Data"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -186,23 +175,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -248,7 +234,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -263,7 +249,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -319,7 +305,7 @@ msgid "Name"
 msgstr "Nume"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -330,7 +316,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -354,13 +340,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -376,13 +362,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Motivul"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Secventa"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -407,7 +398,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -456,30 +447,28 @@ msgstr "An"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -488,7 +477,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -497,7 +486,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/ru.po b/mass_mailing_custom_unsubscribe/i18n/ru.po
index 01d8c8082..ef1357d3e 100644
--- a/mass_mailing_custom_unsubscribe/i18n/ru.po
+++ b/mass_mailing_custom_unsubscribe/i18n/ru.po
@@ -49,27 +49,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -80,7 +69,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -108,7 +97,7 @@ msgid "Date"
 msgstr "Дата"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -187,23 +176,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -249,7 +235,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -264,7 +250,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -320,7 +306,7 @@ msgid "Name"
 msgstr "Название"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -331,7 +317,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -355,13 +341,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -377,13 +363,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Причина"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Последовательность"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -408,7 +399,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -457,30 +448,28 @@ msgstr "Год"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -489,7 +478,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -498,7 +487,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/sk.po b/mass_mailing_custom_unsubscribe/i18n/sk.po
index 8d4a2b570..da9141b8a 100644
--- a/mass_mailing_custom_unsubscribe/i18n/sk.po
+++ b/mass_mailing_custom_unsubscribe/i18n/sk.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "Dátum"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "Meno"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Postupnosť"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/sl.po b/mass_mailing_custom_unsubscribe/i18n/sl.po
index 340b7528a..0d91a2361 100644
--- a/mass_mailing_custom_unsubscribe/i18n/sl.po
+++ b/mass_mailing_custom_unsubscribe/i18n/sl.po
@@ -51,27 +51,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -82,7 +71,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -111,7 +100,7 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -190,23 +179,20 @@ msgstr "Me ne zanima"
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -258,7 +244,7 @@ msgid "Mail unsubscription reason"
 msgstr "Razlogi za odjavo"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr "Poštni seznam"
 
@@ -274,7 +260,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr "Masovno razpošiljanje"
 
@@ -331,7 +317,7 @@ msgid "Name"
 msgstr "Naziv"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -342,7 +328,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -366,13 +352,13 @@ msgid "Other reason"
 msgstr "Drugi razlogi"
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -388,13 +374,18 @@ msgstr "Položaj razloga v seznamu."
 msgid "Reason"
 msgstr "Razlog"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Zaporedje"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 #, fuzzy
 msgid "Subscription"
 msgstr "Odjave"
@@ -420,7 +411,7 @@ msgid "Unsubscribe now"
 msgstr "Odjavi se zdaj"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 #, fuzzy
 msgid "Unsubscription"
 msgstr "Odjave"
@@ -471,30 +462,28 @@ msgstr "Leto"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -503,7 +492,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -512,7 +501,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/sr.po b/mass_mailing_custom_unsubscribe/i18n/sr.po
index d7295d654..656a7e543 100644
--- a/mass_mailing_custom_unsubscribe/i18n/sr.po
+++ b/mass_mailing_custom_unsubscribe/i18n/sr.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Ime"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Niz"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/sr@latin.po b/mass_mailing_custom_unsubscribe/i18n/sr@latin.po
index 783c5228a..9eda91655 100644
--- a/mass_mailing_custom_unsubscribe/i18n/sr@latin.po
+++ b/mass_mailing_custom_unsubscribe/i18n/sr@latin.po
@@ -49,27 +49,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -80,7 +69,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -108,7 +97,7 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -186,23 +175,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -248,7 +234,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -263,7 +249,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -319,7 +305,7 @@ msgid "Name"
 msgstr "Ime:"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -330,7 +316,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -354,13 +340,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -376,13 +362,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Razlog"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Sekvenca"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -407,7 +398,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -456,30 +447,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -488,7 +477,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -497,7 +486,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/sv.po b/mass_mailing_custom_unsubscribe/i18n/sv.po
index 26e57cd84..d3a109fa7 100644
--- a/mass_mailing_custom_unsubscribe/i18n/sv.po
+++ b/mass_mailing_custom_unsubscribe/i18n/sv.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "Datum"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "Namn"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Orsak"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Sequence"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr "År"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/th.po b/mass_mailing_custom_unsubscribe/i18n/th.po
index 8b84beb1a..1b740d384 100644
--- a/mass_mailing_custom_unsubscribe/i18n/th.po
+++ b/mass_mailing_custom_unsubscribe/i18n/th.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "วันที่"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "รหัส"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "ชื่อ"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr "เหตุผล"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "กำหนดเลขที่เอกสาร"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr "ปี"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/tr.po b/mass_mailing_custom_unsubscribe/i18n/tr.po
index 76d0dd52d..535380122 100644
--- a/mass_mailing_custom_unsubscribe/i18n/tr.po
+++ b/mass_mailing_custom_unsubscribe/i18n/tr.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "Tarih"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "Adı"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Sebep"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Sıralama"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr "Yıl"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/tr_TR.po b/mass_mailing_custom_unsubscribe/i18n/tr_TR.po
index 1d3c9253d..26ea7bea7 100644
--- a/mass_mailing_custom_unsubscribe/i18n/tr_TR.po
+++ b/mass_mailing_custom_unsubscribe/i18n/tr_TR.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "Kimlik"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Ad"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Neden"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Sıra"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/uk.po b/mass_mailing_custom_unsubscribe/i18n/uk.po
index a07f2d190..b920692a5 100644
--- a/mass_mailing_custom_unsubscribe/i18n/uk.po
+++ b/mass_mailing_custom_unsubscribe/i18n/uk.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "Дата"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Name"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Послідовність"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/vi.po b/mass_mailing_custom_unsubscribe/i18n/vi.po
index b0e391f92..de1d35654 100644
--- a/mass_mailing_custom_unsubscribe/i18n/vi.po
+++ b/mass_mailing_custom_unsubscribe/i18n/vi.po
@@ -47,27 +47,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -78,7 +67,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -106,7 +95,7 @@ msgid "Date"
 msgstr "Ngày"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -184,23 +173,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -246,7 +232,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -261,7 +247,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -317,7 +303,7 @@ msgid "Name"
 msgstr "Tên"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -328,7 +314,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -352,13 +338,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -374,13 +360,18 @@ msgstr ""
 msgid "Reason"
 msgstr "Lý do"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "Trình tự"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -405,7 +396,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -454,30 +445,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -486,7 +475,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -495,7 +484,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/vi_VN.po b/mass_mailing_custom_unsubscribe/i18n/vi_VN.po
index d7413e7fa..f3de3e5d9 100644
--- a/mass_mailing_custom_unsubscribe/i18n/vi_VN.po
+++ b/mass_mailing_custom_unsubscribe/i18n/vi_VN.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "Tên"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/zh_CN.po b/mass_mailing_custom_unsubscribe/i18n/zh_CN.po
index 36d3976ab..6f58b1248 100644
--- a/mass_mailing_custom_unsubscribe/i18n/zh_CN.po
+++ b/mass_mailing_custom_unsubscribe/i18n/zh_CN.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "日期"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -186,23 +175,20 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -248,7 +234,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -263,7 +249,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -319,7 +305,7 @@ msgid "Name"
 msgstr "名称"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -330,7 +316,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -354,13 +340,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -376,13 +362,18 @@ msgstr ""
 msgid "Reason"
 msgstr "理由"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "序列"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -407,7 +398,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -456,30 +447,28 @@ msgstr "年"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -488,7 +477,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -497,7 +486,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/i18n/zh_TW.po b/mass_mailing_custom_unsubscribe/i18n/zh_TW.po
index 2374a3e48..f2985e5c3 100644
--- a/mass_mailing_custom_unsubscribe/i18n/zh_TW.po
+++ b/mass_mailing_custom_unsubscribe/i18n/zh_TW.po
@@ -48,27 +48,16 @@ msgstr ""
 msgid "Action Needed"
 msgstr ""
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__allow_private
-msgid "Allow Private"
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:89
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:94
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:221
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:230
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:260
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:270
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occured. Please try again later or contact us."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:163
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:169
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "An error occurred. Your changes have not been saved, try again later."
 msgstr ""
@@ -79,7 +68,7 @@ msgid "Attachment Count"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_add
 msgid "Blacklisting"
 msgstr ""
 
@@ -107,7 +96,7 @@ msgid "Date"
 msgstr "日期"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__blacklist_rm
 msgid "De-blacklisting"
 msgstr ""
 
@@ -185,23 +174,20 @@ msgstr ""
 msgid "ID"
 msgstr "編號"
 
-#. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
-msgid "If checked new messages require your attention."
-msgstr ""
-
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_needaction
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_unread
 msgid "If checked, new messages require your attention."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
 msgid "If checked, some messages have a delivery error."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,help:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid ""
 "If you mark this field, this list won't be shown when unsubscribing from "
 "other mailing list, in the section: 'Is there any other mailing list you "
@@ -247,7 +233,7 @@ msgid "Mail unsubscription reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing_list
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_list
 msgid "Mailing List"
 msgstr ""
 
@@ -262,7 +248,7 @@ msgid "Main Attachment"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mail_mass_mailing
+#: model:ir.model,name:mass_mailing_custom_unsubscribe.model_mailing_mailing
 msgid "Mass Mailing"
 msgstr ""
 
@@ -318,7 +304,7 @@ msgid "Name"
 msgstr "名稱"
 
 #. module: mass_mailing_custom_unsubscribe
-#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_mass_mailing_list__not_cross_unsubscriptable
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mailing_list__not_cross_unsubscriptable
 msgid "Not cross unsubscriptable"
 msgstr ""
 
@@ -329,7 +315,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_error_counter
-msgid "Number of error"
+msgid "Number of errors"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
@@ -353,13 +339,13 @@ msgid "Other reason"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:89
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please indicate why are you unsubscribing."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:98
+#: code:addons/mass_mailing_custom_unsubscribe/models/mail_unsubscription.py:0
 #, python-format
 msgid "Please provide details on why you are unsubscribing."
 msgstr ""
@@ -375,13 +361,18 @@ msgstr ""
 msgid "Reason"
 msgstr "原因"
 
+#. module: mass_mailing_custom_unsubscribe
+#: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
 #. module: mass_mailing_custom_unsubscribe
 #: model:ir.model.fields,field_description:mass_mailing_custom_unsubscribe.field_mail_unsubscription_reason__sequence
 msgid "Sequence"
 msgstr "序列"
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__subscription
 msgid "Subscription"
 msgstr ""
 
@@ -406,7 +397,7 @@ msgid "Unsubscribe now"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
-#: selection:mail.unsubscription,action:0
+#: model:ir.model.fields.selection,name:mass_mailing_custom_unsubscribe.selection__mail_unsubscription__action__unsubscription
 msgid "Unsubscription"
 msgstr ""
 
@@ -455,30 +446,28 @@ msgstr "年度"
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:147
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:199
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:247
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You are not authorized to do this!"
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:105
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed from %s</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:110
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "You have been <strong>successfully unsubscribed</strong>."
 msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:205
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>added to our blacklist</strong>. You will "
@@ -487,7 +476,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:253
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid ""
 "You have been successfully <strong>removed from our blacklist</strong>. You "
@@ -496,7 +485,7 @@ msgstr ""
 
 #. module: mass_mailing_custom_unsubscribe
 #. openerp-web
-#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:152
+#: code:addons/mass_mailing_custom_unsubscribe/static/src/js/unsubscribe.js:0
 #, python-format
 msgid "Your changes have been saved."
 msgstr ""
diff --git a/mass_mailing_custom_unsubscribe/static/src/js/contact.tour.js b/mass_mailing_custom_unsubscribe/static/src/js/contact.tour.js
index 0860b82f2..0d12240dc 100644
--- a/mass_mailing_custom_unsubscribe/static/src/js/contact.tour.js
+++ b/mass_mailing_custom_unsubscribe/static/src/js/contact.tour.js
@@ -1,93 +1,102 @@
 /* Copyright 2016 Jairo Llopis <jairo.llopis@tecnativa.com>
  * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
 odoo.define("mass_mailing_custom_unsubscribe.contact_tour",
-            function (require) {
-    "use strict";
-    var base = require("web_editor.base");
-    var tour = require("web_tour.tour");
+    function (require) {
+        "use strict";
+        var base = require("web_editor.base");
+        var tour = require("web_tour.tour");
 
-    // Allow to know if an element is required
-    $.extend($.expr[':'], {
-        propRequired: function(element, index, matches) {
-           return $(element).prop("required");
-        },
-    });
+        // Allow to know if an element is required
+        $.extend($.expr[':'], {
+            propRequired: function (element) {
+                return $(element).prop("required");
+            },
+        });
 
-    tour.register(
-        "mass_mailing_custom_unsubscribe_tour_contact",
-        {
-            test: true,
-            wait_for: base.ready(),
-        },
-        [
+        tour.register(
+            "mass_mailing_custom_unsubscribe_tour_contact",
             {
-                content: "Choose other reason",
-                trigger: ".radio:contains('Other reason') :radio:not(:checked)",
-                extra_trigger: "#reason_form #custom_div_feedback",
+                test: true,
+                wait_for: base.ready(),
             },
-            {
-                content: "Switch to not interested reason",
-                trigger: ".radio:contains(\"I'm not interested\") :radio:not(:checked)",
-                extra_trigger: "[name='details']:propRequired",
-            },
-            {
-                content: "Unsubscribe",
-                trigger: "#reason_form button:submit",
-                extra_trigger: "body:not(:has([name='details']:propRequired))",
-            },
-            {
-                content: "Successfully unsubscribed",
-                trigger: "body:not(:has(#reason_form)) #subscription_info " +
+            [
+                {
+                    content: "Choose other reason",
+                    trigger: ".radio:contains('Other reason') :radio:not(:checked)",
+                    extra_trigger: "#reason_form #custom_div_feedback",
+                },
+                {
+                    content: "Switch to not interested reason",
+                    trigger:
+                        ".radio:contains(\"I'm not interested\") :radio:not(:checked)",
+                    extra_trigger: "[name='details']:propRequired",
+                },
+                {
+                    content: "Unsubscribe",
+                    trigger: "#reason_form button:submit",
+                    extra_trigger: "body:not(:has([name='details']:propRequired))",
+                },
+                {
+                    content: "Successfully unsubscribed",
+                    trigger: "body:not(:has(#reason_form)) #subscription_info " +
                          ":contains('successfully unsubscribed from')",
-            },
-            {
-                content: "Unsubscription reasons are invisible",
-                trigger: "#unsubscribe_form:has(#custom_div_feedback:hidden)",
-            },
-            {
-                content: "List 2 is not cross unsubscriptable",
-                trigger: "body:not(:has(li:contains('test list 2')))",
-            },
-            {
-                content: "List 3 is not public",
-                trigger: "body:not(:has(li:contains('test list 3')))",
-            },
-            {
-                content: "Uncheck list 1",
-                trigger: "li:contains('test list 1') input:checked",
-            },
-            {
-                content: "Choose other reason",
-                trigger: ".radio:contains('Other reason') :radio",
-                extra_trigger: ".radio:contains('Other reason') " +
+                },
+                {
+                    content: "Unsubscription reasons are invisible",
+                    trigger: "#unsubscribe_form:has(#custom_div_feedback:hidden)",
+                },
+                {
+                    content: "List 2 is not cross unsubscriptable",
+                    trigger: "body:not(:has(li:contains('test list 2')))",
+                },
+                {
+                    content: "List 3 is not public",
+                    trigger: "body:not(:has(li:contains('test list 3')))",
+                },
+                {
+                    content: "Uncheck list 1",
+                    trigger: "li:contains('test list 1') input:checked",
+                },
+                {
+                    content: "Choose other reason",
+                    trigger: ".radio:contains('Other reason') :radio",
+                    extra_trigger: ".radio:contains('Other reason') " +
                                ":radio:not(:checked)",
-            },
-            {
-                content: "Add details to reason",
-                trigger: "[name='details']:visible:propRequired",
-                run: "text I want to unsubscribe because I want. Period.",
-                extra_trigger: ".radio:contains('Other reason') :radio:checked",
-            },
-            {
-                content: "Update subscriptions 2nd time",
-                trigger: "#unsubscribe_form :submit",
-            },
-            {
-                content: "Successfully unsubscribed",
-                trigger: "#subscription_info:contains('Your changes have been saved.')",
-            },
-            {
-                content: "Subscribe again to list 0",
-                trigger: "body:not(:has(#unsubscribe_form #custom_div_feedback:visible)):has(.alert-success) li:contains('test list 0') input:not(:checked)",
-            },
-            {
-                content: "Update subscriptions 3nd time",
-                trigger: "#unsubscribe_form:not(:has(.js_unsubscription_reason:visible)) :submit",
-            },
-            {
-                content: "Successfully subscribed",
-                trigger: "#subscription_info:contains('Your changes have been saved.')",
-            },
-        ]
-    );
-});
+                },
+                {
+                    content: "Add details to reason",
+                    trigger: "[name='details']:visible:propRequired",
+                    run: "text I want to unsubscribe because I want. Period.",
+                    extra_trigger: ".radio:contains('Other reason') :radio:checked",
+                },
+                {
+                    content: "Update subscriptions 2nd time",
+                    trigger: "#unsubscribe_form :submit",
+                },
+                {
+                    content: "Successfully unsubscribed",
+                    trigger:
+                        "#subscription_info:contains('Your changes have been saved.')",
+                },
+                {
+                    content: "Subscribe again to list 0",
+                    // eslint-disable-next-line no-multi-str
+                    trigger:"body:not(:has(#unsubscribe_form #custom_div_feedback\
+                            :visible)):has(.alert-success) li:contains('test list 0') \
+                            input:not(:checked)",
+                },
+                {
+                    content: "Update subscriptions 3nd time",
+                    // eslint-disable-next-line no-multi-str
+                    trigger:"#unsubscribe_form:not(\
+                            :has(.js_unsubscription_reason:visible)) :submit",
+                },
+                {
+                    content: "Successfully subscribed",
+                    trigger:
+                        "#subscription_info:contains('Your changes have been saved.')",
+                },
+            ]
+        );
+    }
+);
diff --git a/mass_mailing_custom_unsubscribe/static/src/js/partner.tour.js b/mass_mailing_custom_unsubscribe/static/src/js/partner.tour.js
index d7e701d6a..063cbee61 100644
--- a/mass_mailing_custom_unsubscribe/static/src/js/partner.tour.js
+++ b/mass_mailing_custom_unsubscribe/static/src/js/partner.tour.js
@@ -1,45 +1,48 @@
 /* Copyright 2016 Jairo Llopis <jairo.llopis@tecnativa.com>
  * License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). */
 odoo.define("mass_mailing_custom_unsubscribe.partner_tour",
-            function (require) {
-    "use strict";
-    var base = require("web_editor.base");
-    var tour = require("web_tour.tour");
+    function (require) {
+        "use strict";
+        var base = require("web_editor.base");
+        var tour = require("web_tour.tour");
 
-    // Allow to know if an element is required
-    $.extend($.expr[':'], {
-        propRequired: function(element, index, matches) {
-           return $(element).prop("required");
-        },
-    });
+        // Allow to know if an element is required
+        $.extend($.expr[':'], {
+            propRequired: function (element) {
+                return $(element).prop("required");
+            },
+        });
 
-    tour.register(
-        "mass_mailing_custom_unsubscribe_tour_partner",
-        {
-            tour: true,
-            wait_for: base.ready(),
-        },
-        [
+        tour.register(
+            "mass_mailing_custom_unsubscribe_tour_partner",
             {
-                content: "Choose other reason",
-                trigger: ".radio:contains('Other reason') :radio:not(:checked)",
-                extra_trigger: "#reason_form #custom_div_feedback",
+                tour: true,
+                wait_for: base.ready(),
             },
-            {
-                content: "Switch to not interested reason",
-                trigger: ".radio:contains(\"I'm not interested\") :radio:not(:checked)",
-                extra_trigger: "[name='details']:propRequired",
-            },
-            {
-                content: "Unsubscribe",
-                trigger: "#reason_form button:submit",
-                extra_trigger: "body:not(:has([name='details']:propRequired))",
-            },
-            {
-                content: "Successfully unsubscribed",
-                trigger: "body:not(:has(#reason_form)) #subscription_info " +
-                         ":contains('successfully unsubscribed')",
-            },
-        ]
-    );
-});
+            [
+                {
+                    content: "Choose other reason",
+                    trigger: ".radio:contains('Other reason') :radio:not(:checked)",
+                    extra_trigger: "#reason_form #custom_div_feedback",
+                },
+                {
+                    content: "Switch to not interested reason",
+                    // eslint-disable-next-line no-multi-str
+                    trigger: ".radio:contains(\"I'm not interested\") \
+                            :radio:not(:checked)",
+                    extra_trigger: "[name='details']:propRequired",
+                },
+                {
+                    content: "Unsubscribe",
+                    trigger: "#reason_form button:submit",
+                    extra_trigger: "body:not(:has([name='details']:propRequired))",
+                },
+                {
+                    content: "Successfully unsubscribed",
+                    trigger: "body:not(:has(#reason_form)) #subscription_info " +
+                            ":contains('successfully unsubscribed')",
+                },
+            ]
+        );
+    }
+);