[Issue 2111706] Fixing email filter, which was stopping after an "@"

Change-Id: I4b3a00cc79cc6cc3d1351b5a301a36f6a950d688
2 files changed