diff --git a/bundles/org.openhab.binding.mail/src/main/java/org/openhab/binding/mail/internal/SMTPHandler.java b/bundles/org.openhab.binding.mail/src/main/java/org/openhab/binding/mail/internal/SMTPHandler.java
index efa3cad4f66..086698b1f4e 100644
--- a/bundles/org.openhab.binding.mail/src/main/java/org/openhab/binding/mail/internal/SMTPHandler.java
+++ b/bundles/org.openhab.binding.mail/src/main/java/org/openhab/binding/mail/internal/SMTPHandler.java
@@ -142,7 +142,6 @@ public class SMTPHandler extends BaseThingHandler {
 
             // fix command map not available
             DataHandler dataHandler = mail.getMimeMessage().getDataHandler();
-
             dataHandler.setCommandMap(commandMap);
             try {
                 DataSource dataSource = dataHandler.getDataSource();
diff --git a/bundles/org.openhab.binding.mail/src/main/java/org/openhab/binding/mail/internal/config/BaseConfig.java b/bundles/org.openhab.binding.mail/src/main/java/org/openhab/binding/mail/internal/config/BaseConfig.java
index 3754c61d985..2c910b78848 100644
--- a/bundles/org.openhab.binding.mail/src/main/java/org/openhab/binding/mail/internal/config/BaseConfig.java
+++ b/bundles/org.openhab.binding.mail/src/main/java/org/openhab/binding/mail/internal/config/BaseConfig.java
@@ -24,7 +24,7 @@ import org.openhab.binding.mail.internal.ServerSecurity;
 @NonNullByDefault
 public class BaseConfig {
     public @Nullable String hostname;
-    public Integer port = 0;
+    public int port = 0;
     public String username = "";
     public String password = "";
     public ServerSecurity security = ServerSecurity.PLAIN;