email bug final fix