Fixing mail links