diff --git a/templates/contacts.php b/templates/contacts.php
index 456fcce8..a749c983 100644
--- a/templates/contacts.php
+++ b/templates/contacts.php
@@ -6,33 +6,33 @@
 </form>
 <iframe name="file_upload_target" id='file_upload_target' src=""></iframe>
 <div id="groupsheader">
-	<button class="addgroup icon-plus text"><?php echo $l->t('New Group'); ?></button>
+	<button class="addgroup icon-plus text"><?php p($l->t('New Group')); ?></button>
 </div>
 <div id="leftcontent" class="loading">
 	<nav id="grouplist">
 	</nav>
 	<div id="contacts-settings">
-			<h3 class="settings action text" tabindex="0" role="button" title="<?php echo $l->t('Settings'); ?>"></h3>
-			<h2 data-id="addressbooks" tabindex="0" role="button"><?php echo $l->t('Address books'); ?></h3>
+			<h3 class="settings action text" tabindex="0" role="button" title="<?php p($l->t('Settings')); ?>"></h3>
+			<h2 data-id="addressbooks" tabindex="0" role="button"><?php p($l->t('Address books')); ?></h3>
 				<ul class="hidden">
 				</ul>
-			<h2 data-id="import" tabindex="0" role="button"><?php echo $l->t('Import'); ?></h3>
+			<h2 data-id="import" tabindex="0" role="button"><?php p($l->t('Import')); ?></h3>
 				<ul class="hidden">
 					<li class="import-upload">
 						<form id="import_upload_form" action="<?php echo OCP\Util::linkTo('contacts', 'ajax/uploadimport.php'); ?>" method="post" enctype="multipart/form-data" target="import_upload_target">
 						<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
-						<label for="import_fileupload"><?php echo $l->t('Select files to import'); ?>
-							<button class="import-upload-button" title="<?php echo $l->t('Select files'); ?>"></button>
+						<label for="import_fileupload"><?php p($l->t('Select files to import')); ?>
+							<button class="import-upload-button" title="<?php p($l->t('Select files')); ?>"></button>
 						</label>
 						<input id="import_fileupload" type="file" accept="text/vcard,text/x-vcard,text/directory" multiple="multiple" name="importfile" />
 						</form>
 						<iframe name="import_upload_target" id='import_upload_target' src=""></iframe>
 					</li>
-					<li class="import-select hidden"><label><?php echo $l->t('Import into:'); ?></label></li>
+					<li class="import-select hidden"><label><?php p($l->t('Import into:')); ?></label></li>
 					<li class="import-select hidden">
-						<select id="import_into" title="<?php echo $l->t('Import into:'); ?>">
+						<select id="import_into" title="<?php p($l->t('Import into:')); ?>">
 						</select>
-					<button class="doImport"><?php echo $l->t('OK'); ?></button>
+					<button class="doImport"><?php p($l->t('OK')); ?></button>
 					</li>
 					<li>
 						<label id="import-status-text"></label>
@@ -42,49 +42,49 @@
 	</div>
 </div>
 <div id="contactsheader">
-	<input type="checkbox" id="toggle_all" title="<?php echo $l->t('(De-)select all'); ?>" />
+	<input type="checkbox" id="toggle_all" title="<?php p($l->t('(De-)select all')); ?>" />
 	<div class="actions">
-		<button class="add svg icon-plus action text"><?php echo $l->t('New Contact'); ?></button>
-		<button class="download svg action text"><?php echo $l->t('Download Contact(s)'); ?></button>
+		<button class="add svg icon-plus action text"><?php p($l->t('New Contact')); ?></button>
+		<button class="download svg action text"><?php p($l->t('Download Contact(s)')); ?></button>
 		<select class="groups svg action text button" name="groups">
-			<option value="-1" disabled="disabled" selected="selected"><?php echo $l->t('Groups'); ?></option>
+			<option value="-1" disabled="disabled" selected="selected"><?php p($l->t('Groups')); ?></option>
 		</select>
