simplenews/statistics/click does not work with parametered url's

I've got a url in my newsletter:
http://www.example.com/smartsite.dws?ch=int&id=73822
When sending the email, the following page is loaded: http://www.purmerend.nl/smartsite.dws?ch=int

This is because the url is not htmlencoded.

I've changed the following code

function _simplenews_statistics_replace_url($match, $nid, $mail) {
  if (substr($match, 0, 1) == "#")
    return $match;

  require_once drupal_get_path('module', 'simplenews_statistics') .'/rc4.inc';
  $pars = 'nid='. $nid .'&mail='. $mail .'&url='.$match;
  $pars = rc4Encrypt(simplenews_private_key(), $pars);
  $pars_hash = md5($pars);
  
  return url('simplenews/statistics/click', array('absolute' => TRUE, 'query' => array('p' => _simplenews_statistics_encode_parameter($pars), 
                                                                                       'h' => _simplenews_statistics_encode_parameter($pars_hash))));
}

to

function _simplenews_statistics_replace_url($match, $nid, $mail) {
  if (substr($match, 0, 1) == "#")
    return $match;

  require_once drupal_get_path('module', 'simplenews_statistics') .'/rc4.inc';
  $pars = 'nid='. $nid .'&mail='. $mail .'&url='. urlencode($match);
  $pars = rc4Encrypt(simplenews_private_key(), $pars);
  $pars_hash = md5($pars);
  
  return url('simplenews/statistics/click', array('absolute' => TRUE, 'query' => array('p' => _simplenews_statistics_encode_parameter($pars), 
                                                                                       'h' => _simplenews_statistics_encode_parameter($pars_hash))));
}

As you can see, i've added a urlencode on the url. This solved the problem for me. Would be great if this would be added to the next release :)