Applied a fix for some formatting issue with mail adresses in the