diff --git a/ts/components/basic/I18n.tsx b/ts/components/basic/I18n.tsx
index 1b82ca51b..5b29dcb71 100644
--- a/ts/components/basic/I18n.tsx
+++ b/ts/components/basic/I18n.tsx
@@ -22,12 +22,14 @@ const formattingTagRegex = new RegExp(
  *
  * @param token - The token identifying the message to retrieve and an optional record of substitution variables and their replacement values.
  * @param args - An optional record of substitution variables and their replacement values. This is required if the string has dynamic parts.
+ * @param as - An optional HTML tag to render the component as. Defaults to a fragment, unless the string contains html tags. In that case, it will render as HTML in a div tag.
  *
  * @returns The localized message string with substitutions and formatting applied.
  *
  * @example
  * ```tsx
  * <I18n token="about" />
+ * <I18n token="about" as='h1' />
  * <I18n token="disappearingMessagesFollowSettingOn" args={{ time: 10, type: 'mode' }} />
  * ```
  */
@@ -40,8 +42,10 @@ export const I18n = <T extends LocalizerToken>(props: I18nProps<T>) => {
 
   /** If the string contains a relevant formatting tag, render it as HTML */
   if (i18nString.match(formattingTagRegex)) {
-    return <SessionHtmlRenderer html={i18nString} />;
+    return <SessionHtmlRenderer tag={props.as} html={i18nString} />;
   }
 
-  return <>{i18nString}</>;
+  const Comp = props.as ?? React.Fragment;
+
+  return <Comp>{i18nString}</Comp>;
 };
diff --git a/ts/types/Localizer.ts b/ts/types/Localizer.ts
index 4e2242520..383fe5c9f 100644
--- a/ts/types/Localizer.ts
+++ b/ts/types/Localizer.ts
@@ -1,3 +1,4 @@
+import type { ElementType } from 'react';
 import type { Dictionary } from '../localization/locales';
 
 /** A localization dictionary key */
@@ -20,9 +21,14 @@ type DynamicArgs<LocalizedString extends string> =
 export type GetMessageArgs<T extends Token> =
   DynamicArgs<Dictionary[T]> extends never ? [T] : [T, ArgsRecord<T>];
 
+/** Basic props for all calls of the I18n component */
+type I18nBaseProps<T extends Token> = { token: T; as?: ElementType };
+
 /** The props for the localization component */
 export type I18nProps<T extends Token> =
-  DynamicArgs<Dictionary[T]> extends never ? { token: T } : { token: T; args: ArgsRecord<T> };
+  DynamicArgs<Dictionary[T]> extends never
+    ? I18nBaseProps<T>
+    : I18nBaseProps<T> & { args: ArgsRecord<T> };
 
 /** The dictionary of localized strings */
 export type LocalizerDictionary = Dictionary;