diff --git a/Resources/Private/Templates/Queue/Index.html b/Resources/Private/Templates/Queue/Index.html
index aea3fd8e79bb0b51bbcf89035febed8faa300c28..014fbbc0ca7be3c02590c8806fa4e372b9f87b4b 100644
--- a/Resources/Private/Templates/Queue/Index.html
+++ b/Resources/Private/Templates/Queue/Index.html
@@ -17,11 +17,9 @@
 							<thead>
 								<tr>
 									<th></th>
-									<th><f:translate key="backend.from" /></th>
-									<th><f:translate key="backend.to" /></th>
+									<th><f:translate key="backend.from" /> <br> <f:translate key="backend.to" /></th>
 									<th><f:translate key="backend.subject" /></th>
-									<th><f:translate key="backend.entry_date" /></th>
-									<th><f:translate key="backend.last_sent" /></th>
+									<th><f:translate key="backend.entry_date" /> <br> <f:translate key="backend.last_sent" /></th>
 									<th></th>
 									<th></th>
 									<th></th>
@@ -36,21 +34,17 @@
 												<sgm:backend.icon table="tx_sgmail_domain_model_mail" row="{mail}" />
 											</f:format.raw>
 										</td>
-										<td nowrap="nowrap">
-											<a href="#" onclick="{editOnClick}">
-												<span>{mail.from_address}</span>
-											</a>
-										</td>
 										<td>
+											<span>{mail.from_address}</span>
+											<br>
 											<span>{mail.to_address}</span>
 										</td>
 										<td>
-											<span>{mail.mail_subject}</span>
+											<span><f:format.crop maxCharacters="40" append="...">{mail.mail_subject}</f:format.crop></span>
 										</td>
 										<td>
 											<span><f:format.date format="d.m.Y h:i">{mail.crdate}</f:format.date></span>
-										</td>
-										<td>
+											<br>
 											<span><f:format.date format="d.m.Y h:i">{mail.tstamp}</f:format.date></span>
 										</td>
 										<td nowrap="nowrap" class="col-control">