fix data saving, better looking email