db structure redesign + mail system draft