some mail handling fixups