Carl, based on your comment on IRC I have rebased this patch to the current origin/master and split it in two parts, one that makes the Received: header special when getting headers from a message file, and one that changes the heuristic by which we guess the best From: header. This passes the tests that have been committed last week. I tried to get git send-email to make this a reply to the previous version of this patch... /D -- Dirk Hohndel Intel Open Source Technology Center