diff --git a/src/components/Message/__tests__/MessageTimestamp.test.js b/src/components/Message/__tests__/MessageTimestamp.test.js
index 200a44a8b..68e1ed22e 100644
--- a/src/components/Message/__tests__/MessageTimestamp.test.js
+++ b/src/components/Message/__tests__/MessageTimestamp.test.js
@@ -58,7 +58,7 @@ describe('<MessageTimestamp />', () => {
           datetime="2019-04-03T14:42:47.087Z"
           title="2019-04-03T14:42:47.087Z"
         >
-          04/03/2019
+          14:42
         </time>
       </div>
     `);
@@ -74,7 +74,7 @@ describe('<MessageTimestamp />', () => {
           datetime="28"
           title="28"
         >
-          01/01/1970
+          00:00
         </time>
       </div>
     `);
@@ -90,7 +90,7 @@ describe('<MessageTimestamp />', () => {
         },
       },
     });
-    expect(container).toHaveTextContent('04/03/2020');
+    expect(container).toHaveTextContent('14:42');
   });
 
   it('should not render if no message is available', () => {
@@ -183,7 +183,7 @@ describe('<MessageTimestamp />', () => {
 
   it('should reflect the custom calendarFormats if calendar is enabled', async () => {
     const { container } = await renderComponent({
-      props: { calendarFormats },
+      props: { calendar: true, calendarFormats },
     });
     expect(container).toHaveTextContent('F 2019');
   });
@@ -229,7 +229,7 @@ describe('<MessageTimestamp />', () => {
           datetime="2019-04-03T14:42:47.087Z"
           title="2019-04-03T14:42:47.087Z"
         >
-          04/03/2019
+          14:42
         </time>
       </div>
     `);
diff --git a/src/i18n/de.json b/src/i18n/de.json
index 0afc0154f..280d2b328 100644
--- a/src/i18n/de.json
+++ b/src/i18n/de.json
@@ -386,7 +386,7 @@
   "timestamp/ChannelPreviewTimestamp": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"LT\", \"lastDay\": \"[Gestern]\", \"lastWeek\": \"dddd\", \"sameElse\": \"L\" }) }}",
   "timestamp/DateSeparator": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"[Heute]\", \"nextDay\": \"[Morgen]\", \"lastDay\": \"[Gestern]\", \"nextWeek\": \"dddd\", \"lastWeek\": \"[Letzte] dddd\", \"sameElse\": \"ddd, D MMM\" }) }}",
   "timestamp/LiveLocation": "{{ timestamp | timestampFormatter(calendar: true) }}",
-  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: true) }}",
+  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: false; format: HH:mm) }}",
   "timestamp/PollVote": "{{ timestamp | timestampFormatter(relativeCompact: true) }}",
   "timestamp/PollVoteTooltip": "{{ timestamp | timestampFormatter(calendar: true) }}",
   "timestamp/relativeDaysAgo": "{{ count }}d ago",
diff --git a/src/i18n/en.json b/src/i18n/en.json
index d575a26bd..f52e0ed5c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -386,7 +386,7 @@
   "timestamp/ChannelPreviewTimestamp": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"LT\", \"lastDay\": \"[Yesterday]\", \"lastWeek\": \"dddd\", \"sameElse\": \"L\" }) }}",
   "timestamp/DateSeparator": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"[Today]\", \"nextDay\": \"[Tomorrow]\", \"lastDay\": \"[Yesterday]\", \"nextWeek\": \"dddd\", \"lastWeek\": \"[Last] dddd\", \"sameElse\": \"ddd, D MMM\" }) }}",
   "timestamp/LiveLocation": "{{ timestamp | timestampFormatter(calendar: true) }}",
-  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: true) }}",
+  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: false; format: HH:mm) }}",
   "timestamp/PollVote": "{{ timestamp | timestampFormatter(relativeCompact: true) }}",
   "timestamp/PollVoteTooltip": "{{ timestamp | timestampFormatter(calendar: true) }}",
   "timestamp/relativeDaysAgo": "{{ count }}d ago",
diff --git a/src/i18n/es.json b/src/i18n/es.json
index 6a930a100..e610d4cf9 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -401,7 +401,7 @@
   "timestamp/ChannelPreviewTimestamp": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"LT\", \"lastDay\": \"[Ayer]\", \"lastWeek\": \"dddd\", \"sameElse\": \"L\" }) }}",
   "timestamp/DateSeparator": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"[Hoy]\", \"nextDay\": \"[Mañana]\", \"lastDay\": \"[Ayer]\", \"nextWeek\": \"dddd\", \"lastWeek\": \"[Último] dddd\", \"sameElse\": \"ddd, D MMM\" }) }}",
   "timestamp/LiveLocation": "{{ timestamp | timestampFormatter(calendar: true) }}",
-  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: true) }}",
+  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: false; format: HH:mm) }}",
   "timestamp/PollVote": "{{ timestamp | timestampFormatter(relativeCompact: true) }}",
   "timestamp/PollVoteTooltip": "{{ timestamp | timestampFormatter(calendar: true) }}",
   "timestamp/relativeDaysAgo": "{{ count }}d ago",
diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index de078634e..e026837de 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -401,7 +401,7 @@
   "timestamp/ChannelPreviewTimestamp": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"LT\", \"lastDay\": \"[Hier]\", \"lastWeek\": \"dddd\", \"sameElse\": \"L\" }) }}",
   "timestamp/DateSeparator": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"[Aujourd'hui]\", \"nextDay\": \"[Demain]\", \"lastDay\": \"[Hier]\", \"nextWeek\": \"dddd\", \"lastWeek\": \"[Dernier] dddd\", \"sameElse\": \"ddd, D MMM\" }) }}",
   "timestamp/LiveLocation": "{{ timestamp | timestampFormatter(calendar: true) }}",
-  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: true) }}",
+  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: false; format: HH:mm) }}",
   "timestamp/PollVote": "{{ timestamp | timestampFormatter(relativeCompact: true) }}",
   "timestamp/PollVoteTooltip": "{{ timestamp | timestampFormatter(calendar: true) }}",
   "timestamp/relativeDaysAgo": "{{ count }}d ago",
diff --git a/src/i18n/hi.json b/src/i18n/hi.json
index f9b673e08..c89aacf81 100644
--- a/src/i18n/hi.json
+++ b/src/i18n/hi.json
@@ -387,7 +387,7 @@
   "timestamp/ChannelPreviewTimestamp": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"LT\", \"lastDay\": \"[बीता कल]\", \"lastWeek\": \"dddd\", \"sameElse\": \"L\" }) }}",
   "timestamp/DateSeparator": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"[आज]\", \"nextDay\": \"[कल]\", \"lastDay\": \"[बीता कल]\", \"nextWeek\": \"dddd\", \"lastWeek\": \"[पिछला] dddd\", \"sameElse\": \"ddd, D MMM\" }) }}",
   "timestamp/LiveLocation": "{{ timestamp | timestampFormatter(calendar: true) }}",
-  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: true) }}",
+  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: false; format: HH:mm) }}",
   "timestamp/PollVote": "{{ timestamp | timestampFormatter(relativeCompact: true) }}",
   "timestamp/PollVoteTooltip": "{{ timestamp | timestampFormatter(calendar: true) }}",
   "timestamp/relativeDaysAgo": "{{ count }}d ago",
diff --git a/src/i18n/it.json b/src/i18n/it.json
index 795b7d8c2..c069a3aae 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -401,7 +401,7 @@
   "timestamp/ChannelPreviewTimestamp": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"LT\", \"lastDay\": \"[Ieri]\", \"lastWeek\": \"dddd\", \"sameElse\": \"L\" }) }}",
   "timestamp/DateSeparator": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"[Oggi]\", \"nextDay\": \"[Domani]\", \"lastDay\": \"[Ieri]\", \"nextWeek\": \"dddd\", \"lastWeek\": \"[Scorsa] dddd\", \"sameElse\": \"ddd, D MMM\" }) }}",
   "timestamp/LiveLocation": "{{ timestamp | timestampFormatter(calendar: true) }}",
-  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: true) }}",
+  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: false; format: HH:mm) }}",
   "timestamp/PollVote": "{{ timestamp | timestampFormatter(relativeCompact: true) }}",
   "timestamp/PollVoteTooltip": "{{ timestamp | timestampFormatter(calendar: true) }}",
   "timestamp/relativeDaysAgo": "{{ count }}d ago",
diff --git a/src/i18n/ja.json b/src/i18n/ja.json
index cfbdac966..aac1dede5 100644
--- a/src/i18n/ja.json
+++ b/src/i18n/ja.json
@@ -381,7 +381,7 @@
   "timestamp/ChannelPreviewTimestamp": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"LT\", \"lastDay\": \"[昨日]\", \"lastWeek\": \"dddd\", \"sameElse\": \"L\" }) }}",
   "timestamp/DateSeparator": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"[今日]\", \"nextDay\": \"[明日]\", \"lastDay\": \"[昨日]\", \"nextWeek\": \"dddd\", \"lastWeek\": \"[先週の] dddd\", \"sameElse\": \"ddd, D MMM\" }) }}",
   "timestamp/LiveLocation": "{{ timestamp | timestampFormatter(calendar: true) }}",
-  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: true) }}",
+  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: false; format: HH:mm) }}",
   "timestamp/PollVote": "{{ timestamp | timestampFormatter(relativeCompact: true) }}",
   "timestamp/PollVoteTooltip": "{{ timestamp | timestampFormatter(calendar: true) }}",
   "timestamp/relativeDaysAgo": "{{ count }}d ago",
diff --git a/src/i18n/ko.json b/src/i18n/ko.json
index 1a2df9806..b9a16106e 100644
--- a/src/i18n/ko.json
+++ b/src/i18n/ko.json
@@ -381,7 +381,7 @@
   "timestamp/ChannelPreviewTimestamp": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"LT\", \"lastDay\": \"[어제]\", \"lastWeek\": \"dddd\", \"sameElse\": \"L\" }) }}",
   "timestamp/DateSeparator": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"[오늘]\", \"nextDay\": \"[내일]\", \"lastDay\": \"[어제]\", \"nextWeek\": \"dddd\", \"lastWeek\": \"[지난] dddd\", \"sameElse\": \"ddd, D MMM\" }) }}",
   "timestamp/LiveLocation": "{{ timestamp | timestampFormatter(calendar: true) }}",
-  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: true) }}",
+  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: false; format: HH:mm) }}",
   "timestamp/PollVote": "{{ timestamp | timestampFormatter(relativeCompact: true) }}",
   "timestamp/PollVoteTooltip": "{{ timestamp | timestampFormatter(calendar: true) }}",
   "timestamp/relativeDaysAgo": "{{ count }}d ago",
diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index 7a9dbb12e..e01b7ae50 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -388,7 +388,7 @@
   "timestamp/ChannelPreviewTimestamp": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"LT\", \"lastDay\": \"[Gisteren]\", \"lastWeek\": \"dddd\", \"sameElse\": \"L\" }) }}",
   "timestamp/DateSeparator": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"[Vandaag]\", \"nextDay\": \"[Morgen]\", \"lastDay\": \"[Gisteren]\", \"nextWeek\": \"dddd\", \"lastWeek\": \"[Laatste] dddd\", \"sameElse\": \"ddd, D MMM\" }) }}",
   "timestamp/LiveLocation": "{{ timestamp | timestampFormatter(calendar: true) }}",
-  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: true) }}",
+  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: false; format: HH:mm) }}",
   "timestamp/PollVote": "{{ timestamp | timestampFormatter(relativeCompact: true) }}",
   "timestamp/PollVoteTooltip": "{{ timestamp | timestampFormatter(calendar: true) }}",
   "timestamp/relativeDaysAgo": "{{ count }}d ago",
diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 516af19f2..681634d26 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -401,7 +401,7 @@
   "timestamp/ChannelPreviewTimestamp": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"LT\", \"lastDay\": \"[Ontem]\", \"lastWeek\": \"dddd\", \"sameElse\": \"L\" }) }}",
   "timestamp/DateSeparator": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"[Hoje]\", \"nextDay\": \"[Amanhã]\", \"lastDay\": \"[Ontem]\", \"nextWeek\": \"dddd\", \"lastWeek\": \"[Último] dddd\", \"sameElse\": \"ddd, D MMM\" }) }}",
   "timestamp/LiveLocation": "{{ timestamp | timestampFormatter(calendar: true) }}",
-  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: true) }}",
+  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: false; format: HH:mm) }}",
   "timestamp/PollVote": "{{ timestamp | timestampFormatter(relativeCompact: true) }}",
   "timestamp/PollVoteTooltip": "{{ timestamp | timestampFormatter(calendar: true) }}",
   "timestamp/relativeDaysAgo": "{{ count }}d ago",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index c94cf845c..79ad8d4e2 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -420,7 +420,7 @@
   "timestamp/ChannelPreviewTimestamp": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"LT\", \"lastDay\": \"[Вчера]\", \"lastWeek\": \"dddd\", \"sameElse\": \"L\" }) }}",
   "timestamp/DateSeparator": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"[Сегодня]\", \"nextDay\": \"[Завтра]\", \"lastDay\": \"[Вчера]\", \"nextWeek\": \"dddd\", \"lastWeek\": \"[В прошлый] dddd\", \"sameElse\": \"ddd, D MMM\" }) }}",
   "timestamp/LiveLocation": "{{ timestamp | timestampFormatter(calendar: true) }}",
-  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: true) }}",
+  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: false; format: HH:mm) }}",
   "timestamp/PollVote": "{{ timestamp | timestampFormatter(relativeCompact: true) }}",
   "timestamp/PollVoteTooltip": "{{ timestamp | timestampFormatter(calendar: true) }}",
   "timestamp/relativeDaysAgo": "{{ count }}d ago",
diff --git a/src/i18n/tr.json b/src/i18n/tr.json
index 8a68669ba..26c8bee93 100644
--- a/src/i18n/tr.json
+++ b/src/i18n/tr.json
@@ -386,7 +386,7 @@
   "timestamp/ChannelPreviewTimestamp": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"LT\", \"lastDay\": \"[Dün]\", \"lastWeek\": \"dddd\", \"sameElse\": \"L\" }) }}",
   "timestamp/DateSeparator": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { \"sameDay\": \"[Bugün]\", \"nextDay\": \"[Yarın]\", \"lastDay\": \"[Dün]\", \"nextWeek\": \"dddd\", \"lastWeek\": \"[Geçen] dddd\", \"sameElse\": \"ddd, D MMM\" }) }}",
   "timestamp/LiveLocation": "{{ timestamp | timestampFormatter(calendar: true) }}",
-  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: true) }}",
+  "timestamp/MessageTimestamp": "{{ timestamp | timestampFormatter(calendar: false; format: HH:mm) }}",
   "timestamp/PollVote": "{{ timestamp | timestampFormatter(relativeCompact: true) }}",
   "timestamp/PollVoteTooltip": "{{ timestamp | timestampFormatter(calendar: true) }}",
   "timestamp/relativeDaysAgo": "{{ count }}d ago",