3.0 Some small Email fixes

Good points. Also the default class property is null.