diff --git a/src/components/Moment.vue b/src/components/Moment.vue
index f22f09fe0a..f78e8a34aa 100644
--- a/src/components/Moment.vue
+++ b/src/components/Moment.vue
@@ -8,7 +8,7 @@
 
 <script>
 import moment from '@nextcloud/moment'
-import { shortRelativeDatetime } from '../util/shortRelativeDatetime.js'
+import { longRelativeDatetime } from '../util/shortRelativeDatetime.js'
 
 export default {
 	name: 'Moment',
@@ -30,7 +30,7 @@ export default {
 		},
 
 		formatted() {
-			return shortRelativeDatetime(new Date(this.timestamp * 1000))
+			return longRelativeDatetime(new Date(this.timestamp * 1000))
 		},
 	},
 }
diff --git a/src/tests/unit/util/shortRelativeDatetime.spec.js b/src/tests/unit/util/shortRelativeDatetime.spec.js
index 0249ac8ecb..eab1fa7d70 100644
--- a/src/tests/unit/util/shortRelativeDatetime.spec.js
+++ b/src/tests/unit/util/shortRelativeDatetime.spec.js
@@ -20,6 +20,32 @@ describe('shortRelativeDatetime', () => {
 			expect(formatted).toBe('9:27')
 		})
 
+		it('shortens yesterdays time', () => {
+			const ref = new Date()
+			ref.setFullYear(2020, 1, 13)
+			ref.setHours(13, 14)
+			const d = new Date()
+			d.setFullYear(2020, 1, 12)
+			d.setHours(9, 27)
+
+			const formatted = shortDatetime(ref, d)
+
+			expect(formatted).toBe('9:27')
+		})
+
+		it('shortens yesterdays time with label', () => {
+			const ref = new Date()
+			ref.setFullYear(2020, 1, 13)
+			ref.setHours(13, 14)
+			const d = new Date()
+			d.setFullYear(2020, 1, 12)
+			d.setHours(9, 27)
+
+			const formatted = shortDatetime(ref, d, true)
+
+			expect(formatted).toBe('Yesterday 9:27')
+		})
+
 		it('shortens this weeks day', () => {
 			const ref = new Date()
 			ref.setFullYear(2020, 1, 13)
diff --git a/src/util/shortRelativeDatetime.js b/src/util/shortRelativeDatetime.js
index e20d9d756d..9858a7ec70 100644
--- a/src/util/shortRelativeDatetime.js
+++ b/src/util/shortRelativeDatetime.js
@@ -5,15 +5,23 @@
 
 import moment from '@nextcloud/moment'
 import curry from 'lodash/fp/curry.js'
+import { translate as t } from '@nextcloud/l10n'
 
-export const shortDatetime = curry((ref, date) => {
+export const shortDatetime = curry((ref, date, withLabel = false) => {
 	const momentDate = moment(date)
+	const startOfToday = new Date(ref.getFullYear(), ref.getMonth(), ref.getDate())
+	const startOfYesterday = new Date(startOfToday)
+	startOfYesterday.setDate(startOfYesterday.getDate() - 1)
 	// Within the same day?
-	if (ref.getFullYear() === date.getFullYear()
-		&& ref.getMonth() === date.getMonth()
-		&& ref.getDate() === date.getDate()) {
+	if (date >= startOfToday) {
 		return momentDate.format('H:mm')
 	}
+	// Yesterday?
+	if (date >= startOfYesterday) {
+		return withLabel
+			? t('mail', 'Yesterday') + ' ' + momentDate.format('H:mm')
+			: momentDate.format('H:mm')
+	}
 	// Within the previous week?
 	if (date.getTime() > (ref.getTime() - 30 * 60 * 24 * 7 * 1000)) {
 		return momentDate.format('dd')
@@ -30,4 +38,5 @@ export function messageDateTime(date) {
 	return moment(date * 1000).format('lll')
 }
 
-export const shortRelativeDatetime = shortDatetime(new Date())
+export const shortRelativeDatetime = (date) => shortDatetime(new Date(), date, false)
+export const longRelativeDatetime = (date) => shortDatetime(new Date(), date, true)