diff --git a/Resources/Private/Templates/Queue/Index.html b/Resources/Private/Templates/Queue/Index.html
index 26936e22a60680326a7f8300dcd934c51c029358..4a0673c2371c1180d266089c55989796c5f9fc17 100644
--- a/Resources/Private/Templates/Queue/Index.html
+++ b/Resources/Private/Templates/Queue/Index.html
@@ -15,10 +15,12 @@
 						<sgm:backend.widget.paginate objects="{queue}" as="paginatedMails" configuration="{insertAbove: 1, itemsPerPage: 20}">
 							<tbody>
 								<f:for each="{paginatedMails}" as="mail">
-									{sgm:backend.editOnClick(table: 'tx_sgmail_domain_model_mail', uid: mail.uid) -> sgm:set(name: 'editOnClick')}
+									{sgm:backend.editOnClick(table: 'tx_sgmail_domain_model_mail', uid: mail.uid) -> sgm:set(name: 'editOnClick') -> f:format.raw()}
 									<tr data-uid="{mail.uid}">
 										<td nowrap="nowrap" class="col-icon">
-											<sgm:backend.icon table="tx_sgmail_domain_model_mail" row="{mail}" />
+											<f:format.raw>
+												<sgm:backend.icon table="tx_sgmail_domain_model_mail" row="{mail}" />
+											</f:format.raw>
 										</td>
 										<td nowrap="nowrap">
 											<a href="#" onclick="{editOnClick}">
@@ -26,7 +28,9 @@
 											</a>
 										</td>
 										<td nowrap="nowrap" class="col-control">
-											<sgm:backend.control table="tx_sgmail_domain_model_mail" row="{mail}" />
+											<f:format.raw>
+												<sgm:backend.control table="tx_sgmail_domain_model_mail" row="{mail}" />
+											</f:format.raw>
 										</td>
 										<td>
 											<f:if condition="{mail.sent} == '0'">
diff --git a/Resources/Private/Templates/ViewHelpers/Backend/Widget/Paginate/Index.html b/Resources/Private/Templates/ViewHelpers/Backend/Widget/Paginate/Index.html
index 6ee74c1ae458c39544e2b9c1a89377b26096ba5e..50dfbed4df2cfcbe9e8ff0546c3fd81cc7df51e5 100644
--- a/Resources/Private/Templates/ViewHelpers/Backend/Widget/Paginate/Index.html
+++ b/Resources/Private/Templates/ViewHelpers/Backend/Widget/Paginate/Index.html
@@ -71,19 +71,11 @@
 
 					<form id="paginator-form-{position}" onsubmit="goToPage{position}(this); return false;" style="display:inline;">
 					<script type="text/javascript">
-						function goToPage {
-							position
-						}
-						(formObject)
-						{
-							var url = '{sg:widget.uri(arguments:{currentPage: 987654321})}';
+						function goToPage{position}(formObject) {
+							var url = '{sg:widget.uri(arguments:{currentPage: 987654321}) -> f:format.raw()}';
 							var page = formObject.elements['paginator-target-page'].value;
-							if (page > {pagination.numberOfPages}
-						)
-							{
-								page = {pagination.numberOfPages
-							}
-								;
+							if (page > {pagination.numberOfPages}) {
+								page = {pagination.numberOfPages};
 							}
 						else
 							if (page < 1) {