diff --git a/src/EmailModuleWithTemplates/[App Store] Email template.mpr b/src/EmailModuleWithTemplates/[App Store] Email template.mpr
index e9b77a7..18227a0 100644
Binary files a/src/EmailModuleWithTemplates/[App Store] Email template.mpr and b/src/EmailModuleWithTemplates/[App Store] Email template.mpr differ
diff --git a/src/EmailModuleWithTemplates/javasource/emailtemplate/actions/SendEmail.java b/src/EmailModuleWithTemplates/javasource/emailtemplate/actions/SendEmail.java
index 668dd5b..8a70d98 100644
--- a/src/EmailModuleWithTemplates/javasource/emailtemplate/actions/SendEmail.java
+++ b/src/EmailModuleWithTemplates/javasource/emailtemplate/actions/SendEmail.java
@@ -43,8 +43,9 @@ public class SendEmail extends CustomJavaAction<java.lang.Boolean>
 	private java.lang.Boolean UseSSL;
 	private java.lang.Boolean UseTLS;
 	private java.lang.String FromDisplayName;
+	private java.lang.Boolean UseSSLCheckIdentity;
 
-	public SendEmail(IContext context, java.lang.String SMTPHost, java.lang.String SMTPUserName, java.lang.String SMTPPassword, java.lang.String CCAddresses, java.lang.String BCCAddresses, java.lang.String ToAddresses, java.lang.String FromAddress, java.lang.String ReplyToAddress, java.lang.String HtmlBody, java.lang.String PlainBody, java.lang.String Subject, java.lang.Long SMTPPort, java.util.List<IMendixObject> AttachmentList, java.util.List<IMendixObject> HeaderList, java.lang.Boolean UseSSL, java.lang.Boolean UseTLS, java.lang.String FromDisplayName)
+	public SendEmail(IContext context, java.lang.String SMTPHost, java.lang.String SMTPUserName, java.lang.String SMTPPassword, java.lang.String CCAddresses, java.lang.String BCCAddresses, java.lang.String ToAddresses, java.lang.String FromAddress, java.lang.String ReplyToAddress, java.lang.String HtmlBody, java.lang.String PlainBody, java.lang.String Subject, java.lang.Long SMTPPort, java.util.List<IMendixObject> AttachmentList, java.util.List<IMendixObject> HeaderList, java.lang.Boolean UseSSL, java.lang.Boolean UseTLS, java.lang.String FromDisplayName, java.lang.Boolean UseSSLCheckIdentity)
 	{
 		super(context);
 		this.SMTPHost = SMTPHost;
@@ -64,6 +65,7 @@ public SendEmail(IContext context, java.lang.String SMTPHost, java.lang.String S
 		this.UseSSL = UseSSL;
 		this.UseTLS = UseTLS;
 		this.FromDisplayName = FromDisplayName;
+		this.UseSSLCheckIdentity = UseSSLCheckIdentity;
 	}
 
 	@java.lang.Override
@@ -110,6 +112,7 @@ public java.lang.Boolean executeAction() throws Exception
 		config.setUserPass((this.SMTPPassword != null ? this.SMTPPassword : ""));
 		config.setUseSSLSMTP(this.UseSSL);
 		config.setUseTLSSMTP(this.UseTLS);
+		config.setUseSSLCheckServerIdentity(this.UseSSLCheckIdentity);
 
 		String separator = (String) emailtemplate.proxies.constants.Constants.getEmailAddressSeparator();
 		if (separator == null)
diff --git a/src/EmailModuleWithTemplates/javasource/emailtemplate/mail/SMTPConfiguration.java b/src/EmailModuleWithTemplates/javasource/emailtemplate/mail/SMTPConfiguration.java
index 99f1c60..57e8729 100644
--- a/src/EmailModuleWithTemplates/javasource/emailtemplate/mail/SMTPConfiguration.java
+++ b/src/EmailModuleWithTemplates/javasource/emailtemplate/mail/SMTPConfiguration.java
@@ -10,6 +10,7 @@ public class SMTPConfiguration
 	
 	private boolean useSSLSMTP;
 	private boolean useTLSSMTP;
+	private boolean useSSLCheckServerIdentity;
 	
 	private String fromAddress;
 	private String fromDisplayName;
@@ -20,6 +21,7 @@ public SMTPConfiguration()
 		// Basic configuration
 		this.useSSLSMTP = false;
 		this.useTLSSMTP = false;
+		this.useSSLCheckServerIdentity = false;
 		this.SMTPPort = 25;
 		this.SMTPHost = "";
 		this.userName = "";
@@ -29,6 +31,16 @@ public SMTPConfiguration()
 		this.replyToAddress = "";
 	}
 		
+	public boolean useSSLCheckServerIdentity() 
+	{
+		return this.useSSLCheckServerIdentity;
+	}
+	
+	public void setUseSSLCheckServerIdentity(boolean useSSLCheckServerIdentity) 
+	{
+		this.useSSLCheckServerIdentity = useSSLCheckServerIdentity;
+	}
+	
 	public boolean useSSLSMTP() 
 	{
 		return this.useSSLSMTP;
diff --git a/src/EmailModuleWithTemplates/javasource/emailtemplate/mail/Sender.java b/src/EmailModuleWithTemplates/javasource/emailtemplate/mail/Sender.java
index 8d89173..06c261c 100644
--- a/src/EmailModuleWithTemplates/javasource/emailtemplate/mail/Sender.java
+++ b/src/EmailModuleWithTemplates/javasource/emailtemplate/mail/Sender.java
@@ -236,6 +236,8 @@ private void setConnectionInfo(Email mail, SMTPConfiguration configuration)
 	        mail.setStartTLSEnabled(true);
 	    }
 	    
+	    mail.setSSLCheckServerIdentity(configuration.useSSLCheckServerIdentity());
+	    
 	    /* because the default session mechanisms uses System.getProperties() (which is not allowed 
 	     * in the cloud), we need to construct a session ourselves. The code to do this was lifted
 	     * from Email.java in the commons-email package.