-		<button class="favorite action svg inactive control" title="<?php echo $l->t('Favorite'); ?>"></button>
-		<a class="delete action" title="<?php echo $l->t('Delete Contact'); ?>"></a>
+		<button class="favorite action svg inactive control" title="<?php p($l->t('Favorite')); ?>"></button>
+		<a class="delete action" title="<?php p($l->t('Delete Contact')); ?>"></a>
 	</div>
 </div>
 <div id="rightcontent" class="loading">
 	<table id="contactlist">
 	</table>
 	<div class="hidden popup" id="ninjahelp">
-		<a class="close" tabindex="0" role="button" title="<?php echo $l->t('Close'); ?>"></a>
-		<h2><?php echo $l->t('Keyboard shortcuts'); ?></h2>
+		<a class="close" tabindex="0" role="button" title="<?php p($l->t('Close')); ?>"></a>
+		<h2><?php p($l->t('Keyboard shortcuts')); ?></h2>
 		<div class="help-section">
-			<h3><?php echo $l->t('Navigation'); ?></h3>
+			<h3><?php p($l->t('Navigation')); ?></h3>
 			<dl>
 				<dt>j/Down</dt>
-				<dd><?php echo $l->t('Next contact in list'); ?></dd>
+				<dd><?php p($l->t('Next contact in list')); ?></dd>
 				<dt>k/Up</dt>
-				<dd><?php echo $l->t('Previous contact in list'); ?></dd>
+				<dd><?php p($l->t('Previous contact in list')); ?></dd>
 				<dt>o</dt>
-				<dd><?php echo $l->t('Expand/collapse current addressbook'); ?></dd>
+				<dd><?php p($l->t('Expand/collapse current addressbook')); ?></dd>
 				<dt>n/PageDown</dt>
-				<dd><?php echo $l->t('Next addressbook'); ?></dd>
+				<dd><?php p($l->t('Next addressbook')); ?></dd>
 				<dt>p/PageUp</dt>
-				<dd><?php echo $l->t('Previous addressbook'); ?></dd>
+				<dd><?php p($l->t('Previous addressbook')); ?></dd>
 			</dl>
 		</div>
 		<div class="help-section">
-			<h3><?php echo $l->t('Actions'); ?></h3>
+			<h3><?php p($l->t('Actions')); ?></h3>
 			<dl>
 				<dt>r</dt>
-				<dd><?php echo $l->t('Refresh contacts list'); ?></dd>
+				<dd><?php p($l->t('Refresh contacts list')); ?></dd>
 				<dt>a</dt>
-				<dd><?php echo $l->t('Add new contact'); ?></dd>
+				<dd><?php p($l->t('Add new contact')); ?></dd>
 				<!-- dt>Shift-a</dt>
-				<dd><?php echo $l->t('Add new addressbook'); ?></dd -->
+				<dd><?php p($l->t('Add new addressbook')); ?></dd -->
 				<dt>Shift-Delete</dt>
-				<dd><?php echo $l->t('Delete current contact'); ?></dd>
+				<dd><?php p($l->t('Delete current contact')); ?></dd>
 			</dl>
 		</div>
 	</div>
@@ -92,8 +92,8 @@
 		<?php echo $l->t('<h3>You have no contacts in your addressbook.</h3>'
 			. '<p>Add a new contact or import existing contacts from a VCF file.</p>') ?>
 		<div id="selections">
-			<button class="addcontact icon-plus text"><?php echo $l->t('Add contact') ?></button>
-			<button class="import icon text"><?php echo $l->t('Import') ?></button>
+			<button class="addcontact icon-plus text"><?php p($l->t('Add contact')) ?></button>
+			<button class="import icon text"><?php p($l->t('Import')) ?></button>
 		</div>
 	</div>
 </div>
@@ -118,7 +118,7 @@
 </script>
 
 <script id="addGroupTemplate" type="text/template">
-	<div id="dialog-form" title="<?php echo $l->t('Add group'); ?>">
+	<div id="dialog-form" title="<?php p($l->t('Add group')); ?>">
 		<fieldset>
 			<input type="text" name="name" id="name" />
 		</fieldset>
@@ -133,7 +133,7 @@
 		</td>
 		<td class="email">
 			<a href="mailto:{email}">{email}</a>
-			<a class="svg mailto hidden" title="<?php echo $l->t('Compose mail'); ?>"></a>
+			<a class="svg mailto hidden" title="<?php p($l->t('Compose mail')); ?>"></a>
 		</td>
 		<td class="tel">{tel}</td>
 		<td class="adr">{adr}</td>
