Repository: collective/Products.EasyNewsletter (language: python)

Issue:
Unsubsribe mails are getting tagged as spam
Opposite to the subscribe confirmation mails, unsubscribe mails are getting tagged as spam, at least on one occasion here.

I think we should:
- add a bit more information/text inside this mail, right now it only says `Click here to unsubscribe and the unsubscribe link`
- add the site name to the mails subject

opinions?


Discussion / hints:
The text is comming from the newsletter object it self and can be changes there. Right now this is only a textLine field that we could think about to change. The Problem with just adding more text somewhere in code, is that we want it for different langugages.
Now one can at least put there own text in there.
The subject is comming from the view, this text could be changed.

Fix patch:
diff --git a/.github/workflows/plone-package.yml b/.github/workflows/plone-package.yml
index 300aed1e..3f21d0c0 100644
--- a/.github/workflows/plone-package.yml
+++ b/.github/workflows/plone-package.yml
@@ -25,14 +25,14 @@ jobs:
                     ~/.cache/pip
                     ~/buildout-cache
                     ~/extends
-                  key: ${{ runner.os }}-tox-${{ hashFiles('**/tox.ini') }}
-                  restore-keys: |
-                    ${{ runner.os }}-tox-
+                  key: ${{ runner.os }}-tox-${{ hashFiles('**/Products.EasyNewsletter/setup.py') }}-${{ hashFiles('**/Products.EasyNewsletter/requirements.txt') }}-${{ hashFiles('**/Products.EasyNewsletter/tox.ini') }}
+                  # restore-keys: |
+                  #   ${{ runner.os }}-tox-
             - name: Set up Python ${{ matrix.python-version }}
               uses: actions/setup-python@v2
               with:
                   python-version: ${{ matrix.python-version }}
-            - name: Install xmllint
+            - name: Install system libraries...
               run: sudo apt-get install libxml2-dev libxslt1-dev libjpeg-dev
             - name: setup buildout cache
               run: |
@@ -48,4 +48,4 @@ jobs:
                   # if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
             - name: Test with tox
               run: |
-                  tox
+                  tox -r
diff --git a/CHANGES.rst b/CHANGES.rst
index 086ac0b4..621d3c78 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,10 +4,10 @@ Changelog
 5.0.0b2 (unreleased)
 --------------------
 
-- Don't fail sending process when one email fails.
+- Don't fail sending process when one email fails
   [thomasmassmann]
 
-- Fix helper method: get_results_from_aggregation_sources, which can be used for a table of contents.
+- Fix helper method: get_results_from_aggregation_sources, which can be used for a table of contents
   [MrTango]
 
 - Update output_blacksee template with a TOC and some CSS cleanup
@@ -16,9 +16,13 @@ Changelog
 - Switch from travis to Github-Actions and fix tests
   [MrTango]
 
-- Fixed empty epilog error. #162
+- Fixed empty epilog error #162
   [iham]
 
+- Add Newsletter title to the unsubscribe email subject #131
+  [MrTango]
+
+
 5.0.0b1 (2020-03-08)
 --------------------
 
diff --git a/src/Products/EasyNewsletter/__init__.py b/src/Products/EasyNewsletter/__init__.py
index a14a0c81..60cb4061 100644
--- a/src/Products/EasyNewsletter/__init__.py
+++ b/src/Products/EasyNewsletter/__init__.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 # avoid circular import
-from Products.EasyNewsletter import config  # noqa
+# from Products.EasyNewsletter import config  # noqa
 from zope.i18nmessageid import MessageFactory
 
 
-EasyNewsletterMessageFactory = MessageFactory('EasyNewsletter')
+EasyNewsletterMessageFactory = MessageFactory('Products.EasyNewsletter')
 _ = EasyNewsletterMessageFactory
diff --git a/src/Products/EasyNewsletter/config.py b/src/Products/EasyNewsletter/config.py
index 1001c39d..481eb50a 100644
--- a/src/Products/EasyNewsletter/config.py
+++ b/src/Products/EasyNewsletter/config.py
@@ -2,28 +2,30 @@
 # flake8: noqa
 
 from plone import api
+from Products.EasyNewsletter import _
 from zope.i18nmessageid import MessageFactory
 
 import re
 
 
-_ = MessageFactory('Products.EasyNewsletter')
+# see __init__.py
+# _ = MessageFactory('Products.EasyNewsletter')
 
-IS_PLONE_5 = api.env.plone_version().startswith('5')
-IS_PLONE_4 = api.env.plone_version().startswith('4')
+IS_PLONE_5 = api.env.plone_version().startswith("5")
+IS_PLONE_4 = api.env.plone_version().startswith("4")
 
-PROJECTNAME = 'EasyNewsletter'
+PROJECTNAME = "EasyNewsletter"
 
-ENL_ISSUE_TYPES = ['ENLIssue', 'Newsletter Issue']
-ENL_EDITHELPER_TYPES = ['EasyNewsletter', 'ENLIssue', 'Newsletter', 'Newsletter Issue']
+ENL_ISSUE_TYPES = ["ENLIssue", "Newsletter Issue"]
+ENL_EDITHELPER_TYPES = ["EasyNewsletter", "ENLIssue", "Newsletter", "Newsletter Issue"]
 
-PLACEHOLDERS = ['UNSUBSCRIBE', 'SUBSCRIBER_SALUTATION']
+PLACEHOLDERS = ["UNSUBSCRIBE", "SUBSCRIBER_SALUTATION"]
 
 AGG_SOURCES_INFOS = "agg_sources_infos"
 
 SALUTATION = {
-    'ms': _(u'label_salutation_ms', 'Ms.'),
-    'mr': _(u'label_salutation_mr', 'Mr.'),
+    "ms": _(u"label_salutation_ms", "Ms."),
+    "mr": _(u"label_salutation_mr", "Mr."),
 }
 
 # NL_LANGUAGE = DisplayList((
