resolve email issue