Parsing of multiple email addresses

Bear with me on this, don't have much experience with recommending fixes or patches...

I set up a Feed importer to add emails to a site in hopes of associating that email with a contact by using their email address as a reference. In my 'email' content type I set up an email field that allows unlimited values. Using Rules I was going to create a entity reference on create.

Problem is that using the standard field mappings with Mailhandler, only one email address was being added to each node. I tried using Feeds Tamper->Explode using a comma as the delimiter on the full 'To address line' source. But, if the email address had a comma in name portion ("smith, j" ) then the Tamper would obviously split the source up at the wrong points.

So... going through the code I saw this on lines 8-25 of mailhandler/plugins/mailhandler/commands/MailhandlerCommandsHeaders.class.php

        // Some headers are arrays of objects
        if (in_array($key, array('to', 'from', 'reply_to', 'sender', 'cc', 'bcc', 'return_path'))) {
          $message[$key . '-name'] = isset($value[0]->personal) ? iconv_mime_decode($value[0]->personal, 0, "UTF-8") : '';
          $message[$key . '-address'] = (isset($value[0]->mailbox) && isset($value[0]->host)) ? $value[0]->mailbox . '@' . $value[0]->host : '';
        }
        else {
          $message[$key] = iconv_mime_decode($value, 0, "UTF-8");
        }

It looks like the code is only taking the first element of object and setting the item to that value. So I tried this:

        // Some headers are arrays of objects
        if (in_array($key, array('to', 'from', 'reply_to', 'sender', 'cc', 'bcc', 'return_path'))) {
          
          $message[$key . '-name'] = array();
          $message[$key . '-address'] = array();
          
          foreach($value as $valkey => $val){
            $message[$key . '-name'][$valkey] = isset($val->personal) ? iconv_mime_decode($val->personal, 0, "UTF-8") : '';
            $message[$key . '-address'][$valkey] = (isset($val->mailbox) && isset($val->host)) ? $val->mailbox . '@' . $val->host : '';
          }
        }
        else {
          $message[$key] = iconv_mime_decode($value, 0, "UTF-8");
        }

And viola, each individual address gets added as a separate value in my email field. I'm sure it's probably not a complete solution, but perhaps will help somebody along the way.

Thanks.