diff --git a/src/mail.js b/src/mail.js
index 050a7a013..fbaf41492 100644
--- a/src/mail.js
+++ b/src/mail.js
@@ -162,6 +162,8 @@ function checkSmtpRelay(relay, callback) {
     };
 
     var transporter = nodemailer.createTransport(smtpTransport({
+        connectionTimeout: 5000,
+        greetingTimeout: 5000,
         host: relay.host,
         port: relay.port,
         auth: {