diff --git a/app/models/channel/driver/imap.rb b/app/models/channel/driver/imap.rb
index ee0efbb87..733efd836 100644
--- a/app/models/channel/driver/imap.rb
+++ b/app/models/channel/driver/imap.rb
@@ -73,7 +73,7 @@ example
     Rails.logger.info "fetching imap (#{options[:host]}/#{options[:user]} port=#{port},ssl=#{ssl})"
 
     # on check, reduce open_timeout to have faster probing
-    timeout = 12
+    timeout = 24
     if check_type == 'check'
       timeout = 6
     end
diff --git a/app/models/channel/driver/pop3.rb b/app/models/channel/driver/pop3.rb
index cd45ab61e..a227b68eb 100644
--- a/app/models/channel/driver/pop3.rb
+++ b/app/models/channel/driver/pop3.rb
@@ -61,8 +61,8 @@ returns
     #@pop.set_debug_output $stderr
 
     # on check, reduce open_timeout to have faster probing
-    @pop.open_timeout = 8
-    @pop.read_timeout = 12
+    @pop.open_timeout = 12
+    @pop.read_timeout = 24
     if check_type == 'check'
       @pop.open_timeout = 4
       @pop.read_timeout = 6