-maildir and mbox deliver support
