diff --git a/apps/meteor/app/notifications/client/lib/Presence.ts b/apps/meteor/app/notifications/client/lib/Presence.ts
index 7323459a45b73..fa6cc9866b445 100644
--- a/apps/meteor/app/notifications/client/lib/Presence.ts
+++ b/apps/meteor/app/notifications/client/lib/Presence.ts
@@ -1,3 +1,4 @@
+import type { PresenceSource } from '@rocket.chat/core-typings';
 import { UserStatus } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 
@@ -20,10 +21,17 @@ if (isSdkTransportEnabled()) {
 	streamerCentral.setupDdpConnection('user-presence', createDdpSdkStreamerAdapter(getDdpSdk()));
 }
 
-type args = [username: string, statusChanged?: UserStatus, statusText?: string];
+type args = [username: string, statusChanged?: UserStatus, statusText?: string, statusSource?: PresenceSource, statusExpiresAt?: Date];
 
 export const STATUS_MAP = [UserStatus.OFFLINE, UserStatus.ONLINE, UserStatus.AWAY, UserStatus.BUSY, UserStatus.DISABLED];
 
-streamerCentral.on('stream-user-presence', (uid: string, [username, statusChanged, statusText]: args) => {
-	Presence.notify({ _id: uid, username, status: STATUS_MAP[statusChanged as any], statusText });
+streamerCentral.on('stream-user-presence', (uid: string, [username, statusChanged, statusText, statusSource, statusExpiresAt]: args) => {
+	Presence.notify({
+		_id: uid,
+		username,
+		status: STATUS_MAP[statusChanged as any],
+		statusText,
+		statusSource,
+		statusExpiresAt,
+	});
 });
diff --git a/apps/meteor/client/components/UserCard/UserCard.tsx b/apps/meteor/client/components/UserCard/UserCard.tsx
index 8a042c0733e72..b616cb3ca76f5 100644
--- a/apps/meteor/client/components/UserCard/UserCard.tsx
+++ b/apps/meteor/client/components/UserCard/UserCard.tsx
@@ -66,7 +66,7 @@ const UserCard = ({
 					)}
 				</Box>
 				{customStatus && (
-					<UserCardInfo mbe={16}>
+					<UserCardInfo mbe={4}>
 						{typeof customStatus === 'string' ? (
 							<MarkdownText withTruncatedText variant='inlineWithoutBreaks' content={customStatus} parseEmoji={true} />
 						) : (
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index 1f32888e901cf..7439b793c7036 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -22,6 +22,7 @@ import { useUserCustomFields } from '../../hooks/useUserCustomFields';
 import MarkdownText from '../MarkdownText';
 import UTCClock from '../UTCClock';
 import { UserCardRoles } from '../UserCard';
+import { UserStatusText } from '../UserStatusText';
 import UserInfoABACAttributes from './UserInfoABACAttributes';
 import UserInfoAvatar from './UserInfoAvatar';
 
@@ -38,6 +39,7 @@ type UserInfoDataProps = Serialized<
 		| 'phone'
 		| 'createdAt'
 		| 'statusText'
+		| 'statusExpiresAt'
 		| 'canViewAllInfo'
 		| 'customFields'
 		| 'freeSwitchExtension'
@@ -70,6 +72,7 @@ const UserInfo = ({
 	createdAt,
 	status,
 	statusText,
+	statusExpiresAt,
 	customFields,
 	canViewAllInfo,
 	actions,
@@ -102,7 +105,7 @@ const UserInfo = ({
 
 					{statusText && (
 						<InfoPanelText>
-							<MarkdownText content={statusText} parseEmoji={true} variant='inline' />
+							<UserStatusText statusText={statusText} statusExpiresAt={statusExpiresAt} showExpiration />
 						</InfoPanelText>
 					)}
 				</InfoPanelSection>
diff --git a/apps/meteor/client/components/UserInfo/__snapshots__/UserInfo.spec.tsx.snap b/apps/meteor/client/components/UserInfo/__snapshots__/UserInfo.spec.tsx.snap
index 09d900532be03..d023795436af5 100644
--- a/apps/meteor/client/components/UserInfo/__snapshots__/UserInfo.spec.tsx.snap
+++ b/apps/meteor/client/components/UserInfo/__snapshots__/UserInfo.spec.tsx.snap
@@ -93,15 +93,20 @@ exports[`renders Default without crashing 1`] = `
                       class="rcx-box rcx-box--full rcx-css-6hwe8l rcx-css-faoni4"
                     >
                       <div
-                        class="rcx-box rcx-box--full rcx-box--with-block-elements rcx-box--with-inline-elements"
+                        class="rcx-box rcx-box--full"
+                        data-tooltip=""
                       >
-                        <img
-                          alt="🛴"
-                          class="emojione"
-                          src="https://cdn.jsdelivr.net/emojione/assets/4.5/png/32/1f6f4.png"
-                          title=":scooter:"
-                        />
-                         currently working on User Card
+                        <div
+                          class="rcx-box rcx-box--full rcx-box--with-inline-elements rcx-css-1te28na"
+                        >
+                          <img
+                            alt="🛴"
+                            class="emojione"
+                            src="https://cdn.jsdelivr.net/emojione/assets/4.5/png/32/1f6f4.png"
+                            title=":scooter:"
+                          />
+                           currently working on User Card
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -390,15 +395,20 @@ exports[`renders InvitedUser without crashing 1`] = `
                       class="rcx-box rcx-box--full rcx-css-6hwe8l rcx-css-faoni4"
                     >
                       <div
-                        class="rcx-box rcx-box--full rcx-box--with-block-elements rcx-box--with-inline-elements"
+                        class="rcx-box rcx-box--full"
+                        data-tooltip=""
                       >
-                        <img
-                          alt="🛴"
-                          class="emojione"
-                          src="https://cdn.jsdelivr.net/emojione/assets/4.5/png/32/1f6f4.png"
-                          title=":scooter:"
-                        />
-                         currently working on User Card
+                        <div
+                          class="rcx-box rcx-box--full rcx-box--with-inline-elements rcx-css-1te28na"
+                        >
+                          <img
+                            alt="🛴"
+                            class="emojione"
+                            src="https://cdn.jsdelivr.net/emojione/assets/4.5/png/32/1f6f4.png"
+                            title=":scooter:"
+                          />
+                           currently working on User Card
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -701,15 +711,20 @@ exports[`renders WithABACAttributes without crashing 1`] = `
                       class="rcx-box rcx-box--full rcx-css-6hwe8l rcx-css-faoni4"
                     >
                       <div
-                        class="rcx-box rcx-box--full rcx-box--with-block-elements rcx-box--with-inline-elements"
+                        class="rcx-box rcx-box--full"
+                        data-tooltip=""
                       >
-                        <img
-                          alt="🛴"
-                          class="emojione"
-                          src="https://cdn.jsdelivr.net/emojione/assets/4.5/png/32/1f6f4.png"
-                          title=":scooter:"
-                        />
-                         currently working on User Card
+                        <div
+                          class="rcx-box rcx-box--full rcx-box--with-inline-elements rcx-css-1te28na"
+                        >
+                          <img
+                            alt="🛴"
+                            class="emojione"
+                            src="https://cdn.jsdelivr.net/emojione/assets/4.5/png/32/1f6f4.png"
+                            title=":scooter:"
+                          />
+                           currently working on User Card
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -1058,15 +1073,20 @@ exports[`renders WithVoiceCallExtension without crashing 1`] = `
                       class="rcx-box rcx-box--full rcx-css-6hwe8l rcx-css-faoni4"
                     >
                       <div
-                        class="rcx-box rcx-box--full rcx-box--with-block-elements rcx-box--with-inline-elements"
+                        class="rcx-box rcx-box--full"
+                        data-tooltip=""
                       >
-                        <img
-                          alt="🛴"
-                          class="emojione"
-                          src="https://cdn.jsdelivr.net/emojione/assets/4.5/png/32/1f6f4.png"
-                          title=":scooter:"
-                        />
-                         currently working on User Card
+                        <div
+                          class="rcx-box rcx-box--full rcx-box--with-inline-elements rcx-css-1te28na"
+                        >
+                          <img
+                            alt="🛴"
+                            class="emojione"
+                            src="https://cdn.jsdelivr.net/emojione/assets/4.5/png/32/1f6f4.png"
+                            title=":scooter:"
+                          />
+                           currently working on User Card
+                        </div>
                       </div>
                     </div>
                   </div>
diff --git a/apps/meteor/client/components/UserStatusText/UserStatusText.tsx b/apps/meteor/client/components/UserStatusText/UserStatusText.tsx
new file mode 100644
index 0000000000000..f442c206b9682
--- /dev/null
+++ b/apps/meteor/client/components/UserStatusText/UserStatusText.tsx
@@ -0,0 +1,43 @@
+import { Box } from '@rocket.chat/fuselage';
+import { useTooltipClose, useTooltipOpen } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import { useRef, useCallback } from 'react';
+
+import { useExpirationText } from './useExpirationText';
+import MarkdownText from '../MarkdownText';
+
+type UserStatusTextProps = {
+	statusText?: string;
+	statusExpiresAt?: Date | string;
+	showExpiration?: boolean;
+};
+
+const UserStatusText = ({ statusText, statusExpiresAt, showExpiration: showExpirationProp }: UserStatusTextProps): ReactElement | null => {
+	const expirationText = useExpirationText(statusExpiresAt);
+	const hasValidExpiration = expirationText != null;
+	const showExpiration = showExpirationProp ?? hasValidExpiration;
+
+	const ref = useRef<HTMLDivElement>(null);
+	const openTooltip = useTooltipOpen();
+	const closeTooltip = useTooltipClose();
+
+	const handleMouseEnter = useCallback(() => {
+		if (!ref.current || !hasValidExpiration) {
+			return;
+		}
+		openTooltip(<Box fontScale='p2'>{expirationText}</Box>, ref.current);
+	}, [hasValidExpiration, expirationText, openTooltip]);
+
+	if (!statusText) {
+		return null;
+	}
+
+	return (
+		<Box ref={ref} data-tooltip='' onMouseEnter={handleMouseEnter} onMouseLeave={closeTooltip}>
+			<MarkdownText content={statusText} parseEmoji={true} variant='inlineWithoutBreaks' withTruncatedText />
+			{showExpiration && hasValidExpiration && <Box color='secondary-info'>{expirationText}</Box>}
+		</Box>
+	);
+};
+
+export default UserStatusText;
diff --git a/apps/meteor/client/components/UserStatusText/index.ts b/apps/meteor/client/components/UserStatusText/index.ts
new file mode 100644
index 0000000000000..5d279ddfa462a
--- /dev/null
+++ b/apps/meteor/client/components/UserStatusText/index.ts
@@ -0,0 +1,4 @@
+export { default as UserStatusText } from './UserStatusText';
+export { useStatusTooltip } from './useStatusTooltip';
+
+export { useExpirationText, parseExpiresAt } from './useExpirationText';
diff --git a/apps/meteor/client/components/UserStatusText/useExpirationText.ts b/apps/meteor/client/components/UserStatusText/useExpirationText.ts
new file mode 100644
index 0000000000000..573f4189e460a
--- /dev/null
+++ b/apps/meteor/client/components/UserStatusText/useExpirationText.ts
@@ -0,0 +1,58 @@
+import { useLanguage } from '@rocket.chat/ui-contexts';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useFormatDate } from '../../hooks/useFormatDate';
+import { useFormatTime } from '../../hooks/useFormatTime';
+
+// Handles Date, ISO string, and EJSON { $date } (from DDP streamer which does raw JSON.parse without EJSON deserialization)
+export function parseExpiresAt(value?: unknown): Date | undefined {
+	if (!value) {
+		return undefined;
+	}
+
+	if (value instanceof Date) {
+		return Number.isNaN(value.getTime()) ? undefined : value;
+	}
+
+	if (typeof value === 'object' && '$date' in (value as Record<string, unknown>)) {
+		const date = new Date((value as { $date: number }).$date);
+		return Number.isNaN(date.getTime()) ? undefined : date;
+	}
+
+	if (typeof value === 'string') {
+		const date = new Date(value);
+		return Number.isNaN(date.getTime()) ? undefined : date;
+	}
+
+	return undefined;
+}
+
+function isSameDay(a: Date, b: Date): boolean {
+	return a.getFullYear() === b.getFullYear() && a.getMonth() === b.getMonth() && a.getDate() === b.getDate();
+}
+
+export function useExpirationText(statusExpiresAt?: Date | string): string | undefined {
+	const { t } = useTranslation();
+	const language = useLanguage();
+	const formatTime = useFormatTime();
+	const formatDate = useFormatDate();
+
+	return useMemo(() => {
+		const expiresAt = parseExpiresAt(statusExpiresAt);
+		if (!expiresAt || expiresAt.getTime() <= Date.now()) {
+			return undefined;
+		}
+
+		const now = new Date();
+		if (isSameDay(expiresAt, now)) {
+			return `${t('Until')} ${formatTime(expiresAt)}`;
+		}
+
+		if (expiresAt.getFullYear() === now.getFullYear()) {
+			return `${t('Until')} ${new Intl.DateTimeFormat(language, { month: 'long', day: 'numeric' }).format(expiresAt)}`;
+		}
+
+		return `${t('Until')} ${formatDate(expiresAt)}`;
+	}, [statusExpiresAt, t, language, formatTime, formatDate]);
+}
diff --git a/apps/meteor/client/components/UserStatusText/useStatusTooltip.tsx b/apps/meteor/client/components/UserStatusText/useStatusTooltip.tsx
new file mode 100644
index 0000000000000..99a64e1b80d5c
--- /dev/null
+++ b/apps/meteor/client/components/UserStatusText/useStatusTooltip.tsx
@@ -0,0 +1,50 @@
+import { Box, Icon } from '@rocket.chat/fuselage';
+import { useTooltipOpen, useTooltipClose } from '@rocket.chat/ui-contexts';
+import type { MouseEvent } from 'react';
+import { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useExpirationText } from './useExpirationText';
+
+const STATUS_LABEL_KEYS: Record<string, string> = {
+	online: 'Online',
+	away: 'Away',
+	busy: 'Busy',
+	offline: 'Offline',
+};
+
+export function useStatusTooltip(statusText?: string, statusExpiresAt?: Date | string, status?: string) {
+	const { t } = useTranslation();
+	const expirationText = useExpirationText(statusExpiresAt);
+	const openTooltip = useTooltipOpen();
+	const closeTooltip = useTooltipClose();
+
+	const handleMouseEnter = useCallback(
+		(e: MouseEvent<HTMLElement>) => {
+			if (!statusText) {
+				return;
+			}
+			const statusLabelKey = status ? STATUS_LABEL_KEYS[status] : undefined;
+			const headline = statusLabelKey ? `${t(statusLabelKey)} - ${statusText}` : statusText;
+			openTooltip(
+				<Box>
+					<Box fontScale='p2'>{headline}</Box>
+					{expirationText && (
+						<Box color='secondary-info' display='flex' alignItems='center'>
+							<Icon name='clock' size='x16' mie={4} />
+							{expirationText}
+						</Box>
+					)}
+				</Box>,
+				e.currentTarget,
+			);
+		},
+		[statusText, status, expirationText, openTooltip, t],
+	);
+
+	return {
+		hasStatusText: !!statusText,
+		handleMouseEnter,
+		handleMouseLeave: closeTooltip,
+	};
+}
diff --git a/apps/meteor/client/lib/presence.spec.ts b/apps/meteor/client/lib/presence.spec.ts
index 5e630bd4f03da..720a2a2f8fd59 100644
--- a/apps/meteor/client/lib/presence.spec.ts
+++ b/apps/meteor/client/lib/presence.spec.ts
@@ -48,4 +48,54 @@ describe('Presence fallback status', () => {
 
 		expect(Presence.store.get('user1')?.status).toBe(UserStatus.OFFLINE);
 	});
+
+	it('should preserve statusSource and statusExpiresAt from REST response', async () => {
+		const expiresAt = new Date(Date.now() + 3600_000);
+		mockGet.mockResolvedValue({
+			users: [
+				{
+					_id: 'user1',
+					username: 'testuser',
+					status: UserStatus.BUSY,
+					statusText: 'focus time',
+					statusSource: 'manual',
+					statusExpiresAt: expiresAt.toISOString(),
+				},
+			],
+		});
+		Presence.setStatus('enabled');
+
+		Presence.listen('user1', jest.fn());
+		await jest.advanceTimersByTimeAsync(500);
+
+		const stored = Presence.store.get('user1');
+		expect(stored?.status).toBe(UserStatus.BUSY);
+		expect(stored?.statusText).toBe('focus time');
+		expect(stored?.statusSource).toBe('manual');
+		expect(stored?.statusExpiresAt).toEqual(expiresAt);
+	});
+
+	it('should merge statusSource and statusExpiresAt from notify into existing store entry', async () => {
+		mockGet.mockResolvedValue({ users: [] });
+		Presence.setStatus('enabled');
+
+		Presence.listen('user1', jest.fn());
+		await jest.advanceTimersByTimeAsync(500);
+
+		const expiresAt = new Date(Date.now() + 1800_000);
+		Presence.notify({
+			_id: 'user1',
+			username: 'testuser',
+			status: UserStatus.BUSY,
+			statusText: 'in a meeting',
+			statusSource: 'manual',
+			statusExpiresAt: expiresAt,
+		});
+
+		const stored = Presence.store.get('user1');
+		expect(stored?.status).toBe(UserStatus.BUSY);
+		expect(stored?.statusText).toBe('in a meeting');
+		expect(stored?.statusSource).toBe('manual');
+		expect(stored?.statusExpiresAt).toEqual(expiresAt);
+	});
 });
diff --git a/apps/meteor/client/lib/presence.ts b/apps/meteor/client/lib/presence.ts
index 6b748c85d3541..071ad5249fca7 100644
--- a/apps/meteor/client/lib/presence.ts
+++ b/apps/meteor/client/lib/presence.ts
@@ -97,9 +97,12 @@ const getPresence = ((): ((uid: UserPresence['_id']) => void) => {
 
 				const fallbackStatus = status === 'disabled' ? UserStatus.DISABLED : UserStatus.OFFLINE;
 
-				users.forEach((user) => {
+				users.forEach(({ statusExpiresAt, ...user }) => {
 					if (!store.has(user._id)) {
-						notify(user);
+						notify({
+							...user,
+							...(statusExpiresAt && { statusExpiresAt: new Date(statusExpiresAt) }),
+						});
 					}
 					currentUids.delete(user._id);
 				});
diff --git a/apps/meteor/client/lib/statusDurations.ts b/apps/meteor/client/lib/statusDurations.ts
new file mode 100644
index 0000000000000..f4d6004a23942
--- /dev/null
+++ b/apps/meteor/client/lib/statusDurations.ts
@@ -0,0 +1,30 @@
+type DurationOption = {
+	value: string;
+	labelKey: 'Status_dont_clear' | 'Status_30_minutes' | 'Status_1_hour' | 'Status_choose_date_and_time';
+	getExpiresAt?: (ctx: { now: Date; customDate?: string; customTime?: string }) => Date | undefined;
+};
+
+export const STATUS_DURATION_OPTIONS: DurationOption[] = [
+	{ value: '', labelKey: 'Status_dont_clear' },
+	{
+		value: '30',
+		labelKey: 'Status_30_minutes',
+		getExpiresAt: ({ now }) => new Date(now.getTime() + 30 * 60_000),
+	},
+	{
+		value: '60',
+		labelKey: 'Status_1_hour',
+		getExpiresAt: ({ now }) => new Date(now.getTime() + 60 * 60_000),
+	},
+	{
+		value: 'custom',
+		labelKey: 'Status_choose_date_and_time',
+		getExpiresAt: ({ customDate, customTime }) => {
+			if (!customDate || !customTime) {
+				return undefined;
+			}
+			const date = new Date(`${customDate}T${customTime}`);
+			return Number.isNaN(date.getTime()) ? undefined : date;
+		},
+	},
+];
diff --git a/apps/meteor/client/lib/userData.ts b/apps/meteor/client/lib/userData.ts
index 9ae32b29dfca5..c5abf38296380 100644
--- a/apps/meteor/client/lib/userData.ts
+++ b/apps/meteor/client/lib/userData.ts
@@ -18,6 +18,8 @@ type RawUserData = Serialized<
 		| 'status'
 		| 'statusDefault'
 		| 'statusText'
+		| 'statusSource'
+		| 'statusExpiresAt'
 		| 'statusConnection'
 		| 'avatarOrigin'
 		| 'utcOffset'
@@ -158,6 +160,9 @@ export const synchronizeUserData = async (uid: IUser['_id']): Promise<RawUserDat
 			...(lastLogin && {
 				lastLogin: new Date(lastLogin),
 			}),
+			...(meFields.statusExpiresAt && {
+				statusExpiresAt: new Date(meFields.statusExpiresAt),
+			}),
 			ldap: Boolean(ldap),
 			createdAt: meFields.createdAt != null ? new Date(meFields.createdAt) : (existingUser?.createdAt ?? new Date()),
 			_updatedAt: new Date(meFields._updatedAt ?? existingUser?._updatedAt ?? Date.now()),
diff --git a/apps/meteor/client/lib/userStatuses.ts b/apps/meteor/client/lib/userStatuses.ts
index 631c1d1ea0442..f65bf33d40543 100644
--- a/apps/meteor/client/lib/userStatuses.ts
+++ b/apps/meteor/client/lib/userStatuses.ts
@@ -14,7 +14,7 @@ export class UserStatuses implements Iterable<UserStatusDescriptor> {
 	public invisibleAllowed = true;
 
 	private store: Map<UserStatusDescriptor['id'], UserStatusDescriptor> = new Map(
-		[UserStatus.ONLINE, UserStatus.AWAY, UserStatus.BUSY, UserStatus.OFFLINE].map((status) => [
+		[UserStatus.ONLINE, UserStatus.BUSY, UserStatus.OFFLINE].map((status) => [
 			status,
 			{
 				id: status,
diff --git a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/EditStatusModal.tsx b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/EditStatusModal.tsx
index 7e017b88750b9..a6a6e2fe4fe37 100644
--- a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/EditStatusModal.tsx
+++ b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/EditStatusModal.tsx
@@ -1,122 +1,244 @@
-import type { IUser } from '@rocket.chat/core-typings';
+import { UserStatus as UserStatusType } from '@rocket.chat/core-typings';
+import { css } from '@rocket.chat/css-in-js';
+import type { SelectOption } from '@rocket.chat/fuselage';
 import {
 	Field,
-	TextInput,
-	FieldGroup,
-	Modal,
-	Button,
-	Box,
 	FieldLabel,
 	FieldRow,
 	FieldError,
 	FieldHint,
+	TextInput,
+	InputBox,
+	Select,
+	Margins,
+	Modal,
+	Button,
+	Box,
 	ModalHeader,
-	ModalIcon,
 	ModalTitle,
 	ModalClose,
 	ModalContent,
 	ModalFooter,
 	ModalFooterControllers,
 } from '@rocket.chat/fuselage';
-import { useEffectEvent, useLocalStorage } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useSetting, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
-import type { ReactElement, ChangeEvent, ComponentProps, FormEvent } from 'react';
-import { useState, useCallback, useId } from 'react';
+import { useLocalStorage } from '@rocket.chat/fuselage-hooks';
+import { useToastMessageDispatch, useSetting, useEndpoint, useUser } from '@rocket.chat/ui-contexts';
+import type { ReactElement, ChangeEvent, ComponentProps } from 'react';
+import { useId, useMemo } from 'react';
+import { Controller, useForm, useWatch } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import UserStatusMenu from '../../../components/UserStatusMenu';
 import { USER_STATUS_TEXT_MAX_LENGTH } from '../../../lib/constants';
+import { STATUS_DURATION_OPTIONS } from '../../../lib/statusDurations';
 
 type EditStatusModalProps = {
 	onClose: () => void;
-	userStatus: IUser['status'];
-	userStatusText: IUser['statusText'];
 };
 
-const EditStatusModal = ({ onClose, userStatus, userStatusText }: EditStatusModalProps): ReactElement => {
+type StatusFormValues = {
+	statusText: string;
+	statusType: UserStatusType;
+	duration: string;
+	customDate: string;
+	customTime: string;
+};
+
+const EditStatusModal = ({ onClose }: EditStatusModalProps): ReactElement => {
+	const user = useUser();
 	const allowUserStatusMessageChange = useSetting('Accounts_AllowUserStatusMessageChange');
 	const dispatchToastMessage = useToastMessageDispatch();
 	const [customStatus, setCustomStatus] = useLocalStorage<string>('Local_Custom_Status', '');
-	const initialStatusText = customStatus || userStatusText || '';
+	const initialStatusText = user?.statusText ?? customStatus ?? '';
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const modalId = useId();
-	const [statusText, setStatusText] = useState(initialStatusText);
-	const [statusType, setStatusType] = useState(userStatus);
-	const [statusTextError, setStatusTextError] = useState<string | undefined>();
 
-	const setUserStatus = useEndpoint('POST', '/v1/users.setStatus');
+	const initialExpiration = user?.statusExpiresAt && new Date(user.statusExpiresAt) > new Date() ? new Date(user.statusExpiresAt) : null;
+	const initialDate = initialExpiration ?? new Date();
+
+	const {
+		control,
+		handleSubmit,
+		setError,
+		clearErrors,
+		formState: { errors },
+	} = useForm<StatusFormValues>({
+		mode: 'onChange',
+		defaultValues: {
+			statusText: initialStatusText,
+			statusType: user?.status ?? UserStatusType.ONLINE,
+			duration: initialExpiration ? 'custom' : '',
+			customDate: initialDate.toLocaleDateString('en-CA'),
+			customTime: initialDate.toTimeString().slice(0, 5),
+		},
+	});
 
-	const handleStatusText = useEffectEvent((e: ChangeEvent<HTMLInputElement>): void => {
-		setStatusText(e.currentTarget.value);
+	const duration = useWatch({ control, name: 'duration' });
+	const statusType = useWatch({ control, name: 'statusType' });
 
-		if (statusText && statusText.length > USER_STATUS_TEXT_MAX_LENGTH) {
-			return setStatusTextError(t('Max_length_is', USER_STATUS_TEXT_MAX_LENGTH));
-		}
+	const setUserStatus = useEndpoint('POST', '/v1/users.setStatus');
 
-		return setStatusTextError(undefined);
-	});
+	const defaultStatusLabel = `${t(statusType)} (${t('Default')})`;
 
-	const handleStatusType = (type: IUser['status']): void => setStatusType(type);
+	const durationOptions: SelectOption[] = useMemo(() => STATUS_DURATION_OPTIONS.map(({ value, labelKey }) => [value, t(labelKey)]), [t]);
 
-	const handleSaveStatus = useCallback(async () => {
+	const handleSaveStatus = async ({ statusText, statusType, duration, customDate, customTime }: StatusFormValues): Promise<void> => {
+		const expiresAt = STATUS_DURATION_OPTIONS.find((o) => o.value === duration)?.getExpiresAt?.({
+			now: new Date(),
+			customDate,
+			customTime,
+		});
+		if (duration === 'custom') {
+			if (!expiresAt) {
+				setError('duration', { message: t('Status_choose_date_and_time') });
+				return;
+			}
+			if (expiresAt <= new Date()) {
+				setError('duration', { message: t('Status_expiration_must_be_future') });
+				return;
+			}
+		}
+		clearErrors('duration');
 		try {
-			await setUserStatus({ message: statusText, status: statusType });
+			await setUserStatus({
+				message: statusText,
+				status: statusType,
+				...(expiresAt && { expiresAt: expiresAt.toISOString() }),
+			});
 			setCustomStatus(statusText);
 			dispatchToastMessage({ type: 'success', message: t('StatusMessage_Changed_Successfully') });
+			onClose();
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
 		}
-
-		onClose();
-	}, [onClose, setUserStatus, statusText, statusType, setCustomStatus, dispatchToastMessage, t]);
+	};
 
 	return (
 		<Modal
 			aria-labelledby={`${modalId}-title`}
-			wrapperFunction={(props: ComponentProps<typeof Box>) => (
-				<Box
-					is='form'
-					onSubmit={(e: FormEvent) => {
-						e.preventDefault();
-						handleSaveStatus();
-					}}
-					{...props}
-				/>
-			)}
+			wrapperFunction={(props: ComponentProps<typeof Box>) => <Box is='form' onSubmit={handleSubmit(handleSaveStatus)} {...props} />}
 		>
 			<ModalHeader>
-				<ModalIcon name='info' />
-				<ModalTitle id={`${modalId}-title`}>{t('Edit_Status')}</ModalTitle>
+				<ModalTitle id={`${modalId}-title`}>{t('Status_set_your_status')}</ModalTitle>
 				<ModalClose onClick={onClose} />
 			</ModalHeader>
 			<ModalContent fontScale='p2'>
-				<FieldGroup>
+				<Box display='flex' flexDirection='column' rowGap={12}>
+					<Field>
+						<FieldLabel htmlFor={`${modalId}-status-message`}>{t('Status')}</FieldLabel>
+						<FieldRow>
+							<Controller
+								control={control}
+								name='statusText'
+								rules={{
+									maxLength: {
+										value: USER_STATUS_TEXT_MAX_LENGTH,
+										message: t('Max_length_is', { length: USER_STATUS_TEXT_MAX_LENGTH }),
+									},
+								}}
+								render={({ field }) => (
+									<TextInput
+										{...field}
+										id={`${modalId}-status-message`}
+										aria-label={t('Status')}
+										error={errors.statusText?.message}
+										disabled={!allowUserStatusMessageChange}
+										flexGrow={1}
+										placeholder={defaultStatusLabel}
+										className={css`
+											align-items: center;
+
+											& > .rcx-input-box__addon {
+												order: -1;
+												margin-inline-end: 0.5rem;
+											}
+										`}
+										addon={
+											<Controller
+												control={control}
+												name='statusType'
+												render={({ field: { value, onChange } }) => (
+													<UserStatusMenu margin='none' initialStatus={value} onChange={onChange} placement='bottom-start' />
+												)}
+											/>
+										}
+									/>
+								)}
+							/>
+						</FieldRow>
+						<FieldHint>{t(allowUserStatusMessageChange ? 'Status_you_can_use_emoji' : 'StatusMessage_Change_Disabled')}</FieldHint>
+						{errors.statusText && <FieldError>{errors.statusText.message}</FieldError>}
+					</Field>
 					<Field>
-						<FieldLabel htmlFor={`${modalId}-status-message`}>{t('StatusMessage')}</FieldLabel>
+						<FieldLabel htmlFor={`${modalId}-clear-after`}>{t('Status_clear_after')}</FieldLabel>
 						<FieldRow>
-							<TextInput
-								id={`${modalId}-status-message`}
-								aria-label={t('StatusMessage')}
-								error={statusTextError}
-								disabled={!allowUserStatusMessageChange}
-								flexGrow={1}
-								value={statusText}
-								onChange={handleStatusText}
-								placeholder={t('StatusMessage_Placeholder')}
-								addon={<UserStatusMenu margin='neg-x2' onChange={handleStatusType} initialStatus={statusType} />}
+							<Controller
+								control={control}
+								name='duration'
+								render={({ field: { value, onChange } }) => (
+									<Select
+										id={`${modalId}-clear-after`}
+										value={value}
+										options={durationOptions}
+										onChange={(next) => {
+											onChange(String(next));
+											clearErrors('duration');
+										}}
+									/>
+								)}
 							/>
 						</FieldRow>
-						{!allowUserStatusMessageChange && <FieldHint>{t('StatusMessage_Change_Disabled')}</FieldHint>}
-						<FieldError>{statusTextError}</FieldError>
+						{duration === 'custom' && (
+							<Box display='flex' mi='neg-x4' mbs={8}>
+								<Margins inline={4}>
+									<Controller
+										control={control}
+										name='customDate'
+										render={({ field: { value, onChange } }) => (
+											<InputBox
+												aria-label={t('Status_expiration_date')}
+												type='date'
+												flexGrow={1}
+												value={value}
+												onChange={(e: ChangeEvent<HTMLInputElement>) => {
+													onChange(e.currentTarget.value);
+													clearErrors('duration');
+												}}
+												min={new Date().toLocaleDateString('en-CA')}
+											/>
+										)}
+									/>
+									<Controller
+										control={control}
+										name='customTime'
+										render={({ field: { value, onChange } }) => (
+											<InputBox
+												aria-label={t('Status_expiration_time')}
+												type='time'
+												flexGrow={1}
+												value={value}
+												onChange={(e: ChangeEvent<HTMLInputElement>) => {
+													onChange(e.currentTarget.value);
+													clearErrors('duration');
+												}}
+											/>
+										)}
+									/>
+								</Margins>
+							</Box>
+						)}
+						{errors.duration && <FieldError>{errors.duration.message}</FieldError>}
+						<FieldHint>{t('Status_new_status_warning')}</FieldHint>
 					</Field>
-				</FieldGroup>
+				</Box>
 			</ModalContent>
 			<ModalFooter>
 				<ModalFooterControllers>
 					<Button secondary onClick={onClose}>
 						{t('Cancel')}
 					</Button>
-					<Button primary type='submit' disabled={!!statusTextError}>
+					<Button primary type='submit' disabled={!!errors.statusText}>
 						{t('Save')}
 					</Button>
 				</ModalFooterControllers>
diff --git a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/UserMenu.tsx b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
index 171b8762c3142..1b2a61b102d1f 100644
--- a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
+++ b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/UserMenu.tsx
@@ -19,12 +19,15 @@ const UserMenu = function UserMenu({ user, ...props }: UserMenuProps) {
 
 	const handleAction = useHandleMenuAction(items, () => setIsOpen(false));
 
+	// TODO: highlight the active status row once fuselage's MenuItem forwards
+	// `selected={state.selectionManager.isSelected(item.key)}` to MenuOption.
 	return (
 		<GenericMenu
 			{...props}
 			is={UserMenuButton}
 			placement='bottom-end'
 			selectionMode='multiple'
+			// selectedKeys={selectedKeys}
 			sections={sections}
 			title={t('User_menu')}
 			onAction={handleAction}
diff --git a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/UserMenuHeader.tsx b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/UserMenuHeader.tsx
index 9c506cf350f47..775375306c274 100644
--- a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/UserMenuHeader.tsx
+++ b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/UserMenuHeader.tsx
@@ -1,18 +1,11 @@
 import type { IUser } from '@rocket.chat/core-typings';
-import { Box, Margins } from '@rocket.chat/fuselage';
+import { Box } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
 import { useUserDisplayName } from '@rocket.chat/ui-client';
-import { useSetting } from '@rocket.chat/ui-contexts';
-import { useTranslation } from 'react-i18next';
-
-import MarkdownText from '../../../components/MarkdownText';
-import { UserStatus } from '../../../components/UserStatus';
 
 type UserMenuHeaderProps = { user: IUser };
 
 const UserMenuHeader = ({ user }: UserMenuHeaderProps) => {
-	const { t } = useTranslation();
-	const presenceDisabled = useSetting('Presence_broadcast_disabled', false);
 	const displayName = useUserDisplayName(user);
 
 	return (
@@ -20,22 +13,9 @@ const UserMenuHeader = ({ user }: UserMenuHeaderProps) => {
 			<Box mie={4}>
 				<UserAvatar size='x36' username={user?.username || ''} etag={user?.avatarETag} />
 			</Box>
-			<Box mis={4} display='flex' overflow='hidden' flexDirection='column' fontScale='p2' mb='neg-x4' flexGrow={1} flexShrink={1}>
-				<Box withTruncatedText w='full' display='flex' alignItems='center' flexDirection='row'>
-					<Margins inline={4}>
-						<UserStatus status={presenceDisabled ? 'disabled' : user.status} />
-						<Box is='span' withTruncatedText display='inline-block' fontWeight='700'>
-							{displayName}
-						</Box>
-					</Margins>
-				</Box>
-				<Box color='hint'>
-					<MarkdownText
-						withTruncatedText
-						parseEmoji={true}
-						content={user?.statusText || t(user?.status ?? 'offline')}
-						variant='inlineWithoutBreaks'
-					/>
+			<Box mis={4} display='flex' overflow='hidden' flexDirection='column' fontScale='p2' flexGrow={1} flexShrink={1}>
+				<Box withTruncatedText w='full' is='span' fontWeight='700'>
+					{displayName}
 				</Box>
 			</Box>
 		</Box>
diff --git a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useCustomStatusModalHandler.tsx b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useCustomStatusModalHandler.tsx
index 9ea77e131c59a..d839e2142225c 100644
--- a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useCustomStatusModalHandler.tsx
+++ b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useCustomStatusModalHandler.tsx
@@ -1,13 +1,12 @@
-import { useSetModal, useUser } from '@rocket.chat/ui-contexts';
+import { useSetModal } from '@rocket.chat/ui-contexts';
 
 import EditStatusModal from '../EditStatusModal';
 
 export const useCustomStatusModalHandler = () => {
-	const user = useUser();
 	const setModal = useSetModal();
 
 	return () => {
 		const handleModalClose = () => setModal(null);
-		setModal(<EditStatusModal userStatus={user?.status} userStatusText={user?.statusText} onClose={handleModalClose} />);
+		setModal(<EditStatusModal onClose={handleModalClose} />);
 	};
 };
diff --git a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx
index 58b75c7a9fd7c..a875e52cb5b4d 100644
--- a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx
+++ b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx
@@ -1,4 +1,5 @@
-import { Box } from '@rocket.chat/fuselage';
+import type { IUser } from '@rocket.chat/core-typings';
+import { Box, Icon } from '@rocket.chat/fuselage';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { clientCallbacks } from '@rocket.chat/ui-client';
 import { useEndpoint, useSetting } from '@rocket.chat/ui-contexts';
@@ -9,12 +10,13 @@ import { useTranslation } from 'react-i18next';
 import { useCustomStatusModalHandler } from './useCustomStatusModalHandler';
 import MarkdownText from '../../../../components/MarkdownText';
 import { UserStatus } from '../../../../components/UserStatus';
+import { useExpirationText } from '../../../../components/UserStatusText';
 import { useFireGlobalEvent } from '../../../../hooks/useFireGlobalEvent';
 import { userStatuses } from '../../../../lib/userStatuses';
 import type { UserStatusDescriptor } from '../../../../lib/userStatuses';
 import { useStatusDisabledModal } from '../../../../views/admin/customUserStatus/hooks/useStatusDisabledModal';
 
-export const useStatusItems = (): GenericMenuItemProps[] => {
+export const useStatusItems = (user?: IUser): GenericMenuItemProps[] => {
 	// We should lift this up to somewhere else if we want to use it in other places
 
 	userStatuses.invisibleAllowed = useSetting('Accounts_AllowInvisibleStatusOption', true);
@@ -42,6 +44,7 @@ export const useStatusItems = (): GenericMenuItemProps[] => {
 	});
 
 	const presenceDisabled = useSetting('Presence_broadcast_disabled', false);
+	const allowUserStatusMessageChange = useSetting('Accounts_AllowUserStatusMessageChange', true);
 
 	const { data: statuses } = useQuery({
 		queryKey: ['user-statuses'],
@@ -50,41 +53,63 @@ export const useStatusItems = (): GenericMenuItemProps[] => {
 			return Array.from(userStatuses);
 		},
 		staleTime: Infinity,
-		select: (statuses) =>
-			statuses.map((status): GenericMenuItemProps => {
-				const content = status.localizeName ? t(status.name) : status.name;
-				return {
-					id: status.id,
-					status: <UserStatus status={status.statusType} />,
-					content: <MarkdownText content={content} parseEmoji={true} variant='inline' />,
-					disabled: presenceDisabled,
-					onClick: () => setStatusMutation.mutate(status),
-				};
-			}),
 	});
 
 	const handleStatusDisabledModal = useStatusDisabledModal();
 	const handleCustomStatus = useCustomStatusModalHandler();
+	const customStatusExpiration = useExpirationText(user?.statusExpiresAt);
 
-	return [
-		...(presenceDisabled
-			? [
-					{
-						id: 'presence-disabled',
-						content: (
-							<Box fontScale='p2'>
-								<Box mbe={4} wordBreak='break-word' style={{ whiteSpace: 'normal' }}>
-									{t('User_status_disabled')}
-								</Box>
-								<Box is='a' color='info' onClick={handleStatusDisabledModal}>
-									{t('Learn_more')}
+	if (presenceDisabled || !allowUserStatusMessageChange) {
+		return [
+			{
+				id: 'presence-disabled',
+				content: (
+					<Box fontScale='p2'>
+						<Box mbe={4} wordBreak='break-word' style={{ whiteSpace: 'normal' }}>
+							{t('User_status_disabled')}
+						</Box>
+						<Box is='a' color='info' onClick={handleStatusDisabledModal}>
+							{t('Learn_more')}
+						</Box>
+					</Box>
+				),
+			},
+		];
+	}
+
+	const customStatusItem: GenericMenuItemProps = {
+		id: 'custom-status',
+		onClick: handleCustomStatus,
+		...(user?.statusText
+			? {
+					status: <UserStatus status={user.status} />,
+					content: (
+						<Box display='flex' flexDirection='column' rowGap={4}>
+							<MarkdownText content={user.statusText} parseEmoji variant='inline' />
+							{customStatusExpiration && (
+								<Box color='secondary-info' display='flex' alignItems='center'>
+									<Icon name='clock' size='x16' mie={4} />
+									{customStatusExpiration}
 								</Box>
-							</Box>
-						),
-					},
-				]
-			: []),
-		...(statuses ?? []),
-		{ id: 'custom-status', icon: 'emoji', content: t('Custom_Status'), onClick: handleCustomStatus, disabled: presenceDisabled },
-	];
+							)}
+						</Box>
+					),
+					addon: <Icon name='edit' size='x16' />,
+				}
+			: {
+					icon: 'edit',
+					content: t('Custom_Status'),
+				}),
+	};
+
+	const presenceItems = (statuses ?? []).map(
+		(status): GenericMenuItemProps => ({
+			id: status.id,
+			status: <UserStatus status={status.statusType} />,
+			content: <MarkdownText content={status.localizeName ? t(status.name) : status.name} parseEmoji variant='inline' />,
+			onClick: () => setStatusMutation.mutate(status),
+		}),
+	);
+
+	return [customStatusItem, ...presenceItems];
 };
diff --git a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
index c2e16f22cb1a1..fc995b45dd775 100644
--- a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
+++ b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
@@ -13,7 +13,7 @@ import { useUserDropdownAppsActionButtons } from '../../../../hooks/useUserDropd
 export const useUserMenu = (user: IUser) => {
 	const { t } = useTranslation();
 
-	const statusItems = useStatusItems();
+	const statusItems = useStatusItems(user);
 	const accountItems = useAccountItems();
 	const appBoxItems = useUserDropdownAppsActionButtons();
 	const handleKeyboardShortcuts = useKeyboardShortcutsModalHandler();
diff --git a/apps/meteor/client/sidebar/RoomList/RoomList.tsx b/apps/meteor/client/sidebar/RoomList/RoomList.tsx
index 2403621675507..6f69ab47603de 100644
--- a/apps/meteor/client/sidebar/RoomList/RoomList.tsx
+++ b/apps/meteor/client/sidebar/RoomList/RoomList.tsx
@@ -20,7 +20,8 @@ import { useTemplateByViewMode } from '../hooks/useTemplateByViewMode';
 
 const RoomList = () => {
 	const { t } = useTranslation();
-	const isAnonymous = !useUserId();
+	const userId = useUserId();
+	const isAnonymous = !userId;
 
 	const { collapsedGroups, handleClick, handleKeyDown } = useCollapsedGroups();
 	const { groupsCount, groupsList, roomList, groupedUnreadInfo } = useRoomList({ collapsedGroups });
@@ -40,8 +41,9 @@ const RoomList = () => {
 			openedRoom,
 			sidebarViewMode,
 			isAnonymous,
+			userId,
 		}),
-		[avatarTemplate, extended, isAnonymous, openedRoom, sideBarItemTemplate, sidebarViewMode, t],
+		[avatarTemplate, extended, isAnonymous, openedRoom, sideBarItemTemplate, sidebarViewMode, t, userId],
 	);
 
 	usePreventDefault(ref);
diff --git a/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx b/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx
index 832699a092ecc..850ed177e15fa 100644
--- a/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx
+++ b/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx
@@ -16,12 +16,13 @@ type RoomListRowProps = {
 		openedRoom: string;
 		sidebarViewMode: 'extended' | 'condensed' | 'medium';
 		isAnonymous: boolean;
+		userId?: string;
 	};
 	item: SubscriptionWithRoom;
 };
 
 const RoomListRow = ({ data, item }: RoomListRowProps) => {
-	const { extended, t, SidebarItemTemplate, AvatarTemplate, openedRoom, sidebarViewMode } = data;
+	const { extended, t, SidebarItemTemplate, AvatarTemplate, openedRoom, sidebarViewMode, userId } = data;
 
 	const acceptCall = useVideoConfAcceptCall();
 	const rejectCall = useVideoConfRejectIncomingCall();
@@ -47,6 +48,7 @@ const RoomListRow = ({ data, item }: RoomListRowProps) => {
 			SidebarItemTemplate={SidebarItemTemplate}
 			AvatarTemplate={AvatarTemplate}
 			videoConfActions={videoConfActions}
+			userId={userId}
 		/>
 	);
 };
diff --git a/apps/meteor/client/sidebar/RoomList/SidebarItemTemplateWithData.tsx b/apps/meteor/client/sidebar/RoomList/SidebarItemTemplateWithData.tsx
index d297e8c6a9416..485ba22a53309 100644
--- a/apps/meteor/client/sidebar/RoomList/SidebarItemTemplateWithData.tsx
+++ b/apps/meteor/client/sidebar/RoomList/SidebarItemTemplateWithData.tsx
@@ -1,12 +1,13 @@
 import { isOmnichannelRoom } from '@rocket.chat/core-typings';
 import { SidebarV2Action, SidebarV2Actions, SidebarV2ItemIcon } from '@rocket.chat/fuselage';
 import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
-import { useLayout } from '@rocket.chat/ui-contexts';
+import { useLayout, useUserPresence } from '@rocket.chat/ui-contexts';
 import type { TFunction } from 'i18next';
 import type { AllHTMLAttributes, ComponentType, ReactElement, ReactNode } from 'react';
 import { memo, useMemo } from 'react';
 
 import { RoomIcon } from '../../components/RoomIcon';
+import { useStatusTooltip } from '../../components/UserStatusText';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { isIOsDevice } from '../../lib/utils/isIOsDevice';
 import { getMessagePreview } from '../../lib/utils/normalizeMessagePreview/getMessagePreview';
@@ -42,6 +43,7 @@ type RoomListRowProps = {
 	openedRoom?: string;
 	// sidebarViewMode: 'extended';
 	isAnonymous?: boolean;
+	userId?: string;
 
 	room: SubscriptionWithRoom;
 	id?: string;
@@ -67,8 +69,13 @@ const SidebarItemTemplateWithData = ({
 	t,
 	isAnonymous,
 	videoConfActions,
+	userId,
 }: RoomListRowProps) => {
 	const { sidebar } = useLayout();
+	const dmUserId =
+		room.t === 'd' && userId ? (room.uids?.find((uid) => uid !== userId) ?? (room.uids?.length === 1 ? userId : undefined)) : undefined;
+	const dmPresence = useUserPresence(dmUserId);
+	const { handleMouseEnter, handleMouseLeave } = useStatusTooltip(dmPresence?.statusText, dmPresence?.statusExpiresAt, dmPresence?.status);
 
 	const href = roomCoordinator.getRouteLink(room.t, room) || '';
 	const title = roomCoordinator.getRoomName(room.t, room) || '';
@@ -115,6 +122,8 @@ const SidebarItemTemplateWithData = ({
 			}}
 			aria-label={showUnread ? t('__unreadTitle__from__roomTitle__', { unreadTitle, roomTitle: title }) : title}
 			title={title}
+			onMouseEnter={handleMouseEnter}
+			onMouseLeave={handleMouseLeave}
 			time={lastMessage?.ts}
 			subtitle={subtitle}
 			icon={icon}
@@ -160,9 +169,9 @@ const keys: (keyof RoomListRowProps)[] = [
 	't',
 	'sidebarViewMode',
 	'videoConfActions',
+	'userId',
 ];
 
-// eslint-disable-next-line react/no-multi-comp
 export default memo(SidebarItemTemplateWithData, (prevProps, nextProps) => {
 	if (keys.some((key) => prevProps[key] !== nextProps[key])) {
 		return false;
diff --git a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
index 032bd545ec563..3b9cf75876fc5 100644
--- a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
+++ b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
@@ -1,7 +1,7 @@
 import { VisuallyHidden } from '@react-aria/visually-hidden';
-import type { IUser } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
-import { Box, Button, Icon } from '@rocket.chat/fuselage';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Box, Button, Divider, Icon, InputBox, Margins, Select } from '@rocket.chat/fuselage';
 import { Field, FieldGroup, FieldLabel, FieldRow, FieldError, FieldHint, TextInput, TextAreaInput } from '@rocket.chat/fuselage-forms';
 import { validateEmail } from '@rocket.chat/tools';
 import { CustomFieldsForm } from '@rocket.chat/ui-client';
@@ -14,8 +14,8 @@ import {
 	useLayout,
 } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
-import type { AllHTMLAttributes, ReactElement } from 'react';
-import { useCallback } from 'react';
+import type { AllHTMLAttributes, ChangeEvent, ReactElement } from 'react';
+import { useCallback, useMemo } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 
 import type { AccountProfileFormValues } from './getProfileInitialValues';
@@ -25,6 +25,7 @@ import UserStatusMenu from '../../../components/UserStatusMenu';
 import UserAvatarEditor from '../../../components/avatar/UserAvatarEditor';
 import { useUpdateAvatar } from '../../../hooks/useUpdateAvatar';
 import { USER_STATUS_TEXT_MAX_LENGTH, BIO_TEXT_MAX_LENGTH } from '../../../lib/constants';
+import { STATUS_DURATION_OPTIONS } from '../../../lib/statusDurations';
 
 const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactElement => {
 	const t = useTranslation();
@@ -52,10 +53,18 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactEle
 		watch,
 		handleSubmit,
 		reset,
-		formState: { errors },
+		setError,
+		clearErrors,
+		formState: { errors, dirtyFields },
 	} = useFormContext<AccountProfileFormValues>();
 
 	const { email, avatar, username, name: userFullName } = watch();
+	const statusDuration = watch('statusDuration');
+
+	const statusDurationOptions: SelectOption[] = useMemo(
+		() => STATUS_DURATION_OPTIONS.map(({ value, labelKey }) => [value, t(labelKey)]),
+		[t],
+	);
 
 	const previousEmail = user ? getUserEmailAddress(user) : '';
 	const previousUsername = user?.username || '';
@@ -95,18 +104,63 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactEle
 	};
 
 	const updateOwnBasicInfo = useEndpoint('POST', '/v1/users.updateOwnBasicInfo');
+	const setUserStatus = useEndpoint('POST', '/v1/users.setStatus');
 
 	const updateAvatar = useUpdateAvatar(avatar, user?._id || '');
 
-	const handleSave = async ({ email, name, username, statusType, statusText, nickname, bio, customFields }: AccountProfileFormValues) => {
+	const handleSave = async (values: AccountProfileFormValues) => {
+		const {
+			email,
+			name,
+			username,
+			statusType,
+			statusText,
+			statusDuration,
+			statusCustomDate,
+			statusCustomTime,
+			nickname,
+			bio,
+			customFields,
+		} = values;
+
+		const expiresAt = STATUS_DURATION_OPTIONS.find((o) => o.value === statusDuration)?.getExpiresAt?.({
+			now: new Date(),
+			customDate: statusCustomDate,
+			customTime: statusCustomTime,
+		});
+		if (allowUserStatusMessageChange && statusDuration === 'custom') {
+			if (!expiresAt) {
+				setError('statusDuration', { message: t('Status_choose_date_and_time') });
+				return;
+			}
+			if (expiresAt <= new Date()) {
+				setError('statusDuration', { message: t('Status_expiration_must_be_future') });
+				return;
+			}
+		}
+		clearErrors('statusDuration');
+
+		const statusDirty =
+			dirtyFields.statusText ||
+			dirtyFields.statusType ||
+			dirtyFields.statusDuration ||
+			dirtyFields.statusCustomDate ||
+			dirtyFields.statusCustomTime;
+
 		try {
+			if (allowUserStatusMessageChange && statusDirty) {
+				await setUserStatus({
+					message: statusText,
+					status: statusType,
+					...(expiresAt && { expiresAt: expiresAt.toISOString() }),
+				});
+			}
+
 			await updateOwnBasicInfo({
 				data: {
 					name,
 					...(user ? getUserEmailAddress(user) !== email && { email } : {}),
 					username,
-					statusText,
-					statusType,
 					nickname,
 					bio,
 				},
@@ -115,10 +169,9 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactEle
 
 			await updateAvatar();
 			dispatchToastMessage({ type: 'success', message: t('Profile_saved_successfully') });
+			reset(values);
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
-		} finally {
-			reset({ email, name, username, statusType, statusText, nickname, bio, customFields });
 		}
 	};
 
@@ -185,8 +238,9 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactEle
 						{!canChangeUsername && <FieldHint>{t('Username_Change_Disabled')}</FieldHint>}
 					</Field>
 				</Box>
+				<Divider mbs={24} mbe={0} width='full' borderBlockStartColor='stroke-medium' />
 				<Field>
-					<FieldLabel>{t('StatusMessage')}</FieldLabel>
+					<FieldLabel>{t('Status')}</FieldLabel>
 					<FieldRow>
 						<Controller
 							control={control}
@@ -209,7 +263,7 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactEle
 											control={control}
 											name='statusType'
 											render={({ field: { value, onChange } }) => (
-												<UserStatusMenu margin='neg-x2' onChange={onChange} initialStatus={value as IUser['status']} />
+												<UserStatusMenu margin='neg-x2' onChange={onChange} initialStatus={value} />
 											)}
 										/>
 									}
@@ -219,7 +273,70 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactEle
 					</FieldRow>
 					{errors.statusText && <FieldError>{errors.statusText.message}</FieldError>}
 					{!allowUserStatusMessageChange && <FieldHint>{t('StatusMessage_Change_Disabled')}</FieldHint>}
+					{allowUserStatusMessageChange && <FieldHint>{t('Status_you_can_use_emoji')}</FieldHint>}
+				</Field>
+				<Field>
+					<FieldLabel>{t('Status_clear_after')}</FieldLabel>
+					<FieldRow>
+						<Controller
+							control={control}
+							name='statusDuration'
+							render={({ field: { value, onChange } }) => (
+								<Select
+									value={value}
+									options={statusDurationOptions}
+									disabled={!allowUserStatusMessageChange}
+									onChange={(next) => {
+										onChange(String(next));
+										clearErrors('statusDuration');
+									}}
+								/>
+							)}
+						/>
+					</FieldRow>
+					{statusDuration === 'custom' && (
+						<Box display='flex' mi='neg-x4' mbs={8}>
+							<Margins inline={4}>
+								<Controller
+									control={control}
+									name='statusCustomDate'
+									render={({ field: { value, onChange } }) => (
+										<InputBox
+											aria-label={t('Status_expiration_date')}
+											type='date'
+											flexGrow={1}
+											value={value}
+											onChange={(e: ChangeEvent<HTMLInputElement>) => {
+												onChange(e.currentTarget.value);
+												clearErrors('statusDuration');
+											}}
+											min={new Date().toLocaleDateString('en-CA')}
+										/>
+									)}
+								/>
+								<Controller
+									control={control}
+									name='statusCustomTime'
+									render={({ field: { value, onChange } }) => (
+										<InputBox
+											aria-label={t('Status_expiration_time')}
+											type='time'
+											flexGrow={1}
+											value={value}
+											onChange={(e: ChangeEvent<HTMLInputElement>) => {
+												onChange(e.currentTarget.value);
+												clearErrors('statusDuration');
+											}}
+										/>
+									)}
+								/>
+							</Margins>
+						</Box>
+					)}
+					{errors.statusDuration && <FieldError>{errors.statusDuration.message}</FieldError>}
+					<FieldHint>{t('Status_new_status_warning')}</FieldHint>
 				</Field>
+				<Divider mbs={24} mbe={0} width='full' borderBlockStartColor='stroke-medium' />
 				<Field>
 					<FieldLabel>{t('Nickname')}</FieldLabel>
 					<FieldRow>
diff --git a/apps/meteor/client/views/account/profile/getProfileInitialValues.ts b/apps/meteor/client/views/account/profile/getProfileInitialValues.ts
index a15e8477d48db..cb9093d45648a 100644
--- a/apps/meteor/client/views/account/profile/getProfileInitialValues.ts
+++ b/apps/meteor/client/views/account/profile/getProfileInitialValues.ts
@@ -9,21 +9,31 @@ export type AccountProfileFormValues = {
 	avatar: AvatarObject;
 	url: string;
 	statusText: string;
-	statusType: string;
+	statusType: IUser['status'];
+	statusDuration: string;
+	statusCustomDate: string;
+	statusCustomTime: string;
 	bio: string;
 	customFields: Record<string, string>;
 	nickname: string;
 };
 
-export const getProfileInitialValues = (user: IUser | null): AccountProfileFormValues => ({
-	email: user ? getUserEmailAddress(user) || '' : '',
-	name: user?.name ?? '',
-	username: user?.username ?? '',
-	avatar: '' as AvatarObject,
-	url: '',
-	statusText: user?.statusText ?? '',
-	statusType: user?.status ?? '',
-	bio: user?.bio ?? '',
-	customFields: user?.customFields ?? {},
-	nickname: user?.nickname ?? '',
-});
+export const getProfileInitialValues = (user: IUser | null): AccountProfileFormValues => {
+	const expiration = user?.statusExpiresAt && new Date(user.statusExpiresAt) > new Date() ? new Date(user.statusExpiresAt) : null;
+	const date = expiration ?? new Date();
+	return {
+		email: user ? getUserEmailAddress(user) || '' : '',
+		name: user?.name ?? '',
+		username: user?.username ?? '',
+		avatar: '' as AvatarObject,
+		url: '',
+		statusText: user?.statusText ?? '',
+		statusType: user?.status,
+		statusDuration: expiration ? 'custom' : '',
+		statusCustomDate: date.toLocaleDateString('en-CA'),
+		statusCustomTime: date.toTimeString().slice(0, 5),
+		bio: user?.bio ?? '',
+		customFields: user?.customFields ?? {},
+		nickname: user?.nickname ?? '',
+	};
+};
diff --git a/apps/meteor/client/views/room/Header/RoomTopic.tsx b/apps/meteor/client/views/room/Header/RoomTopic.tsx
index abe34ab0f3252..6251335e7df18 100644
--- a/apps/meteor/client/views/room/Header/RoomTopic.tsx
+++ b/apps/meteor/client/views/room/Header/RoomTopic.tsx
@@ -1,9 +1,11 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { isDirectMessageRoom, isPrivateRoom, isPublicRoom, isTeamRoom } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
-import { useUserId, useTranslation, useRouter, useUserPresence } from '@rocket.chat/ui-contexts';
+import { useUserId, useRouter, useUserPresence } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 import MarkdownText from '../../../components/MarkdownText';
+import { UserStatusText } from '../../../components/UserStatusText';
 import { useCanEditRoom } from '../contextualBar/Info/hooks/useCanEditRoom';
 
 type RoomTopicProps = {
@@ -11,17 +13,18 @@ type RoomTopicProps = {
 };
 
 const RoomTopic = ({ room }: RoomTopicProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const canEdit = useCanEditRoom(room);
 	const userId = useUserId();
-	const directUserId = room.uids?.filter((uid) => uid !== userId).shift();
+	const directUserId = room.uids?.filter((uid) => uid !== userId).shift() ?? (room.uids?.length === 1 ? userId : undefined);
 	const directUserData = useUserPresence(directUserId);
 	const router = useRouter();
 
 	const currentRoute = router.getLocationPathname();
 	const href = isTeamRoom(room) ? `${currentRoute}/team-info` : `${currentRoute}/channel-settings`;
 
-	const topic = isDirectMessageRoom(room) && (room.uids?.length ?? 0) < 3 ? directUserData?.statusText : room.topic;
+	const isDirect = isDirectMessageRoom(room) && (room.uids?.length ?? 0) < 3;
+	const topic = isDirect ? directUserData?.statusText : room.topic;
 	const canEditTopic = canEdit && (isPublicRoom(room) || isPrivateRoom(room));
 
 	if (!topic && !canEditTopic) {
@@ -36,6 +39,10 @@ const RoomTopic = ({ room }: RoomTopicProps) => {
 		);
 	}
 
+	if (isDirect) {
+		return <UserStatusText statusText={topic} statusExpiresAt={directUserData?.statusExpiresAt} showExpiration={false} />;
+	}
+
 	return <MarkdownText color='default' parseEmoji={true} variant='inlineWithoutBreaks' withTruncatedText content={topic} />;
 };
 
diff --git a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
index d1b0041eeec95..6ce8829925567 100644
--- a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
+++ b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
@@ -10,6 +10,7 @@ import { useTranslation } from 'react-i18next';
 import LocalTime from '../../../components/LocalTime';
 import { UserCard, UserCardAction, UserCardRole, UserCardSkeleton } from '../../../components/UserCard';
 import { ReactiveUserStatus } from '../../../components/UserStatus';
+import { UserStatusText } from '../../../components/UserStatusText';
 import { useUserInfoQuery } from '../../../hooks/useUserInfoQuery';
 import { useMemberExists } from '../../hooks/useMemberExists';
 import { useUserInfoActions } from '../hooks/useUserInfoActions';
@@ -45,7 +46,8 @@ const UserCardWithData = ({ username, rid, onOpenUserInfo, onClose }: UserCardWi
 			_id,
 			name,
 			roles = defaultValue,
-			statusText = defaultValue,
+			statusText,
+			statusExpiresAt,
 			bio = defaultValue,
 			utcOffset = defaultValue,
 			nickname,
@@ -62,7 +64,7 @@ const UserCardWithData = ({ username, rid, onOpenUserInfo, onClose }: UserCardWi
 			etag: avatarETag,
 			localTime: utcOffset && Number.isInteger(utcOffset) && <LocalTime utcOffset={utcOffset} />,
 			status: _id && <ReactiveUserStatus uid={_id} />,
-			customStatus: statusText,
+			customStatus: statusText && <UserStatusText statusText={statusText} statusExpiresAt={statusExpiresAt} showExpiration />,
 			nickname,
 			freeSwitchExtension,
 		};
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx
index ef1448d50ff64..4a8b0f206ed77 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx
@@ -12,6 +12,7 @@ import {
 } from '@rocket.chat/fuselage';
 import { usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useUserPresence } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MouseEvent } from 'react';
 import { useState } from 'react';
 
@@ -19,6 +20,7 @@ import UserActions from './RoomMembersActions';
 import { getUserDisplayNames } from '../../../../../lib/getUserDisplayNames';
 import InvitationBadge from '../../../../components/InvitationBadge';
 import { ReactiveUserStatus } from '../../../../components/UserStatus';
+import { useStatusTooltip } from '../../../../components/UserStatusText';
 import { usePreventPropagation } from '../../../../hooks/usePreventPropagation';
 import type { RoomMember } from '../../../hooks/useMembersList';
 
@@ -41,24 +43,37 @@ const RoomMembersItem = ({
 	reload,
 	useRealName,
 }: RoomMembersItemProps): ReactElement => {
-	const [showButton, setShowButton] = useState();
+	const [showButton, setShowButton] = useState(false);
 	const isReduceMotionEnabled = usePrefersReducedMotion();
 	const isInvited = subscription?.status === 'INVITED';
 	const invitationDate = isInvited ? subscription?.ts : undefined;
-	const handleMenuEvent = {
-		[isReduceMotionEnabled ? 'onMouseEnter' : 'onTransitionEnd']: setShowButton,
-	};
-
 	const preventPropagation = usePreventPropagation();
-
 	const [nameOrUsername, displayUsername] = getUserDisplayNames(name, username, useRealName);
 
+	const presenceData = useUserPresence(_id);
+	const { handleMouseEnter, handleMouseLeave } = useStatusTooltip(
+		presenceData?.statusText,
+		presenceData?.statusExpiresAt,
+		presenceData?.status,
+	);
+
+	const handleMenuEvent = isReduceMotionEnabled
+		? {
+				onMouseEnter: (e: MouseEvent<HTMLElement>) => {
+					handleMouseEnter(e);
+					setShowButton(true);
+				},
+			}
+		: { onTransitionEnd: () => setShowButton(true) };
+
 	return (
 		<Option
 			data-username={username}
 			data-userid={_id}
 			data-invitationdate={invitationDate}
 			onClick={onClickView}
+			onMouseEnter={handleMouseEnter}
+			onMouseLeave={handleMouseLeave}
 			style={{ paddingInline: 24 }}
 			{...handleMenuEvent}
 		>
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
index cc0f5bb01bd09..127031711b419 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
@@ -58,6 +58,7 @@ const UserInfoWithData = ({ uid, username, rid, invitationDate, onClose, onClick
 			username,
 			roles = [],
 			statusText,
+			statusExpiresAt,
 			bio,
 			utcOffset,
 			lastLogin,
@@ -88,6 +89,7 @@ const UserInfoWithData = ({ uid, username, rid, invitationDate, onClose, onClick
 			createdAt,
 			status: <ReactiveUserStatus uid={_id} />,
 			statusText,
+			statusExpiresAt,
 			nickname,
 			freeSwitchExtension,
 		};
diff --git a/apps/meteor/tests/e2e/page-objects/account-profile.ts b/apps/meteor/tests/e2e/page-objects/account-profile.ts
index 0c1b9924ba45e..6d88821e48140 100644
--- a/apps/meteor/tests/e2e/page-objects/account-profile.ts
+++ b/apps/meteor/tests/e2e/page-objects/account-profile.ts
@@ -44,6 +44,19 @@ export class AccountProfile extends Account {
 		return this.page.locator('//label[contains(text(), "Email")]/..//input');
 	}
 
+	get inputStatusText(): Locator {
+		return this.page.getByRole('textbox', { name: 'Status' });
+	}
+
+	get selectClearStatusAfter(): Locator {
+		return this.page.locator('//label[contains(text(), "Clear status after")]/..//button');
+	}
+
+	async chooseClearStatusAfter(option: string): Promise<void> {
+		await this.selectClearStatusAfter.click();
+		await this.page.getByRole('option', { name: new RegExp(option) }).click();
+	}
+
 	get preferencesSoundAccordionOption(): Locator {
 		return this.page.locator('h2:has-text("Sound")');
 	}
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/modals/edit-status-modal.ts b/apps/meteor/tests/e2e/page-objects/fragments/modals/edit-status-modal.ts
index a2db20bc1020e..ce79b6a1af77a 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/modals/edit-status-modal.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/modals/edit-status-modal.ts
@@ -7,12 +7,50 @@ export class EditStatusModal extends Modal {
 	readonly toastMessages: ToastMessages;
 
 	constructor(page: Page) {
-		super(page.getByRole('dialog', { name: 'Edit Status' }));
+		super(page.getByRole('dialog', { name: 'Set your status' }), page);
 		this.toastMessages = new ToastMessages(page);
 	}
 
 	private get statusMessageInput() {
-		return this.root.getByRole('textbox', { name: 'Status message' });
+		return this.root.getByRole('textbox', { name: 'Status' });
+	}
+
+	private get statusTypeButton() {
+		return this.root.getByRole('button', { name: 'User status menu' });
+	}
+
+	private get durationSelect() {
+		return this.root.locator('[id$="-clear-after"]');
+	}
+
+	get customDateInput() {
+		return this.root.getByLabel('Expiration date');
+	}
+
+	get customTimeInput() {
+		return this.root.getByLabel('Expiration time');
+	}
+
+	get btnSubmit() {
+		return this.root.getByRole('button', { name: 'Save' });
+	}
+
+	get durationError() {
+		return this.root.getByText('Expiration must be in the future');
+	}
+
+	get durationMissingError() {
+		return this.root.locator('.rcx-field__error', { hasText: 'Choose date and time' });
+	}
+
+	async selectStatusType(status: string): Promise<void> {
+		await this.statusTypeButton.click();
+		await this.page!.getByRole('option', { name: status }).click();
+	}
+
+	async selectDuration(duration: string): Promise<void> {
+		await this.durationSelect.click();
+		await this.page!.getByRole('option', { name: new RegExp(duration) }).click();
 	}
 
 	async changeStatusMessage(statusMessage?: string): Promise<void> {
@@ -22,4 +60,34 @@ export class EditStatusModal extends Modal {
 		await this.save();
 		await this.toastMessages.dismissToast();
 	}
+
+	async setStatusWithExpiration({
+		message,
+		statusType,
+		duration,
+		customDate,
+		customTime,
+	}: {
+		message?: string;
+		statusType?: string;
+		duration: string;
+		customDate?: string;
+		customTime?: string;
+	}): Promise<void> {
+		if (statusType) {
+			await this.selectStatusType(statusType);
+		}
+		if (message !== undefined) {
+			await this.statusMessageInput.fill(message);
+		}
+		await this.selectDuration(duration);
+		if (customDate) {
+			await this.customDateInput.fill(customDate);
+		}
+		if (customTime) {
+			await this.customTimeInput.fill(customTime);
+		}
+		await this.save();
+		await this.toastMessages.dismissToast();
+	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/navbar.ts b/apps/meteor/tests/e2e/page-objects/fragments/navbar.ts
index 5a6a653645298..ef7b0f6db86bd 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/navbar.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/navbar.ts
@@ -239,11 +239,30 @@ export class Navbar {
 	}
 
 	async changeUserCustomStatus(text?: string): Promise<void> {
-		await this.btnUserMenu.click();
-		await this.getUserProfileMenuOption('Custom Status').click();
+		await this.openEditStatusModal();
 		await this.modals.editStatus.changeStatusMessage(text);
 	}
 
+	get editStatusModal(): EditStatusModal {
+		return this.modals.editStatus;
+	}
+
+	async openEditStatusModal(): Promise<void> {
+		await this.btnUserMenu.click();
+		await this.userMenu.getByRole('menuitemcheckbox').first().click();
+	}
+
+	async changeUserCustomStatusWithExpiration(options: {
+		message?: string;
+		statusType?: string;
+		duration: string;
+		customDate?: string;
+		customTime?: string;
+	}): Promise<void> {
+		await this.openEditStatusModal();
+		await this.modals.editStatus.setStatusWithExpiration(options);
+	}
+
 	async switchOmnichannelStatus(status: 'offline' | 'online') {
 		// button has a id of "omnichannel-status-toggle"
 		const toggleButton = this.btnSwitchOmnichannelStatus;
diff --git a/apps/meteor/tests/e2e/presence.spec.ts b/apps/meteor/tests/e2e/presence.spec.ts
index 68a05c0721704..ab8447d3c83c5 100644
--- a/apps/meteor/tests/e2e/presence.spec.ts
+++ b/apps/meteor/tests/e2e/presence.spec.ts
@@ -2,16 +2,18 @@ import { faker } from '@faker-js/faker';
 
 import { DEFAULT_USER_CREDENTIALS } from './config/constants';
 import { Users } from './fixtures/userStates';
-import { HomeChannel, Login } from './page-objects';
+import { AccountProfile, HomeChannel, Login } from './page-objects';
 import { test, expect } from './utils/test';
 
 test.describe.serial('Presence', () => {
 	let poLogin: Login;
 	let poHomeChannel: HomeChannel;
+	let poAccountProfile: AccountProfile;
 
 	test.beforeEach(async ({ page }) => {
 		poLogin = new Login(page);
 		poHomeChannel = new HomeChannel(page);
+		poAccountProfile = new AccountProfile(page);
 
 		await page.goto('/home');
 	});
@@ -73,5 +75,164 @@ test.describe.serial('Presence', () => {
 				expect(await page.evaluate(() => localStorage.getItem('fuselage-localStorage-Local_Custom_Status'))).not.toBe('undefined');
 			});
 		});
+
+		test('should replace Custom Status button with active status row when a custom status is set', async ({ page }) => {
+			const text = faker.string.alpha(8);
+
+			await test.step('Custom Status entry visible while no status is set', async () => {
+				await poHomeChannel.navbar.btnUserMenu.click();
+				await expect(poHomeChannel.navbar.userMenu.getByRole('menuitemcheckbox', { name: 'Custom Status' })).toBeVisible();
+				await page.keyboard.press('Escape');
+			});
+
+			await test.step('after setting a status, Custom Status entry is replaced by the active row', async () => {
+				await poHomeChannel.navbar.changeUserCustomStatus(text);
+				await poHomeChannel.navbar.btnUserMenu.click();
+				await expect(poHomeChannel.navbar.userMenu.getByRole('menuitemcheckbox', { name: 'Custom Status' })).not.toBeVisible();
+				await expect(poHomeChannel.navbar.userMenu).toContainText(text);
+				await page.keyboard.press('Escape');
+			});
+
+			await test.step('cleanup', async () => {
+				await poHomeChannel.navbar.changeUserCustomStatus('');
+			});
+		});
+	});
+
+	test.describe('Status expiration', () => {
+		test.use({ storageState: Users.admin.state });
+
+		test('should toggle custom date/time inputs when selecting duration', async () => {
+			await poHomeChannel.navbar.openEditStatusModal();
+
+			const { editStatusModal } = poHomeChannel.navbar;
+
+			await editStatusModal.selectDuration('Choose date and time');
+			await expect(editStatusModal.customDateInput).toBeVisible();
+			await expect(editStatusModal.customTimeInput).toBeVisible();
+
+			await editStatusModal.selectDuration("Don't clear");
+			await expect(editStatusModal.customDateInput).not.toBeVisible();
+			await expect(editStatusModal.customTimeInput).not.toBeVisible();
+
+			await editStatusModal.close();
+		});
+
+		test('should reject custom expiration in the past', async () => {
+			await poHomeChannel.navbar.openEditStatusModal();
+
+			const { editStatusModal } = poHomeChannel.navbar;
+
+			await editStatusModal.selectDuration('Choose date and time');
+
+			const now = new Date();
+			const pastTime = new Date(now.getTime() - 60 * 60_000);
+			const dateStr = pastTime.toLocaleDateString('en-CA');
+			const timeStr = pastTime.toTimeString().slice(0, 5);
+
+			await editStatusModal.customDateInput.fill(dateStr);
+			await editStatusModal.customTimeInput.fill(timeStr);
+			await editStatusModal.btnSubmit.click();
+
+			await expect(editStatusModal.durationError).toBeVisible();
+			await editStatusModal.close();
+		});
+
+		test('should reject custom expiration when date/time is missing', async () => {
+			await poHomeChannel.navbar.openEditStatusModal();
+
+			const { editStatusModal } = poHomeChannel.navbar;
+
+			await editStatusModal.selectDuration('Choose date and time');
+			await editStatusModal.customDateInput.fill('');
+			await editStatusModal.btnSubmit.click();
+
+			await expect(editStatusModal.durationMissingError).toBeVisible();
+			await editStatusModal.close();
+		});
+
+		test('should set status with custom date/time expiration', async ({ page }) => {
+			const tomorrow = new Date();
+			tomorrow.setDate(tomorrow.getDate() + 1);
+			const dateStr = tomorrow.toLocaleDateString('en-CA');
+			const timeStr = '12:00';
+
+			await test.step('set status with custom expiration', async () => {
+				await poHomeChannel.navbar.changeUserCustomStatusWithExpiration({
+					message: 'custom deadline',
+					duration: 'Choose date and time',
+					customDate: dateStr,
+					customTime: timeStr,
+				});
+			});
+
+			await test.step('verify expiration is displayed in user menu', async () => {
+				await poHomeChannel.navbar.btnUserMenu.click();
+				await expect(poHomeChannel.navbar.userMenu).toContainText('custom deadline');
+				await expect(poHomeChannel.navbar.userMenu).toContainText('Until');
+				await page.keyboard.press('Escape');
+			});
+
+			await test.step('clear status', async () => {
+				await poHomeChannel.navbar.changeUserCustomStatus('');
+			});
+		});
+
+		test('should set status with expiration, show it, and clear it', async ({ page }) => {
+			await test.step('set busy status with 30-minute expiration', async () => {
+				await poHomeChannel.navbar.changeUserCustomStatusWithExpiration({
+					message: 'focus time',
+					statusType: 'Busy',
+					duration: '30 minutes',
+				});
+			});
+
+			await test.step('verify expiration is displayed in user menu', async () => {
+				await poHomeChannel.navbar.btnUserMenu.click();
+				await expect(poHomeChannel.navbar.userMenu).toContainText('focus time');
+				await expect(poHomeChannel.navbar.userMenu).toContainText('Until');
+				await page.keyboard.press('Escape');
+			});
+
+			await test.step('clear status and verify expiration is removed', async () => {
+				await poHomeChannel.navbar.changeUserCustomStatus('');
+
+				await poHomeChannel.navbar.btnUserMenu.click();
+				await expect(poHomeChannel.navbar.userMenu).not.toContainText('Until');
+				await expect(poHomeChannel.navbar.userMenu).not.toContainText('focus time');
+			});
+		});
+	});
+
+	test.describe('Status set from account profile', () => {
+		test.use({ storageState: Users.admin.state });
+
+		test('should save status with expiration from the profile form and surface it in the user menu', async ({ page }) => {
+			const text = faker.string.alpha(10);
+
+			await test.step('fill Status field + Clear-after on /account/profile and save', async () => {
+				await page.goto('/account/profile');
+				await poAccountProfile.inputStatusText.fill(text);
+				await poAccountProfile.chooseClearStatusAfter('30 minutes');
+				await Promise.all([
+					page.waitForResponse((r) => r.url().endsWith('/v1/users.setStatus') && r.ok()),
+					page.waitForResponse((r) => r.url().endsWith('/v1/users.updateOwnBasicInfo') && r.ok()),
+					poAccountProfile.btnSaveChanges.click(),
+				]);
+				await expect(page.getByText('Profile saved successfully')).toBeVisible();
+			});
+
+			await test.step('status with expiration appears in user menu', async () => {
+				await page.goto('/home');
+				await poHomeChannel.navbar.btnUserMenu.click();
+				await expect(poHomeChannel.navbar.userMenu).toContainText(text);
+				await expect(poHomeChannel.navbar.userMenu).toContainText('Until');
+				await page.keyboard.press('Escape');
+			});
+
+			await test.step('cleanup', async () => {
+				await poHomeChannel.navbar.changeUserCustomStatus('');
+			});
+		});
 	});
 });
diff --git a/packages/core-typings/src/IUser.ts b/packages/core-typings/src/IUser.ts
index 1ef0312f27061..6c5d9abbe0a87 100644
--- a/packages/core-typings/src/IUser.ts
+++ b/packages/core-typings/src/IUser.ts
@@ -296,7 +296,10 @@ export type IUserInRole = Pick<
 >;
 
 export type UserPresence = Readonly<
-	Partial<Pick<IUser, 'name' | 'status' | 'utcOffset' | 'statusText' | 'avatarETag' | 'roles' | 'username'>> & Required<Pick<IUser, '_id'>>
+	Partial<
+		Pick<IUser, 'name' | 'status' | 'utcOffset' | 'statusText' | 'statusSource' | 'statusExpiresAt' | 'avatarETag' | 'roles' | 'username'>
+	> &
+		Required<Pick<IUser, '_id'>>
 >;
 
 export type AvatarUrlObj = {
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 05f127fbffb63..accb3a73ab07d 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -5154,7 +5154,13 @@
   "Status_1_hour": "1 hour",
   "Status_4_hours": "4 hours",
   "Status_choose_date_and_time": "Choose date and time",
+  "Status_expiration_date": "Expiration date",
+  "Status_expiration_time": "Expiration time",
+  "Status_expiration_must_be_future": "Expiration must be in the future",
   "Status_calendar_events_wont_override": "Calendar events won't override this",
+  "Status_current": "Current status",
+  "Status_you_can_use_emoji": "You can use emoji",
+  "Status_new_status_warning": "New status can be changed by: calendar integrations, voice calls or videoconferencing.",
   "Step": "Step",
   "Stop_Recording": "Stop Recording",
   "Stop_call": "Stop call",
@@ -5584,6 +5590,7 @@
   "Update_EnableChecker": "Enable the Update Checker",
   "Update_EnableChecker_Description": "Checks automatically for new updates / important messages from the Rocket.Chat developers and receives notifications when available. The notification appears once per new version as a clickable banner and as a message from the Rocket.Cat bot, both visible only for administrators.",
   "Update_LatestAvailableVersion": "Update Latest Available Version",
+  "Until": "Until",
   "Update_anyway": "Update anyway",
   "Update_every": "Update every",
   "Update_to_access_marketplace": "Update to access marketplace",
diff --git a/packages/rest-typings/src/v1/users.ts b/packages/rest-typings/src/v1/users.ts
index d78fa5e527fdc..fc3264e487e6e 100644
--- a/packages/rest-typings/src/v1/users.ts
+++ b/packages/rest-typings/src/v1/users.ts
@@ -103,7 +103,10 @@ type UsersPresencePayload = {
 };
 
 export type UserPresence = Readonly<
-	Partial<Pick<IUser, 'name' | 'status' | 'utcOffset' | 'statusText' | 'avatarETag' | 'roles' | 'username'>> & Required<Pick<IUser, '_id'>>
+	Partial<
+		Pick<IUser, 'name' | 'status' | 'utcOffset' | 'statusText' | 'statusSource' | 'statusExpiresAt' | 'avatarETag' | 'roles' | 'username'>
+	> &
+		Required<Pick<IUser, '_id'>>
 >;
 
 export type UserPersonalTokens = Pick<IPersonalAccessToken, 'name' | 'lastTokenPart' | 'bypassTwoFactor'> & { createdAt: string };