diff --git a/CHANGES.rst b/CHANGES.rst
index 27119fca..c3bc9f71 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,6 +8,8 @@ Changelog
- booking_type filter in @months-slots
[mamico]
+- Register adapters for IMailFromFieldAction for both Site root and dx containers.
+ [cekk]
2.0.0.dev1 (2023-06-12)
-----------------------
diff --git a/src/redturtle/prenotazioni/actions/configure.zcml b/src/redturtle/prenotazioni/actions/configure.zcml
index 232b4a0a..1c5d7fc1 100644
--- a/src/redturtle/prenotazioni/actions/configure.zcml
+++ b/src/redturtle/prenotazioni/actions/configure.zcml
@@ -3,6 +3,8 @@
i18n_domain="redturtle.prenotazioni"
>
-
+
+
+
diff --git a/src/redturtle/prenotazioni/actions/mail.py b/src/redturtle/prenotazioni/actions/mail.py
index d0ae8c11..6d445b35 100644
--- a/src/redturtle/prenotazioni/actions/mail.py
+++ b/src/redturtle/prenotazioni/actions/mail.py
@@ -7,19 +7,18 @@
MailActionExecutor as BaseExecutor,
)
from plone.contentrules.rule.interfaces import IExecutable
+from plone.dexterity.interfaces import IDexterityContainer
+from plone.event.interfaces import IICalendar
from Products.CMFPlone.interfaces.siteroot import IPloneSiteRoot
+from redturtle.prenotazioni.prenotazione_event import IMovedPrenotazione
from six.moves import filter
from zope.component import adapter
from zope.interface import implementer
from zope.interface import Interface
-from plone.event.interfaces import IICalendar
-from redturtle.prenotazioni.prenotazione_event import IMovedPrenotazione
import six
-@implementer(IExecutable)
-@adapter(IPloneSiteRoot, IMailFromFieldAction, Interface)
class MailActionExecutor(BaseExecutor):
"""The executor for this action."""
@@ -78,3 +77,15 @@ def manage_attachments(self, msg):
subtype="calendar",
filename=name,
)
+
+
+@implementer(IExecutable)
+@adapter(IPloneSiteRoot, IMailFromFieldAction, Interface)
+class MailActionExecutorRoot(MailActionExecutor):
+ """Registered for site root"""
+
+
+@implementer(IExecutable)
+@adapter(IDexterityContainer, IMailFromFieldAction, Interface)
+class MailActionExecutorFolder(MailActionExecutor):
+ """Registered for folderish content"""