changed email structure to use sender too