diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 3701cbe93..e5238ae75 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -179,16 +179,16 @@ export class MessageListMailBoxUserView extends AbstractViewRight {
 			messageListFocused: () => Scope.MessageList === AppUserStore.focusedState(),
 
 			sortText: () => {
-				let mode = FolderUserStore.sortMode();
-				if ('' === mode) {
-					return '📅⬇';
-				}
+				let mode = FolderUserStore.sortMode(),
+					desc = '' === mode || mode.includes('REVERSE');
 				mode = mode.split(/\s+/);
-				return (mode.includes('SIZE') ? '✉'
-					 : (mode.includes('FROM') ? '@'
-					 : (mode.includes('SUBJECT') ? '𝐒'
-					 : '📅')))
-					+ (mode.includes('REVERSE') ? '⬇' : '⬆');
+				if (mode.includes('FROM')) {
+					 return '@' + (desc ? '⬆' : '⬇');
+				}
+				if (mode.includes('SUBJECT')) {
+					 return '𝐒' + (desc ? '⬆' : '⬇');
+				}
+				return (mode.includes('SIZE') ? '✉' : '📅') + (desc ? '⬇' : '⬆');
 			}
 		});
 
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 3a039252f..e5cfa630d 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
@@ -130,25 +130,25 @@
 						</li>
 						<li class="e-item dividerbar" role="presentation" data-sort="SUBJECT" data-bind="click: changeSort">
 							<a class="e-link menuitem" href="#" tabindex="-1">
-								<i class="fontastic">𝐒⬆</i>
+								<i class="fontastic">𝐒⬇</i>
 								<span data-i18n="MESSAGE_LIST/SORT_SUBJECT_ASC"></span>
 							</a>
 						</li>
 						<li class="e-item" role="presentation" data-sort="REVERSE SUBJECT" data-bind="click: changeSort">
 							<a class="e-link menuitem" href="#" tabindex="-1">
-								<i class="fontastic">𝐒⬇</i>
+								<i class="fontastic">𝐒⬆</i>
 								<span data-i18n="MESSAGE_LIST/SORT_SUBJECT_DESC"></span>
 							</a>
 						</li>
 						<li class="e-item dividerbar" role="presentation" data-sort="FROM" data-bind="click: changeSort">
 							<a class="e-link menuitem" href="#" tabindex="-1">
-								<i class="fontastic">@⬆</i>
+								<i class="fontastic">@⬇</i>
 								<span data-i18n="MESSAGE_LIST/SORT_FROM_ASC"></span>
 							</a>
 						</li>
 						<li class="e-item" role="presentation" data-sort="REVERSE FROM" data-bind="click: changeSort">
 							<a class="e-link menuitem" href="#" tabindex="-1">
-								<i class="fontastic">@⬇</i>
+								<i class="fontastic">@⬆</i>
 								<span data-i18n="MESSAGE_LIST/SORT_FROM_DESC"></span>
 							</a>
 						</li>