Small changes in mail_clicks, still working