django-codenerix-email 4.0.28__py2.py3-none-any.whl → 4.0.30__py2.py3-none-any.whl

codenerix_email/migrations/0014_emailreceived.py

@@ -0,0 +1,95 @@
+# Generated by Django 5.2.6 on 2025-09-24 09:21
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("codenerix_email", "0013_emailmessage_headers"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="EmailReceived",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "created",
+                    models.DateTimeField(auto_now_add=True, verbose_name="Created"),
+                ),
+                (
+                    "updated",
+                    models.DateTimeField(auto_now=True, verbose_name="Updated"),
+                ),
+                ("imap_id", models.IntegerField(default=0, verbose_name="IMAP ID")),
+                (
+                    "eid",
+                    models.CharField(
+                        help_text="Unique Message-ID header",
+                        max_length=512,
+                        unique=True,
+                        verbose_name="Message ID",
+                    ),
+                ),
+                ("efrom", models.EmailField(max_length=254, verbose_name="From")),
+                ("eto", models.EmailField(max_length=254, verbose_name="To")),
+                ("subject", models.CharField(max_length=256, verbose_name="Subject")),
+                (
+                    "headers",
+                    models.JSONField(blank=True, null=True, verbose_name="Headers"),
+                ),
+                ("body_text", models.TextField(blank=True, verbose_name="Body (Text)")),
+                ("body_html", models.TextField(blank=True, verbose_name="Body (HTML)")),
+                (
+                    "date_received",
+                    models.DateTimeField(
+                        auto_now_add=True, verbose_name="Date received"
+                    ),
+                ),
+                (
+                    "bounce_type",
+                    models.CharField(
+                        blank=True,
+                        choices=[("S", "Soft"), ("H", "Hard")],
+                        default=None,
+                        max_length=1,
+                        null=True,
+                        verbose_name="Bounce Type",
+                    ),
+                ),
+                (
+                    "bounce_reason",
+                    models.CharField(
+                        blank=True,
+                        default=None,
+                        max_length=512,
+                        null=True,
+                        verbose_name="Bounce Reason",
+                    ),
+                ),
+                (
+                    "email",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="receiveds",
+                        to="codenerix_email.emailmessage",
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+                "default_permissions": ("add", "change", "delete", "view", "list"),
+            },
+        ),
+    ]

codenerix_email/models.py

@@ -24,6 +24,7 @@ import re
 import ssl
 import smtplib
 from uuid import uuid4
+from typing import Optional
 
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
@@ -32,8 +33,10 @@ from django.template import Context, Template
 from django.core.exceptions import ValidationError
 from django.conf import settings
 from django.db.models import Q
+from django.utils.safestring import SafeString
 
 from codenerix.models import CodenerixModel
+from codenerix.helpers import obj_to_html
 from codenerix_lib.debugger import Debugger
 from codenerix.lib.genmail import (  # noqa: N817
     EmailMessage as EM,
@@ -48,6 +51,13 @@ CONTENT_SUBTYPES = (
     (CONTENT_SUBTYPE_HTML, _("HTML Web")),
 )
 
+BOUNCE_SOFT = "S"
+BOUNCE_HARD = "H"
+BOUNCE_TYPES = (
+    (BOUNCE_SOFT, _("Soft")),
+    (BOUNCE_HARD, _("Hard")),
+)
+
 
 def ensure_header(headers, key, value, headers_keys=None):
     if headers_keys is None:
@@ -174,6 +184,18 @@ class EmailMessage(CodenerixModel, Debugger):
     def __unicode__(self):
         return "{} ({})".format(self.eto, self.pk)
 
+    @property
+    def bounces_soft(self):
+        return self.receiveds.filter(bounce_type=BOUNCE_SOFT).count()
+
+    @property
+    def bounces_hard(self):
+        return self.receiveds.filter(bounce_type=BOUNCE_HARD).count()
+
+    @property
+    def bounces_total(self):
+        return self.receiveds.filter(bounce_type__isnull=False).count()
+
     def clean(self):
         if not isinstance(self.headers, dict):
             raise ValidationError(_("HEADERS must be a Dictionary"))
@@ -183,7 +205,7 @@ class EmailMessage(CodenerixModel, Debugger):
             self.opened = timezone.now()
             self.save()
 
-    def get_headers(self):
+    def get_headers(self, legacy=False):
 
         # Get headers
         headers = self.headers or {}
@@ -218,6 +240,36 @@ class EmailMessage(CodenerixModel, Debugger):
                 headers_keys,
             )
 
