--- uc_eway.module.unpatched	2011-03-30 13:58:48.000000000 +1100
+++ uc_eway.module	2011-03-30 13:59:26.000000000 +1100
@@ -288,7 +288,7 @@ function uc_eway_charge($order_id, $amou
 
   $xmlstring = '<ewaygateway>';
   foreach ($xml_data as $key => $value) {
-    $xmlstring .= '<' . $key . '>' . htmlentities($value) . '</' . $key . '>';
+    $xmlstring .= '<' . $key . '>' . htmlspecialchars(trim($value),ENT_QUOTES,'UTF-8') . '</' . $key . '>';
   }
   $xmlstring .= '</ewaygateway>';
 
