killbill-uncached

diff --git a/util/src/main/java/com/ning/billing/util/email/DefaultEmailSender.java b/util/src/main/java/com/ning/billing/util/email/DefaultEmailSender.java
index f399dae..8b230be 100644
--- a/util/src/main/java/com/ning/billing/util/email/DefaultEmailSender.java
+++ b/util/src/main/java/com/ning/billing/util/email/DefaultEmailSender.java
@@ -24,6 +24,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.inject.Inject;
+import com.ning.billing.ErrorCode;
 
 public class DefaultEmailSender implements EmailSender {
     private final Logger log = LoggerFactory.getLogger(EmailSender.class);
@@ -62,7 +63,7 @@ public class DefaultEmailSender implements EmailSender {
                 }
             }
 
-            email.setSSL(true);
+            email.setSSL(config.useSSL());
             email.send();
         } catch (EmailException ee) {
             log.warn("Failed to send e-mail", ee);

diff --git a/util/src/main/java/com/ning/billing/util/email/EmailConfig.java b/util/src/main/java/com/ning/billing/util/email/EmailConfig.java
index e972382..2d9a583 100644
--- a/util/src/main/java/com/ning/billing/util/email/EmailConfig.java
+++ b/util/src/main/java/com/ning/billing/util/email/EmailConfig.java
@@ -46,4 +46,8 @@ public interface EmailConfig extends KillbillConfig {
     @Config("killbill.mail.from")
     @Default("support@example.com")
     String getDefaultFrom();
+
+    @Config("killbill.mail.useSSL")
+    @Default("false")
+    boolean useSSL();
 }