Fix #1577
Merge pull request #1579 from CroceRossaCatania/mail

Fix #1577