=== modified file 'modules/addresses/addresses.inc'
--- modules/addresses/addresses.inc	2009-06-08 15:33:42 +0000
+++ modules/addresses/addresses.inc	2009-06-08 16:28:38 +0000
@@ -615,18 +615,18 @@
 }
 
 /**
- * Generates HTML for the passed address.
- *
- * @ingroup themeable
- * @param $afields
- *   Array. A single address with the following fields (generally, but it can have more):
- *   - 'street'       => A string representing the street
- *   - 'additional'   => A string for any additional portion of the street
- *   - 'city'         => A string for the city name
- *   - 'province'     => The standard postal abbreviation for the province
- *   - 'country'      => The two-letter ISO code for the country of the address (REQUIRED)
- *   - 'postal_code'  => The international postal code for the address
- */
+* Generates HTML for the passed address.
+*
+* @ingroup themeable
+* @param $afields
+*   Array. A single address with the following fields (generally, but it can have more):
+*   - 'street'       => A string representing the street
+*   - 'additional'   => A string for any additional portion of the street
+*   - 'city'         => A string for the city name
+*   - 'province'     => The standard postal abbreviation for the province
+*   - 'country'      => The two-letter ISO code for the country of the address (REQUIRED)
+*   - 'postal_code'  => The international postal code for the address
+*/
 function theme_addresses($afields) {
   // If all fields are hidden, return ''
   if (empty($afields)) {
@@ -658,13 +658,10 @@
 
   // Call token module to replace all tokens to their right value. Also,
   // use 'adr' microformat
-  $format_address = '<dl class="adr">'.
-    token_replace($format_address, 'addresses_adr', $afields, '!', '') .'</dl>  ';
-
+  $format_address = token_replace($format_address, 'addresses_adr', $afields, '!', '');
   // Besides being the Drupal Address info,
   // its possible to be used by hCard and VCard (if a address name was provided)
-  $format_address = '<div class="vcard">'.
-    token_replace($format_address, 'addresses_general', $afields, '!', '') .'</div>';
+  $format_address = token_replace($format_address, 'addresses_general', $afields, '!', '');
 
   // Replace the new lines for HTML line breaks AND remove
   // all empty lines
@@ -677,6 +674,14 @@
   }
   $format_address = implode('<br/>', $format_address);
 
+  $format_address = '<dl class="adr">'.
+    $format_address .'</dl>  ';
+
+  // Besides being the Drupal Address info,
+  // its possible to be used by hCard and VCard (if a address name was provided)
+  $format_address = '<div class="vcard">'.
+    $format_address.'</div>';
+
   // Add the CCS
   drupal_add_css(drupal_get_path('module', 'addresses') .'/addresses.css');