3.0 Some small Email fixes

Why not default?