@@ -144,7 +144,7 @@
 <script id="groupListItemTemplate" type="text/template">
 	<h3 class="group" data-type="{type}" data-id="{id}">
 		{name}
-		<a class="action delete tooltipped rightwards" title="<?php echo $l->t('Delete group'); ?>"></a>
+		<a class="action delete tooltipped rightwards" title="<?php p($l->t('Delete group')); ?>"></a>
 		<span class="action numcontacts">{num}</span>
 	</h3>
 </script>
@@ -157,10 +157,10 @@
 		<li>
 			<div id="photowrapper" class="propertycontainer" data-element="photo">
 				<ul id="phototools" class="transparent hidden">
-					<li><a class="action delete" title="<?php echo $l->t('Delete current photo'); ?>"></a></li>
-					<li><a class="action edit" title="<?php echo $l->t('Edit current photo'); ?>"></a></li>
-					<li><a class="action upload" title="<?php echo $l->t('Upload new photo'); ?>"></a></li>
-					<li><a class="action cloud" title="<?php echo $l->t('Select photo from ownCloud'); ?>"></a></li>
+					<li><a class="action delete" title="<?php p($l->t('Delete current photo')); ?>"></a></li>
+					<li><a class="action edit" title="<?php p($l->t('Edit current photo')); ?>"></a></li>
+					<li><a class="action upload" title="<?php p($l->t('Upload new photo')); ?>"></a></li>
+					<li><a class="action cloud" title="<?php p($l->t('Select photo from ownCloud')); ?>"></a></li>
 				</ul>
 				<a class="favorite action {favorite}"></a>
 			</div>
@@ -171,54 +171,54 @@
 			<ul>
 				<li>
 					<input class="value tooltipped rightwards onfocus" type="text" id="n_1" name="value[1]" value="{n1}" 
-						placeholder="<?php echo $l->t('First name'); ?>" 
-						title="<?php echo $l->t('First name'); ?>" />
+						placeholder="<?php p($l->t('First name')); ?>" 
+						title="<?php p($l->t('First name')); ?>" />
 				</li>
 				<li>
 					<input class="value tooltipped rightwards onfocus" type="text" id="n_2" name="value[2]" value="{n2}" 
-						placeholder="<?php echo $l->t('Additional names'); ?>" 
-						title="<?php echo $l->t('Additional names'); ?>" />
+						placeholder="<?php p($l->t('Additional names')); ?>" 
+						title="<?php p($l->t('Additional names')); ?>" />
 				</li>
 				<li>
 					<input class="value tooltipped rightwards onfocus" type="text" id="n_0" name="value[0]" value="{n0}" 
-						placeholder="<?php echo $l->t('Last name'); ?>" 
-						title="<?php echo $l->t('Last name'); ?>" />
+						placeholder="<?php p($l->t('Last name')); ?>" 
+						title="<?php p($l->t('Last name')); ?>" />
 				</li>
 			</ul>
 			<input class="value" type="hidden" id="n_3" name="value[3]" value="{n3}" />
 			<input class="value" type="hidden" id="n_4" name="value[4]" value="{n4}" />
 			</fieldset>
 			<div class="groupscontainer propertycontainer" data-element="categories">
-				<select id="contactgroups" title="<?php echo $l->t('Select groups'); ?>" name="value" multiple></select>
+				<select id="contactgroups" title="<?php p($l->t('Select groups')); ?>" name="value" multiple></select>
 			</div>
 			<dl class="form">
 				<dt data-element="nickname">
-					<?php echo $l->t('Nickname'); ?>
+					<?php p($l->t('Nickname')); ?>
 				</dt>
 				<dd data-element="nickname" class="propertycontainer">
-					<input class="value tooltipped rightwards onfocus" type="text" name="value" value="{nickname}" title="<?php echo $l->t('Enter nickname'); ?>" required />
-					<a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a>
+					<input class="value tooltipped rightwards onfocus" type="text" name="value" value="{nickname}" title="<?php p($l->t('Enter nickname')); ?>" required />
+					<a role="button" class="action delete" title="<?php p($l->t('Delete')); ?>"></a>
 				</dd>
 				<dt data-element="title">
