3.0 Some small Email fixes