diff --git a/dev/Common/Translator.js b/dev/Common/Translator.js
index c20a40025..d9194d075 100644
--- a/dev/Common/Translator.js
+++ b/dev/Common/Translator.js
@@ -107,7 +107,7 @@ export const
 			switch (formatStr) {
 				case 'FROMNOW':
 					return fromNow(m);
-				case 'SHORT': {
+				case 'AUTO': {
 					// 4 hours
 					if (14400000 >= now - time)
 						return fromNow(m);
@@ -119,7 +119,9 @@ export const
 							{TIME: m.format('LT',0,h)}
 						)
 						: m.format(
-							date.getFullYear() === m.getFullYear() ? {day: '2-digit', month: 'short'} : {dateStyle: 'medium'}
+							date.getFullYear() === m.getFullYear()
+								? {day: '2-digit', month: 'short', hour: 'numeric', minute: 'numeric'}
+								: {dateStyle: 'medium', timeStyle: 'short'}
 							, 0, h);
 				}
 				case 'FULL':
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 104876975..59c55b31c 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -153,7 +153,7 @@ export class MailMessageList extends AbstractViewRight {
 				return SettingsUserStore.listGrouped() && (sort.includes('DATE') || sort.includes('FROM')) && !uid;
 			},
 
-			timeFormat: () => (FolderUserStore.sortMode() || '').includes('FROM') ? 'SHORT' : 'LT',
+			timeFormat: () => (FolderUserStore.sortMode() || '').includes('FROM') ? 'AUTO' : 'LT',
 
 			groupedList: () => {
 				let list = [], current, sort = FolderUserStore.sortMode() || 'DATE';
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 e3458780b..acca3dcf8 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
@@ -165,7 +165,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="SHORT" data-bind="moment: dateTimeStampInUTC"></time>
+					<time class="actionHandle" data-moment-format="AUTO" data-bind="moment: dateTimeStampInUTC"></time>
 				</div>
 			</div>
 		</div>