note for 2.1
Merge branch 'feature/click_on_email'