diff --git a/modoboa/webmail/lib/__init__.py b/modoboa/webmail/lib/__init__.py
index 2d78a671d..ec7e7baa6 100644
--- a/modoboa/webmail/lib/__init__.py
+++ b/modoboa/webmail/lib/__init__.py
@@ -7,7 +7,6 @@ from .imapemail import ImapEmail, ReplyModifier, ForwardModifier
 from .imaputils import BodyStructure, IMAPconnector, get_imapconnector, separate_mailbox
 from .signature import EmailSignature
 from .utils import decode_payload
-from .sendmail import send_mail, schedule_email
 
 
 __all__ = [
@@ -22,7 +21,5 @@ __all__ = [
     "decode_payload",
     "get_imapconnector",
     "save_attachment",
-    "send_mail",
-    "schedule_email",
     "separate_mailbox",
 ]
diff --git a/modoboa/webmail/lib/sendmail.py b/modoboa/webmail/lib/sendmail.py
index d2178a703..9a5621f18 100644
--- a/modoboa/webmail/lib/sendmail.py
+++ b/modoboa/webmail/lib/sendmail.py
@@ -11,18 +11,6 @@ from modoboa.webmail.lib.utils import create_message
 from . import get_imapconnector
 
 
-def create_message_from_scheduled_message(sched_msg: models.ScheduledMessage):
-    attachments = [attachment.to_dict() for attachment in sched_msg.attachments.all()]
-    result = create_message(sched_msg.account, sched_msg.to_dict(), attachments)
-    result.extra_headers.update(
-        {
-            constants.CUSTOM_HEADER_SCHEDULED_ID: sched_msg.id,
-            constants.CUSTOM_HEADER_SCHEDULED_DATETIME: sched_msg.scheduled_datetime.isoformat(),
-        }
-    )
-    return result
-
-
 def send_mail(request, attributes: dict, attachments: list) -> tuple[bool, str | None]:
     """
     Send a new email.
@@ -77,7 +65,7 @@ def schedule_email(
     request, attributes: dict, attachments: list
 ) -> models.ScheduledMessage:
     """Schedule a new email sending."""
-    message = models.ScheduledMessage(
+    sched_msg = models.ScheduledMessage(
         account=request.user,
         sender=attributes["sender"],
         scheduled_datetime=attributes["scheduled_datetime"],
@@ -88,25 +76,25 @@ def schedule_email(
     )
     for attr in ["cc", "bcc"]:
         if attr in attributes:
-            setattr(message, attr, ",".join(attributes[attr]))
-    message.save()
+            setattr(sched_msg, attr, ",".join(attributes[attr]))
+    sched_msg.save()
 
     # Save a copy of this message into an IMAP mailbox
-    msg = create_message_from_scheduled_message(message)
+    msg = sched_msg.to_email_message()
     with get_imapconnector(request) as imapc:
         try:
             imapc.create_folder(constants.MAILBOX_NAME_SCHEDULED)
         except WebmailInternalError:
             pass
         # TODO: deal with UID Validity
-        message.imap_uid = imapc.push_mail(
+        sched_msg.imap_uid = imapc.push_mail(
             constants.MAILBOX_NAME_SCHEDULED, msg.message()
         )
-        message.save()
+        sched_msg.save()
 
     for attachment in attachments:
         mattachment = models.MessageAttachment(
-            message=message,
+            message=sched_msg,
         )
         if "content-type" in attachment:
             mattachment.content_type = attachment["content-type"]
@@ -119,12 +107,12 @@ def schedule_email(
             mattachment.filename = attachment["fname"]
         mattachment.save()
 
-    return message
+    return sched_msg
 
 
 def send_scheduled_message(sched_msg: models.ScheduledMessage) -> bool:
     """Send a scheduled message using configured SMTP server."""
-    msg = create_message_from_scheduled_message(sched_msg)
+    msg = sched_msg.to_email_message()
     conf = dict(param_tools.get_global_parameters("webmail"))
     options = {
         "host": conf["scheduling_smtp_server"],
diff --git a/modoboa/webmail/viewsets.py b/modoboa/webmail/viewsets.py
index 2dc5063db..fb09bb2a4 100644
--- a/modoboa/webmail/viewsets.py
+++ b/modoboa/webmail/viewsets.py
@@ -14,6 +14,7 @@ from modoboa.lib.paginator import Paginator
 from modoboa.lib.viewsets import HasMailbox
 from modoboa.webmail import lib, models, serializers
 from modoboa.webmail.lib import attachments
+from modoboa.webmail.lib.sendmail import send_mail, schedule_email
 
 
 class UserMailboxViewSet(viewsets.GenericViewSet):
@@ -378,14 +379,14 @@ class ComposeSessionViewSet(viewsets.GenericViewSet):
         serializer.is_valid(raise_exception=True)
         manager = attachments.ComposeSessionManager(request.user.username)
         if serializer.validated_data["scheduled_datetime"]:
-            lib.schedule_email(
+            schedule_email(
                 request,
                 serializer.validated_data,
                 manager.get_content(pk)["attachments"],
             )
             return response.Response(status=204)
         else:
-            status, error = lib.send_mail(
+            status, error = send_mail(
                 request,
                 serializer.validated_data,
                 manager.get_content(pk)["attachments"],