Added mail-delivery capability