add sent email function
solve merge conflict