@@ -34,31 +36,36 @@
 # ))
 
 MESSAGE_CODE = {
-    'email_added': _(
-        u'email_added',
-        default=u'Your email has been registered. A confirmation email was'
-                u' sent to your address. Please check your inbox and click '
-                u' on the link in the email in order to confirm your'
-                u' subscription.'
+    "email_added": _(
+        u"email_added",
+        default=u"Your email has been registered. A confirmation email was"
+        u" sent to your address. Please check your inbox and click "
+        u" on the link in the email in order to confirm your"
+        u" subscription.",
+    ),
+    "invalid_email": _(
+        u"invalid_email", default=u"Please enter a valid email address."
+    ),
+    "email_exists": _(
+        u"email_exists", default=u"Your email address is already registered."
+    ),
+    "invalid_hashkey": _(
+        u"invalid_hashkey", default=u"Please enter a valid email address."
+    ),
+    "subscription_confirmed": _(
+        u"subscription_confirmed",
+        default=u"Your subscription was successfully confirmed.",
     ),
-    'invalid_email': _(
-        u'invalid_email', default=u'Please enter a valid email address.'),
-    'email_exists': _(
-        u'email_exists', default=u'Your email address is already registered.'),
-    'invalid_hashkey': _(
-        u'invalid_hashkey', default=u'Please enter a valid email address.'),
-    'subscription_confirmed': _(
-        u'subscription_confirmed',
-        default=u'Your subscription was successfully confirmed.'),
 }
 
 
 EMAIL_RE = re.compile(
-    r"(?:^|\s)[-a-z0-9_.]+@(?:[-a-z0-9]+\.)+[a-z]{2,63}(?:\s|$)", re.IGNORECASE)
+    r"(?:^|\s)[-a-z0-9_.]+@(?:[-a-z0-9]+\.)+[a-z]{2,63}(?:\s|$)", re.IGNORECASE
+)
 
 
 DEFAULT_SUBSCRIBER_CONFIRMATION_MAIL_SUBJECT = _(
-    u'Confirm your subscription on ${portal_url}'
+    u"Confirm your subscription on ${portal_url}"
 )
 
 DEFAULT_SUBSCRIBER_CONFIRMATION_MAIL_TEXT = u"""\
diff --git a/src/Products/EasyNewsletter/locales/Products.EasyNewsletter.pot b/src/Products/EasyNewsletter/locales/Products.EasyNewsletter.pot
index 71c0fe28..79cb10ab 100644
--- a/src/Products/EasyNewsletter/locales/Products.EasyNewsletter.pot
+++ b/src/Products/EasyNewsletter/locales/Products.EasyNewsletter.pot
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Products.EasyNewsletter\n"
-"POT-Creation-Date: 2021-02-01 19:16+0000\n"
+"POT-Creation-Date: 2021-02-02 19:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: Maik Derstappen <md@derico.de>\n"
 "Language-Team: LANGUAGE <md@derico.de>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Preferred-Encodings: utf-8 latin1\n"
 "Domain: Products.EasyNewsletter\n"
 
-#: EasyNewsletter/views/newsletter_issue_send.py:197
+#: EasyNewsletter/views/newsletter_issue_send.py:201
 msgid "
 Please check the log files, for more details!"
 msgstr ""
@@ -31,7 +31,7 @@ msgstr ""
 msgid "${count} import(s) successful."
 msgstr ""
 
-#: EasyNewsletter/content/newsletter.py:213
+#: EasyNewsletter/content/newsletter.py:211
 msgid "<h1>Community Newsletter for Plone</h1>
 {{unsubscribe}}"
 msgstr ""
@@ -61,8 +61,8 @@ msgstr ""
 msgid "Allowed content aggregation types"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:304
-#: EasyNewsletter/views/newsletter_unsubscribe.py:39
+#: EasyNewsletter/browser/registration.py:302
+#: EasyNewsletter/views/newsletter_unsubscribe.py:38
 msgid "An error occured"
 msgstr ""
 
@@ -95,7 +95,7 @@ msgstr ""
 msgid "Configuration for version 4005"
 msgstr ""
 
-#: EasyNewsletter/config.py:60
+#: EasyNewsletter/config.py:67
 msgid "Confirm your subscription on ${portal_url}"
 msgstr ""
 
@@ -107,7 +107,7 @@ msgstr ""
 msgid "Content types which will be visible in the Content aggregation sources reference field."
 msgstr ""
 
-#: EasyNewsletter/content/newsletter_issue.py:76
+#: EasyNewsletter/content/newsletter_issue.py:73
 msgid "Customizations"
 msgstr ""
 
@@ -115,10 +115,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_output_templates.py:31
-msgid "Default output template"
-msgstr ""
-
 #: EasyNewsletter/browser/enl_subscribers_view.pt:135
 #: EasyNewsletter/views/newsletter_subscribers.pt:151
 msgid "Delete"
@@ -133,152 +129,152 @@ msgid "E-Mail"
 msgstr ""
 
 #. Default: "Choose sources to aggregate newsletter content from."
-#: EasyNewsletter/content/newsletter.py:117
-#: EasyNewsletter/content/newsletter_issue.py:100
+#: EasyNewsletter/content/newsletter.py:115
+#: EasyNewsletter/content/newsletter_issue.py:97
 msgid "ENL_content_aggregation_sources_desc"
 msgstr ""
 
 #. Default: "Content aggregation sources"
-#: EasyNewsletter/content/newsletter.py:113
-#: EasyNewsletter/content/newsletter_issue.py:96
+#: EasyNewsletter/content/newsletter.py:111
+#: EasyNewsletter/content/newsletter_issue.py:93
 msgid "ENL_content_aggregation_sources_label"
 msgstr ""
 
 #. Default: "Text used for confirmation email subject. You can                 customize the text, but it should include the                 placeholder: ${portal_url}!"
-#: EasyNewsletter/content/newsletter.py:248
+#: EasyNewsletter/content/newsletter.py:246
 msgid "ENL_description_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Text used for confirmation email. You can customize                 the text, but it should include the placeholders:                 ${portal_url}, ${subscriber_email} and                 ${confirmation_url}!"
-#: EasyNewsletter/content/newsletter.py:263
+#: EasyNewsletter/content/newsletter.py:261
 msgid "ENL_description_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "The default epilogue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:207
-#: EasyNewsletter/content/newsletter_issue.py:154
+#: EasyNewsletter/content/newsletter.py:205
+#: EasyNewsletter/content/newsletter_issue.py:151
 msgid "ENL_description_text_footer"
 msgstr ""
 
 #. Default: "The default prologue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:194
-#: EasyNewsletter/content/newsletter_issue.py:141
+#: EasyNewsletter/content/newsletter.py:192
+#: EasyNewsletter/content/newsletter_issue.py:138
 msgid "ENL_description_text_header"
 msgstr ""
 
 #. Default: "If checked, the newsletter/mailing will not be send                  to all subscribers inside the newsletter. Changing this                 setting does not affect already existing issues."
-#: EasyNewsletter/content/newsletter.py:222
-#: EasyNewsletter/content/newsletter_issue.py:117
+#: EasyNewsletter/content/newsletter.py:220
+#: EasyNewsletter/content/newsletter_issue.py:114
 msgid "ENL_help_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "This will be used if the subscriber has no fullname."
-#: EasyNewsletter/content/newsletter.py:148
+#: EasyNewsletter/content/newsletter.py:146
 msgid "ENL_help_fullname_fallback"
 msgstr ""
 
 #. Default: "Define here possible salutations for subscriber.                 One salutation per line in the form of: \"mr|Dear Mr.\".                 The left hand value \"mr\" or \"ms\" is mapped to salutation                 of each subscriber and then the right hand value, which                 you can customize is used as salutation."
-#: EasyNewsletter/content/newsletter.py:130
+#: EasyNewsletter/content/newsletter.py:128
 msgid "ENL_help_salutations"
 msgstr ""
 
 #. Default: "Default for the sender address of the newsletters."
-#: EasyNewsletter/content/newsletter.py:81
+#: EasyNewsletter/content/newsletter.py:79
 msgid "ENL_help_senderEmail"
 msgstr ""
 
 #. Default: "Default for the sender name of the newsletters."
-#: EasyNewsletter/content/newsletter.py:90
+#: EasyNewsletter/content/newsletter.py:88
 msgid "ENL_help_senderName"
 msgstr ""
 
 #. Default: "Default for the test email address."
-#: EasyNewsletter/content/newsletter.py:99
+#: EasyNewsletter/content/newsletter.py:97
 msgid "ENL_help_testEmail"
 msgstr ""
 
 #. Default: "This will replace the placeholder {{UNSUBSCRIBE}}."
-#: EasyNewsletter/content/newsletter.py:160
+#: EasyNewsletter/content/newsletter.py:158
 msgid "ENL_help_unsubscribe_string"
 msgstr ""
 
 #. Default: "Banner image, you can include in the templates by\n adding the {{banner}} placeholder into it. By default it should be 600x200 pixel."
-#: EasyNewsletter/content/newsletter.py:171
-#: EasyNewsletter/content/newsletter_issue.py:181
+#: EasyNewsletter/content/newsletter.py:169
+#: EasyNewsletter/content/newsletter_issue.py:178
 msgid "ENL_image_desc"
 msgstr ""
 
 #. Default: "Banner image"
-#: EasyNewsletter/content/newsletter.py:170
-#: EasyNewsletter/content/newsletter_issue.py:180
+#: EasyNewsletter/content/newsletter.py:168
+#: EasyNewsletter/content/newsletter_issue.py:177
 msgid "ENL_image_label"
 msgstr ""
 
 #. Default: "Epilogue"
-#: EasyNewsletter/content/newsletter.py:206
-#: EasyNewsletter/content/newsletter_issue.py:153
+#: EasyNewsletter/content/newsletter.py:204
+#: EasyNewsletter/content/newsletter_issue.py:150
 msgid "ENL_label_default_footer"
 msgstr ""
 
 #. Default: "Prologue"
-#: EasyNewsletter/content/newsletter.py:193
-#: EasyNewsletter/content/newsletter_issue.py:140
+#: EasyNewsletter/content/newsletter.py:191
+#: EasyNewsletter/content/newsletter_issue.py:137
 msgid "ENL_label_default_header"
 msgstr ""
 
 #. Default: "Exclude all subscribers"
-#: EasyNewsletter/content/newsletter.py:221
-#: EasyNewsletter/content/newsletter_issue.py:116
+#: EasyNewsletter/content/newsletter.py:219
+#: EasyNewsletter/content/newsletter_issue.py:113
 msgid "ENL_label_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "Fallback for subscribers without a name."
-#: EasyNewsletter/content/newsletter.py:144
+#: EasyNewsletter/content/newsletter.py:142
 msgid "ENL_label_fullname_fallback"
 msgstr ""
 
 #. Default: "Subscriber Salutations."
-#: EasyNewsletter/content/newsletter.py:129
+#: EasyNewsletter/content/newsletter.py:127
 msgid "ENL_label_salutations"
 msgstr ""
 
 #. Default: "Sender email"
-#: EasyNewsletter/content/newsletter.py:80
+#: EasyNewsletter/content/newsletter.py:78
 msgid "ENL_label_senderEmail"
 msgstr ""
 
 #. Default: "Sender name"
-#: EasyNewsletter/content/newsletter.py:89
+#: EasyNewsletter/content/newsletter.py:87
 msgid "ENL_label_senderName"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail subject"
-#: EasyNewsletter/content/newsletter.py:244
+#: EasyNewsletter/content/newsletter.py:242
 msgid "ENL_label_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail text"
-#: EasyNewsletter/content/newsletter.py:259
+#: EasyNewsletter/content/newsletter.py:257
 msgid "ENL_label_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "Test email"
-#: EasyNewsletter/content/newsletter.py:98
+#: EasyNewsletter/content/newsletter.py:96
 msgid "ENL_label_testEmail"
 msgstr ""
 
 #. Default: "Text for the 'unsubscribe' link"
-#: EasyNewsletter/content/newsletter.py:157
+#: EasyNewsletter/content/newsletter.py:155
 msgid "ENL_label_unsubscribe_string"
 msgstr ""
 
 #. Default: "Logo image, you can include in the templates by\n adding the {{logo}} placeholder into it."
-#: EasyNewsletter/content/newsletter.py:183
+#: EasyNewsletter/content/newsletter.py:181
 msgid "ENL_logo_desc"
 msgstr ""
 
 #. Default: "Logo image"
-#: EasyNewsletter/content/newsletter.py:182
+#: EasyNewsletter/content/newsletter.py:180
 msgid "ENL_logo_label"
 msgstr ""
 
@@ -293,12 +289,12 @@ msgid "EasyNewsletter_help_name_prefix"
 msgstr ""
 
 #. Default: "Choose Plone Groups which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:70
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:67
 msgid "EasyNewsletter_help_ploneReceiverGroups"
 msgstr ""
 
 #. Default: "Choose Plone Members which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:54
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:51
 msgid "EasyNewsletter_help_ploneReceiverMembers"
 msgstr ""
 
@@ -356,12 +352,12 @@ msgid "EasyNewsletter_label_organization"
 msgstr ""
 
 #. Default: "Plone Groups to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:66
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:63
 msgid "EasyNewsletter_label_ploneReceiverGroups"
 msgstr ""
 
 #. Default: "Plone Members to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:50
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:47
 msgid "EasyNewsletter_label_ploneReceiverMembers"
 msgstr ""
 
@@ -410,7 +406,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:317
+#: EasyNewsletter/browser/subscribers.py:316
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:132
 msgid "Email existed, updated subscriber."
 msgstr ""
@@ -433,10 +429,6 @@ msgstr ""
 msgid "First Name"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_aggregation_templates.py:31
-msgid "Generic Listing"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:28
 #: EasyNewsletter/views/newsletter_subscribers_upload.pt:13
 msgid "Import"
@@ -458,10 +450,6 @@ msgstr ""
 msgid "Issue masters"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_plone_users.py:38
-msgid "Jane Doe - jane@plone.org"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:94
 msgid "Language"
 msgstr ""
@@ -475,17 +463,16 @@ msgstr ""
 msgid "Masters"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:293
+#: EasyNewsletter/browser/subscribers.py:292
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:108
 msgid "More than one subscriber with this email address existed, subscriber info was NOT updated. Check manually!"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/salutations.py:26
+#: EasyNewsletter/vocabularies/salutations.py:25
 msgid "Mr"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_salutations.py:32
-#: EasyNewsletter/vocabularies/salutations.py:25
+#: EasyNewsletter/vocabularies/salutations.py:24
 msgid "Ms"
 msgstr ""
 
@@ -501,7 +488,7 @@ msgstr ""
 msgid "Newsletter Subscriber"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:29
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:27
 msgid "Newsletter aggregation template"
 msgstr ""
 
@@ -513,7 +500,7 @@ msgstr ""
 msgid "Newsletter content successfully aggregated."
 msgstr ""
 
-#: EasyNewsletter/views/newsletter_issue_statistics.py:22
+#: EasyNewsletter/views/newsletter_issue_statistics.py:23
 msgid "Newsletter issue statistics have been reset."
 msgstr ""
 
@@ -521,17 +508,17 @@ msgstr ""
 msgid "Newsletter subscriber portlet"
 msgstr ""
 
-#: EasyNewsletter/views/newsletter_issue_send.py:201
+#: EasyNewsletter/views/newsletter_issue_send.py:205
 msgid "Newsletter was sent to ({0}) receivers. ({1}) errors occurred!{2}"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:254
+#: EasyNewsletter/browser/subscribers.py:253
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:68
 msgid "No file specified."
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:208
-#: EasyNewsletter/views/newsletter_subscribers.py:96
+#: EasyNewsletter/browser/subscribers.py:207
+#: EasyNewsletter/views/newsletter_subscribers.py:100
 msgid "No subscriber selected!"
 msgstr ""
 
@@ -540,21 +527,21 @@ msgstr ""
 msgid "Organization"
 msgstr ""
 
-#: EasyNewsletter/content/newsletter.py:61
+#: EasyNewsletter/content/newsletter.py:59
 msgid "Personalization"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:195
+#: EasyNewsletter/browser/registration.py:193
 msgid "Please enter a valid email address."
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:77
+#: EasyNewsletter/browser/registration.py:75
 msgid "Please enter a valid email address.
 {0}"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:292
-#: EasyNewsletter/views/newsletter_unsubscribe.py:24
+#: EasyNewsletter/browser/registration.py:290
+#: EasyNewsletter/views/newsletter_unsubscribe.py:23
 msgid "Please use the correct unsubscribe url!"
 msgstr ""
 
@@ -587,7 +574,7 @@ msgstr ""
 msgid "Products.EasyNewsletter (4005)"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/plone_users.py:49
+#: EasyNewsletter/vocabularies/plone_users.py:47
 msgid "Property email: \"{0}\" is not an email!"
 msgstr ""
 
@@ -600,8 +587,8 @@ msgstr ""
 msgid "Reason for failure"
 msgstr ""
 
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:45
-#: EasyNewsletter/content/newsletter.py:76
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:42
+#: EasyNewsletter/content/newsletter.py:74
 msgid "Recipients"
 msgstr ""
 
@@ -624,7 +611,7 @@ msgstr ""
 msgid "Select your CSV file here."
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:24
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:22
 msgid "Settings"
 msgstr ""
 
@@ -637,7 +624,7 @@ msgstr ""
 msgid "Subscriber Search"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:350
+#: EasyNewsletter/browser/subscribers.py:349
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:166
 msgid "Subscriber created."
 msgstr ""
@@ -661,7 +648,7 @@ msgstr ""
 msgid "Tester"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:30
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:28
 msgid "The <a href=\"https://productseasynewsletter.readthedocs.io/en/latest/#aggregation-templates\">aggregation template</a> used by the Newsletter to render Collection items for the Newsletter."
 msgstr ""
 
@@ -671,7 +658,7 @@ msgid "The CSV file must contain the header and follow this format"
 msgstr ""
 
 #: EasyNewsletter/browser/issue.py:74
-#: EasyNewsletter/views/newsletter_issue_send.py:81
+#: EasyNewsletter/views/newsletter_issue_send.py:85
 msgid "The issue has been generated and sent to the mail server."
 msgstr ""
 
@@ -680,11 +667,11 @@ msgid "The issue sending has been initiated in the background."
 msgstr ""
 
 #: EasyNewsletter/browser/issue.py:55
-#: EasyNewsletter/views/newsletter_issue_send.py:62
+#: EasyNewsletter/views/newsletter_issue_send.py:66
 msgid "The issue test sending has been initiated."
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:275
+#: EasyNewsletter/browser/subscribers.py:274
 msgid "The number of items in the line is not correct.                         It should be 7. Check your CSV file."
 msgstr ""
 
@@ -705,28 +692,24 @@ msgstr ""
 msgid "Title for the portlet."
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_plone_groups.py:35
-msgid "VIP"
-msgstr ""
-
 #: EasyNewsletter/profiles/default/types/Newsletter.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Issue.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Subscriber.xml
 msgid "View"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:272
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:48
+#: EasyNewsletter/browser/registration.py:270
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:58
 msgid "We send you an email, please confirm this unsubscription."
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:265
+#: EasyNewsletter/browser/subscribers.py:264
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:78
 msgid "Wrong specification of the CSV file. Please correct it and retry."
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:307
-#: EasyNewsletter/views/newsletter_unsubscribe.py:46
+#: EasyNewsletter/browser/registration.py:305
+#: EasyNewsletter/views/newsletter_unsubscribe.py:45
 msgid "You have been unsubscribed."
 msgstr ""
 
@@ -734,16 +717,16 @@ msgstr ""
 msgid "You want to unsubscribe from this Newsletter?"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:278
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:56
+#: EasyNewsletter/browser/registration.py:276
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:66
 msgid "Your email address could not be found in subscribers."
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:95
+#: EasyNewsletter/browser/registration.py:93
 msgid "Your email address is already registered."
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:142
+#: EasyNewsletter/browser/registration.py:140
 msgid "Your email has been registered.                 A confirmation email was sent to your address. Please check                 your inbox and click on the link in the email in order to                 confirm your subscription."
 msgstr ""
 
@@ -751,7 +734,7 @@ msgstr ""
 msgid "Your registered E-Mail address:"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:191
+#: EasyNewsletter/browser/registration.py:189
 msgid "Your subscription was successfully confirmed."
 msgstr ""
 
@@ -771,8 +754,8 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:268
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:44
+#: EasyNewsletter/browser/registration.py:266
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:53
 msgid "confirm newsletter unsubscription"
 msgstr ""
 
@@ -868,34 +851,34 @@ msgid "easynewsletter_unsubscribe_button"
 msgstr ""
 
 #. Default: "Your email has been registered. A confirmation email was sent to your address. Please check your inbox and click  on the link in the email in order to confirm your subscription."
-#: EasyNewsletter/config.py:37
+#: EasyNewsletter/config.py:39
 msgid "email_added"
 msgstr ""
 
 #. Default: "Your email address is already registered."
-#: EasyNewsletter/config.py:46
+#: EasyNewsletter/config.py:49
 msgid "email_exists"
 msgstr ""
 
 #. Default: "Choose the template to render the email. "
-#: EasyNewsletter/content/newsletter.py:234
-#: EasyNewsletter/content/newsletter_issue.py:129
+#: EasyNewsletter/content/newsletter.py:232
+#: EasyNewsletter/content/newsletter_issue.py:126
 msgid "enl_help_output_template"
 msgstr ""
 
 #. Default: "If checked, the banner image defined on newsletter                     or on this issue will not be used."
-#: EasyNewsletter/content/newsletter_issue.py:169
+#: EasyNewsletter/content/newsletter_issue.py:166
 msgid "enl_issue_help_hide_image"
 msgstr ""
 
 #. Default: "Default output template"
-#: EasyNewsletter/vocabularies/output_templates.py:37
+#: EasyNewsletter/vocabularies/output_templates.py:36
 msgid "enl_label_default_output_template"
 msgstr ""
 
 #. Default: "Output template"
-#: EasyNewsletter/content/newsletter.py:233
-#: EasyNewsletter/content/newsletter_issue.py:128
+#: EasyNewsletter/content/newsletter.py:231
+#: EasyNewsletter/content/newsletter_issue.py:125
 msgid "enl_label_output_template"
 msgstr ""
 
@@ -929,12 +912,12 @@ msgid "import_subscriber"
 msgstr ""
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:44
+#: EasyNewsletter/config.py:46
 msgid "invalid_email"
 msgstr ""
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:48
+#: EasyNewsletter/config.py:52
 msgid "invalid_hashkey"
 msgstr ""
 
@@ -944,7 +927,7 @@ msgid "label_ext_subcriber_source_failed"
 msgstr ""
 
 #. Default: "Hide banner image."
-#: EasyNewsletter/content/newsletter_issue.py:168
+#: EasyNewsletter/content/newsletter_issue.py:165
 msgid "label_issueHideImage"
 msgstr ""
 
@@ -984,12 +967,12 @@ msgid "label_newsletter_path"
 msgstr ""
 
 #. Default: "Mr."
-#: EasyNewsletter/config.py:26
+#: EasyNewsletter/config.py:28
 msgid "label_salutation_mr"
 msgstr ""
 
 #. Default: "Ms."
-#: EasyNewsletter/config.py:25
+#: EasyNewsletter/config.py:27
 msgid "label_salutation_ms"
 msgstr ""
 
@@ -1091,8 +1074,8 @@ msgstr ""
 msgid "source"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:215
-#: EasyNewsletter/views/newsletter_subscribers.py:103
+#: EasyNewsletter/browser/subscribers.py:214
+#: EasyNewsletter/views/newsletter_subscribers.py:107
 msgid "subscriber/s deleted successfully"
 msgstr ""
 
@@ -1103,7 +1086,7 @@ msgid "subscribers_search_note"
 msgstr ""
 
 #. Default: "Your subscription was successfully confirmed."
-#: EasyNewsletter/config.py:50
+#: EasyNewsletter/config.py:55
 msgid "subscription_confirmed"
 msgstr ""
 
@@ -1117,6 +1100,11 @@ msgstr ""
 msgid "unsubscribe"
 msgstr ""
 
-#: EasyNewsletter/content/newsletter.py:200
+#. Default: "You requested to unsubscribe from the following newsletter: ${title}"
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:37
+msgid "you_requested_to_unsubscribe"
+msgstr ""
+
+#: EasyNewsletter/content/newsletter.py:198
 msgid "{{subscriber_salutation}}<br />"
 msgstr ""
diff --git a/src/Products/EasyNewsletter/locales/da/LC_MESSAGES/Products.EasyNewsletter.po b/src/Products/EasyNewsletter/locales/da/LC_MESSAGES/Products.EasyNewsletter.po
index 663761cf..ad658e10 100644
--- a/src/Products/EasyNewsletter/locales/da/LC_MESSAGES/Products.EasyNewsletter.po
+++ b/src/Products/EasyNewsletter/locales/da/LC_MESSAGES/Products.EasyNewsletter.po
@@ -52,8 +52,8 @@ msgstr ""
 msgid "Allowed content aggregation types"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:304
-#: EasyNewsletter/views/newsletter_unsubscribe.py:39
+#: EasyNewsletter/browser/registration.py:302
+#: EasyNewsletter/views/newsletter_unsubscribe.py:38
 msgid "An error occured"
 msgstr "Der er sket en fejl"
 
@@ -86,7 +86,7 @@ msgstr ""
 msgid "Configuration for version 4005"
 msgstr ""
 
-#: EasyNewsletter/config.py:60
+#: EasyNewsletter/config.py:67
 msgid "Confirm your subscription on ${portal_url}"
 msgstr ""
 
@@ -98,7 +98,7 @@ msgstr ""
 msgid "Content types which will be visible in the Content aggregation sources reference field."
 msgstr ""
 
-#: EasyNewsletter/content/newsletter_issue.py:76
+#: EasyNewsletter/content/newsletter_issue.py:73
 msgid "Customizations"
 msgstr ""
 
@@ -106,10 +106,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_output_templates.py:31
-msgid "Default output template"
-msgstr ""
-
 #: EasyNewsletter/browser/enl_subscribers_view.pt:135
 #: EasyNewsletter/views/newsletter_subscribers.pt:151
 msgid "Delete"
@@ -124,152 +120,152 @@ msgid "E-Mail"
 msgstr ""
 
 #. Default: "Choose sources to aggregate newsletter content from."
-#: EasyNewsletter/content/newsletter.py:117
-#: EasyNewsletter/content/newsletter_issue.py:100
+#: EasyNewsletter/content/newsletter.py:115
+#: EasyNewsletter/content/newsletter_issue.py:97
 msgid "ENL_content_aggregation_sources_desc"
 msgstr ""
 
 #. Default: "Content aggregation sources"
-#: EasyNewsletter/content/newsletter.py:113
-#: EasyNewsletter/content/newsletter_issue.py:96
+#: EasyNewsletter/content/newsletter.py:111
+#: EasyNewsletter/content/newsletter_issue.py:93
 msgid "ENL_content_aggregation_sources_label"
 msgstr ""
 
 #. Default: "Text used for confirmation email subject. You can                 customize the text, but it should include the                 placeholder: ${portal_url}!"
-#: EasyNewsletter/content/newsletter.py:248
+#: EasyNewsletter/content/newsletter.py:246
 msgid "ENL_description_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Text used for confirmation email. You can customize                 the text, but it should include the placeholders:                 ${portal_url}, ${subscriber_email} and                 ${confirmation_url}!"
-#: EasyNewsletter/content/newsletter.py:263
+#: EasyNewsletter/content/newsletter.py:261
 msgid "ENL_description_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "The default epilogue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:207
-#: EasyNewsletter/content/newsletter_issue.py:154
+#: EasyNewsletter/content/newsletter.py:205
+#: EasyNewsletter/content/newsletter_issue.py:151
 msgid "ENL_description_text_footer"
 msgstr ""
 
 #. Default: "The default prologue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:194
-#: EasyNewsletter/content/newsletter_issue.py:141
+#: EasyNewsletter/content/newsletter.py:192
+#: EasyNewsletter/content/newsletter_issue.py:138
 msgid "ENL_description_text_header"
 msgstr ""
 
 #. Default: "If checked, the newsletter/mailing will not be send                  to all subscribers inside the newsletter. Changing this                 setting does not affect already existing issues."
-#: EasyNewsletter/content/newsletter.py:222
-#: EasyNewsletter/content/newsletter_issue.py:117
+#: EasyNewsletter/content/newsletter.py:220
+#: EasyNewsletter/content/newsletter_issue.py:114
 msgid "ENL_help_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "This will be used if the subscriber has no fullname."
-#: EasyNewsletter/content/newsletter.py:148
+#: EasyNewsletter/content/newsletter.py:146
 msgid "ENL_help_fullname_fallback"
 msgstr ""
 
 #. Default: "Define here possible salutations for subscriber.                 One salutation per line in the form of: \"mr|Dear Mr.\".                 The left hand value \"mr\" or \"ms\" is mapped to salutation                 of each subscriber and then the right hand value, which                 you can customize is used as salutation."
-#: EasyNewsletter/content/newsletter.py:130
+#: EasyNewsletter/content/newsletter.py:128
 msgid "ENL_help_salutations"
 msgstr ""
 
 #. Default: "Default for the sender address of the newsletters."
-#: EasyNewsletter/content/newsletter.py:81
+#: EasyNewsletter/content/newsletter.py:79
 msgid "ENL_help_senderEmail"
 msgstr ""
 
 #. Default: "Default for the sender name of the newsletters."
-#: EasyNewsletter/content/newsletter.py:90
+#: EasyNewsletter/content/newsletter.py:88
 msgid "ENL_help_senderName"
 msgstr ""
 
 #. Default: "Default for the test email address."
-#: EasyNewsletter/content/newsletter.py:99
+#: EasyNewsletter/content/newsletter.py:97
 msgid "ENL_help_testEmail"
 msgstr ""
 
 #. Default: "This will replace the placeholder {{UNSUBSCRIBE}}."
-#: EasyNewsletter/content/newsletter.py:160
+#: EasyNewsletter/content/newsletter.py:158
 msgid "ENL_help_unsubscribe_string"
 msgstr ""
 
 #. Default: "Banner image, you can include in the templates by\n adding the {{banner}} placeholder into it. By default it should be 600x200 pixel."
-#: EasyNewsletter/content/newsletter.py:171
-#: EasyNewsletter/content/newsletter_issue.py:181
+#: EasyNewsletter/content/newsletter.py:169
+#: EasyNewsletter/content/newsletter_issue.py:178
 msgid "ENL_image_desc"
 msgstr ""
 
 #. Default: "Banner image"
-#: EasyNewsletter/content/newsletter.py:170
-#: EasyNewsletter/content/newsletter_issue.py:180
+#: EasyNewsletter/content/newsletter.py:168
+#: EasyNewsletter/content/newsletter_issue.py:177
 msgid "ENL_image_label"
 msgstr ""
 
 #. Default: "Epilogue"
-#: EasyNewsletter/content/newsletter.py:206
-#: EasyNewsletter/content/newsletter_issue.py:153
+#: EasyNewsletter/content/newsletter.py:204
+#: EasyNewsletter/content/newsletter_issue.py:150
 msgid "ENL_label_default_footer"
 msgstr ""
 
 #. Default: "Prologue"
-#: EasyNewsletter/content/newsletter.py:193
-#: EasyNewsletter/content/newsletter_issue.py:140
+#: EasyNewsletter/content/newsletter.py:191
+#: EasyNewsletter/content/newsletter_issue.py:137
 msgid "ENL_label_default_header"
 msgstr ""
 
 #. Default: "Exclude all subscribers"
-#: EasyNewsletter/content/newsletter.py:221
-#: EasyNewsletter/content/newsletter_issue.py:116
+#: EasyNewsletter/content/newsletter.py:219
+#: EasyNewsletter/content/newsletter_issue.py:113
 msgid "ENL_label_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "Fallback for subscribers without a name."
-#: EasyNewsletter/content/newsletter.py:144
+#: EasyNewsletter/content/newsletter.py:142
 msgid "ENL_label_fullname_fallback"
 msgstr ""
 
 #. Default: "Subscriber Salutations."
-#: EasyNewsletter/content/newsletter.py:129
+#: EasyNewsletter/content/newsletter.py:127
 msgid "ENL_label_salutations"
 msgstr ""
 
 #. Default: "Sender email"
-#: EasyNewsletter/content/newsletter.py:80
+#: EasyNewsletter/content/newsletter.py:78
 msgid "ENL_label_senderEmail"
 msgstr ""
 
 #. Default: "Sender name"
-#: EasyNewsletter/content/newsletter.py:89
+#: EasyNewsletter/content/newsletter.py:87
 msgid "ENL_label_senderName"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail subject"
-#: EasyNewsletter/content/newsletter.py:244
+#: EasyNewsletter/content/newsletter.py:242
 msgid "ENL_label_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail text"
-#: EasyNewsletter/content/newsletter.py:259
+#: EasyNewsletter/content/newsletter.py:257
 msgid "ENL_label_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "Test email"
-#: EasyNewsletter/content/newsletter.py:98
+#: EasyNewsletter/content/newsletter.py:96
 msgid "ENL_label_testEmail"
 msgstr ""
 
 #. Default: "Text for the 'unsubscribe' link"
-#: EasyNewsletter/content/newsletter.py:157
+#: EasyNewsletter/content/newsletter.py:155
 msgid "ENL_label_unsubscribe_string"
 msgstr ""
 
 #. Default: "Logo image, you can include in the templates by\n adding the {{logo}} placeholder into it."
-#: EasyNewsletter/content/newsletter.py:183
+#: EasyNewsletter/content/newsletter.py:181
 msgid "ENL_logo_desc"
 msgstr ""
 
 #. Default: "Logo image"
-#: EasyNewsletter/content/newsletter.py:182
+#: EasyNewsletter/content/newsletter.py:180
 msgid "ENL_logo_label"
 msgstr ""
 
@@ -284,13 +280,13 @@ msgid "EasyNewsletter_help_name_prefix"
 msgstr ""
 
 #. Default: "Choose Plone Groups which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:70
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:67
 #, fuzzy
 msgid "EasyNewsletter_help_ploneReceiverGroups"
 msgstr "Vælg grupper, der skal modtage nyhedsbrevet."
 
 #. Default: "Choose Plone Members which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:54
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:51
 #, fuzzy
 msgid "EasyNewsletter_help_ploneReceiverMembers"
 msgstr "Vælg medlemmer, der skal modtage nyhedsbrevet."
@@ -349,12 +345,12 @@ msgid "EasyNewsletter_label_organization"
 msgstr "Firma/organisation"
 
 #. Default: "Plone Groups to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:66
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:63
 msgid "EasyNewsletter_label_ploneReceiverGroups"
 msgstr "Grupper, der skal modtage nyhedsbrevet"
 
 #. Default: "Plone Members to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:50
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:47
 msgid "EasyNewsletter_label_ploneReceiverMembers"
 msgstr "Brugere, der skal modtage nyhedsbrevet"
 
@@ -403,7 +399,7 @@ msgstr "Rediger nyhedsbrevsportletten"
 msgid "Email"
 msgstr "E-mail"
 
-#: EasyNewsletter/browser/subscribers.py:317
+#: EasyNewsletter/browser/subscribers.py:316
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:132
 msgid "Email existed, updated subscriber."
 msgstr ""
@@ -426,10 +422,6 @@ msgstr ""
 msgid "First Name"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_aggregation_templates.py:31
-msgid "Generic Listing"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:28
 #: EasyNewsletter/views/newsletter_subscribers_upload.pt:13
 msgid "Import"
@@ -451,10 +443,6 @@ msgstr ""
 msgid "Issue masters"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_plone_users.py:38
-msgid "Jane Doe - jane@plone.org"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:94
 msgid "Language"
 msgstr ""
@@ -468,17 +456,16 @@ msgstr ""
 msgid "Masters"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:293
+#: EasyNewsletter/browser/subscribers.py:292
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:108
 msgid "More than one subscriber with this email address existed, subscriber info was NOT updated. Check manually!"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/salutations.py:26
+#: EasyNewsletter/vocabularies/salutations.py:25
 msgid "Mr"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_salutations.py:32
-#: EasyNewsletter/vocabularies/salutations.py:25
+#: EasyNewsletter/vocabularies/salutations.py:24
 msgid "Ms"
 msgstr ""
 
@@ -494,7 +481,7 @@ msgstr ""
 msgid "Newsletter Subscriber"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:29
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:27
 msgid "Newsletter aggregation template"
 msgstr ""
 
@@ -506,7 +493,7 @@ msgstr ""
 msgid "Newsletter content successfully aggregated."
 msgstr ""
 
-#: EasyNewsletter/views/newsletter_issue_statistics.py:22
+#: EasyNewsletter/views/newsletter_issue_statistics.py:23
 msgid "Newsletter issue statistics have been reset."
 msgstr ""
 
@@ -514,17 +501,17 @@ msgstr ""
 msgid "Newsletter subscriber portlet"
 msgstr "Nyhedsbrev tilmeldingsportlet"
 
-#: EasyNewsletter/views/newsletter_issue_send.py:201
+#: EasyNewsletter/views/newsletter_issue_send.py:205
 msgid "Newsletter was sent to ({0}) receivers. ({1}) errors occurred!{2}"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:254
+#: EasyNewsletter/browser/subscribers.py:253
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:68
 msgid "No file specified."
 msgstr "Ingen fil blev valgt."
 
-#: EasyNewsletter/browser/subscribers.py:208
-#: EasyNewsletter/views/newsletter_subscribers.py:96
+#: EasyNewsletter/browser/subscribers.py:207
+#: EasyNewsletter/views/newsletter_subscribers.py:100
 msgid "No subscriber selected!"
 msgstr "Ingen tilmeldte valgt!"
 
@@ -533,16 +520,16 @@ msgstr "Ingen tilmeldte valgt!"
 msgid "Organization"
 msgstr "Organisation"
 
-#: EasyNewsletter/content/newsletter.py:61
+#: EasyNewsletter/content/newsletter.py:59
 msgid "Personalization"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:195
+#: EasyNewsletter/browser/registration.py:193
 msgid "Please enter a valid email address."
 msgstr "Indtast en gyldig e-mail adresse."
 
-#: EasyNewsletter/browser/registration.py:292
-#: EasyNewsletter/views/newsletter_unsubscribe.py:24
+#: EasyNewsletter/browser/registration.py:290
+#: EasyNewsletter/views/newsletter_unsubscribe.py:23
 msgid "Please use the correct unsubscribe url!"
 msgstr ""
 
@@ -575,7 +562,7 @@ msgstr ""
 msgid "Products.EasyNewsletter (4005)"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/plone_users.py:49
+#: EasyNewsletter/vocabularies/plone_users.py:47
 msgid "Property email: \"{0}\" is not an email!"
 msgstr ""
 
@@ -588,8 +575,8 @@ msgstr ""
 msgid "Reason for failure"
 msgstr "Årsag til fejl"
 
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:45
-#: EasyNewsletter/content/newsletter.py:76
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:42
+#: EasyNewsletter/content/newsletter.py:74
 msgid "Recipients"
 msgstr ""
 
@@ -612,7 +599,7 @@ msgstr ""
 msgid "Select your CSV file here."
 msgstr "Vælg din CSV-fil her."
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:24
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:22
 msgid "Settings"
 msgstr ""
 
@@ -625,7 +612,7 @@ msgstr ""
 msgid "Subscriber Search"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:350
+#: EasyNewsletter/browser/subscribers.py:349
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:166
 msgid "Subscriber created."
 msgstr ""
@@ -649,7 +636,7 @@ msgstr ""
 msgid "Tester"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:30
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:28
 msgid "The <a href=\"https://productseasynewsletter.readthedocs.io/en/latest/#aggregation-templates\">aggregation template</a> used by the Newsletter to render Collection items for the Newsletter."
 msgstr ""
 
@@ -659,7 +646,7 @@ msgid "The CSV file must contain the header and follow this format"
 msgstr "CSV-filen til import skal indeholde en header og følge dette format"
 
 #: EasyNewsletter/browser/issue.py:74
-#: EasyNewsletter/views/newsletter_issue_send.py:81
+#: EasyNewsletter/views/newsletter_issue_send.py:85
 msgid "The issue has been generated and sent to the mail server."
 msgstr ""
 
@@ -668,11 +655,11 @@ msgid "The issue sending has been initiated in the background."
 msgstr ""
 
 #: EasyNewsletter/browser/issue.py:55
-#: EasyNewsletter/views/newsletter_issue_send.py:62
+#: EasyNewsletter/views/newsletter_issue_send.py:66
 msgid "The issue test sending has been initiated."
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:275
+#: EasyNewsletter/browser/subscribers.py:274
 msgid "The number of items in the line is not correct.                         It should be 7. Check your CSV file."
 msgstr ""
 
@@ -693,28 +680,24 @@ msgstr ""
 msgid "Title for the portlet."
 msgstr "Portlettens titel."
 
-#: EasyNewsletter/tests/test_vocab_plone_groups.py:35
-msgid "VIP"
-msgstr ""
-
 #: EasyNewsletter/profiles/default/types/Newsletter.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Issue.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Subscriber.xml
 msgid "View"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:272
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:48
+#: EasyNewsletter/browser/registration.py:270
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:58
 msgid "We send you an email, please confirm this unsubscription."
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:265
+#: EasyNewsletter/browser/subscribers.py:264
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:78
 msgid "Wrong specification of the CSV file. Please correct it and retry."
 msgstr "Ukendt specifikation af CSV-fil."
 
-#: EasyNewsletter/browser/registration.py:307
-#: EasyNewsletter/views/newsletter_unsubscribe.py:46
+#: EasyNewsletter/browser/registration.py:305
+#: EasyNewsletter/views/newsletter_unsubscribe.py:45
 msgid "You have been unsubscribed."
 msgstr "Du er blevet afmeldt."
 
@@ -722,16 +705,16 @@ msgstr "Du er blevet afmeldt."
 msgid "You want to unsubscribe from this Newsletter?"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:278
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:56
+#: EasyNewsletter/browser/registration.py:276
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:66
 msgid "Your email address could not be found in subscribers."
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:95
+#: EasyNewsletter/browser/registration.py:93
 msgid "Your email address is already registered."
 msgstr "Din e-mail adresse er allerede registeret."
 
-#: EasyNewsletter/browser/registration.py:142
+#: EasyNewsletter/browser/registration.py:140
 msgid "Your email has been registered.                 A confirmation email was sent to your address. Please check                 your inbox and click on the link in the email in order to                 confirm your subscription."
 msgstr "Din e-mail adresse blev registret. En anmodning om godkendelse er blevet sendt."
 
@@ -739,7 +722,7 @@ msgstr "Din e-mail adresse blev registret. En anmodning om godkendelse er blevet
 msgid "Your registered E-Mail address:"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:191
+#: EasyNewsletter/browser/registration.py:189
 msgid "Your subscription was successfully confirmed."
 msgstr "Din tilmelding er blevet godkendt."
 
@@ -759,8 +742,8 @@ msgstr "Tilføj tilmelding"
 msgid "cancel"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:268
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:44
+#: EasyNewsletter/browser/registration.py:266
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:53
 msgid "confirm newsletter unsubscription"
 msgstr ""
 
@@ -858,34 +841,34 @@ msgid "easynewsletter_unsubscribe_button"
 msgstr ""
 
 #. Default: "Your email has been registered. A confirmation email was sent to your address. Please check your inbox and click  on the link in the email in order to confirm your subscription."
-#: EasyNewsletter/config.py:37
+#: EasyNewsletter/config.py:39
 msgid "email_added"
 msgstr ""
 
 #. Default: "Your email address is already registered."
-#: EasyNewsletter/config.py:46
+#: EasyNewsletter/config.py:49
 msgid "email_exists"
 msgstr ""
 
 #. Default: "Choose the template to render the email. "
-#: EasyNewsletter/content/newsletter.py:234
-#: EasyNewsletter/content/newsletter_issue.py:129
+#: EasyNewsletter/content/newsletter.py:232
+#: EasyNewsletter/content/newsletter_issue.py:126
 msgid "enl_help_output_template"
 msgstr ""
 
 #. Default: "If checked, the banner image defined on newsletter                     or on this issue will not be used."
-#: EasyNewsletter/content/newsletter_issue.py:169
+#: EasyNewsletter/content/newsletter_issue.py:166
 msgid "enl_issue_help_hide_image"
 msgstr ""
 
 #. Default: "Default output template"
-#: EasyNewsletter/vocabularies/output_templates.py:37
+#: EasyNewsletter/vocabularies/output_templates.py:36
 msgid "enl_label_default_output_template"
 msgstr ""
 
 #. Default: "Output template"
-#: EasyNewsletter/content/newsletter.py:233
-#: EasyNewsletter/content/newsletter_issue.py:128
+#: EasyNewsletter/content/newsletter.py:231
+#: EasyNewsletter/content/newsletter_issue.py:125
 msgid "enl_label_output_template"
 msgstr ""
 
@@ -919,12 +902,12 @@ msgid "import_subscriber"
 msgstr ""
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:44
+#: EasyNewsletter/config.py:46
 msgid "invalid_email"
 msgstr ""
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:48
+#: EasyNewsletter/config.py:52
 msgid "invalid_hashkey"
 msgstr ""
 
@@ -934,7 +917,7 @@ msgid "label_ext_subcriber_source_failed"
 msgstr ""
 
 #. Default: "Hide banner image."
-#: EasyNewsletter/content/newsletter_issue.py:168
+#: EasyNewsletter/content/newsletter_issue.py:165
 msgid "label_issueHideImage"
 msgstr ""
 
@@ -974,12 +957,12 @@ msgid "label_newsletter_path"
 msgstr ""
 
 #. Default: "Mr."
-#: EasyNewsletter/config.py:26
+#: EasyNewsletter/config.py:28
 msgid "label_salutation_mr"
 msgstr "Hr"
 
 #. Default: "Ms."
-#: EasyNewsletter/config.py:25
+#: EasyNewsletter/config.py:27
 msgid "label_salutation_ms"
 msgstr "Fru"
 
@@ -1082,8 +1065,8 @@ msgstr ""
 msgid "source"
 msgstr "Kilde"
 
-#: EasyNewsletter/browser/subscribers.py:215
-#: EasyNewsletter/views/newsletter_subscribers.py:103
+#: EasyNewsletter/browser/subscribers.py:214
+#: EasyNewsletter/views/newsletter_subscribers.py:107
 msgid "subscriber/s deleted successfully"
 msgstr "Abonnenter slettet"
 
@@ -1094,7 +1077,7 @@ msgid "subscribers_search_note"
 msgstr ""
 
 #. Default: "Your subscription was successfully confirmed."
-#: EasyNewsletter/config.py:50
+#: EasyNewsletter/config.py:55
 msgid "subscription_confirmed"
 msgstr ""
 
@@ -1109,6 +1092,11 @@ msgstr "Abonnenter oprettet"
 msgid "unsubscribe"
 msgstr ""
 
-#: EasyNewsletter/content/newsletter.py:200
+#. Default: "You requested to unsubscribe from the following newsletter: ${title}"
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:37
+msgid "you_requested_to_unsubscribe"
+msgstr ""
+
+#: EasyNewsletter/content/newsletter.py:198
 msgid "{{subscriber_salutation}}<br />"
 msgstr ""
diff --git a/src/Products/EasyNewsletter/locales/da/LC_MESSAGES/plone.po b/src/Products/EasyNewsletter/locales/da/LC_MESSAGES/plone.po
index 2c8e08f5..e931282d 100644
--- a/src/Products/EasyNewsletter/locales/da/LC_MESSAGES/plone.po
+++ b/src/Products/EasyNewsletter/locales/da/LC_MESSAGES/plone.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-02-01 19:16+0000\n"
+"POT-Creation-Date: 2021-02-02 19:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/Products/EasyNewsletter/locales/de/LC_MESSAGES/EasyNewsletter.po.bak b/src/Products/EasyNewsletter/locales/de/LC_MESSAGES/EasyNewsletter.po.bak
deleted file mode 100644
index d040c151..00000000
--- a/src/Products/EasyNewsletter/locales/de/LC_MESSAGES/EasyNewsletter.po.bak
+++ /dev/null
@@ -1,1079 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2015-07-18 16:25+0000\n"
-"PO-Revision-Date: 2011-01-04 22:46+0100\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0\n"
-"Language-Code: en\n"
-"Language-Name: English\n"
-"Preferred-Encodings: utf-8 latin1\n"
-"Domain: DOMAIN\n"
-
-#: ./browser/upload_csv.pt:113
-msgid "${count} import(s) failed."
-msgstr "${count} import(s) fehlgeschlagen."
-
-#: ./browser/upload_csv.pt:145
-msgid "${count} import(s) successful."
-msgstr "${count} import(s) erfolgreich."
-
-#: ./profiles/default/types/ENLSubscriber.xml
-#: ./profiles/default/types/ENLTemplate.xml
-msgid "A page in the site. Can contain rich text."
-msgstr "Eine Seite in der Website kann Text enthalten."
-
-#: ./profiles/default/types/EasyNewsletter.xml
-msgid "An easy to use Newsletter"
-msgstr "Ein einfach zu verwendendes Newsletter-Tool"
-
-#: ./browser/registration.py:257
-msgid "An error occured"
-msgstr "Ein Fehler ist aufgetreten"
-
-#: ./profiles/default/types/ENLIssue.xml
-msgid "An issue of a newsleter"
-msgstr "Eine Newsletterausgabe"
-
-#: ./browser/templates/enl_actions_viewlet.pt:3
-msgid "Archive"
-msgstr "Archiv"
-
-#: ./browser/upload_csv.pt:57
-msgid "CSV file"
-msgstr "CSV-Datei"
-
-#: ./config.py:225
-msgid "Confirm your subscription on ${portal_url}"
-msgstr "Bitte bestätigen Sie Ihre Anmeldung mit folgendem Link: ${portal_url}"
-
-#: ./profiles/default/types/EasyNewsletter.xml
-msgid "Criteria"
-msgstr "Kriterium"
-
-#: ./browser/enl_subscribers_view.pt:127
-msgid "Delete"
-msgstr "Löschen"
-
-#: ./browser/templates/enl_actions_viewlet.pt:7
-msgid "Drafts"
-msgstr "Entwürfe"
-
-#: ./portlets/subscriber.pt:66
-msgid "E-Mail"
-msgstr ""
-
-#. Default: "If checked, the newsletter/mailing will not be send                     to all external subscribers inside the newsletter."
-#: ./content/ENLIssue.py:84
-msgid "EasyNewsletter_ENLIssue_help_excludeAllSubscribers"
-msgstr "Externe Abonnenten vom Versand ausschliessen."
-
-#. Default: "Choose Plone Groups which members should                         receive the newsletter."
-#: ./content/ENLIssue.py:132
-msgid "EasyNewsletter_ENLIssue_help_ploneReceiverGroups"
-msgstr "Wählen Sie die Plone Gruppen, die den Newsletter erhalten sollen."
-
-#. Default: "Choose Plone Members which should receive                         the newsletter."
-#: ./content/ENLIssue.py:115
-msgid "EasyNewsletter_ENLIssue_help_ploneReceiverMembers"
-msgstr "Wählen Sie die Plone-Benutzer, die den Newsletter erhalten sollen."
-
-#. Default: "If checked, the newsletter/mailing is send to all                     plone members."
-#: ./content/ENLIssue.py:99
-msgid "EasyNewsletter_ENLIssue_help_sendToAllPloneMembers"
-msgstr "An alle Plone-Benutzer"
-
-#. Default: "Text used for confirmation email subject. You can                     customize the text, but it should include the                     placeholder: ${portal_url}!"
-#: ./content/EasyNewsletter.py:305
-msgid "EasyNewsletter_description_subscriber_confirmation_mail_subject"
-msgstr "Betreff der Bestätigungsmail. Sie sollten den Platzhalter ${portal_url} verwenden! "
-
-#. Default: "Enable sendbutton"
-#: ./browser/issue_send_form.pt:113
-msgid "EasyNewsletter_enablesendbutton_label"
-msgstr "Aktiviere Sende-Knopf"
-
-#: ./content/ENLIssue.py:185
-msgid "EasyNewsletter_help_acquireCriteria"
-msgstr "Kriterien erben"
-
-#. Default: "Some packages provide an external delivery service                     for EasyNewsletter. If one is installed you can choose                     it here."
-#: ./content/EasyNewsletter.py:264
-msgid "EasyNewsletter_help_externalDeliveryService"
-msgstr "Einige Erweiterungen stellen externe Newsletter-Zustelldienste bereit. Wenn eine Erweiterung installiert ist, kann sie hier ausgewählt werden."
-
-#. Default: "Some packages provide an external subscriber source                     for EasyNewsletter. If one is installed you can                     choose it here."
-#: ./content/EasyNewsletter.py:245
-msgid "EasyNewsletter_help_externalSubscriberSource"
-msgstr "Einige Erweiterungen stellen externe Newsletter-Abonnenten-Quellen bereit. Wenn eine Erweiterung installiert ist, kann sie hier ausgewählt werden."
-
-#. Default: "This will be used if the subscriber has no fullname."
-#: ./content/EasyNewsletter.py:107
-msgid "EasyNewsletter_help_fullname_fallback"
-msgstr "Dieser Text wird verwendet sofern der Abonnent keinen Namen gespeichert hat."
-
-#: ./content/ENLSubscriber.py:56
-msgid "EasyNewsletter_help_name_prefix"
-msgstr "z.B. Titel (Dr.)"
-
-#. No translation needed
-#: ./content/ENLSubscriber.py:44
-msgid "EasyNewsletter_help_nl_language"
-msgstr ""
-
-#. Default: "Choose Plone Groups which members should                     receive the newsletter. Changing this setting does not                     affect already existing issues."
-#: ./content/EasyNewsletter.py:226
-msgid "EasyNewsletter_help_ploneReceiverGroups"
-msgstr "Wählen Sie die Plone-Gruppen aus, deren Mitglieder den Newsletter erhalten sollen."
-
-#. Default: "Choose Plone Members which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: ./content/EasyNewsletter.py:209
-msgid "EasyNewsletter_help_ploneReceiverMembers"
-msgstr "Wählen Sie hier die Plone-Nutzer aus, die den Newsletter erhalten sollen."
-
-#. No translation needed
-#: ./content/ENLSubscriber.py:30
-msgid "EasyNewsletter_help_salutation"
-msgstr ""
-
-#. Default: "Define here possible salutations for subscriber.                     One salutation per line in the form of: \"mr|Dear Mr.\".                     The left hand value \"mr\" or \"ms\" is mapped to salutation                     of each subscriber and then the right hand value, which                     you can customize is used as salutation."
-#: ./content/EasyNewsletter.py:89
-msgid "EasyNewsletter_help_salutations"
-msgstr "Hier können Sie verschiedene Anredeformen definieren. Eine Anrede pro Zeile in der folgenden Form: \"mr|Dear Mr.\". \"mr\" ist dabei der Anrede-Schlüssel und darf nicht verändert werden. Der rechte Teil \"Dear Mr.\" wird als Anrede verwendet. Eine Zeile kann z.B. \"ms|Sehr geehrte Frau\" sein."
-
-#. Default: "Default for the sender address of the newsletters."
-#: ./content/EasyNewsletter.py:47
-msgid "EasyNewsletter_help_senderEmail"
-msgstr "Standard Absender-Adresse des Newsletters."
-
-#. Default: "Sender address of the newsletter email. If you let this field empty, the default sender email address will be used."
-#: ./browser/issue_send_form.pt:54
-msgid "EasyNewsletter_help_senderEmailForm"
-msgstr "Absenderadresse der Newsletters-E-Mail. Falls Sie dieses Feld frei lassen, wird die voreingestellte E-Mail-Adresse verwendet."
-
-#. Default: "Default for the sender name of the newsletters."
-#: ./content/EasyNewsletter.py:60
-msgid "EasyNewsletter_help_senderName"
-msgstr "Standard Absender-Name des Newsletters."
-
-#. Default: "Sender name of the newsletter email. If you let this field empty, the default sender name will be used."
-#: ./browser/issue_send_form.pt:36
-msgid "EasyNewsletter_help_senderNameForm"
-msgstr "Absendername der Newsletters-E-Mail. Falls Sie dieses Feld frei lassen, wird der voreingestellte Name verwendet."
-
-#. Default: "Subject of the newsletter email. If you let this field empty, the title of the newsletter will be used."
-#: ./browser/issue_send_form.pt:72
-msgid "EasyNewsletter_help_subject"
-msgstr "Thema der Newsletter-E-Mail. Falls Sie dieses Feld frei lassen, wird der Titel des Newsletters verwendet."
-
-#. Default: "Template, to generate the newsletter."
-#: ./content/ENLIssue.py:203
-msgid "EasyNewsletter_help_template"
-msgstr "Template für die automatische Aggregierung von Inhalten."
-
-#. Default: "Default for the test email address."
-#: ./content/EasyNewsletter.py:75
-msgid "EasyNewsletter_help_testEmail"
-msgstr "Standard Test-E-Mail-Adresse"
-
-#. Default: "Test email. If you let this field empty, the default test email address will be used."
-#: ./browser/issue_send_form.pt:90
-msgid "EasyNewsletter_help_testreceiverForm"
-msgstr "E-Mail-Adresse, die zum Test des Newsletters verwendet wird. Falls Sie diese Feld leer lassen, wird die voreingestellt E-Mail-Adresse verwendet."
-
-#. Default: "This will replace the placeholder [[UNSUBSCRIBE]]."
-#: ./content/EasyNewsletter.py:122
-msgid "EasyNewsletter_help_unsubscribe_string"
-msgstr "Dieser Text wird anstelle des Platzhalters [[UNSUBSCRIBE]] in die Email eingefügt."
-
-#. Default: "Default Plone Mailhost"
-#: ./content/EasyNewsletter.py:529
-msgid "EasyNewsletter_label_PloneMailHost"
-msgstr "Standard PloneMailHost"
-
-#. Default: "Footer"
-#: ./content/EasyNewsletter.py:159
-msgid "EasyNewsletter_label_default_footer"
-msgstr "Fusszeile"
-
-#. Default: "Header"
-#: ./content/EasyNewsletter.py:138
-msgid "EasyNewsletter_label_default_header"
-msgstr "Kopfzeile"
-
-#. Default: "Email"
-#: ./content/ENLSubscriber.py:95
-msgid "EasyNewsletter_label_email"
-msgstr "E-Mail"
-
-#. Default: "External delivery service"
-#: ./content/EasyNewsletter.py:261
-msgid "EasyNewsletter_label_externalDeliveryService"
-msgstr "Externer Newsletter-Zustelldienst"
-
-#. Default: "External subscriber source"
-#: ./content/EasyNewsletter.py:242
-msgid "EasyNewsletter_label_externalSubscriberSource"
-msgstr "Externe Newsletter-Abonnentenquelle"
-
-#. Default: "First Name"
-#: ./content/ENLSubscriber.py:65
-msgid "EasyNewsletter_label_firstname"
-msgstr "Vorname"
-
-#. Default: "Footer"
-#: ./content/ENLIssue.py:171
-msgid "EasyNewsletter_label_footer"
-msgstr "Fusszeilen"
-
-#. Default: "Fallback for subscribers without a name."
-#: ./content/EasyNewsletter.py:104
-msgid "EasyNewsletter_label_fullname_fallback"
-msgstr "Ersatz für Abonnenten ohne Namen"
-
-#. Default: "Header"
-#: ./content/ENLIssue.py:151
-msgid "EasyNewsletter_label_header"
-msgstr "Kopfzeilen"
-
-#. Default: "Newsletter language"
-#: ./content/ENLSubscriber.py:41
-msgid "EasyNewsletter_label_help_nl_language"
-msgstr "Sprache"
-
-#. Default: "Last Name"
-#: ./content/ENLSubscriber.py:74
-msgid "EasyNewsletter_label_lastname"
-msgstr "Nachname"
-
-#. Default: "Name Prefix"
-#: ./content/ENLSubscriber.py:54
-msgid "EasyNewsletter_label_name_prefix"
-msgstr "Namensprefix"
-
-#. Default: "no external subscriber source"
-#: ./content/EasyNewsletter.py:520
-msgid "EasyNewsletter_label_noSource"
-msgstr "keine externen Quellen für Abonnenten"
-
-#. Default: "Organization"
-#: ./content/ENLSubscriber.py:83
-msgid "EasyNewsletter_label_organization"
-msgstr "Organisation"
-
-#. Default: "Plone Groups to receive the newsletter"
-#: ./content/ENLIssue.py:129
-#: ./content/EasyNewsletter.py:223
-msgid "EasyNewsletter_label_ploneReceiverGroups"
-msgstr "Plone Gruppen für den Newsletterempfang"
-
-#. Default: "Plone Members to receive the newsletter"
-#: ./content/ENLIssue.py:112
-#: ./content/EasyNewsletter.py:206
-msgid "EasyNewsletter_label_ploneReceiverMembers"
-msgstr "Plone Nutzer für den Newsletterempfang"
-
-#. Default: "Salutation"
-#: ./content/ENLSubscriber.py:27
-msgid "EasyNewsletter_label_salutation"
-msgstr "Anrede"
-
-#. Default: "Subscriber Salutations."
-#: ./content/EasyNewsletter.py:86
-msgid "EasyNewsletter_label_salutations"
-msgstr "Anrede"
-
-#. Default: "Sender email"
-#: ./browser/issue_send_form.pt:49
-#: ./content/EasyNewsletter.py:44
-msgid "EasyNewsletter_label_senderEmail"
-msgstr "E-Mail des Absenders"
-
-#. Default: "Sender name"
-#: ./browser/issue_send_form.pt:31
-#: ./content/EasyNewsletter.py:57
-msgid "EasyNewsletter_label_senderName"
-msgstr "Name des Absenders"
-
-#. Default: "Subject"
-#: ./browser/issue_send_form.pt:67
-msgid "EasyNewsletter_label_subject"
-msgstr "Betreff"
-
-#. Default: "Subscriber confirmation mail subject"
-#: ./content/EasyNewsletter.py:302
-msgid "EasyNewsletter_label_subscriber_confirmation_mail_subject"
-msgstr "Betreff der Bestätigungsmail"
-
-#. Default: "Subscriber confirmation mail text"
-#: ./content/EasyNewsletter.py:322
-msgid "EasyNewsletter_label_subscriber_confirmation_mail_text"
-msgstr "Text der Bestätigungsmail"
-
-#. Default: "Newsletter Template"
-#: ./content/ENLIssue.py:200
-msgid "EasyNewsletter_label_template"
-msgstr "Inhaltsaggregierungs-Template"
-
-#. Default: "Test email"
-#: ./content/EasyNewsletter.py:72
-msgid "EasyNewsletter_label_testEmail"
-msgstr "Test E-Mail-Adresse"
-
-#. Default: "Test email"
-#: ./browser/issue_send_form.pt:85
-msgid "EasyNewsletter_label_testreceiver"
-msgstr "Empfänger des Test-Newsletters"
-
-#. Default: "Text"
-#: ./content/ENLIssue.py:67
-msgid "EasyNewsletter_label_text"
-msgstr ""
-
-#. Default: "Title"
-#: ./content/ENLSubscriber.py:17
-msgid "EasyNewsletter_label_title"
-msgstr "Titel"
-
-#. Default: "Text for the 'unsubscribe' link"
-#: ./content/EasyNewsletter.py:119
-msgid "EasyNewsletter_label_unsubscribe_string"
-msgstr "Text für den Newsletterabmelde-Link"
-
-#: ./profiles/default/types/ENLIssue.xml
-#: ./profiles/default/types/ENLSubscriber.xml
-#: ./profiles/default/types/ENLTemplate.xml
-msgid "Edit"
-msgstr "Bearbeiten"
-
-#: ./portlets/subscriber.py:164
-msgid "Edit Newsletter portlet"
-msgstr "Newsletter-Portlet bearbeiten"
-
-#: ./browser/upload_csv.pt:40
-msgid "Email"
-msgstr "E-Mail"
-
-#: ./profiles/default/types/ENLSubscriber.xml
-#: ./profiles/default/types/ENLTemplate.xml
-msgid "External Edit"
-msgstr ""
-
-#: ./browser/upload_csv.pt:37
-#: ./portlets/subscriber.pt:49
-msgid "First Name"
-msgstr "Vorname"
-
-#: ./profiles/default/types/ENLSubscriber.xml
-#: ./profiles/default/types/ENLTemplate.xml
-msgid "History"
-msgstr ""
-
-#: ./browser/upload_csv.pt:28
-msgid "Import"
-msgstr ""
-
-#: ./profiles/default/types/ENLIssue.xml
-msgid "Issue"
-msgstr "Ausgabe"
-
-#: ./browser/templates/enl_actions_viewlet.pt:3
-msgid "Issue archive"
-msgstr "Archiv der Newsletter-Ausgaben"
-
-#: ./browser/templates/enl_actions_viewlet.pt:7
-msgid "Issue drafts"
-msgstr "Newsletter Entwürfe"
-
-#: ./browser/templates/enl_actions_viewlet.pt:11
-msgid "Issue masters"
-msgstr "Muster"
-
-msgid "Issues full view"
-msgstr ""
-
-#: ./browser/upload_csv.pt:39
-msgid "Language"
-msgstr "Sprache"
-
-#: ./browser/upload_csv.pt:38
-msgid "Last Name"
-msgstr "Nachname"
-
-#: ./profiles/default/types/EasyNewsletter.xml
-msgid "Manage aggregation templates"
-msgstr "Aggregierungstemplates verwalten"
-
-#: ./browser/templates/enl_actions_viewlet.pt:11
-msgid "Masters"
-msgstr "Muster"
-
-#: ./profiles/default/types/EasyNewsletter.xml
-msgid "Newsletter"
-msgstr ""
-
-#: ./portlets/subscriber.py:119
-msgid "Newsletter subscriber portlet"
-msgstr "Newsletter-Abo-Portlet"
-
-#: ./browser/subscribers.py:241
-msgid "No file specified."
-msgstr "Es wurde keine Datei angegeben!"
-
-#: ./browser/subscribers.py:203
-msgid "No subscriber selected!"
-msgstr "Es wurde kein Abonnent ausgewählt!"
-
-#: ./browser/upload_csv.pt:41
-msgid "Organization"
-msgstr "Organisation"
-
-#: ./browser/registration.py:78
-msgid "Please enter a valid email address."
-msgstr "Bitte geben Sie eine gültige Email-Adresse ein."
-
-#: ./browser/upload_csv.pt:89
-msgid "Prefix"
-msgstr ""
-
-#: ./browser/upload_csv.pt:95
-msgid "Reason for failure"
-msgstr "Fehlerursache"
-
-#: ./profiles/default/types/ENLSubscriber.xml
-#: ./profiles/default/types/ENLTemplate.xml
-msgid "References"
-msgstr "Verweise"
-
-#: ./browser/upload_csv.pt:36
-msgid "Salutation"
-msgstr "Anrede"
-
-#: ./browser/enl_subscribers_view.pt:42
-msgid "Search"
-msgstr "Suche"
-
-#: ./browser/upload_csv.pt:58
-msgid "Select your CSV file here."
-msgstr "Wählen Sie eine CSV-Datei aus."
-
-msgid "Sent"
-msgstr "Gesendet"
-
-#: ./profiles/default/types/EasyNewsletter.xml
-msgid "Subfolders"
-msgstr "Unterkollektionen"
-
-#: ./profiles/default/types/ENLSubscriber.xml
-msgid "Subscriber"
-msgstr "Abonnent"
-
-#: ./browser/enl_subscribers_view.pt:35
-msgid "Subscriber Search"
-msgstr "Abonnentensuche"
-
-#: ./browser/templates/enl_actions_viewlet.pt:15
-msgid "Subscriberlist"
-msgstr "Liste der Newsletter-Abonnenten"
-
-#: ./browser/templates/enl_actions_viewlet.pt:15
-msgid "Subscribers"
-msgstr "Abonnenten"
-
-#: ./profiles/default/types/ENLTemplate.xml
-msgid "Template"
-msgstr "Vorlage"
-
-#: ./browser/upload_csv.pt:32
-msgid "The CSV file must contain the header and follow this format"
-msgstr "Die CSV-Datei muss Kopfzeilen im folgenden Format enthalten!"
-
-#: ./browser/issue.py:44
-msgid "The issue sending has been initiated in the background."
-msgstr "Der Newsletterversand wurde im Hintergrund gestartet."
-
-#: ./browser/issue.py:35
-msgid "The issue test sending has been initiated."
-msgstr "Der Newslettertestversand wurde gestartet."
-
-#: ./browser/subscribers.py:263
-msgid "The number of items in the line is not correct.                         It should be 7. Check your CSV file."
-msgstr ""
-
-#: ./browser/enl_subscribers_view.pt:64
-msgid "There are ${subscribers_count} subscribers"
-msgstr "Es sind ${subscribers_count} Abonnenten eingetragen"
-
-#: ./browser/subscribers.py:277
-msgid "This email address is already registered."
-msgstr "Diese E-Mail-Adresse wurde bereits eingetragen!"
-
-#: ./portlets/subscriber.py:165
-msgid "This portlet displays the subscriber add form of a newsletter."
-msgstr "Dieses Portlet ist ein Bestellformular für einen Newsletter."
-
-#: ./portlets/subscriber.pt:44
-msgid "Title"
-msgstr "Titel"
-
-#: ./portlets/subscriber.py:16
-msgid "Title for the portlet."
-msgstr "Titel des Portlets"
-
-#: ./profiles/default/types/ENLIssue.xml
-#: ./profiles/default/types/ENLSubscriber.xml
-#: ./profiles/default/types/ENLTemplate.xml
-msgid "View"
-msgstr "Ansicht"
-
-#: ./browser/registration.py:239
-msgid "We send you an email, please confirm this unsubscription."
-msgstr "Wir haben Ihnen eine E-Mail mit einem Abmeldelink geschickt."
-
-#: ./browser/subscribers.py:253
-msgid "Wrong specification of the CSV file. Please correct it and retry."
-msgstr "Falsche Spezifikation der CSV-Datei. Bitte korrigieren Sie den Fehler und versuchen es noch einmal."
-
-#: ./browser/registration.py:265
-msgid "You have been unsubscribed."
-msgstr "Sie haben den Newsletter abbestellt."
-
-#: ./browser/templates/unsubscribe_form.pt:16
-msgid "You want to unsubscribe from this Newsletter?"
-msgstr "Sie möchten das Newsletter Abonnement kündigen?"
-
-#: ./browser/registration.py:245
-msgid "Your email address could not be found in subscribers."
-msgstr "Wir konnten Ihre E-Mail-Adresse nicht in den Abonnenten dieses Newsletters finden."
-
-#: ./browser/registration.py:90
-msgid "Your email address is already registered."
-msgstr "Ihre Email-Adresse wurde bereits registriert."
-
-#: ./browser/registration.py:130
-msgid "Your email has been registered.                 A confirmation email was sent to your address. Please check                 your inbox and click on the link in the email in order to                 confirm your subscription."
-msgstr "Ihre E-Mail-Adresse wurde eingetragen. Sie erhalten eine Bestätigungs-E-Mail. Bitte aktivieren Sie Ihr Abonnenment, in dem Sie auf den Link in der Bestätigungs-E-Mail klicken."
-
-#: ./browser/templates/unsubscribe_form.pt:19
-msgid "Your registered E-Mail address:"
-msgstr "Ihre eingetragenen E-Mail-Adresse:"
-
-#: ./browser/registration.py:154
-msgid "Your subscription was successfully confirmed."
-msgstr "Ihr Newsletter-Abonnement wurde erfolgreich bestätigt."
-
-#. Default: "Action"
-#: ./browser/enl_subscribers_view.pt:82
-msgid "action"
-msgstr "Aktion"
-
-#. Default: "Add subscriber"
-#: ./browser/enl_subscribers_view.pt:32
-msgid "add_subscriber"
-msgstr "Abonnent hinzufügen"
-
-#: ./browser/templates/unsubscribe_form.pt:25
-msgid "cancel"
-msgstr "Abbrechen"
-
-#: ./browser/registration.py:235
-msgid "confirm newsletter unsubscription"
-msgstr "Newsletter-Abmeldung bestätigen"
-
-#. Default: "The footer will included in outgoing mails."
-#: ./content/ENLIssue.py:172
-msgid "description_help_footer"
-msgstr "Dieser Text wird am Ende des Newsletter angehängt."
-
-#. Default: "The header will included in outgoing mails."
-#: ./content/ENLIssue.py:154
-msgid "description_help_header"
-msgstr "Dieser Text wird dem Newsletter vorangestellt."
-
-#. Default: "This folder has no visible items. To add content, press the add button, or paste content from another location."
-#: ./skins/EasyNewsletter/enl_subtopics.pt:57
-msgid "description_no_visible_items_add_paste"
-msgstr "Dieser Ordner enhält keine Einträge"
-
-#. Default: "Text used for confirmation email. You can customize                     the text, but it should include the placeholders:                     ${portal_url}, ${subscriber_email} and                     ${confirmation_url}!"
-#: ./content/EasyNewsletter.py:325
-msgid "description_subscriber_confirmation_mail_text"
-msgstr "Text der Bestätigungsmail. Sie können den Text anpassen, er sollte aber die Platzhalter ${portal_url}, ${subscriber_email} und ${confirmation_url} enthalten!"
-
-#. Default: "This is used in the frontpage of EasyNewsletter             on top of Issue archive list."
-#: ./content/EasyNewsletter.py:339
-msgid "description_text"
-msgstr "Dieser Text wird auf der Startseite des Newsletters über der Liste der Ausgaben angezeigt."
-
-#. Default: "The default footer text. This is used as a default                     for new issues. You can use the placeholders                     [[SUBSCRIBER_SALUTATION]] and [[UNSUBSCRIBE]] here."
-#: ./content/EasyNewsletter.py:160
-msgid "description_text_footer"
-msgstr "Der Standard-Seitenfuß. Er wird als Vorlage für neue Ausgaben verwendet."
-
-#. Default: "The default header text. This is used as a default                     for new issues. You can use the placeholders                     [[SUBSCRIBER_SALUTATION]] and [[UNSUBSCRIBE]] here."
-#: ./content/EasyNewsletter.py:141
-msgid "description_text_header"
-msgstr "Der Standard Seitenanfang. Er wird als Vorlage für neue Ausgaben verwendet."
-
-#. Default: "The main content of the mailing. You can use                     the topic criteria to collect content or put manual                     content in. This will included in outgoing mails."
-#: ./content/ENLIssue.py:68
-msgid "description_text_issue"
-msgstr "Der Haupttext des Newsletters. Sie können die Kritierien verwenden um Inhalte der Webseite zu sammeln oder Inhalt von Hand einfügen. Dies ist Teil der verschickten Mails."
-
-#. Default: "Save & Update"
-#: ./skins/EasyNewsletter/NewsletterTemplateWidget.pt:22
-msgid "easycms_saveupdate_label"
-msgstr "Sichern und Aktualisieren"
-
-#. Default: "Back to newsletter"
-#: ./browser/issue_send_form.pt:18
-#: ./skins/EasyNewsletter/enl_drafts_view.pt:23
-#: ./skins/EasyNewsletter/enl_masters_view.pt:23
-msgid "easynewsletter_backtonewsletter_label"
-msgstr "Zurück zum Newsletter"
-
-#. Default: "subscribe"
-#: ./portlets/subscriber.pt:71
-msgid "easynewsletter_button_label"
-msgstr "Abonnieren"
-
-#. Default: "Drafts"
-#: ./skins/EasyNewsletter/enl_drafts_view.pt:20
-msgid "easynewsletter_drafts_label"
-msgstr "Entwürfe"
-
-#. Default: "Export subscribers"
-#: ./browser/enl_subscribers_view.pt:146
-msgid "easynewsletter_label_export_subscribers"
-msgstr "Abonnenten exportieren"
-
-#. Default: "Import subscribers"
-#: ./browser/enl_subscribers_view.pt:143
-msgid "easynewsletter_label_import_subscribers"
-msgstr "Abonnenten importieren"
-
-#. Default: "Masters"
-#: ./skins/EasyNewsletter/enl_masters_view.pt:20
-msgid "easynewsletter_masters_label"
-msgstr "Muster"
-
-#. Default: "The newsletter was already sent."
-#: ./browser/issue_send_form.pt:127
-msgid "easynewsletter_newslettersent_label"
-msgstr "Dieser Newsletter wurde bereits versandt."
-
-#. Default: "There are no issues."
-#: ./skins/EasyNewsletter/easynewsletter_view.pt:49
-msgid "easynewsletter_non_issues_label"
-msgstr "Es gibt keine Ausgaben."
-
-#. Default: "There are no drafts."
-#: ./skins/EasyNewsletter/enl_drafts_view.pt:30
-msgid "easynewsletter_nondrafts_label"
-msgstr "Es gibt keine Entwürfe."
-
-#. Default: "There are no masters."
-#: ./skins/EasyNewsletter/enl_masters_view.pt:30
-msgid "easynewsletter_nonmasters_label"
-msgstr "Es gibt keine Muster."
-
-#. Default: "There are no subscribers."
-#: ./browser/enl_subscribers_view.pt:50
-msgid "easynewsletter_nosubscribers_label"
-msgstr "Es gibt keine Abonnenten."
-
-#. Default: "There are no templates."
-#: ./skins/EasyNewsletter/enl_templates_view.pt:28
-msgid "easynewsletter_notemplates_label"
-msgstr "Es gibt keine Schablonen."
-
-#. Default: "Send Newsletter"
-#: ./browser/issue_send_form.pt:118
-msgid "easynewsletter_send_button"
-msgstr "Newsletter versenden"
-
-#. Default: "Send Issue"
-#: ./browser/issue_send_form.pt:13
-msgid "easynewsletter_sendnewsletter_label"
-msgstr "Ausgabe versenden"
-
-#. Default: "Subscribers"
-#: ./browser/enl_subscribers_view.pt:20
-#: ./browser/upload_csv.pt:20
-msgid "easynewsletter_subcribers_label"
-msgstr "Abonnenten"
-
-#. Default: "Templates"
-#: ./skins/EasyNewsletter/enl_templates_view.pt:21
-msgid "easynewsletter_templates_label"
-msgstr "Schablonen"
-
-#. Default: "Test Newsletter"
-#: ./browser/issue_send_form.pt:100
-msgid "easynewsletter_test_button"
-msgstr "Newsletter testen"
-
-#. Default: "Unsubscribe"
-#: ./browser/templates/unsubscribe_form.pt:23
-msgid "easynewsletter_unsubscribe_button"
-msgstr "Abonnement kündigen"
-
-#: ./browser/subscribers.py:95
-msgid "email"
-msgstr "E-Mail"
-
-#. Default: "Your email has been registered. A confirmation email was sent to your address. Please check your inbox and click  on the link in the email in order to confirm your subscription."
-#: ./config.py:30
-msgid "email_added"
-msgstr "Ihre E-Mail-Adresse wurde eingetragen, bitte über prüfen Sie Ihren posteingang und bestätigen Sie die Anmeldung."
-
-#. Default: "Your email address is already registered."
-#: ./config.py:39
-msgid "email_exists"
-msgstr "Ihre E-Mail-Adresse wurde bereits eingetragen."
-
-msgid "enl_action_subscribers"
-msgstr ""
-
-#. Default: "First Name"
-#: ./browser/subscribers.py:92
-msgid "firstname"
-msgstr "Vorname"
-
-#. Default: "First Name"
-#: ./browser/enl_subscribers_view.pt:77
-msgid "firstname_listing"
-msgstr "Vorname"
-
-#. Default: "Up one level"
-#: ./skins/EasyNewsletter/enl_subtopics.pt:40
-msgid "go_to_parent_url"
-msgstr "Eine Ebene höher"
-
-#. Default: "This is a Zope Page Template file that is used for                      rendering the newsletter mail."
-#: ./content/ENLTemplate.py:19
-msgid "help_body_zpt"
-msgstr "Dieses Template wird für die Generierung des HTML-Newsletters versendet. Sie brauchen es nicht zu editieren, können aber die Ausgabe flexibel anpassen, wenn Sie die TAL (Zope's Template Attribute Language) beherschen."
-
-#. Default: "Enter a value for description."
-#: ./content/ENLTemplate.py:33
-msgid "help_description"
-msgstr "Bitte geben Sie eien Beschreibung ein."
-
-#. Default: "If checked, the newsletter/mailing will not be send                     to all subscribers inside the newsletter. Changing this                    setting does not affect already existing issues."
-#: ./content/EasyNewsletter.py:176
-msgid "help_excludeAllSubscribers"
-msgstr "Wenn aktiviert, werden alle lokalen Abonnenten vom Newsletterversand ausgeschlossen."
-
-#. Default: "This is a Zope Page Template used for rendering                         of the out going mail. You don't need to modify                         it, but if you know TAL (Zope's Template                         Attribute Language) you have the full power                         to customize your outgoing mails."
-#: ./content/EasyNewsletter.py:284
-msgid "help_mailtemplate_body_pt"
-msgstr "Dieses Template wird für die Generierung des HTML-Newsletters versendet. Sie brauchen es nicht zu editieren, können aber die Ausgabe flexibel anpassen, wenn Sie die TAL (Zope's Template Attribute Language) beherschen."
-
-#. Default: "Search for the accordingly newsletter, choose one and apply."
-#: ./portlets/subscriber.py:32
-msgid "help_newsletter_path"
-msgstr "Suchen sie den gewünschten Newsletter und wählen sie diesen aus."
-
-#. Default: "If checked, the newsletter/mailing is send to all                     plone members. If there are subscribers inside the                     newsletter, they get the letter anyway. Changing this                     setting does not affect already existing issues."
-#: ./content/EasyNewsletter.py:192
-msgid "help_sendToAllPloneMembers"
-msgstr "An alle Plone-Benutzer senden"
-
-#. Default: "Import / Export"
-#: ./browser/enl_subscribers_view.pt:141
-msgid "import_export"
-msgstr "Import / Export"
-
-#. Default: "Please enter a valid email address."
-#: ./config.py:37
-msgid "invalid_email"
-msgstr "Bitte geben Sie eine korrekte E-Mail-Adresse ein!"
-
-#. Default: "Please enter a valid email address."
-#: ./config.py:41
-msgid "invalid_hashkey"
-msgstr "Bitte geben Sie eine korrekte E-Mail-Adresse ein!"
-
-#. Default: "Issues"
-#: ./skins/EasyNewsletter/easynewsletter_view.pt:46
-msgid "issues_label"
-msgstr "Ausgaben"
-
-#. Default: "Newsletter Template"
-#: ./content/ENLTemplate.py:18
-msgid "label_body_zpt"
-msgstr "Newsletter Template"
-
-#. Default: "Choose language..."
-#: ./config.py:23
-msgid "label_choose_nl_language"
-msgstr "Sprache wählen"
-
-#. Default: "Choose salutation..."
-#: ./config.py:17
-msgid "label_choose_saluation"
-msgstr "Anrede wählen..."
-
-#. Default: "Description"
-#: ./content/ENLTemplate.py:32
-msgid "label_description"
-msgstr "Beschreibung"
-
-#. Default: "Exclude all external subscribers"
-#: ./content/ENLIssue.py:81
-msgid "label_excludeAllExternalSubscribers"
-msgstr "Externe Abonnenten vom Versand ausschliessen"
-
-#. Default: "Exclude all subscribers"
-#: ./content/EasyNewsletter.py:173
-msgid "label_excludeAllSubscribers"
-msgstr "Alle lokalen Abonnenten vom Versand ausschliessen"
-
-#. Default: "Inherit Criteria"
-#: ./content/ENLIssue.py:184
-msgid "label_inherit_criteria"
-msgstr "Kriterien übernehmen."
-
-#. Default: "Ask for the firstname as well"
-#: ./portlets/subscriber.py:55
-msgid "label_newletter_show_firstname"
-msgstr "Auch nach dem Vornamen fragen."
-
-#. Default: "Ask for the name of the subscriber"
-#: ./portlets/subscriber.py:48
-msgid "label_newletter_show_name"
-msgstr "Um den Nachnamen fragen"
-
-#. Default: "Ask for the name prefix (aka title) as well"
-#: ./portlets/subscriber.py:62
-msgid "label_newletter_show_name_prefix"
-msgstr "Auch nach Namensprefix (z.B. Titel) fragen."
-
-#. Default: "Display field to enter company/organization of subscriber"
-#: ./portlets/subscriber.py:69
-msgid "label_newletter_show_organization"
-msgstr "Feld 'Firma/Organisation' im Formular anzeigen'"
-
-#. Default: "Ask for the salutation of the subscriber"
-#: ./portlets/subscriber.py:41
-msgid "label_newletter_show_salutation"
-msgstr "Um die Anrede fragen"
-
-#. Default: "Display an unsubscribe link in portlet footer"
-#: ./portlets/subscriber.py:77
-msgid "label_newletter_show_unsubscribe_link"
-msgstr "Abmeldelink im Portlet zeigen"
-
-#. Default: "Path to Newsletter"
-#: ./portlets/subscriber.py:29
-msgid "label_newsletter_path"
-msgstr "Zugehöriger Newsletter"
-
-#. Default: "Outgoing Mail Template"
-#: ./content/EasyNewsletter.py:281
-msgid "label_out_template_pt"
-msgstr "Newsletter-Ausgabe-Template"
-
-#. Default: "DE"
-#: ./config.py:24
-msgid "label_salutation_de"
-msgstr ""
-
-#. Default: "EN"
-#: ./config.py:25
-msgid "label_salutation_en"
-msgstr ""
-
-#. Default: "FR"
-#: ./config.py:26
-msgid "label_salutation_fr"
-msgstr ""
-
-#. Default: "Mr."
-#: ./config.py:19
-msgid "label_salutation_mr"
-msgstr "Herr"
-
-#. Default: "Ms."
-#: ./config.py:18
-msgid "label_salutation_ms"
-msgstr "Frau"
-
-#. Default: "Select all items"
-#: ./skins/EasyNewsletter/enl_subtopics.pt:86
-msgid "label_select_all_items"
-msgstr "Alle Elemente auswählen"
-
-#. Default: "Send to all Plone members"
-#: ./content/ENLIssue.py:96
-#: ./content/EasyNewsletter.py:189
-msgid "label_sendToAllPloneMembers"
-msgstr "An allePlone-Benutzer senden"
-
-#. Default: "Description"
-#: ./portlets/subscriber.py:22
-msgid "label_subscriber_portlet_description"
-msgstr "Portlet Beschreibung"
-
-#. Default: "Language"
-#: ./browser/enl_subscribers_view.pt:79
-msgid "language"
-msgstr "Sprache"
-
-#. Default: "Last Name"
-#: ./browser/subscribers.py:93
-msgid "lastname"
-msgstr "Nachname"
-
-#. Default: "Last Name"
-#: ./browser/enl_subscribers_view.pt:78
-msgid "lastname_listing"
-msgstr "Nachname"
-
-#. Default: "Modified"
-#: ./skins/EasyNewsletter/enl_subtopics.pt:105
-msgid "listingheader_modified"
-msgstr "Bearbeitet"
-
-#. Default: "Order"
-#: ./skins/EasyNewsletter/enl_subtopics.pt:112
-msgid "listingheader_order"
-msgstr "Reihenfolge"
-
-#. Default: "Size"
-#: ./skins/EasyNewsletter/enl_subtopics.pt:102
-msgid "listingheader_size"
-msgstr "Größe"
-
-#. Default: "State"
-#: ./skins/EasyNewsletter/enl_subtopics.pt:108
-msgid "listingheader_status"
-msgstr "Status"
-
-#. Default: "Title"
-#: ./skins/EasyNewsletter/enl_subtopics.pt:98
-msgid "listingheader_title"
-msgstr "Titel"
-
-#. Default: "Email"
-#: ./browser/enl_subscribers_view.pt:74
-msgid "mail"
-msgstr "E-Mail"
-
-#. Default: "Mr"
-#: ./portlets/subscriber.pt:37
-msgid "mr"
-msgstr "Herr"
-
-#. Default: "Ms"
-#: ./portlets/subscriber.pt:30
-msgid "ms"
-msgstr "Frau"
-
-#. Default: "Name"
-#: ./portlets/subscriber.pt:54
-msgid "name"
-msgstr "Name"
-
-#. Default: "Prefix"
-#: ./browser/subscribers.py:91
-msgid "name_prefix"
-msgstr "Namensprefix"
-
-#. Default: "Prefix"
-#: ./browser/enl_subscribers_view.pt:76
-msgid "name_prefix_listing"
-msgstr ""
-
-#: ./browser/subscribers.py:94
-msgid "nl_language"
-msgstr "Sprache"
-
-#. Default: "Not imported subscribers"
-#: ./browser/upload_csv.pt:83
-msgid "not_created_subscribers"
-msgstr "Nicht importierte Abonnenten"
-
-#. Default: "Organization"
-#: ./browser/subscribers.py:96
-msgid "organization"
-msgstr "Organisation"
-
-#. Default: "Organization"
-#: ./browser/enl_subscribers_view.pt:80
-msgid "organization_listing"
-msgstr "Organisation"
-
-#. Default: "Organization"
-#: ./portlets/subscriber.pt:61
-msgid "organization_portlet"
-msgstr "Organisation"
-
-#. Default: "Salutation"
-#: ./browser/subscribers.py:90
-msgid "salutation"
-msgstr "Anrede"
-
-#. Default: "Salutation"
-#: ./browser/enl_subscribers_view.pt:75
-msgid "salutation_listing"
-msgstr "Anrede"
-
-#. Default: "Source"
-#: ./browser/enl_subscribers_view.pt:81
-msgid "source"
-msgstr "Quelle"
-
-#. Default: "Subtopics"
-#: ./skins/EasyNewsletter/enl_subtopics.pt:34
-msgid "sub_topics_label"
-msgstr "Unterkollektionen"
-
-#: ./browser/subscribers.py:210
-msgid "subscriber/s deleted successfully"
-msgstr "Abonnenten erfolgreich gelöscht"
-
-#. Default: "This search affects only local subscribers, not those coming from external sources."
-#: ./browser/enl_subscribers_view.pt:36
-msgid "subscribers_search_note"
-msgstr "Die Suche wirkt sich nur auf lokale Abonnenten aus, nicht auf Abonnenten von externen Quellen."
-
-#. Default: "Your subscription was successfully confirmed."
-#: ./config.py:43
-msgid "subscription_confirmed"
-msgstr "Ihre Anmeldung wurde erfolgreich bestätigt."
-
-#. Default: "Sucessfully created Subscribers"
-#: ./browser/upload_csv.pt:117
-msgid "sucessfully_created_subscribers"
-msgstr "Erfolgreich angelegte/aktualisierte Abonnenten"
-
-#. Default: "Content listing"
-#: ./skins/EasyNewsletter/enl_subtopics.pt:78
-msgid "summary_content_listing"
-msgstr "Inhalt"
-
-#. Default: "expired"
-#: ./skins/EasyNewsletter/enl_subtopics.pt:194
-msgid "time_expired"
-msgstr "Ablaufdatum"
-
-#. Default: "Move item down"
-#: ./skins/EasyNewsletter/enl_subtopics.pt:227
-msgid "title_move_item_down"
-msgstr "Eintrag nach unten"
-
-#. Default: "Move item up"
-#: ./skins/EasyNewsletter/enl_subtopics.pt:220
-msgid "title_move_item_up"
-msgstr "Eintrag nach oben"
-
-#: ./portlets/subscriber.pt:82
-msgid "unsubscribe"
-msgstr "Abonnement kündigen"
-
diff --git a/src/Products/EasyNewsletter/locales/de/LC_MESSAGES/Products.EasyNewsletter.po b/src/Products/EasyNewsletter/locales/de/LC_MESSAGES/Products.EasyNewsletter.po
index 845347ab..2e50ee22 100644
--- a/src/Products/EasyNewsletter/locales/de/LC_MESSAGES/Products.EasyNewsletter.po
+++ b/src/Products/EasyNewsletter/locales/de/LC_MESSAGES/Products.EasyNewsletter.po
@@ -49,8 +49,8 @@ msgstr "Abonnent hinzufügen"
 msgid "Allowed content aggregation types"
 msgstr "Erlaubte Inhaltstypen für die Inhaltsaggregierung"
 
-#: EasyNewsletter/browser/registration.py:304
-#: EasyNewsletter/views/newsletter_unsubscribe.py:39
+#: EasyNewsletter/browser/registration.py:302
+#: EasyNewsletter/views/newsletter_unsubscribe.py:38
 msgid "An error occured"
 msgstr "Ein Fehler ist aufgetreten"
 
@@ -83,7 +83,7 @@ msgstr ""
 msgid "Configuration for version 4005"
 msgstr ""
 
-#: EasyNewsletter/config.py:60
+#: EasyNewsletter/config.py:67
 msgid "Confirm your subscription on ${portal_url}"
 msgstr "Bitte bestätigen Sie Ihre Anmeldung mit folgendem Link: ${portal_url}"
 
@@ -95,7 +95,7 @@ msgstr "Inhaltstyp"
 msgid "Content types which will be visible in the Content aggregation sources reference field."
 msgstr "Inhaltstypen die im Feld "
 
-#: EasyNewsletter/content/newsletter_issue.py:76
+#: EasyNewsletter/content/newsletter_issue.py:73
 msgid "Customizations"
 msgstr "Anpassungen"
 
@@ -103,10 +103,6 @@ msgstr "Anpassungen"
 msgid "Date"
 msgstr "Datum"
 
-#: EasyNewsletter/tests/test_vocab_output_templates.py:31
-msgid "Default output template"
-msgstr ""
-
 #: EasyNewsletter/browser/enl_subscribers_view.pt:135
 #: EasyNewsletter/views/newsletter_subscribers.pt:151
 msgid "Delete"
@@ -121,152 +117,152 @@ msgid "E-Mail"
 msgstr ""
 
 #. Default: "Choose sources to aggregate newsletter content from."
-#: EasyNewsletter/content/newsletter.py:117
-#: EasyNewsletter/content/newsletter_issue.py:100
+#: EasyNewsletter/content/newsletter.py:115
+#: EasyNewsletter/content/newsletter_issue.py:97
 msgid "ENL_content_aggregation_sources_desc"
 msgstr "Quellen für die Inhaltsaggregation auswählen."
 
 #. Default: "Content aggregation sources"
-#: EasyNewsletter/content/newsletter.py:113
-#: EasyNewsletter/content/newsletter_issue.py:96
+#: EasyNewsletter/content/newsletter.py:111
+#: EasyNewsletter/content/newsletter_issue.py:93
 msgid "ENL_content_aggregation_sources_label"
 msgstr "Quellen für die Inhaltsaggregation"
 
 #. Default: "Text used for confirmation email subject. You can                 customize the text, but it should include the                 placeholder: ${portal_url}!"
-#: EasyNewsletter/content/newsletter.py:248
+#: EasyNewsletter/content/newsletter.py:246
 msgid "ENL_description_subscriber_confirmation_mail_subject"
 msgstr "Betreff für die Bestätigungs-E-Mail. Diese kann angepasst werden, sollte aber immer den Platzhalter ${portal_url} enthalten!"
 
 #. Default: "Text used for confirmation email. You can customize                 the text, but it should include the placeholders:                 ${portal_url}, ${subscriber_email} and                 ${confirmation_url}!"
-#: EasyNewsletter/content/newsletter.py:263
+#: EasyNewsletter/content/newsletter.py:261
 msgid "ENL_description_subscriber_confirmation_mail_text"
 msgstr "Text für die Bestätigungs-E-Mail. Diese kann angepasst werden, sollte aber immer die Platzhalter: ${portal_url}, ${subscriber_email} und ${confirmation_url} enthalten!"
 
 #. Default: "The default epilogue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:207
-#: EasyNewsletter/content/newsletter_issue.py:154
+#: EasyNewsletter/content/newsletter.py:205
+#: EasyNewsletter/content/newsletter_issue.py:151
 msgid "ENL_description_text_footer"
 msgstr "Der standard epilogue text. Dies wird verwendet für neue Newsletter-Ausgaben. Es können Platzhalter wie {{subscriber_salutation}} und {{unsubscribe}} verwendet werden."
 
 #. Default: "The default prologue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:194
-#: EasyNewsletter/content/newsletter_issue.py:141
+#: EasyNewsletter/content/newsletter.py:192
+#: EasyNewsletter/content/newsletter_issue.py:138
 msgid "ENL_description_text_header"
 msgstr "Der standard prolog text. Dies wird verwendet für neue Newsletter-Ausgaben. Es können Platzhalter wie {{subscriber_salutation}} und {{unsubscribe}} verwendet werden."
 
 #. Default: "If checked, the newsletter/mailing will not be send                  to all subscribers inside the newsletter. Changing this                 setting does not affect already existing issues."
-#: EasyNewsletter/content/newsletter.py:222
-#: EasyNewsletter/content/newsletter_issue.py:117
+#: EasyNewsletter/content/newsletter.py:220
+#: EasyNewsletter/content/newsletter_issue.py:114
 msgid "ENL_help_excludeAllSubscribers"
 msgstr "Alle Abonnenten vom Versandt ausschließen."
 
 #. Default: "This will be used if the subscriber has no fullname."
-#: EasyNewsletter/content/newsletter.py:148
+#: EasyNewsletter/content/newsletter.py:146
 msgid "ENL_help_fullname_fallback"
 msgstr "Dies wird verwendet, wenn der Abonnent keinen Nachnamen angegeben hat."
 
 #. Default: "Define here possible salutations for subscriber.                 One salutation per line in the form of: \"mr|Dear Mr.\".                 The left hand value \"mr\" or \"ms\" is mapped to salutation                 of each subscriber and then the right hand value, which                 you can customize is used as salutation."
-#: EasyNewsletter/content/newsletter.py:130
+#: EasyNewsletter/content/newsletter.py:128
 msgid "ENL_help_salutations"
 msgstr "Mögliche Anreden, ein je Zeil in der Form: \"mr|Sehr geehrter Herr.\". Der linke Wert \"mr\", \"ms\" oder \"mx\" wird auf die vom Abonnenten gewählte Anrede abgebildet und der entsprechende rechte Wert für die Anzeige verwendet. Bitte nur den rechten Wert anpassen!"
 
 #. Default: "Default for the sender address of the newsletters."
-#: EasyNewsletter/content/newsletter.py:81
+#: EasyNewsletter/content/newsletter.py:79
 msgid "ENL_help_senderEmail"
 msgstr "Standard Absender E-Mail"
 
 #. Default: "Default for the sender name of the newsletters."
-#: EasyNewsletter/content/newsletter.py:90
+#: EasyNewsletter/content/newsletter.py:88
 msgid "ENL_help_senderName"
 msgstr "Standard Abender Name"
 
 #. Default: "Default for the test email address."
-#: EasyNewsletter/content/newsletter.py:99
+#: EasyNewsletter/content/newsletter.py:97
 msgid "ENL_help_testEmail"
 msgstr "Standard Test-Email"
 
 #. Default: "This will replace the placeholder {{UNSUBSCRIBE}}."
-#: EasyNewsletter/content/newsletter.py:160
+#: EasyNewsletter/content/newsletter.py:158
 msgid "ENL_help_unsubscribe_string"
 msgstr "Dies wird den Platzhalter {{UNSUBSCRIBE}} ersetzen."
 
 #. Default: "Banner image, you can include in the templates by\n adding the {{banner}} placeholder into it. By default it should be 600x200 pixel."
-#: EasyNewsletter/content/newsletter.py:171
-#: EasyNewsletter/content/newsletter_issue.py:181
+#: EasyNewsletter/content/newsletter.py:169
+#: EasyNewsletter/content/newsletter_issue.py:178
 msgid "ENL_image_desc"
 msgstr "Banner-Bild, kann in templates mittels des Platzhalters {{banner}} eingebunden werden. Die Standardabmaße betragen 600x200 Pixel."
 
 #. Default: "Banner image"
-#: EasyNewsletter/content/newsletter.py:170
-#: EasyNewsletter/content/newsletter_issue.py:180
+#: EasyNewsletter/content/newsletter.py:168
+#: EasyNewsletter/content/newsletter_issue.py:177
 msgid "ENL_image_label"
 msgstr "Banner-Bild"
 
 #. Default: "Epilogue"
-#: EasyNewsletter/content/newsletter.py:206
-#: EasyNewsletter/content/newsletter_issue.py:153
+#: EasyNewsletter/content/newsletter.py:204
+#: EasyNewsletter/content/newsletter_issue.py:150
 msgid "ENL_label_default_footer"
 msgstr "Abspann"
 
 #. Default: "Prologue"
-#: EasyNewsletter/content/newsletter.py:193
-#: EasyNewsletter/content/newsletter_issue.py:140
+#: EasyNewsletter/content/newsletter.py:191
+#: EasyNewsletter/content/newsletter_issue.py:137
 msgid "ENL_label_default_header"
 msgstr "Einleitung"
 
 #. Default: "Exclude all subscribers"
-#: EasyNewsletter/content/newsletter.py:221
-#: EasyNewsletter/content/newsletter_issue.py:116
+#: EasyNewsletter/content/newsletter.py:219
+#: EasyNewsletter/content/newsletter_issue.py:113
 msgid "ENL_label_excludeAllSubscribers"
 msgstr "Alle Abonnenten vom Versand ausschließen"
 
 #. Default: "Fallback for subscribers without a name."
-#: EasyNewsletter/content/newsletter.py:144
+#: EasyNewsletter/content/newsletter.py:142
 msgid "ENL_label_fullname_fallback"
 msgstr "Ersatz für Abonnenten ohne Nachnahmen"
 
 #. Default: "Subscriber Salutations."
-#: EasyNewsletter/content/newsletter.py:129
+#: EasyNewsletter/content/newsletter.py:127
 msgid "ENL_label_salutations"
 msgstr "Abonnenten Anreden"
 
 #. Default: "Sender email"
-#: EasyNewsletter/content/newsletter.py:80
+#: EasyNewsletter/content/newsletter.py:78
 msgid "ENL_label_senderEmail"
 msgstr "Absender-E-Mail"
 
 #. Default: "Sender name"
-#: EasyNewsletter/content/newsletter.py:89
+#: EasyNewsletter/content/newsletter.py:87
 msgid "ENL_label_senderName"
 msgstr "Absendername"
 
 #. Default: "Subscriber confirmation mail subject"
-#: EasyNewsletter/content/newsletter.py:244
+#: EasyNewsletter/content/newsletter.py:242
 msgid "ENL_label_subscriber_confirmation_mail_subject"
 msgstr "Betreff der Abonnenten-E-Mail-Bestätigung"
 
 #. Default: "Subscriber confirmation mail text"
-#: EasyNewsletter/content/newsletter.py:259
+#: EasyNewsletter/content/newsletter.py:257
 msgid "ENL_label_subscriber_confirmation_mail_text"
 msgstr "Text der Abonnenten-E-Mail-Bestätigung"
 
 #. Default: "Test email"
-#: EasyNewsletter/content/newsletter.py:98
+#: EasyNewsletter/content/newsletter.py:96
 msgid "ENL_label_testEmail"
 msgstr "Test E-Mail-Adresse"
 
 #. Default: "Text for the 'unsubscribe' link"
-#: EasyNewsletter/content/newsletter.py:157
+#: EasyNewsletter/content/newsletter.py:155
 msgid "ENL_label_unsubscribe_string"
 msgstr "Text für den Abmeldelink"
 
 #. Default: "Logo image, you can include in the templates by\n adding the {{logo}} placeholder into it."
-#: EasyNewsletter/content/newsletter.py:183
+#: EasyNewsletter/content/newsletter.py:181
 msgid "ENL_logo_desc"
 msgstr "Logo-Bild, kann in templates mittels des Platzhalters {{logo}} eingebunden werden."
 
 #. Default: "Logo image"
-#: EasyNewsletter/content/newsletter.py:182
+#: EasyNewsletter/content/newsletter.py:180
 msgid "ENL_logo_label"
 msgstr "Logo-Bild"
 
@@ -281,13 +277,12 @@ msgid "EasyNewsletter_help_name_prefix"
 msgstr "z.B. Titel (Dr.)"
 
 #. Default: "Choose Plone Groups which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:70
-#, fuzzy
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:67
 msgid "EasyNewsletter_help_ploneReceiverGroups"
 msgstr "Wählen Sie die Plone-Gruppen aus, deren Mitglieder den Newsletter erhalten sollen."
 
 #. Default: "Choose Plone Members which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:54
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:51
 msgid "EasyNewsletter_help_ploneReceiverMembers"
 msgstr "Wählen Sie hier die Plone-Nutzer aus, die den Newsletter erhalten sollen."
 
@@ -346,12 +341,12 @@ msgid "EasyNewsletter_label_organization"
 msgstr "Organisation"
 
 #. Default: "Plone Groups to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:66
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:63
 msgid "EasyNewsletter_label_ploneReceiverGroups"
 msgstr "Plone Gruppen für den Newsletterempfang"
 
 #. Default: "Plone Members to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:50
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:47
 msgid "EasyNewsletter_label_ploneReceiverMembers"
 msgstr "Plone Nutzer für den Newsletterempfang"
 
@@ -400,7 +395,7 @@ msgstr "Newsletter-Portlet bearbeiten"
 msgid "Email"
 msgstr "E-Mail"
 
-#: EasyNewsletter/browser/subscribers.py:317
+#: EasyNewsletter/browser/subscribers.py:316
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:132
 msgid "Email existed, updated subscriber."
 msgstr "E-Mail-Adresse existierte, Abonnement aktualisiert."
@@ -423,10 +418,6 @@ msgstr "Fehlgeschlagen"
 msgid "First Name"
 msgstr "Vorname"
 
-#: EasyNewsletter/tests/test_vocab_aggregation_templates.py:31
-msgid "Generic Listing"
-msgstr "Generische Auflistung"
-
 #: EasyNewsletter/browser/upload_csv.pt:28
 #: EasyNewsletter/views/newsletter_subscribers_upload.pt:13
 msgid "Import"
@@ -448,10 +439,6 @@ msgstr "Newsletter Entwürfe"
 msgid "Issue masters"
 msgstr "Muster"
 
-#: EasyNewsletter/tests/test_vocab_plone_users.py:38
-msgid "Jane Doe - jane@plone.org"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:94
 msgid "Language"
 msgstr "Sprache"
@@ -465,17 +452,16 @@ msgstr "Nachname"
 msgid "Masters"
 msgstr "Muster"
 
-#: EasyNewsletter/browser/subscribers.py:293
+#: EasyNewsletter/browser/subscribers.py:292
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:108
 msgid "More than one subscriber with this email address existed, subscriber info was NOT updated. Check manually!"
 msgstr "Achtung, es existiert mehr als ein Abonnent mit dieser E-Mail-Adresse, bitte manuell prüfen!"
 
-#: EasyNewsletter/vocabularies/salutations.py:26
+#: EasyNewsletter/vocabularies/salutations.py:25
 msgid "Mr"
 msgstr "Herr"
 
-#: EasyNewsletter/tests/test_vocab_salutations.py:32
-#: EasyNewsletter/vocabularies/salutations.py:25
+#: EasyNewsletter/vocabularies/salutations.py:24
 msgid "Ms"
 msgstr "Frau"
 
@@ -491,7 +477,7 @@ msgstr "Newsletter-Ausgabe"
 msgid "Newsletter Subscriber"
 msgstr "Newsletter-Abonnent"
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:29
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:27
 msgid "Newsletter aggregation template"
 msgstr "Newsletter-Aggregations-Template"
 
@@ -503,7 +489,7 @@ msgstr "Newsletter-Kontainer welcher Ausgaben und Abonennten beinhaltet."
 msgid "Newsletter content successfully aggregated."
 msgstr "Newsletter-Inhalte erfolgreich aggregiert."
 
-#: EasyNewsletter/views/newsletter_issue_statistics.py:22
+#: EasyNewsletter/views/newsletter_issue_statistics.py:23
 msgid "Newsletter issue statistics have been reset."
 msgstr "Die Newsletterstatistik wurde zurück gesetzt."
 
@@ -511,17 +497,17 @@ msgstr "Die Newsletterstatistik wurde zurück gesetzt."
 msgid "Newsletter subscriber portlet"
 msgstr "Newsletter-Abo-Portlet"
 
-#: EasyNewsletter/views/newsletter_issue_send.py:201
+#: EasyNewsletter/views/newsletter_issue_send.py:205
 msgid "Newsletter was sent to ({0}) receivers. ({1}) errors occurred!{2}"
 msgstr "Der Newsletter wurde versendet an ({0}) Empfänger. ({1}) Fehler aufgetreten!{2}"
 
-#: EasyNewsletter/browser/subscribers.py:254
+#: EasyNewsletter/browser/subscribers.py:253
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:68
 msgid "No file specified."
 msgstr "Es wurde keine Datei angegeben!"
 
-#: EasyNewsletter/browser/subscribers.py:208
-#: EasyNewsletter/views/newsletter_subscribers.py:96
+#: EasyNewsletter/browser/subscribers.py:207
+#: EasyNewsletter/views/newsletter_subscribers.py:100
 msgid "No subscriber selected!"
 msgstr "Es wurde kein Abonnent ausgewählt!"
 
@@ -530,16 +516,16 @@ msgstr "Es wurde kein Abonnent ausgewählt!"
 msgid "Organization"
 msgstr "Organisation"
 
-#: EasyNewsletter/content/newsletter.py:61
+#: EasyNewsletter/content/newsletter.py:59
 msgid "Personalization"
 msgstr "Personalisierung"
 
-#: EasyNewsletter/browser/registration.py:195
+#: EasyNewsletter/browser/registration.py:193
 msgid "Please enter a valid email address."
 msgstr "Bitte geben Sie eine gültige Email-Adresse ein."
 
-#: EasyNewsletter/browser/registration.py:292
-#: EasyNewsletter/views/newsletter_unsubscribe.py:24
+#: EasyNewsletter/browser/registration.py:290
+#: EasyNewsletter/views/newsletter_unsubscribe.py:23
 msgid "Please use the correct unsubscribe url!"
 msgstr "Bitte einen gültigen Abmeldelink verwenden! "
 
@@ -572,7 +558,7 @@ msgstr ""
 msgid "Products.EasyNewsletter (4005)"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/plone_users.py:49
+#: EasyNewsletter/vocabularies/plone_users.py:47
 msgid "Property email: \"{0}\" is not an email!"
 msgstr ""
 
@@ -585,8 +571,8 @@ msgstr "Später lesen mit Pocket"
 msgid "Reason for failure"
 msgstr "Fehlerursache"
 
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:45
-#: EasyNewsletter/content/newsletter.py:76
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:42
+#: EasyNewsletter/content/newsletter.py:74
 msgid "Recipients"
 msgstr "Empfänger"
 
@@ -609,7 +595,7 @@ msgstr "Suche"
 msgid "Select your CSV file here."
 msgstr "Wählen Sie eine CSV-Datei aus."
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:24
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:22
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -622,7 +608,7 @@ msgstr ""
 msgid "Subscriber Search"
 msgstr "Abonnentensuche"
 
-#: EasyNewsletter/browser/subscribers.py:350
+#: EasyNewsletter/browser/subscribers.py:349
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:166
 msgid "Subscriber created."
 msgstr "Abonnenten angelegt"
@@ -646,7 +632,7 @@ msgstr "Erfolgreiche versendete E-Mails werden nicht erneut versendet, es sei de
 msgid "Tester"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:30
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:28
 msgid "The <a href=\"https://productseasynewsletter.readthedocs.io/en/latest/#aggregation-templates\">aggregation template</a> used by the Newsletter to render Collection items for the Newsletter."
 msgstr "Das <a href=\"https://productseasynewsletter.readthedocs.io/en/latest/#aggregation-templates\">Aggregations-Template</a> wird verwendet um die von der Kollektion gefundenen Inhalte zu rendern."
 
@@ -656,7 +642,7 @@ msgid "The CSV file must contain the header and follow this format"
 msgstr "Die CSV-Datei muss Kopfzeilen im folgenden Format enthalten!"
 
 #: EasyNewsletter/browser/issue.py:74
-#: EasyNewsletter/views/newsletter_issue_send.py:81
+#: EasyNewsletter/views/newsletter_issue_send.py:85
 msgid "The issue has been generated and sent to the mail server."
 msgstr "Die Newsletter-Ausgabe wurde generiert und an den E-Mail-Server übergeben."
 
@@ -665,11 +651,11 @@ msgid "The issue sending has been initiated in the background."
 msgstr "Der Newsletterversand wurde im Hintergrund gestartet."
 
 #: EasyNewsletter/browser/issue.py:55
-#: EasyNewsletter/views/newsletter_issue_send.py:62
+#: EasyNewsletter/views/newsletter_issue_send.py:66
 msgid "The issue test sending has been initiated."
 msgstr "Der Newslettertestversand wurde gestartet."
 
-#: EasyNewsletter/browser/subscribers.py:275
+#: EasyNewsletter/browser/subscribers.py:274
 msgid "The number of items in the line is not correct.                         It should be 7. Check your CSV file."
 msgstr "Die Anzahl der Zeilen stimmt nicht mit dem Import-Format überein!"
 
@@ -690,28 +676,24 @@ msgstr "Titel"
 msgid "Title for the portlet."
 msgstr "Titel des Portlets"
 
-#: EasyNewsletter/tests/test_vocab_plone_groups.py:35
-msgid "VIP"
-msgstr ""
-
 #: EasyNewsletter/profiles/default/types/Newsletter.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Issue.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Subscriber.xml
 msgid "View"
 msgstr "Ansicht"
 
-#: EasyNewsletter/browser/registration.py:272
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:48
+#: EasyNewsletter/browser/registration.py:270
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:58
 msgid "We send you an email, please confirm this unsubscription."
 msgstr "Wir haben Ihnen eine E-Mail mit einem Abmeldelink geschickt."
 
-#: EasyNewsletter/browser/subscribers.py:265
+#: EasyNewsletter/browser/subscribers.py:264
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:78
 msgid "Wrong specification of the CSV file. Please correct it and retry."
 msgstr "Falsche Spezifikation der CSV-Datei. Bitte korrigieren Sie den Fehler und versuchen es noch einmal."
 
-#: EasyNewsletter/browser/registration.py:307
-#: EasyNewsletter/views/newsletter_unsubscribe.py:46
+#: EasyNewsletter/browser/registration.py:305
+#: EasyNewsletter/views/newsletter_unsubscribe.py:45
 msgid "You have been unsubscribed."
 msgstr "Sie haben den Newsletter abbestellt."
 
@@ -719,16 +701,16 @@ msgstr "Sie haben den Newsletter abbestellt."
 msgid "You want to unsubscribe from this Newsletter?"
 msgstr "Sie möchten das Newsletter Abonnement kündigen?"
 
-#: EasyNewsletter/browser/registration.py:278
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:56
+#: EasyNewsletter/browser/registration.py:276
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:66
 msgid "Your email address could not be found in subscribers."
 msgstr "Wir konnten Ihre E-Mail-Adresse nicht in den Abonnenten dieses Newsletters finden."
 
-#: EasyNewsletter/browser/registration.py:95
+#: EasyNewsletter/browser/registration.py:93
 msgid "Your email address is already registered."
 msgstr "Ihre Email-Adresse wurde bereits registriert."
 
-#: EasyNewsletter/browser/registration.py:142
+#: EasyNewsletter/browser/registration.py:140
 msgid "Your email has been registered.                 A confirmation email was sent to your address. Please check                 your inbox and click on the link in the email in order to                 confirm your subscription."
 msgstr "Ihre E-Mail-Adresse wurde eingetragen. Sie erhalten eine Bestätigungs-E-Mail. Bitte aktivieren Sie Ihr Abonnenment, in dem Sie auf den Link in der Bestätigungs-E-Mail klicken."
 
@@ -736,7 +718,7 @@ msgstr "Ihre E-Mail-Adresse wurde eingetragen. Sie erhalten eine Bestätigungs-E
 msgid "Your registered E-Mail address:"
 msgstr "Ihre eingetragenen E-Mail-Adresse:"
 
-#: EasyNewsletter/browser/registration.py:191
+#: EasyNewsletter/browser/registration.py:189
 msgid "Your subscription was successfully confirmed."
 msgstr "Ihr Newsletter-Abonnement wurde erfolgreich bestätigt."
 
@@ -756,8 +738,8 @@ msgstr "Abonnent hinzufügen"
 msgid "cancel"
 msgstr "Abbrechen"
 
-#: EasyNewsletter/browser/registration.py:268
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:44
+#: EasyNewsletter/browser/registration.py:266
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:53
 msgid "confirm newsletter unsubscription"
 msgstr "Newsletter-Abmeldung bestätigen"
 
@@ -790,7 +772,6 @@ msgstr "Dieser Newsletter wurde bereits versandt."
 
 #. Default: "There are no issues in this archive."
 #: EasyNewsletter/views/newsletter.pt:17
-#, fuzzy
 msgid "easynewsletter_non_issues_label"
 msgstr "Es gibt keine Ausgaben."
 
@@ -854,34 +835,34 @@ msgid "easynewsletter_unsubscribe_button"
 msgstr "Abonnement kündigen"
 
 #. Default: "Your email has been registered. A confirmation email was sent to your address. Please check your inbox and click  on the link in the email in order to confirm your subscription."
-#: EasyNewsletter/config.py:37
+#: EasyNewsletter/config.py:39
 msgid "email_added"
 msgstr "Ihre E-Mail-Adresse wurde eingetragen, bitte über prüfen Sie Ihren posteingang und bestätigen Sie die Anmeldung."
 
 #. Default: "Your email address is already registered."
-#: EasyNewsletter/config.py:46
+#: EasyNewsletter/config.py:49
 msgid "email_exists"
 msgstr "Ihre E-Mail-Adresse wurde bereits eingetragen."
 
 #. Default: "Choose the template to render the email. "
-#: EasyNewsletter/content/newsletter.py:234
-#: EasyNewsletter/content/newsletter_issue.py:129
+#: EasyNewsletter/content/newsletter.py:232
+#: EasyNewsletter/content/newsletter_issue.py:126
 msgid "enl_help_output_template"
 msgstr "Wählen Sie das Ausgabe-Template, dieses bestimmt das Layout des Newsletters."
 
 #. Default: "If checked, the banner image defined on newsletter                     or on this issue will not be used."
-#: EasyNewsletter/content/newsletter_issue.py:169
+#: EasyNewsletter/content/newsletter_issue.py:166
 msgid "enl_issue_help_hide_image"
 msgstr "Wenn aktiv, wird das Banner-Bild vom Newsletter, nicht bei dieser Newsletterausgabe verwendet."
 
 #. Default: "Default output template"
-#: EasyNewsletter/vocabularies/output_templates.py:37
+#: EasyNewsletter/vocabularies/output_templates.py:36
 msgid "enl_label_default_output_template"
 msgstr "Standard Ausgabe-Template"
 
 #. Default: "Output template"
-#: EasyNewsletter/content/newsletter.py:233
-#: EasyNewsletter/content/newsletter_issue.py:128
+#: EasyNewsletter/content/newsletter.py:231
+#: EasyNewsletter/content/newsletter_issue.py:125
 msgid "enl_label_output_template"
 msgstr "Ausgabe-Template"
 
@@ -915,12 +896,12 @@ msgid "import_subscriber"
 msgstr "Abonnenten importieren"
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:44
+#: EasyNewsletter/config.py:46
 msgid "invalid_email"
 msgstr "Bitte geben Sie eine korrekte E-Mail-Adresse ein!"
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:48
+#: EasyNewsletter/config.py:52
 msgid "invalid_hashkey"
 msgstr "Bitte geben Sie eine korrekte E-Mail-Adresse ein!"
 
@@ -930,7 +911,7 @@ msgid "label_ext_subcriber_source_failed"
 msgstr "Das laden der externen Abonnenten ist fehlgeschlagen!"
 
 #. Default: "Hide banner image."
-#: EasyNewsletter/content/newsletter_issue.py:168
+#: EasyNewsletter/content/newsletter_issue.py:165
 msgid "label_issueHideImage"
 msgstr "Verstecke Banner-Bild"
 
@@ -970,12 +951,12 @@ msgid "label_newsletter_path"
 msgstr "Zugehöriger Newsletter"
 
 #. Default: "Mr."
-#: EasyNewsletter/config.py:26
+#: EasyNewsletter/config.py:28
 msgid "label_salutation_mr"
 msgstr "Herr"
 
 #. Default: "Ms."
-#: EasyNewsletter/config.py:25
+#: EasyNewsletter/config.py:27
 msgid "label_salutation_ms"
 msgstr "Frau"
 
@@ -1036,7 +1017,7 @@ msgstr "Präfix"
 #. Default: "Newsletter archive"
 #: EasyNewsletter/views/newsletter.pt:14
 msgid "newsletter_archive_label"
-msgstr "Newslettr-Archiv"
+msgstr "Newsletter-Archiv"
 
 #. Default: "Not imported subscribers"
 #: EasyNewsletter/browser/upload_csv.pt:85
@@ -1077,8 +1058,8 @@ msgstr "In Pocket speichern"
 msgid "source"
 msgstr "Quelle"
 
-#: EasyNewsletter/browser/subscribers.py:215
-#: EasyNewsletter/views/newsletter_subscribers.py:103
+#: EasyNewsletter/browser/subscribers.py:214
+#: EasyNewsletter/views/newsletter_subscribers.py:107
 msgid "subscriber/s deleted successfully"
 msgstr "Abonnenten erfolgreich gelöscht"
 
@@ -1089,14 +1070,13 @@ msgid "subscribers_search_note"
 msgstr "Die Suche wirkt sich nur auf lokale Abonnenten aus, nicht auf Abonnenten von externen Quellen."
 
 #. Default: "Your subscription was successfully confirmed."
-#: EasyNewsletter/config.py:50
+#: EasyNewsletter/config.py:55
 msgid "subscription_confirmed"
 msgstr "Ihre Anmeldung wurde erfolgreich bestätigt."
 
 #. Default: "Sucessfully created/updated Subscribers"
 #: EasyNewsletter/browser/upload_csv.pt:119
 #: EasyNewsletter/views/newsletter_subscribers_upload.pt:104
-#, fuzzy
 msgid "sucessfully_created_subscribers"
 msgstr "Erfolgreich angelegte/aktualisierte Abonnenten"
 
@@ -1104,6 +1084,11 @@ msgstr "Erfolgreich angelegte/aktualisierte Abonnenten"
 msgid "unsubscribe"
 msgstr "Abonnement kündigen"
 
-#: EasyNewsletter/content/newsletter.py:200
+#. Default: "You requested to unsubscribe from the following newsletter: ${title}"
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:37
+msgid "you_requested_to_unsubscribe"
+msgstr "Sie wollen sich von dem folgenden Newsletter abmelden?: ${title}"
+
+#: EasyNewsletter/content/newsletter.py:198
 msgid "{{subscriber_salutation}}<br />"
 msgstr ""
diff --git a/src/Products/EasyNewsletter/locales/de/LC_MESSAGES/plone.po b/src/Products/EasyNewsletter/locales/de/LC_MESSAGES/plone.po
index d7258951..a8824d45 100644
--- a/src/Products/EasyNewsletter/locales/de/LC_MESSAGES/plone.po
+++ b/src/Products/EasyNewsletter/locales/de/LC_MESSAGES/plone.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-02-01 19:16+0000\n"
+"POT-Creation-Date: 2021-02-02 19:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/Products/EasyNewsletter/locales/en/LC_MESSAGES/Products.EasyNewsletter.po b/src/Products/EasyNewsletter/locales/en/LC_MESSAGES/Products.EasyNewsletter.po
index fb9bf341..56d66c69 100644
--- a/src/Products/EasyNewsletter/locales/en/LC_MESSAGES/Products.EasyNewsletter.po
+++ b/src/Products/EasyNewsletter/locales/en/LC_MESSAGES/Products.EasyNewsletter.po
@@ -49,8 +49,8 @@ msgstr ""
 msgid "Allowed content aggregation types"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:304
-#: EasyNewsletter/views/newsletter_unsubscribe.py:39
+#: EasyNewsletter/browser/registration.py:302
+#: EasyNewsletter/views/newsletter_unsubscribe.py:38
 msgid "An error occured"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr ""
 msgid "Configuration for version 4005"
 msgstr ""
 
-#: EasyNewsletter/config.py:60
+#: EasyNewsletter/config.py:67
 msgid "Confirm your subscription on ${portal_url}"
 msgstr ""
 
@@ -95,7 +95,7 @@ msgstr ""
 msgid "Content types which will be visible in the Content aggregation sources reference field."
 msgstr ""
 
-#: EasyNewsletter/content/newsletter_issue.py:76
+#: EasyNewsletter/content/newsletter_issue.py:73
 msgid "Customizations"
 msgstr ""
 
@@ -103,10 +103,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_output_templates.py:31
-msgid "Default output template"
-msgstr ""
-
 #: EasyNewsletter/browser/enl_subscribers_view.pt:135
 #: EasyNewsletter/views/newsletter_subscribers.pt:151
 msgid "Delete"
@@ -121,152 +117,152 @@ msgid "E-Mail"
 msgstr ""
 
 #. Default: "Choose sources to aggregate newsletter content from."
-#: EasyNewsletter/content/newsletter.py:117
-#: EasyNewsletter/content/newsletter_issue.py:100
+#: EasyNewsletter/content/newsletter.py:115
+#: EasyNewsletter/content/newsletter_issue.py:97
 msgid "ENL_content_aggregation_sources_desc"
 msgstr ""
 
 #. Default: "Content aggregation sources"
-#: EasyNewsletter/content/newsletter.py:113
-#: EasyNewsletter/content/newsletter_issue.py:96
+#: EasyNewsletter/content/newsletter.py:111
+#: EasyNewsletter/content/newsletter_issue.py:93
 msgid "ENL_content_aggregation_sources_label"
 msgstr ""
 
 #. Default: "Text used for confirmation email subject. You can                 customize the text, but it should include the                 placeholder: ${portal_url}!"
-#: EasyNewsletter/content/newsletter.py:248
+#: EasyNewsletter/content/newsletter.py:246
 msgid "ENL_description_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Text used for confirmation email. You can customize                 the text, but it should include the placeholders:                 ${portal_url}, ${subscriber_email} and                 ${confirmation_url}!"
-#: EasyNewsletter/content/newsletter.py:263
+#: EasyNewsletter/content/newsletter.py:261
 msgid "ENL_description_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "The default epilogue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:207
-#: EasyNewsletter/content/newsletter_issue.py:154
+#: EasyNewsletter/content/newsletter.py:205
+#: EasyNewsletter/content/newsletter_issue.py:151
 msgid "ENL_description_text_footer"
 msgstr ""
 
 #. Default: "The default prologue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:194
-#: EasyNewsletter/content/newsletter_issue.py:141
+#: EasyNewsletter/content/newsletter.py:192
+#: EasyNewsletter/content/newsletter_issue.py:138
 msgid "ENL_description_text_header"
 msgstr ""
 
 #. Default: "If checked, the newsletter/mailing will not be send                  to all subscribers inside the newsletter. Changing this                 setting does not affect already existing issues."
-#: EasyNewsletter/content/newsletter.py:222
-#: EasyNewsletter/content/newsletter_issue.py:117
+#: EasyNewsletter/content/newsletter.py:220
+#: EasyNewsletter/content/newsletter_issue.py:114
 msgid "ENL_help_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "This will be used if the subscriber has no fullname."
-#: EasyNewsletter/content/newsletter.py:148
+#: EasyNewsletter/content/newsletter.py:146
 msgid "ENL_help_fullname_fallback"
 msgstr ""
 
 #. Default: "Define here possible salutations for subscriber.                 One salutation per line in the form of: \"mr|Dear Mr.\".                 The left hand value \"mr\" or \"ms\" is mapped to salutation                 of each subscriber and then the right hand value, which                 you can customize is used as salutation."
-#: EasyNewsletter/content/newsletter.py:130
+#: EasyNewsletter/content/newsletter.py:128
 msgid "ENL_help_salutations"
 msgstr ""
 
 #. Default: "Default for the sender address of the newsletters."
-#: EasyNewsletter/content/newsletter.py:81
+#: EasyNewsletter/content/newsletter.py:79
 msgid "ENL_help_senderEmail"
 msgstr ""
 
 #. Default: "Default for the sender name of the newsletters."
-#: EasyNewsletter/content/newsletter.py:90
+#: EasyNewsletter/content/newsletter.py:88
 msgid "ENL_help_senderName"
 msgstr ""
 
 #. Default: "Default for the test email address."
-#: EasyNewsletter/content/newsletter.py:99
+#: EasyNewsletter/content/newsletter.py:97
 msgid "ENL_help_testEmail"
 msgstr ""
 
 #. Default: "This will replace the placeholder {{UNSUBSCRIBE}}."
-#: EasyNewsletter/content/newsletter.py:160
+#: EasyNewsletter/content/newsletter.py:158
 msgid "ENL_help_unsubscribe_string"
 msgstr ""
 
 #. Default: "Banner image, you can include in the templates by\n adding the {{banner}} placeholder into it. By default it should be 600x200 pixel."
-#: EasyNewsletter/content/newsletter.py:171
-#: EasyNewsletter/content/newsletter_issue.py:181
+#: EasyNewsletter/content/newsletter.py:169
+#: EasyNewsletter/content/newsletter_issue.py:178
 msgid "ENL_image_desc"
 msgstr ""
 
 #. Default: "Banner image"
-#: EasyNewsletter/content/newsletter.py:170
-#: EasyNewsletter/content/newsletter_issue.py:180
+#: EasyNewsletter/content/newsletter.py:168
+#: EasyNewsletter/content/newsletter_issue.py:177
 msgid "ENL_image_label"
 msgstr ""
 
 #. Default: "Epilogue"
-#: EasyNewsletter/content/newsletter.py:206
-#: EasyNewsletter/content/newsletter_issue.py:153
+#: EasyNewsletter/content/newsletter.py:204
+#: EasyNewsletter/content/newsletter_issue.py:150
 msgid "ENL_label_default_footer"
 msgstr ""
 
 #. Default: "Prologue"
-#: EasyNewsletter/content/newsletter.py:193
-#: EasyNewsletter/content/newsletter_issue.py:140
+#: EasyNewsletter/content/newsletter.py:191
+#: EasyNewsletter/content/newsletter_issue.py:137
 msgid "ENL_label_default_header"
 msgstr ""
 
 #. Default: "Exclude all subscribers"
-#: EasyNewsletter/content/newsletter.py:221
-#: EasyNewsletter/content/newsletter_issue.py:116
+#: EasyNewsletter/content/newsletter.py:219
+#: EasyNewsletter/content/newsletter_issue.py:113
 msgid "ENL_label_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "Fallback for subscribers without a name."
-#: EasyNewsletter/content/newsletter.py:144
+#: EasyNewsletter/content/newsletter.py:142
 msgid "ENL_label_fullname_fallback"
 msgstr ""
 
 #. Default: "Subscriber Salutations."
-#: EasyNewsletter/content/newsletter.py:129
+#: EasyNewsletter/content/newsletter.py:127
 msgid "ENL_label_salutations"
 msgstr ""
 
 #. Default: "Sender email"
-#: EasyNewsletter/content/newsletter.py:80
+#: EasyNewsletter/content/newsletter.py:78
 msgid "ENL_label_senderEmail"
 msgstr ""
 
 #. Default: "Sender name"
-#: EasyNewsletter/content/newsletter.py:89
+#: EasyNewsletter/content/newsletter.py:87
 msgid "ENL_label_senderName"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail subject"
-#: EasyNewsletter/content/newsletter.py:244
+#: EasyNewsletter/content/newsletter.py:242
 msgid "ENL_label_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail text"
-#: EasyNewsletter/content/newsletter.py:259
+#: EasyNewsletter/content/newsletter.py:257
 msgid "ENL_label_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "Test email"
-#: EasyNewsletter/content/newsletter.py:98
+#: EasyNewsletter/content/newsletter.py:96
 msgid "ENL_label_testEmail"
 msgstr ""
 
 #. Default: "Text for the 'unsubscribe' link"
-#: EasyNewsletter/content/newsletter.py:157
+#: EasyNewsletter/content/newsletter.py:155
 msgid "ENL_label_unsubscribe_string"
 msgstr ""
 
 #. Default: "Logo image, you can include in the templates by\n adding the {{logo}} placeholder into it."
-#: EasyNewsletter/content/newsletter.py:183
+#: EasyNewsletter/content/newsletter.py:181
 msgid "ENL_logo_desc"
 msgstr ""
 
 #. Default: "Logo image"
-#: EasyNewsletter/content/newsletter.py:182
+#: EasyNewsletter/content/newsletter.py:180
 msgid "ENL_logo_label"
 msgstr ""
 
@@ -281,12 +277,12 @@ msgid "EasyNewsletter_help_name_prefix"
 msgstr ""
 
 #. Default: "Choose Plone Groups which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:70
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:67
 msgid "EasyNewsletter_help_ploneReceiverGroups"
 msgstr ""
 
 #. Default: "Choose Plone Members which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:54
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:51
 msgid "EasyNewsletter_help_ploneReceiverMembers"
 msgstr ""
 
@@ -344,12 +340,12 @@ msgid "EasyNewsletter_label_organization"
 msgstr ""
 
 #. Default: "Plone Groups to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:66
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:63
 msgid "EasyNewsletter_label_ploneReceiverGroups"
 msgstr ""
 
 #. Default: "Plone Members to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:50
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:47
 msgid "EasyNewsletter_label_ploneReceiverMembers"
 msgstr ""
 
@@ -398,7 +394,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:317
+#: EasyNewsletter/browser/subscribers.py:316
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:132
 msgid "Email existed, updated subscriber."
 msgstr ""
@@ -421,10 +417,6 @@ msgstr ""
 msgid "First Name"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_aggregation_templates.py:31
-msgid "Generic Listing"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:28
 #: EasyNewsletter/views/newsletter_subscribers_upload.pt:13
 msgid "Import"
@@ -446,10 +438,6 @@ msgstr ""
 msgid "Issue masters"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_plone_users.py:38
-msgid "Jane Doe - jane@plone.org"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:94
 msgid "Language"
 msgstr ""
@@ -463,17 +451,16 @@ msgstr ""
 msgid "Masters"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:293
+#: EasyNewsletter/browser/subscribers.py:292
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:108
 msgid "More than one subscriber with this email address existed, subscriber info was NOT updated. Check manually!"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/salutations.py:26
+#: EasyNewsletter/vocabularies/salutations.py:25
 msgid "Mr"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_salutations.py:32
-#: EasyNewsletter/vocabularies/salutations.py:25
+#: EasyNewsletter/vocabularies/salutations.py:24
 msgid "Ms"
 msgstr ""
 
@@ -489,7 +476,7 @@ msgstr ""
 msgid "Newsletter Subscriber"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:29
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:27
 msgid "Newsletter aggregation template"
 msgstr ""
 
@@ -501,7 +488,7 @@ msgstr ""
 msgid "Newsletter content successfully aggregated."
 msgstr ""
 
-#: EasyNewsletter/views/newsletter_issue_statistics.py:22
+#: EasyNewsletter/views/newsletter_issue_statistics.py:23
 msgid "Newsletter issue statistics have been reset."
 msgstr ""
 
@@ -509,17 +496,17 @@ msgstr ""
 msgid "Newsletter subscriber portlet"
 msgstr ""
 
-#: EasyNewsletter/views/newsletter_issue_send.py:201
+#: EasyNewsletter/views/newsletter_issue_send.py:205
 msgid "Newsletter was sent to ({0}) receivers. ({1}) errors occurred!{2}"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:254
+#: EasyNewsletter/browser/subscribers.py:253
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:68
 msgid "No file specified."
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:208
-#: EasyNewsletter/views/newsletter_subscribers.py:96
+#: EasyNewsletter/browser/subscribers.py:207
+#: EasyNewsletter/views/newsletter_subscribers.py:100
 msgid "No subscriber selected!"
 msgstr ""
 
@@ -528,16 +515,16 @@ msgstr ""
 msgid "Organization"
 msgstr ""
 
-#: EasyNewsletter/content/newsletter.py:61
+#: EasyNewsletter/content/newsletter.py:59
 msgid "Personalization"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:195
+#: EasyNewsletter/browser/registration.py:193
 msgid "Please enter a valid email address."
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:292
-#: EasyNewsletter/views/newsletter_unsubscribe.py:24
+#: EasyNewsletter/browser/registration.py:290
+#: EasyNewsletter/views/newsletter_unsubscribe.py:23
 msgid "Please use the correct unsubscribe url!"
 msgstr ""
 
@@ -570,7 +557,7 @@ msgstr ""
 msgid "Products.EasyNewsletter (4005)"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/plone_users.py:49
+#: EasyNewsletter/vocabularies/plone_users.py:47
 msgid "Property email: \"{0}\" is not an email!"
 msgstr ""
 
@@ -583,8 +570,8 @@ msgstr ""
 msgid "Reason for failure"
 msgstr ""
 
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:45
-#: EasyNewsletter/content/newsletter.py:76
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:42
+#: EasyNewsletter/content/newsletter.py:74
 msgid "Recipients"
 msgstr ""
 
@@ -607,7 +594,7 @@ msgstr ""
 msgid "Select your CSV file here."
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:24
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:22
 msgid "Settings"
 msgstr ""
 
@@ -620,7 +607,7 @@ msgstr ""
 msgid "Subscriber Search"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:350
+#: EasyNewsletter/browser/subscribers.py:349
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:166
 msgid "Subscriber created."
 msgstr ""
@@ -644,7 +631,7 @@ msgstr ""
 msgid "Tester"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:30
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:28
 msgid "The <a href=\"https://productseasynewsletter.readthedocs.io/en/latest/#aggregation-templates\">aggregation template</a> used by the Newsletter to render Collection items for the Newsletter."
 msgstr ""
 
@@ -654,7 +641,7 @@ msgid "The CSV file must contain the header and follow this format"
 msgstr ""
 
 #: EasyNewsletter/browser/issue.py:74
-#: EasyNewsletter/views/newsletter_issue_send.py:81
+#: EasyNewsletter/views/newsletter_issue_send.py:85
 msgid "The issue has been generated and sent to the mail server."
 msgstr ""
 
@@ -663,11 +650,11 @@ msgid "The issue sending has been initiated in the background."
 msgstr ""
 
 #: EasyNewsletter/browser/issue.py:55
-#: EasyNewsletter/views/newsletter_issue_send.py:62
+#: EasyNewsletter/views/newsletter_issue_send.py:66
 msgid "The issue test sending has been initiated."
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:275
+#: EasyNewsletter/browser/subscribers.py:274
 msgid "The number of items in the line is not correct.                         It should be 7. Check your CSV file."
 msgstr ""
 
@@ -688,28 +675,24 @@ msgstr ""
 msgid "Title for the portlet."
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_plone_groups.py:35
-msgid "VIP"
-msgstr ""
-
 #: EasyNewsletter/profiles/default/types/Newsletter.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Issue.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Subscriber.xml
 msgid "View"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:272
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:48
+#: EasyNewsletter/browser/registration.py:270
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:58
 msgid "We send you an email, please confirm this unsubscription."
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:265
+#: EasyNewsletter/browser/subscribers.py:264
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:78
 msgid "Wrong specification of the CSV file. Please correct it and retry."
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:307
-#: EasyNewsletter/views/newsletter_unsubscribe.py:46
+#: EasyNewsletter/browser/registration.py:305
+#: EasyNewsletter/views/newsletter_unsubscribe.py:45
 msgid "You have been unsubscribed."
 msgstr ""
 
@@ -717,16 +700,16 @@ msgstr ""
 msgid "You want to unsubscribe from this Newsletter?"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:278
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:56
+#: EasyNewsletter/browser/registration.py:276
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:66
 msgid "Your email address could not be found in subscribers."
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:95
+#: EasyNewsletter/browser/registration.py:93
 msgid "Your email address is already registered."
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:142
+#: EasyNewsletter/browser/registration.py:140
 msgid "Your email has been registered.                 A confirmation email was sent to your address. Please check                 your inbox and click on the link in the email in order to                 confirm your subscription."
 msgstr ""
 
@@ -734,7 +717,7 @@ msgstr ""
 msgid "Your registered E-Mail address:"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:191
+#: EasyNewsletter/browser/registration.py:189
 msgid "Your subscription was successfully confirmed."
 msgstr ""
 
@@ -754,8 +737,8 @@ msgstr ""
 msgid "cancel"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:268
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:44
+#: EasyNewsletter/browser/registration.py:266
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:53
 msgid "confirm newsletter unsubscription"
 msgstr ""
 
@@ -851,34 +834,34 @@ msgid "easynewsletter_unsubscribe_button"
 msgstr ""
 
 #. Default: "Your email has been registered. A confirmation email was sent to your address. Please check your inbox and click  on the link in the email in order to confirm your subscription."
-#: EasyNewsletter/config.py:37
+#: EasyNewsletter/config.py:39
 msgid "email_added"
 msgstr ""
 
 #. Default: "Your email address is already registered."
-#: EasyNewsletter/config.py:46
+#: EasyNewsletter/config.py:49
 msgid "email_exists"
 msgstr ""
 
 #. Default: "Choose the template to render the email. "
-#: EasyNewsletter/content/newsletter.py:234
-#: EasyNewsletter/content/newsletter_issue.py:129
+#: EasyNewsletter/content/newsletter.py:232
+#: EasyNewsletter/content/newsletter_issue.py:126
 msgid "enl_help_output_template"
 msgstr ""
 
 #. Default: "If checked, the banner image defined on newsletter                     or on this issue will not be used."
-#: EasyNewsletter/content/newsletter_issue.py:169
+#: EasyNewsletter/content/newsletter_issue.py:166
 msgid "enl_issue_help_hide_image"
 msgstr ""
 
 #. Default: "Default output template"
-#: EasyNewsletter/vocabularies/output_templates.py:37
+#: EasyNewsletter/vocabularies/output_templates.py:36
 msgid "enl_label_default_output_template"
 msgstr ""
 
 #. Default: "Output template"
-#: EasyNewsletter/content/newsletter.py:233
-#: EasyNewsletter/content/newsletter_issue.py:128
+#: EasyNewsletter/content/newsletter.py:231
+#: EasyNewsletter/content/newsletter_issue.py:125
 msgid "enl_label_output_template"
 msgstr ""
 
@@ -912,12 +895,12 @@ msgid "import_subscriber"
 msgstr ""
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:44
+#: EasyNewsletter/config.py:46
 msgid "invalid_email"
 msgstr ""
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:48
+#: EasyNewsletter/config.py:52
 msgid "invalid_hashkey"
 msgstr ""
 
@@ -927,7 +910,7 @@ msgid "label_ext_subcriber_source_failed"
 msgstr ""
 
 #. Default: "Hide banner image."
-#: EasyNewsletter/content/newsletter_issue.py:168
+#: EasyNewsletter/content/newsletter_issue.py:165
 msgid "label_issueHideImage"
 msgstr ""
 
@@ -967,12 +950,12 @@ msgid "label_newsletter_path"
 msgstr ""
 
 #. Default: "Mr."
-#: EasyNewsletter/config.py:26
+#: EasyNewsletter/config.py:28
 msgid "label_salutation_mr"
 msgstr ""
 
 #. Default: "Ms."
-#: EasyNewsletter/config.py:25
+#: EasyNewsletter/config.py:27
 msgid "label_salutation_ms"
 msgstr ""
 
@@ -1074,8 +1057,8 @@ msgstr ""
 msgid "source"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:215
-#: EasyNewsletter/views/newsletter_subscribers.py:103
+#: EasyNewsletter/browser/subscribers.py:214
+#: EasyNewsletter/views/newsletter_subscribers.py:107
 msgid "subscriber/s deleted successfully"
 msgstr ""
 
@@ -1086,7 +1069,7 @@ msgid "subscribers_search_note"
 msgstr ""
 
 #. Default: "Your subscription was successfully confirmed."
-#: EasyNewsletter/config.py:50
+#: EasyNewsletter/config.py:55
 msgid "subscription_confirmed"
 msgstr ""
 
@@ -1100,6 +1083,11 @@ msgstr ""
 msgid "unsubscribe"
 msgstr ""
 
-#: EasyNewsletter/content/newsletter.py:200
+#. Default: "You requested to unsubscribe from the following newsletter: ${title}"
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:37
+msgid "you_requested_to_unsubscribe"
+msgstr ""
+
+#: EasyNewsletter/content/newsletter.py:198
 msgid "{{subscriber_salutation}}<br />"
 msgstr ""
diff --git a/src/Products/EasyNewsletter/locales/en/LC_MESSAGES/plone.po b/src/Products/EasyNewsletter/locales/en/LC_MESSAGES/plone.po
index 2c8e08f5..e931282d 100644
--- a/src/Products/EasyNewsletter/locales/en/LC_MESSAGES/plone.po
+++ b/src/Products/EasyNewsletter/locales/en/LC_MESSAGES/plone.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-02-01 19:16+0000\n"
+"POT-Creation-Date: 2021-02-02 19:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/Products/EasyNewsletter/locales/es/LC_MESSAGES/Products.EasyNewsletter.po b/src/Products/EasyNewsletter/locales/es/LC_MESSAGES/Products.EasyNewsletter.po
index afe2a29a..7bf6895a 100644
--- a/src/Products/EasyNewsletter/locales/es/LC_MESSAGES/Products.EasyNewsletter.po
+++ b/src/Products/EasyNewsletter/locales/es/LC_MESSAGES/Products.EasyNewsletter.po
@@ -54,8 +54,8 @@ msgstr ""
 msgid "Allowed content aggregation types"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:304
-#: EasyNewsletter/views/newsletter_unsubscribe.py:39
+#: EasyNewsletter/browser/registration.py:302
+#: EasyNewsletter/views/newsletter_unsubscribe.py:38
 msgid "An error occured"
 msgstr "Ocurrió un error"
 
@@ -88,7 +88,7 @@ msgstr ""
 msgid "Configuration for version 4005"
 msgstr ""
 
-#: EasyNewsletter/config.py:60
+#: EasyNewsletter/config.py:67
 msgid "Confirm your subscription on ${portal_url}"
 msgstr "Confirme su suscripción en la dirección ${portal_url}"
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Content types which will be visible in the Content aggregation sources reference field."
 msgstr ""
 
-#: EasyNewsletter/content/newsletter_issue.py:76
+#: EasyNewsletter/content/newsletter_issue.py:73
 msgid "Customizations"
 msgstr ""
 
@@ -108,10 +108,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_output_templates.py:31
-msgid "Default output template"
-msgstr ""
-
 #: EasyNewsletter/browser/enl_subscribers_view.pt:135
 #: EasyNewsletter/views/newsletter_subscribers.pt:151
 msgid "Delete"
@@ -126,152 +122,152 @@ msgid "E-Mail"
 msgstr "Correo electrónico"
 
 #. Default: "Choose sources to aggregate newsletter content from."
-#: EasyNewsletter/content/newsletter.py:117
-#: EasyNewsletter/content/newsletter_issue.py:100
+#: EasyNewsletter/content/newsletter.py:115
+#: EasyNewsletter/content/newsletter_issue.py:97
 msgid "ENL_content_aggregation_sources_desc"
 msgstr ""
 
 #. Default: "Content aggregation sources"
-#: EasyNewsletter/content/newsletter.py:113
-#: EasyNewsletter/content/newsletter_issue.py:96
+#: EasyNewsletter/content/newsletter.py:111
+#: EasyNewsletter/content/newsletter_issue.py:93
 msgid "ENL_content_aggregation_sources_label"
 msgstr ""
 
 #. Default: "Text used for confirmation email subject. You can                 customize the text, but it should include the                 placeholder: ${portal_url}!"
-#: EasyNewsletter/content/newsletter.py:248
+#: EasyNewsletter/content/newsletter.py:246
 msgid "ENL_description_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Text used for confirmation email. You can customize                 the text, but it should include the placeholders:                 ${portal_url}, ${subscriber_email} and                 ${confirmation_url}!"
-#: EasyNewsletter/content/newsletter.py:263
+#: EasyNewsletter/content/newsletter.py:261
 msgid "ENL_description_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "The default epilogue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:207
-#: EasyNewsletter/content/newsletter_issue.py:154
+#: EasyNewsletter/content/newsletter.py:205
+#: EasyNewsletter/content/newsletter_issue.py:151
 msgid "ENL_description_text_footer"
 msgstr ""
 
 #. Default: "The default prologue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:194
-#: EasyNewsletter/content/newsletter_issue.py:141
+#: EasyNewsletter/content/newsletter.py:192
+#: EasyNewsletter/content/newsletter_issue.py:138
 msgid "ENL_description_text_header"
 msgstr ""
 
 #. Default: "If checked, the newsletter/mailing will not be send                  to all subscribers inside the newsletter. Changing this                 setting does not affect already existing issues."
-#: EasyNewsletter/content/newsletter.py:222
-#: EasyNewsletter/content/newsletter_issue.py:117
+#: EasyNewsletter/content/newsletter.py:220
+#: EasyNewsletter/content/newsletter_issue.py:114
 msgid "ENL_help_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "This will be used if the subscriber has no fullname."
-#: EasyNewsletter/content/newsletter.py:148
+#: EasyNewsletter/content/newsletter.py:146
 msgid "ENL_help_fullname_fallback"
 msgstr ""
 
 #. Default: "Define here possible salutations for subscriber.                 One salutation per line in the form of: \"mr|Dear Mr.\".                 The left hand value \"mr\" or \"ms\" is mapped to salutation                 of each subscriber and then the right hand value, which                 you can customize is used as salutation."
-#: EasyNewsletter/content/newsletter.py:130
+#: EasyNewsletter/content/newsletter.py:128
 msgid "ENL_help_salutations"
 msgstr ""
 
 #. Default: "Default for the sender address of the newsletters."
-#: EasyNewsletter/content/newsletter.py:81
+#: EasyNewsletter/content/newsletter.py:79
 msgid "ENL_help_senderEmail"
 msgstr ""
 
 #. Default: "Default for the sender name of the newsletters."
-#: EasyNewsletter/content/newsletter.py:90
+#: EasyNewsletter/content/newsletter.py:88
 msgid "ENL_help_senderName"
 msgstr ""
 
 #. Default: "Default for the test email address."
-#: EasyNewsletter/content/newsletter.py:99
+#: EasyNewsletter/content/newsletter.py:97
 msgid "ENL_help_testEmail"
 msgstr ""
 
 #. Default: "This will replace the placeholder {{UNSUBSCRIBE}}."
-#: EasyNewsletter/content/newsletter.py:160
+#: EasyNewsletter/content/newsletter.py:158
 msgid "ENL_help_unsubscribe_string"
 msgstr ""
 
 #. Default: "Banner image, you can include in the templates by\n adding the {{banner}} placeholder into it. By default it should be 600x200 pixel."
-#: EasyNewsletter/content/newsletter.py:171
-#: EasyNewsletter/content/newsletter_issue.py:181
+#: EasyNewsletter/content/newsletter.py:169
+#: EasyNewsletter/content/newsletter_issue.py:178
 msgid "ENL_image_desc"
 msgstr ""
 
 #. Default: "Banner image"
-#: EasyNewsletter/content/newsletter.py:170
-#: EasyNewsletter/content/newsletter_issue.py:180
+#: EasyNewsletter/content/newsletter.py:168
+#: EasyNewsletter/content/newsletter_issue.py:177
 msgid "ENL_image_label"
 msgstr ""
 
 #. Default: "Epilogue"
-#: EasyNewsletter/content/newsletter.py:206
-#: EasyNewsletter/content/newsletter_issue.py:153
+#: EasyNewsletter/content/newsletter.py:204
+#: EasyNewsletter/content/newsletter_issue.py:150
 msgid "ENL_label_default_footer"
 msgstr ""
 
 #. Default: "Prologue"
-#: EasyNewsletter/content/newsletter.py:193
-#: EasyNewsletter/content/newsletter_issue.py:140
+#: EasyNewsletter/content/newsletter.py:191
+#: EasyNewsletter/content/newsletter_issue.py:137
 msgid "ENL_label_default_header"
 msgstr ""
 
 #. Default: "Exclude all subscribers"
-#: EasyNewsletter/content/newsletter.py:221
-#: EasyNewsletter/content/newsletter_issue.py:116
+#: EasyNewsletter/content/newsletter.py:219
+#: EasyNewsletter/content/newsletter_issue.py:113
 msgid "ENL_label_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "Fallback for subscribers without a name."
-#: EasyNewsletter/content/newsletter.py:144
+#: EasyNewsletter/content/newsletter.py:142
 msgid "ENL_label_fullname_fallback"
 msgstr ""
 
 #. Default: "Subscriber Salutations."
-#: EasyNewsletter/content/newsletter.py:129
+#: EasyNewsletter/content/newsletter.py:127
 msgid "ENL_label_salutations"
 msgstr ""
 
 #. Default: "Sender email"
-#: EasyNewsletter/content/newsletter.py:80
+#: EasyNewsletter/content/newsletter.py:78
 msgid "ENL_label_senderEmail"
 msgstr ""
 
 #. Default: "Sender name"
-#: EasyNewsletter/content/newsletter.py:89
+#: EasyNewsletter/content/newsletter.py:87
 msgid "ENL_label_senderName"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail subject"
-#: EasyNewsletter/content/newsletter.py:244
+#: EasyNewsletter/content/newsletter.py:242
 msgid "ENL_label_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail text"
-#: EasyNewsletter/content/newsletter.py:259
+#: EasyNewsletter/content/newsletter.py:257
 msgid "ENL_label_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "Test email"
-#: EasyNewsletter/content/newsletter.py:98
+#: EasyNewsletter/content/newsletter.py:96
 msgid "ENL_label_testEmail"
 msgstr ""
 
 #. Default: "Text for the 'unsubscribe' link"
-#: EasyNewsletter/content/newsletter.py:157
+#: EasyNewsletter/content/newsletter.py:155
 msgid "ENL_label_unsubscribe_string"
 msgstr ""
 
 #. Default: "Logo image, you can include in the templates by\n adding the {{logo}} placeholder into it."
-#: EasyNewsletter/content/newsletter.py:183
+#: EasyNewsletter/content/newsletter.py:181
 msgid "ENL_logo_desc"
 msgstr ""
 
 #. Default: "Logo image"
-#: EasyNewsletter/content/newsletter.py:182
+#: EasyNewsletter/content/newsletter.py:180
 msgid "ENL_logo_label"
 msgstr ""
 
@@ -286,13 +282,13 @@ msgid "EasyNewsletter_help_name_prefix"
 msgstr ""
 
 #. Default: "Choose Plone Groups which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:70
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:67
 #, fuzzy
 msgid "EasyNewsletter_help_ploneReceiverGroups"
 msgstr "Seleccione los grupos de miembros del sitio Plone que deben recibir el boletín de noticias. Cambiar esta configuración no afecta a ediciones ya existentes."
 
 #. Default: "Choose Plone Members which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:54
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:51
 msgid "EasyNewsletter_help_ploneReceiverMembers"
 msgstr "Seleccione los miembros del sitio Plone que deben recibir el boletín de noticias. Cambiar esta configuración no afecta a ediciones ya existentes."
 
@@ -350,12 +346,12 @@ msgid "EasyNewsletter_label_organization"
 msgstr "Compañía/Organización"
 
 #. Default: "Plone Groups to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:66
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:63
 msgid "EasyNewsletter_label_ploneReceiverGroups"
 msgstr "Grupos de miembros del sitio que recibirán el boletín de noticias"
 
 #. Default: "Plone Members to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:50
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:47
 msgid "EasyNewsletter_label_ploneReceiverMembers"
 msgstr "Miembros del sitio que recibirán el boletín de noticias"
 
@@ -404,7 +400,7 @@ msgstr "Editar el portlet del boletín de noticias"
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: EasyNewsletter/browser/subscribers.py:317
+#: EasyNewsletter/browser/subscribers.py:316
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:132
 msgid "Email existed, updated subscriber."
 msgstr ""
@@ -427,10 +423,6 @@ msgstr ""
 msgid "First Name"
 msgstr "Nombre"
 
-#: EasyNewsletter/tests/test_vocab_aggregation_templates.py:31
-msgid "Generic Listing"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:28
 #: EasyNewsletter/views/newsletter_subscribers_upload.pt:13
 msgid "Import"
@@ -452,10 +444,6 @@ msgstr "Borradores de emisión"
 msgid "Issue masters"
 msgstr "Maestras de emisión"
 
-#: EasyNewsletter/tests/test_vocab_plone_users.py:38
-msgid "Jane Doe - jane@plone.org"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:94
 msgid "Language"
 msgstr "Idioma"
@@ -469,17 +457,16 @@ msgstr "Apellido"
 msgid "Masters"
 msgstr "Maestras"
 
-#: EasyNewsletter/browser/subscribers.py:293
+#: EasyNewsletter/browser/subscribers.py:292
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:108
 msgid "More than one subscriber with this email address existed, subscriber info was NOT updated. Check manually!"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/salutations.py:26
+#: EasyNewsletter/vocabularies/salutations.py:25
 msgid "Mr"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_salutations.py:32
-#: EasyNewsletter/vocabularies/salutations.py:25
+#: EasyNewsletter/vocabularies/salutations.py:24
 msgid "Ms"
 msgstr ""
 
@@ -495,7 +482,7 @@ msgstr ""
 msgid "Newsletter Subscriber"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:29
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:27
 msgid "Newsletter aggregation template"
 msgstr ""
 
@@ -507,7 +494,7 @@ msgstr ""
 msgid "Newsletter content successfully aggregated."
 msgstr ""
 
-#: EasyNewsletter/views/newsletter_issue_statistics.py:22
+#: EasyNewsletter/views/newsletter_issue_statistics.py:23
 msgid "Newsletter issue statistics have been reset."
 msgstr ""
 
@@ -515,17 +502,17 @@ msgstr ""
 msgid "Newsletter subscriber portlet"
 msgstr "Portlet de suscripción al boletín de noticias"
 
-#: EasyNewsletter/views/newsletter_issue_send.py:201
+#: EasyNewsletter/views/newsletter_issue_send.py:205
 msgid "Newsletter was sent to ({0}) receivers. ({1}) errors occurred!{2}"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:254
+#: EasyNewsletter/browser/subscribers.py:253
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:68
 msgid "No file specified."
 msgstr "No se indico un archivo."
 
-#: EasyNewsletter/browser/subscribers.py:208
-#: EasyNewsletter/views/newsletter_subscribers.py:96
+#: EasyNewsletter/browser/subscribers.py:207
+#: EasyNewsletter/views/newsletter_subscribers.py:100
 msgid "No subscriber selected!"
 msgstr "¡No hay suscriptores seleccionados!"
 
@@ -534,16 +521,16 @@ msgstr "¡No hay suscriptores seleccionados!"
 msgid "Organization"
 msgstr "Organización"
 
-#: EasyNewsletter/content/newsletter.py:61
+#: EasyNewsletter/content/newsletter.py:59
 msgid "Personalization"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:195
+#: EasyNewsletter/browser/registration.py:193
 msgid "Please enter a valid email address."
 msgstr "Por favor ingrese una dirección de correo electrónico valida."
 
-#: EasyNewsletter/browser/registration.py:292
-#: EasyNewsletter/views/newsletter_unsubscribe.py:24
+#: EasyNewsletter/browser/registration.py:290
+#: EasyNewsletter/views/newsletter_unsubscribe.py:23
 msgid "Please use the correct unsubscribe url!"
 msgstr ""
 
@@ -576,7 +563,7 @@ msgstr ""
 msgid "Products.EasyNewsletter (4005)"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/plone_users.py:49
+#: EasyNewsletter/vocabularies/plone_users.py:47
 msgid "Property email: \"{0}\" is not an email!"
 msgstr ""
 
@@ -589,8 +576,8 @@ msgstr ""
 msgid "Reason for failure"
 msgstr "Razón de la falla"
 
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:45
-#: EasyNewsletter/content/newsletter.py:76
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:42
+#: EasyNewsletter/content/newsletter.py:74
 msgid "Recipients"
 msgstr ""
 
@@ -613,7 +600,7 @@ msgstr ""
 msgid "Select your CSV file here."
 msgstr "Seleccione su archivo CSV."
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:24
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:22
 msgid "Settings"
 msgstr ""
 
@@ -626,7 +613,7 @@ msgstr ""
 msgid "Subscriber Search"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:350
+#: EasyNewsletter/browser/subscribers.py:349
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:166
 msgid "Subscriber created."
 msgstr ""
@@ -650,7 +637,7 @@ msgstr ""
 msgid "Tester"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:30
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:28
 msgid "The <a href=\"https://productseasynewsletter.readthedocs.io/en/latest/#aggregation-templates\">aggregation template</a> used by the Newsletter to render Collection items for the Newsletter."
 msgstr ""
 
@@ -660,7 +647,7 @@ msgid "The CSV file must contain the header and follow this format"
 msgstr "El archivo CSV debe contener un encabezado que cumpla el siguiente formato"
 
 #: EasyNewsletter/browser/issue.py:74
-#: EasyNewsletter/views/newsletter_issue_send.py:81
+#: EasyNewsletter/views/newsletter_issue_send.py:85
 msgid "The issue has been generated and sent to the mail server."
 msgstr ""
 
@@ -669,11 +656,11 @@ msgid "The issue sending has been initiated in the background."
 msgstr "El envió de la emisión se ha iniciado en el fondo."
 
 #: EasyNewsletter/browser/issue.py:55
-#: EasyNewsletter/views/newsletter_issue_send.py:62
+#: EasyNewsletter/views/newsletter_issue_send.py:66
 msgid "The issue test sending has been initiated."
 msgstr "La emisión de prueba se ha iniciado."
 
-#: EasyNewsletter/browser/subscribers.py:275
+#: EasyNewsletter/browser/subscribers.py:274
 msgid "The number of items in the line is not correct.                         It should be 7. Check your CSV file."
 msgstr "El número de elementos de la línea no es la correcta. Debe ser 7. Compruebe el archivo CSV."
 
@@ -694,28 +681,24 @@ msgstr "Título"
 msgid "Title for the portlet."
 msgstr "Titulo para el portlet."
 
-#: EasyNewsletter/tests/test_vocab_plone_groups.py:35
-msgid "VIP"
-msgstr ""
-
 #: EasyNewsletter/profiles/default/types/Newsletter.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Issue.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Subscriber.xml
 msgid "View"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:272
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:48
+#: EasyNewsletter/browser/registration.py:270
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:58
 msgid "We send you an email, please confirm this unsubscription."
 msgstr "Le enviamos un correo electrónico, por favor confirme esta de-suscripción."
 
-#: EasyNewsletter/browser/subscribers.py:265
+#: EasyNewsletter/browser/subscribers.py:264
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:78
 msgid "Wrong specification of the CSV file. Please correct it and retry."
 msgstr "La especificación del archivo CSV no es correcta. Por favor corrija esto y vuelva intentarlo."
 
-#: EasyNewsletter/browser/registration.py:307
-#: EasyNewsletter/views/newsletter_unsubscribe.py:46
+#: EasyNewsletter/browser/registration.py:305
+#: EasyNewsletter/views/newsletter_unsubscribe.py:45
 msgid "You have been unsubscribed."
 msgstr "Su suscripción ha sido dada de baja."
 
@@ -723,16 +706,16 @@ msgstr "Su suscripción ha sido dada de baja."
 msgid "You want to unsubscribe from this Newsletter?"
 msgstr "¿Quiere darse de baja de este boletín?"
 
-#: EasyNewsletter/browser/registration.py:278
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:56
+#: EasyNewsletter/browser/registration.py:276
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:66
 msgid "Your email address could not be found in subscribers."
 msgstr "Su dirección de correo electrónico no se pudo encontrar en los suscriptores."
 
-#: EasyNewsletter/browser/registration.py:95
+#: EasyNewsletter/browser/registration.py:93
 msgid "Your email address is already registered."
 msgstr "Su dirección de correo electrónico ya se encuentra registrada."
 
-#: EasyNewsletter/browser/registration.py:142
+#: EasyNewsletter/browser/registration.py:140
 msgid "Your email has been registered.                 A confirmation email was sent to your address. Please check                 your inbox and click on the link in the email in order to                 confirm your subscription."
 msgstr "Su dirección de correo electrónico ha sido registrada. Un correo electrónico de confirmación fue enviado a esta dirección. Por favor verifique su correspondencia y presione sobre el enlace que contiene el correo para confirmar su suscripción."
 
@@ -740,7 +723,7 @@ msgstr "Su dirección de correo electrónico ha sido registrada. Un correo elect
 msgid "Your registered E-Mail address:"
 msgstr "Su dirección de correo electrónico registrada:"
 
-#: EasyNewsletter/browser/registration.py:191
+#: EasyNewsletter/browser/registration.py:189
 msgid "Your subscription was successfully confirmed."
 msgstr "Su suscripción fue confirmada."
 
@@ -760,8 +743,8 @@ msgstr "Agregar suscriptor"
 msgid "cancel"
 msgstr "cancelar"
 
-#: EasyNewsletter/browser/registration.py:268
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:44
+#: EasyNewsletter/browser/registration.py:266
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:53
 msgid "confirm newsletter unsubscription"
 msgstr "confirmar de-suscripción de boletín"
 
@@ -858,34 +841,34 @@ msgid "easynewsletter_unsubscribe_button"
 msgstr "Darse de baja"
 
 #. Default: "Your email has been registered. A confirmation email was sent to your address. Please check your inbox and click  on the link in the email in order to confirm your subscription."
-#: EasyNewsletter/config.py:37
+#: EasyNewsletter/config.py:39
 msgid "email_added"
 msgstr "Tu correo electrónico ha sido registrado. Un correo electrónico de confirmación fue enviado a su dirección. Por favor, revise su bandeja de entrada y haga clic en el enlace en el correo electrónico para confirmar su suscripción."
 
 #. Default: "Your email address is already registered."
-#: EasyNewsletter/config.py:46
+#: EasyNewsletter/config.py:49
 msgid "email_exists"
 msgstr "Su dirección de correo electrónico ya está registrada."
 
 #. Default: "Choose the template to render the email. "
-#: EasyNewsletter/content/newsletter.py:234
-#: EasyNewsletter/content/newsletter_issue.py:129
+#: EasyNewsletter/content/newsletter.py:232
+#: EasyNewsletter/content/newsletter_issue.py:126
 msgid "enl_help_output_template"
 msgstr ""
 
 #. Default: "If checked, the banner image defined on newsletter                     or on this issue will not be used."
-#: EasyNewsletter/content/newsletter_issue.py:169
+#: EasyNewsletter/content/newsletter_issue.py:166
 msgid "enl_issue_help_hide_image"
 msgstr ""
 
 #. Default: "Default output template"
-#: EasyNewsletter/vocabularies/output_templates.py:37
+#: EasyNewsletter/vocabularies/output_templates.py:36
 msgid "enl_label_default_output_template"
 msgstr ""
 
 #. Default: "Output template"
-#: EasyNewsletter/content/newsletter.py:233
-#: EasyNewsletter/content/newsletter_issue.py:128
+#: EasyNewsletter/content/newsletter.py:231
+#: EasyNewsletter/content/newsletter_issue.py:125
 msgid "enl_label_output_template"
 msgstr ""
 
@@ -919,12 +902,12 @@ msgid "import_subscriber"
 msgstr ""
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:44
+#: EasyNewsletter/config.py:46
 msgid "invalid_email"
 msgstr "Por favor, introduce una dirección de correo electrónico válida."
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:48
+#: EasyNewsletter/config.py:52
 msgid "invalid_hashkey"
 msgstr "Por favor, introduce una dirección de correo electrónico válida."
 
@@ -934,7 +917,7 @@ msgid "label_ext_subcriber_source_failed"
 msgstr ""
 
 #. Default: "Hide banner image."
-#: EasyNewsletter/content/newsletter_issue.py:168
+#: EasyNewsletter/content/newsletter_issue.py:165
 msgid "label_issueHideImage"
 msgstr ""
 
@@ -974,12 +957,12 @@ msgid "label_newsletter_path"
 msgstr "Ruta al boletín de noticias"
 
 #. Default: "Mr."
-#: EasyNewsletter/config.py:26
+#: EasyNewsletter/config.py:28
 msgid "label_salutation_mr"
 msgstr "Sr."
 
 #. Default: "Ms."
-#: EasyNewsletter/config.py:25
+#: EasyNewsletter/config.py:27
 msgid "label_salutation_ms"
 msgstr "Srta."
 
@@ -1081,8 +1064,8 @@ msgstr ""
 msgid "source"
 msgstr "Fuente"
 
-#: EasyNewsletter/browser/subscribers.py:215
-#: EasyNewsletter/views/newsletter_subscribers.py:103
+#: EasyNewsletter/browser/subscribers.py:214
+#: EasyNewsletter/views/newsletter_subscribers.py:107
 msgid "subscriber/s deleted successfully"
 msgstr "suscriptores borrados"
 
@@ -1093,7 +1076,7 @@ msgid "subscribers_search_note"
 msgstr ""
 
 #. Default: "Your subscription was successfully confirmed."
-#: EasyNewsletter/config.py:50
+#: EasyNewsletter/config.py:55
 msgid "subscription_confirmed"
 msgstr "Su suscripción se confirmó con éxito."
 
@@ -1108,6 +1091,11 @@ msgstr "Los suscriptores se crearon correctamente"
 msgid "unsubscribe"
 msgstr "darse de baja"
 
-#: EasyNewsletter/content/newsletter.py:200
+#. Default: "You requested to unsubscribe from the following newsletter: ${title}"
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:37
+msgid "you_requested_to_unsubscribe"
+msgstr ""
+
+#: EasyNewsletter/content/newsletter.py:198
 msgid "{{subscriber_salutation}}<br />"
 msgstr ""
diff --git a/src/Products/EasyNewsletter/locales/es/LC_MESSAGES/plone.po b/src/Products/EasyNewsletter/locales/es/LC_MESSAGES/plone.po
index ee8e7fc8..a32b9451 100644
--- a/src/Products/EasyNewsletter/locales/es/LC_MESSAGES/plone.po
+++ b/src/Products/EasyNewsletter/locales/es/LC_MESSAGES/plone.po
@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EasyNewsletter\n"
-"POT-Creation-Date: 2021-02-01 19:16+0000\n"
+"POT-Creation-Date: 2021-02-02 19:02+0000\n"
 "PO-Revision-Date: 2015-07-12 03:05-0430\n"
 "Last-Translator: Leonardo J. Caballero G. <leonardocaballero@gmail.com>\n"
 "Language-Team: ES <LL@li.org>\n"
diff --git a/src/Products/EasyNewsletter/locales/fr/LC_MESSAGES/Products.EasyNewsletter.po b/src/Products/EasyNewsletter/locales/fr/LC_MESSAGES/Products.EasyNewsletter.po
index 8d1aa1b0..21bbd97e 100644
--- a/src/Products/EasyNewsletter/locales/fr/LC_MESSAGES/Products.EasyNewsletter.po
+++ b/src/Products/EasyNewsletter/locales/fr/LC_MESSAGES/Products.EasyNewsletter.po
@@ -53,8 +53,8 @@ msgstr ""
 msgid "Allowed content aggregation types"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:304
-#: EasyNewsletter/views/newsletter_unsubscribe.py:39
+#: EasyNewsletter/browser/registration.py:302
+#: EasyNewsletter/views/newsletter_unsubscribe.py:38
 msgid "An error occured"
 msgstr "Une erreur est survenue"
 
@@ -88,7 +88,7 @@ msgid "Configuration for version 4005"
 msgstr ""
 
 #. Default: "Confirm your subscription on ${portal_url}"
-#: EasyNewsletter/config.py:60
+#: EasyNewsletter/config.py:67
 msgid "Confirm your subscription on ${portal_url}"
 msgstr "Confirmez votre inscription au site ${portal_url}"
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Content types which will be visible in the Content aggregation sources reference field."
 msgstr ""
 
-#: EasyNewsletter/content/newsletter_issue.py:76
+#: EasyNewsletter/content/newsletter_issue.py:73
 msgid "Customizations"
 msgstr ""
 
@@ -108,10 +108,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_output_templates.py:31
-msgid "Default output template"
-msgstr ""
-
 #: EasyNewsletter/browser/enl_subscribers_view.pt:135
 #: EasyNewsletter/views/newsletter_subscribers.pt:151
 msgid "Delete"
@@ -126,152 +122,152 @@ msgid "E-Mail"
 msgstr ""
 
 #. Default: "Choose sources to aggregate newsletter content from."
-#: EasyNewsletter/content/newsletter.py:117
-#: EasyNewsletter/content/newsletter_issue.py:100
+#: EasyNewsletter/content/newsletter.py:115
+#: EasyNewsletter/content/newsletter_issue.py:97
 msgid "ENL_content_aggregation_sources_desc"
 msgstr ""
 
 #. Default: "Content aggregation sources"
-#: EasyNewsletter/content/newsletter.py:113
-#: EasyNewsletter/content/newsletter_issue.py:96
+#: EasyNewsletter/content/newsletter.py:111
+#: EasyNewsletter/content/newsletter_issue.py:93
 msgid "ENL_content_aggregation_sources_label"
 msgstr ""
 
 #. Default: "Text used for confirmation email subject. You can                 customize the text, but it should include the                 placeholder: ${portal_url}!"
-#: EasyNewsletter/content/newsletter.py:248
+#: EasyNewsletter/content/newsletter.py:246
 msgid "ENL_description_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Text used for confirmation email. You can customize                 the text, but it should include the placeholders:                 ${portal_url}, ${subscriber_email} and                 ${confirmation_url}!"
-#: EasyNewsletter/content/newsletter.py:263
+#: EasyNewsletter/content/newsletter.py:261
 msgid "ENL_description_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "The default epilogue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:207
-#: EasyNewsletter/content/newsletter_issue.py:154
+#: EasyNewsletter/content/newsletter.py:205
+#: EasyNewsletter/content/newsletter_issue.py:151
 msgid "ENL_description_text_footer"
 msgstr ""
 
 #. Default: "The default prologue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:194
-#: EasyNewsletter/content/newsletter_issue.py:141
+#: EasyNewsletter/content/newsletter.py:192
+#: EasyNewsletter/content/newsletter_issue.py:138
 msgid "ENL_description_text_header"
 msgstr ""
 
 #. Default: "If checked, the newsletter/mailing will not be send                  to all subscribers inside the newsletter. Changing this                 setting does not affect already existing issues."
-#: EasyNewsletter/content/newsletter.py:222
-#: EasyNewsletter/content/newsletter_issue.py:117
+#: EasyNewsletter/content/newsletter.py:220
+#: EasyNewsletter/content/newsletter_issue.py:114
 msgid "ENL_help_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "This will be used if the subscriber has no fullname."
-#: EasyNewsletter/content/newsletter.py:148
+#: EasyNewsletter/content/newsletter.py:146
 msgid "ENL_help_fullname_fallback"
 msgstr ""
 
 #. Default: "Define here possible salutations for subscriber.                 One salutation per line in the form of: \"mr|Dear Mr.\".                 The left hand value \"mr\" or \"ms\" is mapped to salutation                 of each subscriber and then the right hand value, which                 you can customize is used as salutation."
-#: EasyNewsletter/content/newsletter.py:130
+#: EasyNewsletter/content/newsletter.py:128
 msgid "ENL_help_salutations"
 msgstr ""
 
 #. Default: "Default for the sender address of the newsletters."
-#: EasyNewsletter/content/newsletter.py:81
+#: EasyNewsletter/content/newsletter.py:79
 msgid "ENL_help_senderEmail"
 msgstr ""
 
 #. Default: "Default for the sender name of the newsletters."
-#: EasyNewsletter/content/newsletter.py:90
+#: EasyNewsletter/content/newsletter.py:88
 msgid "ENL_help_senderName"
 msgstr ""
 
 #. Default: "Default for the test email address."
-#: EasyNewsletter/content/newsletter.py:99
+#: EasyNewsletter/content/newsletter.py:97
 msgid "ENL_help_testEmail"
 msgstr ""
 
 #. Default: "This will replace the placeholder {{UNSUBSCRIBE}}."
-#: EasyNewsletter/content/newsletter.py:160
+#: EasyNewsletter/content/newsletter.py:158
 msgid "ENL_help_unsubscribe_string"
 msgstr ""
 
 #. Default: "Banner image, you can include in the templates by\n adding the {{banner}} placeholder into it. By default it should be 600x200 pixel."
-#: EasyNewsletter/content/newsletter.py:171
-#: EasyNewsletter/content/newsletter_issue.py:181
+#: EasyNewsletter/content/newsletter.py:169
+#: EasyNewsletter/content/newsletter_issue.py:178
 msgid "ENL_image_desc"
 msgstr ""
 
 #. Default: "Banner image"
-#: EasyNewsletter/content/newsletter.py:170
-#: EasyNewsletter/content/newsletter_issue.py:180
+#: EasyNewsletter/content/newsletter.py:168
+#: EasyNewsletter/content/newsletter_issue.py:177
 msgid "ENL_image_label"
 msgstr ""
 
 #. Default: "Epilogue"
-#: EasyNewsletter/content/newsletter.py:206
-#: EasyNewsletter/content/newsletter_issue.py:153
+#: EasyNewsletter/content/newsletter.py:204
+#: EasyNewsletter/content/newsletter_issue.py:150
 msgid "ENL_label_default_footer"
 msgstr ""
 
 #. Default: "Prologue"
-#: EasyNewsletter/content/newsletter.py:193
-#: EasyNewsletter/content/newsletter_issue.py:140
+#: EasyNewsletter/content/newsletter.py:191
+#: EasyNewsletter/content/newsletter_issue.py:137
 msgid "ENL_label_default_header"
 msgstr ""
 
 #. Default: "Exclude all subscribers"
-#: EasyNewsletter/content/newsletter.py:221
-#: EasyNewsletter/content/newsletter_issue.py:116
+#: EasyNewsletter/content/newsletter.py:219
+#: EasyNewsletter/content/newsletter_issue.py:113
 msgid "ENL_label_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "Fallback for subscribers without a name."
-#: EasyNewsletter/content/newsletter.py:144
+#: EasyNewsletter/content/newsletter.py:142
 msgid "ENL_label_fullname_fallback"
 msgstr ""
 
 #. Default: "Subscriber Salutations."
-#: EasyNewsletter/content/newsletter.py:129
+#: EasyNewsletter/content/newsletter.py:127
 msgid "ENL_label_salutations"
 msgstr ""
 
 #. Default: "Sender email"
-#: EasyNewsletter/content/newsletter.py:80
+#: EasyNewsletter/content/newsletter.py:78
 msgid "ENL_label_senderEmail"
 msgstr ""
 
 #. Default: "Sender name"
-#: EasyNewsletter/content/newsletter.py:89
+#: EasyNewsletter/content/newsletter.py:87
 msgid "ENL_label_senderName"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail subject"
-#: EasyNewsletter/content/newsletter.py:244
+#: EasyNewsletter/content/newsletter.py:242
 msgid "ENL_label_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail text"
-#: EasyNewsletter/content/newsletter.py:259
+#: EasyNewsletter/content/newsletter.py:257
 msgid "ENL_label_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "Test email"
-#: EasyNewsletter/content/newsletter.py:98
+#: EasyNewsletter/content/newsletter.py:96
 msgid "ENL_label_testEmail"
 msgstr ""
 
 #. Default: "Text for the 'unsubscribe' link"
-#: EasyNewsletter/content/newsletter.py:157
+#: EasyNewsletter/content/newsletter.py:155
 msgid "ENL_label_unsubscribe_string"
 msgstr ""
 
 #. Default: "Logo image, you can include in the templates by\n adding the {{logo}} placeholder into it."
-#: EasyNewsletter/content/newsletter.py:183
+#: EasyNewsletter/content/newsletter.py:181
 msgid "ENL_logo_desc"
 msgstr ""
 
 #. Default: "Logo image"
-#: EasyNewsletter/content/newsletter.py:182
+#: EasyNewsletter/content/newsletter.py:180
 msgid "ENL_logo_label"
 msgstr ""
 
@@ -286,13 +282,13 @@ msgid "EasyNewsletter_help_name_prefix"
 msgstr ""
 
 #. Default: "Choose Plone Groups which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:70
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:67
 #, fuzzy
 msgid "EasyNewsletter_help_ploneReceiverGroups"
 msgstr "Choisissez les groupes dont les membres doivent recevoir la newsletter."
 
 #. Default: "Choose Plone Members which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:54
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:51
 #, fuzzy
 msgid "EasyNewsletter_help_ploneReceiverMembers"
 msgstr "Choisissez les utilisateurs devant recevoir la newsletter."
@@ -351,12 +347,12 @@ msgid "EasyNewsletter_label_organization"
 msgstr "Organisation"
 
 #. Default: "Plone Groups to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:66
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:63
 msgid "EasyNewsletter_label_ploneReceiverGroups"
 msgstr "Groupes d'utilisateurs du site qui recevront la lettre"
 
 #. Default: "Plone Members to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:50
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:47
 msgid "EasyNewsletter_label_ploneReceiverMembers"
 msgstr "Membres du site qui recevront la lettre"
 
@@ -405,7 +401,7 @@ msgstr ""
 msgid "Email"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:317
+#: EasyNewsletter/browser/subscribers.py:316
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:132
 msgid "Email existed, updated subscriber."
 msgstr ""
@@ -428,10 +424,6 @@ msgstr ""
 msgid "First Name"
 msgstr "Prénom"
 
-#: EasyNewsletter/tests/test_vocab_aggregation_templates.py:31
-msgid "Generic Listing"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:28
 #: EasyNewsletter/views/newsletter_subscribers_upload.pt:13
 msgid "Import"
@@ -453,10 +445,6 @@ msgstr "Lettre brouillon"
 msgid "Issue masters"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_plone_users.py:38
-msgid "Jane Doe - jane@plone.org"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:94
 msgid "Language"
 msgstr ""
@@ -470,17 +458,16 @@ msgstr ""
 msgid "Masters"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:293
+#: EasyNewsletter/browser/subscribers.py:292
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:108
 msgid "More than one subscriber with this email address existed, subscriber info was NOT updated. Check manually!"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/salutations.py:26
+#: EasyNewsletter/vocabularies/salutations.py:25
 msgid "Mr"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_salutations.py:32
-#: EasyNewsletter/vocabularies/salutations.py:25
+#: EasyNewsletter/vocabularies/salutations.py:24
 msgid "Ms"
 msgstr ""
 
@@ -496,7 +483,7 @@ msgstr ""
 msgid "Newsletter Subscriber"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:29
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:27
 msgid "Newsletter aggregation template"
 msgstr ""
 
@@ -508,7 +495,7 @@ msgstr ""
 msgid "Newsletter content successfully aggregated."
 msgstr ""
 
-#: EasyNewsletter/views/newsletter_issue_statistics.py:22
+#: EasyNewsletter/views/newsletter_issue_statistics.py:23
 msgid "Newsletter issue statistics have been reset."
 msgstr ""
 
@@ -516,17 +503,17 @@ msgstr ""
 msgid "Newsletter subscriber portlet"
 msgstr ""
 
-#: EasyNewsletter/views/newsletter_issue_send.py:201
+#: EasyNewsletter/views/newsletter_issue_send.py:205
 msgid "Newsletter was sent to ({0}) receivers. ({1}) errors occurred!{2}"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:254
+#: EasyNewsletter/browser/subscribers.py:253
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:68
 msgid "No file specified."
 msgstr "Aucun fichier sélectionné"
 
-#: EasyNewsletter/browser/subscribers.py:208
-#: EasyNewsletter/views/newsletter_subscribers.py:96
+#: EasyNewsletter/browser/subscribers.py:207
+#: EasyNewsletter/views/newsletter_subscribers.py:100
 msgid "No subscriber selected!"
 msgstr ""
 
@@ -535,16 +522,16 @@ msgstr ""
 msgid "Organization"
 msgstr "Organisation"
 
-#: EasyNewsletter/content/newsletter.py:61
+#: EasyNewsletter/content/newsletter.py:59
 msgid "Personalization"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:195
+#: EasyNewsletter/browser/registration.py:193
 msgid "Please enter a valid email address."
 msgstr "Veuillez saisir une adresse email valide"
 
-#: EasyNewsletter/browser/registration.py:292
-#: EasyNewsletter/views/newsletter_unsubscribe.py:24
+#: EasyNewsletter/browser/registration.py:290
+#: EasyNewsletter/views/newsletter_unsubscribe.py:23
 msgid "Please use the correct unsubscribe url!"
 msgstr ""
 
@@ -577,7 +564,7 @@ msgstr ""
 msgid "Products.EasyNewsletter (4005)"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/plone_users.py:49
+#: EasyNewsletter/vocabularies/plone_users.py:47
 msgid "Property email: \"{0}\" is not an email!"
 msgstr ""
 
@@ -590,8 +577,8 @@ msgstr ""
 msgid "Reason for failure"
 msgstr "Cause de l'échec"
 
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:45
-#: EasyNewsletter/content/newsletter.py:76
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:42
+#: EasyNewsletter/content/newsletter.py:74
 msgid "Recipients"
 msgstr ""
 
@@ -614,7 +601,7 @@ msgstr ""
 msgid "Select your CSV file here."
 msgstr "Sélectionnez votre fichier CSV"
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:24
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:22
 msgid "Settings"
 msgstr ""
 
@@ -627,7 +614,7 @@ msgstr ""
 msgid "Subscriber Search"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:350
+#: EasyNewsletter/browser/subscribers.py:349
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:166
 msgid "Subscriber created."
 msgstr ""
@@ -651,7 +638,7 @@ msgstr ""
 msgid "Tester"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:30
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:28
 msgid "The <a href=\"https://productseasynewsletter.readthedocs.io/en/latest/#aggregation-templates\">aggregation template</a> used by the Newsletter to render Collection items for the Newsletter."
 msgstr ""
 
@@ -661,7 +648,7 @@ msgid "The CSV file must contain the header and follow this format"
 msgstr "Le fichier CSV doit contenir l'entête et reprendre ce format"
 
 #: EasyNewsletter/browser/issue.py:74
-#: EasyNewsletter/views/newsletter_issue_send.py:81
+#: EasyNewsletter/views/newsletter_issue_send.py:85
 msgid "The issue has been generated and sent to the mail server."
 msgstr ""
 
@@ -670,11 +657,11 @@ msgid "The issue sending has been initiated in the background."
 msgstr ""
 
 #: EasyNewsletter/browser/issue.py:55
-#: EasyNewsletter/views/newsletter_issue_send.py:62
+#: EasyNewsletter/views/newsletter_issue_send.py:66
 msgid "The issue test sending has been initiated."
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:275
+#: EasyNewsletter/browser/subscribers.py:274
 msgid "The number of items in the line is not correct.                         It should be 7. Check your CSV file."
 msgstr ""
 
@@ -695,28 +682,24 @@ msgstr "Titre"
 msgid "Title for the portlet."
 msgstr "Titre de la portlet"
 
-#: EasyNewsletter/tests/test_vocab_plone_groups.py:35
-msgid "VIP"
-msgstr ""
-
 #: EasyNewsletter/profiles/default/types/Newsletter.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Issue.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Subscriber.xml
 msgid "View"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:272
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:48
+#: EasyNewsletter/browser/registration.py:270
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:58
 msgid "We send you an email, please confirm this unsubscription."
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:265
+#: EasyNewsletter/browser/subscribers.py:264
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:78
 msgid "Wrong specification of the CSV file. Please correct it and retry."
 msgstr "Mauvais format du fichier CSV. Veuillez le corriger et recommencer."
 
-#: EasyNewsletter/browser/registration.py:307
-#: EasyNewsletter/views/newsletter_unsubscribe.py:46
+#: EasyNewsletter/browser/registration.py:305
+#: EasyNewsletter/views/newsletter_unsubscribe.py:45
 msgid "You have been unsubscribed."
 msgstr "Vous avez été désabonné(e)."
 
@@ -724,16 +707,16 @@ msgstr "Vous avez été désabonné(e)."
 msgid "You want to unsubscribe from this Newsletter?"
 msgstr "Vous désirez vous désabonner de cette lettre?"
 
-#: EasyNewsletter/browser/registration.py:278
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:56
+#: EasyNewsletter/browser/registration.py:276
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:66
 msgid "Your email address could not be found in subscribers."
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:95
+#: EasyNewsletter/browser/registration.py:93
 msgid "Your email address is already registered."
 msgstr "Votre adresse email est déjà enregistrée."
 
-#: EasyNewsletter/browser/registration.py:142
+#: EasyNewsletter/browser/registration.py:140
 msgid "Your email has been registered.                 A confirmation email was sent to your address. Please check                 your inbox and click on the link in the email in order to                 confirm your subscription."
 msgstr "Votre email a été enregistré. Un message de confirmation vous a été adressé. Veuillez vérifier votre messagerie et cliquer sur le lien de confirmation pour valider votre inscription."
 
@@ -741,7 +724,7 @@ msgstr "Votre email a été enregistré. Un message de confirmation vous a été
 msgid "Your registered E-Mail address:"
 msgstr "Votre adresse E-mail enregistrée:"
 
-#: EasyNewsletter/browser/registration.py:191
+#: EasyNewsletter/browser/registration.py:189
 msgid "Your subscription was successfully confirmed."
 msgstr "Votre inscription est confirmée. Merci!"
 
@@ -761,8 +744,8 @@ msgstr "ajouter un abonné"
 msgid "cancel"
 msgstr "Annuler"
 
-#: EasyNewsletter/browser/registration.py:268
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:44
+#: EasyNewsletter/browser/registration.py:266
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:53
 msgid "confirm newsletter unsubscription"
 msgstr ""
 
@@ -860,35 +843,35 @@ msgid "easynewsletter_unsubscribe_button"
 msgstr "Désabonner"
 
 #. Default: "Your email has been registered. A confirmation email was sent to your address. Please check your inbox and click  on the link in the email in order to confirm your subscription."
-#: EasyNewsletter/config.py:37
+#: EasyNewsletter/config.py:39
 #, fuzzy
 msgid "email_added"
 msgstr "Votre email a été enregistré. Un message de confirmation vous a été adressé. Veuillez vérifier votre messagerie et cliquer sur le lien de confirmation pour valider votre inscription."
 
 #. Default: "Your email address is already registered."
-#: EasyNewsletter/config.py:46
+#: EasyNewsletter/config.py:49
 msgid "email_exists"
 msgstr ""
 
 #. Default: "Choose the template to render the email. "
-#: EasyNewsletter/content/newsletter.py:234
-#: EasyNewsletter/content/newsletter_issue.py:129
+#: EasyNewsletter/content/newsletter.py:232
+#: EasyNewsletter/content/newsletter_issue.py:126
 msgid "enl_help_output_template"
 msgstr ""
 
 #. Default: "If checked, the banner image defined on newsletter                     or on this issue will not be used."
-#: EasyNewsletter/content/newsletter_issue.py:169
+#: EasyNewsletter/content/newsletter_issue.py:166
 msgid "enl_issue_help_hide_image"
 msgstr ""
 
 #. Default: "Default output template"
-#: EasyNewsletter/vocabularies/output_templates.py:37
+#: EasyNewsletter/vocabularies/output_templates.py:36
 msgid "enl_label_default_output_template"
 msgstr ""
 
 #. Default: "Output template"
-#: EasyNewsletter/content/newsletter.py:233
-#: EasyNewsletter/content/newsletter_issue.py:128
+#: EasyNewsletter/content/newsletter.py:231
+#: EasyNewsletter/content/newsletter_issue.py:125
 msgid "enl_label_output_template"
 msgstr ""
 
@@ -922,12 +905,12 @@ msgid "import_subscriber"
 msgstr ""
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:44
+#: EasyNewsletter/config.py:46
 msgid "invalid_email"
 msgstr ""
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:48
+#: EasyNewsletter/config.py:52
 msgid "invalid_hashkey"
 msgstr ""
 
@@ -937,7 +920,7 @@ msgid "label_ext_subcriber_source_failed"
 msgstr ""
 
 #. Default: "Hide banner image."
-#: EasyNewsletter/content/newsletter_issue.py:168
+#: EasyNewsletter/content/newsletter_issue.py:165
 msgid "label_issueHideImage"
 msgstr ""
 
@@ -977,12 +960,12 @@ msgid "label_newsletter_path"
 msgstr ""
 
 #. Default: "Mr."
-#: EasyNewsletter/config.py:26
+#: EasyNewsletter/config.py:28
 msgid "label_salutation_mr"
 msgstr "Monsieur"
 
 #. Default: "Ms."
-#: EasyNewsletter/config.py:25
+#: EasyNewsletter/config.py:27
 msgid "label_salutation_ms"
 msgstr "Madame"
 
@@ -1085,8 +1068,8 @@ msgstr ""
 msgid "source"
 msgstr "Source"
 
-#: EasyNewsletter/browser/subscribers.py:215
-#: EasyNewsletter/views/newsletter_subscribers.py:103
+#: EasyNewsletter/browser/subscribers.py:214
+#: EasyNewsletter/views/newsletter_subscribers.py:107
 msgid "subscriber/s deleted successfully"
 msgstr "Abonné(s) supprimé(s) avec succès"
 
@@ -1097,7 +1080,7 @@ msgid "subscribers_search_note"
 msgstr ""
 
 #. Default: "Your subscription was successfully confirmed."
-#: EasyNewsletter/config.py:50
+#: EasyNewsletter/config.py:55
 msgid "subscription_confirmed"
 msgstr ""
 
@@ -1112,6 +1095,11 @@ msgstr "Abonnés créés avec succès"
 msgid "unsubscribe"
 msgstr "Désabonner"
 
-#: EasyNewsletter/content/newsletter.py:200
+#. Default: "You requested to unsubscribe from the following newsletter: ${title}"
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:37
+msgid "you_requested_to_unsubscribe"
+msgstr ""
+
+#: EasyNewsletter/content/newsletter.py:198
 msgid "{{subscriber_salutation}}<br />"
 msgstr ""
diff --git a/src/Products/EasyNewsletter/locales/fr/LC_MESSAGES/plone.po b/src/Products/EasyNewsletter/locales/fr/LC_MESSAGES/plone.po
index 2c8e08f5..e931282d 100644
--- a/src/Products/EasyNewsletter/locales/fr/LC_MESSAGES/plone.po
+++ b/src/Products/EasyNewsletter/locales/fr/LC_MESSAGES/plone.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-02-01 19:16+0000\n"
+"POT-Creation-Date: 2021-02-02 19:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/Products/EasyNewsletter/locales/it/LC_MESSAGES/Products.EasyNewsletter.po b/src/Products/EasyNewsletter/locales/it/LC_MESSAGES/Products.EasyNewsletter.po
index a7b6bb7d..fdcbc67a 100644
--- a/src/Products/EasyNewsletter/locales/it/LC_MESSAGES/Products.EasyNewsletter.po
+++ b/src/Products/EasyNewsletter/locales/it/LC_MESSAGES/Products.EasyNewsletter.po
@@ -49,8 +49,8 @@ msgstr ""
 msgid "Allowed content aggregation types"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:304
-#: EasyNewsletter/views/newsletter_unsubscribe.py:39
+#: EasyNewsletter/browser/registration.py:302
+#: EasyNewsletter/views/newsletter_unsubscribe.py:38
 msgid "An error occured"
 msgstr "Si è verificato un errore"
 
@@ -83,7 +83,7 @@ msgstr ""
 msgid "Configuration for version 4005"
 msgstr ""
 
-#: EasyNewsletter/config.py:60
+#: EasyNewsletter/config.py:67
 msgid "Confirm your subscription on ${portal_url}"
 msgstr ""
 
@@ -95,7 +95,7 @@ msgstr ""
 msgid "Content types which will be visible in the Content aggregation sources reference field."
 msgstr ""
 
-#: EasyNewsletter/content/newsletter_issue.py:76
+#: EasyNewsletter/content/newsletter_issue.py:73
 msgid "Customizations"
 msgstr ""
 
@@ -103,10 +103,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_output_templates.py:31
-msgid "Default output template"
-msgstr ""
-
 #: EasyNewsletter/browser/enl_subscribers_view.pt:135
 #: EasyNewsletter/views/newsletter_subscribers.pt:151
 msgid "Delete"
@@ -121,152 +117,152 @@ msgid "E-Mail"
 msgstr ""
 
 #. Default: "Choose sources to aggregate newsletter content from."
-#: EasyNewsletter/content/newsletter.py:117
-#: EasyNewsletter/content/newsletter_issue.py:100
+#: EasyNewsletter/content/newsletter.py:115
+#: EasyNewsletter/content/newsletter_issue.py:97
 msgid "ENL_content_aggregation_sources_desc"
 msgstr ""
 
 #. Default: "Content aggregation sources"
-#: EasyNewsletter/content/newsletter.py:113
-#: EasyNewsletter/content/newsletter_issue.py:96
+#: EasyNewsletter/content/newsletter.py:111
+#: EasyNewsletter/content/newsletter_issue.py:93
 msgid "ENL_content_aggregation_sources_label"
 msgstr ""
 
 #. Default: "Text used for confirmation email subject. You can                 customize the text, but it should include the                 placeholder: ${portal_url}!"
-#: EasyNewsletter/content/newsletter.py:248
+#: EasyNewsletter/content/newsletter.py:246
 msgid "ENL_description_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Text used for confirmation email. You can customize                 the text, but it should include the placeholders:                 ${portal_url}, ${subscriber_email} and                 ${confirmation_url}!"
-#: EasyNewsletter/content/newsletter.py:263
+#: EasyNewsletter/content/newsletter.py:261
 msgid "ENL_description_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "The default epilogue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:207
-#: EasyNewsletter/content/newsletter_issue.py:154
+#: EasyNewsletter/content/newsletter.py:205
+#: EasyNewsletter/content/newsletter_issue.py:151
 msgid "ENL_description_text_footer"
 msgstr ""
 
 #. Default: "The default prologue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:194
-#: EasyNewsletter/content/newsletter_issue.py:141
+#: EasyNewsletter/content/newsletter.py:192
+#: EasyNewsletter/content/newsletter_issue.py:138
 msgid "ENL_description_text_header"
 msgstr ""
 
 #. Default: "If checked, the newsletter/mailing will not be send                  to all subscribers inside the newsletter. Changing this                 setting does not affect already existing issues."
-#: EasyNewsletter/content/newsletter.py:222
-#: EasyNewsletter/content/newsletter_issue.py:117
+#: EasyNewsletter/content/newsletter.py:220
+#: EasyNewsletter/content/newsletter_issue.py:114
 msgid "ENL_help_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "This will be used if the subscriber has no fullname."
-#: EasyNewsletter/content/newsletter.py:148
+#: EasyNewsletter/content/newsletter.py:146
 msgid "ENL_help_fullname_fallback"
 msgstr ""
 
 #. Default: "Define here possible salutations for subscriber.                 One salutation per line in the form of: \"mr|Dear Mr.\".                 The left hand value \"mr\" or \"ms\" is mapped to salutation                 of each subscriber and then the right hand value, which                 you can customize is used as salutation."
-#: EasyNewsletter/content/newsletter.py:130
+#: EasyNewsletter/content/newsletter.py:128
 msgid "ENL_help_salutations"
 msgstr ""
 
 #. Default: "Default for the sender address of the newsletters."
-#: EasyNewsletter/content/newsletter.py:81
+#: EasyNewsletter/content/newsletter.py:79
 msgid "ENL_help_senderEmail"
 msgstr ""
 
 #. Default: "Default for the sender name of the newsletters."
-#: EasyNewsletter/content/newsletter.py:90
+#: EasyNewsletter/content/newsletter.py:88
 msgid "ENL_help_senderName"
 msgstr ""
 
 #. Default: "Default for the test email address."
-#: EasyNewsletter/content/newsletter.py:99
+#: EasyNewsletter/content/newsletter.py:97
 msgid "ENL_help_testEmail"
 msgstr ""
 
 #. Default: "This will replace the placeholder {{UNSUBSCRIBE}}."
-#: EasyNewsletter/content/newsletter.py:160
+#: EasyNewsletter/content/newsletter.py:158
 msgid "ENL_help_unsubscribe_string"
 msgstr ""
 
 #. Default: "Banner image, you can include in the templates by\n adding the {{banner}} placeholder into it. By default it should be 600x200 pixel."
-#: EasyNewsletter/content/newsletter.py:171
-#: EasyNewsletter/content/newsletter_issue.py:181
+#: EasyNewsletter/content/newsletter.py:169
+#: EasyNewsletter/content/newsletter_issue.py:178
 msgid "ENL_image_desc"
 msgstr ""
 
 #. Default: "Banner image"
-#: EasyNewsletter/content/newsletter.py:170
-#: EasyNewsletter/content/newsletter_issue.py:180
+#: EasyNewsletter/content/newsletter.py:168
+#: EasyNewsletter/content/newsletter_issue.py:177
 msgid "ENL_image_label"
 msgstr ""
 
 #. Default: "Epilogue"
-#: EasyNewsletter/content/newsletter.py:206
-#: EasyNewsletter/content/newsletter_issue.py:153
+#: EasyNewsletter/content/newsletter.py:204
+#: EasyNewsletter/content/newsletter_issue.py:150
 msgid "ENL_label_default_footer"
 msgstr ""
 
 #. Default: "Prologue"
-#: EasyNewsletter/content/newsletter.py:193
-#: EasyNewsletter/content/newsletter_issue.py:140
+#: EasyNewsletter/content/newsletter.py:191
+#: EasyNewsletter/content/newsletter_issue.py:137
 msgid "ENL_label_default_header"
 msgstr ""
 
 #. Default: "Exclude all subscribers"
-#: EasyNewsletter/content/newsletter.py:221
-#: EasyNewsletter/content/newsletter_issue.py:116
+#: EasyNewsletter/content/newsletter.py:219
+#: EasyNewsletter/content/newsletter_issue.py:113
 msgid "ENL_label_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "Fallback for subscribers without a name."
-#: EasyNewsletter/content/newsletter.py:144
+#: EasyNewsletter/content/newsletter.py:142
 msgid "ENL_label_fullname_fallback"
 msgstr ""
 
 #. Default: "Subscriber Salutations."
-#: EasyNewsletter/content/newsletter.py:129
+#: EasyNewsletter/content/newsletter.py:127
 msgid "ENL_label_salutations"
 msgstr ""
 
 #. Default: "Sender email"
-#: EasyNewsletter/content/newsletter.py:80
+#: EasyNewsletter/content/newsletter.py:78
 msgid "ENL_label_senderEmail"
 msgstr ""
 
 #. Default: "Sender name"
-#: EasyNewsletter/content/newsletter.py:89
+#: EasyNewsletter/content/newsletter.py:87
 msgid "ENL_label_senderName"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail subject"
-#: EasyNewsletter/content/newsletter.py:244
+#: EasyNewsletter/content/newsletter.py:242
 msgid "ENL_label_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail text"
-#: EasyNewsletter/content/newsletter.py:259
+#: EasyNewsletter/content/newsletter.py:257
 msgid "ENL_label_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "Test email"
-#: EasyNewsletter/content/newsletter.py:98
+#: EasyNewsletter/content/newsletter.py:96
 msgid "ENL_label_testEmail"
 msgstr ""
 
 #. Default: "Text for the 'unsubscribe' link"
-#: EasyNewsletter/content/newsletter.py:157
+#: EasyNewsletter/content/newsletter.py:155
 msgid "ENL_label_unsubscribe_string"
 msgstr ""
 
 #. Default: "Logo image, you can include in the templates by\n adding the {{logo}} placeholder into it."
-#: EasyNewsletter/content/newsletter.py:183
+#: EasyNewsletter/content/newsletter.py:181
 msgid "ENL_logo_desc"
 msgstr ""
 
 #. Default: "Logo image"
-#: EasyNewsletter/content/newsletter.py:182
+#: EasyNewsletter/content/newsletter.py:180
 msgid "ENL_logo_label"
 msgstr ""
 
@@ -281,13 +277,13 @@ msgid "EasyNewsletter_help_name_prefix"
 msgstr ""
 
 #. Default: "Choose Plone Groups which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:70
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:67
 #, fuzzy
 msgid "EasyNewsletter_help_ploneReceiverGroups"
 msgstr "Seleziona un gruppo di utenti al quale inviare la newsletter"
 
 #. Default: "Choose Plone Members which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:54
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:51
 #, fuzzy
 msgid "EasyNewsletter_help_ploneReceiverMembers"
 msgstr "Seleziona gli utenti ai quali inviare la newsletter"
@@ -346,12 +342,12 @@ msgid "EasyNewsletter_label_organization"
 msgstr "Azienda/Organizzazione"
 
 #. Default: "Plone Groups to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:66
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:63
 msgid "EasyNewsletter_label_ploneReceiverGroups"
 msgstr ""
 
 #. Default: "Plone Members to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:50
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:47
 msgid "EasyNewsletter_label_ploneReceiverMembers"
 msgstr "Utenti del portale che riceveranno la newsletter"
 
@@ -400,7 +396,7 @@ msgstr "Modifica il riquadro newsletter"
 msgid "Email"
 msgstr "E-Mail"
 
-#: EasyNewsletter/browser/subscribers.py:317
+#: EasyNewsletter/browser/subscribers.py:316
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:132
 msgid "Email existed, updated subscriber."
 msgstr ""
@@ -423,10 +419,6 @@ msgstr ""
 msgid "First Name"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_aggregation_templates.py:31
-msgid "Generic Listing"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:28
 #: EasyNewsletter/views/newsletter_subscribers_upload.pt:13
 msgid "Import"
@@ -448,10 +440,6 @@ msgstr ""
 msgid "Issue masters"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_plone_users.py:38
-msgid "Jane Doe - jane@plone.org"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:94
 msgid "Language"
 msgstr ""
@@ -465,17 +453,16 @@ msgstr ""
 msgid "Masters"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:293
+#: EasyNewsletter/browser/subscribers.py:292
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:108
 msgid "More than one subscriber with this email address existed, subscriber info was NOT updated. Check manually!"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/salutations.py:26
+#: EasyNewsletter/vocabularies/salutations.py:25
 msgid "Mr"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_salutations.py:32
-#: EasyNewsletter/vocabularies/salutations.py:25
+#: EasyNewsletter/vocabularies/salutations.py:24
 msgid "Ms"
 msgstr ""
 
@@ -491,7 +478,7 @@ msgstr ""
 msgid "Newsletter Subscriber"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:29
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:27
 msgid "Newsletter aggregation template"
 msgstr ""
 
@@ -503,7 +490,7 @@ msgstr ""
 msgid "Newsletter content successfully aggregated."
 msgstr ""
 
-#: EasyNewsletter/views/newsletter_issue_statistics.py:22
+#: EasyNewsletter/views/newsletter_issue_statistics.py:23
 msgid "Newsletter issue statistics have been reset."
 msgstr ""
 
@@ -511,17 +498,17 @@ msgstr ""
 msgid "Newsletter subscriber portlet"
 msgstr "Portlet di iscrizione alla newsletter"
 
-#: EasyNewsletter/views/newsletter_issue_send.py:201
+#: EasyNewsletter/views/newsletter_issue_send.py:205
 msgid "Newsletter was sent to ({0}) receivers. ({1}) errors occurred!{2}"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:254
+#: EasyNewsletter/browser/subscribers.py:253
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:68
 msgid "No file specified."
 msgstr "Nessun file specificato."
 
-#: EasyNewsletter/browser/subscribers.py:208
-#: EasyNewsletter/views/newsletter_subscribers.py:96
+#: EasyNewsletter/browser/subscribers.py:207
+#: EasyNewsletter/views/newsletter_subscribers.py:100
 msgid "No subscriber selected!"
 msgstr "Nessun iscritto selezionato"
 
@@ -530,16 +517,16 @@ msgstr "Nessun iscritto selezionato"
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: EasyNewsletter/content/newsletter.py:61
+#: EasyNewsletter/content/newsletter.py:59
 msgid "Personalization"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:195
+#: EasyNewsletter/browser/registration.py:193
 msgid "Please enter a valid email address."
 msgstr "Prego inserire un indirizzo e-mail valido."
 
-#: EasyNewsletter/browser/registration.py:292
-#: EasyNewsletter/views/newsletter_unsubscribe.py:24
+#: EasyNewsletter/browser/registration.py:290
+#: EasyNewsletter/views/newsletter_unsubscribe.py:23
 msgid "Please use the correct unsubscribe url!"
 msgstr ""
 
@@ -572,7 +559,7 @@ msgstr ""
 msgid "Products.EasyNewsletter (4005)"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/plone_users.py:49
+#: EasyNewsletter/vocabularies/plone_users.py:47
 msgid "Property email: \"{0}\" is not an email!"
 msgstr ""
 
@@ -585,8 +572,8 @@ msgstr ""
 msgid "Reason for failure"
 msgstr "Motivo del fallimento"
 
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:45
-#: EasyNewsletter/content/newsletter.py:76
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:42
+#: EasyNewsletter/content/newsletter.py:74
 msgid "Recipients"
 msgstr ""
 
@@ -609,7 +596,7 @@ msgstr ""
 msgid "Select your CSV file here."
 msgstr "Seleziona il file CSV."
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:24
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:22
 msgid "Settings"
 msgstr ""
 
@@ -622,7 +609,7 @@ msgstr ""
 msgid "Subscriber Search"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:350
+#: EasyNewsletter/browser/subscribers.py:349
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:166
 msgid "Subscriber created."
 msgstr ""
@@ -646,7 +633,7 @@ msgstr ""
 msgid "Tester"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:30
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:28
 msgid "The <a href=\"https://productseasynewsletter.readthedocs.io/en/latest/#aggregation-templates\">aggregation template</a> used by the Newsletter to render Collection items for the Newsletter."
 msgstr ""
 
@@ -656,7 +643,7 @@ msgid "The CSV file must contain the header and follow this format"
 msgstr "Il CSV deve contenere un header col seguente formato"
 
 #: EasyNewsletter/browser/issue.py:74
-#: EasyNewsletter/views/newsletter_issue_send.py:81
+#: EasyNewsletter/views/newsletter_issue_send.py:85
 msgid "The issue has been generated and sent to the mail server."
 msgstr ""
 
@@ -665,11 +652,11 @@ msgid "The issue sending has been initiated in the background."
 msgstr ""
 
 #: EasyNewsletter/browser/issue.py:55
-#: EasyNewsletter/views/newsletter_issue_send.py:62
+#: EasyNewsletter/views/newsletter_issue_send.py:66
 msgid "The issue test sending has been initiated."
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:275
+#: EasyNewsletter/browser/subscribers.py:274
 msgid "The number of items in the line is not correct.                         It should be 7. Check your CSV file."
 msgstr ""
 
@@ -690,28 +677,24 @@ msgstr ""
 msgid "Title for the portlet."
 msgstr "Titolo del riquadro."
 
-#: EasyNewsletter/tests/test_vocab_plone_groups.py:35
-msgid "VIP"
-msgstr ""
-
 #: EasyNewsletter/profiles/default/types/Newsletter.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Issue.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Subscriber.xml
 msgid "View"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:272
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:48
+#: EasyNewsletter/browser/registration.py:270
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:58
 msgid "We send you an email, please confirm this unsubscription."
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:265
+#: EasyNewsletter/browser/subscribers.py:264
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:78
 msgid "Wrong specification of the CSV file. Please correct it and retry."
 msgstr "Formato del file CSV non valido. Correggere e riprovare."
 
-#: EasyNewsletter/browser/registration.py:307
-#: EasyNewsletter/views/newsletter_unsubscribe.py:46
+#: EasyNewsletter/browser/registration.py:305
+#: EasyNewsletter/views/newsletter_unsubscribe.py:45
 msgid "You have been unsubscribed."
 msgstr "La tua registrazione è stata annullata."
 
@@ -719,16 +702,16 @@ msgstr "La tua registrazione è stata annullata."
 msgid "You want to unsubscribe from this Newsletter?"
 msgstr "Si desidera annullare l'iscrizione a questa newsletter?"
 
-#: EasyNewsletter/browser/registration.py:278
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:56
+#: EasyNewsletter/browser/registration.py:276
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:66
 msgid "Your email address could not be found in subscribers."
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:95
+#: EasyNewsletter/browser/registration.py:93
 msgid "Your email address is already registered."
 msgstr "Il tuo indirizzo email è già registrato."
 
-#: EasyNewsletter/browser/registration.py:142
+#: EasyNewsletter/browser/registration.py:140
 msgid "Your email has been registered.                 A confirmation email was sent to your address. Please check                 your inbox and click on the link in the email in order to                 confirm your subscription."
 msgstr "La tua email è stata registrata. Un'email di conferma è stata inviata al tuo indirizzo. Controlla la tua posta in ingresso e clicca sul link di conferma della registrazione."
 
@@ -736,7 +719,7 @@ msgstr "La tua email è stata registrata. Un'email di conferma è stata inviata
 msgid "Your registered E-Mail address:"
 msgstr "Il tuo indirizzo e-mail registrato"
 
-#: EasyNewsletter/browser/registration.py:191
+#: EasyNewsletter/browser/registration.py:189
 msgid "Your subscription was successfully confirmed."
 msgstr ""
 
@@ -756,8 +739,8 @@ msgstr ""
 msgid "cancel"
 msgstr "Annullare"
 
-#: EasyNewsletter/browser/registration.py:268
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:44
+#: EasyNewsletter/browser/registration.py:266
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:53
 msgid "confirm newsletter unsubscription"
 msgstr ""
 
@@ -855,34 +838,34 @@ msgid "easynewsletter_unsubscribe_button"
 msgstr "Cancellati"
 
 #. Default: "Your email has been registered. A confirmation email was sent to your address. Please check your inbox and click  on the link in the email in order to confirm your subscription."
-#: EasyNewsletter/config.py:37
+#: EasyNewsletter/config.py:39
 msgid "email_added"
 msgstr ""
 
 #. Default: "Your email address is already registered."
-#: EasyNewsletter/config.py:46
+#: EasyNewsletter/config.py:49
 msgid "email_exists"
 msgstr ""
 
 #. Default: "Choose the template to render the email. "
-#: EasyNewsletter/content/newsletter.py:234
-#: EasyNewsletter/content/newsletter_issue.py:129
+#: EasyNewsletter/content/newsletter.py:232
+#: EasyNewsletter/content/newsletter_issue.py:126
 msgid "enl_help_output_template"
 msgstr ""
 
 #. Default: "If checked, the banner image defined on newsletter                     or on this issue will not be used."
-#: EasyNewsletter/content/newsletter_issue.py:169
+#: EasyNewsletter/content/newsletter_issue.py:166
 msgid "enl_issue_help_hide_image"
 msgstr ""
 
 #. Default: "Default output template"
-#: EasyNewsletter/vocabularies/output_templates.py:37
+#: EasyNewsletter/vocabularies/output_templates.py:36
 msgid "enl_label_default_output_template"
 msgstr ""
 
 #. Default: "Output template"
-#: EasyNewsletter/content/newsletter.py:233
-#: EasyNewsletter/content/newsletter_issue.py:128
+#: EasyNewsletter/content/newsletter.py:231
+#: EasyNewsletter/content/newsletter_issue.py:125
 msgid "enl_label_output_template"
 msgstr ""
 
@@ -916,12 +899,12 @@ msgid "import_subscriber"
 msgstr ""
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:44
+#: EasyNewsletter/config.py:46
 msgid "invalid_email"
 msgstr ""
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:48
+#: EasyNewsletter/config.py:52
 msgid "invalid_hashkey"
 msgstr ""
 
@@ -931,7 +914,7 @@ msgid "label_ext_subcriber_source_failed"
 msgstr ""
 
 #. Default: "Hide banner image."
-#: EasyNewsletter/content/newsletter_issue.py:168
+#: EasyNewsletter/content/newsletter_issue.py:165
 msgid "label_issueHideImage"
 msgstr ""
 
@@ -971,12 +954,12 @@ msgid "label_newsletter_path"
 msgstr ""
 
 #. Default: "Mr."
-#: EasyNewsletter/config.py:26
+#: EasyNewsletter/config.py:28
 msgid "label_salutation_mr"
 msgstr "Signore"
 
 #. Default: "Ms."
-#: EasyNewsletter/config.py:25
+#: EasyNewsletter/config.py:27
 msgid "label_salutation_ms"
 msgstr "Signora"
 
@@ -1078,8 +1061,8 @@ msgstr ""
 msgid "source"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:215
-#: EasyNewsletter/views/newsletter_subscribers.py:103
+#: EasyNewsletter/browser/subscribers.py:214
+#: EasyNewsletter/views/newsletter_subscribers.py:107
 msgid "subscriber/s deleted successfully"
 msgstr "iscritto/i cancellato/i con successo"
 
@@ -1090,7 +1073,7 @@ msgid "subscribers_search_note"
 msgstr ""
 
 #. Default: "Your subscription was successfully confirmed."
-#: EasyNewsletter/config.py:50
+#: EasyNewsletter/config.py:55
 msgid "subscription_confirmed"
 msgstr ""
 
@@ -1105,6 +1088,11 @@ msgstr "Iscritti creati con successo"
 msgid "unsubscribe"
 msgstr "Cancellati"
 
-#: EasyNewsletter/content/newsletter.py:200
+#. Default: "You requested to unsubscribe from the following newsletter: ${title}"
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:37
+msgid "you_requested_to_unsubscribe"
+msgstr ""
+
+#: EasyNewsletter/content/newsletter.py:198
 msgid "{{subscriber_salutation}}<br />"
 msgstr ""
diff --git a/src/Products/EasyNewsletter/locales/it/LC_MESSAGES/plone.po b/src/Products/EasyNewsletter/locales/it/LC_MESSAGES/plone.po
index 2c8e08f5..e931282d 100644
--- a/src/Products/EasyNewsletter/locales/it/LC_MESSAGES/plone.po
+++ b/src/Products/EasyNewsletter/locales/it/LC_MESSAGES/plone.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-02-01 19:16+0000\n"
+"POT-Creation-Date: 2021-02-02 19:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/Products/EasyNewsletter/locales/nl/LC_MESSAGES/Products.EasyNewsletter.po b/src/Products/EasyNewsletter/locales/nl/LC_MESSAGES/Products.EasyNewsletter.po
index 5abf1fdd..5b4d4ea5 100644
--- a/src/Products/EasyNewsletter/locales/nl/LC_MESSAGES/Products.EasyNewsletter.po
+++ b/src/Products/EasyNewsletter/locales/nl/LC_MESSAGES/Products.EasyNewsletter.po
@@ -50,8 +50,8 @@ msgstr ""
 msgid "Allowed content aggregation types"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:304
-#: EasyNewsletter/views/newsletter_unsubscribe.py:39
+#: EasyNewsletter/browser/registration.py:302
+#: EasyNewsletter/views/newsletter_unsubscribe.py:38
 msgid "An error occured"
 msgstr "Er is een fout opgetreden."
 
@@ -84,7 +84,7 @@ msgstr ""
 msgid "Configuration for version 4005"
 msgstr ""
 
-#: EasyNewsletter/config.py:60
+#: EasyNewsletter/config.py:67
 msgid "Confirm your subscription on ${portal_url}"
 msgstr "Bevestig uw inschrijving op ${portal_url}"
 
@@ -96,7 +96,7 @@ msgstr ""
 msgid "Content types which will be visible in the Content aggregation sources reference field."
 msgstr ""
 
-#: EasyNewsletter/content/newsletter_issue.py:76
+#: EasyNewsletter/content/newsletter_issue.py:73
 msgid "Customizations"
 msgstr ""
 
@@ -104,10 +104,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_output_templates.py:31
-msgid "Default output template"
-msgstr ""
-
 #: EasyNewsletter/browser/enl_subscribers_view.pt:135
 #: EasyNewsletter/views/newsletter_subscribers.pt:151
 msgid "Delete"
@@ -122,152 +118,152 @@ msgid "E-Mail"
 msgstr "E-mail"
 
 #. Default: "Choose sources to aggregate newsletter content from."
-#: EasyNewsletter/content/newsletter.py:117
-#: EasyNewsletter/content/newsletter_issue.py:100
+#: EasyNewsletter/content/newsletter.py:115
+#: EasyNewsletter/content/newsletter_issue.py:97
 msgid "ENL_content_aggregation_sources_desc"
 msgstr ""
 
 #. Default: "Content aggregation sources"
-#: EasyNewsletter/content/newsletter.py:113
-#: EasyNewsletter/content/newsletter_issue.py:96
+#: EasyNewsletter/content/newsletter.py:111
+#: EasyNewsletter/content/newsletter_issue.py:93
 msgid "ENL_content_aggregation_sources_label"
 msgstr ""
 
 #. Default: "Text used for confirmation email subject. You can                 customize the text, but it should include the                 placeholder: ${portal_url}!"
-#: EasyNewsletter/content/newsletter.py:248
+#: EasyNewsletter/content/newsletter.py:246
 msgid "ENL_description_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Text used for confirmation email. You can customize                 the text, but it should include the placeholders:                 ${portal_url}, ${subscriber_email} and                 ${confirmation_url}!"
-#: EasyNewsletter/content/newsletter.py:263
+#: EasyNewsletter/content/newsletter.py:261
 msgid "ENL_description_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "The default epilogue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:207
-#: EasyNewsletter/content/newsletter_issue.py:154
+#: EasyNewsletter/content/newsletter.py:205
+#: EasyNewsletter/content/newsletter_issue.py:151
 msgid "ENL_description_text_footer"
 msgstr ""
 
 #. Default: "The default prologue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:194
-#: EasyNewsletter/content/newsletter_issue.py:141
+#: EasyNewsletter/content/newsletter.py:192
+#: EasyNewsletter/content/newsletter_issue.py:138
 msgid "ENL_description_text_header"
 msgstr ""
 
 #. Default: "If checked, the newsletter/mailing will not be send                  to all subscribers inside the newsletter. Changing this                 setting does not affect already existing issues."
-#: EasyNewsletter/content/newsletter.py:222
-#: EasyNewsletter/content/newsletter_issue.py:117
+#: EasyNewsletter/content/newsletter.py:220
+#: EasyNewsletter/content/newsletter_issue.py:114
 msgid "ENL_help_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "This will be used if the subscriber has no fullname."
-#: EasyNewsletter/content/newsletter.py:148
+#: EasyNewsletter/content/newsletter.py:146
 msgid "ENL_help_fullname_fallback"
 msgstr ""
 
 #. Default: "Define here possible salutations for subscriber.                 One salutation per line in the form of: \"mr|Dear Mr.\".                 The left hand value \"mr\" or \"ms\" is mapped to salutation                 of each subscriber and then the right hand value, which                 you can customize is used as salutation."
-#: EasyNewsletter/content/newsletter.py:130
+#: EasyNewsletter/content/newsletter.py:128
 msgid "ENL_help_salutations"
 msgstr ""
 
 #. Default: "Default for the sender address of the newsletters."
-#: EasyNewsletter/content/newsletter.py:81
+#: EasyNewsletter/content/newsletter.py:79
 msgid "ENL_help_senderEmail"
 msgstr ""
 
 #. Default: "Default for the sender name of the newsletters."
-#: EasyNewsletter/content/newsletter.py:90
+#: EasyNewsletter/content/newsletter.py:88
 msgid "ENL_help_senderName"
 msgstr ""
 
 #. Default: "Default for the test email address."
-#: EasyNewsletter/content/newsletter.py:99
+#: EasyNewsletter/content/newsletter.py:97
 msgid "ENL_help_testEmail"
 msgstr ""
 
 #. Default: "This will replace the placeholder {{UNSUBSCRIBE}}."
-#: EasyNewsletter/content/newsletter.py:160
+#: EasyNewsletter/content/newsletter.py:158
 msgid "ENL_help_unsubscribe_string"
 msgstr ""
 
 #. Default: "Banner image, you can include in the templates by\n adding the {{banner}} placeholder into it. By default it should be 600x200 pixel."
-#: EasyNewsletter/content/newsletter.py:171
-#: EasyNewsletter/content/newsletter_issue.py:181
+#: EasyNewsletter/content/newsletter.py:169
+#: EasyNewsletter/content/newsletter_issue.py:178
 msgid "ENL_image_desc"
 msgstr ""
 
 #. Default: "Banner image"
-#: EasyNewsletter/content/newsletter.py:170
-#: EasyNewsletter/content/newsletter_issue.py:180
+#: EasyNewsletter/content/newsletter.py:168
+#: EasyNewsletter/content/newsletter_issue.py:177
 msgid "ENL_image_label"
 msgstr ""
 
 #. Default: "Epilogue"
-#: EasyNewsletter/content/newsletter.py:206
-#: EasyNewsletter/content/newsletter_issue.py:153
+#: EasyNewsletter/content/newsletter.py:204
+#: EasyNewsletter/content/newsletter_issue.py:150
 msgid "ENL_label_default_footer"
 msgstr ""
 
 #. Default: "Prologue"
-#: EasyNewsletter/content/newsletter.py:193
-#: EasyNewsletter/content/newsletter_issue.py:140
+#: EasyNewsletter/content/newsletter.py:191
+#: EasyNewsletter/content/newsletter_issue.py:137
 msgid "ENL_label_default_header"
 msgstr ""
 
 #. Default: "Exclude all subscribers"
-#: EasyNewsletter/content/newsletter.py:221
-#: EasyNewsletter/content/newsletter_issue.py:116
+#: EasyNewsletter/content/newsletter.py:219
+#: EasyNewsletter/content/newsletter_issue.py:113
 msgid "ENL_label_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "Fallback for subscribers without a name."
-#: EasyNewsletter/content/newsletter.py:144
+#: EasyNewsletter/content/newsletter.py:142
 msgid "ENL_label_fullname_fallback"
 msgstr ""
 
 #. Default: "Subscriber Salutations."
-#: EasyNewsletter/content/newsletter.py:129
+#: EasyNewsletter/content/newsletter.py:127
 msgid "ENL_label_salutations"
 msgstr ""
 
 #. Default: "Sender email"
-#: EasyNewsletter/content/newsletter.py:80
+#: EasyNewsletter/content/newsletter.py:78
 msgid "ENL_label_senderEmail"
 msgstr ""
 
 #. Default: "Sender name"
-#: EasyNewsletter/content/newsletter.py:89
+#: EasyNewsletter/content/newsletter.py:87
 msgid "ENL_label_senderName"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail subject"
-#: EasyNewsletter/content/newsletter.py:244
+#: EasyNewsletter/content/newsletter.py:242
 msgid "ENL_label_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail text"
-#: EasyNewsletter/content/newsletter.py:259
+#: EasyNewsletter/content/newsletter.py:257
 msgid "ENL_label_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "Test email"
-#: EasyNewsletter/content/newsletter.py:98
+#: EasyNewsletter/content/newsletter.py:96
 msgid "ENL_label_testEmail"
 msgstr ""
 
 #. Default: "Text for the 'unsubscribe' link"
-#: EasyNewsletter/content/newsletter.py:157
+#: EasyNewsletter/content/newsletter.py:155
 msgid "ENL_label_unsubscribe_string"
 msgstr ""
 
 #. Default: "Logo image, you can include in the templates by\n adding the {{logo}} placeholder into it."
-#: EasyNewsletter/content/newsletter.py:183
+#: EasyNewsletter/content/newsletter.py:181
 msgid "ENL_logo_desc"
 msgstr ""
 
 #. Default: "Logo image"
-#: EasyNewsletter/content/newsletter.py:182
+#: EasyNewsletter/content/newsletter.py:180
 msgid "ENL_logo_label"
 msgstr ""
 
@@ -282,13 +278,13 @@ msgid "EasyNewsletter_help_name_prefix"
 msgstr "Titulatuur"
 
 #. Default: "Choose Plone Groups which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:70
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:67
 #, fuzzy
 msgid "EasyNewsletter_help_ploneReceiverGroups"
 msgstr "Kies de groepen die deze nieuwsbrief opgestuurd krijgen. Al verzonden edities worden niet aangepast of opnieuw verzonden."
 
 #. Default: "Choose Plone Members which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:54
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:51
 msgid "EasyNewsletter_help_ploneReceiverMembers"
 msgstr "Kies de gebruikers die deze nieuwsbrief opgestuurd krijgen. Al verzonden edities worden niet aangepast of opnieuw verzonden."
 
@@ -346,12 +342,12 @@ msgid "EasyNewsletter_label_organization"
 msgstr "Bedrijf/Organisatie"
 
 #. Default: "Plone Groups to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:66
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:63
 msgid "EasyNewsletter_label_ploneReceiverGroups"
 msgstr "Groepen die de nieuwsbrief ontvangen."
 
 #. Default: "Plone Members to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:50
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:47
 msgid "EasyNewsletter_label_ploneReceiverMembers"
 msgstr "Gebruikers die de nieuwsbrief ontvangen."
 
@@ -400,7 +396,7 @@ msgstr "Wijzigen nieuwsbrief-portlet"
 msgid "Email"
 msgstr "E-mail"
 
-#: EasyNewsletter/browser/subscribers.py:317
+#: EasyNewsletter/browser/subscribers.py:316
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:132
 msgid "Email existed, updated subscriber."
 msgstr ""
@@ -423,10 +419,6 @@ msgstr ""
 msgid "First Name"
 msgstr "Voornaam"
 
-#: EasyNewsletter/tests/test_vocab_aggregation_templates.py:31
-msgid "Generic Listing"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:28
 #: EasyNewsletter/views/newsletter_subscribers_upload.pt:13
 msgid "Import"
@@ -448,10 +440,6 @@ msgstr "Nieuwsbrief concepten"
 msgid "Issue masters"
 msgstr "Nieuwsbrief masters"
 
-#: EasyNewsletter/tests/test_vocab_plone_users.py:38
-msgid "Jane Doe - jane@plone.org"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:94
 msgid "Language"
 msgstr "Taal"
@@ -465,17 +453,16 @@ msgstr "Achternaam"
 msgid "Masters"
 msgstr "Masters"
 
-#: EasyNewsletter/browser/subscribers.py:293
+#: EasyNewsletter/browser/subscribers.py:292
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:108
 msgid "More than one subscriber with this email address existed, subscriber info was NOT updated. Check manually!"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/salutations.py:26
+#: EasyNewsletter/vocabularies/salutations.py:25
 msgid "Mr"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_salutations.py:32
-#: EasyNewsletter/vocabularies/salutations.py:25
+#: EasyNewsletter/vocabularies/salutations.py:24
 msgid "Ms"
 msgstr ""
 
@@ -491,7 +478,7 @@ msgstr ""
 msgid "Newsletter Subscriber"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:29
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:27
 msgid "Newsletter aggregation template"
 msgstr ""
 
@@ -503,7 +490,7 @@ msgstr ""
 msgid "Newsletter content successfully aggregated."
 msgstr ""
 
-#: EasyNewsletter/views/newsletter_issue_statistics.py:22
+#: EasyNewsletter/views/newsletter_issue_statistics.py:23
 msgid "Newsletter issue statistics have been reset."
 msgstr ""
 
@@ -511,17 +498,17 @@ msgstr ""
 msgid "Newsletter subscriber portlet"
 msgstr "Nieuwsbrief abonneren portlet"
 
-#: EasyNewsletter/views/newsletter_issue_send.py:201
+#: EasyNewsletter/views/newsletter_issue_send.py:205
 msgid "Newsletter was sent to ({0}) receivers. ({1}) errors occurred!{2}"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:254
+#: EasyNewsletter/browser/subscribers.py:253
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:68
 msgid "No file specified."
 msgstr "Geen bestand opgegeven."
 
-#: EasyNewsletter/browser/subscribers.py:208
-#: EasyNewsletter/views/newsletter_subscribers.py:96
+#: EasyNewsletter/browser/subscribers.py:207
+#: EasyNewsletter/views/newsletter_subscribers.py:100
 msgid "No subscriber selected!"
 msgstr "Er is geen abonnee geselecteerd!"
 
@@ -530,16 +517,16 @@ msgstr "Er is geen abonnee geselecteerd!"
 msgid "Organization"
 msgstr "Organisatie"
 
-#: EasyNewsletter/content/newsletter.py:61
+#: EasyNewsletter/content/newsletter.py:59
 msgid "Personalization"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:195
+#: EasyNewsletter/browser/registration.py:193
 msgid "Please enter a valid email address."
 msgstr "Gelieve een geldig e-mailadres in te vullen of schrijf je opnieuw in om een nieuwe bevestigings-e-mail te ontvangen."
 
-#: EasyNewsletter/browser/registration.py:292
-#: EasyNewsletter/views/newsletter_unsubscribe.py:24
+#: EasyNewsletter/browser/registration.py:290
+#: EasyNewsletter/views/newsletter_unsubscribe.py:23
 msgid "Please use the correct unsubscribe url!"
 msgstr ""
 
@@ -572,7 +559,7 @@ msgstr ""
 msgid "Products.EasyNewsletter (4005)"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/plone_users.py:49
+#: EasyNewsletter/vocabularies/plone_users.py:47
 msgid "Property email: \"{0}\" is not an email!"
 msgstr ""
 
@@ -585,8 +572,8 @@ msgstr ""
 msgid "Reason for failure"
 msgstr "Reden van de fout"
 
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:45
-#: EasyNewsletter/content/newsletter.py:76
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:42
+#: EasyNewsletter/content/newsletter.py:74
 msgid "Recipients"
 msgstr ""
 
@@ -609,7 +596,7 @@ msgstr "Zoeken"
 msgid "Select your CSV file here."
 msgstr "Selecteer het CSV-bestand."
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:24
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:22
 msgid "Settings"
 msgstr ""
 
@@ -622,7 +609,7 @@ msgstr ""
 msgid "Subscriber Search"
 msgstr "Zoek abonnee's"
 
-#: EasyNewsletter/browser/subscribers.py:350
+#: EasyNewsletter/browser/subscribers.py:349
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:166
 msgid "Subscriber created."
 msgstr ""
@@ -646,7 +633,7 @@ msgstr ""
 msgid "Tester"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:30
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:28
 msgid "The <a href=\"https://productseasynewsletter.readthedocs.io/en/latest/#aggregation-templates\">aggregation template</a> used by the Newsletter to render Collection items for the Newsletter."
 msgstr ""
 
@@ -656,7 +643,7 @@ msgid "The CSV file must contain the header and follow this format"
 msgstr "Het CSV bestand dient deze hoofding te bevatten en dient de structuur te respecteren"
 
 #: EasyNewsletter/browser/issue.py:74
-#: EasyNewsletter/views/newsletter_issue_send.py:81
+#: EasyNewsletter/views/newsletter_issue_send.py:85
 msgid "The issue has been generated and sent to the mail server."
 msgstr ""
 
@@ -665,11 +652,11 @@ msgid "The issue sending has been initiated in the background."
 msgstr "De verzending is geïnitialiseerd in de achtergrond."
 
 #: EasyNewsletter/browser/issue.py:55
-#: EasyNewsletter/views/newsletter_issue_send.py:62
+#: EasyNewsletter/views/newsletter_issue_send.py:66
 msgid "The issue test sending has been initiated."
 msgstr "De test verzending is geïnitialiseerd."
 
-#: EasyNewsletter/browser/subscribers.py:275
+#: EasyNewsletter/browser/subscribers.py:274
 msgid "The number of items in the line is not correct.                         It should be 7. Check your CSV file."
 msgstr "Het aantal elementen in de regel is niet juist. Het zouden er 7 moeten zijn. Controleer het CSV bestand."
 
@@ -690,28 +677,24 @@ msgstr "Titel"
 msgid "Title for the portlet."
 msgstr "Titel voor de portlet."
 
-#: EasyNewsletter/tests/test_vocab_plone_groups.py:35
-msgid "VIP"
-msgstr ""
-
 #: EasyNewsletter/profiles/default/types/Newsletter.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Issue.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Subscriber.xml
 msgid "View"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:272
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:48
+#: EasyNewsletter/browser/registration.py:270
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:58
 msgid "We send you an email, please confirm this unsubscription."
 msgstr "Wij hebben u een e-mail met een afmeldlink verzonden."
 
-#: EasyNewsletter/browser/subscribers.py:265
+#: EasyNewsletter/browser/subscribers.py:264
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:78
 msgid "Wrong specification of the CSV file. Please correct it and retry."
 msgstr "Het CSV-bestand bevat fouten. Corrigeer en probeer opnieuw."
 
-#: EasyNewsletter/browser/registration.py:307
-#: EasyNewsletter/views/newsletter_unsubscribe.py:46
+#: EasyNewsletter/browser/registration.py:305
+#: EasyNewsletter/views/newsletter_unsubscribe.py:45
 msgid "You have been unsubscribed."
 msgstr "U bent uitgeschreven."
 
@@ -719,16 +702,16 @@ msgstr "U bent uitgeschreven."
 msgid "You want to unsubscribe from this Newsletter?"
 msgstr "Wilt u zich afmelden voor deze nieuwsbrief?"
 
-#: EasyNewsletter/browser/registration.py:278
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:56
+#: EasyNewsletter/browser/registration.py:276
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:66
 msgid "Your email address could not be found in subscribers."
 msgstr "Uw e-mail kon niet worden gevonden in de abonnees."
 
-#: EasyNewsletter/browser/registration.py:95
+#: EasyNewsletter/browser/registration.py:93
 msgid "Your email address is already registered."
 msgstr "Je e-mailadres is reeds geregistreerd."
 
-#: EasyNewsletter/browser/registration.py:142
+#: EasyNewsletter/browser/registration.py:140
 msgid "Your email has been registered.                 A confirmation email was sent to your address. Please check                 your inbox and click on the link in the email in order to                 confirm your subscription."
 msgstr "Je e-mail werd geregistreerd. Een bevestigings-e-mail werd verzonden naar je e-mailadres. Gelieve je inbox te controleren en te klikken op de link in de e-mail om je registratie te bevestigen."
 
@@ -736,7 +719,7 @@ msgstr "Je e-mail werd geregistreerd. Een bevestigings-e-mail werd verzonden naa
 msgid "Your registered E-Mail address:"
 msgstr "Uw geregistreerde e-mailadres:"
 
-#: EasyNewsletter/browser/registration.py:191
+#: EasyNewsletter/browser/registration.py:189
 msgid "Your subscription was successfully confirmed."
 msgstr "Uw inschrijving is bevestigd."
 
@@ -756,8 +739,8 @@ msgstr "Abonnee toevoegen"
 msgid "cancel"
 msgstr "annuleren"
 
-#: EasyNewsletter/browser/registration.py:268
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:44
+#: EasyNewsletter/browser/registration.py:266
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:53
 msgid "confirm newsletter unsubscription"
 msgstr "bevestig afmelding van de nieuwsbrief"
 
@@ -854,34 +837,34 @@ msgid "easynewsletter_unsubscribe_button"
 msgstr "Abonnement beëindigen"
 
 #. Default: "Your email has been registered. A confirmation email was sent to your address. Please check your inbox and click  on the link in the email in order to confirm your subscription."
-#: EasyNewsletter/config.py:37
+#: EasyNewsletter/config.py:39
 msgid "email_added"
 msgstr "Uw e-mailadres is geregistreerd. Een e-mail is verzonden ter bevestiging. Controleer alstublieft uw inbox en klik op de link om het abonnement te bevestigen."
 
 #. Default: "Your email address is already registered."
-#: EasyNewsletter/config.py:46
+#: EasyNewsletter/config.py:49
 msgid "email_exists"
 msgstr "Uw e-mailadres is reeds geregistreerd."
 
 #. Default: "Choose the template to render the email. "
-#: EasyNewsletter/content/newsletter.py:234
-#: EasyNewsletter/content/newsletter_issue.py:129
+#: EasyNewsletter/content/newsletter.py:232
+#: EasyNewsletter/content/newsletter_issue.py:126
 msgid "enl_help_output_template"
 msgstr ""
 
 #. Default: "If checked, the banner image defined on newsletter                     or on this issue will not be used."
-#: EasyNewsletter/content/newsletter_issue.py:169
+#: EasyNewsletter/content/newsletter_issue.py:166
 msgid "enl_issue_help_hide_image"
 msgstr ""
 
 #. Default: "Default output template"
-#: EasyNewsletter/vocabularies/output_templates.py:37
+#: EasyNewsletter/vocabularies/output_templates.py:36
 msgid "enl_label_default_output_template"
 msgstr ""
 
 #. Default: "Output template"
-#: EasyNewsletter/content/newsletter.py:233
-#: EasyNewsletter/content/newsletter_issue.py:128
+#: EasyNewsletter/content/newsletter.py:231
+#: EasyNewsletter/content/newsletter_issue.py:125
 msgid "enl_label_output_template"
 msgstr ""
 
@@ -915,12 +898,12 @@ msgid "import_subscriber"
 msgstr ""
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:44
+#: EasyNewsletter/config.py:46
 msgid "invalid_email"
 msgstr "Vul alstublieft een geldig e-mailadres in"
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:48
+#: EasyNewsletter/config.py:52
 msgid "invalid_hashkey"
 msgstr "Vul alstublieft een geldig e-mailadres in"
 
@@ -930,7 +913,7 @@ msgid "label_ext_subcriber_source_failed"
 msgstr ""
 
 #. Default: "Hide banner image."
-#: EasyNewsletter/content/newsletter_issue.py:168
+#: EasyNewsletter/content/newsletter_issue.py:165
 msgid "label_issueHideImage"
 msgstr ""
 
@@ -970,12 +953,12 @@ msgid "label_newsletter_path"
 msgstr "Pad naar de nieuwsbrief"
 
 #. Default: "Mr."
-#: EasyNewsletter/config.py:26
+#: EasyNewsletter/config.py:28
 msgid "label_salutation_mr"
 msgstr "De heer"
 
 #. Default: "Ms."
-#: EasyNewsletter/config.py:25
+#: EasyNewsletter/config.py:27
 msgid "label_salutation_ms"
 msgstr "Mevrouw"
 
@@ -1077,8 +1060,8 @@ msgstr ""
 msgid "source"
 msgstr "Bron"
 
-#: EasyNewsletter/browser/subscribers.py:215
-#: EasyNewsletter/views/newsletter_subscribers.py:103
+#: EasyNewsletter/browser/subscribers.py:214
+#: EasyNewsletter/views/newsletter_subscribers.py:107
 msgid "subscriber/s deleted successfully"
 msgstr "abonnee(s) succesvol verwijderd"
 
@@ -1089,7 +1072,7 @@ msgid "subscribers_search_note"
 msgstr "Deze zoekopdracht vindt alleen lokale abonnee's en zoekt niet in externe bronnen."
 
 #. Default: "Your subscription was successfully confirmed."
-#: EasyNewsletter/config.py:50
+#: EasyNewsletter/config.py:55
 msgid "subscription_confirmed"
 msgstr "Uw inschrijving is bevestigd."
 
@@ -1104,6 +1087,11 @@ msgstr "Abonnees met succes aangemaakt"
 msgid "unsubscribe"
 msgstr "Abonnement beëindigen"
 
-#: EasyNewsletter/content/newsletter.py:200
+#. Default: "You requested to unsubscribe from the following newsletter: ${title}"
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:37
+msgid "you_requested_to_unsubscribe"
+msgstr ""
+
+#: EasyNewsletter/content/newsletter.py:198
 msgid "{{subscriber_salutation}}<br />"
 msgstr ""
diff --git a/src/Products/EasyNewsletter/locales/nl/LC_MESSAGES/plone.po b/src/Products/EasyNewsletter/locales/nl/LC_MESSAGES/plone.po
index 3c575e56..f4bf3be7 100644
--- a/src/Products/EasyNewsletter/locales/nl/LC_MESSAGES/plone.po
+++ b/src/Products/EasyNewsletter/locales/nl/LC_MESSAGES/plone.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-02-01 19:16+0000\n"
+"POT-Creation-Date: 2021-02-02 19:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/Products/EasyNewsletter/locales/plone.pot b/src/Products/EasyNewsletter/locales/plone.pot
index 876bf8d8..989c8f77 100644
--- a/src/Products/EasyNewsletter/locales/plone.pot
+++ b/src/Products/EasyNewsletter/locales/plone.pot
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-02-01 19:16+0000\n"
+"POT-Creation-Date: 2021-02-02 19:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/Products/EasyNewsletter/locales/pt_BR/LC_MESSAGES/Products.EasyNewsletter.po b/src/Products/EasyNewsletter/locales/pt_BR/LC_MESSAGES/Products.EasyNewsletter.po
index f591c527..4e3523e1 100644
--- a/src/Products/EasyNewsletter/locales/pt_BR/LC_MESSAGES/Products.EasyNewsletter.po
+++ b/src/Products/EasyNewsletter/locales/pt_BR/LC_MESSAGES/Products.EasyNewsletter.po
@@ -50,8 +50,8 @@ msgstr ""
 msgid "Allowed content aggregation types"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:304
-#: EasyNewsletter/views/newsletter_unsubscribe.py:39
+#: EasyNewsletter/browser/registration.py:302
+#: EasyNewsletter/views/newsletter_unsubscribe.py:38
 msgid "An error occured"
 msgstr "Ocorreu um erro"
 
@@ -84,7 +84,7 @@ msgstr ""
 msgid "Configuration for version 4005"
 msgstr ""
 
-#: EasyNewsletter/config.py:60
+#: EasyNewsletter/config.py:67
 msgid "Confirm your subscription on ${portal_url}"
 msgstr ""
 
@@ -96,7 +96,7 @@ msgstr ""
 msgid "Content types which will be visible in the Content aggregation sources reference field."
 msgstr ""
 
-#: EasyNewsletter/content/newsletter_issue.py:76
+#: EasyNewsletter/content/newsletter_issue.py:73
 msgid "Customizations"
 msgstr ""
 
@@ -104,10 +104,6 @@ msgstr ""
 msgid "Date"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_output_templates.py:31
-msgid "Default output template"
-msgstr ""
-
 #: EasyNewsletter/browser/enl_subscribers_view.pt:135
 #: EasyNewsletter/views/newsletter_subscribers.pt:151
 msgid "Delete"
@@ -122,152 +118,152 @@ msgid "E-Mail"
 msgstr ""
 
 #. Default: "Choose sources to aggregate newsletter content from."
-#: EasyNewsletter/content/newsletter.py:117
-#: EasyNewsletter/content/newsletter_issue.py:100
+#: EasyNewsletter/content/newsletter.py:115
+#: EasyNewsletter/content/newsletter_issue.py:97
 msgid "ENL_content_aggregation_sources_desc"
 msgstr ""
 
 #. Default: "Content aggregation sources"
-#: EasyNewsletter/content/newsletter.py:113
-#: EasyNewsletter/content/newsletter_issue.py:96
+#: EasyNewsletter/content/newsletter.py:111
+#: EasyNewsletter/content/newsletter_issue.py:93
 msgid "ENL_content_aggregation_sources_label"
 msgstr ""
 
 #. Default: "Text used for confirmation email subject. You can                 customize the text, but it should include the                 placeholder: ${portal_url}!"
-#: EasyNewsletter/content/newsletter.py:248
+#: EasyNewsletter/content/newsletter.py:246
 msgid "ENL_description_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Text used for confirmation email. You can customize                 the text, but it should include the placeholders:                 ${portal_url}, ${subscriber_email} and                 ${confirmation_url}!"
-#: EasyNewsletter/content/newsletter.py:263
+#: EasyNewsletter/content/newsletter.py:261
 msgid "ENL_description_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "The default epilogue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:207
-#: EasyNewsletter/content/newsletter_issue.py:154
+#: EasyNewsletter/content/newsletter.py:205
+#: EasyNewsletter/content/newsletter_issue.py:151
 msgid "ENL_description_text_footer"
 msgstr ""
 
 #. Default: "The default prologue text. This is used as a default                 for new issues. You can use placeholders like                {{subscriber_salutation}} and {{unsubscribe}} here."
-#: EasyNewsletter/content/newsletter.py:194
-#: EasyNewsletter/content/newsletter_issue.py:141
+#: EasyNewsletter/content/newsletter.py:192
+#: EasyNewsletter/content/newsletter_issue.py:138
 msgid "ENL_description_text_header"
 msgstr ""
 
 #. Default: "If checked, the newsletter/mailing will not be send                  to all subscribers inside the newsletter. Changing this                 setting does not affect already existing issues."
-#: EasyNewsletter/content/newsletter.py:222
-#: EasyNewsletter/content/newsletter_issue.py:117
+#: EasyNewsletter/content/newsletter.py:220
+#: EasyNewsletter/content/newsletter_issue.py:114
 msgid "ENL_help_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "This will be used if the subscriber has no fullname."
-#: EasyNewsletter/content/newsletter.py:148
+#: EasyNewsletter/content/newsletter.py:146
 msgid "ENL_help_fullname_fallback"
 msgstr ""
 
 #. Default: "Define here possible salutations for subscriber.                 One salutation per line in the form of: \"mr|Dear Mr.\".                 The left hand value \"mr\" or \"ms\" is mapped to salutation                 of each subscriber and then the right hand value, which                 you can customize is used as salutation."
-#: EasyNewsletter/content/newsletter.py:130
+#: EasyNewsletter/content/newsletter.py:128
 msgid "ENL_help_salutations"
 msgstr ""
 
 #. Default: "Default for the sender address of the newsletters."
-#: EasyNewsletter/content/newsletter.py:81
+#: EasyNewsletter/content/newsletter.py:79
 msgid "ENL_help_senderEmail"
 msgstr ""
 
 #. Default: "Default for the sender name of the newsletters."
-#: EasyNewsletter/content/newsletter.py:90
+#: EasyNewsletter/content/newsletter.py:88
 msgid "ENL_help_senderName"
 msgstr ""
 
 #. Default: "Default for the test email address."
-#: EasyNewsletter/content/newsletter.py:99
+#: EasyNewsletter/content/newsletter.py:97
 msgid "ENL_help_testEmail"
 msgstr ""
 
 #. Default: "This will replace the placeholder {{UNSUBSCRIBE}}."
-#: EasyNewsletter/content/newsletter.py:160
+#: EasyNewsletter/content/newsletter.py:158
 msgid "ENL_help_unsubscribe_string"
 msgstr ""
 
 #. Default: "Banner image, you can include in the templates by\n adding the {{banner}} placeholder into it. By default it should be 600x200 pixel."
-#: EasyNewsletter/content/newsletter.py:171
-#: EasyNewsletter/content/newsletter_issue.py:181
+#: EasyNewsletter/content/newsletter.py:169
+#: EasyNewsletter/content/newsletter_issue.py:178
 msgid "ENL_image_desc"
 msgstr ""
 
 #. Default: "Banner image"
-#: EasyNewsletter/content/newsletter.py:170
-#: EasyNewsletter/content/newsletter_issue.py:180
+#: EasyNewsletter/content/newsletter.py:168
+#: EasyNewsletter/content/newsletter_issue.py:177
 msgid "ENL_image_label"
 msgstr ""
 
 #. Default: "Epilogue"
-#: EasyNewsletter/content/newsletter.py:206
-#: EasyNewsletter/content/newsletter_issue.py:153
+#: EasyNewsletter/content/newsletter.py:204
+#: EasyNewsletter/content/newsletter_issue.py:150
 msgid "ENL_label_default_footer"
 msgstr ""
 
 #. Default: "Prologue"
-#: EasyNewsletter/content/newsletter.py:193
-#: EasyNewsletter/content/newsletter_issue.py:140
+#: EasyNewsletter/content/newsletter.py:191
+#: EasyNewsletter/content/newsletter_issue.py:137
 msgid "ENL_label_default_header"
 msgstr ""
 
 #. Default: "Exclude all subscribers"
-#: EasyNewsletter/content/newsletter.py:221
-#: EasyNewsletter/content/newsletter_issue.py:116
+#: EasyNewsletter/content/newsletter.py:219
+#: EasyNewsletter/content/newsletter_issue.py:113
 msgid "ENL_label_excludeAllSubscribers"
 msgstr ""
 
 #. Default: "Fallback for subscribers without a name."
-#: EasyNewsletter/content/newsletter.py:144
+#: EasyNewsletter/content/newsletter.py:142
 msgid "ENL_label_fullname_fallback"
 msgstr ""
 
 #. Default: "Subscriber Salutations."
-#: EasyNewsletter/content/newsletter.py:129
+#: EasyNewsletter/content/newsletter.py:127
 msgid "ENL_label_salutations"
 msgstr ""
 
 #. Default: "Sender email"
-#: EasyNewsletter/content/newsletter.py:80
+#: EasyNewsletter/content/newsletter.py:78
 msgid "ENL_label_senderEmail"
 msgstr ""
 
 #. Default: "Sender name"
-#: EasyNewsletter/content/newsletter.py:89
+#: EasyNewsletter/content/newsletter.py:87
 msgid "ENL_label_senderName"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail subject"
-#: EasyNewsletter/content/newsletter.py:244
+#: EasyNewsletter/content/newsletter.py:242
 msgid "ENL_label_subscriber_confirmation_mail_subject"
 msgstr ""
 
 #. Default: "Subscriber confirmation mail text"
-#: EasyNewsletter/content/newsletter.py:259
+#: EasyNewsletter/content/newsletter.py:257
 msgid "ENL_label_subscriber_confirmation_mail_text"
 msgstr ""
 
 #. Default: "Test email"
-#: EasyNewsletter/content/newsletter.py:98
+#: EasyNewsletter/content/newsletter.py:96
 msgid "ENL_label_testEmail"
 msgstr ""
 
 #. Default: "Text for the 'unsubscribe' link"
-#: EasyNewsletter/content/newsletter.py:157
+#: EasyNewsletter/content/newsletter.py:155
 msgid "ENL_label_unsubscribe_string"
 msgstr ""
 
 #. Default: "Logo image, you can include in the templates by\n adding the {{logo}} placeholder into it."
-#: EasyNewsletter/content/newsletter.py:183
+#: EasyNewsletter/content/newsletter.py:181
 msgid "ENL_logo_desc"
 msgstr ""
 
 #. Default: "Logo image"
-#: EasyNewsletter/content/newsletter.py:182
+#: EasyNewsletter/content/newsletter.py:180
 msgid "ENL_logo_label"
 msgstr ""
 
@@ -282,13 +278,13 @@ msgid "EasyNewsletter_help_name_prefix"
 msgstr ""
 
 #. Default: "Choose Plone Groups which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:70
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:67
 #, fuzzy
 msgid "EasyNewsletter_help_ploneReceiverGroups"
 msgstr "Escolha os grupos do Plone que devem receber o boletim."
 
 #. Default: "Choose Plone Members which should receive                     the newsletter. Changing this setting does not affect                     already existing issues."
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:54
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:51
 #, fuzzy
 msgid "EasyNewsletter_help_ploneReceiverMembers"
 msgstr "Escolha os membros do Plone que devem receber o boletim."
@@ -347,12 +343,12 @@ msgid "EasyNewsletter_label_organization"
 msgstr "Empresa/Organização"
 
 #. Default: "Plone Groups to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:66
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:63
 msgid "EasyNewsletter_label_ploneReceiverGroups"
 msgstr "Grupos do Plone que devem receber o boletim"
 
 #. Default: "Plone Members to receive the newsletter"
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:50
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:47
 msgid "EasyNewsletter_label_ploneReceiverMembers"
 msgstr "Membros do Plone que devem receber o boletim"
 
@@ -401,7 +397,7 @@ msgstr "Editar portlet de newsletter"
 msgid "Email"
 msgstr "Email"
 
-#: EasyNewsletter/browser/subscribers.py:317
+#: EasyNewsletter/browser/subscribers.py:316
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:132
 msgid "Email existed, updated subscriber."
 msgstr ""
@@ -424,10 +420,6 @@ msgstr ""
 msgid "First Name"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_aggregation_templates.py:31
-msgid "Generic Listing"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:28
 #: EasyNewsletter/views/newsletter_subscribers_upload.pt:13
 msgid "Import"
@@ -449,10 +441,6 @@ msgstr "Rascunhos de edições"
 msgid "Issue masters"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_plone_users.py:38
-msgid "Jane Doe - jane@plone.org"
-msgstr ""
-
 #: EasyNewsletter/browser/upload_csv.pt:94
 msgid "Language"
 msgstr ""
@@ -466,17 +454,16 @@ msgstr ""
 msgid "Masters"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:293
+#: EasyNewsletter/browser/subscribers.py:292
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:108
 msgid "More than one subscriber with this email address existed, subscriber info was NOT updated. Check manually!"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/salutations.py:26
+#: EasyNewsletter/vocabularies/salutations.py:25
 msgid "Mr"
 msgstr ""
 
-#: EasyNewsletter/tests/test_vocab_salutations.py:32
-#: EasyNewsletter/vocabularies/salutations.py:25
+#: EasyNewsletter/vocabularies/salutations.py:24
 msgid "Ms"
 msgstr ""
 
@@ -492,7 +479,7 @@ msgstr ""
 msgid "Newsletter Subscriber"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:29
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:27
 msgid "Newsletter aggregation template"
 msgstr ""
 
@@ -504,7 +491,7 @@ msgstr ""
 msgid "Newsletter content successfully aggregated."
 msgstr ""
 
-#: EasyNewsletter/views/newsletter_issue_statistics.py:22
+#: EasyNewsletter/views/newsletter_issue_statistics.py:23
 msgid "Newsletter issue statistics have been reset."
 msgstr ""
 
@@ -512,17 +499,17 @@ msgstr ""
 msgid "Newsletter subscriber portlet"
 msgstr "Portlet de assinatura de Boletim"
 
-#: EasyNewsletter/views/newsletter_issue_send.py:201
+#: EasyNewsletter/views/newsletter_issue_send.py:205
 msgid "Newsletter was sent to ({0}) receivers. ({1}) errors occurred!{2}"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:254
+#: EasyNewsletter/browser/subscribers.py:253
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:68
 msgid "No file specified."
 msgstr "Nenhum arquivo informado."
 
-#: EasyNewsletter/browser/subscribers.py:208
-#: EasyNewsletter/views/newsletter_subscribers.py:96
+#: EasyNewsletter/browser/subscribers.py:207
+#: EasyNewsletter/views/newsletter_subscribers.py:100
 msgid "No subscriber selected!"
 msgstr "Nenhum assinante selecionado!"
 
@@ -531,16 +518,16 @@ msgstr "Nenhum assinante selecionado!"
 msgid "Organization"
 msgstr "Organização"
 
-#: EasyNewsletter/content/newsletter.py:61
+#: EasyNewsletter/content/newsletter.py:59
 msgid "Personalization"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:195
+#: EasyNewsletter/browser/registration.py:193
 msgid "Please enter a valid email address."
 msgstr "Por favor informe um endereço de email válido."
 
-#: EasyNewsletter/browser/registration.py:292
-#: EasyNewsletter/views/newsletter_unsubscribe.py:24
+#: EasyNewsletter/browser/registration.py:290
+#: EasyNewsletter/views/newsletter_unsubscribe.py:23
 msgid "Please use the correct unsubscribe url!"
 msgstr ""
 
@@ -573,7 +560,7 @@ msgstr ""
 msgid "Products.EasyNewsletter (4005)"
 msgstr ""
 
-#: EasyNewsletter/vocabularies/plone_users.py:49
+#: EasyNewsletter/vocabularies/plone_users.py:47
 msgid "Property email: \"{0}\" is not an email!"
 msgstr ""
 
@@ -586,8 +573,8 @@ msgstr ""
 msgid "Reason for failure"
 msgstr "Motivo da falha"
 
-#: EasyNewsletter/behaviors/plone_user_group_recipients.py:45
-#: EasyNewsletter/content/newsletter.py:76
+#: EasyNewsletter/behaviors/plone_user_group_recipients.py:42
+#: EasyNewsletter/content/newsletter.py:74
 msgid "Recipients"
 msgstr ""
 
@@ -610,7 +597,7 @@ msgstr ""
 msgid "Select your CSV file here."
 msgstr "Infomr aqui seu arquivo CSV."
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:24
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:22
 msgid "Settings"
 msgstr ""
 
@@ -623,7 +610,7 @@ msgstr ""
 msgid "Subscriber Search"
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:350
+#: EasyNewsletter/browser/subscribers.py:349
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:166
 msgid "Subscriber created."
 msgstr ""
@@ -647,7 +634,7 @@ msgstr ""
 msgid "Tester"
 msgstr ""
 
-#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:30
+#: EasyNewsletter/behaviors/collection_as_newsletter_aggregation_source.py:28
 msgid "The <a href=\"https://productseasynewsletter.readthedocs.io/en/latest/#aggregation-templates\">aggregation template</a> used by the Newsletter to render Collection items for the Newsletter."
 msgstr ""
 
@@ -657,7 +644,7 @@ msgid "The CSV file must contain the header and follow this format"
 msgstr "O arquivo CSV deve conter um cabeçalho com o seguinte formato"
 
 #: EasyNewsletter/browser/issue.py:74
-#: EasyNewsletter/views/newsletter_issue_send.py:81
+#: EasyNewsletter/views/newsletter_issue_send.py:85
 msgid "The issue has been generated and sent to the mail server."
 msgstr ""
 
@@ -666,11 +653,11 @@ msgid "The issue sending has been initiated in the background."
 msgstr ""
 
 #: EasyNewsletter/browser/issue.py:55
-#: EasyNewsletter/views/newsletter_issue_send.py:62
+#: EasyNewsletter/views/newsletter_issue_send.py:66
 msgid "The issue test sending has been initiated."
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:275
+#: EasyNewsletter/browser/subscribers.py:274
 msgid "The number of items in the line is not correct.                         It should be 7. Check your CSV file."
 msgstr ""
 
@@ -691,28 +678,24 @@ msgstr ""
 msgid "Title for the portlet."
 msgstr "Título do portlet"
 
-#: EasyNewsletter/tests/test_vocab_plone_groups.py:35
-msgid "VIP"
-msgstr ""
-
 #: EasyNewsletter/profiles/default/types/Newsletter.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Issue.xml
 #: EasyNewsletter/profiles/default/types/Newsletter_Subscriber.xml
 msgid "View"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:272
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:48
+#: EasyNewsletter/browser/registration.py:270
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:58
 msgid "We send you an email, please confirm this unsubscription."
 msgstr ""
 
-#: EasyNewsletter/browser/subscribers.py:265
+#: EasyNewsletter/browser/subscribers.py:264
 #: EasyNewsletter/views/newsletter_subscribers_upload.py:78
 msgid "Wrong specification of the CSV file. Please correct it and retry."
 msgstr "Especificação inválida do arquivo CSV. Por favor corrija e tente novamente."
 
-#: EasyNewsletter/browser/registration.py:307
-#: EasyNewsletter/views/newsletter_unsubscribe.py:46
+#: EasyNewsletter/browser/registration.py:305
+#: EasyNewsletter/views/newsletter_unsubscribe.py:45
 msgid "You have been unsubscribed."
 msgstr "Você foi descadastrado."
 
@@ -720,16 +703,16 @@ msgstr "Você foi descadastrado."
 msgid "You want to unsubscribe from this Newsletter?"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:278
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:56
+#: EasyNewsletter/browser/registration.py:276
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:66
 msgid "Your email address could not be found in subscribers."
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:95
+#: EasyNewsletter/browser/registration.py:93
 msgid "Your email address is already registered."
 msgstr "Seu endereço de email já está cadastrado."
 
-#: EasyNewsletter/browser/registration.py:142
+#: EasyNewsletter/browser/registration.py:140
 msgid "Your email has been registered.                 A confirmation email was sent to your address. Please check                 your inbox and click on the link in the email in order to                 confirm your subscription."
 msgstr "Seu email foi registrado. Um email de confirmação foi enviado para seu endereço. Por favor verifique sua caixa de entrada e clique no link no email recebido a fim de confirmarmos o seu cadastro."
 
@@ -737,7 +720,7 @@ msgstr "Seu email foi registrado. Um email de confirmação foi enviado para seu
 msgid "Your registered E-Mail address:"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:191
+#: EasyNewsletter/browser/registration.py:189
 msgid "Your subscription was successfully confirmed."
 msgstr "Sua inscrição foi confirmada com sucesso"
 
@@ -757,8 +740,8 @@ msgstr "Adicionar assinante"
 msgid "cancel"
 msgstr ""
 
-#: EasyNewsletter/browser/registration.py:268
-#: EasyNewsletter/views/newsletter_unsubscribe_form.py:44
+#: EasyNewsletter/browser/registration.py:266
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:53
 msgid "confirm newsletter unsubscription"
 msgstr ""
 
@@ -856,34 +839,34 @@ msgid "easynewsletter_unsubscribe_button"
 msgstr ""
 
 #. Default: "Your email has been registered. A confirmation email was sent to your address. Please check your inbox and click  on the link in the email in order to confirm your subscription."
-#: EasyNewsletter/config.py:37
+#: EasyNewsletter/config.py:39
 msgid "email_added"
 msgstr ""
 
 #. Default: "Your email address is already registered."
-#: EasyNewsletter/config.py:46
+#: EasyNewsletter/config.py:49
 msgid "email_exists"
 msgstr ""
 
 #. Default: "Choose the template to render the email. "
-#: EasyNewsletter/content/newsletter.py:234
-#: EasyNewsletter/content/newsletter_issue.py:129
+#: EasyNewsletter/content/newsletter.py:232
+#: EasyNewsletter/content/newsletter_issue.py:126
 msgid "enl_help_output_template"
 msgstr ""
 
 #. Default: "If checked, the banner image defined on newsletter                     or on this issue will not be used."
-#: EasyNewsletter/content/newsletter_issue.py:169
+#: EasyNewsletter/content/newsletter_issue.py:166
 msgid "enl_issue_help_hide_image"
 msgstr ""
 
 #. Default: "Default output template"
-#: EasyNewsletter/vocabularies/output_templates.py:37
+#: EasyNewsletter/vocabularies/output_templates.py:36
 msgid "enl_label_default_output_template"
 msgstr ""
 
 #. Default: "Output template"
-#: EasyNewsletter/content/newsletter.py:233
-#: EasyNewsletter/content/newsletter_issue.py:128
+#: EasyNewsletter/content/newsletter.py:231
+#: EasyNewsletter/content/newsletter_issue.py:125
 msgid "enl_label_output_template"
 msgstr ""
 
@@ -917,12 +900,12 @@ msgid "import_subscriber"
 msgstr ""
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:44
+#: EasyNewsletter/config.py:46
 msgid "invalid_email"
 msgstr ""
 
 #. Default: "Please enter a valid email address."
-#: EasyNewsletter/config.py:48
+#: EasyNewsletter/config.py:52
 msgid "invalid_hashkey"
 msgstr ""
 
@@ -932,7 +915,7 @@ msgid "label_ext_subcriber_source_failed"
 msgstr ""
 
 #. Default: "Hide banner image."
-#: EasyNewsletter/content/newsletter_issue.py:168
+#: EasyNewsletter/content/newsletter_issue.py:165
 msgid "label_issueHideImage"
 msgstr ""
 
@@ -972,12 +955,12 @@ msgid "label_newsletter_path"
 msgstr ""
 
 #. Default: "Mr."
-#: EasyNewsletter/config.py:26
+#: EasyNewsletter/config.py:28
 msgid "label_salutation_mr"
 msgstr "Sr."
 
 #. Default: "Ms."
-#: EasyNewsletter/config.py:25
+#: EasyNewsletter/config.py:27
 msgid "label_salutation_ms"
 msgstr "Sra."
 
@@ -1080,8 +1063,8 @@ msgstr ""
 msgid "source"
 msgstr "Origem"
 
-#: EasyNewsletter/browser/subscribers.py:215
-#: EasyNewsletter/views/newsletter_subscribers.py:103
+#: EasyNewsletter/browser/subscribers.py:214
+#: EasyNewsletter/views/newsletter_subscribers.py:107
 msgid "subscriber/s deleted successfully"
 msgstr "assinante(s) apagado(s) com sucesso"
 
@@ -1092,7 +1075,7 @@ msgid "subscribers_search_note"
 msgstr ""
 
 #. Default: "Your subscription was successfully confirmed."
-#: EasyNewsletter/config.py:50
+#: EasyNewsletter/config.py:55
 msgid "subscription_confirmed"
 msgstr ""
 
@@ -1107,6 +1090,11 @@ msgstr "Assinantes criados com sucesso"
 msgid "unsubscribe"
 msgstr ""
 
-#: EasyNewsletter/content/newsletter.py:200
+#. Default: "You requested to unsubscribe from the following newsletter: ${title}"
+#: EasyNewsletter/views/newsletter_unsubscribe_form.py:37
+msgid "you_requested_to_unsubscribe"
+msgstr ""
+
+#: EasyNewsletter/content/newsletter.py:198
 msgid "{{subscriber_salutation}}<br />"
 msgstr ""
diff --git a/src/Products/EasyNewsletter/locales/pt_BR/LC_MESSAGES/plone.po b/src/Products/EasyNewsletter/locales/pt_BR/LC_MESSAGES/plone.po
index 2c8e08f5..e931282d 100644
--- a/src/Products/EasyNewsletter/locales/pt_BR/LC_MESSAGES/plone.po
+++ b/src/Products/EasyNewsletter/locales/pt_BR/LC_MESSAGES/plone.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2021-02-01 19:16+0000\n"
+"POT-Creation-Date: 2021-02-02 19:02+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/Products/EasyNewsletter/locales/update.py b/src/Products/EasyNewsletter/locales/update.py
index b22d5325..462cf30a 100644
--- a/src/Products/EasyNewsletter/locales/update.py
+++ b/src/Products/EasyNewsletter/locales/update.py
@@ -15,7 +15,7 @@ def locale_folder_setup(domain=None):
     languages = [
         d
         for d in os.listdir(locale_path)
-        if os.path.isdir(os.path.join(locale_path, d) and d != "__pycache__")
+        if os.path.isdir(os.path.join(locale_path, d)) and d != "__pycache__"
     ]
     for lang in languages:
         lc_message_dir_path = os.path.join(locale_path, lang, 'LC_MESSAGES')
diff --git a/src/Products/EasyNewsletter/views/newsletter_subscriber.pt b/src/Products/EasyNewsletter/views/newsletter_subscriber.pt
index 721fe6b1..6f6f11c0 100644
--- a/src/Products/EasyNewsletter/views/newsletter_subscriber.pt
+++ b/src/Products/EasyNewsletter/views/newsletter_subscriber.pt
@@ -6,8 +6,12 @@
       metal:use-macro="context/main_template/macros/master">
 <body>
   <metal:block fill-slot="content-core">
-      <h2 i18n:translate="">Sample View</h2>
-      <p tal:content="view/msg">this gets replaced</p>
+    <div tal:content="structure view/w/salutation/render" />
+    <div tal:content="structure view/w/name_prefix/render" />
+    <div tal:content="structure view/w/firstname/render" />
+    <div tal:content="structure view/w/lastname/render" />
+    <div tal:content="structure view/w/organization/render" />
+    <div tal:content="structure view/w/email/render" />
   </metal:block>
 </body>
 </html>
diff --git a/src/Products/EasyNewsletter/views/newsletter_subscriber.py b/src/Products/EasyNewsletter/views/newsletter_subscriber.py
index d8137d1c..8b3b5cb2 100644
--- a/src/Products/EasyNewsletter/views/newsletter_subscriber.py
+++ b/src/Products/EasyNewsletter/views/newsletter_subscriber.py
@@ -1,15 +1,11 @@
 # -*- coding: utf-8 -*-
 
-from Products.EasyNewsletter import _
-from Products.Five.browser import BrowserView
+from plone.dexterity.browser.view import DefaultView
 
 
-class NewsletterSubscriber(BrowserView):
-    # If you want to define a template here, please remove the template from
-    # the configure.zcml registration of this view.
-    # template = ViewPageTemplateFile('newsletter_subscriber.pt')
+# from Products.EasyNewsletter import _
 
-    def __call__(self):
-        # Implement your own actions:
-        self.msg = _(u'A small message')
-        return self.index()
+
+class NewsletterSubscriber(DefaultView):
+    """
+    """
diff --git a/src/Products/EasyNewsletter/views/newsletter_unsubscribe_form.py b/src/Products/EasyNewsletter/views/newsletter_unsubscribe_form.py
index 2cff32e4..ee29994e 100644
--- a/src/Products/EasyNewsletter/views/newsletter_unsubscribe_form.py
+++ b/src/Products/EasyNewsletter/views/newsletter_unsubscribe_form.py
@@ -4,6 +4,7 @@
 from Products.EasyNewsletter import _
 from Products.EasyNewsletter.utils.mail import get_portal_mail_settings
 from Products.Five.browser import BrowserView
+from zope.i18n import translate
 
 
 # from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
@@ -33,7 +34,13 @@ def send_unsubscribe_email(self, subscriber):
             unsubscribe_url = (
                 self.newsletter_url + "/unsubscribe?subscriber=" + subscriber_brain.UID
             )
-            msg_text = """%s: %s""" % (
+            unsubscribe_header_msgid = _(
+                u"you_requested_to_unsubscribe",
+                default=u"You requested to unsubscribe from the following newsletter: ${title}",
+                mapping={u"title": newsletter.title},
+            )
+            msg_text = "{0}\n{1}: {2}".format(
+                translate(unsubscribe_header_msgid),
                 newsletter.unsubscribe_string,
                 unsubscribe_url,
             )
@@ -41,7 +48,9 @@ def send_unsubscribe_email(self, subscriber):
             api.portal.send_email(
                 recipient=subscriber,
                 sender=settings.email_from_address,
-                subject=_(u"confirm newsletter unsubscription"),
+                subject=u"{0}: {1}".format(
+                    newsletter.title, _(u"confirm newsletter unsubscription")
+                ),
                 body=msg_text,
             )
             api.portal.show_message(
diff --git a/tox.ini b/tox.ini
index 284097ce..52a6ee51 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,6 +14,7 @@ skip_missing_interpreters = True
 python =
     2.7: py27
     3.7: py37
+
     # 3.8: py38
     # 3.9: py39
 


Test patch:
diff --git a/src/Products/EasyNewsletter/tests/test_unsubscribe_form.py b/src/Products/EasyNewsletter/tests/test_unsubscribe_form.py
index 475a8c1c..18a17467 100644
--- a/src/Products/EasyNewsletter/tests/test_unsubscribe_form.py
+++ b/src/Products/EasyNewsletter/tests/test_unsubscribe_form.py
@@ -87,10 +87,9 @@ def test_submit_unsubscribe_form(self):
             (self.newsletter, self.portal.REQUEST), name="unsubscribe-form"
         )
         view.__call__()
-
         self.assertEqual(len(self.mailhost.messages), 1)
         self.assertTrue(self.mailhost.messages[0])
-        msg = str(self.mailhost.messages[0])
+        msg = safe_unicode(self.mailhost.messages[0])
         self.assertIn("To: max@example.com", msg)
         self.assertIn("From: portal@plone.test", msg)