-					<?php echo $l->t('Title'); ?>
+					<?php p($l->t('Title')); ?>
 				</dt>
 				<dd data-element="title" class="propertycontainer">
-					<input class="value tooltipped rightwards onfocus" type="text" name="value" value="{title}" title="<?php echo $l->t('Enter title'); ?>" required />
-					<a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a>
+					<input class="value tooltipped rightwards onfocus" type="text" name="value" value="{title}" title="<?php p($l->t('Enter title')); ?>" required />
+					<a role="button" class="action delete" title="<?php p($l->t('Delete')); ?>"></a>
 				</dd>
 				<dt data-element="org">
-					<?php echo $l->t('Organization'); ?>
+					<?php p($l->t('Organization')); ?>
 				</dt>
 				<dd data-element="org" class="propertycontainer">
-					<input class="value tooltipped rightwards onfocus" type="text" name="value" value="{org}" title="<?php echo $l->t('Enter organization'); ?>" required />
-					<a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a>
+					<input class="value tooltipped rightwards onfocus" type="text" name="value" value="{org}" title="<?php p($l->t('Enter organization')); ?>" required />
+					<a role="button" class="action delete" title="<?php p($l->t('Delete')); ?>"></a>
 				</dd>
 				<dt data-element="bday">
-					<?php echo $l->t('Birthday'); ?>
+					<?php p($l->t('Birthday')); ?>
 				</dt>
 				<dd data-element="bday" class="propertycontainer">
 					<input class="value tooltipped rightwards onfocus" type="text" name="value" value="{bday}" required />
-					<a role="button" class="action delete" title="<?php echo $l->t('Delete'); ?>"></a>
+					<a role="button" class="action delete" title="<?php p($l->t('Delete')); ?>"></a>
 				</dd>
 			</dl>
 			</div>
@@ -245,28 +245,28 @@
 		</li>
 		<li>
 			<section class="note propertycontainer" data-element="note">
-				<textarea class="value" placeholder="<?php echo $l->t('Notes go here...'); ?>">{note}</textarea>
+				<textarea class="value" placeholder="<?php p($l->t('Notes go here...')); ?>">{note}</textarea>
 			</section>
 		</li>
 	</ul>
 	<footer>
-		<button class="cancel action text tooltipped downwards" title="<?php echo $l->t('Cancel'); ?>"><?php echo $l->t('Cancel'); ?></button>
-		<button class="close text tooltipped downwards" title="<?php echo $l->t('Close'); ?>"><?php echo $l->t('Close'); ?></button>
-		<button class="export action text tooltipped downwards" title="<?php echo $l->t('Export as VCF'); ?>"><?php echo $l->t('Download'); ?></button>
+		<button class="cancel action text tooltipped downwards" title="<?php p($l->t('Cancel')); ?>"><?php p($l->t('Cancel')); ?></button>
+		<button class="close text tooltipped downwards" title="<?php p($l->t('Close')); ?>"><?php p($l->t('Close')); ?></button>
+		<button class="export action text tooltipped downwards" title="<?php p($l->t('Export as VCF')); ?>"><?php p($l->t('Download')); ?></button>
 		<select class="add action text button" id="addproperty">
-			<option value=""><?php echo $l->t('Add'); ?></option>
-			<option value="ORG"><?php echo $l->t('Organization'); ?></option>
-			<option value="TITLE"><?php echo $l->t('Title'); ?></option>
-			<option value="NICKNAME"><?php echo $l->t('Nickname'); ?></option>
-			<option value="BDAY"><?php echo $l->t('Birthday'); ?></option>
-			<option value="TEL"><?php echo $l->t('Phone'); ?></option>
-			<option value="EMAIL"><?php echo $l->t('Email'); ?></option>
-			<option value="IMPP"><?php echo $l->t('Instant Messaging'); ?></option>
-			<option value="ADR"><?php echo $l->t('Address'); ?></option>
-			<option value="NOTE"><?php echo $l->t('Note'); ?></option>
-			<option value="URL"><?php echo $l->t('Web site'); ?></option>
+			<option value=""><?php p($l->t('Add')); ?></option>
+			<option value="ORG"><?php p($l->t('Organization')); ?></option>
+			<option value="TITLE"><?php p($l->t('Title')); ?></option>
+			<option value="NICKNAME"><?php p($l->t('Nickname')); ?></option>
+			<option value="BDAY"><?php p($l->t('Birthday')); ?></option>
+			<option value="TEL"><?php p($l->t('Phone')); ?></option>
+			<option value="EMAIL"><?php p($l->t('Email')); ?></option>
+			<option value="IMPP"><?php p($l->t('Instant Messaging')); ?></option>
+			<option value="ADR"><?php p($l->t('Address')); ?></option>
+			<option value="NOTE"><?php p($l->t('Note')); ?></option>
+			<option value="URL"><?php p($l->t('Web site')); ?></option>
 		</select>
