From ca245b22663d02ad0440198e35c3ce983e3b4245 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Wed, 30 Mar 2022 21:41:39 -0400
Subject: [PATCH 01/36] Create initial SMTP handler

---
 SMTP_handler.py  | 539 +++++++++++++++++++++++++++++++++++++++++++++++
 app/config.py    |   4 +
 app/models.py    |  32 +++
 email_handler.py |  54 +++--
 4 files changed, 606 insertions(+), 23 deletions(-)
 create mode 100644 SMTP_handler.py

diff --git a/SMTP_handler.py b/SMTP_handler.py
new file mode 100644
index 000000000..67644fc2f
--- /dev/null
+++ b/SMTP_handler.py
@@ -0,0 +1,539 @@
+"""
+Enable SMTP access for aliases.
+
+This will allow a MUA to send directly from the alias without the need for the user to create a reverse-alias.
+
+"""
+
+import argparse
+import time
+import ssl
+import uuid
+import email
+
+import newrelic.agent
+
+from aiosmtpd.controller import Controller
+from aiosmtpd.smtp import AuthResult, LoginPassword, Envelope
+
+from sqlalchemy.orm.exc import ObjectDeletedError
+from email.message import Message
+from email.utils import formataddr,  formatdate
+from init_app import load_pgp_public_keys
+from server import create_light_app
+from app.db import Session
+from app.log import LOG,set_message_id
+from app.email import status, headers
+from app.utils import sanitize_email
+from app.email.spam import get_spam_score
+from app.pgp_utils import PGPException
+from app.models import (
+    Alias,
+    SMTPCredentials,
+    EmailLog,
+    Contact,
+    Mailbox
+)
+from app.config import (
+    SMTP_SSL_KEY_FILE,
+    SMTP_SSL_CERT_FILE,
+    NOREPLY,
+    ENABLE_SPAM_ASSASSIN,
+    SPAMASSASSIN_HOST,
+    MAX_REPLY_PHASE_SPAM_SCORE,
+    BOUNCE_PREFIX_FOR_REPLY_PHASE,
+    LOAD_PGP_EMAIL_HANDLER,
+)
+from app.email_utils import (
+    copy,
+    save_email_for_debugging,
+    sanitize_header,
+    get_header_unicode,
+    parse_full_address,
+    is_valid_alias_address_domain,
+    get_spam_info,
+    delete_all_headers_except,
+    sl_sendmail,
+    add_or_replace_header,
+    should_add_dkim_signature,
+    add_dkim_signature,
+    send_email,
+    render,
+    get_email_domain_part,
+    should_ignore_bounce,
+)
+
+from email_handler import (
+    send_no_reply_response,
+    get_or_create_contact,
+    handle_spam,
+    prepare_pgp_message,
+    replace_original_message_id
+)
+
+
+def handle_SMTP(envelope, msg: Message, rcpt_to: str) -> (bool, str):
+    """
+    Return whether an email has been delivered and
+    the smtp status ("250 Message accepted", "550 Non-existent email address", etc)
+    """
+    website_email = rcpt_to
+
+    # region Create variables For Logging Purpose
+    alias_address: str = envelope.mail_from
+    alias = Alias.get_by(email=alias_address)
+    if not alias:
+        LOG.e("Alias: %s isn't known", alias_address)
+        return False, status.E503
+
+    alias_domain = alias_address[alias_address.find("@") + 1:]
+
+    # Sanity check: verify alias domain is managed by SimpleLogin
+    # scenario: a user have removed a domain but due to a bug, the aliases are still there
+    if not is_valid_alias_address_domain(alias.email):
+        LOG.e("%s domain isn't known", alias)
+        return False, status.E503
+
+    contact = Contact.get_by(website_email=website_email)
+    if not contact:
+        LOG.w(f"No contact with {website_email} as website email")
+    try:
+        LOG.d("Create or get contact for website_email:%s", website_email)
+        contact = get_or_create_contact("", website_email, alias, msg)
+    except ObjectDeletedError:
+        LOG.d("maybe alias was deleted in the meantime")
+        alias = Alias.get_by(email=alias_address)
+        if not alias:
+            LOG.i("Alias %s was deleted in the meantime", alias_address)
+            if should_ignore_bounce(envelope.mail_from):
+                return [(True, status.E207)]
+            else:
+                return [(False, status.E515)]
+
+    user = alias.user
+    mailbox = Mailbox.get_by(id=alias.mailbox_id)
+    # endregion
+
+    if user.disabled:
+        LOG.e(
+            "User %s disabled, disable sending emails from %s to %s",
+            user,
+            alias,
+            contact,
+        )
+        return [(False, status.E504)]
+
+    email_log = EmailLog.create(
+        contact_id=contact.id,
+        alias_id=contact.alias_id,
+        is_SMTP=True,
+        user_id=contact.user_id,
+        mailbox_id=mailbox.id,
+        message_id=msg[headers.MESSAGE_ID],
+        commit=True,
+    )
+    LOG.d("Create %s for %s, %s, %s", email_log, contact, user, mailbox)
+
+    # Spam check
+    if ENABLE_SPAM_ASSASSIN:
+        spam_status = ""
+        is_spam = False
+
+        # do not use user.max_spam_score here
+        if SPAMASSASSIN_HOST:
+            start = time.time()
+            spam_score, spam_report = get_spam_score(msg, email_log)
+            LOG.d(
+                "%s -> %s - spam score %s in %s seconds. Spam report %s",
+                alias,
+                contact,
+                spam_score,
+                time.time() - start,
+                spam_report,
+            )
+            email_log.spam_score = spam_score
+            if spam_score > MAX_REPLY_PHASE_SPAM_SCORE:
+                is_spam = True
+                # only set the spam report for spam
+                email_log.spam_report = spam_report
+        else:
+            is_spam, spam_status = get_spam_info(
+                msg, max_score=MAX_REPLY_PHASE_SPAM_SCORE
+            )
+
+        if is_spam:
+            LOG.w(
+                "Email detected as spam. SMTP phase. %s -> %s. Spam Score: %s, Spam Report: %s",
+                alias,
+                contact,
+                email_log.spam_score,
+                email_log.spam_report,
+            )
+
+            email_log.is_spam = True
+            email_log.spam_status = spam_status
+            Session.commit()
+
+            handle_spam(contact, alias, msg, user, mailbox, email_log, is_SMTP=True)
+            return False, status.E506
+
+    delete_all_headers_except(
+        msg,
+        [
+            headers.FROM,
+            headers.TO,
+            headers.CC,
+            headers.SUBJECT,
+            headers.DATE,
+            # do not delete original message id
+            headers.MESSAGE_ID,
+            # References and In-Reply-To are used for keeping the email thread
+            headers.REFERENCES,
+            headers.IN_REPLY_TO,
+        ]
+        + headers.MIME_HEADERS,
+    )
+
+    # create PGP email if needed
+    if contact.pgp_finger_print and user.is_premium():
+        LOG.d("Encrypt message for contact %s", contact)
+        try:
+            msg = prepare_pgp_message(
+                msg, contact.pgp_finger_print, contact.pgp_public_key
+            )
+        except PGPException:
+            LOG.e(
+                "Cannot encrypt message %s -> %s. %s %s", alias, contact, mailbox, user
+            )
+            # programming error, user shouldn't see a new email log
+            EmailLog.delete(email_log.id, commit=True)
+            # return 421 so the client can retry later
+            return False, status.E402
+
+    Session.commit()
+
+    # make the email comes from alias <- Can be kept for SMTP as well
+    from_header = alias.email
+    # add alias name from alias
+    if alias.name:
+        LOG.d("Put alias name %s in from header", alias.name)
+        from_header = formataddr((alias.name, alias.email))
+    elif alias.custom_domain:
+        # add alias name from domain
+        if alias.custom_domain.name:
+            LOG.d(
+                "Put domain default alias name %s in from header",
+                alias.custom_domain.name,
+            )
+            from_header = formataddr((alias.custom_domain.name, alias.email))
+
+    LOG.d("From header is %s", from_header)
+    add_or_replace_header(msg, headers.FROM, from_header)
+
+    replace_original_message_id(alias, email_log, msg)
+
+    if not msg[headers.DATE]:
+        date_header = formatdate()
+        LOG.w("missing date header, add one")
+        msg[headers.DATE] = date_header
+
+    msg[headers.SL_DIRECTION] = "Reply"
+    msg[headers.SL_EMAIL_LOG_ID] = str(email_log.id)
+
+    LOG.d(
+        "send email from %s to %s, mail_options:%s,rcpt_options:%s",
+        alias.email,
+        contact.website_email,
+        envelope.mail_options,
+        envelope.rcpt_options,
+    )
+
+    if should_add_dkim_signature(alias_domain):
+        add_dkim_signature(msg, alias_domain)
+
+    # generate a mail_from for VERP <- Can be kept for SMTP as well
+    verp_mail_from = f"{BOUNCE_PREFIX_FOR_REPLY_PHASE}+{email_log.id}+@{alias_domain}"
+
+    try:
+        sl_sendmail(
+            verp_mail_from,
+            contact.website_email,
+            msg,
+            envelope.mail_options,
+            envelope.rcpt_options,
+            is_forward=False,
+        )
+    except Exception:
+        LOG.w("Cannot send email from %s to %s", alias, contact)
+        EmailLog.delete(email_log.id, commit=True)
+        send_email(
+            mailbox.email,
+            f"Email cannot be sent to {contact.email} from {alias.email}",
+            render(
+                "transactional/reply-error.txt.jinja2",
+                user=user,
+                alias=alias,
+                contact=contact,
+                contact_domain=get_email_domain_part(contact.email),
+            ),
+            render(
+                "transactional/reply-error.html",
+                user=user,
+                alias=alias,
+                contact=contact,
+                contact_domain=get_email_domain_part(contact.email),
+            ),
+        )
+
+    # return 250 even if error as user is already informed of the incident and can retry sending the email
+    return True, status.E200
+
+
+class SMTPAuthenticator:
+    def fail_nothandled(self,message=None) -> AuthResult:
+        return AuthResult(success=False, handled=False, message=message)
+
+    def __call__(self, server, session, envelope, mechanism, auth_data):
+        if mechanism not in ("LOGIN", "PLAIN"):
+            LOG.e(
+                "mechanism %s not supported.",
+                mechanism
+            )
+            return self.fail_nothandled("550 Mechanism not supported")
+
+        if not isinstance(auth_data, LoginPassword):
+            LOG.e("Incorrect Format for Credentials")
+            return self.fail_nothandled(status.E501)
+
+        username = auth_data.login
+        password = auth_data.password
+
+        alias = Alias.get_by(email=username)
+        if not alias:
+            LOG.e(
+                "alias %s does not exist.",
+                alias.email
+            )
+            return self.fail_nothandled(status.E502)
+
+        user = alias.user
+
+        if not user or user.disabled:
+            LOG.e(
+                "User for alias %s is disabled",
+                username
+            )
+            return self.fail_nothandled(status.E504)
+
+        is_smtp_enabled_for_aliases = user.enable_SMTP_aliases
+
+        if not is_smtp_enabled_for_aliases:
+            LOG.e("SMTP disabled by user")
+            return self.fail_nothandled("521 SMTP disabled by user")
+
+        SMTPCred = SMTPCredentials.get_by(alias_id=alias.id)
+        if not SMTPCred or not SMTPCred.check_password(password):
+            LOG.e(
+                "Credentials Mismatch for alias %s",
+                username,
+            )
+            return self.fail_nothandled("535 5.7.8 Authentication credentials invalid")
+
+        return AuthResult(success=True,auth_data=auth_data)
+
+
+def handle(envelope: Envelope, msg: Message) -> str:
+    """Return SMTP status"""
+
+    # sanitize mail_from, rcpt_tos
+    mail_from = sanitize_email(envelope.mail_from)
+    rcpt_tos = [sanitize_email(rcpt_to) for rcpt_to in envelope.rcpt_tos]
+    envelope.mail_from = mail_from
+    envelope.rcpt_tos = rcpt_tos
+
+    # sanitize email headers
+    sanitize_header(msg, "from")
+    sanitize_header(msg, "to")
+    sanitize_header(msg, "cc")
+    sanitize_header(msg, "reply-to")
+
+    LOG.d(
+        "==>> Handle mail_from:%s, rcpt_tos:%s, header_from:%s, header_to:%s, "
+        "cc:%s, reply-to:%s, message_id:%s, client_ip:%s, headers:%s, mail_options:%s, rcpt_options:%s",
+        mail_from,
+        rcpt_tos,
+        msg[headers.FROM],
+        msg[headers.TO],
+        msg[headers.CC],
+        msg[headers.REPLY_TO],
+        msg[headers.MESSAGE_ID],
+        msg[headers.SL_CLIENT_IP],
+        msg._headers,
+        envelope.mail_options,
+        envelope.rcpt_options,
+    )
+
+    res: [(bool, str)] = []
+
+    nb_rcpt_tos = len(rcpt_tos)
+    for rcpt_index, rcpt_to in enumerate(rcpt_tos):
+        if rcpt_to == NOREPLY:
+            LOG.i("email sent to {} address from {}".format(NOREPLY, mail_from))
+            send_no_reply_response(mail_from, msg)
+            return status.E200
+
+        # create a copy of msg for each recipient except the last one
+        # as copy() is a slow function
+        if rcpt_index < nb_rcpt_tos - 1:
+            LOG.d("copy message for rcpt %s", rcpt_to)
+            copy_msg = copy(msg)
+        else:
+            copy_msg = msg
+
+        # SMTP case
+        LOG.d(
+            "SMTP phase %s(%s) -> %s", mail_from, copy_msg[headers.FROM], rcpt_to
+        )
+        is_delivered, smtp_status = handle_SMTP(envelope, copy_msg, rcpt_to)
+        res.append((is_delivered, smtp_status))
+
+    # to know whether both successful and unsuccessful deliveries can happen at the same time
+    nb_success = len([is_success for (is_success, smtp_status) in res if is_success])
+    nb_non_success = len(
+        [is_success for (is_success, smtp_status) in res if not is_success]
+    )
+
+    if nb_success > 0 and nb_non_success > 0:
+        LOG.e(f"some deliveries fail and some success, {mail_from}, {rcpt_tos}, {res}")
+
+    for (is_success, smtp_status) in res:
+        # Consider all deliveries successful if 1 delivery is successful
+        if is_success:
+            return smtp_status
+
+    # Failed delivery for all, return the first failure
+    return res[0][1]
+
+
+class SMTPHandler:
+    async def handle_DATA(self, server, session, envelope: Envelope):
+        username = session.auth_data.login
+        msg = email.message_from_bytes(envelope.original_content)
+        try:
+            ret = self.check_and_handle(envelope, msg, username)
+            return ret
+        except Exception as e:
+            LOG.e(
+                "email handling fail with error:%s "
+                "mail_from:%s, rcpt_tos:%s, header_from:%s, header_to:%s, saved to %s",
+                e,
+                envelope.mail_from,
+                envelope.rcpt_tos,
+                msg[headers.FROM],
+                msg[headers.TO],
+                save_email_for_debugging(
+                    msg, file_name_prefix=e.__class__.__name__
+                ),  # todo: remove
+            )
+            return status.E404
+
+    def check_and_handle(self, envelope: Envelope, msg: Message, username) -> str:
+        """Return SMTP status"""
+        mail_from = sanitize_email(envelope.mail_from)
+        envelope.mail_from = mail_from
+
+        # sanitize email headers
+        sanitize_header(msg, "from")
+
+        # If Sending from MUA, "mail_from", "from" and "username" should match <- This should prevent Spoofing
+        from_header = get_header_unicode(msg[headers.FROM])
+        if from_header:
+            try:
+                _, from_header_address = parse_full_address(from_header)
+            except ValueError:
+                LOG.w("cannot parse the From header %s", from_header)
+                return status.E501 # Could be changed
+            else:
+                if mail_from != username or from_header_address != username:
+                    LOG.e(
+                        "Mail_From: '%s' , From Header: '%s' and username '%s' does not match",
+                        mail_from,
+                        msg[headers.FROM], username
+                    )
+                    return status.E509
+
+        return self._handle(envelope, msg)
+
+    @newrelic.agent.background_task()
+    def _handle(self, envelope: Envelope, msg: Message):
+        start = time.time()
+
+        # generate a different message_id to keep track of an email lifecycle
+        message_id = str(uuid.uuid4())
+        set_message_id(message_id)
+
+        LOG.d("====>=====>====>====>====>====>====>====>")
+        LOG.i(
+            "New message, mail from %s, rctp tos %s ",
+            envelope.mail_from,
+            envelope.rcpt_tos,
+        )
+        newrelic.agent.record_custom_metric(
+            "Custom/nb_rcpt_tos", len(envelope.rcpt_tos)
+        )
+
+        with create_light_app().app_context():
+            ret = handle(envelope, msg)
+            elapsed = time.time() - start
+
+            LOG.i(
+                "Finish mail_from %s, rcpt_tos %s, takes %s seconds <<===",
+                envelope.mail_from,
+                envelope.rcpt_tos,
+                elapsed,
+            )
+            newrelic.agent.record_custom_metric("Custom/email_handler_time", elapsed)
+            newrelic.agent.record_custom_metric("Custom/number_incoming_email", 1)
+            return ret
+
+
+
+def main(port: int):
+    """Use aiosmtpd Controller"""
+    handler = SMTPHandler()
+    ssl_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
+    ssl_context.load_cert_chain(
+        certfile=SMTP_SSL_CERT_FILE,
+        keyfile=SMTP_SSL_KEY_FILE
+    )
+    controller = Controller(
+        handler,
+        hostname="0.0.0.0",
+        port=port,
+        ssl_context=ssl_context, # Implicit SSL/TLS
+        authenticator=SMTPAuthenticator(),
+        auth_required=True,
+        # Below param needs to be set in case of implicit SSL/TLS as per (https://github.com/aio-libs/aiosmtpd/issues/281)
+        auth_require_tls=False
+    )
+
+    controller.start()
+    LOG.d("Start SMTP controller %s %s", controller.hostname, controller.port)
+
+    if LOAD_PGP_EMAIL_HANDLER:
+        LOG.w("LOAD PGP keys")
+        load_pgp_public_keys()
+
+    while True:
+        time.sleep(2)
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "-p", "--port", help="SMTP port to listen for", type=int, default=8465
+    )
+    args = parser.parse_args()
+
+    LOG.i("Listen for port %s", args.port)
+    main(port=args.port)
\ No newline at end of file
diff --git a/app/config.py b/app/config.py
index 4a83f985e..3f1b4dfe3 100644
--- a/app/config.py
+++ b/app/config.py
@@ -444,3 +444,7 @@ def setup_nameservers():
 
 
 NAMESERVERS = setup_nameservers()
+
+# For SMTP support
+SMTP_SSL_CERT_FILE = os.environ.get("SMTP_SSL_CERT_FILE") or "/smtp_ssl_cert.pem"
+SMTP_SSL_KEY_FILE = os.environ.get("SMTP_SSL_KEY_FILE") or "/smtp_ssl_privkey.key"
diff --git a/app/models.py b/app/models.py
index b40ca7410..ac0fd37df 100644
--- a/app/models.py
+++ b/app/models.py
@@ -417,6 +417,10 @@ class User(Base, ModelMixin, UserMixin, PasswordOracle):
         sa.Boolean, default=False, nullable=False, server_default="0"
     )
 
+    enable_SMTP_aliases = sa.Column(
+        sa.Boolean, default=False, nullable=False, server_default="0"
+    )
+
     referral_id = sa.Column(
         sa.ForeignKey("referral.id", ondelete="SET NULL"), nullable=True, default=None
     )
@@ -1305,6 +1309,9 @@ class Alias(Base, ModelMixin):
         TSVector(), sa.Computed("to_tsvector('english', note)", persisted=True)
     )
 
