diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index f50fbeeed..04cffae8d 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -153,6 +153,8 @@ export class MailMessageList extends AbstractViewRight {
 				return SettingsUserStore.listGrouped() && sort.includes('DATE') && !uid;
 			},
 
+			timeFormat: () => (FolderUserStore.sortMode() || '').includes('FROM') ? 'SHORT' : 'LT',
+
 			groupedList: () => {
 				let list = [], current, sort = FolderUserStore.sortMode() || 'DATE';
 				if (sort.includes('FROM')) {
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 127f19210..a212cd53b 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
@@ -145,7 +145,7 @@
 					</div>
 					<div class="sizeParent actionHandle" data-bind="text: friendlySize()"></div>
 					<div class="threads-len" data-bind="visible: 1 < threadsLen(), text: threadsLen"></div>
-					<time class="actionHandle" data-moment-format="LT" data-bind="moment: dateTimeStampInUTC"></time>
+					<time class="actionHandle" data-bind="attr:{'data-moment-format':$root.timeFormat()}, moment: dateTimeStampInUTC"></time>
 				</div>
 			</div>
 			<!-- /ko -->