A minor stylistic fix and cleanup of mail deliveries.

cc @senny