.../retrieve/MailhandlerPhpImapRetrieve.class.php  |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/modules/mailhandler_php_imap/plugins/mailhandler/retrieve/MailhandlerPhpImapRetrieve.class.php b/modules/mailhandler_php_imap/plugins/mailhandler/retrieve/MailhandlerPhpImapRetrieve.class.php
index 5d6acb3..d9a5b25 100644
--- a/modules/mailhandler_php_imap/plugins/mailhandler/retrieve/MailhandlerPhpImapRetrieve.class.php
+++ b/modules/mailhandler_php_imap/plugins/mailhandler/retrieve/MailhandlerPhpImapRetrieve.class.php
@@ -284,6 +284,13 @@ class MailhandlerPhpImapRetrieve extends MailhandlerRetrieve {
       $part->id = $structure->id;
     }
 
+    // If this email only has one part, then we arrive at this point with invalid
+    // part_number FALSE.  We need to pass a valid part number to imap_fetchbody
+    // at this point.  The correct part number for a single part e-mail is "1".
+    if ($part_number === FALSE) {
+      $part_number = 1;
+    }
+
     // Retrieve part and convert MIME encoding to UTF-8
     if (!$part->data = imap_fetchbody($stream, $msg_number, $part_number, FT_PEEK)) {
       watchdog('mailhandler', 'No Data!!', array(), WATCHDOG_ERROR);