diff --git a/view/theme/frio/templates/profile_vcard.tpl b/view/theme/frio/templates/profile_vcard.tpl
index 02aa89fcc..b00e82321 100644
--- a/view/theme/frio/templates/profile_vcard.tpl
+++ b/view/theme/frio/templates/profile_vcard.tpl
@@ -39,7 +39,7 @@
 		<div class="profile-header">
 			<h3 class="fn p-name">{{$profile.name}}</h3>
 
-			{{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
+			{{if $profile.addr}}<div class="p-addr">{{include file="sub/punct_wrap.tpl" text=$profile.addr}}</div>{{/if}}
 
 			{{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 
@@ -92,7 +92,7 @@
 		{{if $profile.xmpp}}
 		<div class="xmpp">
 			<span class="xmpp-label icon"><i class="fa fa-comments"></i></span>
-			<span class="xmpp-data">{{$profile.xmpp}}</span>
+			<span class="xmpp-data"><a href="xmpp:{{$profile.xmpp}}" rel="me" target="_blank">{{include file="sub/punct_wrap.tpl" text=$profile.xmpp}}</a></span>
 		</div>
 		{{/if}}
 
@@ -119,7 +119,7 @@
 		{{if $homepage}}
 		<div class="homepage detail">
 			<span class="homepage-label icon"><i class="fa fa-external-link-square"></i></span>
-			<span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></span>
+			<span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{include file="sub/punct_wrap.tpl" text=$profile.homepage}}</a></span>
 		</div>
 		{{/if}}
 
diff --git a/view/theme/frio/templates/sub/punct_wrap.tpl b/view/theme/frio/templates/sub/punct_wrap.tpl
new file mode 100644
index 000000000..68830ecd6
--- /dev/null
+++ b/view/theme/frio/templates/sub/punct_wrap.tpl
@@ -0,0 +1 @@
+{{$text|regex_replace:"/([@\.\/])/":"<wbr>$1" nofilter}}