--- media_mover/contrib/mm_mailhandler/mm_mailhandler.module  2009-06-11 17:46:38.000000000 +0200
+++ mm_mailhandler.module 2009-11-30 12:23:58.000000000 +0100
@@ -236,7 +236,7 @@ function mm_mailhandler_retrieve_message
 
   if ($result) {
 
-    $header = imap_header($result, $i);
+    $header = imap_header($result, imap_msgno($result, $i));
     // Initialize the subject in case it's missing.
     if (!isset($header->subject)) {
       $header->subject = '';
@@ -413,4 +413,4 @@ function mm_mailhandler_test_mailbox($co
   }
 
   return;
-}
\ No newline at end of file
+}