Ensure locally-delivered mails have the X-Original-To header

Change as discussed in #223 (closed). Happy to reformulate (or remove the verbose comments) if desired.