Fix class name.
Fix wrong mail state.
Added tag 2.1 for changeset cbaad42344b5