+    # Enable SMTP for alias
+    enable_SMTP = sa.Column(sa.Boolean(), default=False, nullable=False, server_default="0")
+
     __table_args__ = (
         Index("ix_video___ts_vector__", ts_vector, postgresql_using="gin"),
         # index on note column using pg_trgm
@@ -1354,6 +1361,12 @@ def pgp_enabled(self) -> bool:
             return True
         return False
 
+    def SMTP_enabled(self) -> bool:
+        """return True is SMTP is enabled for the alias"""
+        if self.enable_SMTP:
+            return True
+        return False
+
     @staticmethod
     def get_custom_domain(alias_address) -> Optional["CustomDomain"]:
         alias_domain = validate_email(
@@ -1784,6 +1797,9 @@ class EmailLog(Base, ModelMixin):
     # whether this is a reply
     is_reply = sa.Column(sa.Boolean, nullable=False, default=False)
 
+    # whether this is sent from SMTP
+    is_SMTP = sa.Column(sa.Boolean, nullable=False, default=False)
+
     # for ex if alias is disabled, this forwarding is blocked
     blocked = sa.Column(sa.Boolean, nullable=False, default=False)
 
@@ -2557,6 +2573,22 @@ class AliasMailbox(Base, ModelMixin):
     alias = orm.relationship(Alias)
 
 
+class SMTPCredentials(Base, ModelMixin, PasswordOracle):
+    __tablename__ = "SMTP_credentials"
+    __table_args__ = (
+        sa.UniqueConstraint("alias_id", name="uq_alias"),
+    )
+
+    alias_id = sa.Column(
+        sa.ForeignKey(Alias.id, ondelete="cascade"), nullable=False, index=True
+    )
+
+    # override, SMTP password should not be null
+    password = sa.Column(sa.String(128), nullable=False)
+
+    alias = orm.relationship(Alias)
+
+
 class AliasHibp(Base, ModelMixin):
     __tablename__ = "alias_hibp"
 
diff --git a/email_handler.py b/email_handler.py
index ddba3e4b6..054a0a509 100644
--- a/email_handler.py
+++ b/email_handler.py
@@ -775,6 +775,11 @@ def forward_email_to_mailbox(
         else:
             return False, status.E518
 
+    # check if alias has SMTP enabled
+    is_SMTP_enabled_for_alias = False
+    if user.enable_SMTP_aliases and alias.SMTP_enabled():
+        is_SMTP_enabled_for_alias = True
+
     # sanity check: make sure mailbox is not actually an alias
     if get_email_domain_part(alias.email) == get_email_domain_part(mailbox.email):
         LOG.w(
@@ -927,28 +932,30 @@ def forward_email_to_mailbox(
 
     replace_sl_message_id_by_original_message_id(msg)
 
-    # change the from_header so the email comes from a reverse-alias
-    # replace the email part in from: header
-    old_from_header = msg[headers.FROM]
-    new_from_header = contact.new_addr()
-    add_or_replace_header(msg, "From", new_from_header)
-    LOG.d("From header, new:%s, old:%s", new_from_header, old_from_header)
-
-    if reply_to_contact:
-        reply_to_header = msg[headers.REPLY_TO]
-        new_reply_to_header = reply_to_contact.new_addr()
-        add_or_replace_header(msg, "Reply-To", new_reply_to_header)
-        LOG.d("Reply-To header, new:%s, old:%s", new_reply_to_header, reply_to_header)
-
-    # replace CC & To emails by reverse-alias for all emails that are not alias
-    try:
-        replace_header_when_forward(msg, alias, "Cc")
-        replace_header_when_forward(msg, alias, "To")
-    except CannotCreateContactForReverseAlias:
-        LOG.d("CannotCreateContactForReverseAlias error, delete %s", email_log)
-        EmailLog.delete(email_log.id)
-        Session.commit()
-        raise
+    # Don't Change Headers when SMTP is enabled for alias
+    if not is_SMTP_enabled_for_alias:
+        # change the from_header so the email comes from a reverse-alias
+        # replace the email part in from: header
+        old_from_header = msg[headers.FROM]
+        new_from_header = contact.new_addr()
+        add_or_replace_header(msg, "From", new_from_header)
+        LOG.d("From header, new:%s, old:%s", new_from_header, old_from_header)
+
+        if reply_to_contact:
+            reply_to_header = msg[headers.REPLY_TO]
+            new_reply_to_header = reply_to_contact.new_addr()
+            add_or_replace_header(msg, "Reply-To", new_reply_to_header)
+            LOG.d("Reply-To header, new:%s, old:%s", new_reply_to_header, reply_to_header)
+
+        # replace CC & To emails by reverse-alias for all emails that are not alias
+        try:
+            replace_header_when_forward(msg, alias, "Cc")
+            replace_header_when_forward(msg, alias, "To")
+        except CannotCreateContactForReverseAlias:
+            LOG.d("CannotCreateContactForReverseAlias error, delete %s", email_log)
+            EmailLog.delete(email_log.id)
+            Session.commit()
+            raise
 
     # add List-Unsubscribe header
     if user.one_click_unsubscribe_block_sender:
@@ -1866,6 +1873,7 @@ def handle_spam(
     mailbox: Mailbox,
     email_log: EmailLog,
     is_reply=False,  # whether the email is in forward or reply phase
+    is_SMTP=False,  # whether the email is sent via SMTP
 ):
     # Store the report & original email
     orig_msg = get_orig_message_from_spamassassin_report(msg)
@@ -1895,7 +1903,7 @@ def handle_spam(
     refused_email_url = f"{URL}/dashboard/refused_email?highlight_id={email_log.id}"
     disable_alias_link = f"{URL}/dashboard/unsubscribe/{alias.id}"
 
-    if is_reply:
+    if is_reply or is_SMTP:
         LOG.d(
             "Inform %s (%s) about spam email sent from alias %s to %s. %s",
             mailbox,

From a93696e69e7e8b38f23e9eb193f6309ab9237e5d Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Thu, 31 Mar 2022 22:35:12 -0400
Subject: [PATCH 02/36] Add helper functions to SMTPCredentials class

---
 app/models.py | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/models.py b/app/models.py
index ac0fd37df..89e4506e3 100644
--- a/app/models.py
+++ b/app/models.py
@@ -2583,11 +2583,28 @@ class SMTPCredentials(Base, ModelMixin, PasswordOracle):
         sa.ForeignKey(Alias.id, ondelete="cascade"), nullable=False, index=True
     )
 
-    # override, SMTP password should not be null
-    password = sa.Column(sa.String(128), nullable=False)
-
     alias = orm.relationship(Alias)
 
+    @classmethod
+    def create(cls, alias_id, password, **kwargs):
+        smtp_cred: SMTPCredentials = super(SMTPCredentials, cls).create(alias_id=alias_id, **kwargs)
+
+        if password and len(password) == 21:
+            smtp_cred.set_password(password)
+        else:
+            return None
+
+        Session.flush()
+
+        return smtp_cred
+
+    @classmethod
+    def delete_by_alias_id(cls, alias_id, commit=False):
+        Session.query(cls).filter(cls.alias_id == alias_id).delete()
+
+        if commit:
+            Session.commit()
+
 
 class AliasHibp(Base, ModelMixin):
     __tablename__ = "alias_hibp"

From fbfc714acefa830a6dac73c89722653a7d66203f Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 04:07:12 -0400
Subject: [PATCH 03/36] Modify Front-end for SMTP support

---
 app/api/views/alias.py           |  18 ++-
 app/dashboard/views/setting.py   |  10 ++
 static/package-lock.json         | 214 ++++++++++++++++++++++++++++++-
 static/package.json              |   1 +
 templates/dashboard/index.html   | 110 ++++++++++++++++
 templates/dashboard/setting.html |  28 ++++
 6 files changed, 377 insertions(+), 4 deletions(-)

diff --git a/app/api/views/alias.py b/app/api/views/alias.py
index cff85601a..3dc72292e 100644
--- a/app/api/views/alias.py
+++ b/app/api/views/alias.py
@@ -24,7 +24,7 @@
 )
 from app.errors import CannotCreateContactForReverseAlias
 from app.log import LOG
-from app.models import Alias, Contact, Mailbox, AliasMailbox
+from app.models import Alias, Contact, Mailbox, AliasMailbox, SMTPCredentials
 from app.utils import sanitize_email
 
 
@@ -242,6 +242,7 @@ def update_alias(alias_id):
         name (optional): in body
         mailbox_id (optional): in body
         disable_pgp (optional): in body
+        enable_SMTP & SMTP_password (optional): in body
     Output:
         200
     """
@@ -318,6 +319,21 @@ def update_alias(alias_id):
         alias.pinned = data.get("pinned")
         changed = True
 
+    if "enable_SMTP" in data:
+        enable_SMTP = data.get("enable_SMTP")
+        if enable_SMTP:
+            if "SMTP_password" in data:
+                SMTP_password = data.get("SMTP_password")
+                if SMTP_password and len(SMTP_password) != 21:  # 21 is default password length set for nanoid.
+                    return jsonify(error="Invalid SMTP Password Length"), 400
+                SMTPCredentials.create(alias_id=alias.id, password=SMTP_password)
+            else:
+                return jsonify(error="SMTP password not supplied"), 400
+        else:
+            SMTPCredentials.delete_by_alias_id(alias_id=alias.id)
+        alias.enable_SMTP = enable_SMTP
+        changed = True
+
     if changed:
         Session.commit()
 
diff --git a/app/dashboard/views/setting.py b/app/dashboard/views/setting.py
index b9af1e0bf..0c1d92b6e 100644
--- a/app/dashboard/views/setting.py
+++ b/app/dashboard/views/setting.py
@@ -258,6 +258,16 @@ def setting():
             flash("Your preference has been updated", "success")
             return redirect(url_for("dashboard.setting"))
 
+        elif request.form.get("form-name") == "smtp-for-aliases":
+            choose = request.form.get("smtp-for-aliases")
+            if choose == "on":
+                current_user.enable_SMTP_aliases = True
+            else:
+                current_user.enable_SMTP_aliases = False
+            Session.commit()
+            flash("Your preference has been updated", "success")
+            return redirect(url_for("dashboard.setting"))
+
         elif request.form.get("form-name") == "sender-in-ra":
             choose = request.form.get("enable")
             if choose == "on":
diff --git a/static/package-lock.json b/static/package-lock.json
index 4d1dd1ca3..19b1584f8 100644
--- a/static/package-lock.json
+++ b/static/package-lock.json
@@ -1,8 +1,209 @@
 {
   "name": "simplelogin",
   "version": "1.0.0",
-  "lockfileVersion": 1,
+  "lockfileVersion": 2,
   "requires": true,
+  "packages": {
+    "": {
+      "name": "simplelogin",
+      "version": "1.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "@sentry/browser": "^5.30.0",
+        "bootbox": "^5.5.2",
+        "font-awesome": "^4.7.0",
+        "htmx.org": "^1.6.1",
+        "intro.js": "^2.9.3",
+        "multiple-select": "^1.5.2",
+        "nanoid": "^3.3.2",
+        "parsleyjs": "^2.9.2",
+        "qrious": "^4.0.2",
+        "toastr": "^2.1.4",
+        "vue": "^2.6.14"
+      }
+    },
+    "node_modules/@sentry/browser": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-5.30.0.tgz",
+      "integrity": "sha512-rOb58ZNVJWh1VuMuBG1mL9r54nZqKeaIlwSlvzJfc89vyfd7n6tQ1UXMN383QBz/MS5H5z44Hy5eE+7pCrYAfw==",
+      "dependencies": {
+        "@sentry/core": "5.30.0",
+        "@sentry/types": "5.30.0",
+        "@sentry/utils": "5.30.0",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/core": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/core/-/core-5.30.0.tgz",
+      "integrity": "sha512-TmfrII8w1PQZSZgPpUESqjB+jC6MvZJZdLtE/0hZ+SrnKhW3x5WlYLvTXZpcWePYBku7rl2wn1RZu6uT0qCTeg==",
+      "dependencies": {
+        "@sentry/hub": "5.30.0",
+        "@sentry/minimal": "5.30.0",
+        "@sentry/types": "5.30.0",
+        "@sentry/utils": "5.30.0",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/hub": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/hub/-/hub-5.30.0.tgz",
+      "integrity": "sha512-2tYrGnzb1gKz2EkMDQcfLrDTvmGcQPuWxLnJKXJvYTQDGLlEvi2tWz1VIHjunmOvJrB5aIQLhm+dcMRwFZDCqQ==",
+      "dependencies": {
+        "@sentry/types": "5.30.0",
+        "@sentry/utils": "5.30.0",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/minimal": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/minimal/-/minimal-5.30.0.tgz",
+      "integrity": "sha512-BwWb/owZKtkDX+Sc4zCSTNcvZUq7YcH3uAVlmh/gtR9rmUvbzAA3ewLuB3myi4wWRAMEtny6+J/FN/x+2wn9Xw==",
+      "dependencies": {
+        "@sentry/hub": "5.30.0",
+        "@sentry/types": "5.30.0",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/types": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.30.0.tgz",
+      "integrity": "sha512-R8xOqlSTZ+htqrfteCWU5Nk0CDN5ApUTvrlvBuiH1DyP6czDZ4ktbZB0hAgBlVcK0U+qpD3ag3Tqqpa5Q67rPw==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/@sentry/utils": {
+      "version": "5.30.0",
+      "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.30.0.tgz",
+      "integrity": "sha512-zaYmoH0NWWtvnJjC9/CBseXMtKHm/tm40sz3YfJRxeQjyzRqNQPgivpd9R/oDJCYj999mzdW382p/qi2ypjLww==",
+      "dependencies": {
+        "@sentry/types": "5.30.0",
+        "tslib": "^1.9.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/bootbox": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/bootbox/-/bootbox-5.5.2.tgz",
+      "integrity": "sha512-q8d9VO2A4+q6S0XvovLtqtBUp7uRy0wtDOuuycnoheK2TiAm3um0jOlAOu9ORn9XoT92tdil+p15Dle1mRgSPQ==",
+      "dependencies": {
+        "bootstrap": "^4.4.0",
+        "jquery": "^3.5.1",
+        "popper.js": "^1.16.0"
+      }
+    },
+    "node_modules/bootstrap": {
+      "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.3.tgz",
+      "integrity": "sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ==",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/bootstrap"
+      },
+      "peerDependencies": {
+        "jquery": "1.9.1 - 3",
+        "popper.js": "^1.16.1"
+      }
+    },
+    "node_modules/font-awesome": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
+      "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=",
+      "engines": {
+        "node": ">=0.10.3"
+      }
+    },
+    "node_modules/htmx.org": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/htmx.org/-/htmx.org-1.6.1.tgz",
+      "integrity": "sha512-i+1k5ee2eFWaZbomjckyrDjUpa3FMDZWufatUSBmmsjXVksn89nsXvr1KLGIdAajiz+ZSL7TE4U/QaZVd2U2sA=="
+    },
+    "node_modules/intro.js": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/intro.js/-/intro.js-2.9.3.tgz",
+      "integrity": "sha512-hC+EXWnEuJeA3CveGMat3XHePd2iaXNFJIVfvJh2E9IzBMGLTlhWvPIVHAgKlOpO4lNayCxEqzr4N02VmHFr9Q=="
+    },
+    "node_modules/jquery": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
+      "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
+    },
+    "node_modules/multiple-select": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/multiple-select/-/multiple-select-1.5.2.tgz",
+      "integrity": "sha512-sTNNRrjnTtB1b1+HTKcjQ/mjWY7Gvigo9F3C/3oTQCTFEpYzwaRYFPRAOu2SogfA1hEfyJTXjyS1VAbanJMsmA==",
+      "peerDependencies": {
+        "jquery": "1.9.1 - 3"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz",
+      "integrity": "sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA==",
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/parsleyjs": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/parsleyjs/-/parsleyjs-2.9.2.tgz",
+      "integrity": "sha512-DKS2XXTjEUZ1BJWUzgXAr+550kFBZrom2WYweubqdV7WzdNC1hjOajZDfeBPoAZMkXumJPlB3v37IKatbiW8zQ==",
+      "dependencies": {
+        "jquery": ">=1.8.0"
+      }
+    },
+    "node_modules/popper.js": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz",
+      "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==",
+      "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/popperjs"
+      }
+    },
+    "node_modules/qrious": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/qrious/-/qrious-4.0.2.tgz",
+      "integrity": "sha512-xWPJIrK1zu5Ypn898fBp8RHkT/9ibquV2Kv24S/JY9VYEhMBMKur1gHVsOiNUh7PHP9uCgejjpZUHUIXXKoU/g=="
+    },
+    "node_modules/toastr": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/toastr/-/toastr-2.1.4.tgz",
+      "integrity": "sha1-i0O+ZPudDEFIcURvLbjoyk6V8YE=",
+      "dependencies": {
+        "jquery": ">=1.12.0"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
+    "node_modules/vue": {
+      "version": "2.6.14",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.14.tgz",
+      "integrity": "sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ=="
+    }
+  },
   "dependencies": {
     "@sentry/browser": {
       "version": "5.30.0",
@@ -74,7 +275,8 @@
     "bootstrap": {
       "version": "4.5.3",
       "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.5.3.tgz",
-      "integrity": "sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ=="
+      "integrity": "sha512-o9ppKQioXGqhw8Z7mah6KdTYpNQY//tipnkxppWhPbiSWdD+1raYsnhwEZjkTHYbGee4cVQ0Rx65EhOY/HNLcQ==",
+      "requires": {}
     },
     "font-awesome": {
       "version": "4.7.0",
@@ -99,7 +301,13 @@
     "multiple-select": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/multiple-select/-/multiple-select-1.5.2.tgz",
-      "integrity": "sha512-sTNNRrjnTtB1b1+HTKcjQ/mjWY7Gvigo9F3C/3oTQCTFEpYzwaRYFPRAOu2SogfA1hEfyJTXjyS1VAbanJMsmA=="
+      "integrity": "sha512-sTNNRrjnTtB1b1+HTKcjQ/mjWY7Gvigo9F3C/3oTQCTFEpYzwaRYFPRAOu2SogfA1hEfyJTXjyS1VAbanJMsmA==",
+      "requires": {}
+    },
+    "nanoid": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.2.tgz",
+      "integrity": "sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA=="
     },
     "parsleyjs": {
       "version": "2.9.2",
diff --git a/static/package.json b/static/package.json
index b48b6dc7a..6fac196ce 100644
--- a/static/package.json
+++ b/static/package.json
@@ -22,6 +22,7 @@
     "htmx.org": "^1.6.1",
     "intro.js": "^2.9.3",
     "multiple-select": "^1.5.2",
+    "nanoid": "^3.3.2",
     "parsleyjs": "^2.9.2",
     "qrious": "^4.0.2",
     "toastr": "^2.1.4",
diff --git a/templates/dashboard/index.html b/templates/dashboard/index.html
index 225c3cf02..a5f54674c 100644
--- a/templates/dashboard/index.html
+++ b/templates/dashboard/index.html
@@ -27,6 +27,11 @@
       }
 
   </style>
+
+    <!-- NanoID -->
+  <script src="{{ url_for('static', filename='node_modules/nanoid/nanoid.js') }}">
+  </script>
+
 {% endblock %}
 
 {% block title %}
@@ -190,6 +195,13 @@
             <option value="pinned" {% if filter == "pinned" %} selected {% endif %}>
               Pinned Aliases
             </option>
+
+          {%  if current_user.enable_SMTP_aliases %}
+            <option value="enable_SMTP" {% if filter == "enable_SMTP" %} selected {% endif %}>
+              Only SMTP Enabled Aliases
+            </option>
+          {% endif %}
+
             <option value="enabled" {% if filter == "enabled" %} selected {% endif %}>
               Only Enabled Aliases
             </option>
@@ -277,6 +289,13 @@
                       title="This alias is pinned"></span>
               {% endif %}
 
+            {%  if current_user.enable_SMTP_aliases %}
+              {% if alias.enable_SMTP %}
+                <span class="fa fa-id-card" data-toggle="tooltip"
+                      title="SMTP is enabled for this alias"></span>
+              {% endif %}
+            {% endif %}
+
               {% if alias.hibp_breaches | length > 0 %}
                 <a href="https://haveibeenpwned.com/account/{{ alias.email }}">
                   <span class="fa fa-warning text-danger" data-toggle="tooltip"
@@ -513,6 +532,23 @@
               </label>
             </div>
 
+          {%  if current_user.enable_SMTP_aliases %}
+          <div class="small-text mt-2" data-toogle="tooltip"
+                 title="This enables sending via SMTP for alias">
+              Enable SMTP for this alias
+              <i class="fe fe-help-circle"></i>
+            </div>
+            <div>
+              <label class="custom-switch cursor pl-0">
+                <input type="checkbox" class="enable-disable-smtp custom-switch-input"
+                       data-alias="{{ alias.id }}"
+                       data-alias-email="{{ alias.email }}"
+                    {{ "checked" if alias.enable_SMTP else "" }}>
+
+                <span class="custom-switch-indicator"></span>
+              </label>
+            </div>
+            {% endif %}
             <div>
               <div class="btn-group float-right" role="group" aria-label="Basic example">
                 <a href="{{ url_for('dashboard.alias_transfer_send_route', alias_id=alias.id) }}"
@@ -588,4 +624,78 @@
 
     $('.highlighted').tooltip("show");
   </script>
+    {%  if current_user.enable_SMTP_aliases %}
+        <script>
+        $(".enable-disable-smtp").change(async function () {
+          let aliasId = $(this).data("alias");
+          let alias = $(this).data("alias-email");
+          const oldValue = !$(this).prop("checked");
+          let newValue = !oldValue;
+
+          if(newValue) {
+            var smtp_generated_password = nanoid(21);
+
+            var message = `SMTP credentials for alias (<b>This will be visible only once, so please save it</b>):
+                        <br><br>Username (same as alias): ${alias}
+                        <br>Password: ${smtp_generated_password}<br>
+                        `;
+          }
+          try {
+            if(newValue) {
+              var res = await fetch(`/api/aliases/${aliasId}`, {
+                method: "PUT",
+                headers: {
+                  "Content-Type": "application/json",
+                },
+                body: JSON.stringify({
+                  enable_SMTP: newValue,
+                  SMTP_password: smtp_generated_password,
+                }),
+              });
+            }
+            else {
+              var res = await fetch(`/api/aliases/${aliasId}`, {
+                method: "PUT",
+                headers: {
+                  "Content-Type": "application/json",
+                },
+                body: JSON.stringify({
+                  enable_SMTP: newValue,
+                }),
+              });
+            }
+            if (res.ok) {
+              if (newValue) {
+                bootbox.alert({
+                  title: `SMTP Credentials for ${alias}`,
+                  message: message,
+                  size: 'large',
+                  onEscape: false,
+                  buttons: {
+                    ok: {
+                      label: 'Ok, I have saved them',
+                      className: 'btn-primary',
+                    },
+                  },
+                  callback: function () {
+                    toastr.success(`SMTP Enabled for ${alias}`);
+                  }
+                });
+                smtp_generated_password = null; // Clear the password.
+              } else {
+                toastr.info(`SMTP Disabled for ${alias}`);
+              }
+            } else {
+              toastr.error("Sorry for the inconvenience! Could you refresh the page & retry please?", "Unknown Error");
+              // reset to the original value
+              $(this).prop("checked", oldValue);
+            }
+          } catch (e) {
+            toastr.error("Sorry for the inconvenience! Could you refresh the page & retry please?", "Unknown Error");
+            // reset to the original value
+            $(this).prop("checked", oldValue);
+          }
+        });
+        </script>
+    {% endif %}
 {% endblock %}
diff --git a/templates/dashboard/setting.html b/templates/dashboard/setting.html
index da0b10970..42dbeb554 100644
--- a/templates/dashboard/setting.html
+++ b/templates/dashboard/setting.html
@@ -351,6 +351,34 @@
     </div>
     <!-- END Reverse-alias -->
 
+  <!-- SMTP for Aliases -->
+    <div class="card" id="smtp-for-aliases-section">
+      <div class="card-body">
+        <div class="card-title">SMTP for Aliases
+          <div class="badge badge-warning">Experimental</div>
+        </div>
+        <div class="mb-3">
+          This will enable <b>SMTP access for aliases</b>.
+          If this option is enabled, emails can be sent directly from aliases via SMTP without the need for creation of reverse-alias.
+          <br>
+            Note: After enabling this, you would still need to enable SMTP individually per alias.
+          <br>
+            This will also disable receiving via reverse-alias for that particular alias. i.e. Sender's original address will be displayed in "From:".
+          <br>
+        </div>
+        <form method="post" action="#smtp-for-aliases-section">
+          <input type="hidden" name="form-name" value="smtp-for-aliases">
+          <div class="form-check">
+            <input type="checkbox" id="smtp-for-aliases" name="smtp-for-aliases"
+                {% if current_user.enable_SMTP_aliases %} checked {% endif %} class="form-check-input">
+            <label for="replace-ra">Enable SMTP for aliases</label>
+          </div>
+          <button type="submit" class="btn btn-outline-primary">Update</button>
+        </form>
+      </div>
+    </div>
+    <!-- END SMTP for Aliases -->
+
     <!-- Sender included in reverse-alias -->
     <div class="card" id="sender-in-ra">
       <div class="card-body">

From 334ab9391bc6869d249799b89fb29877fee491fa Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 14:45:36 -0400
Subject: [PATCH 04/36] Fix smtp-for-aliases-section checkbox issue

---
 templates/dashboard/setting.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/dashboard/setting.html b/templates/dashboard/setting.html
index 42dbeb554..507c84394 100644
--- a/templates/dashboard/setting.html
+++ b/templates/dashboard/setting.html
@@ -371,7 +371,7 @@
           <div class="form-check">
             <input type="checkbox" id="smtp-for-aliases" name="smtp-for-aliases"
                 {% if current_user.enable_SMTP_aliases %} checked {% endif %} class="form-check-input">
-            <label for="replace-ra">Enable SMTP for aliases</label>
+            <label for="smtp-for-aliases">Enable SMTP for aliases</label>
           </div>
           <button type="submit" class="btn btn-outline-primary">Update</button>
         </form>

From d07af5197aa0ce39a6010d56e7a1a7bb5e547124 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 14:47:04 -0400
Subject: [PATCH 05/36] Change script type to module

Also change way of importing nanoid
---
 templates/dashboard/index.html | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/templates/dashboard/index.html b/templates/dashboard/index.html
index a5f54674c..845f6f472 100644
--- a/templates/dashboard/index.html
+++ b/templates/dashboard/index.html
@@ -27,11 +27,6 @@
       }
 
   </style>
-
-    <!-- NanoID -->
-  <script src="{{ url_for('static', filename='node_modules/nanoid/nanoid.js') }}">
-  </script>
-
 {% endblock %}
 
 {% block title %}
@@ -625,7 +620,10 @@
     $('.highlighted').tooltip("show");
   </script>
     {%  if current_user.enable_SMTP_aliases %}
-        <script>
+        <script type="module">
+
+        import { nanoid } from "{{ url_for('static', filename='node_modules/nanoid/nanoid.js') }}"
+
         $(".enable-disable-smtp").change(async function () {
           let aliasId = $(this).data("alias");
           let alias = $(this).data("alias-email");

From dfdbf0d1d688048a2bd889cef3dbd233294900d4 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 17:04:59 -0400
Subject: [PATCH 06/36] Improve SMTP password logic

---
 app/models.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/models.py b/app/models.py
index 89e4506e3..f8ca0ced8 100644
--- a/app/models.py
+++ b/app/models.py
@@ -2583,19 +2583,22 @@ class SMTPCredentials(Base, ModelMixin, PasswordOracle):
         sa.ForeignKey(Alias.id, ondelete="cascade"), nullable=False, index=True
     )
 
+    # override, SMTP password should not be null
+    password = sa.Column(sa.String(128), nullable=False)
+
     alias = orm.relationship(Alias)
 
     @classmethod
     def create(cls, alias_id, password, **kwargs):
-        smtp_cred: SMTPCredentials = super(SMTPCredentials, cls).create(alias_id=alias_id, **kwargs)
-
-        if password and len(password) == 21:
-            smtp_cred.set_password(password)
+        if password and len(password) == 21:  # This is default length for nanoid
+            pass_oracle = PasswordOracle()
+            pass_oracle.set_password(password)
+            password = pass_oracle.password
+            smtp_cred: SMTPCredentials = super(SMTPCredentials, cls).create(alias_id=alias_id, password=password, **kwargs)
+            del pass_oracle
         else:
-            return None
-
+             return None
         Session.flush()
-
         return smtp_cred
 
     @classmethod

From 26fdf522402586dcad26b197665f6f4d74cd1591 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 17:13:25 -0400
Subject: [PATCH 07/36] Add __repr__ to SMTP Credentials class

---
 app/models.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/models.py b/app/models.py
index f8ca0ced8..e41bfbfdf 100644
--- a/app/models.py
+++ b/app/models.py
@@ -2608,6 +2608,9 @@ def delete_by_alias_id(cls, alias_id, commit=False):
         if commit:
             Session.commit()
 
+    def __repr__(self):
+        return f"<SMTPCredentials {self.id}>"
+
 
 class AliasHibp(Base, ModelMixin):
     __tablename__ = "alias_hibp"

From fb65e0c4fbf65eaa7e3151666a0fee8dfe5cf777 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 17:19:02 -0400
Subject: [PATCH 08/36] Add decode to auth_data in SMTP_handler

---
 SMTP_handler.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SMTP_handler.py b/SMTP_handler.py
index 67644fc2f..427ef342a 100644
--- a/SMTP_handler.py
+++ b/SMTP_handler.py
@@ -305,8 +305,8 @@ def __call__(self, server, session, envelope, mechanism, auth_data):
             LOG.e("Incorrect Format for Credentials")
             return self.fail_nothandled(status.E501)
 
-        username = auth_data.login
-        password = auth_data.password
+        username = (auth_data.login).decode("utf-8")
+        password = (auth_data.password).decode("utf-8")
 
         alias = Alias.get_by(email=username)
         if not alias:
@@ -417,7 +417,7 @@ def handle(envelope: Envelope, msg: Message) -> str:
 
 class SMTPHandler:
     async def handle_DATA(self, server, session, envelope: Envelope):
-        username = session.auth_data.login
+        username = (session.auth_data.login).decode("utf-8")
         msg = email.message_from_bytes(envelope.original_content)
         try:
             ret = self.check_and_handle(envelope, msg, username)

From 42c4c806ec0f3c151f7892799a1fcf9a21878930 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 17:51:29 -0400
Subject: [PATCH 09/36] Add auto-generated migrations

---
 .../versions/2022_040117_d609ea71d807_.py     | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 migrations/versions/2022_040117_d609ea71d807_.py

diff --git a/migrations/versions/2022_040117_d609ea71d807_.py b/migrations/versions/2022_040117_d609ea71d807_.py
new file mode 100644
index 000000000..af6eb538c
--- /dev/null
+++ b/migrations/versions/2022_040117_d609ea71d807_.py
@@ -0,0 +1,58 @@
+"""empty message
+
+Revision ID: d609ea71d807
+Revises: b500363567e3
+Create Date: 2022-04-01 17:15:59.541023
+
+"""
+import sqlalchemy_utils
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = 'd609ea71d807'
+down_revision = 'b500363567e3'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('SMTP_credentials',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('created_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=False),
+    sa.Column('updated_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=True),
+    sa.Column('alias_id', sa.Integer(), nullable=False),
+    sa.Column('password', sa.String(length=128), nullable=False),
+    sa.ForeignKeyConstraint(['alias_id'], ['alias.id'], ondelete='cascade'),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('alias_id', name='uq_alias')
+    )
+    op.create_index(op.f('ix_SMTP_credentials_alias_id'), 'SMTP_credentials', ['alias_id'], unique=False)
+    op.alter_column('admin_audit_log', 'data',
+               existing_type=postgresql.JSONB(astext_type=sa.Text()),
+               nullable=True)
+    op.drop_index('admin_audit_log_admin_user_id_idx', table_name='admin_audit_log')
+    op.drop_constraint('admin_audit_log_admin_user_id_fkey', 'admin_audit_log', type_='foreignkey')
+    op.create_foreign_key(None, 'admin_audit_log', 'users', ['admin_user_id'], ['id'])
+    op.add_column('alias', sa.Column('enable_SMTP', sa.Boolean(), server_default='0', nullable=False))
+    op.add_column('email_log', sa.Column('is_SMTP', sa.Boolean(), nullable=False))
+    op.add_column('users', sa.Column('enable_SMTP_aliases', sa.Boolean(), server_default='0', nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('users', 'enable_SMTP_aliases')
+    op.drop_column('email_log', 'is_SMTP')
+    op.drop_column('alias', 'enable_SMTP')
+    op.drop_constraint(None, 'admin_audit_log', type_='foreignkey')
+    op.create_foreign_key('admin_audit_log_admin_user_id_fkey', 'admin_audit_log', 'users', ['admin_user_id'], ['id'], ondelete='CASCADE')
+    op.create_index('admin_audit_log_admin_user_id_idx', 'admin_audit_log', ['admin_user_id'], unique=False)
+    op.alter_column('admin_audit_log', 'data',
+               existing_type=postgresql.JSONB(astext_type=sa.Text()),
+               nullable=False)
+    op.drop_index(op.f('ix_SMTP_credentials_alias_id'), table_name='SMTP_credentials')
+    op.drop_table('SMTP_credentials')
+    # ### end Alembic commands ###

From 7b5181c5068db584b56daad69f8925d99976c593 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 17:53:44 -0400
Subject: [PATCH 10/36] Change Default port to 465 for SMTP_handler

---
 SMTP_handler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SMTP_handler.py b/SMTP_handler.py
index 427ef342a..a001a8c2f 100644
--- a/SMTP_handler.py
+++ b/SMTP_handler.py
@@ -531,7 +531,7 @@ def main(port: int):
 if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument(
-        "-p", "--port", help="SMTP port to listen for", type=int, default=8465
+        "-p", "--port", help="SMTP port to listen for", type=int, default=465
     )
     args = parser.parse_args()
 

From 7673644a44ed093de8410ca1f5fc0cbad13af48e Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 17:57:18 -0400
Subject: [PATCH 11/36] Format code with: poetry run black

---
 SMTP_handler.py        | 56 ++++++++++++++----------------------------
 app/api/views/alias.py |  4 ++-
 app/models.py          | 14 ++++++-----
 email_handler.py       |  4 ++-
 4 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/SMTP_handler.py b/SMTP_handler.py
index a001a8c2f..bf1d704c7 100644
--- a/SMTP_handler.py
+++ b/SMTP_handler.py
@@ -18,22 +18,16 @@
 
 from sqlalchemy.orm.exc import ObjectDeletedError
 from email.message import Message
-from email.utils import formataddr,  formatdate
+from email.utils import formataddr, formatdate
 from init_app import load_pgp_public_keys
 from server import create_light_app
 from app.db import Session
-from app.log import LOG,set_message_id
+from app.log import LOG, set_message_id
 from app.email import status, headers
 from app.utils import sanitize_email
 from app.email.spam import get_spam_score
 from app.pgp_utils import PGPException
-from app.models import (
-    Alias,
-    SMTPCredentials,
-    EmailLog,
-    Contact,
-    Mailbox
-)
+from app.models import Alias, SMTPCredentials, EmailLog, Contact, Mailbox
 from app.config import (
     SMTP_SSL_KEY_FILE,
     SMTP_SSL_CERT_FILE,
@@ -68,7 +62,7 @@
     get_or_create_contact,
     handle_spam,
     prepare_pgp_message,
-    replace_original_message_id
+    replace_original_message_id,
 )
 
 
@@ -86,7 +80,7 @@ def handle_SMTP(envelope, msg: Message, rcpt_to: str) -> (bool, str):
         LOG.e("Alias: %s isn't known", alias_address)
         return False, status.E503
 
-    alias_domain = alias_address[alias_address.find("@") + 1:]
+    alias_domain = alias_address[alias_address.find("@") + 1 :]
 
     # Sanity check: verify alias domain is managed by SimpleLogin
     # scenario: a user have removed a domain but due to a bug, the aliases are still there
@@ -290,15 +284,12 @@ def handle_SMTP(envelope, msg: Message, rcpt_to: str) -> (bool, str):
 
 
 class SMTPAuthenticator:
-    def fail_nothandled(self,message=None) -> AuthResult:
+    def fail_nothandled(self, message=None) -> AuthResult:
         return AuthResult(success=False, handled=False, message=message)
 
     def __call__(self, server, session, envelope, mechanism, auth_data):
         if mechanism not in ("LOGIN", "PLAIN"):
-            LOG.e(
-                "mechanism %s not supported.",
-                mechanism
-            )
+            LOG.e("mechanism %s not supported.", mechanism)
             return self.fail_nothandled("550 Mechanism not supported")
 
         if not isinstance(auth_data, LoginPassword):
@@ -310,19 +301,13 @@ def __call__(self, server, session, envelope, mechanism, auth_data):
 
         alias = Alias.get_by(email=username)
         if not alias:
-            LOG.e(
-                "alias %s does not exist.",
-                alias.email
-            )
+            LOG.e("alias %s does not exist.", alias.email)
             return self.fail_nothandled(status.E502)
 
         user = alias.user
 
         if not user or user.disabled:
-            LOG.e(
-                "User for alias %s is disabled",
-                username
-            )
+            LOG.e("User for alias %s is disabled", username)
             return self.fail_nothandled(status.E504)
 
         is_smtp_enabled_for_aliases = user.enable_SMTP_aliases
@@ -339,7 +324,7 @@ def __call__(self, server, session, envelope, mechanism, auth_data):
             )
             return self.fail_nothandled("535 5.7.8 Authentication credentials invalid")
 
-        return AuthResult(success=True,auth_data=auth_data)
+        return AuthResult(success=True, auth_data=auth_data)
 
 
 def handle(envelope: Envelope, msg: Message) -> str:
@@ -391,9 +376,7 @@ def handle(envelope: Envelope, msg: Message) -> str:
             copy_msg = msg
 
         # SMTP case
-        LOG.d(
-            "SMTP phase %s(%s) -> %s", mail_from, copy_msg[headers.FROM], rcpt_to
-        )
+        LOG.d("SMTP phase %s(%s) -> %s", mail_from, copy_msg[headers.FROM], rcpt_to)
         is_delivered, smtp_status = handle_SMTP(envelope, copy_msg, rcpt_to)
         res.append((is_delivered, smtp_status))
 
@@ -452,13 +435,14 @@ def check_and_handle(self, envelope: Envelope, msg: Message, username) -> str:
                 _, from_header_address = parse_full_address(from_header)
             except ValueError:
                 LOG.w("cannot parse the From header %s", from_header)
-                return status.E501 # Could be changed
+                return status.E501  # Could be changed
             else:
                 if mail_from != username or from_header_address != username:
                     LOG.e(
                         "Mail_From: '%s' , From Header: '%s' and username '%s' does not match",
                         mail_from,
-                        msg[headers.FROM], username
+                        msg[headers.FROM],
+                        username,
                     )
                     return status.E509
 
@@ -497,24 +481,20 @@ def _handle(self, envelope: Envelope, msg: Message):
             return ret
 
 
-
 def main(port: int):
     """Use aiosmtpd Controller"""
     handler = SMTPHandler()
     ssl_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
-    ssl_context.load_cert_chain(
-        certfile=SMTP_SSL_CERT_FILE,
-        keyfile=SMTP_SSL_KEY_FILE
-    )
+    ssl_context.load_cert_chain(certfile=SMTP_SSL_CERT_FILE, keyfile=SMTP_SSL_KEY_FILE)
     controller = Controller(
         handler,
         hostname="0.0.0.0",
         port=port,
-        ssl_context=ssl_context, # Implicit SSL/TLS
+        ssl_context=ssl_context,  # Implicit SSL/TLS
         authenticator=SMTPAuthenticator(),
         auth_required=True,
         # Below param needs to be set in case of implicit SSL/TLS as per (https://github.com/aio-libs/aiosmtpd/issues/281)
-        auth_require_tls=False
+        auth_require_tls=False,
     )
 
     controller.start()
@@ -536,4 +516,4 @@ def main(port: int):
     args = parser.parse_args()
 
     LOG.i("Listen for port %s", args.port)
-    main(port=args.port)
\ No newline at end of file
+    main(port=args.port)
diff --git a/app/api/views/alias.py b/app/api/views/alias.py
index 3dc72292e..15ab0b3bb 100644
--- a/app/api/views/alias.py
+++ b/app/api/views/alias.py
@@ -324,7 +324,9 @@ def update_alias(alias_id):
         if enable_SMTP:
             if "SMTP_password" in data:
                 SMTP_password = data.get("SMTP_password")
-                if SMTP_password and len(SMTP_password) != 21:  # 21 is default password length set for nanoid.
+                if (
+                    SMTP_password and len(SMTP_password) != 21
+                ):  # 21 is default password length set for nanoid.
                     return jsonify(error="Invalid SMTP Password Length"), 400
                 SMTPCredentials.create(alias_id=alias.id, password=SMTP_password)
             else:
diff --git a/app/models.py b/app/models.py
index e41bfbfdf..eed913f93 100644
--- a/app/models.py
+++ b/app/models.py
@@ -1310,7 +1310,9 @@ class Alias(Base, ModelMixin):
     )
 
     # Enable SMTP for alias
-    enable_SMTP = sa.Column(sa.Boolean(), default=False, nullable=False, server_default="0")
+    enable_SMTP = sa.Column(
+        sa.Boolean(), default=False, nullable=False, server_default="0"
+    )
 
     __table_args__ = (
         Index("ix_video___ts_vector__", ts_vector, postgresql_using="gin"),
@@ -2575,9 +2577,7 @@ class AliasMailbox(Base, ModelMixin):
 
 class SMTPCredentials(Base, ModelMixin, PasswordOracle):
     __tablename__ = "SMTP_credentials"
-    __table_args__ = (
-        sa.UniqueConstraint("alias_id", name="uq_alias"),
-    )
+    __table_args__ = (sa.UniqueConstraint("alias_id", name="uq_alias"),)
 
     alias_id = sa.Column(
         sa.ForeignKey(Alias.id, ondelete="cascade"), nullable=False, index=True
@@ -2594,10 +2594,12 @@ def create(cls, alias_id, password, **kwargs):
             pass_oracle = PasswordOracle()
             pass_oracle.set_password(password)
             password = pass_oracle.password
-            smtp_cred: SMTPCredentials = super(SMTPCredentials, cls).create(alias_id=alias_id, password=password, **kwargs)
+            smtp_cred: SMTPCredentials = super(SMTPCredentials, cls).create(
+                alias_id=alias_id, password=password, **kwargs
+            )
             del pass_oracle
         else:
-             return None
+            return None
         Session.flush()
         return smtp_cred
 
diff --git a/email_handler.py b/email_handler.py
index 054a0a509..9e3d39ce1 100644
--- a/email_handler.py
+++ b/email_handler.py
@@ -945,7 +945,9 @@ def forward_email_to_mailbox(
             reply_to_header = msg[headers.REPLY_TO]
             new_reply_to_header = reply_to_contact.new_addr()
             add_or_replace_header(msg, "Reply-To", new_reply_to_header)
-            LOG.d("Reply-To header, new:%s, old:%s", new_reply_to_header, reply_to_header)
+            LOG.d(
+                "Reply-To header, new:%s, old:%s", new_reply_to_header, reply_to_header
+            )
 
         # replace CC & To emails by reverse-alias for all emails that are not alias
         try:

From 25b8ee83fe78ed790e4c7e58e9df6a95ed131cfd Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 17:51:29 -0400
Subject: [PATCH 12/36] Revert "Add auto-generated migrations"

This reverts commit 42c4c806ec0f3c151f7892799a1fcf9a21878930.
---
 .../versions/2022_040117_d609ea71d807_.py     | 58 -------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 migrations/versions/2022_040117_d609ea71d807_.py

diff --git a/migrations/versions/2022_040117_d609ea71d807_.py b/migrations/versions/2022_040117_d609ea71d807_.py
deleted file mode 100644
index af6eb538c..000000000
--- a/migrations/versions/2022_040117_d609ea71d807_.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""empty message
-
-Revision ID: d609ea71d807
-Revises: b500363567e3
-Create Date: 2022-04-01 17:15:59.541023
-
-"""
-import sqlalchemy_utils
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision = 'd609ea71d807'
-down_revision = 'b500363567e3'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('SMTP_credentials',
-    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
-    sa.Column('created_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=False),
-    sa.Column('updated_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=True),
-    sa.Column('alias_id', sa.Integer(), nullable=False),
-    sa.Column('password', sa.String(length=128), nullable=False),
-    sa.ForeignKeyConstraint(['alias_id'], ['alias.id'], ondelete='cascade'),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('alias_id', name='uq_alias')
-    )
-    op.create_index(op.f('ix_SMTP_credentials_alias_id'), 'SMTP_credentials', ['alias_id'], unique=False)
-    op.alter_column('admin_audit_log', 'data',
-               existing_type=postgresql.JSONB(astext_type=sa.Text()),
-               nullable=True)
-    op.drop_index('admin_audit_log_admin_user_id_idx', table_name='admin_audit_log')
-    op.drop_constraint('admin_audit_log_admin_user_id_fkey', 'admin_audit_log', type_='foreignkey')
-    op.create_foreign_key(None, 'admin_audit_log', 'users', ['admin_user_id'], ['id'])
-    op.add_column('alias', sa.Column('enable_SMTP', sa.Boolean(), server_default='0', nullable=False))
-    op.add_column('email_log', sa.Column('is_SMTP', sa.Boolean(), nullable=False))
-    op.add_column('users', sa.Column('enable_SMTP_aliases', sa.Boolean(), server_default='0', nullable=False))
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('users', 'enable_SMTP_aliases')
-    op.drop_column('email_log', 'is_SMTP')
-    op.drop_column('alias', 'enable_SMTP')
-    op.drop_constraint(None, 'admin_audit_log', type_='foreignkey')
-    op.create_foreign_key('admin_audit_log_admin_user_id_fkey', 'admin_audit_log', 'users', ['admin_user_id'], ['id'], ondelete='CASCADE')
-    op.create_index('admin_audit_log_admin_user_id_idx', 'admin_audit_log', ['admin_user_id'], unique=False)
-    op.alter_column('admin_audit_log', 'data',
-               existing_type=postgresql.JSONB(astext_type=sa.Text()),
-               nullable=False)
-    op.drop_index(op.f('ix_SMTP_credentials_alias_id'), table_name='SMTP_credentials')
-    op.drop_table('SMTP_credentials')
-    # ### end Alembic commands ###

From 8387ecd50a1deda03b4cc086d675499a1f16a1d0 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 19:56:48 -0400
Subject: [PATCH 13/36] Fix email logging

---
 SMTP_handler.py  | 4 ++--
 app/models.py    | 3 ---
 email_handler.py | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/SMTP_handler.py b/SMTP_handler.py
index bf1d704c7..878de5687 100644
--- a/SMTP_handler.py
+++ b/SMTP_handler.py
@@ -120,7 +120,7 @@ def handle_SMTP(envelope, msg: Message, rcpt_to: str) -> (bool, str):
     email_log = EmailLog.create(
         contact_id=contact.id,
         alias_id=contact.alias_id,
-        is_SMTP=True,
+        is_reply=True,
         user_id=contact.user_id,
         mailbox_id=mailbox.id,
         message_id=msg[headers.MESSAGE_ID],
@@ -168,7 +168,7 @@ def handle_SMTP(envelope, msg: Message, rcpt_to: str) -> (bool, str):
             email_log.spam_status = spam_status
             Session.commit()
 
-            handle_spam(contact, alias, msg, user, mailbox, email_log, is_SMTP=True)
+            handle_spam(contact, alias, msg, user, mailbox, email_log, is_reply=True)
             return False, status.E506
 
     delete_all_headers_except(
diff --git a/app/models.py b/app/models.py
index eed913f93..3dfe2c193 100644
--- a/app/models.py
+++ b/app/models.py
@@ -1799,9 +1799,6 @@ class EmailLog(Base, ModelMixin):
     # whether this is a reply
     is_reply = sa.Column(sa.Boolean, nullable=False, default=False)
 
-    # whether this is sent from SMTP
-    is_SMTP = sa.Column(sa.Boolean, nullable=False, default=False)
-
     # for ex if alias is disabled, this forwarding is blocked
     blocked = sa.Column(sa.Boolean, nullable=False, default=False)
 
diff --git a/email_handler.py b/email_handler.py
index 9e3d39ce1..103e091e8 100644
--- a/email_handler.py
+++ b/email_handler.py
@@ -1875,7 +1875,6 @@ def handle_spam(
     mailbox: Mailbox,
     email_log: EmailLog,
     is_reply=False,  # whether the email is in forward or reply phase
-    is_SMTP=False,  # whether the email is sent via SMTP
 ):
     # Store the report & original email
     orig_msg = get_orig_message_from_spamassassin_report(msg)
@@ -1905,7 +1904,7 @@ def handle_spam(
     refused_email_url = f"{URL}/dashboard/refused_email?highlight_id={email_log.id}"
     disable_alias_link = f"{URL}/dashboard/unsubscribe/{alias.id}"
 
-    if is_reply or is_SMTP:
+    if is_reply:
         LOG.d(
             "Inform %s (%s) about spam email sent from alias %s to %s. %s",
             mailbox,

From c512e77605b44d9de1fcf1da7bceb796f04e5a29 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 20:57:26 -0400
Subject: [PATCH 14/36] Re-enable is_SMTP in EmailLog

---
 SMTP_handler.py | 1 +
 app/models.py   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/SMTP_handler.py b/SMTP_handler.py
index 878de5687..f0006253f 100644
--- a/SMTP_handler.py
+++ b/SMTP_handler.py
@@ -121,6 +121,7 @@ def handle_SMTP(envelope, msg: Message, rcpt_to: str) -> (bool, str):
         contact_id=contact.id,
         alias_id=contact.alias_id,
         is_reply=True,
+        is_SMTP=True,
         user_id=contact.user_id,
         mailbox_id=mailbox.id,
         message_id=msg[headers.MESSAGE_ID],
diff --git a/app/models.py b/app/models.py
index 3dfe2c193..eed913f93 100644
--- a/app/models.py
+++ b/app/models.py
@@ -1799,6 +1799,9 @@ class EmailLog(Base, ModelMixin):
     # whether this is a reply
     is_reply = sa.Column(sa.Boolean, nullable=False, default=False)
 
+    # whether this is sent from SMTP
+    is_SMTP = sa.Column(sa.Boolean, nullable=False, default=False)
+
     # for ex if alias is disabled, this forwarding is blocked
     blocked = sa.Column(sa.Boolean, nullable=False, default=False)
 

From 73f3d09d16760108b07774f017f466c1024f92d3 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 21:03:01 -0400
Subject: [PATCH 15/36] Fix filtering for SMTP enabled aliases

---
 app/api/serializer.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/api/serializer.py b/app/api/serializer.py
index 21b801dee..9dd27e266 100644
--- a/app/api/serializer.py
+++ b/app/api/serializer.py
@@ -180,6 +180,8 @@ def get_alias_infos_with_pagination_v3(
         q = q.filter(Alias.pinned)
     elif alias_filter == "hibp":
         q = q.filter(Alias.hibp_breaches.any())
+    elif alias_filter == "enable_SMTP":
+        q = q.filter(Alias.enable_SMTP)
 
     if sort == "old2new":
         q = q.order_by(Alias.created_at)

From ba2a047e52f8bd7b5600466e8df020a6d6320d8a Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 21:31:20 -0400
Subject: [PATCH 16/36] Add auto-generated migrations

---
 .../versions/2022_040120_faeed1acdd33_.py     | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 migrations/versions/2022_040120_faeed1acdd33_.py

diff --git a/migrations/versions/2022_040120_faeed1acdd33_.py b/migrations/versions/2022_040120_faeed1acdd33_.py
new file mode 100644
index 000000000..e670513a9
--- /dev/null
+++ b/migrations/versions/2022_040120_faeed1acdd33_.py
@@ -0,0 +1,58 @@
+"""empty message
+
+Revision ID: faeed1acdd33
+Revises: b500363567e3
+Create Date: 2022-04-01 20:59:11.596772
+
+"""
+import sqlalchemy_utils
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = 'faeed1acdd33'
+down_revision = 'b500363567e3'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('SMTP_credentials',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('created_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=False),
+    sa.Column('updated_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=True),
+    sa.Column('alias_id', sa.Integer(), nullable=False),
+    sa.Column('password', sa.String(length=128), nullable=False),
+    sa.ForeignKeyConstraint(['alias_id'], ['alias.id'], ondelete='cascade'),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('alias_id', name='uq_alias')
+    )
+    op.create_index(op.f('ix_SMTP_credentials_alias_id'), 'SMTP_credentials', ['alias_id'], unique=False)
+    op.alter_column('admin_audit_log', 'data',
+               existing_type=postgresql.JSONB(astext_type=sa.Text()),
+               nullable=True)
+    op.drop_index('admin_audit_log_admin_user_id_idx', table_name='admin_audit_log')
+    op.drop_constraint('admin_audit_log_admin_user_id_fkey', 'admin_audit_log', type_='foreignkey')
+    op.create_foreign_key(None, 'admin_audit_log', 'users', ['admin_user_id'], ['id'])
+    op.add_column('alias', sa.Column('enable_SMTP', sa.Boolean(), server_default='0', nullable=False))
+    op.add_column('email_log', sa.Column('is_SMTP', sa.Boolean(), nullable=False))
+    op.add_column('users', sa.Column('enable_SMTP_aliases', sa.Boolean(), server_default='0', nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('users', 'enable_SMTP_aliases')
+    op.drop_column('email_log', 'is_SMTP')
+    op.drop_column('alias', 'enable_SMTP')
+    op.drop_constraint(None, 'admin_audit_log', type_='foreignkey')
+    op.create_foreign_key('admin_audit_log_admin_user_id_fkey', 'admin_audit_log', 'users', ['admin_user_id'], ['id'], ondelete='CASCADE')
+    op.create_index('admin_audit_log_admin_user_id_idx', 'admin_audit_log', ['admin_user_id'], unique=False)
+    op.alter_column('admin_audit_log', 'data',
+               existing_type=postgresql.JSONB(astext_type=sa.Text()),
+               nullable=False)
+    op.drop_index(op.f('ix_SMTP_credentials_alias_id'), table_name='SMTP_credentials')
+    op.drop_table('SMTP_credentials')
+    # ### end Alembic commands ###

From 1af6fcf6b9ddb29fa135e7c8ce3d096fe5ae19ad Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 21:33:51 -0400
Subject: [PATCH 17/36] Add SMTP variables to example.env

---
 example.env | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/example.env b/example.env
index 31429f754..3d56dfbd1 100644
--- a/example.env
+++ b/example.env
@@ -179,3 +179,7 @@ ALLOWED_REDIRECT_DOMAINS=[]
 # DNS nameservers to be used by the app
 # Multiple nameservers can be specified, separated by ','
 NAMESERVERS="1.1.1.1"
+
+# For SMTP support
+# SMTP_SSL_CERT_FILE = "/smtp_ssl_cert.pem"
+# SMTP_SSL_KEY_FILE = "/smtp_ssl_privkey.key"

From 84ec9e253cfb0d117eae8fcc58c2fb76adc29fbe Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 22:04:45 -0400
Subject: [PATCH 18/36] Add about SMTP handler to README

---
 README.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/README.md b/README.md
index aff3d18de..d151e7f50 100644
--- a/README.md
+++ b/README.md
@@ -489,6 +489,32 @@ docker run -d \
     simplelogin/app:3.4.0 python job_runner.py
 ```
 
+#### Enable Sending via SMTP
+
+For sending via SMTP  you need to make sure you have the required SSL certificate and key at following, as SMTP requires SSL.
+
+- `$(pwd)/smtp_ssl_cert.pem` for SSL Certificate file,
+- `$(pwd)/smtp_ssl_privkey.key` for Key file.
+- adjust this according to where you have the files present.
+
+then run `SMTP handler`
+
+```bash
+docker run -d \
+    --name sl-smtp \
+    -v $(pwd)/sl:/sl \
+    -v $(pwd)/sl/upload:/code/static/upload \
+    -v $(pwd)/simplelogin.env:/code/.env \
+    -v $(pwd)/dkim.key:/dkim.key \
+    -v $(pwd)/dkim.pub.key:/dkim.pub.key \
+    -v $(pwd)/smtp_ssl_cert.pem:/smtp_ssl_cert.pem
+    -v $(pwd)/smtp_ssl_privkey.key:/smtp_ssl_privkey.key
+    -p 465:465 \
+    --restart always \
+    --network="sl-network" \
+    simplelogin/app:3.4.0 python SMTP_handler.py
+```
+
 ### Nginx
 
 Install Nginx and make sure to replace `mydomain.com` by your domain

From 48da27aadb1f2fa5b91777bf0ce92c3d7d7d1f49 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Sat, 2 Apr 2022 21:15:15 -0400
Subject: [PATCH 19/36] Add command to generate self-signed certs in README

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index d151e7f50..e55323ee2 100644
--- a/README.md
+++ b/README.md
@@ -497,6 +497,14 @@ For sending via SMTP  you need to make sure you have the required SSL certificat
 - `$(pwd)/smtp_ssl_privkey.key` for Key file.
 - adjust this according to where you have the files present.
 
+You can use the following command to generate a self-signed certificate for testing.
+
+```bash
+openssl req -x509 -newkey rsa:4096 -keyout smtp_ssl_privkey.key \
+  -out smtp_ssl_cert.pem -sha256 -days 3650 -nodes \
+  -subj "/C=US/ST=Oregon/L=Portland/O=My Company/OU=Org/CN=mydomain.com"
+```
+
 then run `SMTP handler`
 
 ```bash

From b717f795ea1f35fc489f9120d891ad1b28e3e6db Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Sat, 2 Apr 2022 21:20:25 -0400
Subject: [PATCH 20/36] change SMTP_password to lowercase.

---
 app/api/views/alias.py         | 8 ++++----
 templates/dashboard/index.html | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/api/views/alias.py b/app/api/views/alias.py
index 15ab0b3bb..5a5153b32 100644
--- a/app/api/views/alias.py
+++ b/app/api/views/alias.py
@@ -322,13 +322,13 @@ def update_alias(alias_id):
     if "enable_SMTP" in data:
         enable_SMTP = data.get("enable_SMTP")
         if enable_SMTP:
-            if "SMTP_password" in data:
-                SMTP_password = data.get("SMTP_password")
+            if "smtp_password" in data:
+                smtp_password = data.get("smtp_password")
                 if (
-                    SMTP_password and len(SMTP_password) != 21
+                    smtp_password and len(smtp_password) != 21
                 ):  # 21 is default password length set for nanoid.
                     return jsonify(error="Invalid SMTP Password Length"), 400
-                SMTPCredentials.create(alias_id=alias.id, password=SMTP_password)
+                SMTPCredentials.create(alias_id=alias.id, password=smtp_password)
             else:
                 return jsonify(error="SMTP password not supplied"), 400
         else:
diff --git a/templates/dashboard/index.html b/templates/dashboard/index.html
index 845f6f472..fc40d3965 100644
--- a/templates/dashboard/index.html
+++ b/templates/dashboard/index.html
@@ -647,7 +647,7 @@
                 },
                 body: JSON.stringify({
                   enable_SMTP: newValue,
-                  SMTP_password: smtp_generated_password,
+                  smtp_password: smtp_generated_password,
                 }),
               });
             }

From 40eab5439230fac33dc884dec0c64ebbeade9c4f Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Sat, 2 Apr 2022 21:29:19 -0400
Subject: [PATCH 21/36] Suffix PATH to key/cert vars  to be explicit

---
 SMTP_handler.py | 6 +++---
 app/config.py   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/SMTP_handler.py b/SMTP_handler.py
index f0006253f..ae47ce254 100644
--- a/SMTP_handler.py
+++ b/SMTP_handler.py
@@ -29,8 +29,8 @@
 from app.pgp_utils import PGPException
 from app.models import Alias, SMTPCredentials, EmailLog, Contact, Mailbox
 from app.config import (
-    SMTP_SSL_KEY_FILE,
-    SMTP_SSL_CERT_FILE,
+    SMTP_SSL_KEY_FILEPATH,
+    SMTP_SSL_CERT_FILEPATH,
     NOREPLY,
     ENABLE_SPAM_ASSASSIN,
     SPAMASSASSIN_HOST,
@@ -486,7 +486,7 @@ def main(port: int):
     """Use aiosmtpd Controller"""
     handler = SMTPHandler()
     ssl_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
-    ssl_context.load_cert_chain(certfile=SMTP_SSL_CERT_FILE, keyfile=SMTP_SSL_KEY_FILE)
+    ssl_context.load_cert_chain(certfile=SMTP_SSL_CERT_FILEPATH, keyfile=SMTP_SSL_KEY_FILEPATH)
     controller = Controller(
         handler,
         hostname="0.0.0.0",
diff --git a/app/config.py b/app/config.py
index 3f1b4dfe3..68afcd27e 100644
--- a/app/config.py
+++ b/app/config.py
@@ -446,5 +446,5 @@ def setup_nameservers():
 NAMESERVERS = setup_nameservers()
 
 # For SMTP support
-SMTP_SSL_CERT_FILE = os.environ.get("SMTP_SSL_CERT_FILE") or "/smtp_ssl_cert.pem"
-SMTP_SSL_KEY_FILE = os.environ.get("SMTP_SSL_KEY_FILE") or "/smtp_ssl_privkey.key"
+SMTP_SSL_CERT_FILEPATH = os.environ.get("SMTP_SSL_CERT_FILEPATH") or "/smtp_ssl_cert.pem"
+SMTP_SSL_KEY_FILEPATH = os.environ.get("SMTP_SSL_KEY_FILEPATH") or "/smtp_ssl_privkey.key"

From 98d1ff9d18981ebbc8336794a6e63d2ee50961aa Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Sat, 2 Apr 2022 21:33:43 -0400
Subject: [PATCH 22/36] add unique=True in alias_id declaration

---
 app/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models.py b/app/models.py
index eed913f93..7038fc226 100644
--- a/app/models.py
+++ b/app/models.py
@@ -2580,7 +2580,7 @@ class SMTPCredentials(Base, ModelMixin, PasswordOracle):
     __table_args__ = (sa.UniqueConstraint("alias_id", name="uq_alias"),)
 
     alias_id = sa.Column(
-        sa.ForeignKey(Alias.id, ondelete="cascade"), nullable=False, index=True
+        sa.ForeignKey(Alias.id, ondelete="cascade"), unique=True, nullable=False, index=True
     )
 
     # override, SMTP password should not be null

From 93335a6416a21943bd0cb4a4aa789fd29648eece Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Fri, 1 Apr 2022 21:31:20 -0400
Subject: [PATCH 23/36] Revert "Add auto-generated migrations"

This reverts commit ba2a047e52f8bd7b5600466e8df020a6d6320d8a.
---
 .../versions/2022_040120_faeed1acdd33_.py     | 58 -------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 migrations/versions/2022_040120_faeed1acdd33_.py

diff --git a/migrations/versions/2022_040120_faeed1acdd33_.py b/migrations/versions/2022_040120_faeed1acdd33_.py
deleted file mode 100644
index e670513a9..000000000
--- a/migrations/versions/2022_040120_faeed1acdd33_.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""empty message
-
-Revision ID: faeed1acdd33
-Revises: b500363567e3
-Create Date: 2022-04-01 20:59:11.596772
-
-"""
-import sqlalchemy_utils
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision = 'faeed1acdd33'
-down_revision = 'b500363567e3'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('SMTP_credentials',
-    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
-    sa.Column('created_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=False),
-    sa.Column('updated_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=True),
-    sa.Column('alias_id', sa.Integer(), nullable=False),
-    sa.Column('password', sa.String(length=128), nullable=False),
-    sa.ForeignKeyConstraint(['alias_id'], ['alias.id'], ondelete='cascade'),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('alias_id', name='uq_alias')
-    )
-    op.create_index(op.f('ix_SMTP_credentials_alias_id'), 'SMTP_credentials', ['alias_id'], unique=False)
-    op.alter_column('admin_audit_log', 'data',
-               existing_type=postgresql.JSONB(astext_type=sa.Text()),
-               nullable=True)
-    op.drop_index('admin_audit_log_admin_user_id_idx', table_name='admin_audit_log')
-    op.drop_constraint('admin_audit_log_admin_user_id_fkey', 'admin_audit_log', type_='foreignkey')
-    op.create_foreign_key(None, 'admin_audit_log', 'users', ['admin_user_id'], ['id'])
-    op.add_column('alias', sa.Column('enable_SMTP', sa.Boolean(), server_default='0', nullable=False))
-    op.add_column('email_log', sa.Column('is_SMTP', sa.Boolean(), nullable=False))
-    op.add_column('users', sa.Column('enable_SMTP_aliases', sa.Boolean(), server_default='0', nullable=False))
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('users', 'enable_SMTP_aliases')
-    op.drop_column('email_log', 'is_SMTP')
-    op.drop_column('alias', 'enable_SMTP')
-    op.drop_constraint(None, 'admin_audit_log', type_='foreignkey')
-    op.create_foreign_key('admin_audit_log_admin_user_id_fkey', 'admin_audit_log', 'users', ['admin_user_id'], ['id'], ondelete='CASCADE')
-    op.create_index('admin_audit_log_admin_user_id_idx', 'admin_audit_log', ['admin_user_id'], unique=False)
-    op.alter_column('admin_audit_log', 'data',
-               existing_type=postgresql.JSONB(astext_type=sa.Text()),
-               nullable=False)
-    op.drop_index(op.f('ix_SMTP_credentials_alias_id'), table_name='SMTP_credentials')
-    op.drop_table('SMTP_credentials')
-    # ### end Alembic commands ###

From cc07d6b66fb2bdba2ab9df31f107069295ff98ec Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Sat, 2 Apr 2022 22:12:46 -0400
Subject: [PATCH 24/36] Change set_password part

- Also change comment to " override PasswordOracle.password" to be more explicit
- Add one more check in alias.py view while saving password.
---
 app/api/views/alias.py | 4 +++-
 app/models.py          | 9 +++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/api/views/alias.py b/app/api/views/alias.py
index 5a5153b32..b2a6e0fe6 100644
--- a/app/api/views/alias.py
+++ b/app/api/views/alias.py
@@ -328,7 +328,9 @@ def update_alias(alias_id):
                     smtp_password and len(smtp_password) != 21
                 ):  # 21 is default password length set for nanoid.
                     return jsonify(error="Invalid SMTP Password Length"), 400
-                SMTPCredentials.create(alias_id=alias.id, password=smtp_password)
+                smtp_cred = SMTPCredentials.create(alias_id=alias.id, password=smtp_password)
+                if not smtp_cred:
+                    return jsonify(error="Error Saving SMTP Password"), 400
             else:
                 return jsonify(error="SMTP password not supplied"), 400
         else:
diff --git a/app/models.py b/app/models.py
index 7038fc226..ff5dd159c 100644
--- a/app/models.py
+++ b/app/models.py
@@ -2583,7 +2583,7 @@ class SMTPCredentials(Base, ModelMixin, PasswordOracle):
         sa.ForeignKey(Alias.id, ondelete="cascade"), unique=True, nullable=False, index=True
     )
 
-    # override, SMTP password should not be null
+    # override  PasswordOracle.password, SMTP password should not be null
     password = sa.Column(sa.String(128), nullable=False)
 
     alias = orm.relationship(Alias)
@@ -2591,13 +2591,10 @@ class SMTPCredentials(Base, ModelMixin, PasswordOracle):
     @classmethod
     def create(cls, alias_id, password, **kwargs):
         if password and len(password) == 21:  # This is default length for nanoid
-            pass_oracle = PasswordOracle()
-            pass_oracle.set_password(password)
-            password = pass_oracle.password
             smtp_cred: SMTPCredentials = super(SMTPCredentials, cls).create(
-                alias_id=alias_id, password=password, **kwargs
+                alias_id=alias_id, **kwargs
             )
-            del pass_oracle
+            smtp_cred.set_password(password)
         else:
             return None
         Session.flush()

From aec499e6bfdfe4612008064c056da3dbc205b05e Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Sat, 2 Apr 2022 22:52:27 -0400
Subject: [PATCH 25/36] ReFormat index and setting htmls using Pycharm

- Also change JS variable to camelCase in index.html
---
 templates/dashboard/index.html   | 1245 +++++++++++++++---------------
 templates/dashboard/setting.html | 1184 ++++++++++++++--------------
 2 files changed, 1232 insertions(+), 1197 deletions(-)

diff --git a/templates/dashboard/index.html b/templates/dashboard/index.html
index fc40d3965..d8d5a0831 100644
--- a/templates/dashboard/index.html
+++ b/templates/dashboard/index.html
@@ -3,697 +3,706 @@
 {% set active_page = "dashboard" %}
 
 {% block head %}
-  <style>
-      .alias-activity {
-          font-weight: 600;
-          font-size: 14px;
-      }
-
-      .btn-group-border-left {
-          border-left: 1px #fbfbfb4f solid;
-      }
-
-      em {
-          padding: 0px;
-      }
-
-      {#CSS to change collapse button display from https://stackoverflow.com/a/31967516/1428034#}
-      [data-toggle="collapse"].collapsed .if-not-collapsed {
-          display: none;
-      }
-
-      [data-toggle="collapse"]:not(.collapsed) .if-collapsed {
-          display: none;
-      }
-
-  </style>
+    <style>
+        .alias-activity {
+            font-weight: 600;
+            font-size: 14px;
+        }
+
+        .btn-group-border-left {
+            border-left: 1px #fbfbfb4f solid;
+        }
+
+        em {
+            padding: 0px;
+        }
+
+        {#CSS to change collapse button display from https://stackoverflow.com/a/31967516/1428034#}
+        [data-toggle="collapse"].collapsed .if-not-collapsed {
+            display: none;
+        }
+
+        [data-toggle="collapse"]:not(.collapsed) .if-collapsed {
+            display: none;
+        }
+
+    </style>
 {% endblock %}
 
 {% block title %}
-  Alias
+    Alias
 {% endblock %}
 
 {% block default_content %}
-  <!-- Global Stats -->
-  <div class="row">
-    <div class="col-12 col-md-6 col-lg-3">
-      <div class="card">
-        <div class="card-body">
-          <div class="d-flex align-items-center">
-            <div class="subheader">
-              Aliases
-            </div>
-            <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
-              All time
+    <!-- Global Stats -->
+    <div class="row">
+        <div class="col-12 col-md-6 col-lg-3">
+            <div class="card">
+                <div class="card-body">
+                    <div class="d-flex align-items-center">
+                        <div class="subheader">
+                            Aliases
+                        </div>
+                        <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
+                            All time
+                        </div>
+                    </div>
+                    <div class="h1 m-0">{{ stats.nb_alias }}</div>
+                </div>
             </div>
-          </div>
-          <div class="h1 m-0">{{ stats.nb_alias }}</div>
         </div>
-      </div>
-    </div>
 
-    <div class="col-12 col-md-6 col-lg-3">
-      <div class="card">
-        <div class="card-body">
-          <div class="d-flex align-items-center">
-            <div class="subheader">
-              Forwards
-            </div>
-            <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
-              Last 14 days
+        <div class="col-12 col-md-6 col-lg-3">
+            <div class="card">
+                <div class="card-body">
+                    <div class="d-flex align-items-center">
+                        <div class="subheader">
+                            Forwards
+                        </div>
+                        <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
+                            Last 14 days
+                        </div>
+                    </div>
+                    <div class="h1 m-0">{{ stats.nb_forward }}</div>
+                </div>
             </div>
-          </div>
-          <div class="h1 m-0">{{ stats.nb_forward }}</div>
         </div>
-      </div>
-    </div>
 
-    <div class="col-12 col-md-6 col-lg-3">
-      <div class="card">
-        <div class="card-body">
-          <div class="d-flex align-items-center">
-            <div class="subheader">
-              Replies/Sent
-            </div>
-            <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
-              Last 14 days
+        <div class="col-12 col-md-6 col-lg-3">
+            <div class="card">
+                <div class="card-body">
+                    <div class="d-flex align-items-center">
+                        <div class="subheader">
+                            Replies/Sent
+                        </div>
+                        <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
+                            Last 14 days
+                        </div>
+                    </div>
+                    <div class="h1 m-0">{{ stats.nb_reply }}</div>
+                </div>
             </div>
-          </div>
-          <div class="h1 m-0">{{ stats.nb_reply }}</div>
         </div>
-      </div>
-    </div>
 
-    <div class="col-12 col-md-6 col-lg-3">
-      <div class="card">
-        <div class="card-body">
-          <div class="d-flex align-items-center">
-            <div class="subheader">
-              Blocks
-            </div>
-            <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
-              Last 14 days
+        <div class="col-12 col-md-6 col-lg-3">
+            <div class="card">
+                <div class="card-body">
+                    <div class="d-flex align-items-center">
+                        <div class="subheader">
+                            Blocks
+                        </div>
+                        <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
+                            Last 14 days
+                        </div>
+                    </div>
+                    <div class="h1 m-0">{{ stats.nb_block }}</div>
+                </div>
             </div>
-          </div>
-          <div class="h1 m-0">{{ stats.nb_block }}</div>
         </div>
-      </div>
     </div>
-  </div>
-  <!-- END Global Stats -->
-
-  <!-- Controls: buttons & search -->
-  <div id="filter-app">
-    <div class="row mb-3">
-      <div class="col d-flex">
-        <div>
-          <div class="btn-group" role="group">
-            <form method="post">
-              <input type="hidden" name="form-name" value="create-custom-email">
-              <button data-toggle="tooltip"
-                      title="Create a custom alias"
-                      class="btn btn-primary mr-2"><i class="fa fa-plus"></i> New Custom Alias
-              </button>
-            </form>
-            <div class="btn-group" role="group">
-              <form method="post">
-                <input type="hidden" name="form-name" value="create-random-email">
-                <button data-toggle="tooltip"
-                        title="Create a totally random alias"
-                        class="btn btn-success"><i class="fa fa-random"></i> Random Alias
-                </button>
-              </form>
-              <button id="btnGroupDrop1" type="button" class="btn btn-success dropdown-toggle btn-group-border-left"
-                      data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-              </button>
-              <div class="dropdown-menu dropdown-menu-right border-left" aria-labelledby="btnGroupDrop1">
-                <div class="">
-                  <form method="post">
-                    <input type="hidden" name="form-name" value="create-random-email">
-                    <input type="hidden" name="generator_scheme" value="{{ AliasGeneratorEnum.word.value }}">
-                    <button class="dropdown-item">By Random Words</button>
-                  </form>
+    <!-- END Global Stats -->
+
+    <!-- Controls: buttons & search -->
+    <div id="filter-app">
+        <div class="row mb-3">
+            <div class="col d-flex">
+                <div>
+                    <div class="btn-group" role="group">
+                        <form method="post">
+                            <input type="hidden" name="form-name" value="create-custom-email">
+                            <button data-toggle="tooltip"
+                                    title="Create a custom alias"
+                                    class="btn btn-primary mr-2"><i class="fa fa-plus"></i> New Custom Alias
+                            </button>
+                        </form>
+                        <div class="btn-group" role="group">
+                            <form method="post">
+                                <input type="hidden" name="form-name" value="create-random-email">
+                                <button data-toggle="tooltip"
+                                        title="Create a totally random alias"
+                                        class="btn btn-success"><i class="fa fa-random"></i> Random Alias
+                                </button>
+                            </form>
+                            <button id="btnGroupDrop1" type="button"
+                                    class="btn btn-success dropdown-toggle btn-group-border-left"
+                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                            </button>
+                            <div class="dropdown-menu dropdown-menu-right border-left" aria-labelledby="btnGroupDrop1">
+                                <div class="">
+                                    <form method="post">
+                                        <input type="hidden" name="form-name" value="create-random-email">
+                                        <input type="hidden" name="generator_scheme"
+                                               value="{{ AliasGeneratorEnum.word.value }}">
+                                        <button class="dropdown-item">By Random Words</button>
+                                    </form>
+                                </div>
+                                <div class="">
+                                    <form method="post">
+                                        <input type="hidden" name="form-name" value="create-random-email">
+                                        <input type="hidden" name="generator_scheme"
+                                               value="{{ AliasGeneratorEnum.uuid.value }}">
+                                        <button class="dropdown-item">By UUID</button>
+                                    </form>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-                <div class="">
-                  <form method="post">
-                    <input type="hidden" name="form-name" value="create-random-email">
-                    <input type="hidden" name="generator_scheme" value="{{ AliasGeneratorEnum.uuid.value }}">
-                    <button class="dropdown-item">By UUID</button>
-                  </form>
+
+                <div class="" style="margin-left: auto">
+                    <div class="btn-group">
+                        <a v-if="!showFilter" @click="toggleFilter()" class="btn btn-outline-secondary">
+                            <i class="fe fe-chevrons-down"></i> Filters
+                        </a>
+                    </div>
                 </div>
-              </div>
             </div>
-          </div>
         </div>
 
-        <div class="" style="margin-left: auto">
-          <div class="btn-group">
-            <a v-if="!showFilter" @click="toggleFilter()" class="btn btn-outline-secondary">
-              <i class="fe fe-chevrons-down"></i> Filters
-            </a>
-          </div>
-        </div>
-      </div>
-    </div>
+        <div class="row mb-2" v-if="showFilter" id="filter-control">
+            <!-- Filter Control -->
+            <div class="col d-flex">
+                <form method="get" class="form-inline">
+                    <select name="sort"
+                            onchange="this.form.submit()"
+                            class="form-control mr-3 shadow">
+                        <option value="" {% if sort == "" %} selected {% endif %}>
+                            Sort by most recent activity
+                        </option>
+                        <option value="old2new" {% if sort == "old2new" %} selected {% endif %}>
+                            Alias Old-Recent
+                        </option>
+                        <option value="new2old" {% if sort == "new2old" %} selected {% endif %}>
+                            Alias Recent-Old
+                        </option>
+                        <option value="a2z" {% if sort == "a2z" %} selected {% endif %}>
+                            Alias A-Z
+                        </option>
+                        <option value="z2a" {% if sort == "z2a" %} selected {% endif %}>
+                            Alias Z-A
+                        </option>
+                    </select>
+
+                    <select name="filter"
+                            onchange="this.form.submit()"
+                            class="form-control mr-3 shadow"
+                            style="max-width: 200px">
+                        <option value="" {% if filter == "" %} selected {% endif %}>
+                            All Aliases
+                        </option>
+                        <option value="pinned" {% if filter == "pinned" %} selected {% endif %}>
+                            Pinned Aliases
+                        </option>
+
+                        {% if current_user.enable_SMTP_aliases %}
+                            <option value="enable_SMTP" {% if filter == "enable_SMTP" %} selected {% endif %}>
+                                Only SMTP Enabled Aliases
+                            </option>
+                        {% endif %}
+
+                        <option value="enabled" {% if filter == "enabled" %} selected {% endif %}>
+                            Only Enabled Aliases
+                        </option>
+                        <option value="disabled" {% if filter == "disabled" %} selected {% endif %}>
+                            Only Disabled Aliases
+                        </option>
+                        <option value="hibp" {% if filter == "hibp" %} selected {% endif %}>
+                            Only Aliases Found In Data Breaches
+                        </option>
+                        {% for mailbox in current_user.mailboxes() %}
+                            <option value="mailbox:{{ mailbox.id }}" {% if filter == "mailbox:" ~ mailbox.id %}
+                                    selected {% endif %}>
+                                {{ mailbox.email }}'s aliases
+                            </option>
+                        {% endfor %}
+
+                        {% for directory in current_user.directories %}
+                            <option value="directory:{{ directory.id }}" {% if filter == "directory:" ~ directory.id %}
+                                    selected {% endif %}>
+                                Directory <b>{{ directory.name }}</b> aliases
+                            </option>
+                        {% endfor %}
+
+                    </select>
+
+                    <input type="search" name="query" placeholder="Enter to search for alias"
+                           class="form-control shadow mr-2"
+                           style="max-width: 15em"
+                           value="{{ query }}">
+
+
+                </form>
+
+                <div style="margin-left: auto">
 
-    <div class="row mb-2" v-if="showFilter" id="filter-control">
-      <!-- Filter Control -->
-      <div class="col d-flex">
-        <form method="get" class="form-inline">
-          <select name="sort"
-                  onchange="this.form.submit()"
-                  class="form-control mr-3 shadow">
-            <option value="" {% if sort == "" %} selected {% endif %}>
-              Sort by most recent activity
-            </option>
-            <option value="old2new" {% if sort == "old2new" %} selected {% endif %}>
-              Alias Old-Recent
-            </option>
-            <option value="new2old" {% if sort == "new2old" %} selected {% endif %}>
-              Alias Recent-Old
-            </option>
-            <option value="a2z" {% if sort == "a2z" %} selected {% endif %}>
-              Alias A-Z
-            </option>
-            <option value="z2a" {% if sort == "z2a" %} selected {% endif %}>
-              Alias Z-A
-            </option>
-          </select>
-
-          <select name="filter"
-                  onchange="this.form.submit()"
-                  class="form-control mr-3 shadow"
-                  style="max-width: 200px">
-            <option value="" {% if filter == "" %} selected {% endif %}>
-              All Aliases
-            </option>
-            <option value="pinned" {% if filter == "pinned" %} selected {% endif %}>
-              Pinned Aliases
-            </option>
-
-          {%  if current_user.enable_SMTP_aliases %}
-            <option value="enable_SMTP" {% if filter == "enable_SMTP" %} selected {% endif %}>
-              Only SMTP Enabled Aliases
-            </option>
-          {% endif %}
-
-            <option value="enabled" {% if filter == "enabled" %} selected {% endif %}>
-              Only Enabled Aliases
-            </option>
-            <option value="disabled" {% if filter == "disabled" %} selected {% endif %}>
-              Only Disabled Aliases
-            </option>
-            <option value="hibp" {% if filter == "hibp" %} selected {% endif %}>
-              Only Aliases Found In Data Breaches
-            </option>
-            {% for mailbox in current_user.mailboxes() %}
-              <option value="mailbox:{{ mailbox.id }}" {% if filter == "mailbox:" ~ mailbox.id %}
-                      selected {% endif %}>
-                {{ mailbox.email }}'s aliases
-              </option>
-            {% endfor %}
-
-            {% for directory in current_user.directories %}
-              <option value="directory:{{ directory.id }}" {% if filter == "directory:" ~ directory.id %}
-                      selected {% endif %}>
-                Directory <b>{{ directory.name }}</b> aliases
-              </option>
-            {% endfor %}
-
-          </select>
-
-          <input type="search" name="query" placeholder="Enter to search for alias"
-                 class="form-control shadow mr-2"
-                 style="max-width: 15em"
-                 value="{{ query }}">
-
-
-        </form>
-
-        <div style="margin-left: auto">
-
-          {% if query or sort or filter %}
-            <a href="{{ url_for('dashboard.index') }}"
-               class="btn btn-outline-secondary">Reset</a>
-          {% endif %}
-
-          <a v-if="showFilter" @click="toggleFilter()" class="btn btn-outline-secondary">
-            <i class="fe fe-chevrons-up"></i>
-          </a>
+                    {% if query or sort or filter %}
+                        <a href="{{ url_for('dashboard.index') }}"
+                           class="btn btn-outline-secondary">Reset</a>
+                    {% endif %}
+
+                    <a v-if="showFilter" @click="toggleFilter()" class="btn btn-outline-secondary">
+                        <i class="fe fe-chevrons-up"></i>
+                    </a>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
-  <!-- END Controls: buttons & search -->
-
-  <!-- Alias list -->
-  <div class="row">
-    {% for alias_info in alias_infos %}
-      {% set alias = alias_info.alias %}
-
-      <div class="col-12 col-lg-6" id="alias-container-{{ alias.id }}">
-        <div class="card p-4 shadow-sm {% if alias.id == highlight_alias_id %} highlight-row {% endif %} "
-            {% if highlight_alias_id and alias.id != highlight_alias_id %}
-             style="opacity: 0.6"
-            {% endif %}
-        >
-
-          <div class="row">
-            <div class="col-8">
+    <!-- END Controls: buttons & search -->
+
+    <!-- Alias list -->
+    <div class="row">
+        {% for alias_info in alias_infos %}
+            {% set alias = alias_info.alias %}
+
+            <div class="col-12 col-lg-6" id="alias-container-{{ alias.id }}">
+                <div class="card p-4 shadow-sm {% if alias.id == highlight_alias_id %} highlight-row {% endif %} "
+                        {% if highlight_alias_id and alias.id != highlight_alias_id %}
+                     style="opacity: 0.6"
+                        {% endif %}
+                >
+
+                    <div class="row">
+                        <div class="col-8">
               <span class="{% if alias.id == highlight_alias_id %} highlighted {% endif %} clipboard cursor mb-0"
-                  {% if loop.index ==1 %}
+                      {% if loop.index ==1 %}
                     data-intro="This is your first <em>alias</em>. <br><br>
           Emails sent to an alias are <em>forwarded</em> to your <em>real</em> email address. <br><br>"
                     data-step="2"
-                  {% endif %}
-                  {% if alias.enabled %}
+                      {% endif %}
+                      {% if alias.enabled %}
                     data-toggle="tooltip"
                     title="Click to copy"
                     data-clipboard-text="{{ alias.email }}"
-                  {% endif %}
+                      {% endif %}
               >
                 <span class="font-weight-bold">{{ alias.email }}</span>
               </span>
-              {% if alias.automatic_creation %}
-                <span class="fa fa-inbox" data-toggle="tooltip"
-                      title="This alias was automatically generated because of an incoming email"></span>
-              {% endif %}
-
-              {% if alias.pinned %}
-                <span class="fa fa-thumb-tack" data-toggle="tooltip"
-                      title="This alias is pinned"></span>
-              {% endif %}
-
-            {%  if current_user.enable_SMTP_aliases %}
-              {% if alias.enable_SMTP %}
-                <span class="fa fa-id-card" data-toggle="tooltip"
-                      title="SMTP is enabled for this alias"></span>
-              {% endif %}
-            {% endif %}
-
-              {% if alias.hibp_breaches | length > 0 %}
-                <a href="https://haveibeenpwned.com/account/{{ alias.email }}">
+                            {% if alias.automatic_creation %}
+                                <span class="fa fa-inbox" data-toggle="tooltip"
+                                      title="This alias was automatically generated because of an incoming email"></span>
+                            {% endif %}
+
+                            {% if alias.pinned %}
+                                <span class="fa fa-thumb-tack" data-toggle="tooltip"
+                                      title="This alias is pinned"></span>
+                            {% endif %}
+
+                            {% if current_user.enable_SMTP_aliases %}
+                                {% if alias.enable_SMTP %}
+                                    <span class="fa fa-id-card" data-toggle="tooltip"
+                                          title="SMTP is enabled for this alias"></span>
+                                {% endif %}
+                            {% endif %}
+
+                            {% if alias.hibp_breaches | length > 0 %}
+                                <a href="https://haveibeenpwned.com/account/{{ alias.email }}">
                   <span class="fa fa-warning text-danger" data-toggle="tooltip"
                         title="This alias was found in {{ alias.hibp_breaches | length }} data breaches. Check haveibeenpwned.com for more information."></span>
-                </a>
-              {% endif %}
-
-              {% if alias.custom_domain and not alias.custom_domain.verified %}
-                <span class="fa fa-warning text-warning" data-toggle="tooltip"
-                      title="Alias can't receive emails as its domain doesn't have MX records set up."></span>
-              {% endif %}
-            </div>
-            <div class="col text-right">
-              <label class="custom-switch cursor"
-                     data-toggle="tooltip"
-                  {% if alias.enabled %}
-                     title="Disable alias - stop receiving emails sent to this alias"
-                  {% else %}
-                     title="Enable alias - start receiving emails sent to this alias"
-                  {% endif %}
-
-                  {% if loop.index ==1 %}
-                     data-intro="By <em>disabling</em> an alias, emails sent to this alias will <em>not</em>
+                                </a>
+                            {% endif %}
+
+                            {% if alias.custom_domain and not alias.custom_domain.verified %}
+                                <span class="fa fa-warning text-warning" data-toggle="tooltip"
+                                      title="Alias can't receive emails as its domain doesn't have MX records set up."></span>
+                            {% endif %}
+                        </div>
+                        <div class="col text-right">
+                            <label class="custom-switch cursor"
+                                   data-toggle="tooltip"
+                                    {% if alias.enabled %}
+                                   title="Disable alias - stop receiving emails sent to this alias"
+                                    {% else %}
+                                   title="Enable alias - start receiving emails sent to this alias"
+                                    {% endif %}
+
+                                    {% if loop.index ==1 %}
+                                   data-intro="By <em>disabling</em> an alias, emails sent to this alias will <em>not</em>
                          be forwarded to your inbox. <br><br>"
-                     data-step="3"
-                  {% endif %}
-                     style="padding-left: 0px"
-              >
-                <input type="checkbox" class="enable-disable-alias custom-switch-input"
-                       data-alias="{{ alias.id }}"
-                       data-alias-email="{{ alias.email }}"
-                    {{ "checked" if alias.enabled else "" }}>
-
-                <span class="custom-switch-indicator"></span>
-              </label>
-            </div>
-          </div>
-
-          <!-- Email Activity -->
-          <div class="row mb-2">
-            <div class="col">
-              <div style="font-size: 12px">
-                {% if alias_info.latest_email_log != None %}
-                  {% set email_log = alias_info.latest_email_log %}
-                  {% set contact = alias_info.latest_contact %}
-
-                  {% if email_log.is_reply %}
-                    {{ contact.website_email }}
-                    <i class="fa fa-reply mr-2" data-toggle="tooltip" title="Email reply/sent from alias"></i>
-                    {{ email_log.created_at | dt }}
-                  {% elif email_log.bounced %}
-                    <span class="text-danger">
+                                   data-step="3"
+                                    {% endif %}
+                                   style="padding-left: 0px"
+                            >
+                                <input type="checkbox" class="enable-disable-alias custom-switch-input"
+                                       data-alias="{{ alias.id }}"
+                                       data-alias-email="{{ alias.email }}"
+                                        {{ "checked" if alias.enabled else "" }}>
+
+                                <span class="custom-switch-indicator"></span>
+                            </label>
+                        </div>
+                    </div>
+
+                    <!-- Email Activity -->
+                    <div class="row mb-2">
+                        <div class="col">
+                            <div style="font-size: 12px">
+                                {% if alias_info.latest_email_log != None %}
+                                    {% set email_log = alias_info.latest_email_log %}
+                                    {% set contact = alias_info.latest_contact %}
+
+                                    {% if email_log.is_reply %}
+                                        {{ contact.website_email }}
+                                        <i class="fa fa-reply mr-2" data-toggle="tooltip"
+                                           title="Email reply/sent from alias"></i>
+                                        {{ email_log.created_at | dt }}
+                                    {% elif email_log.bounced %}
+                                        <span class="text-danger">
                       {{ contact.website_email }}
                       <i class="fa fa-warning mr-2" data-toggle="tooltip"
                          title="Email bounced and cannot be forwarded to your mailbox"></i>
                       {{ email_log.created_at | dt }}
                     </span>
-                  {% elif email_log.blocked %}
-                    {{ contact.website_email }}
-                    <i class="fa fa-ban mr-2 text-danger" data-toggle="tooltip" title="Email blocked"></i>
-                    {{ email_log.created_at | dt }}
-                  {% else %}
-                    {{ contact.website_email }}
-                    <i class="fa fa-paper-plane  mr-2" data-toggle="tooltip" title="Email sent to alias"></i>
-                    {{ email_log.created_at | dt }}
-                    {% include 'partials/toggle_contact.html' %}
-
-                  {% endif %}
-                {% else %}
-                  No emails received/sent in the last 14 days. Created {{ alias.created_at | dt }}.
-                {% endif %}
-
-              </div>
-            </div>
-          </div>
-          <!-- END Email Activity -->
-
-          <div class="small-text mt-1">Alias description</div>
-          <div class="d-flex mb-2">
-            <div class="flex-grow-1 mr-2">
+                                    {% elif email_log.blocked %}
+                                        {{ contact.website_email }}
+                                        <i class="fa fa-ban mr-2 text-danger" data-toggle="tooltip"
+                                           title="Email blocked"></i>
+                                        {{ email_log.created_at | dt }}
+                                    {% else %}
+                                        {{ contact.website_email }}
+                                        <i class="fa fa-paper-plane  mr-2" data-toggle="tooltip"
+                                           title="Email sent to alias"></i>
+                                        {{ email_log.created_at | dt }}
+                                        {% include 'partials/toggle_contact.html' %}
+
+                                    {% endif %}
+                                {% else %}
+                                    No emails received/sent in the last 14 days. Created {{ alias.created_at | dt }}.
+                                {% endif %}
+
+                            </div>
+                        </div>
+                    </div>
+                    <!-- END Email Activity -->
+
+                    <div class="small-text mt-1">Alias description</div>
+                    <div class="d-flex mb-2">
+                        <div class="flex-grow-1 mr-2">
                 <textarea
-                    id="note-{{ alias.id }}"
-                    name="note"
-                    class="form-control"
-                    style="font-size: 12px"
-                    rows="2"
-                    placeholder="e.g. where the alias is used or why is it created">{{ alias.note or "" }}</textarea>
-            </div>
-
-            <div class="">
-              <a data-alias="{{ alias.id }}"
-                 class="save-note btn btn-sm btn-outline-success w-100">
-                Save
-              </a>
-            </div>
-          </div>
-
-          <!-- Send Email && More button -->
-          <div class="row">
-            <div class="col">
-              <a href="{{ url_for('dashboard.alias_contact_manager', alias_id=alias.id) }}"
-                 id="send-email-{{ alias.id }}"
-                  {% if loop.index ==1 %}
-                 data-intro="Not only alias can receive emails, it can <em>send</em> emails too! <br><br>
+                        id="note-{{ alias.id }}"
+                        name="note"
+                        class="form-control"
+                        style="font-size: 12px"
+                        rows="2"
+                        placeholder="e.g. where the alias is used or why is it created">{{ alias.note or "" }}</textarea>
+                        </div>
+
+                        <div class="">
+                            <a data-alias="{{ alias.id }}"
+                               class="save-note btn btn-sm btn-outline-success w-100">
+                                Save
+                            </a>
+                        </div>
+                    </div>
+
+                    <!-- Send Email && More button -->
+                    <div class="row">
+                        <div class="col">
+                            <a href="{{ url_for('dashboard.alias_contact_manager', alias_id=alias.id) }}"
+                               id="send-email-{{ alias.id }}"
+                                    {% if loop.index ==1 %}
+                               data-intro="Not only alias can receive emails, it can <em>send</em> emails too! <br><br>
                  You can add a new <em>contact</em> for your alias here. <br><br>
                  If you need to reply to an email, just hit 'Reply': the response will come from your alias
                  and your real email address stays <em>hidden</em>."
-                 data-step="4"
-                  {% endif %}
-                 class="btn btn-sm btn-outline-primary {% if not alias.enabled %} disabled {% endif %}"
-                 data-toggle="tooltip"
-                 title="Add new contact, manage your existing contacts"
-              >
-                Contacts&nbsp; &nbsp;<i class="fe fe-send"></i>
-              </a>
-            </div>
-            {% if not current_user.expand_alias_info %}
-              <div class="col text-right">
-                <a class="btn btn-sm collapsed" data-toggle="collapse" href="#alias-{{ alias.id }}" role="button"
-                   aria-expanded="false">
+                               data-step="4"
+                                    {% endif %}
+                               class="btn btn-sm btn-outline-primary {% if not alias.enabled %} disabled {% endif %}"
+                               data-toggle="tooltip"
+                               title="Add new contact, manage your existing contacts"
+                            >
+                                Contacts&nbsp; &nbsp;<i class="fe fe-send"></i>
+                            </a>
+                        </div>
+                        {% if not current_user.expand_alias_info %}
+                            <div class="col text-right">
+                                <a class="btn btn-sm collapsed" data-toggle="collapse" href="#alias-{{ alias.id }}"
+                                   role="button"
+                                   aria-expanded="false">
 
                   <span class="if-collapsed">
                     More <i class="fe fe-chevron-down"></i>
                   </span>
-                  <span class="if-not-collapsed">Less
+                                    <span class="if-not-collapsed">Less
                     <i class="fe fe-chevron-up"></i>
                   </span>
-                </a>
-              </div>
-            {% endif %}
-          </div>
-          <!-- END Send Email && More button -->
-
-          <!-- Collapse section -->
-          <div class="{% if not current_user.expand_alias_info %} collapse {% endif %} mt-2" id="alias-{{ alias.id }}">
-
-            {% if alias_info.latest_email_log != None %}
-              <div style="font-size: 12px">
-                Alias created {{ alias.created_at | dt }}
-              </div>
-            {% endif %}
-
-            <span class="alias-activity">{{ alias_info.nb_forward }}</span> forwards,
-            <span class="alias-activity">{{ alias_info.nb_blocked }}</span> blocks,
-            <span class="alias-activity">{{ alias_info.nb_reply }}</span> sents
-            <a href="{{ url_for('dashboard.alias_log', alias_id=alias.id) }}"
-               class="btn btn-sm btn-link">
-              See All &nbsp;→
-            </a>
-
-            {% if mailboxes|length > 1 %}
-              <div class="small-text">Current mailbox</div>
-              <div class="d-flex">
-                <div class="flex-grow-1 mr-2">
-                  <select required id="mailbox-{{ alias.id }}"
-                          data-width="100%"
-                          class="mailbox-select" multiple name="mailbox">
-                    {% for mailbox in mailboxes %}
-                      <option value="{{ mailbox.id }}" {% if alias_info.contain_mailbox(mailbox.id) %}
-                              selected {% endif %}>
-                        {{ mailbox.email }}
-                      </option>
-                    {% endfor %}
-                  </select>
-                </div>
-
-                <div class="">
-                  <a data-alias="{{ alias.id }}"
-                     class="save-mailbox btn btn-sm btn-outline-info w-100">
-                    Update
-                  </a>
-                </div>
-
-              </div>
-            {% elif alias_info.mailbox != None and alias_info.mailbox.email != current_user.email %}
-              <div class="small-text">
-                Owned by <b>{{ alias_info.mailbox.email }}</b> mailbox
-              </div>
-            {% endif %}
-
-            <div class="small-text mt-2" data-toogle="tooltip"
-                 title="When sending an email from this alias, the email will have 'Display Name <{{ alias.email }}>' as sender.">
-              Display name
-              <i class="fe fe-help-circle"></i>
-            </div>
+                                </a>
+                            </div>
+                        {% endif %}
+                    </div>
+                    <!-- END Send Email && More button -->
+
+                    <!-- Collapse section -->
+                    <div class="{% if not current_user.expand_alias_info %} collapse {% endif %} mt-2"
+                         id="alias-{{ alias.id }}">
+
+                        {% if alias_info.latest_email_log != None %}
+                            <div style="font-size: 12px">
+                                Alias created {{ alias.created_at | dt }}
+                            </div>
+                        {% endif %}
+
+                        <span class="alias-activity">{{ alias_info.nb_forward }}</span> forwards,
+                        <span class="alias-activity">{{ alias_info.nb_blocked }}</span> blocks,
+                        <span class="alias-activity">{{ alias_info.nb_reply }}</span> sents
+                        <a href="{{ url_for('dashboard.alias_log', alias_id=alias.id) }}"
+                           class="btn btn-sm btn-link">
+                            See All &nbsp;→
+                        </a>
+
+                        {% if mailboxes|length > 1 %}
+                            <div class="small-text">Current mailbox</div>
+                            <div class="d-flex">
+                                <div class="flex-grow-1 mr-2">
+                                    <select required id="mailbox-{{ alias.id }}"
+                                            data-width="100%"
+                                            class="mailbox-select" multiple name="mailbox">
+                                        {% for mailbox in mailboxes %}
+                                            <option value="{{ mailbox.id }}"
+                                                    {% if alias_info.contain_mailbox(mailbox.id) %}
+                                                    selected {% endif %}>
+                                                {{ mailbox.email }}
+                                            </option>
+                                        {% endfor %}
+                                    </select>
+                                </div>
+
+                                <div class="">
+                                    <a data-alias="{{ alias.id }}"
+                                       class="save-mailbox btn btn-sm btn-outline-info w-100">
+                                        Update
+                                    </a>
+                                </div>
+
+                            </div>
+                        {% elif alias_info.mailbox != None and alias_info.mailbox.email != current_user.email %}
+                            <div class="small-text">
+                                Owned by <b>{{ alias_info.mailbox.email }}</b> mailbox
+                            </div>
+                        {% endif %}
+
+                        <div class="small-text mt-2" data-toogle="tooltip"
+                             title="When sending an email from this alias, the email will have 'Display Name <{{ alias.email }}>' as sender.">
+                            Display name
+                            <i class="fe fe-help-circle"></i>
+                        </div>
+
+                        <div class="d-flex">
+                            <div class="flex-grow-1 mr-2">
+                                <input id="alias-name-{{ alias.id }}"
+                                       value="{{ alias.name or '' }}" class="form-control"
+                                       placeholder="{{ alias.custom_domain.name or "Alias name" }}">
+                            </div>
+
+
+                            <div class="">
+                                <a data-alias="{{ alias.id }}"
+                                   class="save-alias-name btn btn-sm btn-outline-primary w-100">
+                                    Save
+                                </a>
+                            </div>
+                        </div>
+
+                        {% if alias.mailbox_support_pgp() %}
+                            <div class="small-text mt-2" data-toogle="tooltip"
+                                 title="You can decide to turn off the PGP for an alias. This can be useful if the sender already encrypts the emails">
+                                PGP
+                                <i class="fe fe-help-circle"></i>
+                            </div>
+                            <div>
+                                <label class="custom-switch cursor pl-0">
+                                    <input type="checkbox" class="enable-disable-pgp custom-switch-input"
+                                           data-alias="{{ alias.id }}"
+                                           data-alias-email="{{ alias.email }}"
+                                            {{ "checked" if alias.pgp_enabled() else "" }}>
+
+                                    <span class="custom-switch-indicator"></span>
+                                </label>
+                            </div>
+                        {% endif %}
+
+                        <div class="small-text mt-2" data-toogle="tooltip"
+                             title="it's always pinned on top">
+                            Pin this alias
+                            <i class="fe fe-help-circle"></i>
+                        </div>
+                        <div>
+                            <label class="custom-switch cursor pl-0">
+                                <input type="checkbox" class="pin-alias custom-switch-input"
+                                       data-alias="{{ alias.id }}"
+                                       data-alias-email="{{ alias.email }}"
+                                        {{ "checked" if alias.pinned else "" }}>
+
+                                <span class="custom-switch-indicator"></span>
+                            </label>
+                        </div>
+
+                        {% if current_user.enable_SMTP_aliases %}
+                            <div class="small-text mt-2" data-toogle="tooltip"
+                                 title="This enables sending via SMTP for alias">
+                                Enable SMTP for this alias
+                                <i class="fe fe-help-circle"></i>
+                            </div>
+                            <div>
+                                <label class="custom-switch cursor pl-0">
+                                    <input type="checkbox" class="enable-disable-smtp custom-switch-input"
+                                           data-alias="{{ alias.id }}"
+                                           data-alias-email="{{ alias.email }}"
+                                            {{ "checked" if alias.enable_SMTP else "" }}>
+
+                                    <span class="custom-switch-indicator"></span>
+                                </label>
+                            </div>
+                        {% endif %}
+                        <div>
+                            <div class="btn-group float-right" role="group" aria-label="Basic example">
+                                <a href="{{ url_for('dashboard.alias_transfer_send_route', alias_id=alias.id) }}"
+                                   class="btn btn-sm btn-link">
+                                    Transfer
+                                    <i class="ml-0 dropdown-icon fe fe-share-2 text-primary"></i>
+                                </a>
+
+
+                                <form method="post">
+                                    <input type="hidden" name="form-name" value="delete-alias">
+                                    <input type="hidden" name="alias-id" value="{{ alias.id }}">
+                                    <input type="hidden" name="alias" class="alias" value="{{ alias.email }}">
+
+                                    <span class="btn btn-link btn-sm float-right text-danger"
+                                          onclick="confirmDeleteAlias.call(this)"
+                                            {% if alias.custom_domain %}
+                                          data-custom-domain-trash-url="{{ alias.custom_domain.get_trash_url() }}"
+                                            {% endif %}
+                                          data-alias="{{ alias.id }}"
+                                          data-alias-email="{{ alias.email }}"
+                                    >
+                    Delete&nbsp; &nbsp;<i class="dropdown-icon fe fe-trash-2 text-danger"></i>
+                  </span>
+                                </form>
 
-            <div class="d-flex">
-              <div class="flex-grow-1 mr-2">
-                <input id="alias-name-{{ alias.id }}"
-                       value="{{ alias.name or '' }}" class="form-control"
-                       placeholder="{{ alias.custom_domain.name or "Alias name" }}">
-              </div>
+                            </div>
+                        </div>
 
 
-              <div class="">
-                <a data-alias="{{ alias.id }}"
-                   class="save-alias-name btn btn-sm btn-outline-primary w-100">
-                  Save
-                </a>
-              </div>
-            </div>
-
-            {% if alias.mailbox_support_pgp() %}
-              <div class="small-text mt-2" data-toogle="tooltip"
-                   title="You can decide to turn off the PGP for an alias. This can be useful if the sender already encrypts the emails">
-                PGP
-                <i class="fe fe-help-circle"></i>
-              </div>
-              <div>
-                <label class="custom-switch cursor pl-0">
-                  <input type="checkbox" class="enable-disable-pgp custom-switch-input"
-                         data-alias="{{ alias.id }}"
-                         data-alias-email="{{ alias.email }}"
-                      {{ "checked" if alias.pgp_enabled() else "" }}>
-
-                  <span class="custom-switch-indicator"></span>
-                </label>
-              </div>
-            {% endif %}
-
-            <div class="small-text mt-2" data-toogle="tooltip"
-                 title="it's always pinned on top">
-              Pin this alias
-              <i class="fe fe-help-circle"></i>
-            </div>
-            <div>
-              <label class="custom-switch cursor pl-0">
-                <input type="checkbox" class="pin-alias custom-switch-input"
-                       data-alias="{{ alias.id }}"
-                       data-alias-email="{{ alias.email }}"
-                    {{ "checked" if alias.pinned else "" }}>
-
-                <span class="custom-switch-indicator"></span>
-              </label>
-            </div>
-
-          {%  if current_user.enable_SMTP_aliases %}
-          <div class="small-text mt-2" data-toogle="tooltip"
-                 title="This enables sending via SMTP for alias">
-              Enable SMTP for this alias
-              <i class="fe fe-help-circle"></i>
-            </div>
-            <div>
-              <label class="custom-switch cursor pl-0">
-                <input type="checkbox" class="enable-disable-smtp custom-switch-input"
-                       data-alias="{{ alias.id }}"
-                       data-alias-email="{{ alias.email }}"
-                    {{ "checked" if alias.enable_SMTP else "" }}>
-
-                <span class="custom-switch-indicator"></span>
-              </label>
+                    </div>
+                    <!-- END Collapse section -->
+                </div>
             </div>
-            {% endif %}
-            <div>
-              <div class="btn-group float-right" role="group" aria-label="Basic example">
-                <a href="{{ url_for('dashboard.alias_transfer_send_route', alias_id=alias.id) }}"
-                   class="btn btn-sm btn-link">
-                  Transfer
-                  <i class="ml-0 dropdown-icon fe fe-share-2 text-primary"></i>
-                </a>
-
-
-                <form method="post">
-                  <input type="hidden" name="form-name" value="delete-alias">
-                  <input type="hidden" name="alias-id" value="{{ alias.id }}">
-                  <input type="hidden" name="alias" class="alias" value="{{ alias.email }}">
-
-                  <span class="btn btn-link btn-sm float-right text-danger"
-                        onclick="confirmDeleteAlias.call(this)"
-                      {% if alias.custom_domain %}
-                        data-custom-domain-trash-url="{{ alias.custom_domain.get_trash_url() }}"
-                      {% endif %}
-                        data-alias="{{ alias.id }}"
-                        data-alias-email="{{ alias.email }}"
-                  >
-                    Delete&nbsp; &nbsp;<i class="dropdown-icon fe fe-trash-2 text-danger"></i>
-                  </span>
-                </form>
+        {% endfor %}
+    </div>
+    <!-- END Alias list -->
 
-              </div>
+    <!-- Only show pagination control if there are previous/next page -->
+    {% if page > 0 or not last_page %}
+        <div class="row">
+            <div class="col">
+                <nav aria-label="Alias navigation">
+                    <ul class="pagination">
+                        <li class="page-item mr-1">
+                            <a class="btn btn-outline-primary {% if page == 0 %}disabled{% endif %}"
+                               href="{{ url_for('dashboard.index', page=page-1, query=query, sort=sort, filter=filter) }}">
+                                Previous</a>
+                        </li>
+                        <li class="page-item">
+                            <a class="btn btn-outline-primary {% if last_page %}disabled{% endif %}"
+                               href="
+                                       {{ url_for('dashboard.index', page=page+1, query=query, sort=sort, filter=filter) }}">
+                                Next</a>
+                        </li>
+                    </ul>
+                </nav>
             </div>
-
-
-          </div>
-          <!-- END Collapse section -->
         </div>
-      </div>
-    {% endfor %}
-  </div>
-  <!-- END Alias list -->
-
-  <!-- Only show pagination control if there are previous/next page -->
-  {% if page > 0 or not last_page %}
-    <div class="row">
-      <div class="col">
-        <nav aria-label="Alias navigation">
-          <ul class="pagination">
-            <li class="page-item mr-1">
-              <a class="btn btn-outline-primary {% if page == 0 %}disabled{% endif %}"
-                 href="{{ url_for('dashboard.index', page=page-1, query=query, sort=sort, filter=filter) }}">
-                Previous</a>
-            </li>
-            <li class="page-item">
-              <a class="btn btn-outline-primary {% if last_page %}disabled{% endif %}"
-                 href="{{ url_for('dashboard.index', page=page+1, query=query, sort=sort, filter=filter) }}">
-                Next</a>
-            </li>
-          </ul>
-        </nav>
-      </div>
-    </div>
-  {% endif %}
+    {% endif %}
 
 {% endblock %}
 
 {% block script %}
-  <script src="/static/js/index.js?v=0"></script>
-
-  <script>
-    {% if show_intro %}
-      // only show intro when screen is big enough to show "developer" tab
-      if (window.innerWidth >= 1024) {
-        introJs().start();
-      }
-    {% endif %}
+    <script src="/static/js/index.js?v=0"></script>
 
-    $('.highlighted').tooltip("show");
-  </script>
-    {%  if current_user.enable_SMTP_aliases %}
+    <script>
+        {% if show_intro %}
+            // only show intro when screen is big enough to show "developer" tab
+            if (window.innerWidth >= 1024) {
+                introJs().start();
+            }
+        {% endif %}
+
+        $('.highlighted').tooltip("show");
+    </script>
+    {% if current_user.enable_SMTP_aliases %}
         <script type="module">
 
-        import { nanoid } from "{{ url_for('static', filename='node_modules/nanoid/nanoid.js') }}"
+            import {nanoid} from "{{ url_for('static', filename='node_modules/nanoid/nanoid.js') }}"
 
-        $(".enable-disable-smtp").change(async function () {
-          let aliasId = $(this).data("alias");
-          let alias = $(this).data("alias-email");
-          const oldValue = !$(this).prop("checked");
-          let newValue = !oldValue;
+            $(".enable-disable-smtp").change(async function () {
+                let aliasId = $(this).data("alias");
+                let alias = $(this).data("alias-email");
+                const oldValue = !$(this).prop("checked");
+                let newValue = !oldValue;
 
-          if(newValue) {
-            var smtp_generated_password = nanoid(21);
+                if (newValue) {
+                    var smtpGeneratedPassword = nanoid(21);
 
-            var message = `SMTP credentials for alias (<b>This will be visible only once, so please save it</b>):
+                    var message = `SMTP credentials for alias (<b>This will be visible only once, so please save it</b>):
                         <br><br>Username (same as alias): ${alias}
-                        <br>Password: ${smtp_generated_password}<br>
+                        <br>Password: ${smtpGeneratedPassword}<br>
                         `;
-          }
-          try {
-            if(newValue) {
-              var res = await fetch(`/api/aliases/${aliasId}`, {
-                method: "PUT",
-                headers: {
-                  "Content-Type": "application/json",
-                },
-                body: JSON.stringify({
-                  enable_SMTP: newValue,
-                  smtp_password: smtp_generated_password,
-                }),
-              });
-            }
-            else {
-              var res = await fetch(`/api/aliases/${aliasId}`, {
-                method: "PUT",
-                headers: {
-                  "Content-Type": "application/json",
-                },
-                body: JSON.stringify({
-                  enable_SMTP: newValue,
-                }),
-              });
-            }
-            if (res.ok) {
-              if (newValue) {
-                bootbox.alert({
-                  title: `SMTP Credentials for ${alias}`,
-                  message: message,
-                  size: 'large',
-                  onEscape: false,
-                  buttons: {
-                    ok: {
-                      label: 'Ok, I have saved them',
-                      className: 'btn-primary',
-                    },
-                  },
-                  callback: function () {
-                    toastr.success(`SMTP Enabled for ${alias}`);
-                  }
-                });
-                smtp_generated_password = null; // Clear the password.
-              } else {
-                toastr.info(`SMTP Disabled for ${alias}`);
-              }
-            } else {
-              toastr.error("Sorry for the inconvenience! Could you refresh the page & retry please?", "Unknown Error");
-              // reset to the original value
-              $(this).prop("checked", oldValue);
-            }
-          } catch (e) {
-            toastr.error("Sorry for the inconvenience! Could you refresh the page & retry please?", "Unknown Error");
-            // reset to the original value
-            $(this).prop("checked", oldValue);
-          }
-        });
+                }
+                try {
+                    if (newValue) {
+                        var res = await fetch(`/api/aliases/${aliasId}`, {
+                            method: "PUT",
+                            headers: {
+                                "Content-Type": "application/json",
+                            },
+                            body: JSON.stringify({
+                                enable_SMTP: newValue,
+                                smtp_password: smtpGeneratedPassword,
+                            }),
+                        });
+                    } else {
+                        var res = await fetch(`/api/aliases/${aliasId}`, {
+                            method: "PUT",
+                            headers: {
+                                "Content-Type": "application/json",
+                            },
+                            body: JSON.stringify({
+                                enable_SMTP: newValue,
+                            }),
+                        });
+                    }
+                    if (res.ok) {
+                        if (newValue) {
+                            bootbox.alert({
+                                title: `SMTP Credentials for ${alias}`,
+                                message: message,
+                                size: 'large',
+                                onEscape: false,
+                                buttons: {
+                                    ok: {
+                                        label: 'Ok, I have saved them',
+                                        className: 'btn-primary',
+                                    },
+                                },
+                                callback: function () {
+                                    toastr.success(`SMTP Enabled for ${alias}`);
+                                }
+                            });
+                            smtpGeneratedPassword = null; // Clear the password.
+                        } else {
+                            toastr.info(`SMTP Disabled for ${alias}`);
+                        }
+                    } else {
+                        toastr.error("Sorry for the inconvenience! Could you refresh the page & retry please?", "Unknown Error");
+                        // reset to the original value
+                        $(this).prop("checked", oldValue);
+                    }
+                } catch (e) {
+                    toastr.error("Sorry for the inconvenience! Could you refresh the page & retry please?", "Unknown Error");
+                    // reset to the original value
+                    $(this).prop("checked", oldValue);
+                }
+            });
         </script>
     {% endif %}
 {% endblock %}
diff --git a/templates/dashboard/setting.html b/templates/dashboard/setting.html
index 507c84394..2d76dd0fc 100644
--- a/templates/dashboard/setting.html
+++ b/templates/dashboard/setting.html
@@ -3,627 +3,653 @@
 {% set active_page = "setting" %}
 
 {% block title %}
-  Settings
+    Settings
 {% endblock %}
 
 {% block head %}
-  <style>
-      .card-title {
-          font-size: 22px;
-          font-weight: 600;
-          margin-bottom: 3px;
-      }
-  </style>
+    <style>
+        .card-title {
+            font-size: 22px;
+            font-weight: 600;
+            margin-bottom: 3px;
+        }
+    </style>
 {% endblock %}
 
 {% block default_content %}
 
-  <div class="col pb-3">
-    <!-- Current plan -->
-    <div class="card">
-      <div class="card-body">
-        <div class="card-title mb-3">Current Plan</div>
-
-        {% if current_user.lifetime %}
-          You have lifetime access to the Premium plan.
-        {% elif current_user.lifetime_or_active_subscription() %}
-          {% if current_user.get_subscription() %}
-            <div>
-              {{ current_user.get_subscription().plan_name() }} plan subscribed via Paddle.
-              <a href="{{ url_for('dashboard.billing') }}">
-                Manage Subscription ➡
-              </a>
+    <div class="col pb-3">
+        <!-- Current plan -->
+        <div class="card">
+            <div class="card-body">
+                <div class="card-title mb-3">Current Plan</div>
+
+                {% if current_user.lifetime %}
+                    You have lifetime access to the Premium plan.
+                {% elif current_user.lifetime_or_active_subscription() %}
+                    {% if current_user.get_subscription() %}
+                        <div>
+                            {{ current_user.get_subscription().plan_name() }} plan subscribed via Paddle.
+                            <a href="{{ url_for('dashboard.billing') }}">
+                                Manage Subscription ➡
+                            </a>
+                        </div>
+                    {% endif %}
+
+                    {% if manual_sub and manual_sub.is_active() %}
+                        <div>
+                            Manual plan which expires {{ manual_sub.end_at | dt }}
+                            ({{ manual_sub.end_at.format("YYYY-MM-DD") }}).
+                            {% if manual_sub.is_giveaway %}
+                                <br>
+                                To gain additional features and support SimpleLogin you can upgrade to a Premium plan.
+                                <br>
+                                <a href="{{ url_for('dashboard.pricing') }}" class="btn btn-sm btn-outline-primary">Upgrade</a>
+                            {% endif %}
+                        </div>
+                    {% endif %}
+
+                    {% if apple_sub and apple_sub.is_valid() %}
+                        <div>
+                            Premium plan subscribed via Apple which expires {{ apple_sub.expires_date | dt }}
+                            ({{ apple_sub.expires_date.format("YYYY-MM-DD") }}).
+                            <div class="alert alert-info">
+                                If you want to subscribe via the Web instead, please make sure to cancel your
+                                subscription
+                                on Apple first.
+                                <a href="{{ url_for('dashboard.pricing') }}"
+                                   class="">Upgrade <i class="fa fa-arrow-right" aria-hidden="true"></i></a>
+                            </div>
+                        </div>
+                    {% endif %}
+
+                    {% if coinbase_sub and coinbase_sub.is_active() %}
+                        <div>
+                            Yearly plan subscribed with cryptocurrency which expires on
+                            {{ coinbase_sub.end_at.format("YYYY-MM-DD") }}.
+                            <a href="{{ url_for('dashboard.coinbase_checkout_route') }}" target="_blank">
+                                Extend Subscription <i class="fe fe-external-link"></i>
+                            </a>
+                        </div>
+                    {% endif %}
+                {% elif current_user.in_trial() %}
+                    Your Premium trial expires {{ current_user.trial_end | dt }}.
+                {% else %}
+                    You are on the Free plan.
+                {% endif %}
             </div>
-          {% endif %}
-
-          {% if manual_sub and manual_sub.is_active() %}
-            <div>
-              Manual plan which expires {{ manual_sub.end_at | dt }}
-              ({{ manual_sub.end_at.format("YYYY-MM-DD") }}).
-              {% if manual_sub.is_giveaway %}
-                <br>
-                To gain additional features and support SimpleLogin you can upgrade to a Premium plan. <br>
-                <a href="{{ url_for('dashboard.pricing') }}" class="btn btn-sm btn-outline-primary">Upgrade</a>
-              {% endif %}
-            </div>
-          {% endif %}
-
-          {% if apple_sub and apple_sub.is_valid() %}
-            <div>
-              Premium plan subscribed via Apple which expires {{ apple_sub.expires_date | dt }}
-              ({{ apple_sub.expires_date.format("YYYY-MM-DD") }}).
-              <div class="alert alert-info">
-                If you want to subscribe via the Web instead, please make sure to cancel your subscription
-                on Apple first.
-                <a href="{{ url_for('dashboard.pricing') }}"
-                   class="">Upgrade <i class="fa fa-arrow-right" aria-hidden="true"></i></a>
-              </div>
+        </div>
+        <!-- END Current plan -->
+
+        <!-- TOTP -->
+        <div class="card" id="totp">
+            <div class="card-body">
+                <div class="card-title">Two Factor Authentication</div>
+                <div class="mb-3">
+                    Secure your account with 2FA, you'll be asked for a code generated through an app when you login.
+                    <br>
+                </div>
+                {% if not current_user.enable_otp %}
+                    <a href="{{ url_for('dashboard.mfa_setup') }}" class="btn btn-outline-primary">Setup TOTP</a>
+                {% else %}
+                    <a href="{{ url_for('dashboard.mfa_cancel') }}" class="btn btn-outline-danger">Disable TOTP</a>
+                    <a href="{{ url_for('dashboard.recovery_code_route') }}" class="btn btn-outline-secondary">Recovery
+                        Codes</a>
+                {% endif %}
             </div>
-          {% endif %}
-
-          {% if coinbase_sub and coinbase_sub.is_active() %}
-            <div>
-              Yearly plan subscribed with cryptocurrency which expires on
-              {{ coinbase_sub.end_at.format("YYYY-MM-DD") }}.
-              <a href="{{ url_for('dashboard.coinbase_checkout_route') }}" target="_blank">
-                Extend Subscription <i class="fe fe-external-link"></i>
-              </a>
+        </div>
+        <!-- END TOTP -->
+
+        <!-- WebAuthn -->
+        <div class="card">
+            <div class="card-body">
+                <div class="card-title">Security Key (WebAuthn)</div>
+                <div class="mb-3">
+                    You can secure your account by linking either your FIDO-supported physical key such as Yubikey,
+                    Google
+                    Titan,
+                    or a device with appropriate hardware to your account.
+                </div>
+                {% if current_user.fido_uuid is none %}
+                    <a href="{{ url_for('dashboard.fido_setup') }}" class="btn btn-outline-primary">Setup WebAuthn</a>
+                {% else %}
+                    <a href="{{ url_for('dashboard.fido_manage') }}" class="btn btn-outline-info">Manage WebAuthn</a>
+                    <a href="{{ url_for('dashboard.recovery_code_route') }}" class="btn btn-outline-secondary">Recovery
+                        Codes</a>
+                {% endif %}
             </div>
-          {% endif %}
-        {% elif current_user.in_trial() %}
-          Your Premium trial expires {{ current_user.trial_end | dt }}.
-        {% else %}
-          You are on the Free plan.
-        {% endif %}
-      </div>
-    </div>
-    <!-- END Current plan -->
-
-    <!-- TOTP -->
-    <div class="card" id="totp">
-      <div class="card-body">
-        <div class="card-title">Two Factor Authentication</div>
-        <div class="mb-3">
-          Secure your account with 2FA, you'll be asked for a code generated through an app when you login. <br>
         </div>
-        {% if not current_user.enable_otp %}
-          <a href="{{ url_for('dashboard.mfa_setup') }}" class="btn btn-outline-primary">Setup TOTP</a>
-        {% else %}
-          <a href="{{ url_for('dashboard.mfa_cancel') }}" class="btn btn-outline-danger">Disable TOTP</a>
-          <a href="{{ url_for('dashboard.recovery_code_route') }}" class="btn btn-outline-secondary">Recovery Codes</a>
-        {% endif %}
-      </div>
-    </div>
-    <!-- END TOTP -->
-
-    <!-- WebAuthn -->
-    <div class="card">
-      <div class="card-body">
-        <div class="card-title">Security Key (WebAuthn)</div>
-        <div class="mb-3">
-          You can secure your account by linking either your FIDO-supported physical key such as Yubikey, Google
-          Titan,
-          or a device with appropriate hardware to your account.
+        <!-- END WebAuthn -->
+
+
+        <!-- Newsletter -->
+        <div class="card" id="notification">
+            <div class="card-body">
+                <div class="card-title">Newsletters</div>
+                <div class="mb-3">
+                    We will occasionally send you emails with new feature announcements.
+                </div>
+                <form method="post">
+                    <input type="hidden" name="form-name" value="notification-preference">
+                    <div class="form-check">
+                        <input type="checkbox" id="notification" name="notification" {% if current_user.notification %}
+                               checked {% endif %} class="form-check-input">
+                        <label for="notification">I want to be emailed when new features are released.</label>
+                    </div>
+                    <button type="submit" class="btn btn-outline-primary">Submit</button>
+                </form>
+            </div>
         </div>
-        {% if current_user.fido_uuid is none %}
-          <a href="{{ url_for('dashboard.fido_setup') }}" class="btn btn-outline-primary">Setup WebAuthn</a>
-        {% else %}
-          <a href="{{ url_for('dashboard.fido_manage') }}" class="btn btn-outline-info">Manage WebAuthn</a>
-          <a href="{{ url_for('dashboard.recovery_code_route') }}" class="btn btn-outline-secondary">Recovery Codes</a>
-        {% endif %}
-      </div>
-    </div>
-    <!-- END WebAuthn -->
-
-
-    <!-- Newsletter -->
-    <div class="card" id="notification">
-      <div class="card-body">
-        <div class="card-title">Newsletters</div>
-        <div class="mb-3">
-          We will occasionally send you emails with new feature announcements.
+        <!-- END Newsletter -->
+
+        <!-- Change name & profile picture -->
+        <div class="card">
+            <form method="post" enctype="multipart/form-data">
+                {{ form.csrf_token }}
+                <input type="hidden" name="form-name" value="update-profile">
+
+                <div class="card-body">
+                    <div class="card-title">
+                        Profile
+                    </div>
+                    <div>
+                        This information will be filled in automatically when you use the
+                        <em>Sign in with SimpleLogin</em> button.
+                    </div>
+                    <div class="form-group mt-3">
+                        <label class="form-label">Name</label>
+                        {{ form.name(class="form-control", value=current_user.name) }}
+                        {{ render_field_errors(form.name) }}
+                    </div>
+
+                    <div class="form-group">
+                        <div class="form-label">Profile picture</div>
+                        {{ form.profile_picture(class="form-control-file") }}
+                        {{ render_field_errors(form.profile_picture) }}
+                        {% if current_user.profile_picture_id %}
+                            <img src="{{ current_user.profile_picture_url() }}" class="profile-picture">
+                        {% endif %}
+                    </div>
+                    <button class="btn btn-outline-primary">Update</button>
+                </div>
+            </form>
         </div>
-        <form method="post">
-          <input type="hidden" name="form-name" value="notification-preference">
-          <div class="form-check">
-            <input type="checkbox" id="notification" name="notification" {% if current_user.notification %}
-                   checked {% endif %} class="form-check-input">
-            <label for="notification">I want to be emailed when new features are released.</label>
-          </div>
-          <button type="submit" class="btn btn-outline-primary">Submit</button>
-        </form>
-      </div>
-    </div>
-    <!-- END Newsletter -->
-
-    <!-- Change name & profile picture -->
-    <div class="card">
-      <form method="post" enctype="multipart/form-data">
-        {{ form.csrf_token }}
-        <input type="hidden" name="form-name" value="update-profile">
-
-        <div class="card-body">
-          <div class="card-title">
-            Profile
-          </div>
-          <div>
-            This information will be filled in automatically when you use the
-            <em>Sign in with SimpleLogin</em> button.
-          </div>
-          <div class="form-group mt-3">
-            <label class="form-label">Name</label>
-            {{ form.name(class="form-control", value=current_user.name) }}
-            {{ render_field_errors(form.name) }}
-          </div>
-
-          <div class="form-group">
-            <div class="form-label">Profile picture</div>
-            {{ form.profile_picture(class="form-control-file") }}
-            {{ render_field_errors(form.profile_picture) }}
-            {% if current_user.profile_picture_id %}
-              <img src="{{ current_user.profile_picture_url() }}" class="profile-picture">
-            {% endif %}
-          </div>
-          <button class="btn btn-outline-primary">Update</button>
+        <!-- END change name & profile picture -->
+
+        <!-- Change email -->
+        <div class="card">
+            <form method="post" enctype="multipart/form-data">
+                <input type="hidden" name="form-name" value="update-email">
+                {{ change_email_form.csrf_token }}
+
+                <div class="card-body">
+                    <div class="card-title">
+                        Account Email
+                    </div>
+                    <div class="mb-3">
+                        This email address is used to log in to SimpleLogin. <br>
+                        If you want to change the mailbox that emails are forwarded to, use the
+                        <a href="{{ url_for('dashboard.mailbox_route') }}">
+                            <i class="fe fe-inbox"></i> Mailboxes page
+                        </a> instead.
+                    </div>
+                    <div class="form-group mt-2">
+                        <!-- Not allow user to change email if there's a pending change -->
+                        {{ change_email_form.email(class="form-control", value=current_user.email, readonly=pending_email != None) }}
+                        {{ render_field_errors(change_email_form.email) }}
+
+                        {% if pending_email %}
+                            <div class="mt-2">
+                                <span class="text-danger">Pending email change: {{ pending_email }}</span>
+                                <a href="{{ url_for('dashboard.resend_email_change') }}"
+                                   class="btn btn-secondary btn-sm">Resend
+                                    confirmation email</a>
+                                <a href="{{ url_for('dashboard.cancel_email_change') }}"
+                                   class="btn btn-secondary btn-sm">Cancel email
+                                    change</a>
+                            </div>
+                        {% endif %}
+                    </div>
+                    <button class="btn btn-outline-primary">Change Email</button>
+                </div>
+            </form>
         </div>
-      </form>
-    </div>
-    <!-- END change name & profile picture -->
-
-    <!-- Change email -->
-    <div class="card">
-      <form method="post" enctype="multipart/form-data">
-        <input type="hidden" name="form-name" value="update-email">
-        {{ change_email_form.csrf_token }}
-
-        <div class="card-body">
-          <div class="card-title">
-            Account Email
-          </div>
-          <div class="mb-3">
-            This email address is used to log in to SimpleLogin. <br>
-            If you want to change the mailbox that emails are forwarded to, use the
-            <a href="{{ url_for('dashboard.mailbox_route') }}">
-              <i class="fe fe-inbox"></i> Mailboxes page
-            </a> instead.
-          </div>
-          <div class="form-group mt-2">
-            <!-- Not allow user to change email if there's a pending change -->
-            {{ change_email_form.email(class="form-control", value=current_user.email, readonly=pending_email != None) }}
-            {{ render_field_errors(change_email_form.email) }}
-
-            {% if pending_email %}
-              <div class="mt-2">
-                <span class="text-danger">Pending email change: {{ pending_email }}</span>
-                <a href="{{ url_for('dashboard.resend_email_change') }}" class="btn btn-secondary btn-sm">Resend
-                  confirmation email</a>
-                <a href="{{ url_for('dashboard.cancel_email_change') }}" class="btn btn-secondary btn-sm">Cancel email
-                  change</a>
-              </div>
-            {% endif %}
-          </div>
-          <button class="btn btn-outline-primary">Change Email</button>
+        <!-- END Change email -->
+
+        <!-- Change password -->
+        <div class="card" id="change_password">
+            <div class="card-body">
+                <div class="card-title">
+                    Password
+                </div>
+                <div class="mb-3">
+                    You will receive an email containing instructions on how to change your password.
+                </div>
+                <form method="post">
+                    <input type="hidden" name="form-name" value="change-password">
+                    <button class="btn btn-outline-primary">Change password</button>
+                </form>
+            </div>
         </div>
-      </form>
-    </div>
-    <!-- END Change email -->
+        <!-- END Change password -->
+
+        <!-- Random alias -->
+        <div id="random-alias" class="card">
+            <div class="card-body">
+                <div class="card-title">Aliases</div>
+
+                <div class="mt-3 mb-1">Change the way random aliases are generated by default.</div>
+                <form method="post" action="#random-alias" class="form-inline">
+                    <input type="hidden" name="form-name" value="change-alias-generator">
+                    <select class="form-control mr-sm-2" name="alias-generator-scheme">
+                        <option value="{{ AliasGeneratorEnum.word.value }}"
+                                {% if current_user.alias_generator == AliasGeneratorEnum.word.value %}
+                                selected {% endif %} >Based on
+                            Random {{ AliasGeneratorEnum.word.name.capitalize() }}</option>
+                        <option value="{{ AliasGeneratorEnum.uuid.value }}"
+                                {% if current_user.alias_generator == AliasGeneratorEnum.uuid.value %}
+                                selected {% endif %} >Based
+                            on {{ AliasGeneratorEnum.uuid.name.upper() }}</option>
+                    </select>
+                    <button class="btn btn-outline-primary">Update</button>
+                </form>
+
+                <div class="mt-3 mb-1">Select the default domain for aliases.</div>
+                <form method="post" action="#random-alias" class="form-inline">
+                    <input type="hidden" name="form-name" value="change-random-alias-default-domain">
+                    <select class="form-control mr-sm-2" name="random-alias-default-domain">
+                        {% for is_public, domain in current_user.available_domains_for_random_alias() %}
+                            <option value="{{ domain }}"
+                                    {% if current_user.default_random_alias_domain() == domain %} selected {% endif %} >
+                                {{ domain }} ({% if is_public %} SimpleLogin domain {% else %} your domain {% endif %})
+                            </option>
+                        {% endfor %}
+                    </select>
+                    <button class="btn btn-outline-primary">Update</button>
+                </form>
+
+                <div id="random-alias-suffix" class="mt-3 mb-1">Select the default suffix generator for aliases.</div>
+                <form method="post" action="#random-alias-suffix" class="form-inline">
+                    <input type="hidden" name="form-name" value="random-alias-suffix">
+                    <select class="form-control mr-sm-2" name="random-alias-suffix-generator">
+
+                        <option value="0" {% if current_user.random_alias_suffix==0 %} selected {% endif %}>
+                            Random word from our dictionary
+                        </option>
+                        <option value="1" {% if current_user.random_alias_suffix==1 %} selected {% endif %}>
+                            Random combination of {{ ALIAS_RAND_SUFFIX_LENGTH }} letter and digits
+                        </option>
+                    </select>
+                    <button class="btn btn-outline-primary">Update</button>
+                </form>
 
-    <!-- Change password -->
-    <div class="card" id="change_password">
-      <div class="card-body">
-        <div class="card-title">
-          Password
+            </div>
         </div>
-        <div class="mb-3">
-          You will receive an email containing instructions on how to change your password.
+        <!-- END Random alias -->
+
+        <!-- Sender Format -->
+        <div class="card" id="sender-format">
+            <div class="card-body">
+                <div class="card-title">Sender Address Format</div>
+                <div class="mt-1 mb-3">
+                    When your alias receives an email, say from: <b>John Wick &lt;john@wick.com&gt;</b>,
+                    SimpleLogin forwards it to your mailbox. <br>
+
+                    Due to some email constraints, SimpleLogin cannot keep the sender email address
+                    in the original form and needs to <b>transform</b> it to one of the formats below.
+                </div>
+
+                <form method="post" action="#sender-format">
+                    <input type="hidden" name="form-name" value="change-sender-format">
+
+                    <select class="form-control mr-sm-2" name="sender-format">
+                        <option value="{{ SenderFormatEnum.AT.value }}"
+                                {% if current_user.sender_format == SenderFormatEnum.AT.value %} selected {% endif %}>
+                            John Wick - john at wick.com
+                        </option>
+
+                        <option value="{{ SenderFormatEnum.A.value }}"
+                                {% if current_user.sender_format == SenderFormatEnum.A.value %} selected {% endif %}>
+                            John Wick - john(a)wick.com
+                        </option>
+
+                        <option value="{{ SenderFormatEnum.NAME_ONLY.value }}"
+                                {% if current_user.sender_format == SenderFormatEnum.NAME_ONLY.value %}
+                                selected {% endif %}>
+                            John Wick
+                        </option>
+
+                        <option value="{{ SenderFormatEnum.AT_ONLY.value }}"
+                                {% if current_user.sender_format == SenderFormatEnum.AT_ONLY.value %}
+                                selected {% endif %}>
+                            john at wick.com
+                        </option>
+
+                        <option value="{{ SenderFormatEnum.NO_NAME.value }}"
+                                {% if current_user.sender_format == SenderFormatEnum.NO_NAME.value %}
+                                selected {% endif %}>
+                            No Name (i.e. only reverse-alias)
+                        </option>
+
+                    </select>
+
+                    <button class="btn btn-outline-primary mt-3">Update</button>
+                </form>
+            </div>
         </div>
-        <form method="post">
-          <input type="hidden" name="form-name" value="change-password">
-          <button class="btn btn-outline-primary">Change password</button>
-        </form>
-      </div>
-    </div>
-    <!-- END Change password -->
-
-    <!-- Random alias -->
-    <div id="random-alias" class="card">
-      <div class="card-body">
-        <div class="card-title">Aliases</div>
-
-        <div class="mt-3 mb-1">Change the way random aliases are generated by default.</div>
-        <form method="post" action="#random-alias" class="form-inline">
-          <input type="hidden" name="form-name" value="change-alias-generator">
-          <select class="form-control mr-sm-2" name="alias-generator-scheme">
-            <option value="{{ AliasGeneratorEnum.word.value }}"
-                {% if current_user.alias_generator == AliasGeneratorEnum.word.value %} selected {% endif %} >Based on
-              Random {{ AliasGeneratorEnum.word.name.capitalize() }}</option>
-            <option value="{{ AliasGeneratorEnum.uuid.value }}"
-                {% if current_user.alias_generator == AliasGeneratorEnum.uuid.value %} selected {% endif %} >Based
-              on {{ AliasGeneratorEnum.uuid.name.upper() }}</option>
-          </select>
-          <button class="btn btn-outline-primary">Update</button>
-        </form>
-
-        <div class="mt-3 mb-1">Select the default domain for aliases.</div>
-        <form method="post" action="#random-alias" class="form-inline">
-          <input type="hidden" name="form-name" value="change-random-alias-default-domain">
-          <select class="form-control mr-sm-2" name="random-alias-default-domain">
-            {% for is_public, domain in current_user.available_domains_for_random_alias() %}
-              <option value="{{ domain }}"
-                  {% if current_user.default_random_alias_domain() == domain %} selected {% endif %} >
-                {{ domain }} ({% if is_public %} SimpleLogin domain {% else %} your domain {% endif %})
-              </option>
-            {% endfor %}
-          </select>
-          <button class="btn btn-outline-primary">Update</button>
-        </form>
-
-        <div id="random-alias-suffix" class="mt-3 mb-1">Select the default suffix generator for aliases.</div>
-        <form method="post" action="#random-alias-suffix" class="form-inline">
-          <input type="hidden" name="form-name" value="random-alias-suffix">
-          <select class="form-control mr-sm-2" name="random-alias-suffix-generator">
-
-            <option value="0" {% if current_user.random_alias_suffix==0 %} selected {% endif %}>
-              Random word from our dictionary
-            </option>
-            <option value="1" {% if current_user.random_alias_suffix==1 %} selected {% endif %}>
-              Random combination of {{ ALIAS_RAND_SUFFIX_LENGTH }} letter and digits
-            </option>
-          </select>
-          <button class="btn btn-outline-primary">Update</button>
-        </form>
-
-      </div>
-    </div>
-    <!-- END Random alias -->
-
-    <!-- Sender Format -->
-    <div class="card" id="sender-format">
-      <div class="card-body">
-        <div class="card-title">Sender Address Format</div>
-        <div class="mt-1 mb-3">
-          When your alias receives an email, say from: <b>John Wick &lt;john@wick.com&gt;</b>,
-          SimpleLogin forwards it to your mailbox. <br>
-
-          Due to some email constraints, SimpleLogin cannot keep the sender email address
-          in the original form and needs to <b>transform</b> it to one of the formats below.
+        <!-- END Sender Format -->
+
+        <!-- Reverse-alias replacement -->
+        <div class="card" id="reverse-alias-replacement-section">
+            <div class="card-body">
+                <div class="card-title">Reverse Alias Replacement
+                    <div class="badge badge-warning">Experimental</div>
+                </div>
+                <div class="mb-3">
+                    When replying to a forwarded email, the <b>reverse-alias</b> can be automatically included
+                    in the attached message by your email client.
+                    If this option is enabled, SimpleLogin will try to <b>replace</b> the reverse-alias by your contact
+                    email.
+                    <br>
+                </div>
+                <form method="post" action="#reverse-alias-replacement-section">
+                    <input type="hidden" name="form-name" value="replace-ra">
+                    <div class="form-check">
+                        <input type="checkbox" id="replace-ra" name="replace-ra"
+                                {% if current_user.replace_reverse_alias %} checked {% endif %}
+                               class="form-check-input">
+                        <label for="replace-ra">Enable replacing reverse alias</label>
+                    </div>
+                    <button type="submit" class="btn btn-outline-primary">Update</button>
+                </form>
+            </div>
         </div>
-
-        <form method="post" action="#sender-format">
-          <input type="hidden" name="form-name" value="change-sender-format">
-
-          <select class="form-control mr-sm-2" name="sender-format">
-            <option value="{{ SenderFormatEnum.AT.value }}"
-                {% if current_user.sender_format == SenderFormatEnum.AT.value %} selected {% endif %}>
-              John Wick - john at wick.com
-            </option>
-
-            <option value="{{ SenderFormatEnum.A.value }}"
-                {% if current_user.sender_format == SenderFormatEnum.A.value %} selected {% endif %}>
-              John Wick - john(a)wick.com
-            </option>
-
-            <option value="{{ SenderFormatEnum.NAME_ONLY.value }}"
-                {% if current_user.sender_format == SenderFormatEnum.NAME_ONLY.value %} selected {% endif %}>
-              John Wick
-            </option>
-
-            <option value="{{ SenderFormatEnum.AT_ONLY.value }}"
-                {% if current_user.sender_format == SenderFormatEnum.AT_ONLY.value %} selected {% endif %}>
-              john at wick.com
-            </option>
-
-            <option value="{{ SenderFormatEnum.NO_NAME.value }}"
-                {% if current_user.sender_format == SenderFormatEnum.NO_NAME.value %} selected {% endif %}>
-              No Name (i.e. only reverse-alias)
-            </option>
-
-          </select>
-
-          <button class="btn btn-outline-primary mt-3">Update</button>
-        </form>
-      </div>
-    </div>
-    <!-- END Sender Format -->
-
-    <!-- Reverse-alias replacement -->
-    <div class="card" id="reverse-alias-replacement-section">
-      <div class="card-body">
-        <div class="card-title">Reverse Alias Replacement
-          <div class="badge badge-warning">Experimental</div>
+        <!-- END Reverse-alias -->
+
+        <!-- SMTP for Aliases -->
+        <div class="card" id="smtp-for-aliases-section">
+            <div class="card-body">
+                <div class="card-title">SMTP for Aliases
+                    <div class="badge badge-warning">Experimental</div>
+                </div>
+                <div class="mb-3">
+                    This will enable <b>SMTP access for aliases</b>.
+                    If this option is enabled, emails can be sent directly from aliases via SMTP without the need for
+                    creation of reverse-alias.
+                    <br>
+                    Note: After enabling this, you would still need to enable SMTP individually per alias.
+                    <br>
+                    This will also disable receiving via reverse-alias for that particular alias. i.e. Sender's original
+                    address will be displayed in "From:".
+                    <br>
+                </div>
+                <form method="post" action="#smtp-for-aliases-section">
+                    <input type="hidden" name="form-name" value="smtp-for-aliases">
+                    <div class="form-check">
+                        <input type="checkbox" id="smtp-for-aliases" name="smtp-for-aliases"
+                                {% if current_user.enable_SMTP_aliases %} checked {% endif %} class="form-check-input">
+                        <label for="smtp-for-aliases">Enable SMTP for aliases</label>
+                    </div>
+                    <button type="submit" class="btn btn-outline-primary">Update</button>
+                </form>
+            </div>
         </div>
-        <div class="mb-3">
-          When replying to a forwarded email, the <b>reverse-alias</b> can be automatically included
-          in the attached message by your email client.
-          If this option is enabled, SimpleLogin will try to <b>replace</b> the reverse-alias by your contact email.
-          <br>
+        <!-- END SMTP for Aliases -->
+
+        <!-- Sender included in reverse-alias -->
+        <div class="card" id="sender-in-ra">
+            <div class="card-body">
+                <div class="card-title">Include sender address in reverse-alias</div>
+                <div class="mb-3">
+                    By default, the reverse-alias is randomly generated and doesn't contain any information about
+                    the sender.<br>
+
+                    Enabling this option will include the sender address in the reverse-alias. <br>
+
+                    This can be useful if you want to set up email filters based on the reverse-alias.
+                    It will also make the reverse-alias more readable.
+                </div>
+                <form method="post" action="#sender-in-ra">
+                    <input type="hidden" name="form-name" value="sender-in-ra">
+                    <div class="form-check">
+                        <input type="checkbox" id="include-sender-ra" name="enable"
+                                {#                   todo: remove current_user.include_sender_in_reverse_alias is none condition #}
+                                {% if current_user.include_sender_in_reverse_alias is none or current_user.include_sender_in_reverse_alias %}
+                               checked {% endif %} class="form-check-input">
+                        <label for="include-sender-ra">Include sender address in reverse-alias</label>
+                    </div>
+                    <button type="submit" class="btn btn-outline-primary">Update</button>
+                </form>
+            </div>
         </div>
-        <form method="post" action="#reverse-alias-replacement-section">
-          <input type="hidden" name="form-name" value="replace-ra">
-          <div class="form-check">
-            <input type="checkbox" id="replace-ra" name="replace-ra"
-                {% if current_user.replace_reverse_alias %} checked {% endif %} class="form-check-input">
-            <label for="replace-ra">Enable replacing reverse alias</label>
-          </div>
-          <button type="submit" class="btn btn-outline-primary">Update</button>
-        </form>
-      </div>
-    </div>
-    <!-- END Reverse-alias -->
-
-  <!-- SMTP for Aliases -->
-    <div class="card" id="smtp-for-aliases-section">
-      <div class="card-body">
-        <div class="card-title">SMTP for Aliases
-          <div class="badge badge-warning">Experimental</div>
+        <!-- END Reverse-alias -->
+
+        <!-- Always expand alias info -->
+        <div class="card" id="expand-alias-info-section">
+            <div class="card-body">
+                <div class="card-title">Always expand alias info</div>
+                <div class="mb-3">
+                    By default, additional alias info is shown after clicking on the "More" button. <br>
+                    When this option is enabled, alias additional info will always be shown. <br>
+                </div>
+                <form method="post" action="#expand-alias-info-section">
+                    <input type="hidden" name="form-name" value="expand-alias-info">
+                    <div class="form-check">
+                        <input type="checkbox" id="expand-alias-info" name="enable"
+                                {% if current_user.expand_alias_info %} checked {% endif %} class="form-check-input">
+                        <label for="expand-alias-info">Automatically expand alias info</label>
+                    </div>
+                    <button type="submit" class="btn btn-outline-primary">Update</button>
+                </form>
+            </div>
         </div>
-        <div class="mb-3">
-          This will enable <b>SMTP access for aliases</b>.
-          If this option is enabled, emails can be sent directly from aliases via SMTP without the need for creation of reverse-alias.
-          <br>
-            Note: After enabling this, you would still need to enable SMTP individually per alias.
-          <br>
-            This will also disable receiving via reverse-alias for that particular alias. i.e. Sender's original address will be displayed in "From:".
-          <br>
+        <!-- END Always expand alias info -->
+
+        <!-- Include website address in alias -->
+        <div class="card" id="include_website_in_one_click_alias">
+            <div class="card-body">
+                <div class="card-title">
+                    Include website address in one-click alias creation on browser extension
+                </div>
+                <div class="mb-3">
+                    If enabled, the website name will be used as alias prefix
+                    when you create an alias via SimpleLogin browser extension via the email input field <br>
+                    <img src="https://simplelogin.io/images/one-click-alias.gif" class="my-2"
+                         style="max-width: 40%">
+                </div>
+                <form method="post" action="#include_website_in_one_click_alias">
+                    <input type="hidden" name="form-name" value="include_website_in_one_click_alias">
+                    <div class="form-check">
+                        <input type="checkbox" id="include-website-in-alias" name="enable"
+                                {% if current_user.include_website_in_one_click_alias %} checked {% endif %}
+                               class="form-check-input">
+                        <label for="include-website-in-alias">Include website address in alias</label>
+                    </div>
+                    <button type="submit" class="btn btn-outline-primary">Update</button>
+                </form>
+            </div>
         </div>
-        <form method="post" action="#smtp-for-aliases-section">
-          <input type="hidden" name="form-name" value="smtp-for-aliases">
-          <div class="form-check">
-            <input type="checkbox" id="smtp-for-aliases" name="smtp-for-aliases"
-                {% if current_user.enable_SMTP_aliases %} checked {% endif %} class="form-check-input">
-            <label for="smtp-for-aliases">Enable SMTP for aliases</label>
-          </div>
-          <button type="submit" class="btn btn-outline-primary">Update</button>
-        </form>
-      </div>
-    </div>
-    <!-- END SMTP for Aliases -->
-
-    <!-- Sender included in reverse-alias -->
-    <div class="card" id="sender-in-ra">
-      <div class="card-body">
-        <div class="card-title">Include sender address in reverse-alias</div>
-        <div class="mb-3">
-          By default, the reverse-alias is randomly generated and doesn't contain any information about
-          the sender.<br>
-
-          Enabling this option will include the sender address in the reverse-alias. <br>
-
-          This can be useful if you want to set up email filters based on the reverse-alias.
-          It will also make the reverse-alias more readable.
+        <!-- END Include website address in alias -->
+
+        <!-- Ignore Loop Email -->
+        {#    <div class="card" id="ignore-loop-email-section">#}
+        {#      <div class="card-body">#}
+        {#        <div class="card-title">Ignore Loop Emails</div>#}
+        {#        <div class="mb-3">#}
+        {#          On some email clients, "Reply All" automatically includes your alias that#}
+        {#          would send the same email to your mailbox.#}
+        {#          <br>#}
+        {#          You can disable these "loop" emails by enabling this option.#}
+        {#        </div>#}
+        {#        <form method="post" action="#ignore-loop-email-section">#}
+        {#          <input type="hidden" name="form-name" value="ignore-loop-email">#}
+        {#          <div class="form-check">#}
+        {#            <input type="checkbox" id="ignore-loop-email" name="enable"#}
+        {#                {% if current_user.ignore_loop_email %} checked {% endif %} class="form-check-input">#}
+        {#            <label for="ignore-loop-email">Ignore Loop Emails</label>#}
+        {#          </div>#}
+        {#          <button type="submit" class="btn btn-outline-primary">Update</button>#}
+        {#        </form>#}
+        {#      </div>#}
+        {#    </div>#}
+        <!-- END Ignore Loop Email -->
+
+        <!-- One-click subscribe -->
+        <div class="card" id="one-click-unsubscribe-section">
+            <div class="card-body">
+                <div class="card-title">One-click unsubscribe</div>
+                <div class="mb-3">
+                    On email clients that support the
+                    <a href="https://simplelogin.io/docs/getting-started/one-click-unsubscribe/">One-click
+                        unsubscribe</a> button,
+                    clicking on it will disable the alias that receives the emails.
+                    <br>
+                    You can choose to block the sender instead of disabling the alias.
+                </div>
+                <form method="post" action="#one-click-unsubscribe-section">
+                    <input type="hidden" name="form-name" value="one-click-unsubscribe">
+                    <div class="form-check">
+                        <input type="checkbox" id="one-click-unsubscribe" name="enable"
+                                {% if current_user.one_click_unsubscribe_block_sender %} checked {% endif %}
+                               class="form-check-input">
+                        <label for="one-click-unsubscribe">Block sender instead</label>
+                    </div>
+                    <button type="submit" class="btn btn-outline-primary">Update</button>
+                </form>
+            </div>
         </div>
-        <form method="post" action="#sender-in-ra">
-          <input type="hidden" name="form-name" value="sender-in-ra">
-          <div class="form-check">
-            <input type="checkbox" id="include-sender-ra" name="enable"
-                {#                   todo: remove current_user.include_sender_in_reverse_alias is none condition #}
-                {% if current_user.include_sender_in_reverse_alias is none or current_user.include_sender_in_reverse_alias %}
-                   checked {% endif %} class="form-check-input">
-            <label for="include-sender-ra">Include sender address in reverse-alias</label>
-          </div>
-          <button type="submit" class="btn btn-outline-primary">Update</button>
-        </form>
-      </div>
-    </div>
-    <!-- END Reverse-alias -->
-
-    <!-- Always expand alias info -->
-    <div class="card" id="expand-alias-info-section">
-      <div class="card-body">
-        <div class="card-title">Always expand alias info</div>
-        <div class="mb-3">
-          By default, additional alias info is shown after clicking on the "More" button. <br>
-          When this option is enabled, alias additional info will always be shown. <br>
+        <!-- END One-click subscribe -->
+
+        <div class="card">
+            <div class="card-body">
+                <div class="card-title">Quarantine</div>
+                <div class="mb-3">
+                    When an email sent to your alias is classified as spam or refused by your email provider,
+                    it usually means your alias has been leaked to a spammer. <br>
+                    In this case SimpleLogin will <b>keep</b> a copy of this email (so it isn't lost)
+                    and notify you so you can take a look at its content and take appropriate actions. <br>
+
+                    The emails are deleted in 7 days.
+                    This is an exceptional case where SimpleLogin stores the email.
+                </div>
+                <a href="{{ url_for('dashboard.refused_email_route') }}" class="btn btn-outline-primary">
+                    See refused emails
+                </a>
+            </div>
         </div>
-        <form method="post" action="#expand-alias-info-section">
-          <input type="hidden" name="form-name" value="expand-alias-info">
-          <div class="form-check">
-            <input type="checkbox" id="expand-alias-info" name="enable"
-                {% if current_user.expand_alias_info %} checked {% endif %} class="form-check-input">
-            <label for="expand-alias-info">Automatically expand alias info</label>
-          </div>
-          <button type="submit" class="btn btn-outline-primary">Update</button>
-        </form>
-      </div>
-    </div>
-    <!-- END Always expand alias info -->
 
-    <!-- Include website address in alias -->
-    <div class="card" id="include_website_in_one_click_alias">
-      <div class="card-body">
-        <div class="card-title">
-          Include website address in one-click alias creation on browser extension
-        </div>
-        <div class="mb-3">
-          If enabled, the website name will be used as alias prefix
-          when you create an alias via SimpleLogin browser extension via the email input field <br>
-          <img src="https://simplelogin.io/images/one-click-alias.gif" class="my-2"
-               style="max-width: 40%">
-        </div>
-        <form method="post" action="#include_website_in_one_click_alias">
-          <input type="hidden" name="form-name" value="include_website_in_one_click_alias">
-          <div class="form-check">
-            <input type="checkbox" id="include-website-in-alias" name="enable"
-                {% if current_user.include_website_in_one_click_alias %} checked {% endif %} class="form-check-input">
-            <label for="include-website-in-alias">Include website address in alias</label>
-          </div>
-          <button type="submit" class="btn btn-outline-primary">Update</button>
-        </form>
-      </div>
-    </div>
-    <!-- END Include website address in alias -->
-
-    <!-- Ignore Loop Email -->
-    {#    <div class="card" id="ignore-loop-email-section">#}
-    {#      <div class="card-body">#}
-    {#        <div class="card-title">Ignore Loop Emails</div>#}
-    {#        <div class="mb-3">#}
-    {#          On some email clients, "Reply All" automatically includes your alias that#}
-    {#          would send the same email to your mailbox.#}
-    {#          <br>#}
-    {#          You can disable these "loop" emails by enabling this option.#}
-    {#        </div>#}
-    {#        <form method="post" action="#ignore-loop-email-section">#}
-    {#          <input type="hidden" name="form-name" value="ignore-loop-email">#}
-    {#          <div class="form-check">#}
-    {#            <input type="checkbox" id="ignore-loop-email" name="enable"#}
-    {#                {% if current_user.ignore_loop_email %} checked {% endif %} class="form-check-input">#}
-    {#            <label for="ignore-loop-email">Ignore Loop Emails</label>#}
-    {#          </div>#}
-    {#          <button type="submit" class="btn btn-outline-primary">Update</button>#}
-    {#        </form>#}
-    {#      </div>#}
-    {#    </div>#}
-    <!-- END Ignore Loop Email -->
-
-    <!-- One-click subscribe -->
-    <div class="card" id="one-click-unsubscribe-section">
-      <div class="card-body">
-        <div class="card-title">One-click unsubscribe</div>
-        <div class="mb-3">
-          On email clients that support the
-          <a href="https://simplelogin.io/docs/getting-started/one-click-unsubscribe/">One-click unsubscribe</a> button,
-          clicking on it will disable the alias that receives the emails.
-          <br>
-          You can choose to block the sender instead of disabling the alias.
-        </div>
-        <form method="post" action="#one-click-unsubscribe-section">
-          <input type="hidden" name="form-name" value="one-click-unsubscribe">
-          <div class="form-check">
-            <input type="checkbox" id="one-click-unsubscribe" name="enable"
-                {% if current_user.one_click_unsubscribe_block_sender %} checked {% endif %} class="form-check-input">
-            <label for="one-click-unsubscribe">Block sender instead</label>
-          </div>
-          <button type="submit" class="btn btn-outline-primary">Update</button>
-        </form>
-      </div>
-    </div>
-    <!-- END One-click subscribe -->
-
-    <div class="card">
-      <div class="card-body">
-        <div class="card-title">Quarantine</div>
-        <div class="mb-3">
-          When an email sent to your alias is classified as spam or refused by your email provider,
-          it usually means your alias has been leaked to a spammer. <br>
-          In this case SimpleLogin will <b>keep</b> a copy of this email (so it isn't lost)
-          and notify you so you can take a look at its content and take appropriate actions. <br>
-
-          The emails are deleted in 7 days.
-          This is an exceptional case where SimpleLogin stores the email.
+        <div class="card" id="blocked-behaviour">
+            <div class="card-body">
+                <div class="card-title">Disabled alias/Blocked contact</div>
+                <div class="mb-3">
+                    When an email is sent to a <b>disabled</b> alias or sent from a <b>blocked</b> contact, you can
+                    decide what response the sender should see. <br>
+                    <b>Ignore</b> means they will see the message as delivered, but SimpleLogin won't actually forward
+                    it to you.
+                    This is the default option as you can start receiving the emails again
+                    by re-enabling the alias or unblocking a contact.<br>
+                    <b>Reject</b> means SimpleLogin will tell them that the alias does not exist. <br>
+                </div>
+                <form method="post" action="#blocked-behaviour" class="form-inline">
+                    <input type="hidden" name="form-name" value="change-blocked-behaviour">
+
+                    <select class="form-control mr-sm-2" name="blocked-behaviour">
+                        <option value="{{ BlockBehaviourEnum.return_2xx.value }}"
+                                {% if current_user.block_behaviour.value == BlockBehaviourEnum.return_2xx.value %}
+                                selected="selected" {% endif %}>
+                            Ignore (the sender will see the email as delivered, but you won't receive anything).
+                        </option>
+                        <option value="{{ BlockBehaviourEnum.return_5xx.value }}"
+                                {% if current_user.block_behaviour.value == BlockBehaviourEnum.return_5xx.value %}
+                                selected="selected" {% endif %}>
+                            Reject (the sender will be told that your alias does not exist).
+                        </option>
+
+                    </select>
+
+                    <button class="btn btn-outline-primary">Update</button>
+                </form>
+            </div>
         </div>
-        <a href="{{ url_for('dashboard.refused_email_route') }}" class="btn btn-outline-primary">
-          See refused emails
-        </a>
-      </div>
-    </div>
 
-    <div class="card" id="blocked-behaviour">
-      <div class="card-body">
-        <div class="card-title">Disabled alias/Blocked contact</div>
-        <div class="mb-3">
-          When an email is sent to a <b>disabled</b> alias or sent from a <b>blocked</b> contact, you can decide what response the sender should see. <br>
-          <b>Ignore</b> means they will see the message as delivered, but SimpleLogin won't actually forward it to you.
-          This is the default option as you can start receiving the emails again
-          by re-enabling the alias or unblocking a contact.<br>
-          <b>Reject</b> means SimpleLogin will tell them that the alias does not exist. <br>
+        <div class="card" id="sender-header">
+            <div class="card-body">
+                <div class="card-title">Include original sender in email headers
+                </div>
+                <div class="mb-3">
+                    SimpleLogin forwards emails to your mailbox from the <b>reverse-alias</b> and not from the <b>original</b>
+                    sender address. <br>
+                    If this option is enabled, the original sender addresses is stored in the email header <b>X-SimpleLogin-Envelope-From</b>.
+                    You can choose to display this header in your email client. <br>
+                    As email headers aren't encrypted, your mailbox service can know the sender address via this header.
+                </div>
+                <form method="post" action="#sender-header">
+                    <input type="hidden" name="form-name" value="sender-header">
+
+                    <div class="form-check">
+                        <input type="checkbox" id="include-sender-header" name="enable"
+                                {% if current_user.include_header_email_header %} checked {% endif %}
+                               class="form-check-input">
+                        <label for="include-sender-header">Include sender address in email headers</label>
+                    </div>
+
+                    <button type="submit" class="btn btn-outline-primary">Update</button>
+                </form>
+            </div>
         </div>
-        <form method="post" action="#blocked-behaviour" class="form-inline">
-          <input type="hidden" name="form-name" value="change-blocked-behaviour">
-
-          <select class="form-control mr-sm-2" name="blocked-behaviour">
-              <option value="{{ BlockBehaviourEnum.return_2xx.value }}"
-                      {% if current_user.block_behaviour.value == BlockBehaviourEnum.return_2xx.value %} selected="selected" {% endif %}>
-                  Ignore (the sender will see the email as delivered, but you won't receive anything).
-              </option>
-              <option value="{{ BlockBehaviourEnum.return_5xx.value }}"
-                      {% if current_user.block_behaviour.value == BlockBehaviourEnum.return_5xx.value %} selected="selected" {% endif %}>
-                  Reject (the sender will be told that your alias does not exist).
-              </option>
-
-          </select>
-
-          <button class="btn btn-outline-primary">Update</button>
-        </form>
-      </div>
-    </div>
 
-    <div class="card" id="sender-header">
-      <div class="card-body">
-        <div class="card-title">Include original sender in email headers
-        </div>
-        <div class="mb-3">
-          SimpleLogin forwards emails to your mailbox from the <b>reverse-alias</b> and not from the <b>original</b> sender address. <br>
-          If this option is enabled, the original sender addresses is stored in the email header <b>X-SimpleLogin-Envelope-From</b>.
-          You can choose to display this header in your email client. <br>
-          As email headers aren't encrypted, your mailbox service can know the sender address via this header.
-        </div>
-        <form method="post" action="#sender-header">
-          <input type="hidden" name="form-name" value="sender-header">
-
-          <div class="form-check">
-            <input type="checkbox" id="include-sender-header" name="enable"
-                {% if current_user.include_header_email_header %} checked {% endif %} class="form-check-input">
-            <label for="include-sender-header">Include sender address in email headers</label>
-          </div>
-
-          <button type="submit" class="btn btn-outline-primary">Update</button>
-        </form>
-      </div>
-    </div>
+        <div class="card">
+            <div class="card-body">
+                <div class="card-title">Alias Import</div>
+                <div class="mb-3">
+                    You can import your aliases created on other platforms into SimpleLogin.
+                </div>
+                <a href="{{ url_for('dashboard.batch_import_route') }}" class="btn btn-outline-primary">
+                    Batch Import
+                </a>
 
-    <div class="card">
-      <div class="card-body">
-        <div class="card-title">Alias Import</div>
-        <div class="mb-3">
-          You can import your aliases created on other platforms into SimpleLogin.
+            </div>
         </div>
-        <a href="{{ url_for('dashboard.batch_import_route') }}" class="btn btn-outline-primary">
-          Batch Import
-        </a>
 
-      </div>
-    </div>
+        <div class="card">
+            <div class="card-body">
+                <div class="card-title">Data Export</div>
+                <div class="mb-3">
+                    You can download all aliases you have created on SimpleLogin along with other data.
+                </div>
+
+                <div class="d-flex">
+                    <div>
+                        <form method="post">
+                            <input type="hidden" name="form-name" value="export-data">
+                            <button class="btn btn-outline-info">Export Data</button>
+                        </form>
+                    </div>
+                    <div class="ml-5">
+                        <form method="post">
+                            <input type="hidden" name="form-name" value="export-alias">
+                            <button class="btn btn-outline-primary">Export Aliases</button>
+                        </form>
+                    </div>
+                </div>
 
-    <div class="card">
-      <div class="card-body">
-        <div class="card-title">Data Export</div>
-        <div class="mb-3">
-          You can download all aliases you have created on SimpleLogin along with other data.
-        </div>
 
-        <div class="d-flex">
-          <div>
-            <form method="post">
-              <input type="hidden" name="form-name" value="export-data">
-              <button class="btn btn-outline-info">Export Data</button>
-            </form>
-          </div>
-          <div class="ml-5">
-            <form method="post">
-              <input type="hidden" name="form-name" value="export-alias">
-              <button class="btn btn-outline-primary">Export Aliases</button>
-            </form>
-          </div>
+            </div>
         </div>
 
+        <div class="card">
+            <div class="card-body">
+                <div class="card-title">Account Deletion</div>
+                <div class="mb-3">
+                    If SimpleLogin isn't the right fit for you, you can simply delete your account.
+                </div>
 
-      </div>
-    </div>
-
-    <div class="card">
-      <div class="card-body">
-        <div class="card-title">Account Deletion</div>
-        <div class="mb-3">
-          If SimpleLogin isn't the right fit for you, you can simply delete your account.
+                <a href="{{ url_for('dashboard.delete_account') }}" class="btn btn-outline-danger">Delete account</a>
+            </div>
         </div>
 
-        <a href="{{ url_for('dashboard.delete_account') }}" class="btn btn-outline-danger">Delete account</a>
-      </div>
     </div>
 
-  </div>
-
 {% endblock %}
 
 

From 25a56ec7fc910b2bb9b6ab819b1cd13a67192f2c Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Sat, 2 Apr 2022 22:53:09 -0400
Subject: [PATCH 26/36] Add auto-generated migrations

---
 .../versions/2022_040221_b26e402d2e0e_.py     | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 migrations/versions/2022_040221_b26e402d2e0e_.py

diff --git a/migrations/versions/2022_040221_b26e402d2e0e_.py b/migrations/versions/2022_040221_b26e402d2e0e_.py
new file mode 100644
index 000000000..7e77b07d6
--- /dev/null
+++ b/migrations/versions/2022_040221_b26e402d2e0e_.py
@@ -0,0 +1,58 @@
+"""empty message
+
+Revision ID: b26e402d2e0e
+Revises: b500363567e3
+Create Date: 2022-04-02 21:47:30.243843
+
+"""
+import sqlalchemy_utils
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = 'b26e402d2e0e'
+down_revision = 'b500363567e3'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('SMTP_credentials',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('created_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=False),
+    sa.Column('updated_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=True),
+    sa.Column('alias_id', sa.Integer(), nullable=False),
+    sa.Column('password', sa.String(length=128), nullable=False),
+    sa.ForeignKeyConstraint(['alias_id'], ['alias.id'], ondelete='cascade'),
+    sa.PrimaryKeyConstraint('id'),
+    sa.UniqueConstraint('alias_id', name='uq_alias')
+    )
+    op.create_index(op.f('ix_SMTP_credentials_alias_id'), 'SMTP_credentials', ['alias_id'], unique=True)
+    op.alter_column('admin_audit_log', 'data',
+               existing_type=postgresql.JSONB(astext_type=sa.Text()),
+               nullable=True)
+    op.drop_index('admin_audit_log_admin_user_id_idx', table_name='admin_audit_log')
+    op.drop_constraint('admin_audit_log_admin_user_id_fkey', 'admin_audit_log', type_='foreignkey')
+    op.create_foreign_key(None, 'admin_audit_log', 'users', ['admin_user_id'], ['id'])
+    op.add_column('alias', sa.Column('enable_SMTP', sa.Boolean(), server_default='0', nullable=False))
+    op.add_column('email_log', sa.Column('is_SMTP', sa.Boolean(), nullable=False))
+    op.add_column('users', sa.Column('enable_SMTP_aliases', sa.Boolean(), server_default='0', nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('users', 'enable_SMTP_aliases')
+    op.drop_column('email_log', 'is_SMTP')
+    op.drop_column('alias', 'enable_SMTP')
+    op.drop_constraint(None, 'admin_audit_log', type_='foreignkey')
+    op.create_foreign_key('admin_audit_log_admin_user_id_fkey', 'admin_audit_log', 'users', ['admin_user_id'], ['id'], ondelete='CASCADE')
+    op.create_index('admin_audit_log_admin_user_id_idx', 'admin_audit_log', ['admin_user_id'], unique=False)
+    op.alter_column('admin_audit_log', 'data',
+               existing_type=postgresql.JSONB(astext_type=sa.Text()),
+               nullable=False)
+    op.drop_index(op.f('ix_SMTP_credentials_alias_id'), table_name='SMTP_credentials')
+    op.drop_table('SMTP_credentials')
+    # ### end Alembic commands ###

From a00fc102fd8318442bd845d6702fc16a32e261b1 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Sat, 2 Apr 2022 23:26:13 -0400
Subject: [PATCH 27/36] Get alias domain by get_email_domain_part in
 SMTP_handler

Also:
- remove should_ignore_bounce
- Remove region comment
- move "user.disabled" higher to avoid the unnecessary contact creation
- Remove unnecessary parenthesis
---
 SMTP_handler.py | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/SMTP_handler.py b/SMTP_handler.py
index ae47ce254..b877ab20b 100644
--- a/SMTP_handler.py
+++ b/SMTP_handler.py
@@ -73,14 +73,23 @@ def handle_SMTP(envelope, msg: Message, rcpt_to: str) -> (bool, str):
     """
     website_email = rcpt_to
 
-    # region Create variables For Logging Purpose
     alias_address: str = envelope.mail_from
     alias = Alias.get_by(email=alias_address)
     if not alias:
         LOG.e("Alias: %s isn't known", alias_address)
         return False, status.E503
 
-    alias_domain = alias_address[alias_address.find("@") + 1 :]
+    user = alias.user
+    if user.disabled:
+        LOG.e(
+            "User %s disabled, disable sending emails from %s to %s",
+            user,
+            alias,
+            website_email,
+        )
+        return [(False, status.E504)]
+
+    alias_domain = get_email_domain_part(alias_address)
 
     # Sanity check: verify alias domain is managed by SimpleLogin
     # scenario: a user have removed a domain but due to a bug, the aliases are still there
@@ -99,23 +108,9 @@ def handle_SMTP(envelope, msg: Message, rcpt_to: str) -> (bool, str):
         alias = Alias.get_by(email=alias_address)
         if not alias:
             LOG.i("Alias %s was deleted in the meantime", alias_address)
-            if should_ignore_bounce(envelope.mail_from):
-                return [(True, status.E207)]
-            else:
-                return [(False, status.E515)]
+            return [(False, status.E515)]
 
-    user = alias.user
     mailbox = Mailbox.get_by(id=alias.mailbox_id)
-    # endregion
-
-    if user.disabled:
-        LOG.e(
-            "User %s disabled, disable sending emails from %s to %s",
-            user,
-            alias,
-            contact,
-        )
-        return [(False, status.E504)]
 
     email_log = EmailLog.create(
         contact_id=contact.id,
@@ -297,8 +292,8 @@ def __call__(self, server, session, envelope, mechanism, auth_data):
             LOG.e("Incorrect Format for Credentials")
             return self.fail_nothandled(status.E501)
 
-        username = (auth_data.login).decode("utf-8")
-        password = (auth_data.password).decode("utf-8")
+        username = auth_data.login.decode("utf-8")
+        password = auth_data.password.decode("utf-8")
 
         alias = Alias.get_by(email=username)
         if not alias:
@@ -401,7 +396,7 @@ def handle(envelope: Envelope, msg: Message) -> str:
 
 class SMTPHandler:
     async def handle_DATA(self, server, session, envelope: Envelope):
-        username = (session.auth_data.login).decode("utf-8")
+        username = session.auth_data.login.decode("utf-8")
         msg = email.message_from_bytes(envelope.original_content)
         try:
             ret = self.check_and_handle(envelope, msg, username)

From 66b31bb685c2276ffd93a234c602afd3e1c5c20f Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Sat, 2 Apr 2022 23:47:47 -0400
Subject: [PATCH 28/36] Add "Send a test email via SMTP" in CONTRIBUTING

---
 CONTRIBUTING.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 33d901d5b..9e316c20d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -174,4 +174,11 @@ python email_handler.py
 swaks --to e1@sl.local --from hey@google.com --server 127.0.0.1:20381
 ```
 
+4) Send a test email via SMTP 
+   * Make sure SMTP is enabled in settings and password is generated for the alias
+
+```bash
+swaks --to hey@google.com --from e1@sl.local --server 127.0.0.1:465 --tls-on-connect --auth --auth-user e1@sl.local
+```
+
 Now open http://localhost:1080/ (or http://localhost:1080/ for MailHog), you should see the forwarded email.
\ No newline at end of file

From 82da27b49e114556e03494f7388870d475402a72 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Sat, 2 Apr 2022 22:52:27 -0400
Subject: [PATCH 29/36] Revert "ReFormat index and setting htmls using Pycharm"

This reverts commit aec499e6bfdfe4612008064c056da3dbc205b05e.
---
 templates/dashboard/index.html   | 1245 +++++++++++++++---------------
 templates/dashboard/setting.html | 1184 ++++++++++++++--------------
 2 files changed, 1197 insertions(+), 1232 deletions(-)

diff --git a/templates/dashboard/index.html b/templates/dashboard/index.html
index d8d5a0831..fc40d3965 100644
--- a/templates/dashboard/index.html
+++ b/templates/dashboard/index.html
@@ -3,706 +3,697 @@
 {% set active_page = "dashboard" %}
 
 {% block head %}
-    <style>
-        .alias-activity {
-            font-weight: 600;
-            font-size: 14px;
-        }
-
-        .btn-group-border-left {
-            border-left: 1px #fbfbfb4f solid;
-        }
-
-        em {
-            padding: 0px;
-        }
-
-        {#CSS to change collapse button display from https://stackoverflow.com/a/31967516/1428034#}
-        [data-toggle="collapse"].collapsed .if-not-collapsed {
-            display: none;
-        }
-
-        [data-toggle="collapse"]:not(.collapsed) .if-collapsed {
-            display: none;
-        }
-
-    </style>
+  <style>
+      .alias-activity {
+          font-weight: 600;
+          font-size: 14px;
+      }
+
+      .btn-group-border-left {
+          border-left: 1px #fbfbfb4f solid;
+      }
+
+      em {
+          padding: 0px;
+      }
+
+      {#CSS to change collapse button display from https://stackoverflow.com/a/31967516/1428034#}
+      [data-toggle="collapse"].collapsed .if-not-collapsed {
+          display: none;
+      }
+
+      [data-toggle="collapse"]:not(.collapsed) .if-collapsed {
+          display: none;
+      }
+
+  </style>
 {% endblock %}
 
 {% block title %}
-    Alias
+  Alias
 {% endblock %}
 
 {% block default_content %}
-    <!-- Global Stats -->
-    <div class="row">
-        <div class="col-12 col-md-6 col-lg-3">
-            <div class="card">
-                <div class="card-body">
-                    <div class="d-flex align-items-center">
-                        <div class="subheader">
-                            Aliases
-                        </div>
-                        <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
-                            All time
-                        </div>
-                    </div>
-                    <div class="h1 m-0">{{ stats.nb_alias }}</div>
-                </div>
+  <!-- Global Stats -->
+  <div class="row">
+    <div class="col-12 col-md-6 col-lg-3">
+      <div class="card">
+        <div class="card-body">
+          <div class="d-flex align-items-center">
+            <div class="subheader">
+              Aliases
+            </div>
+            <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
+              All time
             </div>
+          </div>
+          <div class="h1 m-0">{{ stats.nb_alias }}</div>
         </div>
+      </div>
+    </div>
 
-        <div class="col-12 col-md-6 col-lg-3">
-            <div class="card">
-                <div class="card-body">
-                    <div class="d-flex align-items-center">
-                        <div class="subheader">
-                            Forwards
-                        </div>
-                        <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
-                            Last 14 days
-                        </div>
-                    </div>
-                    <div class="h1 m-0">{{ stats.nb_forward }}</div>
-                </div>
+    <div class="col-12 col-md-6 col-lg-3">
+      <div class="card">
+        <div class="card-body">
+          <div class="d-flex align-items-center">
+            <div class="subheader">
+              Forwards
             </div>
+            <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
+              Last 14 days
+            </div>
+          </div>
+          <div class="h1 m-0">{{ stats.nb_forward }}</div>
         </div>
+      </div>
+    </div>
 
-        <div class="col-12 col-md-6 col-lg-3">
-            <div class="card">
-                <div class="card-body">
-                    <div class="d-flex align-items-center">
-                        <div class="subheader">
-                            Replies/Sent
-                        </div>
-                        <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
-                            Last 14 days
-                        </div>
-                    </div>
-                    <div class="h1 m-0">{{ stats.nb_reply }}</div>
-                </div>
+    <div class="col-12 col-md-6 col-lg-3">
+      <div class="card">
+        <div class="card-body">
+          <div class="d-flex align-items-center">
+            <div class="subheader">
+              Replies/Sent
             </div>
+            <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
+              Last 14 days
+            </div>
+          </div>
+          <div class="h1 m-0">{{ stats.nb_reply }}</div>
         </div>
+      </div>
+    </div>
 
-        <div class="col-12 col-md-6 col-lg-3">
-            <div class="card">
-                <div class="card-body">
-                    <div class="d-flex align-items-center">
-                        <div class="subheader">
-                            Blocks
-                        </div>
-                        <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
-                            Last 14 days
-                        </div>
-                    </div>
-                    <div class="h1 m-0">{{ stats.nb_block }}</div>
-                </div>
+    <div class="col-12 col-md-6 col-lg-3">
+      <div class="card">
+        <div class="card-body">
+          <div class="d-flex align-items-center">
+            <div class="subheader">
+              Blocks
+            </div>
+            <div class="text-muted" style="order: 2; margin-left: auto; font-size: .8rem">
+              Last 14 days
             </div>
+          </div>
+          <div class="h1 m-0">{{ stats.nb_block }}</div>
         </div>
+      </div>
     </div>
-    <!-- END Global Stats -->
-
-    <!-- Controls: buttons & search -->
-    <div id="filter-app">
-        <div class="row mb-3">
-            <div class="col d-flex">
-                <div>
-                    <div class="btn-group" role="group">
-                        <form method="post">
-                            <input type="hidden" name="form-name" value="create-custom-email">
-                            <button data-toggle="tooltip"
-                                    title="Create a custom alias"
-                                    class="btn btn-primary mr-2"><i class="fa fa-plus"></i> New Custom Alias
-                            </button>
-                        </form>
-                        <div class="btn-group" role="group">
-                            <form method="post">
-                                <input type="hidden" name="form-name" value="create-random-email">
-                                <button data-toggle="tooltip"
-                                        title="Create a totally random alias"
-                                        class="btn btn-success"><i class="fa fa-random"></i> Random Alias
-                                </button>
-                            </form>
-                            <button id="btnGroupDrop1" type="button"
-                                    class="btn btn-success dropdown-toggle btn-group-border-left"
-                                    data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            </button>
-                            <div class="dropdown-menu dropdown-menu-right border-left" aria-labelledby="btnGroupDrop1">
-                                <div class="">
-                                    <form method="post">
-                                        <input type="hidden" name="form-name" value="create-random-email">
-                                        <input type="hidden" name="generator_scheme"
-                                               value="{{ AliasGeneratorEnum.word.value }}">
-                                        <button class="dropdown-item">By Random Words</button>
-                                    </form>
-                                </div>
-                                <div class="">
-                                    <form method="post">
-                                        <input type="hidden" name="form-name" value="create-random-email">
-                                        <input type="hidden" name="generator_scheme"
-                                               value="{{ AliasGeneratorEnum.uuid.value }}">
-                                        <button class="dropdown-item">By UUID</button>
-                                    </form>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
+  </div>
+  <!-- END Global Stats -->
+
+  <!-- Controls: buttons & search -->
+  <div id="filter-app">
+    <div class="row mb-3">
+      <div class="col d-flex">
+        <div>
+          <div class="btn-group" role="group">
+            <form method="post">
+              <input type="hidden" name="form-name" value="create-custom-email">
+              <button data-toggle="tooltip"
+                      title="Create a custom alias"
+                      class="btn btn-primary mr-2"><i class="fa fa-plus"></i> New Custom Alias
+              </button>
+            </form>
+            <div class="btn-group" role="group">
+              <form method="post">
+                <input type="hidden" name="form-name" value="create-random-email">
+                <button data-toggle="tooltip"
+                        title="Create a totally random alias"
+                        class="btn btn-success"><i class="fa fa-random"></i> Random Alias
+                </button>
+              </form>
+              <button id="btnGroupDrop1" type="button" class="btn btn-success dropdown-toggle btn-group-border-left"
+                      data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+              </button>
+              <div class="dropdown-menu dropdown-menu-right border-left" aria-labelledby="btnGroupDrop1">
+                <div class="">
+                  <form method="post">
+                    <input type="hidden" name="form-name" value="create-random-email">
+                    <input type="hidden" name="generator_scheme" value="{{ AliasGeneratorEnum.word.value }}">
+                    <button class="dropdown-item">By Random Words</button>
+                  </form>
                 </div>
-
-                <div class="" style="margin-left: auto">
-                    <div class="btn-group">
-                        <a v-if="!showFilter" @click="toggleFilter()" class="btn btn-outline-secondary">
-                            <i class="fe fe-chevrons-down"></i> Filters
-                        </a>
-                    </div>
+                <div class="">
+                  <form method="post">
+                    <input type="hidden" name="form-name" value="create-random-email">
+                    <input type="hidden" name="generator_scheme" value="{{ AliasGeneratorEnum.uuid.value }}">
+                    <button class="dropdown-item">By UUID</button>
+                  </form>
                 </div>
+              </div>
             </div>
+          </div>
         </div>
 
-        <div class="row mb-2" v-if="showFilter" id="filter-control">
-            <!-- Filter Control -->
-            <div class="col d-flex">
-                <form method="get" class="form-inline">
-                    <select name="sort"
-                            onchange="this.form.submit()"
-                            class="form-control mr-3 shadow">
-                        <option value="" {% if sort == "" %} selected {% endif %}>
-                            Sort by most recent activity
-                        </option>
-                        <option value="old2new" {% if sort == "old2new" %} selected {% endif %}>
-                            Alias Old-Recent
-                        </option>
-                        <option value="new2old" {% if sort == "new2old" %} selected {% endif %}>
-                            Alias Recent-Old
-                        </option>
-                        <option value="a2z" {% if sort == "a2z" %} selected {% endif %}>
-                            Alias A-Z
-                        </option>
-                        <option value="z2a" {% if sort == "z2a" %} selected {% endif %}>
-                            Alias Z-A
-                        </option>
-                    </select>
-
-                    <select name="filter"
-                            onchange="this.form.submit()"
-                            class="form-control mr-3 shadow"
-                            style="max-width: 200px">
-                        <option value="" {% if filter == "" %} selected {% endif %}>
-                            All Aliases
-                        </option>
-                        <option value="pinned" {% if filter == "pinned" %} selected {% endif %}>
-                            Pinned Aliases
-                        </option>
-
-                        {% if current_user.enable_SMTP_aliases %}
-                            <option value="enable_SMTP" {% if filter == "enable_SMTP" %} selected {% endif %}>
-                                Only SMTP Enabled Aliases
-                            </option>
-                        {% endif %}
-
-                        <option value="enabled" {% if filter == "enabled" %} selected {% endif %}>
-                            Only Enabled Aliases
-                        </option>
-                        <option value="disabled" {% if filter == "disabled" %} selected {% endif %}>
-                            Only Disabled Aliases
-                        </option>
-                        <option value="hibp" {% if filter == "hibp" %} selected {% endif %}>
-                            Only Aliases Found In Data Breaches
-                        </option>
-                        {% for mailbox in current_user.mailboxes() %}
-                            <option value="mailbox:{{ mailbox.id }}" {% if filter == "mailbox:" ~ mailbox.id %}
-                                    selected {% endif %}>
-                                {{ mailbox.email }}'s aliases
-                            </option>
-                        {% endfor %}
-
-                        {% for directory in current_user.directories %}
-                            <option value="directory:{{ directory.id }}" {% if filter == "directory:" ~ directory.id %}
-                                    selected {% endif %}>
-                                Directory <b>{{ directory.name }}</b> aliases
-                            </option>
-                        {% endfor %}
-
-                    </select>
-
-                    <input type="search" name="query" placeholder="Enter to search for alias"
-                           class="form-control shadow mr-2"
-                           style="max-width: 15em"
-                           value="{{ query }}">
-
-
-                </form>
-
-                <div style="margin-left: auto">
-
-                    {% if query or sort or filter %}
-                        <a href="{{ url_for('dashboard.index') }}"
-                           class="btn btn-outline-secondary">Reset</a>
-                    {% endif %}
-
-                    <a v-if="showFilter" @click="toggleFilter()" class="btn btn-outline-secondary">
-                        <i class="fe fe-chevrons-up"></i>
-                    </a>
-                </div>
-            </div>
+        <div class="" style="margin-left: auto">
+          <div class="btn-group">
+            <a v-if="!showFilter" @click="toggleFilter()" class="btn btn-outline-secondary">
+              <i class="fe fe-chevrons-down"></i> Filters
+            </a>
+          </div>
         </div>
+      </div>
     </div>
-    <!-- END Controls: buttons & search -->
 
-    <!-- Alias list -->
-    <div class="row">
-        {% for alias_info in alias_infos %}
-            {% set alias = alias_info.alias %}
-
-            <div class="col-12 col-lg-6" id="alias-container-{{ alias.id }}">
-                <div class="card p-4 shadow-sm {% if alias.id == highlight_alias_id %} highlight-row {% endif %} "
-                        {% if highlight_alias_id and alias.id != highlight_alias_id %}
-                     style="opacity: 0.6"
-                        {% endif %}
-                >
-
-                    <div class="row">
-                        <div class="col-8">
+    <div class="row mb-2" v-if="showFilter" id="filter-control">
+      <!-- Filter Control -->
+      <div class="col d-flex">
+        <form method="get" class="form-inline">
+          <select name="sort"
+                  onchange="this.form.submit()"
+                  class="form-control mr-3 shadow">
+            <option value="" {% if sort == "" %} selected {% endif %}>
+              Sort by most recent activity
+            </option>
+            <option value="old2new" {% if sort == "old2new" %} selected {% endif %}>
+              Alias Old-Recent
+            </option>
+            <option value="new2old" {% if sort == "new2old" %} selected {% endif %}>
+              Alias Recent-Old
+            </option>
+            <option value="a2z" {% if sort == "a2z" %} selected {% endif %}>
+              Alias A-Z
+            </option>
+            <option value="z2a" {% if sort == "z2a" %} selected {% endif %}>
+              Alias Z-A
+            </option>
+          </select>
+
+          <select name="filter"
+                  onchange="this.form.submit()"
+                  class="form-control mr-3 shadow"
+                  style="max-width: 200px">
+            <option value="" {% if filter == "" %} selected {% endif %}>
+              All Aliases
+            </option>
+            <option value="pinned" {% if filter == "pinned" %} selected {% endif %}>
+              Pinned Aliases
+            </option>
+
+          {%  if current_user.enable_SMTP_aliases %}
+            <option value="enable_SMTP" {% if filter == "enable_SMTP" %} selected {% endif %}>
+              Only SMTP Enabled Aliases
+            </option>
+          {% endif %}
+
+            <option value="enabled" {% if filter == "enabled" %} selected {% endif %}>
+              Only Enabled Aliases
+            </option>
+            <option value="disabled" {% if filter == "disabled" %} selected {% endif %}>
+              Only Disabled Aliases
+            </option>
+            <option value="hibp" {% if filter == "hibp" %} selected {% endif %}>
+              Only Aliases Found In Data Breaches
+            </option>
+            {% for mailbox in current_user.mailboxes() %}
+              <option value="mailbox:{{ mailbox.id }}" {% if filter == "mailbox:" ~ mailbox.id %}
+                      selected {% endif %}>
+                {{ mailbox.email }}'s aliases
+              </option>
+            {% endfor %}
+
+            {% for directory in current_user.directories %}
+              <option value="directory:{{ directory.id }}" {% if filter == "directory:" ~ directory.id %}
+                      selected {% endif %}>
+                Directory <b>{{ directory.name }}</b> aliases
+              </option>
+            {% endfor %}
+
+          </select>
+
+          <input type="search" name="query" placeholder="Enter to search for alias"
+                 class="form-control shadow mr-2"
+                 style="max-width: 15em"
+                 value="{{ query }}">
+
+
+        </form>
+
+        <div style="margin-left: auto">
+
+          {% if query or sort or filter %}
+            <a href="{{ url_for('dashboard.index') }}"
+               class="btn btn-outline-secondary">Reset</a>
+          {% endif %}
+
+          <a v-if="showFilter" @click="toggleFilter()" class="btn btn-outline-secondary">
+            <i class="fe fe-chevrons-up"></i>
+          </a>
+        </div>
+      </div>
+    </div>
+  </div>
+  <!-- END Controls: buttons & search -->
+
+  <!-- Alias list -->
+  <div class="row">
+    {% for alias_info in alias_infos %}
+      {% set alias = alias_info.alias %}
+
+      <div class="col-12 col-lg-6" id="alias-container-{{ alias.id }}">
+        <div class="card p-4 shadow-sm {% if alias.id == highlight_alias_id %} highlight-row {% endif %} "
+            {% if highlight_alias_id and alias.id != highlight_alias_id %}
+             style="opacity: 0.6"
+            {% endif %}
+        >
+
+          <div class="row">
+            <div class="col-8">
               <span class="{% if alias.id == highlight_alias_id %} highlighted {% endif %} clipboard cursor mb-0"
-                      {% if loop.index ==1 %}
+                  {% if loop.index ==1 %}
                     data-intro="This is your first <em>alias</em>. <br><br>
           Emails sent to an alias are <em>forwarded</em> to your <em>real</em> email address. <br><br>"
                     data-step="2"
-                      {% endif %}
-                      {% if alias.enabled %}
+                  {% endif %}
+                  {% if alias.enabled %}
                     data-toggle="tooltip"
                     title="Click to copy"
                     data-clipboard-text="{{ alias.email }}"
-                      {% endif %}
+                  {% endif %}
               >
                 <span class="font-weight-bold">{{ alias.email }}</span>
               </span>
-                            {% if alias.automatic_creation %}
-                                <span class="fa fa-inbox" data-toggle="tooltip"
-                                      title="This alias was automatically generated because of an incoming email"></span>
-                            {% endif %}
-
-                            {% if alias.pinned %}
-                                <span class="fa fa-thumb-tack" data-toggle="tooltip"
-                                      title="This alias is pinned"></span>
-                            {% endif %}
-
-                            {% if current_user.enable_SMTP_aliases %}
-                                {% if alias.enable_SMTP %}
-                                    <span class="fa fa-id-card" data-toggle="tooltip"
-                                          title="SMTP is enabled for this alias"></span>
-                                {% endif %}
-                            {% endif %}
-
-                            {% if alias.hibp_breaches | length > 0 %}
-                                <a href="https://haveibeenpwned.com/account/{{ alias.email }}">
+              {% if alias.automatic_creation %}
+                <span class="fa fa-inbox" data-toggle="tooltip"
+                      title="This alias was automatically generated because of an incoming email"></span>
+              {% endif %}
+
+              {% if alias.pinned %}
+                <span class="fa fa-thumb-tack" data-toggle="tooltip"
+                      title="This alias is pinned"></span>
+              {% endif %}
+
+            {%  if current_user.enable_SMTP_aliases %}
+              {% if alias.enable_SMTP %}
+                <span class="fa fa-id-card" data-toggle="tooltip"
+                      title="SMTP is enabled for this alias"></span>
+              {% endif %}
+            {% endif %}
+
+              {% if alias.hibp_breaches | length > 0 %}
+                <a href="https://haveibeenpwned.com/account/{{ alias.email }}">
                   <span class="fa fa-warning text-danger" data-toggle="tooltip"
                         title="This alias was found in {{ alias.hibp_breaches | length }} data breaches. Check haveibeenpwned.com for more information."></span>
-                                </a>
-                            {% endif %}
-
-                            {% if alias.custom_domain and not alias.custom_domain.verified %}
-                                <span class="fa fa-warning text-warning" data-toggle="tooltip"
-                                      title="Alias can't receive emails as its domain doesn't have MX records set up."></span>
-                            {% endif %}
-                        </div>
-                        <div class="col text-right">
-                            <label class="custom-switch cursor"
-                                   data-toggle="tooltip"
-                                    {% if alias.enabled %}
-                                   title="Disable alias - stop receiving emails sent to this alias"
-                                    {% else %}
-                                   title="Enable alias - start receiving emails sent to this alias"
-                                    {% endif %}
-
-                                    {% if loop.index ==1 %}
-                                   data-intro="By <em>disabling</em> an alias, emails sent to this alias will <em>not</em>
+                </a>
+              {% endif %}
+
+              {% if alias.custom_domain and not alias.custom_domain.verified %}
+                <span class="fa fa-warning text-warning" data-toggle="tooltip"
+                      title="Alias can't receive emails as its domain doesn't have MX records set up."></span>
+              {% endif %}
+            </div>
+            <div class="col text-right">
+              <label class="custom-switch cursor"
+                     data-toggle="tooltip"
+                  {% if alias.enabled %}
+                     title="Disable alias - stop receiving emails sent to this alias"
+                  {% else %}
+                     title="Enable alias - start receiving emails sent to this alias"
+                  {% endif %}
+
+                  {% if loop.index ==1 %}
+                     data-intro="By <em>disabling</em> an alias, emails sent to this alias will <em>not</em>
                          be forwarded to your inbox. <br><br>"
-                                   data-step="3"
-                                    {% endif %}
-                                   style="padding-left: 0px"
-                            >
-                                <input type="checkbox" class="enable-disable-alias custom-switch-input"
-                                       data-alias="{{ alias.id }}"
-                                       data-alias-email="{{ alias.email }}"
-                                        {{ "checked" if alias.enabled else "" }}>
-
-                                <span class="custom-switch-indicator"></span>
-                            </label>
-                        </div>
-                    </div>
-
-                    <!-- Email Activity -->
-                    <div class="row mb-2">
-                        <div class="col">
-                            <div style="font-size: 12px">
-                                {% if alias_info.latest_email_log != None %}
-                                    {% set email_log = alias_info.latest_email_log %}
-                                    {% set contact = alias_info.latest_contact %}
-
-                                    {% if email_log.is_reply %}
-                                        {{ contact.website_email }}
-                                        <i class="fa fa-reply mr-2" data-toggle="tooltip"
-                                           title="Email reply/sent from alias"></i>
-                                        {{ email_log.created_at | dt }}
-                                    {% elif email_log.bounced %}
-                                        <span class="text-danger">
+                     data-step="3"
+                  {% endif %}
+                     style="padding-left: 0px"
+              >
+                <input type="checkbox" class="enable-disable-alias custom-switch-input"
+                       data-alias="{{ alias.id }}"
+                       data-alias-email="{{ alias.email }}"
+                    {{ "checked" if alias.enabled else "" }}>
+
+                <span class="custom-switch-indicator"></span>
+              </label>
+            </div>
+          </div>
+
+          <!-- Email Activity -->
+          <div class="row mb-2">
+            <div class="col">
+              <div style="font-size: 12px">
+                {% if alias_info.latest_email_log != None %}
+                  {% set email_log = alias_info.latest_email_log %}
+                  {% set contact = alias_info.latest_contact %}
+
+                  {% if email_log.is_reply %}
+                    {{ contact.website_email }}
+                    <i class="fa fa-reply mr-2" data-toggle="tooltip" title="Email reply/sent from alias"></i>
+                    {{ email_log.created_at | dt }}
+                  {% elif email_log.bounced %}
+                    <span class="text-danger">
                       {{ contact.website_email }}
                       <i class="fa fa-warning mr-2" data-toggle="tooltip"
                          title="Email bounced and cannot be forwarded to your mailbox"></i>
                       {{ email_log.created_at | dt }}
                     </span>
-                                    {% elif email_log.blocked %}
-                                        {{ contact.website_email }}
-                                        <i class="fa fa-ban mr-2 text-danger" data-toggle="tooltip"
-                                           title="Email blocked"></i>
-                                        {{ email_log.created_at | dt }}
-                                    {% else %}
-                                        {{ contact.website_email }}
-                                        <i class="fa fa-paper-plane  mr-2" data-toggle="tooltip"
-                                           title="Email sent to alias"></i>
-                                        {{ email_log.created_at | dt }}
-                                        {% include 'partials/toggle_contact.html' %}
-
-                                    {% endif %}
-                                {% else %}
-                                    No emails received/sent in the last 14 days. Created {{ alias.created_at | dt }}.
-                                {% endif %}
-
-                            </div>
-                        </div>
-                    </div>
-                    <!-- END Email Activity -->
-
-                    <div class="small-text mt-1">Alias description</div>
-                    <div class="d-flex mb-2">
-                        <div class="flex-grow-1 mr-2">
+                  {% elif email_log.blocked %}
+                    {{ contact.website_email }}
+                    <i class="fa fa-ban mr-2 text-danger" data-toggle="tooltip" title="Email blocked"></i>
+                    {{ email_log.created_at | dt }}
+                  {% else %}
+                    {{ contact.website_email }}
+                    <i class="fa fa-paper-plane  mr-2" data-toggle="tooltip" title="Email sent to alias"></i>
+                    {{ email_log.created_at | dt }}
+                    {% include 'partials/toggle_contact.html' %}
+
+                  {% endif %}
+                {% else %}
+                  No emails received/sent in the last 14 days. Created {{ alias.created_at | dt }}.
+                {% endif %}
+
+              </div>
+            </div>
+          </div>
+          <!-- END Email Activity -->
+
+          <div class="small-text mt-1">Alias description</div>
+          <div class="d-flex mb-2">
+            <div class="flex-grow-1 mr-2">
                 <textarea
-                        id="note-{{ alias.id }}"
-                        name="note"
-                        class="form-control"
-                        style="font-size: 12px"
-                        rows="2"
-                        placeholder="e.g. where the alias is used or why is it created">{{ alias.note or "" }}</textarea>
-                        </div>
-
-                        <div class="">
-                            <a data-alias="{{ alias.id }}"
-                               class="save-note btn btn-sm btn-outline-success w-100">
-                                Save
-                            </a>
-                        </div>
-                    </div>
-
-                    <!-- Send Email && More button -->
-                    <div class="row">
-                        <div class="col">
-                            <a href="{{ url_for('dashboard.alias_contact_manager', alias_id=alias.id) }}"
-                               id="send-email-{{ alias.id }}"
-                                    {% if loop.index ==1 %}
-                               data-intro="Not only alias can receive emails, it can <em>send</em> emails too! <br><br>
+                    id="note-{{ alias.id }}"
+                    name="note"
+                    class="form-control"
+                    style="font-size: 12px"
+                    rows="2"
+                    placeholder="e.g. where the alias is used or why is it created">{{ alias.note or "" }}</textarea>
+            </div>
+
+            <div class="">
+              <a data-alias="{{ alias.id }}"
+                 class="save-note btn btn-sm btn-outline-success w-100">
+                Save
+              </a>
+            </div>
+          </div>
+
+          <!-- Send Email && More button -->
+          <div class="row">
+            <div class="col">
+              <a href="{{ url_for('dashboard.alias_contact_manager', alias_id=alias.id) }}"
+                 id="send-email-{{ alias.id }}"
+                  {% if loop.index ==1 %}
+                 data-intro="Not only alias can receive emails, it can <em>send</em> emails too! <br><br>
                  You can add a new <em>contact</em> for your alias here. <br><br>
                  If you need to reply to an email, just hit 'Reply': the response will come from your alias
                  and your real email address stays <em>hidden</em>."
-                               data-step="4"
-                                    {% endif %}
-                               class="btn btn-sm btn-outline-primary {% if not alias.enabled %} disabled {% endif %}"
-                               data-toggle="tooltip"
-                               title="Add new contact, manage your existing contacts"
-                            >
-                                Contacts&nbsp; &nbsp;<i class="fe fe-send"></i>
-                            </a>
-                        </div>
-                        {% if not current_user.expand_alias_info %}
-                            <div class="col text-right">
-                                <a class="btn btn-sm collapsed" data-toggle="collapse" href="#alias-{{ alias.id }}"
-                                   role="button"
-                                   aria-expanded="false">
+                 data-step="4"
+                  {% endif %}
+                 class="btn btn-sm btn-outline-primary {% if not alias.enabled %} disabled {% endif %}"
+                 data-toggle="tooltip"
+                 title="Add new contact, manage your existing contacts"
+              >
+                Contacts&nbsp; &nbsp;<i class="fe fe-send"></i>
+              </a>
+            </div>
+            {% if not current_user.expand_alias_info %}
+              <div class="col text-right">
+                <a class="btn btn-sm collapsed" data-toggle="collapse" href="#alias-{{ alias.id }}" role="button"
+                   aria-expanded="false">
 
                   <span class="if-collapsed">
                     More <i class="fe fe-chevron-down"></i>
                   </span>
-                                    <span class="if-not-collapsed">Less
+                  <span class="if-not-collapsed">Less
                     <i class="fe fe-chevron-up"></i>
                   </span>
-                                </a>
-                            </div>
-                        {% endif %}
-                    </div>
-                    <!-- END Send Email && More button -->
-
-                    <!-- Collapse section -->
-                    <div class="{% if not current_user.expand_alias_info %} collapse {% endif %} mt-2"
-                         id="alias-{{ alias.id }}">
-
-                        {% if alias_info.latest_email_log != None %}
-                            <div style="font-size: 12px">
-                                Alias created {{ alias.created_at | dt }}
-                            </div>
-                        {% endif %}
-
-                        <span class="alias-activity">{{ alias_info.nb_forward }}</span> forwards,
-                        <span class="alias-activity">{{ alias_info.nb_blocked }}</span> blocks,
-                        <span class="alias-activity">{{ alias_info.nb_reply }}</span> sents
-                        <a href="{{ url_for('dashboard.alias_log', alias_id=alias.id) }}"
-                           class="btn btn-sm btn-link">
-                            See All &nbsp;→
-                        </a>
-
-                        {% if mailboxes|length > 1 %}
-                            <div class="small-text">Current mailbox</div>
-                            <div class="d-flex">
-                                <div class="flex-grow-1 mr-2">
-                                    <select required id="mailbox-{{ alias.id }}"
-                                            data-width="100%"
-                                            class="mailbox-select" multiple name="mailbox">
-                                        {% for mailbox in mailboxes %}
-                                            <option value="{{ mailbox.id }}"
-                                                    {% if alias_info.contain_mailbox(mailbox.id) %}
-                                                    selected {% endif %}>
-                                                {{ mailbox.email }}
-                                            </option>
-                                        {% endfor %}
-                                    </select>
-                                </div>
-
-                                <div class="">
-                                    <a data-alias="{{ alias.id }}"
-                                       class="save-mailbox btn btn-sm btn-outline-info w-100">
-                                        Update
-                                    </a>
-                                </div>
-
-                            </div>
-                        {% elif alias_info.mailbox != None and alias_info.mailbox.email != current_user.email %}
-                            <div class="small-text">
-                                Owned by <b>{{ alias_info.mailbox.email }}</b> mailbox
-                            </div>
-                        {% endif %}
-
-                        <div class="small-text mt-2" data-toogle="tooltip"
-                             title="When sending an email from this alias, the email will have 'Display Name <{{ alias.email }}>' as sender.">
-                            Display name
-                            <i class="fe fe-help-circle"></i>
-                        </div>
-
-                        <div class="d-flex">
-                            <div class="flex-grow-1 mr-2">
-                                <input id="alias-name-{{ alias.id }}"
-                                       value="{{ alias.name or '' }}" class="form-control"
-                                       placeholder="{{ alias.custom_domain.name or "Alias name" }}">
-                            </div>
-
-
-                            <div class="">
-                                <a data-alias="{{ alias.id }}"
-                                   class="save-alias-name btn btn-sm btn-outline-primary w-100">
-                                    Save
-                                </a>
-                            </div>
-                        </div>
-
-                        {% if alias.mailbox_support_pgp() %}
-                            <div class="small-text mt-2" data-toogle="tooltip"
-                                 title="You can decide to turn off the PGP for an alias. This can be useful if the sender already encrypts the emails">
-                                PGP
-                                <i class="fe fe-help-circle"></i>
-                            </div>
-                            <div>
-                                <label class="custom-switch cursor pl-0">
-                                    <input type="checkbox" class="enable-disable-pgp custom-switch-input"
-                                           data-alias="{{ alias.id }}"
-                                           data-alias-email="{{ alias.email }}"
-                                            {{ "checked" if alias.pgp_enabled() else "" }}>
-
-                                    <span class="custom-switch-indicator"></span>
-                                </label>
-                            </div>
-                        {% endif %}
-
-                        <div class="small-text mt-2" data-toogle="tooltip"
-                             title="it's always pinned on top">
-                            Pin this alias
-                            <i class="fe fe-help-circle"></i>
-                        </div>
-                        <div>
-                            <label class="custom-switch cursor pl-0">
-                                <input type="checkbox" class="pin-alias custom-switch-input"
-                                       data-alias="{{ alias.id }}"
-                                       data-alias-email="{{ alias.email }}"
-                                        {{ "checked" if alias.pinned else "" }}>
-
-                                <span class="custom-switch-indicator"></span>
-                            </label>
-                        </div>
-
-                        {% if current_user.enable_SMTP_aliases %}
-                            <div class="small-text mt-2" data-toogle="tooltip"
-                                 title="This enables sending via SMTP for alias">
-                                Enable SMTP for this alias
-                                <i class="fe fe-help-circle"></i>
-                            </div>
-                            <div>
-                                <label class="custom-switch cursor pl-0">
-                                    <input type="checkbox" class="enable-disable-smtp custom-switch-input"
-                                           data-alias="{{ alias.id }}"
-                                           data-alias-email="{{ alias.email }}"
-                                            {{ "checked" if alias.enable_SMTP else "" }}>
-
-                                    <span class="custom-switch-indicator"></span>
-                                </label>
-                            </div>
-                        {% endif %}
-                        <div>
-                            <div class="btn-group float-right" role="group" aria-label="Basic example">
-                                <a href="{{ url_for('dashboard.alias_transfer_send_route', alias_id=alias.id) }}"
-                                   class="btn btn-sm btn-link">
-                                    Transfer
-                                    <i class="ml-0 dropdown-icon fe fe-share-2 text-primary"></i>
-                                </a>
-
-
-                                <form method="post">
-                                    <input type="hidden" name="form-name" value="delete-alias">
-                                    <input type="hidden" name="alias-id" value="{{ alias.id }}">
-                                    <input type="hidden" name="alias" class="alias" value="{{ alias.email }}">
-
-                                    <span class="btn btn-link btn-sm float-right text-danger"
-                                          onclick="confirmDeleteAlias.call(this)"
-                                            {% if alias.custom_domain %}
-                                          data-custom-domain-trash-url="{{ alias.custom_domain.get_trash_url() }}"
-                                            {% endif %}
-                                          data-alias="{{ alias.id }}"
-                                          data-alias-email="{{ alias.email }}"
-                                    >
-                    Delete&nbsp; &nbsp;<i class="dropdown-icon fe fe-trash-2 text-danger"></i>
-                  </span>
-                                </form>
+                </a>
+              </div>
+            {% endif %}
+          </div>
+          <!-- END Send Email && More button -->
+
+          <!-- Collapse section -->
+          <div class="{% if not current_user.expand_alias_info %} collapse {% endif %} mt-2" id="alias-{{ alias.id }}">
+
+            {% if alias_info.latest_email_log != None %}
+              <div style="font-size: 12px">
+                Alias created {{ alias.created_at | dt }}
+              </div>
+            {% endif %}
+
+            <span class="alias-activity">{{ alias_info.nb_forward }}</span> forwards,
+            <span class="alias-activity">{{ alias_info.nb_blocked }}</span> blocks,
+            <span class="alias-activity">{{ alias_info.nb_reply }}</span> sents
+            <a href="{{ url_for('dashboard.alias_log', alias_id=alias.id) }}"
+               class="btn btn-sm btn-link">
+              See All &nbsp;→
+            </a>
+
+            {% if mailboxes|length > 1 %}
+              <div class="small-text">Current mailbox</div>
+              <div class="d-flex">
+                <div class="flex-grow-1 mr-2">
+                  <select required id="mailbox-{{ alias.id }}"
+                          data-width="100%"
+                          class="mailbox-select" multiple name="mailbox">
+                    {% for mailbox in mailboxes %}
+                      <option value="{{ mailbox.id }}" {% if alias_info.contain_mailbox(mailbox.id) %}
+                              selected {% endif %}>
+                        {{ mailbox.email }}
+                      </option>
+                    {% endfor %}
+                  </select>
+                </div>
 
-                            </div>
-                        </div>
+                <div class="">
+                  <a data-alias="{{ alias.id }}"
+                     class="save-mailbox btn btn-sm btn-outline-info w-100">
+                    Update
+                  </a>
+                </div>
 
+              </div>
+            {% elif alias_info.mailbox != None and alias_info.mailbox.email != current_user.email %}
+              <div class="small-text">
+                Owned by <b>{{ alias_info.mailbox.email }}</b> mailbox
+              </div>
+            {% endif %}
+
+            <div class="small-text mt-2" data-toogle="tooltip"
+                 title="When sending an email from this alias, the email will have 'Display Name <{{ alias.email }}>' as sender.">
+              Display name
+              <i class="fe fe-help-circle"></i>
+            </div>
 
-                    </div>
-                    <!-- END Collapse section -->
-                </div>
+            <div class="d-flex">
+              <div class="flex-grow-1 mr-2">
+                <input id="alias-name-{{ alias.id }}"
+                       value="{{ alias.name or '' }}" class="form-control"
+                       placeholder="{{ alias.custom_domain.name or "Alias name" }}">
+              </div>
+
+
+              <div class="">
+                <a data-alias="{{ alias.id }}"
+                   class="save-alias-name btn btn-sm btn-outline-primary w-100">
+                  Save
+                </a>
+              </div>
             </div>
-        {% endfor %}
-    </div>
-    <!-- END Alias list -->
 
-    <!-- Only show pagination control if there are previous/next page -->
-    {% if page > 0 or not last_page %}
-        <div class="row">
-            <div class="col">
-                <nav aria-label="Alias navigation">
-                    <ul class="pagination">
-                        <li class="page-item mr-1">
-                            <a class="btn btn-outline-primary {% if page == 0 %}disabled{% endif %}"
-                               href="{{ url_for('dashboard.index', page=page-1, query=query, sort=sort, filter=filter) }}">
-                                Previous</a>
-                        </li>
-                        <li class="page-item">
-                            <a class="btn btn-outline-primary {% if last_page %}disabled{% endif %}"
-                               href="
-                                       {{ url_for('dashboard.index', page=page+1, query=query, sort=sort, filter=filter) }}">
-                                Next</a>
-                        </li>
-                    </ul>
-                </nav>
+            {% if alias.mailbox_support_pgp() %}
+              <div class="small-text mt-2" data-toogle="tooltip"
+                   title="You can decide to turn off the PGP for an alias. This can be useful if the sender already encrypts the emails">
+                PGP
+                <i class="fe fe-help-circle"></i>
+              </div>
+              <div>
+                <label class="custom-switch cursor pl-0">
+                  <input type="checkbox" class="enable-disable-pgp custom-switch-input"
+                         data-alias="{{ alias.id }}"
+                         data-alias-email="{{ alias.email }}"
+                      {{ "checked" if alias.pgp_enabled() else "" }}>
+
+                  <span class="custom-switch-indicator"></span>
+                </label>
+              </div>
+            {% endif %}
+
+            <div class="small-text mt-2" data-toogle="tooltip"
+                 title="it's always pinned on top">
+              Pin this alias
+              <i class="fe fe-help-circle"></i>
+            </div>
+            <div>
+              <label class="custom-switch cursor pl-0">
+                <input type="checkbox" class="pin-alias custom-switch-input"
+                       data-alias="{{ alias.id }}"
+                       data-alias-email="{{ alias.email }}"
+                    {{ "checked" if alias.pinned else "" }}>
+
+                <span class="custom-switch-indicator"></span>
+              </label>
+            </div>
+
+          {%  if current_user.enable_SMTP_aliases %}
+          <div class="small-text mt-2" data-toogle="tooltip"
+                 title="This enables sending via SMTP for alias">
+              Enable SMTP for this alias
+              <i class="fe fe-help-circle"></i>
+            </div>
+            <div>
+              <label class="custom-switch cursor pl-0">
+                <input type="checkbox" class="enable-disable-smtp custom-switch-input"
+                       data-alias="{{ alias.id }}"
+                       data-alias-email="{{ alias.email }}"
+                    {{ "checked" if alias.enable_SMTP else "" }}>
+
+                <span class="custom-switch-indicator"></span>
+              </label>
             </div>
+            {% endif %}
+            <div>
+              <div class="btn-group float-right" role="group" aria-label="Basic example">
+                <a href="{{ url_for('dashboard.alias_transfer_send_route', alias_id=alias.id) }}"
+                   class="btn btn-sm btn-link">
+                  Transfer
+                  <i class="ml-0 dropdown-icon fe fe-share-2 text-primary"></i>
+                </a>
+
+
+                <form method="post">
+                  <input type="hidden" name="form-name" value="delete-alias">
+                  <input type="hidden" name="alias-id" value="{{ alias.id }}">
+                  <input type="hidden" name="alias" class="alias" value="{{ alias.email }}">
+
+                  <span class="btn btn-link btn-sm float-right text-danger"
+                        onclick="confirmDeleteAlias.call(this)"
+                      {% if alias.custom_domain %}
+                        data-custom-domain-trash-url="{{ alias.custom_domain.get_trash_url() }}"
+                      {% endif %}
+                        data-alias="{{ alias.id }}"
+                        data-alias-email="{{ alias.email }}"
+                  >
+                    Delete&nbsp; &nbsp;<i class="dropdown-icon fe fe-trash-2 text-danger"></i>
+                  </span>
+                </form>
+
+              </div>
+            </div>
+
+
+          </div>
+          <!-- END Collapse section -->
         </div>
-    {% endif %}
+      </div>
+    {% endfor %}
+  </div>
+  <!-- END Alias list -->
+
+  <!-- Only show pagination control if there are previous/next page -->
+  {% if page > 0 or not last_page %}
+    <div class="row">
+      <div class="col">
+        <nav aria-label="Alias navigation">
+          <ul class="pagination">
+            <li class="page-item mr-1">
+              <a class="btn btn-outline-primary {% if page == 0 %}disabled{% endif %}"
+                 href="{{ url_for('dashboard.index', page=page-1, query=query, sort=sort, filter=filter) }}">
+                Previous</a>
+            </li>
+            <li class="page-item">
+              <a class="btn btn-outline-primary {% if last_page %}disabled{% endif %}"
+                 href="{{ url_for('dashboard.index', page=page+1, query=query, sort=sort, filter=filter) }}">
+                Next</a>
+            </li>
+          </ul>
+        </nav>
+      </div>
+    </div>
+  {% endif %}
 
 {% endblock %}
 
 {% block script %}
-    <script src="/static/js/index.js?v=0"></script>
-
-    <script>
-        {% if show_intro %}
-            // only show intro when screen is big enough to show "developer" tab
-            if (window.innerWidth >= 1024) {
-                introJs().start();
-            }
-        {% endif %}
+  <script src="/static/js/index.js?v=0"></script>
+
+  <script>
+    {% if show_intro %}
+      // only show intro when screen is big enough to show "developer" tab
+      if (window.innerWidth >= 1024) {
+        introJs().start();
+      }
+    {% endif %}
 
-        $('.highlighted').tooltip("show");
-    </script>
-    {% if current_user.enable_SMTP_aliases %}
+    $('.highlighted').tooltip("show");
+  </script>
+    {%  if current_user.enable_SMTP_aliases %}
         <script type="module">
 
-            import {nanoid} from "{{ url_for('static', filename='node_modules/nanoid/nanoid.js') }}"
+        import { nanoid } from "{{ url_for('static', filename='node_modules/nanoid/nanoid.js') }}"
 
-            $(".enable-disable-smtp").change(async function () {
-                let aliasId = $(this).data("alias");
-                let alias = $(this).data("alias-email");
-                const oldValue = !$(this).prop("checked");
-                let newValue = !oldValue;
+        $(".enable-disable-smtp").change(async function () {
+          let aliasId = $(this).data("alias");
+          let alias = $(this).data("alias-email");
+          const oldValue = !$(this).prop("checked");
+          let newValue = !oldValue;
 
-                if (newValue) {
-                    var smtpGeneratedPassword = nanoid(21);
+          if(newValue) {
+            var smtp_generated_password = nanoid(21);
 
-                    var message = `SMTP credentials for alias (<b>This will be visible only once, so please save it</b>):
+            var message = `SMTP credentials for alias (<b>This will be visible only once, so please save it</b>):
                         <br><br>Username (same as alias): ${alias}
-                        <br>Password: ${smtpGeneratedPassword}<br>
+                        <br>Password: ${smtp_generated_password}<br>
                         `;
-                }
-                try {
-                    if (newValue) {
-                        var res = await fetch(`/api/aliases/${aliasId}`, {
-                            method: "PUT",
-                            headers: {
-                                "Content-Type": "application/json",
-                            },
-                            body: JSON.stringify({
-                                enable_SMTP: newValue,
-                                smtp_password: smtpGeneratedPassword,
-                            }),
-                        });
-                    } else {
-                        var res = await fetch(`/api/aliases/${aliasId}`, {
-                            method: "PUT",
-                            headers: {
-                                "Content-Type": "application/json",
-                            },
-                            body: JSON.stringify({
-                                enable_SMTP: newValue,
-                            }),
-                        });
-                    }
-                    if (res.ok) {
-                        if (newValue) {
-                            bootbox.alert({
-                                title: `SMTP Credentials for ${alias}`,
-                                message: message,
-                                size: 'large',
-                                onEscape: false,
-                                buttons: {
-                                    ok: {
-                                        label: 'Ok, I have saved them',
-                                        className: 'btn-primary',
-                                    },
-                                },
-                                callback: function () {
-                                    toastr.success(`SMTP Enabled for ${alias}`);
-                                }
-                            });
-                            smtpGeneratedPassword = null; // Clear the password.
-                        } else {
-                            toastr.info(`SMTP Disabled for ${alias}`);
-                        }
-                    } else {
-                        toastr.error("Sorry for the inconvenience! Could you refresh the page & retry please?", "Unknown Error");
-                        // reset to the original value
-                        $(this).prop("checked", oldValue);
-                    }
-                } catch (e) {
-                    toastr.error("Sorry for the inconvenience! Could you refresh the page & retry please?", "Unknown Error");
-                    // reset to the original value
-                    $(this).prop("checked", oldValue);
-                }
-            });
+          }
+          try {
+            if(newValue) {
+              var res = await fetch(`/api/aliases/${aliasId}`, {
+                method: "PUT",
+                headers: {
+                  "Content-Type": "application/json",
+                },
+                body: JSON.stringify({
+                  enable_SMTP: newValue,
+                  smtp_password: smtp_generated_password,
+                }),
+              });
+            }
+            else {
+              var res = await fetch(`/api/aliases/${aliasId}`, {
+                method: "PUT",
+                headers: {
+                  "Content-Type": "application/json",
+                },
+                body: JSON.stringify({
+                  enable_SMTP: newValue,
+                }),
+              });
+            }
+            if (res.ok) {
+              if (newValue) {
+                bootbox.alert({
+                  title: `SMTP Credentials for ${alias}`,
+                  message: message,
+                  size: 'large',
+                  onEscape: false,
+                  buttons: {
+                    ok: {
+                      label: 'Ok, I have saved them',
+                      className: 'btn-primary',
+                    },
+                  },
+                  callback: function () {
+                    toastr.success(`SMTP Enabled for ${alias}`);
+                  }
+                });
+                smtp_generated_password = null; // Clear the password.
+              } else {
+                toastr.info(`SMTP Disabled for ${alias}`);
+              }
+            } else {
+              toastr.error("Sorry for the inconvenience! Could you refresh the page & retry please?", "Unknown Error");
+              // reset to the original value
+              $(this).prop("checked", oldValue);
+            }
+          } catch (e) {
+            toastr.error("Sorry for the inconvenience! Could you refresh the page & retry please?", "Unknown Error");
+            // reset to the original value
+            $(this).prop("checked", oldValue);
+          }
+        });
         </script>
     {% endif %}
 {% endblock %}
diff --git a/templates/dashboard/setting.html b/templates/dashboard/setting.html
index 2d76dd0fc..507c84394 100644
--- a/templates/dashboard/setting.html
+++ b/templates/dashboard/setting.html
@@ -3,653 +3,627 @@
 {% set active_page = "setting" %}
 
 {% block title %}
-    Settings
+  Settings
 {% endblock %}
 
 {% block head %}
-    <style>
-        .card-title {
-            font-size: 22px;
-            font-weight: 600;
-            margin-bottom: 3px;
-        }
-    </style>
+  <style>
+      .card-title {
+          font-size: 22px;
+          font-weight: 600;
+          margin-bottom: 3px;
+      }
+  </style>
 {% endblock %}
 
 {% block default_content %}
 
-    <div class="col pb-3">
-        <!-- Current plan -->
-        <div class="card">
-            <div class="card-body">
-                <div class="card-title mb-3">Current Plan</div>
-
-                {% if current_user.lifetime %}
-                    You have lifetime access to the Premium plan.
-                {% elif current_user.lifetime_or_active_subscription() %}
-                    {% if current_user.get_subscription() %}
-                        <div>
-                            {{ current_user.get_subscription().plan_name() }} plan subscribed via Paddle.
-                            <a href="{{ url_for('dashboard.billing') }}">
-                                Manage Subscription ➡
-                            </a>
-                        </div>
-                    {% endif %}
-
-                    {% if manual_sub and manual_sub.is_active() %}
-                        <div>
-                            Manual plan which expires {{ manual_sub.end_at | dt }}
-                            ({{ manual_sub.end_at.format("YYYY-MM-DD") }}).
-                            {% if manual_sub.is_giveaway %}
-                                <br>
-                                To gain additional features and support SimpleLogin you can upgrade to a Premium plan.
-                                <br>
-                                <a href="{{ url_for('dashboard.pricing') }}" class="btn btn-sm btn-outline-primary">Upgrade</a>
-                            {% endif %}
-                        </div>
-                    {% endif %}
-
-                    {% if apple_sub and apple_sub.is_valid() %}
-                        <div>
-                            Premium plan subscribed via Apple which expires {{ apple_sub.expires_date | dt }}
-                            ({{ apple_sub.expires_date.format("YYYY-MM-DD") }}).
-                            <div class="alert alert-info">
-                                If you want to subscribe via the Web instead, please make sure to cancel your
-                                subscription
-                                on Apple first.
-                                <a href="{{ url_for('dashboard.pricing') }}"
-                                   class="">Upgrade <i class="fa fa-arrow-right" aria-hidden="true"></i></a>
-                            </div>
-                        </div>
-                    {% endif %}
-
-                    {% if coinbase_sub and coinbase_sub.is_active() %}
-                        <div>
-                            Yearly plan subscribed with cryptocurrency which expires on
-                            {{ coinbase_sub.end_at.format("YYYY-MM-DD") }}.
-                            <a href="{{ url_for('dashboard.coinbase_checkout_route') }}" target="_blank">
-                                Extend Subscription <i class="fe fe-external-link"></i>
-                            </a>
-                        </div>
-                    {% endif %}
-                {% elif current_user.in_trial() %}
-                    Your Premium trial expires {{ current_user.trial_end | dt }}.
-                {% else %}
-                    You are on the Free plan.
-                {% endif %}
+  <div class="col pb-3">
+    <!-- Current plan -->
+    <div class="card">
+      <div class="card-body">
+        <div class="card-title mb-3">Current Plan</div>
+
+        {% if current_user.lifetime %}
+          You have lifetime access to the Premium plan.
+        {% elif current_user.lifetime_or_active_subscription() %}
+          {% if current_user.get_subscription() %}
+            <div>
+              {{ current_user.get_subscription().plan_name() }} plan subscribed via Paddle.
+              <a href="{{ url_for('dashboard.billing') }}">
+                Manage Subscription ➡
+              </a>
             </div>
-        </div>
-        <!-- END Current plan -->
-
-        <!-- TOTP -->
-        <div class="card" id="totp">
-            <div class="card-body">
-                <div class="card-title">Two Factor Authentication</div>
-                <div class="mb-3">
-                    Secure your account with 2FA, you'll be asked for a code generated through an app when you login.
-                    <br>
-                </div>
-                {% if not current_user.enable_otp %}
-                    <a href="{{ url_for('dashboard.mfa_setup') }}" class="btn btn-outline-primary">Setup TOTP</a>
-                {% else %}
-                    <a href="{{ url_for('dashboard.mfa_cancel') }}" class="btn btn-outline-danger">Disable TOTP</a>
-                    <a href="{{ url_for('dashboard.recovery_code_route') }}" class="btn btn-outline-secondary">Recovery
-                        Codes</a>
-                {% endif %}
+          {% endif %}
+
+          {% if manual_sub and manual_sub.is_active() %}
+            <div>
+              Manual plan which expires {{ manual_sub.end_at | dt }}
+              ({{ manual_sub.end_at.format("YYYY-MM-DD") }}).
+              {% if manual_sub.is_giveaway %}
+                <br>
+                To gain additional features and support SimpleLogin you can upgrade to a Premium plan. <br>
+                <a href="{{ url_for('dashboard.pricing') }}" class="btn btn-sm btn-outline-primary">Upgrade</a>
+              {% endif %}
             </div>
-        </div>
-        <!-- END TOTP -->
-
-        <!-- WebAuthn -->
-        <div class="card">
-            <div class="card-body">
-                <div class="card-title">Security Key (WebAuthn)</div>
-                <div class="mb-3">
-                    You can secure your account by linking either your FIDO-supported physical key such as Yubikey,
-                    Google
-                    Titan,
-                    or a device with appropriate hardware to your account.
-                </div>
-                {% if current_user.fido_uuid is none %}
-                    <a href="{{ url_for('dashboard.fido_setup') }}" class="btn btn-outline-primary">Setup WebAuthn</a>
-                {% else %}
-                    <a href="{{ url_for('dashboard.fido_manage') }}" class="btn btn-outline-info">Manage WebAuthn</a>
-                    <a href="{{ url_for('dashboard.recovery_code_route') }}" class="btn btn-outline-secondary">Recovery
-                        Codes</a>
-                {% endif %}
+          {% endif %}
+
+          {% if apple_sub and apple_sub.is_valid() %}
+            <div>
+              Premium plan subscribed via Apple which expires {{ apple_sub.expires_date | dt }}
+              ({{ apple_sub.expires_date.format("YYYY-MM-DD") }}).
+              <div class="alert alert-info">
+                If you want to subscribe via the Web instead, please make sure to cancel your subscription
+                on Apple first.
+                <a href="{{ url_for('dashboard.pricing') }}"
+                   class="">Upgrade <i class="fa fa-arrow-right" aria-hidden="true"></i></a>
+              </div>
             </div>
-        </div>
-        <!-- END WebAuthn -->
-
-
-        <!-- Newsletter -->
-        <div class="card" id="notification">
-            <div class="card-body">
-                <div class="card-title">Newsletters</div>
-                <div class="mb-3">
-                    We will occasionally send you emails with new feature announcements.
-                </div>
-                <form method="post">
-                    <input type="hidden" name="form-name" value="notification-preference">
-                    <div class="form-check">
-                        <input type="checkbox" id="notification" name="notification" {% if current_user.notification %}
-                               checked {% endif %} class="form-check-input">
-                        <label for="notification">I want to be emailed when new features are released.</label>
-                    </div>
-                    <button type="submit" class="btn btn-outline-primary">Submit</button>
-                </form>
+          {% endif %}
+
+          {% if coinbase_sub and coinbase_sub.is_active() %}
+            <div>
+              Yearly plan subscribed with cryptocurrency which expires on
+              {{ coinbase_sub.end_at.format("YYYY-MM-DD") }}.
+              <a href="{{ url_for('dashboard.coinbase_checkout_route') }}" target="_blank">
+                Extend Subscription <i class="fe fe-external-link"></i>
+              </a>
             </div>
+          {% endif %}
+        {% elif current_user.in_trial() %}
+          Your Premium trial expires {{ current_user.trial_end | dt }}.
+        {% else %}
+          You are on the Free plan.
+        {% endif %}
+      </div>
+    </div>
+    <!-- END Current plan -->
+
+    <!-- TOTP -->
+    <div class="card" id="totp">
+      <div class="card-body">
+        <div class="card-title">Two Factor Authentication</div>
+        <div class="mb-3">
+          Secure your account with 2FA, you'll be asked for a code generated through an app when you login. <br>
         </div>
-        <!-- END Newsletter -->
-
-        <!-- Change name & profile picture -->
-        <div class="card">
-            <form method="post" enctype="multipart/form-data">
-                {{ form.csrf_token }}
-                <input type="hidden" name="form-name" value="update-profile">
-
-                <div class="card-body">
-                    <div class="card-title">
-                        Profile
-                    </div>
-                    <div>
-                        This information will be filled in automatically when you use the
-                        <em>Sign in with SimpleLogin</em> button.
-                    </div>
-                    <div class="form-group mt-3">
-                        <label class="form-label">Name</label>
-                        {{ form.name(class="form-control", value=current_user.name) }}
-                        {{ render_field_errors(form.name) }}
-                    </div>
-
-                    <div class="form-group">
-                        <div class="form-label">Profile picture</div>
-                        {{ form.profile_picture(class="form-control-file") }}
-                        {{ render_field_errors(form.profile_picture) }}
-                        {% if current_user.profile_picture_id %}
-                            <img src="{{ current_user.profile_picture_url() }}" class="profile-picture">
-                        {% endif %}
-                    </div>
-                    <button class="btn btn-outline-primary">Update</button>
-                </div>
-            </form>
+        {% if not current_user.enable_otp %}
+          <a href="{{ url_for('dashboard.mfa_setup') }}" class="btn btn-outline-primary">Setup TOTP</a>
+        {% else %}
+          <a href="{{ url_for('dashboard.mfa_cancel') }}" class="btn btn-outline-danger">Disable TOTP</a>
+          <a href="{{ url_for('dashboard.recovery_code_route') }}" class="btn btn-outline-secondary">Recovery Codes</a>
+        {% endif %}
+      </div>
+    </div>
+    <!-- END TOTP -->
+
+    <!-- WebAuthn -->
+    <div class="card">
+      <div class="card-body">
+        <div class="card-title">Security Key (WebAuthn)</div>
+        <div class="mb-3">
+          You can secure your account by linking either your FIDO-supported physical key such as Yubikey, Google
+          Titan,
+          or a device with appropriate hardware to your account.
         </div>
-        <!-- END change name & profile picture -->
-
-        <!-- Change email -->
-        <div class="card">
-            <form method="post" enctype="multipart/form-data">
-                <input type="hidden" name="form-name" value="update-email">
-                {{ change_email_form.csrf_token }}
-
-                <div class="card-body">
-                    <div class="card-title">
-                        Account Email
-                    </div>
-                    <div class="mb-3">
-                        This email address is used to log in to SimpleLogin. <br>
-                        If you want to change the mailbox that emails are forwarded to, use the
-                        <a href="{{ url_for('dashboard.mailbox_route') }}">
-                            <i class="fe fe-inbox"></i> Mailboxes page
-                        </a> instead.
-                    </div>
-                    <div class="form-group mt-2">
-                        <!-- Not allow user to change email if there's a pending change -->
-                        {{ change_email_form.email(class="form-control", value=current_user.email, readonly=pending_email != None) }}
-                        {{ render_field_errors(change_email_form.email) }}
-
-                        {% if pending_email %}
-                            <div class="mt-2">
-                                <span class="text-danger">Pending email change: {{ pending_email }}</span>
-                                <a href="{{ url_for('dashboard.resend_email_change') }}"
-                                   class="btn btn-secondary btn-sm">Resend
-                                    confirmation email</a>
-                                <a href="{{ url_for('dashboard.cancel_email_change') }}"
-                                   class="btn btn-secondary btn-sm">Cancel email
-                                    change</a>
-                            </div>
-                        {% endif %}
-                    </div>
-                    <button class="btn btn-outline-primary">Change Email</button>
-                </div>
-            </form>
+        {% if current_user.fido_uuid is none %}
+          <a href="{{ url_for('dashboard.fido_setup') }}" class="btn btn-outline-primary">Setup WebAuthn</a>
+        {% else %}
+          <a href="{{ url_for('dashboard.fido_manage') }}" class="btn btn-outline-info">Manage WebAuthn</a>
+          <a href="{{ url_for('dashboard.recovery_code_route') }}" class="btn btn-outline-secondary">Recovery Codes</a>
+        {% endif %}
+      </div>
+    </div>
+    <!-- END WebAuthn -->
+
+
+    <!-- Newsletter -->
+    <div class="card" id="notification">
+      <div class="card-body">
+        <div class="card-title">Newsletters</div>
+        <div class="mb-3">
+          We will occasionally send you emails with new feature announcements.
         </div>
-        <!-- END Change email -->
-
-        <!-- Change password -->
-        <div class="card" id="change_password">
-            <div class="card-body">
-                <div class="card-title">
-                    Password
-                </div>
-                <div class="mb-3">
-                    You will receive an email containing instructions on how to change your password.
-                </div>
-                <form method="post">
-                    <input type="hidden" name="form-name" value="change-password">
-                    <button class="btn btn-outline-primary">Change password</button>
-                </form>
-            </div>
+        <form method="post">
+          <input type="hidden" name="form-name" value="notification-preference">
+          <div class="form-check">
+            <input type="checkbox" id="notification" name="notification" {% if current_user.notification %}
+                   checked {% endif %} class="form-check-input">
+            <label for="notification">I want to be emailed when new features are released.</label>
+          </div>
+          <button type="submit" class="btn btn-outline-primary">Submit</button>
+        </form>
+      </div>
+    </div>
+    <!-- END Newsletter -->
+
+    <!-- Change name & profile picture -->
+    <div class="card">
+      <form method="post" enctype="multipart/form-data">
+        {{ form.csrf_token }}
+        <input type="hidden" name="form-name" value="update-profile">
+
+        <div class="card-body">
+          <div class="card-title">
+            Profile
+          </div>
+          <div>
+            This information will be filled in automatically when you use the
+            <em>Sign in with SimpleLogin</em> button.
+          </div>
+          <div class="form-group mt-3">
+            <label class="form-label">Name</label>
+            {{ form.name(class="form-control", value=current_user.name) }}
+            {{ render_field_errors(form.name) }}
+          </div>
+
+          <div class="form-group">
+            <div class="form-label">Profile picture</div>
+            {{ form.profile_picture(class="form-control-file") }}
+            {{ render_field_errors(form.profile_picture) }}
+            {% if current_user.profile_picture_id %}
+              <img src="{{ current_user.profile_picture_url() }}" class="profile-picture">
+            {% endif %}
+          </div>
+          <button class="btn btn-outline-primary">Update</button>
+        </div>
+      </form>
+    </div>
+    <!-- END change name & profile picture -->
+
+    <!-- Change email -->
+    <div class="card">
+      <form method="post" enctype="multipart/form-data">
+        <input type="hidden" name="form-name" value="update-email">
+        {{ change_email_form.csrf_token }}
+
+        <div class="card-body">
+          <div class="card-title">
+            Account Email
+          </div>
+          <div class="mb-3">
+            This email address is used to log in to SimpleLogin. <br>
+            If you want to change the mailbox that emails are forwarded to, use the
+            <a href="{{ url_for('dashboard.mailbox_route') }}">
+              <i class="fe fe-inbox"></i> Mailboxes page
+            </a> instead.
+          </div>
+          <div class="form-group mt-2">
+            <!-- Not allow user to change email if there's a pending change -->
+            {{ change_email_form.email(class="form-control", value=current_user.email, readonly=pending_email != None) }}
+            {{ render_field_errors(change_email_form.email) }}
+
+            {% if pending_email %}
+              <div class="mt-2">
+                <span class="text-danger">Pending email change: {{ pending_email }}</span>
+                <a href="{{ url_for('dashboard.resend_email_change') }}" class="btn btn-secondary btn-sm">Resend
+                  confirmation email</a>
+                <a href="{{ url_for('dashboard.cancel_email_change') }}" class="btn btn-secondary btn-sm">Cancel email
+                  change</a>
+              </div>
+            {% endif %}
+          </div>
+          <button class="btn btn-outline-primary">Change Email</button>
         </div>
-        <!-- END Change password -->
-
-        <!-- Random alias -->
-        <div id="random-alias" class="card">
-            <div class="card-body">
-                <div class="card-title">Aliases</div>
-
-                <div class="mt-3 mb-1">Change the way random aliases are generated by default.</div>
-                <form method="post" action="#random-alias" class="form-inline">
-                    <input type="hidden" name="form-name" value="change-alias-generator">
-                    <select class="form-control mr-sm-2" name="alias-generator-scheme">
-                        <option value="{{ AliasGeneratorEnum.word.value }}"
-                                {% if current_user.alias_generator == AliasGeneratorEnum.word.value %}
-                                selected {% endif %} >Based on
-                            Random {{ AliasGeneratorEnum.word.name.capitalize() }}</option>
-                        <option value="{{ AliasGeneratorEnum.uuid.value }}"
-                                {% if current_user.alias_generator == AliasGeneratorEnum.uuid.value %}
-                                selected {% endif %} >Based
-                            on {{ AliasGeneratorEnum.uuid.name.upper() }}</option>
-                    </select>
-                    <button class="btn btn-outline-primary">Update</button>
-                </form>
-
-                <div class="mt-3 mb-1">Select the default domain for aliases.</div>
-                <form method="post" action="#random-alias" class="form-inline">
-                    <input type="hidden" name="form-name" value="change-random-alias-default-domain">
-                    <select class="form-control mr-sm-2" name="random-alias-default-domain">
-                        {% for is_public, domain in current_user.available_domains_for_random_alias() %}
-                            <option value="{{ domain }}"
-                                    {% if current_user.default_random_alias_domain() == domain %} selected {% endif %} >
-                                {{ domain }} ({% if is_public %} SimpleLogin domain {% else %} your domain {% endif %})
-                            </option>
-                        {% endfor %}
-                    </select>
-                    <button class="btn btn-outline-primary">Update</button>
-                </form>
-
-                <div id="random-alias-suffix" class="mt-3 mb-1">Select the default suffix generator for aliases.</div>
-                <form method="post" action="#random-alias-suffix" class="form-inline">
-                    <input type="hidden" name="form-name" value="random-alias-suffix">
-                    <select class="form-control mr-sm-2" name="random-alias-suffix-generator">
-
-                        <option value="0" {% if current_user.random_alias_suffix==0 %} selected {% endif %}>
-                            Random word from our dictionary
-                        </option>
-                        <option value="1" {% if current_user.random_alias_suffix==1 %} selected {% endif %}>
-                            Random combination of {{ ALIAS_RAND_SUFFIX_LENGTH }} letter and digits
-                        </option>
-                    </select>
-                    <button class="btn btn-outline-primary">Update</button>
-                </form>
+      </form>
+    </div>
+    <!-- END Change email -->
 
-            </div>
+    <!-- Change password -->
+    <div class="card" id="change_password">
+      <div class="card-body">
+        <div class="card-title">
+          Password
         </div>
-        <!-- END Random alias -->
-
-        <!-- Sender Format -->
-        <div class="card" id="sender-format">
-            <div class="card-body">
-                <div class="card-title">Sender Address Format</div>
-                <div class="mt-1 mb-3">
-                    When your alias receives an email, say from: <b>John Wick &lt;john@wick.com&gt;</b>,
-                    SimpleLogin forwards it to your mailbox. <br>
-
-                    Due to some email constraints, SimpleLogin cannot keep the sender email address
-                    in the original form and needs to <b>transform</b> it to one of the formats below.
-                </div>
-
-                <form method="post" action="#sender-format">
-                    <input type="hidden" name="form-name" value="change-sender-format">
-
-                    <select class="form-control mr-sm-2" name="sender-format">
-                        <option value="{{ SenderFormatEnum.AT.value }}"
-                                {% if current_user.sender_format == SenderFormatEnum.AT.value %} selected {% endif %}>
-                            John Wick - john at wick.com
-                        </option>
-
-                        <option value="{{ SenderFormatEnum.A.value }}"
-                                {% if current_user.sender_format == SenderFormatEnum.A.value %} selected {% endif %}>
-                            John Wick - john(a)wick.com
-                        </option>
-
-                        <option value="{{ SenderFormatEnum.NAME_ONLY.value }}"
-                                {% if current_user.sender_format == SenderFormatEnum.NAME_ONLY.value %}
-                                selected {% endif %}>
-                            John Wick
-                        </option>
-
-                        <option value="{{ SenderFormatEnum.AT_ONLY.value }}"
-                                {% if current_user.sender_format == SenderFormatEnum.AT_ONLY.value %}
-                                selected {% endif %}>
-                            john at wick.com
-                        </option>
-
-                        <option value="{{ SenderFormatEnum.NO_NAME.value }}"
-                                {% if current_user.sender_format == SenderFormatEnum.NO_NAME.value %}
-                                selected {% endif %}>
-                            No Name (i.e. only reverse-alias)
-                        </option>
-
-                    </select>
-
-                    <button class="btn btn-outline-primary mt-3">Update</button>
-                </form>
-            </div>
+        <div class="mb-3">
+          You will receive an email containing instructions on how to change your password.
         </div>
-        <!-- END Sender Format -->
-
-        <!-- Reverse-alias replacement -->
-        <div class="card" id="reverse-alias-replacement-section">
-            <div class="card-body">
-                <div class="card-title">Reverse Alias Replacement
-                    <div class="badge badge-warning">Experimental</div>
-                </div>
-                <div class="mb-3">
-                    When replying to a forwarded email, the <b>reverse-alias</b> can be automatically included
-                    in the attached message by your email client.
-                    If this option is enabled, SimpleLogin will try to <b>replace</b> the reverse-alias by your contact
-                    email.
-                    <br>
-                </div>
-                <form method="post" action="#reverse-alias-replacement-section">
-                    <input type="hidden" name="form-name" value="replace-ra">
-                    <div class="form-check">
-                        <input type="checkbox" id="replace-ra" name="replace-ra"
-                                {% if current_user.replace_reverse_alias %} checked {% endif %}
-                               class="form-check-input">
-                        <label for="replace-ra">Enable replacing reverse alias</label>
-                    </div>
-                    <button type="submit" class="btn btn-outline-primary">Update</button>
-                </form>
-            </div>
+        <form method="post">
+          <input type="hidden" name="form-name" value="change-password">
+          <button class="btn btn-outline-primary">Change password</button>
+        </form>
+      </div>
+    </div>
+    <!-- END Change password -->
+
+    <!-- Random alias -->
+    <div id="random-alias" class="card">
+      <div class="card-body">
+        <div class="card-title">Aliases</div>
+
+        <div class="mt-3 mb-1">Change the way random aliases are generated by default.</div>
+        <form method="post" action="#random-alias" class="form-inline">
+          <input type="hidden" name="form-name" value="change-alias-generator">
+          <select class="form-control mr-sm-2" name="alias-generator-scheme">
+            <option value="{{ AliasGeneratorEnum.word.value }}"
+                {% if current_user.alias_generator == AliasGeneratorEnum.word.value %} selected {% endif %} >Based on
+              Random {{ AliasGeneratorEnum.word.name.capitalize() }}</option>
+            <option value="{{ AliasGeneratorEnum.uuid.value }}"
+                {% if current_user.alias_generator == AliasGeneratorEnum.uuid.value %} selected {% endif %} >Based
+              on {{ AliasGeneratorEnum.uuid.name.upper() }}</option>
+          </select>
+          <button class="btn btn-outline-primary">Update</button>
+        </form>
+
+        <div class="mt-3 mb-1">Select the default domain for aliases.</div>
+        <form method="post" action="#random-alias" class="form-inline">
+          <input type="hidden" name="form-name" value="change-random-alias-default-domain">
+          <select class="form-control mr-sm-2" name="random-alias-default-domain">
+            {% for is_public, domain in current_user.available_domains_for_random_alias() %}
+              <option value="{{ domain }}"
+                  {% if current_user.default_random_alias_domain() == domain %} selected {% endif %} >
+                {{ domain }} ({% if is_public %} SimpleLogin domain {% else %} your domain {% endif %})
+              </option>
+            {% endfor %}
+          </select>
+          <button class="btn btn-outline-primary">Update</button>
+        </form>
+
+        <div id="random-alias-suffix" class="mt-3 mb-1">Select the default suffix generator for aliases.</div>
+        <form method="post" action="#random-alias-suffix" class="form-inline">
+          <input type="hidden" name="form-name" value="random-alias-suffix">
+          <select class="form-control mr-sm-2" name="random-alias-suffix-generator">
+
+            <option value="0" {% if current_user.random_alias_suffix==0 %} selected {% endif %}>
+              Random word from our dictionary
+            </option>
+            <option value="1" {% if current_user.random_alias_suffix==1 %} selected {% endif %}>
+              Random combination of {{ ALIAS_RAND_SUFFIX_LENGTH }} letter and digits
+            </option>
+          </select>
+          <button class="btn btn-outline-primary">Update</button>
+        </form>
+
+      </div>
+    </div>
+    <!-- END Random alias -->
+
+    <!-- Sender Format -->
+    <div class="card" id="sender-format">
+      <div class="card-body">
+        <div class="card-title">Sender Address Format</div>
+        <div class="mt-1 mb-3">
+          When your alias receives an email, say from: <b>John Wick &lt;john@wick.com&gt;</b>,
+          SimpleLogin forwards it to your mailbox. <br>
+
+          Due to some email constraints, SimpleLogin cannot keep the sender email address
+          in the original form and needs to <b>transform</b> it to one of the formats below.
         </div>
-        <!-- END Reverse-alias -->
-
-        <!-- SMTP for Aliases -->
-        <div class="card" id="smtp-for-aliases-section">
-            <div class="card-body">
-                <div class="card-title">SMTP for Aliases
-                    <div class="badge badge-warning">Experimental</div>
-                </div>
-                <div class="mb-3">
-                    This will enable <b>SMTP access for aliases</b>.
-                    If this option is enabled, emails can be sent directly from aliases via SMTP without the need for
-                    creation of reverse-alias.
-                    <br>
-                    Note: After enabling this, you would still need to enable SMTP individually per alias.
-                    <br>
-                    This will also disable receiving via reverse-alias for that particular alias. i.e. Sender's original
-                    address will be displayed in "From:".
-                    <br>
-                </div>
-                <form method="post" action="#smtp-for-aliases-section">
-                    <input type="hidden" name="form-name" value="smtp-for-aliases">
-                    <div class="form-check">
-                        <input type="checkbox" id="smtp-for-aliases" name="smtp-for-aliases"
-                                {% if current_user.enable_SMTP_aliases %} checked {% endif %} class="form-check-input">
-                        <label for="smtp-for-aliases">Enable SMTP for aliases</label>
-                    </div>
-                    <button type="submit" class="btn btn-outline-primary">Update</button>
-                </form>
-            </div>
+
+        <form method="post" action="#sender-format">
+          <input type="hidden" name="form-name" value="change-sender-format">
+
+          <select class="form-control mr-sm-2" name="sender-format">
+            <option value="{{ SenderFormatEnum.AT.value }}"
+                {% if current_user.sender_format == SenderFormatEnum.AT.value %} selected {% endif %}>
+              John Wick - john at wick.com
+            </option>
+
+            <option value="{{ SenderFormatEnum.A.value }}"
+                {% if current_user.sender_format == SenderFormatEnum.A.value %} selected {% endif %}>
+              John Wick - john(a)wick.com
+            </option>
+
+            <option value="{{ SenderFormatEnum.NAME_ONLY.value }}"
+                {% if current_user.sender_format == SenderFormatEnum.NAME_ONLY.value %} selected {% endif %}>
+              John Wick
+            </option>
+
+            <option value="{{ SenderFormatEnum.AT_ONLY.value }}"
+                {% if current_user.sender_format == SenderFormatEnum.AT_ONLY.value %} selected {% endif %}>
+              john at wick.com
+            </option>
+
+            <option value="{{ SenderFormatEnum.NO_NAME.value }}"
+                {% if current_user.sender_format == SenderFormatEnum.NO_NAME.value %} selected {% endif %}>
+              No Name (i.e. only reverse-alias)
+            </option>
+
+          </select>
+
+          <button class="btn btn-outline-primary mt-3">Update</button>
+        </form>
+      </div>
+    </div>
+    <!-- END Sender Format -->
+
+    <!-- Reverse-alias replacement -->
+    <div class="card" id="reverse-alias-replacement-section">
+      <div class="card-body">
+        <div class="card-title">Reverse Alias Replacement
+          <div class="badge badge-warning">Experimental</div>
         </div>
-        <!-- END SMTP for Aliases -->
-
-        <!-- Sender included in reverse-alias -->
-        <div class="card" id="sender-in-ra">
-            <div class="card-body">
-                <div class="card-title">Include sender address in reverse-alias</div>
-                <div class="mb-3">
-                    By default, the reverse-alias is randomly generated and doesn't contain any information about
-                    the sender.<br>
-
-                    Enabling this option will include the sender address in the reverse-alias. <br>
-
-                    This can be useful if you want to set up email filters based on the reverse-alias.
-                    It will also make the reverse-alias more readable.
-                </div>
-                <form method="post" action="#sender-in-ra">
-                    <input type="hidden" name="form-name" value="sender-in-ra">
-                    <div class="form-check">
-                        <input type="checkbox" id="include-sender-ra" name="enable"
-                                {#                   todo: remove current_user.include_sender_in_reverse_alias is none condition #}
-                                {% if current_user.include_sender_in_reverse_alias is none or current_user.include_sender_in_reverse_alias %}
-                               checked {% endif %} class="form-check-input">
-                        <label for="include-sender-ra">Include sender address in reverse-alias</label>
-                    </div>
-                    <button type="submit" class="btn btn-outline-primary">Update</button>
-                </form>
-            </div>
+        <div class="mb-3">
+          When replying to a forwarded email, the <b>reverse-alias</b> can be automatically included
+          in the attached message by your email client.
+          If this option is enabled, SimpleLogin will try to <b>replace</b> the reverse-alias by your contact email.
+          <br>
         </div>
-        <!-- END Reverse-alias -->
-
-        <!-- Always expand alias info -->
-        <div class="card" id="expand-alias-info-section">
-            <div class="card-body">
-                <div class="card-title">Always expand alias info</div>
-                <div class="mb-3">
-                    By default, additional alias info is shown after clicking on the "More" button. <br>
-                    When this option is enabled, alias additional info will always be shown. <br>
-                </div>
-                <form method="post" action="#expand-alias-info-section">
-                    <input type="hidden" name="form-name" value="expand-alias-info">
-                    <div class="form-check">
-                        <input type="checkbox" id="expand-alias-info" name="enable"
-                                {% if current_user.expand_alias_info %} checked {% endif %} class="form-check-input">
-                        <label for="expand-alias-info">Automatically expand alias info</label>
-                    </div>
-                    <button type="submit" class="btn btn-outline-primary">Update</button>
-                </form>
-            </div>
+        <form method="post" action="#reverse-alias-replacement-section">
+          <input type="hidden" name="form-name" value="replace-ra">
+          <div class="form-check">
+            <input type="checkbox" id="replace-ra" name="replace-ra"
+                {% if current_user.replace_reverse_alias %} checked {% endif %} class="form-check-input">
+            <label for="replace-ra">Enable replacing reverse alias</label>
+          </div>
+          <button type="submit" class="btn btn-outline-primary">Update</button>
+        </form>
+      </div>
+    </div>
+    <!-- END Reverse-alias -->
+
+  <!-- SMTP for Aliases -->
+    <div class="card" id="smtp-for-aliases-section">
+      <div class="card-body">
+        <div class="card-title">SMTP for Aliases
+          <div class="badge badge-warning">Experimental</div>
         </div>
-        <!-- END Always expand alias info -->
-
-        <!-- Include website address in alias -->
-        <div class="card" id="include_website_in_one_click_alias">
-            <div class="card-body">
-                <div class="card-title">
-                    Include website address in one-click alias creation on browser extension
-                </div>
-                <div class="mb-3">
-                    If enabled, the website name will be used as alias prefix
-                    when you create an alias via SimpleLogin browser extension via the email input field <br>
-                    <img src="https://simplelogin.io/images/one-click-alias.gif" class="my-2"
-                         style="max-width: 40%">
-                </div>
-                <form method="post" action="#include_website_in_one_click_alias">
-                    <input type="hidden" name="form-name" value="include_website_in_one_click_alias">
-                    <div class="form-check">
-                        <input type="checkbox" id="include-website-in-alias" name="enable"
-                                {% if current_user.include_website_in_one_click_alias %} checked {% endif %}
-                               class="form-check-input">
-                        <label for="include-website-in-alias">Include website address in alias</label>
-                    </div>
-                    <button type="submit" class="btn btn-outline-primary">Update</button>
-                </form>
-            </div>
+        <div class="mb-3">
+          This will enable <b>SMTP access for aliases</b>.
+          If this option is enabled, emails can be sent directly from aliases via SMTP without the need for creation of reverse-alias.
+          <br>
+            Note: After enabling this, you would still need to enable SMTP individually per alias.
+          <br>
+            This will also disable receiving via reverse-alias for that particular alias. i.e. Sender's original address will be displayed in "From:".
+          <br>
         </div>
-        <!-- END Include website address in alias -->
-
-        <!-- Ignore Loop Email -->
-        {#    <div class="card" id="ignore-loop-email-section">#}
-        {#      <div class="card-body">#}
-        {#        <div class="card-title">Ignore Loop Emails</div>#}
-        {#        <div class="mb-3">#}
-        {#          On some email clients, "Reply All" automatically includes your alias that#}
-        {#          would send the same email to your mailbox.#}
-        {#          <br>#}
-        {#          You can disable these "loop" emails by enabling this option.#}
-        {#        </div>#}
-        {#        <form method="post" action="#ignore-loop-email-section">#}
-        {#          <input type="hidden" name="form-name" value="ignore-loop-email">#}
-        {#          <div class="form-check">#}
-        {#            <input type="checkbox" id="ignore-loop-email" name="enable"#}
-        {#                {% if current_user.ignore_loop_email %} checked {% endif %} class="form-check-input">#}
-        {#            <label for="ignore-loop-email">Ignore Loop Emails</label>#}
-        {#          </div>#}
-        {#          <button type="submit" class="btn btn-outline-primary">Update</button>#}
-        {#        </form>#}
-        {#      </div>#}
-        {#    </div>#}
-        <!-- END Ignore Loop Email -->
-
-        <!-- One-click subscribe -->
-        <div class="card" id="one-click-unsubscribe-section">
-            <div class="card-body">
-                <div class="card-title">One-click unsubscribe</div>
-                <div class="mb-3">
-                    On email clients that support the
-                    <a href="https://simplelogin.io/docs/getting-started/one-click-unsubscribe/">One-click
-                        unsubscribe</a> button,
-                    clicking on it will disable the alias that receives the emails.
-                    <br>
-                    You can choose to block the sender instead of disabling the alias.
-                </div>
-                <form method="post" action="#one-click-unsubscribe-section">
-                    <input type="hidden" name="form-name" value="one-click-unsubscribe">
-                    <div class="form-check">
-                        <input type="checkbox" id="one-click-unsubscribe" name="enable"
-                                {% if current_user.one_click_unsubscribe_block_sender %} checked {% endif %}
-                               class="form-check-input">
-                        <label for="one-click-unsubscribe">Block sender instead</label>
-                    </div>
-                    <button type="submit" class="btn btn-outline-primary">Update</button>
-                </form>
-            </div>
+        <form method="post" action="#smtp-for-aliases-section">
+          <input type="hidden" name="form-name" value="smtp-for-aliases">
+          <div class="form-check">
+            <input type="checkbox" id="smtp-for-aliases" name="smtp-for-aliases"
+                {% if current_user.enable_SMTP_aliases %} checked {% endif %} class="form-check-input">
+            <label for="smtp-for-aliases">Enable SMTP for aliases</label>
+          </div>
+          <button type="submit" class="btn btn-outline-primary">Update</button>
+        </form>
+      </div>
+    </div>
+    <!-- END SMTP for Aliases -->
+
+    <!-- Sender included in reverse-alias -->
+    <div class="card" id="sender-in-ra">
+      <div class="card-body">
+        <div class="card-title">Include sender address in reverse-alias</div>
+        <div class="mb-3">
+          By default, the reverse-alias is randomly generated and doesn't contain any information about
+          the sender.<br>
+
+          Enabling this option will include the sender address in the reverse-alias. <br>
+
+          This can be useful if you want to set up email filters based on the reverse-alias.
+          It will also make the reverse-alias more readable.
         </div>
-        <!-- END One-click subscribe -->
-
-        <div class="card">
-            <div class="card-body">
-                <div class="card-title">Quarantine</div>
-                <div class="mb-3">
-                    When an email sent to your alias is classified as spam or refused by your email provider,
-                    it usually means your alias has been leaked to a spammer. <br>
-                    In this case SimpleLogin will <b>keep</b> a copy of this email (so it isn't lost)
-                    and notify you so you can take a look at its content and take appropriate actions. <br>
-
-                    The emails are deleted in 7 days.
-                    This is an exceptional case where SimpleLogin stores the email.
-                </div>
-                <a href="{{ url_for('dashboard.refused_email_route') }}" class="btn btn-outline-primary">
-                    See refused emails
-                </a>
-            </div>
+        <form method="post" action="#sender-in-ra">
+          <input type="hidden" name="form-name" value="sender-in-ra">
+          <div class="form-check">
+            <input type="checkbox" id="include-sender-ra" name="enable"
+                {#                   todo: remove current_user.include_sender_in_reverse_alias is none condition #}
+                {% if current_user.include_sender_in_reverse_alias is none or current_user.include_sender_in_reverse_alias %}
+                   checked {% endif %} class="form-check-input">
+            <label for="include-sender-ra">Include sender address in reverse-alias</label>
+          </div>
+          <button type="submit" class="btn btn-outline-primary">Update</button>
+        </form>
+      </div>
+    </div>
+    <!-- END Reverse-alias -->
+
+    <!-- Always expand alias info -->
+    <div class="card" id="expand-alias-info-section">
+      <div class="card-body">
+        <div class="card-title">Always expand alias info</div>
+        <div class="mb-3">
+          By default, additional alias info is shown after clicking on the "More" button. <br>
+          When this option is enabled, alias additional info will always be shown. <br>
         </div>
+        <form method="post" action="#expand-alias-info-section">
+          <input type="hidden" name="form-name" value="expand-alias-info">
+          <div class="form-check">
+            <input type="checkbox" id="expand-alias-info" name="enable"
+                {% if current_user.expand_alias_info %} checked {% endif %} class="form-check-input">
+            <label for="expand-alias-info">Automatically expand alias info</label>
+          </div>
+          <button type="submit" class="btn btn-outline-primary">Update</button>
+        </form>
+      </div>
+    </div>
+    <!-- END Always expand alias info -->
 
-        <div class="card" id="blocked-behaviour">
-            <div class="card-body">
-                <div class="card-title">Disabled alias/Blocked contact</div>
-                <div class="mb-3">
-                    When an email is sent to a <b>disabled</b> alias or sent from a <b>blocked</b> contact, you can
-                    decide what response the sender should see. <br>
-                    <b>Ignore</b> means they will see the message as delivered, but SimpleLogin won't actually forward
-                    it to you.
-                    This is the default option as you can start receiving the emails again
-                    by re-enabling the alias or unblocking a contact.<br>
-                    <b>Reject</b> means SimpleLogin will tell them that the alias does not exist. <br>
-                </div>
-                <form method="post" action="#blocked-behaviour" class="form-inline">
-                    <input type="hidden" name="form-name" value="change-blocked-behaviour">
-
-                    <select class="form-control mr-sm-2" name="blocked-behaviour">
-                        <option value="{{ BlockBehaviourEnum.return_2xx.value }}"
-                                {% if current_user.block_behaviour.value == BlockBehaviourEnum.return_2xx.value %}
-                                selected="selected" {% endif %}>
-                            Ignore (the sender will see the email as delivered, but you won't receive anything).
-                        </option>
-                        <option value="{{ BlockBehaviourEnum.return_5xx.value }}"
-                                {% if current_user.block_behaviour.value == BlockBehaviourEnum.return_5xx.value %}
-                                selected="selected" {% endif %}>
-                            Reject (the sender will be told that your alias does not exist).
-                        </option>
-
-                    </select>
-
-                    <button class="btn btn-outline-primary">Update</button>
-                </form>
-            </div>
+    <!-- Include website address in alias -->
+    <div class="card" id="include_website_in_one_click_alias">
+      <div class="card-body">
+        <div class="card-title">
+          Include website address in one-click alias creation on browser extension
+        </div>
+        <div class="mb-3">
+          If enabled, the website name will be used as alias prefix
+          when you create an alias via SimpleLogin browser extension via the email input field <br>
+          <img src="https://simplelogin.io/images/one-click-alias.gif" class="my-2"
+               style="max-width: 40%">
+        </div>
+        <form method="post" action="#include_website_in_one_click_alias">
+          <input type="hidden" name="form-name" value="include_website_in_one_click_alias">
+          <div class="form-check">
+            <input type="checkbox" id="include-website-in-alias" name="enable"
+                {% if current_user.include_website_in_one_click_alias %} checked {% endif %} class="form-check-input">
+            <label for="include-website-in-alias">Include website address in alias</label>
+          </div>
+          <button type="submit" class="btn btn-outline-primary">Update</button>
+        </form>
+      </div>
+    </div>
+    <!-- END Include website address in alias -->
+
+    <!-- Ignore Loop Email -->
+    {#    <div class="card" id="ignore-loop-email-section">#}
+    {#      <div class="card-body">#}
+    {#        <div class="card-title">Ignore Loop Emails</div>#}
+    {#        <div class="mb-3">#}
+    {#          On some email clients, "Reply All" automatically includes your alias that#}
+    {#          would send the same email to your mailbox.#}
+    {#          <br>#}
+    {#          You can disable these "loop" emails by enabling this option.#}
+    {#        </div>#}
+    {#        <form method="post" action="#ignore-loop-email-section">#}
+    {#          <input type="hidden" name="form-name" value="ignore-loop-email">#}
+    {#          <div class="form-check">#}
+    {#            <input type="checkbox" id="ignore-loop-email" name="enable"#}
+    {#                {% if current_user.ignore_loop_email %} checked {% endif %} class="form-check-input">#}
+    {#            <label for="ignore-loop-email">Ignore Loop Emails</label>#}
+    {#          </div>#}
+    {#          <button type="submit" class="btn btn-outline-primary">Update</button>#}
+    {#        </form>#}
+    {#      </div>#}
+    {#    </div>#}
+    <!-- END Ignore Loop Email -->
+
+    <!-- One-click subscribe -->
+    <div class="card" id="one-click-unsubscribe-section">
+      <div class="card-body">
+        <div class="card-title">One-click unsubscribe</div>
+        <div class="mb-3">
+          On email clients that support the
+          <a href="https://simplelogin.io/docs/getting-started/one-click-unsubscribe/">One-click unsubscribe</a> button,
+          clicking on it will disable the alias that receives the emails.
+          <br>
+          You can choose to block the sender instead of disabling the alias.
+        </div>
+        <form method="post" action="#one-click-unsubscribe-section">
+          <input type="hidden" name="form-name" value="one-click-unsubscribe">
+          <div class="form-check">
+            <input type="checkbox" id="one-click-unsubscribe" name="enable"
+                {% if current_user.one_click_unsubscribe_block_sender %} checked {% endif %} class="form-check-input">
+            <label for="one-click-unsubscribe">Block sender instead</label>
+          </div>
+          <button type="submit" class="btn btn-outline-primary">Update</button>
+        </form>
+      </div>
+    </div>
+    <!-- END One-click subscribe -->
+
+    <div class="card">
+      <div class="card-body">
+        <div class="card-title">Quarantine</div>
+        <div class="mb-3">
+          When an email sent to your alias is classified as spam or refused by your email provider,
+          it usually means your alias has been leaked to a spammer. <br>
+          In this case SimpleLogin will <b>keep</b> a copy of this email (so it isn't lost)
+          and notify you so you can take a look at its content and take appropriate actions. <br>
+
+          The emails are deleted in 7 days.
+          This is an exceptional case where SimpleLogin stores the email.
         </div>
+        <a href="{{ url_for('dashboard.refused_email_route') }}" class="btn btn-outline-primary">
+          See refused emails
+        </a>
+      </div>
+    </div>
 
-        <div class="card" id="sender-header">
-            <div class="card-body">
-                <div class="card-title">Include original sender in email headers
-                </div>
-                <div class="mb-3">
-                    SimpleLogin forwards emails to your mailbox from the <b>reverse-alias</b> and not from the <b>original</b>
-                    sender address. <br>
-                    If this option is enabled, the original sender addresses is stored in the email header <b>X-SimpleLogin-Envelope-From</b>.
-                    You can choose to display this header in your email client. <br>
-                    As email headers aren't encrypted, your mailbox service can know the sender address via this header.
-                </div>
-                <form method="post" action="#sender-header">
-                    <input type="hidden" name="form-name" value="sender-header">
-
-                    <div class="form-check">
-                        <input type="checkbox" id="include-sender-header" name="enable"
-                                {% if current_user.include_header_email_header %} checked {% endif %}
-                               class="form-check-input">
-                        <label for="include-sender-header">Include sender address in email headers</label>
-                    </div>
-
-                    <button type="submit" class="btn btn-outline-primary">Update</button>
-                </form>
-            </div>
+    <div class="card" id="blocked-behaviour">
+      <div class="card-body">
+        <div class="card-title">Disabled alias/Blocked contact</div>
+        <div class="mb-3">
+          When an email is sent to a <b>disabled</b> alias or sent from a <b>blocked</b> contact, you can decide what response the sender should see. <br>
+          <b>Ignore</b> means they will see the message as delivered, but SimpleLogin won't actually forward it to you.
+          This is the default option as you can start receiving the emails again
+          by re-enabling the alias or unblocking a contact.<br>
+          <b>Reject</b> means SimpleLogin will tell them that the alias does not exist. <br>
         </div>
+        <form method="post" action="#blocked-behaviour" class="form-inline">
+          <input type="hidden" name="form-name" value="change-blocked-behaviour">
+
+          <select class="form-control mr-sm-2" name="blocked-behaviour">
+              <option value="{{ BlockBehaviourEnum.return_2xx.value }}"
+                      {% if current_user.block_behaviour.value == BlockBehaviourEnum.return_2xx.value %} selected="selected" {% endif %}>
+                  Ignore (the sender will see the email as delivered, but you won't receive anything).
+              </option>
+              <option value="{{ BlockBehaviourEnum.return_5xx.value }}"
+                      {% if current_user.block_behaviour.value == BlockBehaviourEnum.return_5xx.value %} selected="selected" {% endif %}>
+                  Reject (the sender will be told that your alias does not exist).
+              </option>
+
+          </select>
+
+          <button class="btn btn-outline-primary">Update</button>
+        </form>
+      </div>
+    </div>
 
-        <div class="card">
-            <div class="card-body">
-                <div class="card-title">Alias Import</div>
-                <div class="mb-3">
-                    You can import your aliases created on other platforms into SimpleLogin.
-                </div>
-                <a href="{{ url_for('dashboard.batch_import_route') }}" class="btn btn-outline-primary">
-                    Batch Import
-                </a>
+    <div class="card" id="sender-header">
+      <div class="card-body">
+        <div class="card-title">Include original sender in email headers
+        </div>
+        <div class="mb-3">
+          SimpleLogin forwards emails to your mailbox from the <b>reverse-alias</b> and not from the <b>original</b> sender address. <br>
+          If this option is enabled, the original sender addresses is stored in the email header <b>X-SimpleLogin-Envelope-From</b>.
+          You can choose to display this header in your email client. <br>
+          As email headers aren't encrypted, your mailbox service can know the sender address via this header.
+        </div>
+        <form method="post" action="#sender-header">
+          <input type="hidden" name="form-name" value="sender-header">
+
+          <div class="form-check">
+            <input type="checkbox" id="include-sender-header" name="enable"
+                {% if current_user.include_header_email_header %} checked {% endif %} class="form-check-input">
+            <label for="include-sender-header">Include sender address in email headers</label>
+          </div>
+
+          <button type="submit" class="btn btn-outline-primary">Update</button>
+        </form>
+      </div>
+    </div>
 
-            </div>
+    <div class="card">
+      <div class="card-body">
+        <div class="card-title">Alias Import</div>
+        <div class="mb-3">
+          You can import your aliases created on other platforms into SimpleLogin.
         </div>
+        <a href="{{ url_for('dashboard.batch_import_route') }}" class="btn btn-outline-primary">
+          Batch Import
+        </a>
 
-        <div class="card">
-            <div class="card-body">
-                <div class="card-title">Data Export</div>
-                <div class="mb-3">
-                    You can download all aliases you have created on SimpleLogin along with other data.
-                </div>
-
-                <div class="d-flex">
-                    <div>
-                        <form method="post">
-                            <input type="hidden" name="form-name" value="export-data">
-                            <button class="btn btn-outline-info">Export Data</button>
-                        </form>
-                    </div>
-                    <div class="ml-5">
-                        <form method="post">
-                            <input type="hidden" name="form-name" value="export-alias">
-                            <button class="btn btn-outline-primary">Export Aliases</button>
-                        </form>
-                    </div>
-                </div>
+      </div>
+    </div>
 
+    <div class="card">
+      <div class="card-body">
+        <div class="card-title">Data Export</div>
+        <div class="mb-3">
+          You can download all aliases you have created on SimpleLogin along with other data.
+        </div>
 
-            </div>
+        <div class="d-flex">
+          <div>
+            <form method="post">
+              <input type="hidden" name="form-name" value="export-data">
+              <button class="btn btn-outline-info">Export Data</button>
+            </form>
+          </div>
+          <div class="ml-5">
+            <form method="post">
+              <input type="hidden" name="form-name" value="export-alias">
+              <button class="btn btn-outline-primary">Export Aliases</button>
+            </form>
+          </div>
         </div>
 
-        <div class="card">
-            <div class="card-body">
-                <div class="card-title">Account Deletion</div>
-                <div class="mb-3">
-                    If SimpleLogin isn't the right fit for you, you can simply delete your account.
-                </div>
 
-                <a href="{{ url_for('dashboard.delete_account') }}" class="btn btn-outline-danger">Delete account</a>
-            </div>
+      </div>
+    </div>
+
+    <div class="card">
+      <div class="card-body">
+        <div class="card-title">Account Deletion</div>
+        <div class="mb-3">
+          If SimpleLogin isn't the right fit for you, you can simply delete your account.
         </div>
 
+        <a href="{{ url_for('dashboard.delete_account') }}" class="btn btn-outline-danger">Delete account</a>
+      </div>
     </div>
 
+  </div>
+
 {% endblock %}
 
 

From 6180a807aa03bfc6b02acf0a7ea2a7d3bcee3fcd Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Sun, 3 Apr 2022 04:08:11 -0400
Subject: [PATCH 30/36] Re-format again with PyCharm

- Changed PyCharm's reformat settings to match the repo
---
 templates/dashboard/index.html   | 155 ++++++++++++++++---------------
 templates/dashboard/setting.html |   2 +-
 2 files changed, 79 insertions(+), 78 deletions(-)

diff --git a/templates/dashboard/index.html b/templates/dashboard/index.html
index fc40d3965..adacbd40b 100644
--- a/templates/dashboard/index.html
+++ b/templates/dashboard/index.html
@@ -191,11 +191,11 @@
               Pinned Aliases
             </option>
 
-          {%  if current_user.enable_SMTP_aliases %}
-            <option value="enable_SMTP" {% if filter == "enable_SMTP" %} selected {% endif %}>
-              Only SMTP Enabled Aliases
-            </option>
-          {% endif %}
+            {% if current_user.enable_SMTP_aliases %}
+              <option value="enable_SMTP" {% if filter == "enable_SMTP" %} selected {% endif %}>
+                Only SMTP Enabled Aliases
+              </option>
+            {% endif %}
 
             <option value="enabled" {% if filter == "enabled" %} selected {% endif %}>
               Only Enabled Aliases
@@ -284,12 +284,12 @@
                       title="This alias is pinned"></span>
               {% endif %}
 
-            {%  if current_user.enable_SMTP_aliases %}
-              {% if alias.enable_SMTP %}
-                <span class="fa fa-id-card" data-toggle="tooltip"
-                      title="SMTP is enabled for this alias"></span>
+              {%  if current_user.enable_SMTP_aliases %}
+                {% if alias.enable_SMTP %}
+                  <span class="fa fa-id-card" data-toggle="tooltip"
+                        title="SMTP is enabled for this alias"></span>
+                {% endif %}
               {% endif %}
-            {% endif %}
 
               {% if alias.hibp_breaches | length > 0 %}
                 <a href="https://haveibeenpwned.com/account/{{ alias.email }}">
@@ -528,7 +528,7 @@
             </div>
 
           {%  if current_user.enable_SMTP_aliases %}
-          <div class="small-text mt-2" data-toogle="tooltip"
+            <div class="small-text mt-2" data-toogle="tooltip"
                  title="This enables sending via SMTP for alias">
               Enable SMTP for this alias
               <i class="fe fe-help-circle"></i>
@@ -538,12 +538,12 @@
                 <input type="checkbox" class="enable-disable-smtp custom-switch-input"
                        data-alias="{{ alias.id }}"
                        data-alias-email="{{ alias.email }}"
-                    {{ "checked" if alias.enable_SMTP else "" }}>
-
-                <span class="custom-switch-indicator"></span>
+                     {{ "checked" if alias.enable_SMTP else "" }}>
+                  <span class="custom-switch-indicator"></span>
               </label>
             </div>
-            {% endif %}
+          {% endif %}
+
             <div>
               <div class="btn-group float-right" role="group" aria-label="Basic example">
                 <a href="{{ url_for('dashboard.alias_transfer_send_route', alias_id=alias.id) }}"
@@ -619,81 +619,82 @@
 
     $('.highlighted').tooltip("show");
   </script>
-    {%  if current_user.enable_SMTP_aliases %}
-        <script type="module">
 
-        import { nanoid } from "{{ url_for('static', filename='node_modules/nanoid/nanoid.js') }}"
+  {%  if current_user.enable_SMTP_aliases %}
+    <script type="module">
 
-        $(".enable-disable-smtp").change(async function () {
-          let aliasId = $(this).data("alias");
-          let alias = $(this).data("alias-email");
-          const oldValue = !$(this).prop("checked");
-          let newValue = !oldValue;
+      import { nanoid } from "{{ url_for('static', filename='node_modules/nanoid/nanoid.js') }}"
 
-          if(newValue) {
-            var smtp_generated_password = nanoid(21);
+      $(".enable-disable-smtp").change(async function () {
+        let aliasId = $(this).data("alias");
+        let alias = $(this).data("alias-email");
+        const oldValue = !$(this).prop("checked");
+        let newValue = !oldValue;
 
-            var message = `SMTP credentials for alias (<b>This will be visible only once, so please save it</b>):
+        if(newValue) {
+          var smtp_generated_password = nanoid(21);
+
+          var message = `SMTP credentials for alias (<b>This will be visible only once, so please save it</b>):
                         <br><br>Username (same as alias): ${alias}
                         <br>Password: ${smtp_generated_password}<br>
-                        `;
+                      `;
+        }
+        try {
+          if(newValue) {
+            var res = await fetch(`/api/aliases/${aliasId}`, {
+              method: "PUT",
+              headers: {
+                "Content-Type": "application/json",
+              },
+              body: JSON.stringify({
+                enable_SMTP: newValue,
+                smtp_password: smtp_generated_password,
+              }),
+            });
           }
-          try {
-            if(newValue) {
-              var res = await fetch(`/api/aliases/${aliasId}`, {
-                method: "PUT",
-                headers: {
-                  "Content-Type": "application/json",
-                },
-                body: JSON.stringify({
-                  enable_SMTP: newValue,
-                  smtp_password: smtp_generated_password,
-                }),
-              });
-            }
-            else {
-              var res = await fetch(`/api/aliases/${aliasId}`, {
-                method: "PUT",
-                headers: {
-                  "Content-Type": "application/json",
+          else {
+            var res = await fetch(`/api/aliases/${aliasId}`, {
+              method: "PUT",
+              headers: {
+                "Content-Type": "application/json",
+              },
+              body: JSON.stringify({
+                enable_SMTP: newValue,
+              }),
+            });
+          }
+          if (res.ok) {
+            if (newValue) {
+              bootbox.alert({
+                title: `SMTP Credentials for ${alias}`,
+                message: message,
+                size: 'large',
+                onEscape: false,
+                buttons: {
+                  ok: {
+                    label: 'Ok, I have saved them',
+                    className: 'btn-primary',
+                  },
                 },
-                body: JSON.stringify({
-                  enable_SMTP: newValue,
-                }),
+                callback: function () {
+                  toastr.success(`SMTP Enabled for ${alias}`);
+                }
               });
-            }
-            if (res.ok) {
-              if (newValue) {
-                bootbox.alert({
-                  title: `SMTP Credentials for ${alias}`,
-                  message: message,
-                  size: 'large',
-                  onEscape: false,
-                  buttons: {
-                    ok: {
-                      label: 'Ok, I have saved them',
-                      className: 'btn-primary',
-                    },
-                  },
-                  callback: function () {
-                    toastr.success(`SMTP Enabled for ${alias}`);
-                  }
-                });
-                smtp_generated_password = null; // Clear the password.
-              } else {
-                toastr.info(`SMTP Disabled for ${alias}`);
-              }
+              smtp_generated_password = null; // Clear the password.
             } else {
-              toastr.error("Sorry for the inconvenience! Could you refresh the page & retry please?", "Unknown Error");
-              // reset to the original value
-              $(this).prop("checked", oldValue);
+              toastr.info(`SMTP Disabled for ${alias}`);
             }
-          } catch (e) {
+          } else {
             toastr.error("Sorry for the inconvenience! Could you refresh the page & retry please?", "Unknown Error");
             // reset to the original value
             $(this).prop("checked", oldValue);
           }
-        });
-        </script>
-    {% endif %}
+        } catch (e) {
+          toastr.error("Sorry for the inconvenience! Could you refresh the page & retry please?", "Unknown Error");
+          // reset to the original value
+          $(this).prop("checked", oldValue);
+        }
+      });
+    </script>
+  {% endif %}
 {% endblock %}
diff --git a/templates/dashboard/setting.html b/templates/dashboard/setting.html
index 507c84394..72c8e9812 100644
--- a/templates/dashboard/setting.html
+++ b/templates/dashboard/setting.html
@@ -351,7 +351,7 @@
     </div>
     <!-- END Reverse-alias -->
 
-  <!-- SMTP for Aliases -->
+    <!-- SMTP for Aliases -->
     <div class="card" id="smtp-for-aliases-section">
       <div class="card-body">
         <div class="card-title">SMTP for Aliases

From 8a5efb2bb2928bf95be98d42604cde95ca9b63c9 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Sun, 3 Apr 2022 04:10:18 -0400
Subject: [PATCH 31/36] Redo Change JS vars to camelcase

- Had to do this again after commit revert
---
 templates/dashboard/index.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/dashboard/index.html b/templates/dashboard/index.html
index adacbd40b..e36078cfc 100644
--- a/templates/dashboard/index.html
+++ b/templates/dashboard/index.html
@@ -632,11 +632,11 @@
         let newValue = !oldValue;
 
         if(newValue) {
-          var smtp_generated_password = nanoid(21);
+          var smtpGeneratedPassword = nanoid(21);
 
           var message = `SMTP credentials for alias (<b>This will be visible only once, so please save it</b>):
                         <br><br>Username (same as alias): ${alias}
-                        <br>Password: ${smtp_generated_password}<br>
+                        <br>Password: ${smtpGeneratedPassword}<br>
                       `;
         }
         try {
@@ -648,7 +648,7 @@
               },
               body: JSON.stringify({
                 enable_SMTP: newValue,
-                smtp_password: smtp_generated_password,
+                smtp_password: smtpGeneratedPassword,
               }),
             });
           }
@@ -680,7 +680,7 @@
                   toastr.success(`SMTP Enabled for ${alias}`);
                 }
               });
-              smtp_generated_password = null; // Clear the password.
+              smtpGeneratedPassword = null; // Clear the password.
             } else {
               toastr.info(`SMTP Disabled for ${alias}`);
             }

From b8ec8aad10ac54c9422d464429dcd5300b56f206 Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Thu, 14 Apr 2022 21:51:28 -0400
Subject: [PATCH 32/36] Remove `__table_args__` when `unique=True` in models.py

---
 app/models.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/models.py b/app/models.py
index ff5dd159c..681664b46 100644
--- a/app/models.py
+++ b/app/models.py
@@ -2577,7 +2577,6 @@ class AliasMailbox(Base, ModelMixin):
 
 class SMTPCredentials(Base, ModelMixin, PasswordOracle):
     __tablename__ = "SMTP_credentials"
-    __table_args__ = (sa.UniqueConstraint("alias_id", name="uq_alias"),)
 
     alias_id = sa.Column(
         sa.ForeignKey(Alias.id, ondelete="cascade"), unique=True, nullable=False, index=True

From 18c0a0204dead8afb27cd47cb157a7dc48503faa Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Thu, 14 Apr 2022 21:59:25 -0400
Subject: [PATCH 33/36] Revert keeping original header in email_handler.py

---
 email_handler.py | 53 +++++++++++++++++++++---------------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/email_handler.py b/email_handler.py
index 103e091e8..96cb0c6f5 100644
--- a/email_handler.py
+++ b/email_handler.py
@@ -775,11 +775,6 @@ def forward_email_to_mailbox(
         else:
             return False, status.E518
 
-    # check if alias has SMTP enabled
-    is_SMTP_enabled_for_alias = False
-    if user.enable_SMTP_aliases and alias.SMTP_enabled():
-        is_SMTP_enabled_for_alias = True
-
     # sanity check: make sure mailbox is not actually an alias
     if get_email_domain_part(alias.email) == get_email_domain_part(mailbox.email):
         LOG.w(
@@ -932,32 +927,30 @@ def forward_email_to_mailbox(
 
     replace_sl_message_id_by_original_message_id(msg)
 
-    # Don't Change Headers when SMTP is enabled for alias
-    if not is_SMTP_enabled_for_alias:
-        # change the from_header so the email comes from a reverse-alias
-        # replace the email part in from: header
-        old_from_header = msg[headers.FROM]
-        new_from_header = contact.new_addr()
-        add_or_replace_header(msg, "From", new_from_header)
-        LOG.d("From header, new:%s, old:%s", new_from_header, old_from_header)
-
-        if reply_to_contact:
-            reply_to_header = msg[headers.REPLY_TO]
-            new_reply_to_header = reply_to_contact.new_addr()
-            add_or_replace_header(msg, "Reply-To", new_reply_to_header)
-            LOG.d(
-                "Reply-To header, new:%s, old:%s", new_reply_to_header, reply_to_header
-            )
+    # change the from_header so the email comes from a reverse-alias
+    # replace the email part in from: header
+    old_from_header = msg[headers.FROM]
+    new_from_header = contact.new_addr()
+    add_or_replace_header(msg, "From", new_from_header)
+    LOG.d("From header, new:%s, old:%s", new_from_header, old_from_header)
+
+    if reply_to_contact:
+        reply_to_header = msg[headers.REPLY_TO]
+        new_reply_to_header = reply_to_contact.new_addr()
+        add_or_replace_header(msg, "Reply-To", new_reply_to_header)
+        LOG.d(
+            "Reply-To header, new:%s, old:%s", new_reply_to_header, reply_to_header
+        )
 
-        # replace CC & To emails by reverse-alias for all emails that are not alias
-        try:
-            replace_header_when_forward(msg, alias, "Cc")
-            replace_header_when_forward(msg, alias, "To")
-        except CannotCreateContactForReverseAlias:
-            LOG.d("CannotCreateContactForReverseAlias error, delete %s", email_log)
-            EmailLog.delete(email_log.id)
-            Session.commit()
-            raise
+    # replace CC & To emails by reverse-alias for all emails that are not alias
+    try:
+        replace_header_when_forward(msg, alias, "Cc")
+        replace_header_when_forward(msg, alias, "To")
+    except CannotCreateContactForReverseAlias:
+        LOG.d("CannotCreateContactForReverseAlias error, delete %s", email_log)
+        EmailLog.delete(email_log.id)
+        Session.commit()
+        raise
 
     # add List-Unsubscribe header
     if user.one_click_unsubscribe_block_sender:

From a2901e27fd85cde990ed2aa328d367a2b7c8b83b Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Thu, 14 Apr 2022 23:17:45 -0400
Subject: [PATCH 34/36] Handle sending to reverse alias in SMTP_handler

- Also create a stripped down function `get_or_create_contact_for_SMTP_phase`
- Also change the log to debug instead of warning
---
 SMTP_handler.py | 69 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 65 insertions(+), 4 deletions(-)

diff --git a/SMTP_handler.py b/SMTP_handler.py
index b877ab20b..cebc4d7c5 100644
--- a/SMTP_handler.py
+++ b/SMTP_handler.py
@@ -17,6 +17,7 @@
 from aiosmtpd.smtp import AuthResult, LoginPassword, Envelope
 
 from sqlalchemy.orm.exc import ObjectDeletedError
+from sqlalchemy.exc import IntegrityError
 from email.message import Message
 from email.utils import formataddr, formatdate
 from init_app import load_pgp_public_keys
@@ -54,18 +55,68 @@
     send_email,
     render,
     get_email_domain_part,
-    should_ignore_bounce,
+    is_valid_email,
+    generate_reply_email,
 )
 
 from email_handler import (
     send_no_reply_response,
-    get_or_create_contact,
     handle_spam,
     prepare_pgp_message,
     replace_original_message_id,
+    replace_header_when_reply,
 )
 
 
+def get_or_create_contact_for_SMTP_phase(mail_from: str, alias: Alias) -> Contact:
+    """
+    Create Contact for SMTP phase
+    """
+    contact_email = mail_from
+
+    if not is_valid_email(contact_email):
+        LOG.w(
+            "invalid contact email %s.",
+            contact_email,
+        )
+        # either reuse a contact with empty email or create a new contact with empty email
+        contact_email = ""
+
+    contact_email = sanitize_email(contact_email, not_lower=True)
+
+    contact = Contact.get_by(alias_id=alias.id, website_email=contact_email)
+    if not contact:
+        try:
+            contact = Contact.create(
+                user_id=alias.user_id,
+                alias_id=alias.id,
+                website_email=contact_email,
+                mail_from=mail_from,
+                reply_email=generate_reply_email(contact_email, alias.user)
+                if is_valid_email(contact_email)
+                else NOREPLY,
+                automatic_created=True,
+            )
+            if not contact_email:
+                LOG.d("Create a contact with invalid email for %s", alias)
+                contact.invalid_email = True
+
+            LOG.d(
+                "create contact %s for %s, reverse alias:%s",
+                contact_email,
+                alias,
+                contact.reply_email,
+            )
+
+            Session.commit()
+        except IntegrityError:
+            LOG.w("Contact %s %s already exist", alias, contact_email)
+            Session.rollback()
+            contact = Contact.get_by(alias_id=alias.id, website_email=contact_email)
+
+    return contact
+
+
 def handle_SMTP(envelope, msg: Message, rcpt_to: str) -> (bool, str):
     """
     Return whether an email has been delivered and
@@ -98,11 +149,21 @@ def handle_SMTP(envelope, msg: Message, rcpt_to: str) -> (bool, str):
         return False, status.E503
 
     contact = Contact.get_by(website_email=website_email)
+
+    # Check if website email id a reverse alias.
+    if not contact:
+        contact = Contact.get_by(reply_email=website_email)
+        if contact:
+            LOG.d(f"{website_email} is a reverse-alias. Changing 'To:' to actual website email.")
+            website_email = contact.website_email
+            replace_header_when_reply(msg, alias, headers.TO)
+            replace_header_when_reply(msg, alias, headers.CC)
+
     if not contact:
-        LOG.w(f"No contact with {website_email} as website email")
+        LOG.d(f"No contact with {website_email} as website email")
     try:
         LOG.d("Create or get contact for website_email:%s", website_email)
-        contact = get_or_create_contact("", website_email, alias, msg)
+        contact = get_or_create_contact_for_SMTP_phase(website_email, alias)
     except ObjectDeletedError:
         LOG.d("maybe alias was deleted in the meantime")
         alias = Alias.get_by(email=alias_address)

From e0b7fc3131f98eb2818b9c316288625d1158f18a Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Sat, 2 Apr 2022 22:53:09 -0400
Subject: [PATCH 35/36] Revert "Add auto-generated migrations"

This reverts commit 25a56ec7fc910b2bb9b6ab819b1cd13a67192f2c.
---
 .../versions/2022_040221_b26e402d2e0e_.py     | 58 -------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 migrations/versions/2022_040221_b26e402d2e0e_.py

diff --git a/migrations/versions/2022_040221_b26e402d2e0e_.py b/migrations/versions/2022_040221_b26e402d2e0e_.py
deleted file mode 100644
index 7e77b07d6..000000000
--- a/migrations/versions/2022_040221_b26e402d2e0e_.py
+++ /dev/null
@@ -1,58 +0,0 @@
-"""empty message
-
-Revision ID: b26e402d2e0e
-Revises: b500363567e3
-Create Date: 2022-04-02 21:47:30.243843
-
-"""
-import sqlalchemy_utils
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision = 'b26e402d2e0e'
-down_revision = 'b500363567e3'
-branch_labels = None
-depends_on = None
-
-
-def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('SMTP_credentials',
-    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
-    sa.Column('created_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=False),
-    sa.Column('updated_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=True),
-    sa.Column('alias_id', sa.Integer(), nullable=False),
-    sa.Column('password', sa.String(length=128), nullable=False),
-    sa.ForeignKeyConstraint(['alias_id'], ['alias.id'], ondelete='cascade'),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('alias_id', name='uq_alias')
-    )
-    op.create_index(op.f('ix_SMTP_credentials_alias_id'), 'SMTP_credentials', ['alias_id'], unique=True)
-    op.alter_column('admin_audit_log', 'data',
-               existing_type=postgresql.JSONB(astext_type=sa.Text()),
-               nullable=True)
-    op.drop_index('admin_audit_log_admin_user_id_idx', table_name='admin_audit_log')
-    op.drop_constraint('admin_audit_log_admin_user_id_fkey', 'admin_audit_log', type_='foreignkey')
-    op.create_foreign_key(None, 'admin_audit_log', 'users', ['admin_user_id'], ['id'])
-    op.add_column('alias', sa.Column('enable_SMTP', sa.Boolean(), server_default='0', nullable=False))
-    op.add_column('email_log', sa.Column('is_SMTP', sa.Boolean(), nullable=False))
-    op.add_column('users', sa.Column('enable_SMTP_aliases', sa.Boolean(), server_default='0', nullable=False))
-    # ### end Alembic commands ###
-
-
-def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_column('users', 'enable_SMTP_aliases')
-    op.drop_column('email_log', 'is_SMTP')
-    op.drop_column('alias', 'enable_SMTP')
-    op.drop_constraint(None, 'admin_audit_log', type_='foreignkey')
-    op.create_foreign_key('admin_audit_log_admin_user_id_fkey', 'admin_audit_log', 'users', ['admin_user_id'], ['id'], ondelete='CASCADE')
-    op.create_index('admin_audit_log_admin_user_id_idx', 'admin_audit_log', ['admin_user_id'], unique=False)
-    op.alter_column('admin_audit_log', 'data',
-               existing_type=postgresql.JSONB(astext_type=sa.Text()),
-               nullable=False)
-    op.drop_index(op.f('ix_SMTP_credentials_alias_id'), table_name='SMTP_credentials')
-    op.drop_table('SMTP_credentials')
-    # ### end Alembic commands ###

From 32d6a73a93f77fe34d820662f494e3dc8706f4bd Mon Sep 17 00:00:00 2001
From: Sahil Phule <sahilph@users.noreply.github.com>
Date: Thu, 14 Apr 2022 23:32:28 -0400
Subject: [PATCH 36/36] Add auto-generated migrations

---
 .../versions/2022_041423_6dff9b5f827a_.py     | 57 +++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 migrations/versions/2022_041423_6dff9b5f827a_.py

diff --git a/migrations/versions/2022_041423_6dff9b5f827a_.py b/migrations/versions/2022_041423_6dff9b5f827a_.py
new file mode 100644
index 000000000..00df4d610
--- /dev/null
+++ b/migrations/versions/2022_041423_6dff9b5f827a_.py
@@ -0,0 +1,57 @@
+"""empty message
+
+Revision ID: 6dff9b5f827a
+Revises: b500363567e3
+Create Date: 2022-04-14 23:31:57.185111
+
+"""
+import sqlalchemy_utils
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = '6dff9b5f827a'
+down_revision = 'b500363567e3'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('SMTP_credentials',
+    sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
+    sa.Column('created_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=False),
+    sa.Column('updated_at', sqlalchemy_utils.types.arrow.ArrowType(), nullable=True),
+    sa.Column('alias_id', sa.Integer(), nullable=False),
+    sa.Column('password', sa.String(length=128), nullable=False),
+    sa.ForeignKeyConstraint(['alias_id'], ['alias.id'], ondelete='cascade'),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_SMTP_credentials_alias_id'), 'SMTP_credentials', ['alias_id'], unique=True)
+    op.alter_column('admin_audit_log', 'data',
+               existing_type=postgresql.JSONB(astext_type=sa.Text()),
+               nullable=True)
+    op.drop_index('admin_audit_log_admin_user_id_idx', table_name='admin_audit_log')
+    op.drop_constraint('admin_audit_log_admin_user_id_fkey', 'admin_audit_log', type_='foreignkey')
+    op.create_foreign_key(None, 'admin_audit_log', 'users', ['admin_user_id'], ['id'])
+    op.add_column('alias', sa.Column('enable_SMTP', sa.Boolean(), server_default='0', nullable=False))
+    op.add_column('email_log', sa.Column('is_SMTP', sa.Boolean(), nullable=False))
+    op.add_column('users', sa.Column('enable_SMTP_aliases', sa.Boolean(), server_default='0', nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('users', 'enable_SMTP_aliases')
+    op.drop_column('email_log', 'is_SMTP')
+    op.drop_column('alias', 'enable_SMTP')
+    op.drop_constraint(None, 'admin_audit_log', type_='foreignkey')
+    op.create_foreign_key('admin_audit_log_admin_user_id_fkey', 'admin_audit_log', 'users', ['admin_user_id'], ['id'], ondelete='CASCADE')
+    op.create_index('admin_audit_log_admin_user_id_idx', 'admin_audit_log', ['admin_user_id'], unique=False)
+    op.alter_column('admin_audit_log', 'data',
+               existing_type=postgresql.JSONB(astext_type=sa.Text()),
+               nullable=False)
+    op.drop_index(op.f('ix_SMTP_credentials_alias_id'), table_name='SMTP_credentials')
+    op.drop_table('SMTP_credentials')
+    # ### end Alembic commands ###