diff --git a/Resources/Private/Templates/Mail/Index.html b/Resources/Private/Templates/Mail/Index.html
index 6057c40715fa1312f6e0b9f340a26260b7308825..bf9e4abefe9b72c16883892a5a52bbf5055f8a55 100644
--- a/Resources/Private/Templates/Mail/Index.html
+++ b/Resources/Private/Templates/Mail/Index.html
@@ -13,7 +13,7 @@
 					<p>{templateDescription}</p>
 				</div>
 				<div class=" col-md-3">
-					<f:link.action class="reset-btn reset-all-btn btn-danger btn col-md-12"  action="reset" arguments="{template: selectedTemplateKey, extensionKey: selectedTemplate.extension}">{f:translate(key:'backend.button_reset_all')}</f:link.action>
+					<f:link.action class="reset-btn reset-all-btn btn-danger btn col-md-12" action="reset" arguments="{template: selectedTemplateKey, extensionKey: selectedTemplate.extension}">{f:translate(key:'backend.button_reset_all')}</f:link.action>
 				</div>
 			</div>
 			<div class="col-md-12 row">
@@ -76,56 +76,60 @@
 					</div>
 					<f:for each="{languageTemplates}" as="languageTemplate" key="key">
 						<div class="template-col col-md-{colspace}">
-							<f:for each="{languageLabels}" as="label" key="innerKey">
-								<f:if condition="{key} == {innerKey}">
-									<h3>
-										<f:if condition="{key}=='default'">
-											<f:then>
-												{defaultLanguageLabel}
-											</f:then>
-											<f:else>
-												{label}
-											</f:else>
+							<div class="panel panel-default row">
+								<div class="panel-body">
+									<f:for each="{languageLabels}" as="label" key="innerKey">
+										<f:if condition="{key} == {innerKey}">
+											<h3>
+												<f:if condition="{key}=='default'">
+													<f:then>
+														{defaultLanguageLabel}
+													</f:then>
+													<f:else>
+														{label}
+													</f:else>
+												</f:if>
+												<f:if condition="{languageTemplate.isOverwritten}">
+													<f:translate key="backend.is_overwritten" />
+												</f:if>
+											</h3>
 										</f:if>
-										<f:if condition="{languageTemplate.isOverwritten}">
-											<f:translate key="backend.is_overwritten" />
-										</f:if>
-									</h3>
-								</f:if>
-							</f:for>
+									</f:for>
 
