diff --git a/org.adempiere.base/src/org/compiere/util/EmailSrv.java b/org.adempiere.base/src/org/compiere/util/EmailSrv.java
index 34ea75ea8e..a81bc07c71 100644
--- a/org.adempiere.base/src/org/compiere/util/EmailSrv.java
+++ b/org.adempiere.base/src/org/compiere/util/EmailSrv.java
@@ -171,7 +171,8 @@ public class EmailSrv {
 			return mailSession;
 		
 		//	Session
-		Properties props = System.getProperties();
+		Properties props = new Properties();
+		props.putAll(System.getProperties());
 		String protocol = "imap";
 		if (isSSL){
 			protocol = "imaps";
diff --git a/org.adempiere.server/src/main/server/org/compiere/server/EMailProcessor.java b/org.adempiere.server/src/main/server/org/compiere/server/EMailProcessor.java
index 1595593e0f..c9b5990d1e 100644
--- a/org.adempiere.server/src/main/server/org/compiere/server/EMailProcessor.java
+++ b/org.adempiere.server/src/main/server/org/compiere/server/EMailProcessor.java
@@ -136,7 +136,8 @@ public class EMailProcessor
 			return m_session;
 		
 		//	Session
-		Properties props = System.getProperties();
+		Properties props = new Properties();
+		props.putAll(System.getProperties());
 		props.put("mail.store.protocol", "smtp");
 		props.put("mail.transport.protocol", "smtp");
 		props.put("mail.host", m_host);