diff --git a/Classes/Controller/QueueController.php b/Classes/Controller/QueueController.php
index 17216edf89b39e8ceba90f6e1a65c516d07f485c..a6ddd72fe21400ab83383203dfe1aa6d997da190 100644
--- a/Classes/Controller/QueueController.php
+++ b/Classes/Controller/QueueController.php
@@ -90,8 +90,10 @@ class QueueController extends ActionController {
 	 * send or resend a mail in the queue
 	 *
 	 * @param int $uid
+	 * @param string $selectedExtension
+	 * @param string $selectedTemplate
 	 */
-	public function sendMailAction($uid) {
+	public function sendMailAction($uid, $selectedExtension, $selectedTemplate) {
 		$mailService = new MailTemplateService();
 		$mailService->sendMailFromQueue($uid);
 
diff --git a/Resources/Private/Language/locallang.xlf b/Resources/Private/Language/locallang.xlf
index 5b41bc527595ecc15d91df29487c64a6d5931f65..611a59c8955763e2c9d8cba6dea49af6a25a6867 100644
--- a/Resources/Private/Language/locallang.xlf
+++ b/Resources/Private/Language/locallang.xlf
@@ -64,7 +64,7 @@
 			<source>No template was registered.</source>
 		</trans-unit>
 		<trans-unit id="backend.no_queue_entries">
-			<source>There are no Entries in the Mail Queue for this Template.</source>
+			<source>There are no entries in the mail queue for this template.</source>
 		</trans-unit>
 		<trans-unit id="backend.not_sent">
 			<source>Not Sent</source>
diff --git a/Resources/Private/Templates/Queue/Index.html b/Resources/Private/Templates/Queue/Index.html
index eb06ac7949869665d66605651bd7b262dc0ea4fd..e05f4c73251b57cf61b782ddde66ebb13e97af50 100644
--- a/Resources/Private/Templates/Queue/Index.html
+++ b/Resources/Private/Templates/Queue/Index.html
@@ -31,17 +31,17 @@
 										<td>
 											<f:if condition="{mail.sent} == '0'">
 												<f:then>
-													<f:link.action class="btn btn-default btn-send-now" controller="Queue" action="sendMail" arguments="{uid: mail.uid}">
+													<f:link.action class="btn btn-default btn-send-now" controller="Queue" action="sendMail" arguments="{uid: mail.uid, selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}">
 													<span class="t3js-icon icon icon-size-small icon-state-default actions-document-import-t3d">
 														<span class="icon-markup">
 															<img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-document-import-t3d.svg" width="16" height="16">
 														</span>
-													</span>
+													</span>s
 														Send Now
 													</f:link.action>
 												</f:then>
 												<f:else>
-													<f:link.action class="btn btn-default btn-resend" controller="Queue" action="sendMail" arguments="{uid: mail.uid}">
+													<f:link.action class="btn btn-default btn-resend" controller="Queue" action="sendMail" arguments="{uid: mail.uid, selectedTemplate: selectedTemplateKey, selectedExtension: selectedExtensionKey}">
 															<span class="t3js-icon icon icon-size-small icon-state-default icon-actions-insert-reference">
 																<span class="icon-markup">
 																	<img src="/typo3/sysext/core/Resources/Public/Icons/T3Icons/actions/actions-insert-reference.svg" width="16" height="16">