+        # Prepare message Tracking info
+        if "X-Codenerix-Tracking-ID".lower() not in headers_keys:
+            ets = int(timezone.now().timestamp())
+            ensure_header(
+                headers,
+                "X-Codenerix-Tracking-ID",
+                self.uuid.hex,
+                headers_keys,
+            )
+
+        # Prepare Return-Path
+        if "Return-Path".lower() not in headers_keys:
+            if not legacy:
+                email_bounce = getattr(
+                    settings,
+                    "CLIENT_EMAIL_RETURN_PATH",
+                    settings.CLIENT_EMAIL_FROM,
+                )
+            else:
+                email_bounce = getattr(
+                    settings, "EMAIL_RETURN_PATH", settings.EMAIL_FROM
+                )
+            ensure_header(
+                headers,
+                "Return-Path",
+                email_bounce,
+                headers_keys,
+            )
+
+        print(headers)
         # Return headers
         return headers
 
@@ -405,7 +457,7 @@ class EmailMessage(CodenerixModel, Debugger):
                     from_email=self.efrom,
                     to=[self.eto],
                     connection=connection,
-                    headers=self.get_headers(),
+                    headers=self.get_headers(legacy),
                 )
                 email.content_subtype = self.content_subtype
                 for at in self.attachments.all():
@@ -515,6 +567,101 @@ class EmailAttachment(CodenerixModel):
         return fields
 
 
