diff --git a/org.adempiere.base/src/org/compiere/util/EMail.java b/org.adempiere.base/src/org/compiere/util/EMail.java
index 5f8b17e614..6edd35727e 100644
--- a/org.adempiere.base/src/org/compiere/util/EMail.java
+++ b/org.adempiere.base/src/org/compiere/util/EMail.java
@@ -209,6 +209,9 @@ public final class EMail implements Serializable
 		props.put("mail.store.protocol", "smtp");
 		props.put("mail.transport.protocol", "smtp");
 		props.put("mail.host", m_smtpHost);
+		//Timeout for sending the email defaulted to 20 seconds 
+		props.put("mail.smtp.timeout", 20000); 
+		
 		if (CLogMgt.isLevelFinest())
 			props.put("mail.debug", "true");
 		//