diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index 884db9d38..1def9cde4 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -475,7 +475,7 @@ class MailClient
 				FetchType::BODYSTRUCTURE
 			);
 			if ($this->oImapClient->hasCapability('PREVIEW')) {
-				$aFetchItems[] = FetchType::PREVIEW;
+				$aFetchItems[] = FetchType::PREVIEW; // . ' (LAZY)';
 			}
 			$aFetchItems[] = $this->getEnvelopeOrHeadersRequestString();
 			$aFetchIterator = $this->oImapClient->FetchIterate($aFetchItems, (string) $oRange, $oRange->UID);
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
index e27c247be..9f4bf40f7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageList.html
@@ -132,10 +132,10 @@
 		<div class="messageListPlace" data-bind="dragmessages: 1, i18nUpdate: groupedList, foreach: groupedList" draggable="true">
 			<div class="groupLabel" data-bind="text: label, click: $root.groupSearch" data-i18n="[title]GLOBAL/SEARCH"></div>
 			<!-- ko foreach: messages -->
-			<div class="messageListItem" data-bind="css: lineAsCss()">
+			<div class="messageListItem" data-bind="css: lineAsCss(), attr: {'title':preview}">
 				<div class="messageCheckbox">
 					<div class="checkboxMessage fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
-				</div><div data-bind="attr: {'title':preview}">
+				</div><div>
 					<div class="flagParent fontastic"></div>
 					<div class="senderParent" data-bind="attr: {'title': senderClearEmailsString}, text: senderEmailsString"></div>
 					<div class="subjectParent" data-bind="text: subject"></div>
@@ -152,10 +152,10 @@
 		<!-- /ko -->
 		<!-- ko ifnot: listGrouped -->
 		<div class="messageListPlace" data-bind="dragmessages: 1, foreach: messageList" draggable="true">
-			<div class="messageListItem" data-bind="css: lineAsCss()">
+			<div class="messageListItem" data-bind="css: lineAsCss(), 'title':preview">
 				<div class="messageCheckbox">
 					<div class="checkboxMessage fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
-				</div><div data-bind="attr:{style:indent(), 'title':preview}, css:{reply:indent()}">
+				</div><div data-bind="attr:{style:indent()}, css:{reply:indent()}">
 					<div class="flagParent fontastic"></div>
 					<div class="senderParent" data-bind="attr: {'title': senderClearEmailsString}, text: senderEmailsString"></div>
 					<div class="subjectParent" data-bind="text: subject"></div>