Solved issue with email messasges