Mail system updated, database alterations

Alas, my goal of