Issue #1237720: Use double underscores in mail id

Merge request reports