-		<button class="delete action text float right tooltipped downwards" title="<?php echo $l->t('Delete contact'); ?>"><?php echo $l->t('Delete'); ?></button>
+		<button class="delete action text float right tooltipped downwards" title="<?php p($l->t('Delete contact')); ?>"><?php p($l->t('Delete')); ?></button>
 	</footer>
 	</section>
 </form>
@@ -279,12 +279,12 @@
 				<select class="rtl type parameter" data-parameter="TYPE" name="parameters[TYPE][]">
 					<?php echo OCP\html_select_options($_['email_types'], array()) ?>
 				</select>
-				<input type="checkbox" class="parameter tooltipped rightwards" data-parameter="TYPE" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
+				<input type="checkbox" class="parameter tooltipped rightwards" data-parameter="TYPE" name="parameters[TYPE][]" value="PREF" title="<?php p($l->t('Preferred')); ?>" />
 			</span>
-			<input type="email" class="nonempty value" name="value" value="{value}" x-moz-errormessage="<?php echo $l->t('Please specify a valid email address.'); ?>" placeholder="<?php echo $l->t('someone@example.com'); ?>" required />
+			<input type="email" class="nonempty value" name="value" value="{value}" x-moz-errormessage="<?php p($l->t('Please specify a valid email address.')); ?>" placeholder="<?php p($l->t('someone@example.com')); ?>" required />
 			<span class="listactions">
-				<a class="action mail tooltipped leftwards" title="<?php echo $l->t('Mail to address'); ?>"></a>
-				<a role="button" class="action delete tooltipped leftwards" title="<?php echo $l->t('Delete email address'); ?>"></a>
+				<a class="action mail tooltipped leftwards" title="<?php p($l->t('Mail to address')); ?>"></a>
+				<a role="button" class="action delete tooltipped leftwards" title="<?php p($l->t('Delete email address')); ?>"></a>
 			</span>
 		</li>
 	</div>
@@ -294,11 +294,11 @@
 				<select class="rtl type parameter" data-parameter="TYPE" name="parameters[TYPE][]">
 					<?php echo OCP\html_select_options($_['phone_types'], array()) ?>
 				</select>
-				<input type="checkbox" class="parameter tooltipped rightwards" data-parameter="TYPE" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
+				<input type="checkbox" class="parameter tooltipped rightwards" data-parameter="TYPE" name="parameters[TYPE][]" value="PREF" title="<?php p($l->t('Preferred')); ?>" />
 			</span>
-			<input type="tel" class="nonempty value" name="value" value="{value}" placeholder="<?php echo $l->t('Enter phone number'); ?>" required />
+			<input type="tel" class="nonempty value" name="value" value="{value}" placeholder="<?php p($l->t('Enter phone number')); ?>" required />
 			<span class="listactions">
-				<a role="button" class="action delete tooltipped leftwards" title="<?php echo $l->t('Delete phone number'); ?>"></a>
+				<a role="button" class="action delete tooltipped leftwards" title="<?php p($l->t('Delete phone number')); ?>"></a>
 			</span>
 		</li>
 	</div>
@@ -308,12 +308,12 @@
 				<select class="rtl type parameter" data-parameter="TYPE" name="parameters[TYPE][]">
 					<?php echo OCP\html_select_options($_['email_types'], array()) ?>
 				</select>
-				<input type="checkbox" class="parameter tooltipped rightwards" data-parameter="TYPE" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
+				<input type="checkbox" class="parameter tooltipped rightwards" data-parameter="TYPE" name="parameters[TYPE][]" value="PREF" title="<?php p($l->t('Preferred')); ?>" />
 			</span>
 			<input type="url" class="nonempty value" name="value" value="{value}" placeholder="http://www.example.com/" required />
 			<span class="listactions">
