fixes to mailserver schema / lookups