-							<div class="col-md-12">
-								<div class="row form-group">
-									<label for="parameters[templates][{key}][fromName]" class="">{f:translate(key:'backend.fromName')}</label>
-									<f:form.textfield type="text" class="form-control" value="{languageTemplate.fromName}" name="parameters[templates][{key}][fromName]" />
-								</div>
-								<div class="row form-group">
-									<label for="parameters[templates][{key}][fromMail]" class="">{f:translate(key:'backend.fromMail')}</label>
-									<f:form.textfield type="email" class="form-control" value="{languageTemplate.fromMail}" name="parameters[templates][{key}][fromMail]" />
-								</div>
-								<div class="row form-group">
-									<label for="parameters[templates][{key}][toAddress]" class="">{f:translate(key:'backend.to_form')}</label>
-									<f:form.textfield type="text" class="form-control" value="{languageTemplate.toAddress}" name="parameters[templates][{key}][toAddress]" />
-								</div>
-								<div class="row form-group">
-									<label for="parameters[templates][{key}][cc]" class="">{f:translate(key:'backend.cc')}</label>
-									<f:form.textfield type="text" class="form-control" value="{languageTemplate.cc}" name="parameters[templates][{key}][cc]" />
-								</div>
-								<div class="row form-group">
-									<label for="parameters[templates][{key}][bcc]" class="">{f:translate(key:'backend.bcc')}</label>
-									<f:form.textfield type="text" class="form-control" value="{languageTemplate.bcc}" name="parameters[templates][{key}][bcc]" />
-								</div>
-								<div class="row form-group">
-									<label for="parameters[templates][{key}][replyTo]" class="">{f:translate(key:'backend.replyTo')}</label>
-									<f:form.textfield type="text" class="form-control" value="{languageTemplate.replyTo}" name="parameters[templates][{key}][replyTo]" />
-								</div>
-								<div class="row form-group">
-									<label for="parameters[templates][{key}][subject]" class="">{f:translate(key:'backend.subject')}</label>
-									<f:form.textfield type="text" class="form-control" value="{languageTemplate.subject}" name="parameters[templates][{key}][subject]" />
-								</div>
-								<div class="row form-group">
-									<label for="parameters[templates][{key}][content]" class="">{f:translate(key:'backend.content')}</label>
-									<f:form.textarea class="form-control" rows="15" name="parameters[templates][{key}][content]" value="{languageTemplate.content}" />
+									<div class="col-md-12">
+										<div class="row form-group">
+											<label for="parameters[templates][{key}][fromName]" class="">{f:translate(key:'backend.fromName')}</label>
+											<f:form.textfield type="text" class="form-control" value="{languageTemplate.fromName}" name="parameters[templates][{key}][fromName]" />
+										</div>
+										<div class="row form-group">
+											<label for="parameters[templates][{key}][fromMail]" class="">{f:translate(key:'backend.fromMail')}</label>
+											<f:form.textfield type="email" class="form-control" value="{languageTemplate.fromMail}" name="parameters[templates][{key}][fromMail]" />
+										</div>
+										<div class="row form-group">
+											<label for="parameters[templates][{key}][toAddress]" class="">{f:translate(key:'backend.to_form')}</label>
+											<f:form.textfield type="text" class="form-control" value="{languageTemplate.toAddress}" name="parameters[templates][{key}][toAddress]" />
+										</div>
+										<div class="row form-group">
+											<label for="parameters[templates][{key}][cc]" class="">{f:translate(key:'backend.cc')}</label>
+											<f:form.textfield type="text" class="form-control" value="{languageTemplate.cc}" name="parameters[templates][{key}][cc]" />
+										</div>
+										<div class="row form-group">
+											<label for="parameters[templates][{key}][bcc]" class="">{f:translate(key:'backend.bcc')}</label>
+											<f:form.textfield type="text" class="form-control" value="{languageTemplate.bcc}" name="parameters[templates][{key}][bcc]" />
+										</div>
+										<div class="row form-group">
+											<label for="parameters[templates][{key}][replyTo]" class="">{f:translate(key:'backend.replyTo')}</label>
+											<f:form.textfield type="text" class="form-control" value="{languageTemplate.replyTo}" name="parameters[templates][{key}][replyTo]" />
+										</div>
+										<div class="row form-group">
+											<label for="parameters[templates][{key}][subject]" class="">{f:translate(key:'backend.subject')}</label>
+											<f:form.textfield type="text" class="form-control" value="{languageTemplate.subject}" name="parameters[templates][{key}][subject]" />
+										</div>
+										<div class="row form-group">
+											<label for="parameters[templates][{key}][content]" class="">{f:translate(key:'backend.content')}</label>
+											<f:form.textarea class="form-control" rows="15" name="parameters[templates][{key}][content]" value="{languageTemplate.content}" />
+										</div>
+									</div>
 								</div>
 							</div>
 						</div>
@@ -147,7 +151,8 @@
 								<tr data-uid="{page.pid}">
 									<td nowrap="nowrap" class="col-title">
 										<a href="#" onclick="sgMailGoToPage({page.uid}, '{page.path}'); return false;">
-											<sgm:backend.icon table="pages" row="{page}" clickMenu="0" /> {page._thePathFull}
+											<sgm:backend.icon table="pages" row="{page}" clickMenu="0" />
+											{page._thePathFull}
 										</a>
 									</td>
 								</tr>