-				<a role="button" class="action globe tooltipped leftwards" title="<?php echo $l->t('Go to web site'); ?>">
-				<a role="button" class="action delete tooltipped leftwards" title="<?php echo $l->t('Delete URL'); ?>"></a>
+				<a role="button" class="action globe tooltipped leftwards" title="<?php p($l->t('Go to web site')); ?>">
+				<a role="button" class="action delete tooltipped leftwards" title="<?php p($l->t('Delete URL')); ?>"></a>
 			</span>
 		</li>
 	</div>
@@ -324,8 +324,8 @@
 				<span class="adr">{value}</span>
 			</span>
 			<span class="listactions">
-				<a class="action globe tooltipped leftwards" title="<?php echo $l->t('View on map'); ?>"></a>
-				<a class="action delete tooltipped leftwards" title="<?php echo $l->t('Delete address'); ?>"></a>
+				<a class="action globe tooltipped leftwards" title="<?php p($l->t('View on map')); ?>"></a>
+				<a class="action delete tooltipped leftwards" title="<?php p($l->t('Delete address')); ?>"></a>
 			</span>
 			<fieldset class="adr hidden editor">
 				<ul>
@@ -333,30 +333,30 @@
 					<select class="rtl type parameter" data-parameter="TYPE" name="parameters[TYPE][]">
 						<?php echo OCP\html_select_options($_['adr_types'], array()) ?>
 					</select>
-					<input type="checkbox" id="adr_pref_{idx}" class="parameter tooltipped downwards" data-parameter="TYPE" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" /><label for="adr_pref_{idx}"><?php echo $l->t('Preferred'); ?></label>
+					<input type="checkbox" id="adr_pref_{idx}" class="parameter tooltipped downwards" data-parameter="TYPE" name="parameters[TYPE][]" value="PREF" title="<?php p($l->t('Preferred')); ?>" /><label for="adr_pref_{idx}"><?php p($l->t('Preferred')); ?></label>
 				</li>
 				<li>
 					<input class="value stradr tooltipped rightwards onfocus" type="text" id="adr_2" name="value[2]" value="{adr2}" 
-					placeholder="<?php echo $l->t('1 Main Street'); ?>"
-					title="<?php echo $l->t('Street address'); ?>" />
+					placeholder="<?php p($l->t('1 Main Street')); ?>"
+					title="<?php p($l->t('Street address')); ?>" />
 				</li>
 				<li>
 					<input class="value zip tooltipped rightwards onfocus" type="text" id="adr_5" name="value[5]" value="{adr5}" 
-						placeholder="<?php echo $l->t('12345'); ?>"
-						title="<?php echo $l->t('Postal code'); ?>" />
+						placeholder="<?php p($l->t('12345')); ?>"
+						title="<?php p($l->t('Postal code')); ?>" />
 					<input class="value city tooltipped rightwards onfocus" type="text" id="adr_3" name="value[3]" value="{adr3}" 
-						placeholder="<?php echo $l->t('Your city'); ?>"
-						title="<?php echo $l->t('City'); ?>" />
+						placeholder="<?php p($l->t('Your city')); ?>"
+						title="<?php p($l->t('City')); ?>" />
 				</li>
 				<li>
 					<input class="value region tooltipped rightwards onfocus" type="text" id="adr_4" name="value[4]" value="{adr4}" 
-						placeholder="<?php echo $l->t('Some region'); ?>"
-						title="<?php echo $l->t('State or province'); ?>" />
+						placeholder="<?php p($l->t('Some region')); ?>"
+						title="<?php p($l->t('State or province')); ?>" />
 				</li>
 				<li>
 					<input class="value country tooltipped rightwards onfocus" type="text" id="adr_6" name="value[6]" value="{adr6}" 
-						placeholder="<?php echo $l->t('Your country'); ?>"
-						title="<?php echo $l->t('Country'); ?>" />
+						placeholder="<?php p($l->t('Your country')); ?>"
+						title="<?php p($l->t('Country')); ?>" />
 				</li>
 			</ul>
 			<input class="value pobox" type="hidden" id="adr_0" name="value[0]" value="{adr0}" />
