diff --git a/app/models/channel/imap.rb b/app/models/channel/imap.rb
index 80d13e1b6..e66fe7856 100644
--- a/app/models/channel/imap.rb
+++ b/app/models/channel/imap.rb
@@ -24,7 +24,7 @@ class Channel::IMAP < Channel::EmailParser
       end
       imap.login( channel[:options][:user], channel[:options][:password] )
     end
-    if channel[:options][:folder].empty?
+    if !channel[:options][:folder] || channel[:options][:folder].empty?
       imap.select('INBOX')
     else
       imap.select( channel[:options][:folder] )