Index: mailhandler.retrieve.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/mailhandler/Attic/mailhandler.retrieve.inc,v
retrieving revision 1.1.2.23
diff -u -r1.1.2.23 mailhandler.retrieve.inc
--- mailhandler.retrieve.inc	21 Jul 2009 14:40:52 -0000	1.1.2.23
+++ mailhandler.retrieve.inc	18 Sep 2009 01:23:45 -0000
@@ -732,20 +732,16 @@
  * be deleted after retrieval to prevent repeated downloading of the same messages on each run
  */
 function mailhandler_cron_retrieve($mailbox) {
+  // Find out how many messages need retrieval
+  $new_messages = mailhandler_get_unread_messages($mailbox);
 
-  if ($result = mailhandler_open_mailbox($mailbox)) {
-    // Find out how many messages need retrieval
-    $new_messages = mailhandler_get_unread_messages($mailbox);
+  // Initialise counters for maximum message retrieval
+  $max_messages = variable_get('mailhandler_max_retrieval', 0);
+  $retrieved_messages = 0;
 
-    // Initialise counters for maximum message retrieval
-    $max_messages = variable_get('mailhandler_max_retrieval', 0);
-    $retrieved_messages = 0;
-
-    // Begin retrieval of messages
-    while ($new_messages && (!$max_messages || $retrieved_messages < $max_messages)) {
-      mailhandler_retrieve_message($result, $mailbox, array_shift($new_messages), $context);
-      $retrieved_messages++;
-    }
-    imap_close($result, CL_EXPUNGE);
+  // Begin retrieval of messages
+  while ($new_messages && (!$max_messages || $retrieved_messages < $max_messages)) {
+    mailhandler_retrieve_message($result, $mailbox, array_shift($new_messages), $context);
+    $retrieved_messages++;
   }
 }