New mail skeleton & contact management & DB changes