Fix papacastoro edit link in mail
Merge