WIP Qmail patch clean-up