Index: mailhandler.retrieve.inc
===================================================================
diff -u -r1.1.2.40 mailhandler.retrieve.inc
--- mailhandler.retrieve.inc	9 Apr 2010 02:14:42 -0000	1.1.2.40
+++ mailhandler.retrieve.inc	25 Jan 2011 14:14:56 -0000
@@ -337,7 +337,7 @@
   $unread_messages = array();
   $number_of_messages = imap_num_msg($result);
   for ($i = 1; $i <= $number_of_messages; $i++) {
-    $header = imap_header($result, $i);
+    $header = imap_headerinfo($result, $i);
     // only process new messages
     if ($header->Unseen != 'U' && $header->Recent != 'N') {
       continue;
@@ -365,7 +365,7 @@
   if (!$result) {
     $result = mailhandler_open_mailbox($mailbox);
   }
-  $header = imap_header($result, imap_msgno($result, $i));
+  $header = imap_headerinfo($result, imap_msgno($result, $i));
   // Initialize the subject in case it's missing.
   if (!isset($header->subject)) {
     $header->subject = '';