diff --git a/apps/files_encryption/templates/settings-personal.php b/apps/files_encryption/templates/settings-personal.php
index de05fa5a4bc..1274bd3bb5c 100644
--- a/apps/files_encryption/templates/settings-personal.php
+++ b/apps/files_encryption/templates/settings-personal.php
@@ -1,13 +1,45 @@
 <form id="encryption">
-<fieldset class="personalblock">
-
-<strong>Choose encryption mode:</strong>
-
-<p>
-	<input type="hidden" name="prev_encryption_mode" id="prev_encryption_mode" value="<?php echo $_['encryption_mode']; ?>">
-	<input type="radio" name="encryption_mode" value="client" id='client_encryption' style="width:20px;" <?php if ($_['encryption_mode'] == 'client') echo "checked='checked'"?>/> Client side encryption (most secure but makes it impossible to access your data from the web interface)<br />
-	<input type="radio" name="encryption_mode" value="server" id='server_encryption' style="width:20px;" <?php if ($_['encryption_mode'] == 'server') echo "checked='checked'"?> /> Server side encryption (allows you to access your files from the web interface and the desktop client)<br />
-	<input type="radio" name="encryption_mode" value="none" id='none_encryption' style="width:20px;" <?php if ($_['encryption_mode'] == 'none') echo "checked='checked'"?>/> None (no encryption at all)<br/>
-	</p>	
+	<fieldset class="personalblock">
+		<strong><?php echo $l->t('Choose encryption mode:'); ?></strong>
+		<p>
+			<input 
+			type="hidden" 
+			name="prev_encryption_mode" 
+			id="prev_encryption_mode" 
+			value="<?php echo $_['encryption_mode']; ?>"
+			>
+			
+			<input 
+			type="radio" 
+			name="encryption_mode" 
+			value="client" 
+			id='client_encryption' 
+			style="width:20px;" 
+			<?php if ($_['encryption_mode'] == 'client') echo "checked='checked'"?>
+			/> 
+			<?php echo $l->t('Client side encryption (most secure but makes it impossible to access your data from the web interface)'); ?>
+			<br />
+			
+			<input 
+			type="radio" 
+			name="encryption_mode" 
+			value="server" 
+			id='server_encryption' 
+			style="width:20px;" <?php if ($_['encryption_mode'] == 'server') echo "checked='checked'"?>
+			/> 
+			<?php echo $l->t('Server side encryption (allows you to access your files from the web interface and the desktop client)'); ?>
+			<br />
+			
+			<input 
+			type="radio" 
+			name="encryption_mode" 
+			value="none" 
+			id='none_encryption' 
+			style="width:20px;" 
+			<?php if ($_['encryption_mode'] == 'none') echo "checked='checked'"?>
+			/> 
+			<?php echo $l->t('None (no encryption at all)'); ?>
+			<br/>
+		</p>
 	</fieldset>
 </form>
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
index e2a9bcc3be1..544ec793f37 100644
--- a/apps/files_encryption/templates/settings.php
+++ b/apps/files_encryption/templates/settings.php
@@ -1,24 +1,79 @@
 <form id="encryption">
 	<fieldset class="personalblock">
 		
-	<strong>Choose encryption mode:</strong>
-	
-	<p><i>Important: Once you selected an encryption mode there is no way to change it back</i></p>
-	
-	<p>
-	<input type="radio" name="encryption_mode" id="client_encryption" value="client" style="width:20px;" <?php if ($_['encryption_mode'] == 'client') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?>/> Client side encryption (most secure but makes it impossible to access your data from the web interface)<br />
-	<input type="radio" name="encryption_mode" id="server_encryption" value="server" style="width:20px;" <?php if ($_['encryption_mode'] == 'server') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?> /> Server side encryption (allows you to access your files from the web interface and the desktop client)<br />
-	<input type="radio" name="encryption_mode" id="user_encryption" value="user" style="width:20px;" <?php if ($_['encryption_mode'] == 'user') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?>/> User specific (let the user decide)<br/>
-	<input type="radio" name="encryption_mode" id="none_encryption" value="none" style="width:20px;" <?php if ($_['encryption_mode'] == 'none') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?>/> None (no encryption at all)<br/>
-	</p>	
-	<p>	
-	<strong><?php echo $l->t('Encryption'); ?></strong>
-		<?php echo $l->t("Exclude the following file types from encryption"); ?>
-		<select id='encryption_blacklist' title="<?php echo $l->t('None')?>" multiple="multiple">
+		<strong>
+			<?php echo $l->t('Choose encryption mode:'); ?>
+		</strong>
+		
+		<p>
+			<i>
+				<?php echo $l->t('Important: Once you selected an encryption mode there is no way to change it back'); ?>
+			</i>
+		</p>
+		
+		<p>
+			<input 
+			type="radio" 
+			name="encryption_mode" 
+			id="client_encryption" 
+			value="client" 
+			style="width:20px;" 
+			<?php if ($_['encryption_mode'] == 'client') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?> 
+			/> 
+			
+			<?php echo $l->t("Client side encryption (most secure but makes it impossible to access your data from the web interface)"); ?>
+			<br />
+			
+			<input
+			type="radio" 
+			name="encryption_mode" 
+			id="server_encryption" 
+			value="server" 
+			style="width:20px;" 
+			<?php if ($_['encryption_mode'] == 'server') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?> 
+			/> 
+			
+			<?php echo $l->t('Server side encryption (allows you to access your files from the web interface and the desktop client)'); ?>
+			<br />
+			
+			<input
+			type="radio" 
+			name="encryption_mode" 
+			id="user_encryption" 
+			value="user" 
+			style="width:20px;" 
+			<?php if ($_['encryption_mode'] == 'user') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?> 
+			/>
+			
+			<?php echo $l->t('User specific (let the user decide)'); ?>
+			<br/>
+			
+			<input
+			type="radio" 
+			name="encryption_mode" 
+			id="none_encryption" 
+			value="none" 
+			style="width:20px;" 
+			<?php if ($_['encryption_mode'] == 'none') echo "checked='checked'"; if ($_['encryption_mode'] != 'none') echo "DISABLED"?>
+			/> 
+			
+			<?php echo $l->t('None (no encryption at all)'); ?>
+			<br/>
+			
+		</p>
+		<p>
+			<strong><?php echo $l->t('Encryption'); ?></strong>
+			
+			<?php echo $l->t("Exclude the following file types from encryption"); ?>
+			
+			<select 
+			id='encryption_blacklist' 
+			title="<?php echo $l->t('None')?>" 
+			multiple="multiple">
 			<?php foreach($_["blacklist"] as $type): ?>
-				<option selected="selected" value="<?php echo $type;?>"><?php echo $type;?></option>
+				<option selected="selected" value="<?php echo $type;?>"> <?php echo $type;?> </option>
 			<?php endforeach;?>
-		</select>
-	</p>		
+			</select>
+		</p>
 	</fieldset>
 </form>