--- ./app/code/core/Mage/Customer/etc/config.xml.org	2011-01-25 12:35:25.000000000 +0100
+++ ./app/code/core/Mage/Customer/etc/config.xml	2011-01-25 16:22:52.000000000 +0100
@@ -108,17 +108,17 @@
 {{depend street2}}{{var street2}}{{/depend}}
 {{depend street3}}{{var street3}}{{/depend}}
 {{depend street4}}{{var street4}}{{/depend}}
-{{if city}}{{var city}},  {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}
+{{if postcode}}{{var postcode}}{{/if}}{{if city}} {{var city}}{{/if}}{{if region}}, {{var region}}{{/if}}
 {{var country}}
-T: {{var telephone}}
-{{depend fax}}F: {{var fax}}{{/depend}}
+Tel: {{var telephone}}
+{{depend fax}}Fax: {{var fax}}{{/depend}}
                         ]]></defaultFormat>
                     </text>
                     <oneline translate="title" module="customer">
                         <title>Text One Line</title>
                         <htmlEscape>true</htmlEscape>
                         <defaultFormat>
-<![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}, {{var street}}, {{var city}}, {{var region}} {{var postcode}}, {{var country}}]]>
+<![CDATA[{{depend prefix}}{{var prefix}} {{/depend}}{{var firstname}} {{depend middlename}}{{var middlename}} {{/depend}}{{var lastname}}{{depend suffix}} {{var suffix}}{{/depend}}, {{var street}}, {{var postcode}} {{var city}}, {{var region}}, {{var country}}]]>
                         </defaultFormat>
                     </oneline>
                     <html translate="title" module="customer">
@@ -131,10 +131,10 @@
 {{depend street2}}{{var street2}}<br />{{/depend}}
 {{depend street3}}{{var street3}}<br />{{/depend}}
 {{depend street4}}{{var street4}}<br />{{/depend}}
-{{if city}}{{var city}},  {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}<br/>
+{{if postcode}}{{var postcode}}{{/if}}{{if city}} {{var city}}{{/if}}{{if region}}, {{var region}}{{/if}}<br/>
 {{var country}}<br/>
-{{depend telephone}}T: {{var telephone}}{{/depend}}
-{{depend fax}}<br/>F: {{var fax}}{{/depend}}
+{{depend telephone}}Tel: {{var telephone}}{{/depend}}
+{{depend fax}}<br/>Fax: {{var fax}}{{/depend}}
             ]]></defaultFormat>
                     </html>
                     <pdf translate="title" module="customer">
@@ -147,15 +147,15 @@
 {{depend street2}}{{var street2}}|{{/depend}}
 {{depend street3}}{{var street3}}|{{/depend}}
 {{depend street4}}{{var street4}}|{{/depend}}
-{{if city}}{{var city}},  {{/if}}{{if region}}{{var region}}, {{/if}}{{if postcode}}{{var postcode}}{{/if}}|
+{{if postcode}}{{var postcode}}{{/if}}{{if city}} {{var city}}{{/if}}{{if region}}, {{var region}}{{/if}}|
 {{var country}}|
-{{depend telephone}}T: {{var telephone}}{{/depend}}|
-{{depend fax}}<br/>F: {{var fax}}{{/depend}}|
+{{depend telephone}}Tel: {{var telephone}}{{/depend}}|
+{{depend fax}}<br/>Fax: {{var fax}}{{/depend}}|
             ]]></defaultFormat>
                     </pdf>
                     <js_template template="title" module="customer">
                         <title>Javascript Template</title>
-                        <defaultFormat><![CDATA[#{prefix} #{firstname} #{middlename} #{lastname} #{suffix}<br/>#{company}<br/>#{street0}<br/>#{street1}<br/>#{street2}<br/>#{street3}<br/>#{city}, #{region}, #{postcode}<br/>#{country_id}<br/>T: #{telephone}<br/>F: #{fax}]]></defaultFormat>
+                        <defaultFormat><![CDATA[#{prefix} #{firstname} #{middlename} #{lastname} #{suffix}<br/>#{company}<br/>#{street0}<br/>#{street1}<br/>#{street2}<br/>#{street3}<br/>#{postcode}, #{city}, #{region}<br/>#{country_id}<br/>T: #{telephone}<br/>F: #{fax}]]></defaultFormat>
                     </js_template>
                 </formats>
             </address>
