From f76afd86fd1ae674f6e405e682eee084376a9349 Mon Sep 17 00:00:00 2001
From: Giovanni Bechis <giovanni@paclan.it>
Date: Fri, 30 Dec 2022 09:17:23 +0100
Subject: [PATCH] remove extra chars only if md5 encryption is not used

---
 Esp.pm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Esp.pm b/Esp.pm
index b241436..ea7f6ed 100644
--- a/Esp.pm
+++ b/Esp.pm
@@ -589,7 +589,9 @@ sub esp_amazonses_check {
   my $fid;
 
   # Change base64 chars that are not valid in dns records into "_", uid must be limited to chars permitted in dns records
-  $opts .= "nobase64";
+  if($opts ne "md5") {
+    $opts .= "nobase64";
+  }
 
   # return if X-SES-Outgoing is not what we want
   my $xses = $pms->get("X-SES-Outgoing", undef);
@@ -850,7 +852,9 @@ sub esp_msnd_check {
   my $uid;
 
   # Change "-" into "_", uid must be limited to chars permitted in dns records
-  $opts .= "nodash";
+  if($opts ne "md5") {
+    $opts .= "nodash";
+  }
 
   # return if X-Mailer is not what we want
   my $xmailer = $pms->get("X-Mailer", undef);