diff --git a/.env b/.env
index ee716e348de5b20285c684989e9f6122fafa4af0..350135560d3909692ca122094f3577b1418f8128 100644
--- a/.env
+++ b/.env
@@ -32,7 +32,7 @@ CERN_OIDC_CLIENT_SECRET=fill-me
 EMAIL_AES_SECRET_KEY=fill-mefill-mefill-mefill-mefill
 
 # SMIME signed emails
-EMAIL_BACKEND=vendor.django_mail.backends.smimesmtp.EmailBackend
-EMAIL_SMIME_CERT_FILE_PATH=/etc/notifications-noreply.pem
-EMAIL_SMIME_CERT_KEY_FILE_PATH=/etc/notifications-noreply-key.pem
+#EMAIL_BACKEND=vendor.django_mail.backends.smimesmtp.EmailBackend
+#EMAIL_SMIME_CERT_FILE_PATH=/etc/notifications-noreply.pem
+#EMAIL_SMIME_CERT_KEY_FILE_PATH=/etc/notifications-noreply-key.pem
 
diff --git a/notifications_consumer/config.py b/notifications_consumer/config.py
index ee747649c1e4437e88564f861b0f0fed7734ff5b..3b9b4aae8611cc8765d86a6a9b545bbced3c5890 100644
--- a/notifications_consumer/config.py
+++ b/notifications_consumer/config.py
@@ -59,7 +59,7 @@ class Config:
     EMAIL_SMIME_CERT_FILE_PATH = os.getenv("EMAIL_SMIME_CERT_FILE_PATH")
     EMAIL_SMIME_CERT_KEY_FILE_PATH = os.getenv("EMAIL_SMIME_CERT_KEY_FILE_PATH")
 
-    NOREPLY_ADDRESS = os.getenv("NOREPLY_ADDRESS", "noreply@cern.ch")
+    NOREPLY_ADDRESS = os.getenv("NOREPLY_ADDRESS", "notifications-noreply@cern.ch")
 
     EMAIL_RECIPIENT_REGEX = r"^(.*?)\+(.*?)\+(.*?)$"
     EMAIL_RECIPIENT_PATTERN = re.compile(EMAIL_RECIPIENT_REGEX)
diff --git a/vendor/django_mail/backends/smimesmtp.py b/vendor/django_mail/backends/smimesmtp.py
index 02d6f94bff493949325a1a77624b754215448486..ddebfce18b5ae286221a96ba6b87f67800b968d4 100644
--- a/vendor/django_mail/backends/smimesmtp.py
+++ b/vendor/django_mail/backends/smimesmtp.py
@@ -162,10 +162,9 @@ class EmailBackend(BaseEmailBackend):
 
         try:
             self.connection.sendmail(
-                from_email, 
+                from_email,
                 recipients,
-                # Ugly fix for obscure boundary with newline when using SafeMIMEMultipart
-                signed_message.as_string().replace('\n', '\r\n').replace('; boundary', ';\r\n boundary') 
+                signed_message.as_string()
             )
         except smtplib.SMTPException:
             if not self.fail_silently: