diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index 2f6996dca..ec8c9e1fd 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -54,8 +54,6 @@ export class MessageModel extends AbstractModel {
 			senderEmailsString: '',
 			senderClearEmailsString: '',
 
-			newForAnimation: false,
-
 			deleted: false,
 			isDeleted: false,
 			isUnseen: false,
@@ -128,8 +126,6 @@ export class MessageModel extends AbstractModel {
 		this.senderEmailsString('');
 		this.senderClearEmailsString('');
 
-		this.newForAnimation(false);
-
 		this.deleted(false);
 		this.isDeleted(false);
 		this.isUnseen(false);
@@ -289,7 +285,6 @@ export class MessageModel extends AbstractModel {
 			focused: this.focused(),
 			important: this.isImportant(),
 			withAttachments: this.hasAttachments(),
-			new: this.newForAnimation(),
 			emptySubject: !this.subject(),
 			// hasChildrenMessage: 1 < this.threadsLen(),
 			hasUnseenSubMessage: this.hasUnseenSubMessage(),
diff --git a/dev/Model/MessageCollection.js b/dev/Model/MessageCollection.js
index f4ad0e70e..425284866 100644
--- a/dev/Model/MessageCollection.js
+++ b/dev/Model/MessageCollection.js
@@ -39,7 +39,6 @@ export class MessageCollectionModel extends AbstractCollectionModel
 			if (message) {
 				if (hasNewMessageAndRemoveFromCache(message.folder, message.uid) && 5 >= newCount) {
 					++newCount;
-					message.newForAnimation(true);
 				}
 
 				message.deleted(false);
diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js
index 1c11d45ef..92bca8528 100644
--- a/dev/Stores/User/Message.js
+++ b/dev/Stores/User/Message.js
@@ -196,13 +196,6 @@ export const MessageUserStore = new class {
 			listIsNotCompleted: value =>
 				this.listCompleteLoading(value || this.listLoading()),
 
-			list:
-				(list => {
-					list.forEach(item =>
-						item && item.newForAnimation() && item.newForAnimation(false)
-					)
-				}).debounce(500),
-
 			message: message => {
 				clearTimeout(MessageSeenTimer);
 				if (message) {
diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less
index 2d07f9cb6..ffcc6af98 100644
--- a/dev/Styles/User/MessageList.less
+++ b/dev/Styles/User/MessageList.less
@@ -239,8 +239,6 @@ html.rl-no-preview-pane {
 	}
 
 	.importantMark {
-		display: none;
-
 		color:red;
 		margin-right:5px
 	}
@@ -252,17 +250,8 @@ html.rl-no-preview-pane {
 		}
 	}
 
-	&.important .importantMark {
-		display: inline;
-	}
-
-	&.new {
-		max-height: 0;
-	}
-
 	&.deleted {
-		max-height: 0;
-		border-color: transparent !important;
+		opacity: .3;
 	}
 
 	.checkboxMessage {
@@ -310,22 +299,12 @@ html.rl-no-preview-pane {
 		border-color: #666;
 	}
 
-	.subjectParent .emptySubjectText {
-		display: none;
+	&.emptySubject .subjectParent {
 		font-style: italic;
 		opacity: 0.5;
 	}
 
-	&.emptySubject .subjectParent {
-		.subject {
-			display: none;
-		}
-		.emptySubjectText {
-			display: inline;
-		}
-	}
-
-	.sender, .subject {
+	.senderParent, .subjectParent {
 		margin: 0;
 		overflow: hidden;
 		text-overflow: ellipsis;
@@ -342,18 +321,9 @@ html.rl-no-preview-pane {
 	}
 
 	.replyFlag, .forwardFlag {
-		display: none;
 		margin-right: 0.25em;
 	}
 
-	&.answered .replyFlag {
-		display: inline-block;
-	}
-
-	&.forwarded .forwardFlag {
-		display: inline-block;
-	}
-
 	&:not(.withAttachments) .attachmentParent {
 		display: none;
 	}
@@ -369,7 +339,7 @@ html.rl-no-preview-pane {
 	&.unseen {
 		background-color: rgba(255, 255, 64, 0.15);
 		border-left-color: orange;
-		.sender, .subjectParent {
+		.senderParent, .subjectParent {
 			font-weight: bold;
 		}
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html
index df67481bd..ff1bc1b27 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListItem.html
@@ -3,7 +3,7 @@
 	   css: { 'i-am-inbox': isInbox, 'selected': selected() && !isSystemFolder(), 'selectable': canBeSelected, 'hidden' : hidden, 'unread-sub': hasSubscribedUnreadMessagesSubfolders, 'system': isSystemFolder, 'anim-action-class': actionBlink },
 	   attr: { 'data-unread': printableUnreadCount }">
 		<i data-bind="css: collapsedCss()"></i>
-		<span class="name" data-bind="text: name"></span>
+		<!-- ko text: name --><!-- /ko -->
 	</a>
 	<!-- ko if: subFolders.length -->
 	<div class="b-sub-folders" data-bind="template: { name: 'MailFolderListItem', foreach: subFolders }, css: { 'collapsed': collapsed() }"></div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListSystemItem.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListSystemItem.html
index c193bf2b3..7981bff6c 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListSystemItem.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderListSystemItem.html
@@ -2,7 +2,9 @@
 	<a data-bind="dropmessages: $data,
 		css: { 'selected': selected, 'selectable': selectable, 'anim-action-class': actionBlink },
 		attr: { 'data-unread': printableUnreadCount }">
-		<span class="name" data-bind="text: localName()"></span>
-		<span class="inbox-star-icon fontastic" data-bind="visible: isInbox"></span>
+		<!-- ko text: localName --><!-- /ko -->
+		<!-- ko if: isInbox -->
+		<span class="inbox-star-icon fontastic"></span>
+		<!-- /ko -->
 	</a>
 </div>
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 d36c56dff..d6e9f7406 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
@@ -196,10 +196,10 @@
 
 						<div class="flagParent fontastic"><!-- ☆★⚐⚑ --></div>
 
-						<div class="senderParent actionHandle">
-							<i class="replyFlag fontastic">←</i>
-							<i class="forwardFlag fontastic">→</i>
-							<span class="sender" data-bind="text: senderEmailsString, attr: {'title': senderClearEmailsString}"></span>
+						<div class="senderParent actionHandle" data-bind="attr: {'title': senderClearEmailsString}">
+							<!-- ko if: isAnswered --><i class="replyFlag fontastic">←</i><!-- /ko -->
+							<!-- ko if: isForwarded --><i class="forwardFlag fontastic">→</i><!-- /ko -->
+							<!-- ko text: senderEmailsString --><!-- /ko -->
 						</div>
 
 						<div class="attachmentParent actionHandle">
@@ -207,15 +207,14 @@
 						</div>
 
 						<div class="subjectParent actionHandle">
-							<b class="importantMark">!</b>
-							<span class="emptySubjectText" data-bind="text: $root.emptySubjectValue"></span>
-							<span class="subject" data-bind="text: subject"></span>
+							<!-- ko if: isImportant --><b class="importantMark">!</b><!-- /ko -->
+							<!-- ko text: subject || $root.emptySubjectValue --><!-- /ko -->
 						</div>
 
 						<div class="sizeParent actionHandle" data-bind="text: friendlySize()"></div>
 
 						<div class="threads-len" data-bind="visible: 1 < threadsLen()">
-							<span data-bind="text: threadsLen"></span>
+							<!-- ko text: threadsLen --><!-- /ko -->
 							›
 						</div>
 
@@ -228,7 +227,7 @@
 		</div>
 		<div class="b-footer thm-message-list-bottom-toolbar">
 			<span data-bind="visible: 0 < userUsageProc(), attr: { title: quotaTooltip() }" class="e-quota">
-				<span data-bind="text: userUsageProc"></span>%
+				<!-- ko text: userUsageProc --><!-- /ko -->%
 			</span>
 			<div class="pull-right">
 				<!-- ko template: { name: 'Paginator', data: messageListPaginator } --><!-- /ko -->