+class EmailReceived(CodenerixModel):
+    imap_id = models.IntegerField(
+        _("IMAP ID"), blank=False, null=False, default=0
+    )
+    eid = models.CharField(
+        _("Message ID"),
+        max_length=512,
+        unique=True,
+        help_text=_("Unique Message-ID header"),
+    )
+    efrom = models.EmailField(_("From"), blank=False, null=False)
+    eto = models.EmailField(_("To"), blank=False, null=False)
+    subject = models.CharField(
+        _("Subject"), max_length=256, blank=False, null=False
+    )
+    headers = models.JSONField(_("Headers"), blank=True, null=True)
+    body_text = models.TextField(_("Body (Text)"), blank=True, null=False)
+    body_html = models.TextField(_("Body (HTML)"), blank=True, null=False)
+    date_received = models.DateTimeField(_("Date received"), auto_now_add=True)
+
+    email = models.ForeignKey(
+        EmailMessage,
+        on_delete=models.CASCADE,
+        blank=False,
+        null=True,
+        related_name="receiveds",
+    )
+
+    bounce_type = models.CharField(
+        _("Bounce Type"),
+        max_length=1,
+        choices=BOUNCE_TYPES,
+        blank=True,
+        null=True,
+        default=None,
+    )
+    bounce_reason = models.CharField(
+        _("Bounce Reason"), max_length=512, blank=True, null=True, default=None
+    )
+
+    def __fields__(self, info):
+        fields = []
+        fields.append(("date_received", _("Date received")))
+        fields.append(("bounce_type", None))
+        fields.append(("get_bounce_type_display", _("Bounce Type")))
+        fields.append(("efrom", _("From")))
+        fields.append(("eto", _("To")))
+        fields.append(("subject", _("Subject")))
+        fields.append(("email__uuid", _("Related email")))
+        fields.append(("email__pk", None))
+        fields.append(("imap_id", _("IMAP ID")))
+        return fields
+
+    def __searchF__(self, info):  # noqa: N802
+        def bounce_filter(key):
+            if key == "-":
+                return Q(bounce_type__isnull=False)
+            else:
+                return Q(bounce_type=key)
+
+        return {
+            "efrom": (_("From"), lambda x: Q(efrom__icontains=x), "input"),
+            "eto": (_("To"), lambda x: Q(eto__icontains=x), "input"),
+            "email__uuid": (
+                _("Related email"),
+                lambda x: Q(email__uuid__icontains=x),
+                "input",
+            ),
+            "get_bounce_type_display": (
+                _("Bounce Type"),
+                bounce_filter,
+                [
+                    (BOUNCE_SOFT, _("Soft")),
+                    (BOUNCE_HARD, _("Hard")),
+                    (None, _("No Bounce")),
+                    ("-", _("Only Bounces")),
+                ],
+            ),
+        }
+
+    def __prettyfy__(self, obj) -> Optional[SafeString]:
+        if obj is None:
+            return None
+
+        # Convert to HTML
+        (kind, html) = obj_to_html(obj)
+
+        # Return as HTML
+        return SafeString(f" <b[ {kind} ]></b><br/>") + html
+
+    @property
+    def headers_pretty(self) -> Optional[SafeString]:
+        return self.__prettyfy__(self.headers)
+
+
 class EmailTemplate(CodenerixModel):
     cid = models.CharField(
         _("CID"), unique=True, max_length=30, blank=False, null=False

codenerix_email/static/codenerix_email/{partials/emailmessages_rows.html → emailmessages_rows.html}

@@ -14,6 +14,7 @@
 </td>
 <td>{{row.eto|codenerix}}</td>
 <td><nobr>{{row.subject|codenerix}}</nobr></td>
+<td class="text-nowrap">{{row.bounces_total_count|codenerix}}</td>
 <td><center>{{row.retries|codenerix}}</center></td>
 <td class="text-nowrap">{{row.next_retry|codenerix}}</td>
 <td><center>{{row.pk|codenerix}}</center></td>

codenerix_email/static/codenerix_email/emailreceiveds_rows.html

@@ -0,0 +1,24 @@
+<td
+    ng-class="{'info': (!row.email__pk) && (!row.bounce_type), 'warning': row.bounce_type=='S', 'danger': row.bounce_type=='H', 'text-warning': row.bounce_type=='S', 'text-danger': row.bounce_type=='H'}"
+    class="text-nowrap">{{row.date_received|codenerix}}</td>
+<td
+    ng-class="{'info': (!row.email__pk) && (!row.bounce_type), 'warning': row.bounce_type=='S', 'danger': row.bounce_type=='H', 'text-warning': row.bounce_type=='S', 'text-danger': row.bounce_type=='H'}"
+    class="text-nowrap">{{row.get_bounce_type_display|codenerix}}</td>
+<td
+    ng-class="{'info': (!row.email__pk) && (!row.bounce_type), 'warning': row.bounce_type=='S', 'danger': row.bounce_type=='H', 'text-warning': row.bounce_type=='S', 'text-danger': row.bounce_type=='H'}"
+    class="text-nowrap">{{row.efrom|codenerix}}</td>
+<td
+    ng-class="{'info': (!row.email__pk) && (!row.bounce_type), 'warning': row.bounce_type=='S', 'danger': row.bounce_type=='H', 'text-warning': row.bounce_type=='S', 'text-danger': row.bounce_type=='H'}"
+    class="text-nowrap">{{row.eto|codenerix}}</td>
+<td
+    ng-class="{'info': (!row.email__pk) && (!row.bounce_type), 'warning': row.bounce_type=='S', 'danger': row.bounce_type=='H', 'text-warning': row.bounce_type=='S', 'text-danger': row.bounce_type=='H'}"
+    class="text-nowrap">{{row.subject|codenerix}}</td>
+<td
+    ng-class="{'info': (!row.email__pk) && (!row.bounce_type), 'warning': row.bounce_type=='S', 'danger': row.bounce_type=='H', 'text-warning': row.bounce_type=='S', 'text-danger': row.bounce_type=='H'}"
+    ng-click="$event.stopPropagation();"
+    class="text-nowrap">
+    <a href='/codenerix_email/emailmessages#/{{row.email__pk}}'>{{row.email__uuid|codenerix}}</a>
+</td>
+<td
+    ng-class="{'info': (!row.email__pk) && (!row.bounce_type), 'warning': row.bounce_type=='S', 'danger': row.bounce_type=='H', 'text-warning': row.bounce_type=='S', 'text-danger': row.bounce_type=='H'}"
+        class="text-nowrap">{{row.imap_id|codenerix}}</td>

codenerix_email/urls.py

@@ -19,23 +19,109 @@
 # limitations under the License.
 
 from django.urls import re_path
-from codenerix_email.views import EmailTemplateList, EmailTemplateCreate, EmailTemplateCreateModal, EmailTemplateUpdate, EmailTemplateUpdateModal, EmailTemplateDelete
-from codenerix_email.views import EmailMessageList, EmailMessageCreate, EmailMessageCreateModal, EmailMessageUpdate, EmailMessageUpdateModal, EmailMessageDelete, EmailMessageDetails
+from codenerix_email.views import (
+    EmailTemplateList,
+    EmailTemplateCreate,
+    EmailTemplateCreateModal,
+    EmailTemplateUpdate,
+    EmailTemplateUpdateModal,
+    EmailTemplateDelete,
+)
+from codenerix_email.views import (
+    EmailMessageList,
+    EmailMessageCreate,
+    EmailMessageCreateModal,
+    EmailMessageUpdate,
+    EmailMessageUpdateModal,
+    EmailMessageDelete,
+    EmailMessageDetails,
+)
+from codenerix_email.views import (
+    EmailReceivedList,
+    EmailReceivedDetails,
+    EmailReceivedSubList,
+)
 
 
 urlpatterns = [
-    re_path(r'^emailtemplates$', EmailTemplateList.as_view(), name='CDNX_emails_emailtemplates_list'),
-    re_path(r'^emailtemplates/add$', EmailTemplateCreate.as_view(), name='CDNX_emails_emailtemplates_add'),
-    re_path(r'^emailtemplates/addmodal$', EmailTemplateCreateModal.as_view(), name='CDNX_emails_emailtemplates_addmodal'),
-    re_path(r'^emailtemplates/(?P<pk>\w+)/edit$', EmailTemplateUpdate.as_view(), name='CDNX_emails_emailtemplates_edit'),
-    re_path(r'^emailtemplates/(?P<pk>\w+)/editmodal$', EmailTemplateUpdateModal.as_view(), name='CDNX_emails_emailtemplates_editmodal'),
-    re_path(r'^emailtemplates/(?P<pk>\w+)/delete$', EmailTemplateDelete.as_view(), name='CDNX_emails_emailtemplates_delete'),
-
-    re_path(r'^emailmessages$', EmailMessageList.as_view(), name='CDNX_emails_emailmessages_list'),
-    re_path(r'^emailmessages/add$', EmailMessageCreate.as_view(), name='CDNX_emails_emailmessages_add'),
-    re_path(r'^emailmessages/addmodal$', EmailMessageCreateModal.as_view(), name='CDNX_emails_emailmessages_addmodal'),
-    re_path(r'^emailmessages/(?P<pk>\w+)$', EmailMessageDetails.as_view(), name='CDNX_emails_emailmessages_details'),
-    re_path(r'^emailmessages/(?P<pk>\w+)/edit$', EmailMessageUpdate.as_view(), name='CDNX_emails_emailmessages_edit'),
-    re_path(r'^emailmessages/(?P<pk>\w+)/editmodal$', EmailMessageUpdateModal.as_view(), name='CDNX_emails_emailmessages_editmodal'),
-    re_path(r'^emailmessages/(?P<pk>\w+)/delete$', EmailMessageDelete.as_view(), name='CDNX_emails_emailmessages_delete'),
+    re_path(
+        r"^emailtemplates$",
+        EmailTemplateList.as_view(),
+        name="CDNX_emails_emailtemplates_list",
+    ),
+    re_path(
+        r"^emailtemplates/add$",
+        EmailTemplateCreate.as_view(),
+        name="CDNX_emails_emailtemplates_add",
+    ),
+    re_path(
+        r"^emailtemplates/addmodal$",
+        EmailTemplateCreateModal.as_view(),
+        name="CDNX_emails_emailtemplates_addmodal",
+    ),
+    re_path(
+        r"^emailtemplates/(?P<pk>\w+)/edit$",
+        EmailTemplateUpdate.as_view(),
+        name="CDNX_emails_emailtemplates_edit",
+    ),
+    re_path(
+        r"^emailtemplates/(?P<pk>\w+)/editmodal$",
+        EmailTemplateUpdateModal.as_view(),
+        name="CDNX_emails_emailtemplates_editmodal",
+    ),
+    re_path(
+        r"^emailtemplates/(?P<pk>\w+)/delete$",
+        EmailTemplateDelete.as_view(),
+        name="CDNX_emails_emailtemplates_delete",
+    ),
+    re_path(
+        r"^emailmessages$",
+        EmailMessageList.as_view(),
+        name="CDNX_emails_emailmessages_list",
+    ),
+    re_path(
+        r"^emailmessages/add$",
+        EmailMessageCreate.as_view(),
+        name="CDNX_emails_emailmessages_add",
+    ),
+    re_path(
+        r"^emailmessages/addmodal$",
+        EmailMessageCreateModal.as_view(),
+        name="CDNX_emails_emailmessages_addmodal",
+    ),
+    re_path(
+        r"^emailmessages/(?P<pk>\w+)$",
+        EmailMessageDetails.as_view(),
+        name="CDNX_emails_emailmessages_details",
+    ),
+    re_path(
+        r"^emailmessages/(?P<pk>\w+)/edit$",
+        EmailMessageUpdate.as_view(),
+        name="CDNX_emails_emailmessages_edit",
+    ),
+    re_path(
+        r"^emailmessages/(?P<pk>\w+)/editmodal$",
+        EmailMessageUpdateModal.as_view(),
+        name="CDNX_emails_emailmessages_editmodal",
+    ),
+    re_path(
+        r"^emailmessages/(?P<pk>\w+)/delete$",
+        EmailMessageDelete.as_view(),
+        name="CDNX_emails_emailmessages_delete",
+    ),
+    re_path(
+        r"^emailreceiveds$",
+        EmailReceivedList.as_view(),
+        name="CDNX_emails_emailreceiveds_list",
+    ),
+    re_path(
+        r"^emailreceiveds/(?P<pk>\w+)$",
+        EmailReceivedDetails.as_view(),
+        name="CDNX_emails_emailreceiveds_details",
+    ),
+    re_path(
+        r"^emailreceiveds/(?P<pk>\w+)/sublist$",
+        EmailReceivedSubList.as_view(),
+        name="CDNX_emails_emailreceiveds_sublist",
+    ),
 ]

codenerix_email/views.py

@@ -28,6 +28,7 @@ from django.shortcuts import get_object_or_404
 from django.utils.translation import gettext as _
 from django.conf import settings
 from django.http import HttpRequest, Http404
+from django.db.models import Q, Count
 
 from codenerix.multiforms import MultiForm  # type: ignore
 from codenerix.views import (  # type: ignore
@@ -38,9 +39,21 @@ from codenerix.views import (  # type: ignore
     GenUpdateModal,
     GenDelete,
     GenDetail,
+    SearchFilters,
+)
+from codenerix_email.models import (
+    EmailTemplate,
+    EmailMessage,
+    EmailReceived,
+    MODELS,
+    BOUNCE_SOFT,
+    BOUNCE_HARD,
+)
+from codenerix_email.forms import (
+    EmailTemplateForm,
+    EmailMessageForm,
+    EmailReceivedForm,
 )
-from codenerix_email.models import EmailTemplate, EmailMessage, MODELS
-from codenerix_email.forms import EmailTemplateForm, EmailMessageForm
 
 formsfull: Dict[
     str,
@@ -115,6 +128,23 @@ class EmailTemplateList(GenList):
         "bread": [_("Emails"), _("Email Template")],
     }
 
+    def __fields__(self, info):
+        fields = []
+        fields.append(("pk", _("PK"), 100))
+        fields.append(("cid", _("CID"), 100))
+        fields.append(("efrom", _("From"), 100))
+        fields.append(
+            (
+                f"{self.language}__subject",
+                _("Subject"),
+                100,
+                None,
+                "shorttext:150",
+            )
+        )
+        fields.append(("content_subtype", _("Content Subtype"), 100))
+        return fields
+
 
 class EmailTemplateCreate(MultiForm, GenCreate):
     model = EmailTemplate
@@ -148,7 +178,6 @@ class EmailMessageList(GenList):
     search_filter_button = True
     datetime_filter = "updated"
     default_ordering = ["-created"]
-    static_partial_row = "codenerix_email/partials/emailmessages_rows.html"
     gentranslate = {
         "sending": _("Sending"),
         "sent": _("Sent"),
@@ -159,6 +188,90 @@ class EmailMessageList(GenList):
         "menu": ["codenerix_email", "emailmessages"],
         "bread": [_("Emails"), _("Email Messages")],
     }
+    annotations = {
+        # "bounces_soft_count": Count(
+        #     "receiveds__pk", filter=Q(receiveds__bounce_type=BOUNCE_SOFT)
+        # ),
+        # "bounces_hard_count": Count(
+        #     "receiveds__pk", filter=Q(receiveds__bounce_type=BOUNCE_HARD)
+        # ),
+        "bounces_total_count": Count(
+            "receiveds__pk", filter=Q(receiveds__bounce_type__isnull=False)
+        ),
+    }
+
+    def __fields__(self, info):
+        fields = []
+        fields.append(("sending", None))
+        fields.append(("error", None))
+        fields.append(("sent", _("Send")))
+        fields.append(("priority", _("Priority")))
+        fields.append(("created", _("Created")))
+        fields.append(("updated", _("Updated")))
+        fields.append(("opened", _("Opened")))
+        # fields.append(("efrom", _("From")))
+        fields.append(("eto", _("To")))
+        fields.append(("subject", _("Subject")))
+        fields.append(("bounces_total_count", _("Bounces")))
+        # fields.append(("bounces_soft_count", _("Soft bounces")))
+        # fields.append(("bounces_hard_count", _("Hard bounces")))
+        fields.append(("retries", _("Retries")))
+        fields.append(("next_retry", _("Next retry")))
+        fields.append(("pk", _("ID")))
+        fields.append(("uuid", _("UUID")))
+        fields.append(("unsubscribe_url", _("Unsubscribe")))
+        fields.append(("content_subtype", _("Content Subtype")))
+        return fields
+
+    def __searchF__(self, info):  # noqa: N802
+        def mailstatus(x):
+            if x == "D":
+                return Q(error=False, sent=True)
+            elif x == "P":
+                return Q(error=False, sent=False, sending=False)
+            elif x == "S":
+                return Q(error=False, sent=False, sending=True)
+            elif x == "E":
+                return Q(error=True)
+            else:
+                return Q()
+
+        mailoptions = [
+            ("D", _("Sent")),  # Sent - Done
+            ("P", _("Pending")),  # Pending - Pending
+            ("S", _("Sending")),  # Sending - Sending
+            ("E", _("Error")),  # Error - Error
+        ]
+
+        return {
+            "sent": (_("Sent"), lambda x: mailstatus(x), mailoptions),
+            "uuid": (_("UUID"), lambda x: Q(uuid__icontains=x), "input"),
+            "priority": (_("Priority"), lambda x: Q(priority=x), "input"),
+            "opened": (
+                _("Opened"),
+                lambda x: ~Q(opened__isnull=x),
+                [(True, _("Yes")), (False, _("No"))],
+            ),
+            # "efrom": (_("From"), lambda x: Q(efrom__icontains=x), "input"),
+            "eto": (_("To"), lambda x: Q(eto__icontains=x), "input"),
+            "retries": (_("Retries"), lambda x: Q(retries=x), "input"),
+            "pk": (_("ID"), lambda x: Q(pk=x), "input"),
+            "bounces_total_count": (
+                _("Bounces"),
+                SearchFilters.number("bounces_total_count"),
+                "input",
+            ),
+            "bounces_soft_count": (
+                _("Soft bounces"),
+                SearchFilters.number("bounces_soft_count"),
+                "input",
+            ),
+            "bounces_hard_count": (
+                _("Hard bounces"),
+                SearchFilters.number("bounces_hard_count"),
+                "input",
+            ),
+        }
 
 
 class EmailMessageCreate(GenCreate):
@@ -174,6 +287,14 @@ class EmailMessageDetails(GenDetail):
     model = EmailMessage
     groups = EmailMessageForm.__groups_details__()
     show_details = True
+    tabs = [
+        {
+            "id": "receiveds",
+            "name": _("Received"),
+            "ws": "CDNX_emails_emailreceiveds_sublist",
+            "rows": "base",
+        }
+    ]
 
 
 class EmailMessageUpdate(GenUpdate):
@@ -188,3 +309,39 @@ class EmailMessageUpdateModal(GenUpdateModal, EmailMessageUpdate):
 
 class EmailMessageDelete(GenDelete):
     model = EmailMessage
+
+
+# ############################################
+# EmailReceived
+class EmailReceivedList(GenList):
+    model = EmailReceived
+    show_details = True
+    search_filter_button = True
+    datetime_filter = "updated"
+    default_ordering = ["-created"]
+    readonly = True
+    gentranslate = {
+        "sending": _("Sending"),
+        "sent": _("Sent"),
+        "notsent": _("Not sent!"),
+        "waiting": _("Waiting"),
+    }
+    extra_context = {
+        "menu": ["codenerix_email", "emailreceiveds"],
+        "bread": [_("Emails"), _("Email Messages")],
+    }
+
+
+class EmailReceivedDetails(GenDetail):
+    model = EmailReceived
+    groups = EmailReceivedForm.__groups_details__()
+    show_details = True
+    readonly = True
+
+
+class EmailReceivedSubList(EmailReceivedList):
+    def __limitQ__(self, info):  # noqa: N802
+        limit = {}
+        pk = info.kwargs.get("pk", None)
+        limit["receiveds"] = Q(email__pk=pk)
+        return limit