diff --git a/ems-core/src/main/java/it/integry/ems/service/MailService.java b/ems-core/src/main/java/it/integry/ems/service/MailService.java
index 69ea7c92a0..e3243dae3a 100644
--- a/ems-core/src/main/java/it/integry/ems/service/MailService.java
+++ b/ems-core/src/main/java/it/integry/ems/service/MailService.java
@@ -97,7 +97,7 @@ public class MailService {
 
         List<StbEmail> listEmail = UtilityDB.executeSimpleQueryDTO(multiDBTransactionManager.getPrimaryConnection(), sql, StbEmail.class);
 
-        StbEmail stbEmail = listEmail != null && listEmail.size() > 0 ? listEmail.get(0) : null;
+        StbEmail stbEmail = listEmail != null && !listEmail.isEmpty() ? listEmail.get(0) : null;
 
         if (stbEmail != null && stbEmail.getIdRiga() != null) {
             EmailFileSharerSettings.ENCRYPTION encryption = EmailFileSharerSettings.ENCRYPTION.NONE;
diff --git a/ems-core/src/main/java/it/integry/ems/service/MailTemplateService.java b/ems-core/src/main/java/it/integry/ems/service/MailTemplateService.java
index 142b9f0825..549fe50a4e 100644
--- a/ems-core/src/main/java/it/integry/ems/service/MailTemplateService.java
+++ b/ems-core/src/main/java/it/integry/ems/service/MailTemplateService.java
@@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
 
 import java.io.InputStream;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -21,7 +22,7 @@ public class MailTemplateService {
         URL url = new URL("https://www2.studioml.it/ems-api/mail_models/integry-generic-communication-mail-template.html");
 
         InputStream inputStream = url.openStream();
-        String htmlMailBody = IOUtils.toString(inputStream, "UTF-8");
+        String htmlMailBody = IOUtils.toString(inputStream, StandardCharsets.UTF_8);
         inputStream.close();
 
         String bannerBgColor;