Updated incoming email handler