[#2141] Test emails with apostrophes
Merge pull request #2144 from baloo/improvements/2141-email-apostrophes

[#2141] Test emails with apostrophes