tweak commbadge emailing system
Merge pull request #2575 from ngokevin/commmailre

tweak commbadge emailing system