--- uc_usps.module	2010-02-08 08:31:28.000000000 -0800
+++ uc_usps.module	2011-02-09 14:44:19.000000000 -0800
@@ -370,21 +370,27 @@
     if (user_access('configure quotes') && variable_get('uc_quote_display_debug', FALSE)) {
       $services['data']['debug'] .= htmlentities($result->data) ."<br />\n";
     }
 
     $response = new SimpleXMLElement($result->data);
 
+	$service_match = array('&amp;lt;sup&amp;gt;&amp;amp;reg;&amp;lt;/sup&amp;gt;', '&amp;lt;sup&amp;gt;&amp;amp;trade;&amp;lt;/sup&amp;gt;', '*');
+	$service_replace = array('<sup>&reg;</sup>', '<sup>&trade;</sup>'. '');
 
     if (isset($response->Package)) {
       foreach ($response->Package as $package) {
         if (isset($package->Error)) {
           $services['data']['error'] .= (string)$package->Error[0]->Description .'<br />';
         }
         else {
           if (strpos($method['id'], 'intl')) {
             foreach ($package->Service as $service) {
               $id = (string)$service['ID'];
               $services[$id]['label'] = t('U.S.P.S. @service', array('@service' => (string)$service->SvcDescription));
+//              $services[$id]['label'] = html_entity_decode(t('U.S.P.S. @service', array('@service' => (string)$service->SvcDescription)), ENT_NOQUOTES);
+              $services[$id]['label'] = str_replace($service_match, $service_replace, $services[$id]['label']);
 
               $services[$id]['rate'] += uc_usps_markup((string)$service->Postage);
             }
           }
           else {
             foreach ($package->Postage as $postage) {
@@ -398,11 +404,14 @@
                 }
                 else {
                   $classid = 'zero';
                 }
               }
               $services[$classid]['label'] = t('U.S.P.S. @service', array('@service' => (string)$postage->MailService));
+//              $services[$classid]['label'] = html_entity_decode(html_entity_decode(t('U.S.P.S. @service', array('@service' => (string)$postage->MailService)), ENT_NOQUOTES), ENT_NOQUOTES);
+              $services[$classid]['label'] = str_replace($service_match, $service_replace, $services[$classid]['label']);
 
               $services[$classid]['rate'] += uc_usps_markup((string)$postage->Rate);
             }
           }
         }
       }