@@ -370,7 +370,7 @@
 				<select class="type parameter" data-parameter="TYPE" name="parameters[TYPE][]">
 					<?php echo OCP\html_select_options($_['impp_types'], array()) ?>
 				</select>
-				<input type="checkbox" class="parameter impp tooltipped downwards" name="parameters[TYPE][]" value="PREF" title="<?php echo $l->t('Preferred'); ?>" />
+				<input type="checkbox" class="parameter impp tooltipped downwards" name="parameters[TYPE][]" value="PREF" title="<?php p($l->t('Preferred')); ?>" />
 			</span>
 				<div class="select_wrapper">
 				<select class="ltr parameter label impp" data-parameter="X-SERVICE-TYPE" name="parameters[X-SERVICE-TYPE]">
@@ -378,9 +378,9 @@
 				</select>
 				</div>
 			<input type="text" class="nonempty value" name="value" value="{value}"
-					placeholder="<?php echo $l->t('Instant Messenger'); ?>" required />
+					placeholder="<?php p($l->t('Instant Messenger')); ?>" required />
 			<span class="listactions">
-				<a role="button" class="action delete tooltipped leftwards" title="<?php echo $l->t('Delete IM'); ?>"></a>
+				<a role="button" class="action delete tooltipped leftwards" title="<?php p($l->t('Delete IM')); ?>"></a>
 			</span>
 		</li>
 	</div>
@@ -390,9 +390,9 @@
 <li data-id="{id}">
 	<label class="float">{displayname}</label>
 	<span class="actions">
-	<a title="<?php echo $l->t('Share'); ?>" class="share action" data-possible-permissions="{permissions}" data-item="{id}" data-item-type="addressbook"></a>
-	<a title="<?php echo $l->t('Export'); ?>" class="download action" href="<?php echo OCP\Util::linkTo('contacts', 'export.php'); ?>?bookid={id}"></a>
-	<a  title="<?php echo $l->t('CardDAV link'); ?>" class="globe action"></a>
-	<a  title="<?php echo $l->t('Delete'); ?>" class="delete action"></a>
+	<a title="<?php p($l->t('Share')); ?>" class="share action" data-possible-permissions="{permissions}" data-item="{id}" data-item-type="addressbook"></a>
+	<a title="<?php p($l->t('Export')); ?>" class="download action" href="<?php echo OCP\Util::linkTo('contacts', 'export.php'); ?>?bookid={id}"></a>
+	<a  title="<?php p($l->t('CardDAV link')); ?>" class="globe action"></a>
+	<a  title="<?php p($l->t('Delete')); ?>" class="delete action"></a>
 </span></li>
 </script>
diff --git a/templates/part.cropphoto.php b/templates/part.cropphoto.php
index 08911a86..88547599 100644
--- a/templates/part.cropphoto.php
+++ b/templates/part.cropphoto.php
@@ -28,5 +28,5 @@ $requesttoken = $_['requesttoken'];
 <script type="text/javascript" src="<?php echo OC_Helper::linkTo('contacts/js', 'jcrop.js');?>"></script>
 <?php
 } else {
-	echo $l->t('The temporary image has been removed from cache.');
+	p($l->t('The temporary image has been removed from cache.'));
 }
diff --git a/templates/settings.php b/templates/settings.php
index 269def02..bc174022 100644
--- a/templates/settings.php
+++ b/templates/settings.php
@@ -1,14 +1,14 @@
 <form id="contacts-settings">
 	<fieldset class="personalblock">
-		<?php echo $l->t('CardDAV syncing addresses'); ?> (<a href="http://owncloud.org/synchronisation/" target="_blank"><?php echo $l->t('more info'); ?></a>)
+		<?php p($l->t('CardDAV syncing addresses')); ?> (<a href="http://owncloud.org/synchronisation/" target="_blank"><?php p($l->t('more info')); ?></a>)
 		<dl>
-		<dt><?php echo $l->t('Primary address (Kontact et al)'); ?></dt>
+		<dt><?php p($l->t('Primary address (Kontact et al)')); ?></dt>
 		<dd><code><?php echo OCP\Util::linkToRemote('carddav'); ?></code></dd>
