Merge pull request #199 from hsombini/mailAddressField

Email address field for email servers that does not use email as the …

src/main/java/fr/xephi/authme/mail/SendMailSSL.java

@@ -125,7 +125,10 @@ public class SendMailSSL {
 
     @VisibleForTesting
     HtmlEmail initializeMail(String emailAddress) throws EmailException {
-        String senderMail = settings.getProperty(EmailSettings.MAIL_ACCOUNT);
+        String senderMail = StringUtils.isEmpty(settings.getProperty(EmailSettings.MAIL_ADDRESS))
+            ? settings.getProperty(EmailSettings.MAIL_ACCOUNT)
+            : settings.getProperty(EmailSettings.MAIL_ADDRESS);
+
         String senderName = StringUtils.isEmpty(settings.getProperty(EmailSettings.MAIL_SENDER_NAME))
             ? senderMail
             : settings.getProperty(EmailSettings.MAIL_SENDER_NAME);
@@ -139,7 +142,7 @@ public class SendMailSSL {
         email.addTo(emailAddress);
         email.setFrom(senderMail, senderName);
         email.setSubject(settings.getProperty(EmailSettings.RECOVERY_MAIL_SUBJECT));
-        email.setAuthentication(senderMail, mailPassword);
+        email.setAuthentication(settings.getProperty(EmailSettings.MAIL_ACCOUNT), mailPassword);
 
         setPropertiesForPort(email, port);
         return email;

src/main/java/fr/xephi/authme/settings/properties/EmailSettings.java

@@ -27,6 +27,10 @@ public class EmailSettings implements SettingsHolder {
     public static final Property<String> MAIL_PASSWORD =
         newProperty("Email.mailPassword", "");
 
+    @Comment("Email address, fill when mailAccount is not the email address of the account")
+    public static final Property<String> MAIL_ADDRESS =
+        newProperty("Email.mailAddress", "");
+
     @Comment("Custom sender name, replacing the mailAccount name in the email")
     public static final Property<String> MAIL_SENDER_NAME =
         newProperty("Email.mailSenderName", "");