diff --git a/src/app/components/message/Time.tsx b/src/app/components/message/Time.tsx
index de11cf89..a5126015 100644
--- a/src/app/components/message/Time.tsx
+++ b/src/app/components/message/Time.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { ComponentProps } from 'react';
 import { Text, as } from 'folds';
 import { timeDayMonYear, timeHourMinute, today, yesterday } from '../../utils/time';
 
@@ -7,21 +7,23 @@ export type TimeProps = {
   ts: number;
 };
 
-export const Time = as<'span', TimeProps>(({ compact, ts, ...props }, ref) => {
-  let time = '';
-  if (compact) {
-    time = timeHourMinute(ts);
-  } else if (today(ts)) {
-    time = timeHourMinute(ts);
-  } else if (yesterday(ts)) {
-    time = `Yesterday ${timeHourMinute(ts)}`;
-  } else {
-    time = `${timeDayMonYear(ts)} ${timeHourMinute(ts)}`;
-  }
+export const Time = as<'span', TimeProps & ComponentProps<typeof Text>>(
+  ({ compact, ts, ...props }, ref) => {
+    let time = '';
+    if (compact) {
+      time = timeHourMinute(ts);
+    } else if (today(ts)) {
+      time = timeHourMinute(ts);
+    } else if (yesterday(ts)) {
+      time = `Yesterday ${timeHourMinute(ts)}`;
+    } else {
+      time = `${timeDayMonYear(ts)} ${timeHourMinute(ts)}`;
+    }
 
-  return (
-    <Text as="time" style={{ flexShrink: 0 }} size="T200" priority="300" {...props} ref={ref}>
-      {time}
-    </Text>
-  );
-});
+    return (
+      <Text as="time" style={{ flexShrink: 0 }} size="T200" priority="300" {...props} ref={ref}>
+        {time}
+      </Text>
+    );
+  }
+);