-		<dt><?php echo $l->t('iOS/OS X'); ?></dt>
+		<dt><?php p($l->t('iOS/OS X')); ?></dt>
 		<dd><code><?php echo OCP\Util::linkToRemote('carddav'); ?>principals/<?php echo OCP\USER::getUser(); ?></code>/</dd>
 		</dl>
 		<div class="addressbooks-settings hidden">
-			<?php echo $l->t('Addressbooks'); ?>
+			<?php p($l->t('Addressbooks')); ?>
 			<table>
 			<?php foreach($_['addressbooks'] as $addressbook) { ?>
 			<tr class="addressbook" data-id="<?php echo $addressbook['id'] ?>"
@@ -23,31 +23,31 @@
 				<td class="name"><?php echo $addressbook['displayname'] ?></td>
 				<td class="description"><?php echo $addressbook['description'] ?></td>
 				<td class="action">
-					<a class="svg action globe" title="<?php echo $l->t('Show CardDav link'); ?>"></a>
+					<a class="svg action globe" title="<?php p($l->t('Show CardDav link')); ?>"></a>
 				</td>
 				<td class="action">
-					<a class="svg action cloud" title="<?php echo $l->t('Show read-only VCF link'); ?>"></a>
+					<a class="svg action cloud" title="<?php p($l->t('Show read-only VCF link')); ?>"></a>
 				</td>
 				<td class="action">
 					<?php if($addressbook['permissions'] & OCP\PERMISSION_SHARE) { ?>
 					<a class="svg action share" data-item-type="addressbook"
 						data-item="<?php echo $addressbook['id'] ?>"
 						data-possible-permissions="<?php echo $addressbook['permissions'] ?>"
-						title="<?php echo $l->t("Share"); ?>"></a>
+						title="<?php p($l->t("Share")); ?>"></a>
 					<?php } ?>
 				</td>
 				<td class="action">
-					<a class="svg action download" title="<?php echo $l->t('Download'); ?>"
+					<a class="svg action download" title="<?php p($l->t('Download')); ?>"
 						href="<?php echo OCP\Util::linkToAbsolute('contacts', 'export.php'); ?>?bookid=<?php echo $addressbook['id'] ?>"></a>
 				</td>
 				<td class="action">
 					<?php if($addressbook['permissions'] & OCP\PERMISSION_UPDATE) { ?>
-					<a class="svg action edit" title="<?php echo $l->t("Edit"); ?>"></a>
+					<a class="svg action edit" title="<?php p($l->t("Edit")); ?>"></a>
 					<?php } ?>
 				</td>
 				<td class="action">
 					<?php if($addressbook['permissions'] & OCP\PERMISSION_DELETE) { ?>
-					<a class="svg action delete" title="<?php echo $l->t("Delete"); ?>"></a>
+					<a class="svg action delete" title="<?php p($l->t("Delete")); ?>"></a>
 					<?php } ?>
 				</td>
 			</tr>
@@ -55,15 +55,15 @@
 			</table>
 			<div class="actions" style="width: 100%;">
 				<input class="active hidden" type="checkbox" />
-				<button class="new"><?php echo $l->t('New Address Book') ?></button>
-				<input class="name hidden" type="text" autofocus="autofocus" placeholder="<?php echo $l->t('Name'); ?>" />
-				<input class="description hidden" type="text" placeholder="<?php echo $l->t('Description'); ?>" />
-				<button class="save hidden"><?php echo $l->t('Save') ?></button>
-				<button class="cancel hidden"><?php echo $l->t('Cancel') ?></button>
+				<button class="new"><?php p($l->t('New Address Book')) ?></button>
+				<input class="name hidden" type="text" autofocus="autofocus" placeholder="<?php p($l->t('Name')); ?>" />
+				<input class="description hidden" type="text" placeholder="<?php p($l->t('Description')); ?>" />
+				<button class="save hidden"><?php p($l->t('Save')) ?></button>
+				<button class="cancel hidden"><?php p($l->t('Cancel')) ?></button>
 			</div>
 		</div>
 		<div style="width: 100%; clear: both;">
-			<button class="moreless"><?php echo $l->t('More...') ?></button>
+			<button class="moreless"><?php p($l->t('More...')) ?></button>
 		</div>
 	</fieldset>
 </form>