token replacement adds space in scheduled reminder

creating a scheduled reminder message in 4.3.3. Objective is to create a pre-filled webform linked to contact. HTML breaks token replacement.
e.g. : site/reg-form?cid1=

{contact.contact_id}

​&cs1=

{contact.hash}

​
'&' is concerted to space site/reg-form?cid1=1154%E2%80%8B&cs1=9797bdd3e2076e157a35054ec61ed846%E2%80%8B

Do token replacements like this need some sort of escaping?
This may affect other tokens.
Created bug as per Yosh: http://forum.civicrm.org/index.php/topic,28807.0/topicseen.html