Fix tag naming bug in mail sources