From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Mar 2015 09:44:08 +0000 (+0000)
Subject: Merged r14047 (#19232).
X-Git-Tag: 3.0.1~23
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f4ff617f376eb50f62e46c8bd3be79a8d72ed6ab;p=redmine.git

Merged r14047 (#19232).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14061 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/imap.rb b/lib/redmine/imap.rb
index 418066632..d7f2ad636 100644
--- a/lib/redmine/imap.rb
+++ b/lib/redmine/imap.rb
@@ -24,7 +24,7 @@ module Redmine
         host = imap_options[:host] || '127.0.0.1'
         port = imap_options[:port] || '143'
         ssl = !imap_options[:ssl].nil?
-        starttls = !imap_options[:tls].nil?
+        starttls = !imap_options[:starttls].nil?
         folder = imap_options[:folder] || 'INBOX'
 
         imap = Net::IMAP.new(host, port, ssl)