added PrefFrom
Merge branch 'master' of github.com:oposs/mail-conveyor