With the growing number of option refactors centralize the module import within the mail-server directory. Also group deprecations by release, so we can eventually yank them in bulk after a while.
Martin Weinelt