diff --git a/src/main/java/org/apache/commons/mail/Email.java b/src/main/java/org/apache/commons/mail/Email.java
index cbc23a1..16a8ac2 100644
--- a/src/main/java/org/apache/commons/mail/Email.java
+++ b/src/main/java/org/apache/commons/mail/Email.java
@@ -1558,7 +1558,7 @@
         {
             return this.session.getProperty(EmailConstants.MAIL_HOST);
         }
-        else if (EmailUtils.isNotEmpty(this.hostName))
+        if (EmailUtils.isNotEmpty(this.hostName))
         {
             return this.hostName;
         }
@@ -1576,7 +1576,7 @@
         {
             return this.session.getProperty(EmailConstants.MAIL_PORT);
         }
-        else if (EmailUtils.isNotEmpty(this.smtpPort))
+        if (EmailUtils.isNotEmpty(this.smtpPort))
         {
             return this.smtpPort;
         }
@@ -1746,7 +1746,7 @@
         {
             return this.session.getProperty(EmailConstants.MAIL_SMTP_SOCKET_FACTORY_PORT);
         }
-        else if (EmailUtils.isNotEmpty(this.sslSmtpPort))
+        if (EmailUtils.isNotEmpty(this.sslSmtpPort))
         {
             return this.sslSmtpPort;
         }