diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index cab77ce07ef90..66a5ff9304009 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -1,4 +1,4 @@
-import { MeteorError, Presence, Team, Calendar } from '@rocket.chat/core-services';
+import { MeteorError, Presence, Team } from '@rocket.chat/core-services';
 import type { IExportOperation, ILoginToken, IPersonalAccessToken, IUser, UserStatus } from '@rocket.chat/core-typings';
 import { Users, Subscriptions, Sessions, OAuthAccessTokens, OAuthRefreshTokens, OAuthAuthCodes } from '@rocket.chat/models';
 import {
@@ -29,7 +29,7 @@ import {
 	validateForbiddenErrorResponse,
 } from '@rocket.chat/rest-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
-import { getLoginExpirationInMs, wrapExceptions } from '@rocket.chat/tools';
+import { getLoginExpirationInMs } from '@rocket.chat/tools';
 import { Accounts } from 'meteor/accounts-base';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
@@ -1546,7 +1546,7 @@ API.v1.get(
 
 		if (ids) {
 			return API.v1.success({
-				users: await Users.findNotOfflineByIds(Array.isArray(ids) ? ids : ids.split(','), options).toArray(),
+				users: await Users.findPresenceUsersByIds(Array.isArray(ids) ? ids : ids.split(','), options).toArray(),
 				full: false,
 			});
 		}
@@ -1982,12 +1982,6 @@ API.v1
 				),
 			);
 
-			if (!settings.get('Accounts_AllowUserStatusMessageChange')) {
-				throw new Meteor.Error('error-not-allowed', 'Change status is not allowed', {
-					method: 'users.setStatus',
-				});
-			}
-
 			const user = await (async () => {
 				if (isUserFromParams(this.bodyParams, this.userId, this.user)) {
 					return Users.findOneById(this.userId);
@@ -2003,6 +1997,12 @@ API.v1
 
 			const { status, message, expiresAt } = this.bodyParams;
 
+			if (message && !settings.get('Accounts_AllowUserStatusMessageChange')) {
+				throw new Meteor.Error('error-not-allowed', 'Change status is not allowed', {
+					method: 'users.setStatus',
+				});
+			}
+
 			const statusExpiresAt = expiresAt ? new Date(expiresAt) : undefined;
 			if (statusExpiresAt && Number.isNaN(statusExpiresAt.getTime())) {
 				throw new Meteor.Error('error-invalid-date', 'Invalid expiresAt date string', {
@@ -2028,10 +2028,6 @@ API.v1
 
 			await Presence.setStatus(user._id, effectiveStatus, message, statusExpiresAt);
 
-			if (status) {
-				void wrapExceptions(() => Calendar.cancelUpcomingStatusChanges(user._id)).suppress();
-			}
-
 			return API.v1.success();
 		},
 	)
diff --git a/apps/meteor/app/apps/server/bridges/users.ts b/apps/meteor/app/apps/server/bridges/users.ts
index 1caa744316e7b..4a49f6b613e9d 100644
--- a/apps/meteor/app/apps/server/bridges/users.ts
+++ b/apps/meteor/app/apps/server/bridges/users.ts
@@ -181,7 +181,7 @@ export class AppUserBridge extends UserBridge {
 
 	protected async setActiveState(
 		userId: IUser['id'],
-		state: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt'>,
+		state: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt' | 'statusId'>,
 		appId: string,
 	): Promise<void> {
 		this.orch.debugLog(`The App ${appId} is setting active state for user ${userId}`);
@@ -191,13 +191,14 @@ export class AppUserBridge extends UserBridge {
 			statusText: state.statusText,
 			statusSource: state.statusSource as PresenceSource,
 			...(state.statusExpiresAt && { statusExpiresAt: state.statusExpiresAt }),
+			...(state.statusId && { statusId: state.statusId }),
 		});
 	}
 
-	protected async endActiveState(userId: IUser['id'], appId: string): Promise<void> {
+	protected async endActiveState(userId: IUser['id'], appId: string, statusId?: string): Promise<void> {
 		this.orch.debugLog(`The App ${appId} is ending active state for user ${userId}`);
 
-		await Presence.endActiveState(userId);
+		await Presence.endActiveState(userId, statusId);
 	}
 
 	protected async getActiveUserCount(): Promise<number> {
diff --git a/apps/meteor/client/components/UserCard/UserCard.tsx b/apps/meteor/client/components/UserCard/UserCard.tsx
index 8a042c0733e72..b44fd11201b4d 100644
--- a/apps/meteor/client/components/UserCard/UserCard.tsx
+++ b/apps/meteor/client/components/UserCard/UserCard.tsx
@@ -49,7 +49,7 @@ const UserCard = ({
 	const isLayoutEmbedded = useEmbeddedLayout();
 
 	return (
-		<UserCardDialog title={t('User_card')} {...props}>
+		<UserCardDialog aria-label={t('User_card')} {...props}>
 			<div>
 				{username && <UserAvatar username={username} etag={etag} size='x124' />}
 				<Box flexGrow={0} display='flex' mbs={12} alignItems='center' justifyContent='center'>
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx b/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx
index 81487409ddbb3..c6e6b07107bf3 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx
@@ -1,9 +1,10 @@
 import { ContextualbarDialog } from '@rocket.chat/ui-client';
 import type { Meta, StoryFn } from '@storybook/react';
 
-import * as Status from '../UserStatus';
 import UserInfo from './UserInfo';
 import { UserCardRole } from '../UserCard';
+import * as Status from '../UserStatus';
+import { UserStatusText } from '../UserStatusText';
 
 export default {
 	component: UserInfo,
@@ -24,10 +25,10 @@ const defaultArgs = {
 	name: 'Guilherme Gazzo',
 	username: 'guilherme.gazzo',
 	nickname: 'gazzo',
-	statusText: '🛴 currently working on User Card',
 	bio: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla tempus, eros convallis vulputate cursus, nisi neque eleifend libero, eget lacinia justo purus nec est. In at sodales ipsum. Sed lacinia quis purus eget pulvinar. Aenean eu pretium nunc, at aliquam magna. Praesent dignissim, tortor sed volutpat mattis, mauris diam pulvinar leo, porta commodo risus est non purus.',
 	email: 'rocketchat@rocket.chat',
 	status: <Status.Offline />,
+	customStatus: <UserStatusText statusText='🛴 currently working on User Card' />,
 	roles: [<UserCardRole key='admin'>admin</UserCardRole>, <UserCardRole key='user'>user</UserCardRole>],
 };
 
diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx
index 1fabbdb131ed6..8ecf4b6b697fc 100644
--- a/apps/meteor/client/components/UserInfo/UserInfo.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx
@@ -37,7 +37,6 @@ type UserInfoDataProps = Serialized<
 		| 'utcOffset'
 		| 'phone'
 		| 'createdAt'
-		| 'statusText'
 		| 'canViewAllInfo'
 		| 'customFields'
 		| 'freeSwitchExtension'
@@ -47,6 +46,7 @@ type UserInfoDataProps = Serialized<
 
 type UserInfoProps = UserInfoDataProps & {
 	status: ReactNode;
+	customStatus?: ReactNode;
 	email?: string;
 	verified?: boolean;
 	actions: ReactNode;
@@ -69,7 +69,7 @@ const UserInfo = ({
 	verified,
 	createdAt,
 	status,
-	statusText,
+	customStatus,
 	customFields,
 	canViewAllInfo,
 	actions,
@@ -100,11 +100,7 @@ const UserInfo = ({
 				<InfoPanelSection>
 					{userDisplayName && <InfoPanelTitle icon={status} title={userDisplayName} />}
 
-					{statusText && (
-						<InfoPanelText>
-							<MarkdownText content={statusText} parseEmoji={true} variant='inline' />
-						</InfoPanelText>
-					)}
+					{customStatus && <InfoPanelText>{customStatus}</InfoPanelText>}
 				</InfoPanelSection>
 
 				<InfoPanelSection>
diff --git a/apps/meteor/client/components/UserStatusMenu.tsx b/apps/meteor/client/components/UserStatusMenu.tsx
index 26d78e2c6a32d..42cd249276e1a 100644
--- a/apps/meteor/client/components/UserStatusMenu.tsx
+++ b/apps/meteor/client/components/UserStatusMenu.tsx
@@ -9,7 +9,6 @@ import { useTranslation } from 'react-i18next';
 import { UserStatus } from './UserStatus';
 
 type UserStatusMenuProps = {
-	margin: ComponentProps<typeof Box>['margin'];
 	onChange: (type: UserStatusType) => void;
 	initialStatus?: UserStatusType;
 	optionWidth?: ComponentProps<typeof Box>['width'];
@@ -17,11 +16,10 @@ type UserStatusMenuProps = {
 };
 
 const UserStatusMenu = ({
-	margin,
 	onChange,
 	initialStatus = UserStatusType.OFFLINE,
 	optionWidth = undefined,
-	placement = 'bottom-end',
+	placement = 'bottom-start',
 }: UserStatusMenuProps) => {
 	const { t } = useTranslation();
 	const [status, setStatus] = useState(initialStatus);
@@ -39,16 +37,21 @@ const UserStatusMenu = ({
 
 		const statuses: Array<[value: UserStatusType, label: ReactNode]> = [
 			[UserStatusType.ONLINE, renderOption(UserStatusType.ONLINE, t('Online'))],
-			[UserStatusType.AWAY, renderOption(UserStatusType.AWAY, t('Away'))],
 			[UserStatusType.BUSY, renderOption(UserStatusType.BUSY, t('Busy'))],
 		];
 
+		// Away is no longer manually selectable, but surface it if the user is currently on it
+		// (e.g., set in a previous version or auto-applied by the server) so they can switch off.
+		if (status === UserStatusType.AWAY) {
+			statuses.push([UserStatusType.AWAY, renderOption(UserStatusType.AWAY, t('Away'))]);
+		}
+
 		if (allowInvisibleStatus) {
 			statuses.push([UserStatusType.OFFLINE, renderOption(UserStatusType.OFFLINE, t('Offline'))]);
 		}
 
 		return statuses;
-	}, [t, allowInvisibleStatus]);
+	}, [t, allowInvisibleStatus, status]);
 
 	const [cursor, handleKeyDown, handleKeyUp, reset, [visible, hide, show]] = useCursor(-1, options, ([selected], [, hide]) => {
 		setStatus(selected);
@@ -82,14 +85,13 @@ const UserStatusMenu = ({
 		<>
 			<Button
 				ref={ref}
-				small
+				mini
 				square
 				secondary
 				onClick={onClick}
 				onBlur={hide}
 				onKeyUp={handleKeyUp}
 				onKeyDown={handleKeyDown}
-				margin={margin}
 				aria-label={t('User_status_menu')}
 			>
 				<UserStatus status={status} />
diff --git a/apps/meteor/client/components/UserStatusText/ReactiveUserStatusText.tsx b/apps/meteor/client/components/UserStatusText/ReactiveUserStatusText.tsx
new file mode 100644
index 0000000000000..5851087a09224
--- /dev/null
+++ b/apps/meteor/client/components/UserStatusText/ReactiveUserStatusText.tsx
@@ -0,0 +1,16 @@
+import type { IUser } from '@rocket.chat/core-typings';
+import { useUserPresence } from '@rocket.chat/ui-contexts';
+import { memo } from 'react';
+
+import UserStatusText from './UserStatusText';
+
+type ReactiveUserStatusTextProps = {
+	uid: IUser['_id'];
+};
+
+const ReactiveUserStatusText = ({ uid }: ReactiveUserStatusTextProps) => {
+	const presence = useUserPresence(uid);
+	return <UserStatusText status={presence?.status} statusText={presence?.statusText} statusExpiresAt={presence?.statusExpiresAt} />;
+};
+
+export default memo(ReactiveUserStatusText);
diff --git a/apps/meteor/client/components/UserStatusText/UserStatusText.tsx b/apps/meteor/client/components/UserStatusText/UserStatusText.tsx
new file mode 100644
index 0000000000000..65bfc9541b209
--- /dev/null
+++ b/apps/meteor/client/components/UserStatusText/UserStatusText.tsx
@@ -0,0 +1,47 @@
+import { UserStatus } from '@rocket.chat/core-typings';
+import { Box, Icon } from '@rocket.chat/fuselage';
+import { isTruthy } from '@rocket.chat/tools';
+import { useTranslation } from 'react-i18next';
+
+import { useExpirationText } from '../../hooks/useExpirationText';
+import MarkdownText from '../MarkdownText';
+
+const STATUS_LABEL_KEYS: Record<UserStatus, string> = {
+	[UserStatus.ONLINE]: 'Online',
+	[UserStatus.AWAY]: 'Away',
+	[UserStatus.BUSY]: 'Busy',
+	[UserStatus.OFFLINE]: 'Offline',
+	[UserStatus.DISABLED]: 'Disabled',
+};
+
+type UserStatusTextProps = {
+	status?: UserStatus;
+	statusText?: string;
+	statusExpiresAt?: Date | string;
+};
+
+const UserStatusText = ({ status, statusText, statusExpiresAt }: UserStatusTextProps) => {
+	const { t } = useTranslation();
+	const expirationText = useExpirationText(statusExpiresAt);
+
+	const statusLabel = status ? t(STATUS_LABEL_KEYS[status] ?? STATUS_LABEL_KEYS[UserStatus.OFFLINE]) : undefined;
+	const headline = [statusLabel, statusText].filter(isTruthy).join(' - ');
+
+	if (!headline && !expirationText) {
+		return null;
+	}
+
+	return (
+		<>
+			{headline && <MarkdownText content={headline} parseEmoji={true} variant='inline' />}
+			{expirationText && (
+				<Box fontScale='c1' display='flex' alignItems='center'>
+					<Icon name='clock' size='x16' mie={4} />
+					{expirationText}
+				</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..c21ce333ad198
--- /dev/null
+++ b/apps/meteor/client/components/UserStatusText/index.ts
@@ -0,0 +1,2 @@
+export { default as UserStatusText } from './UserStatusText';
+export { default as ReactiveUserStatusText } from './ReactiveUserStatusText';
diff --git a/apps/meteor/client/hooks/useExpirationText.ts b/apps/meteor/client/hooks/useExpirationText.ts
new file mode 100644
index 0000000000000..bf452210c84da
--- /dev/null
+++ b/apps/meteor/client/hooks/useExpirationText.ts
@@ -0,0 +1,55 @@
+import { useLanguage } from '@rocket.chat/ui-contexts';
+import { isSameDay } from 'date-fns';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useFormatDate } from './useFormatDate';
+import { useFormatTime } from './useFormatTime';
+
+// Handles Date, ISO string, and EJSON { $date } (from DDP streamer which does raw JSON.parse without EJSON deserialization)
+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;
+}
+
+export function useExpirationText(statusExpiresAt?: Date | string) {
+	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_time', { time: formatTime(expiresAt) });
+		}
+
+		if (expiresAt.getFullYear() === now.getFullYear()) {
+			return t('Until_date', { date: new Intl.DateTimeFormat(language, { month: 'long', day: 'numeric' }).format(expiresAt) });
+		}
+
+		return t('Until_date', { date: formatDate(expiresAt) });
+	}, [statusExpiresAt, t, language, formatTime, formatDate]);
+}
diff --git a/apps/meteor/client/hooks/useUserPresenceListener.ts b/apps/meteor/client/hooks/useUserPresenceListener.ts
index 99aaf32eea273..1324cbb7f046d 100644
--- a/apps/meteor/client/hooks/useUserPresenceListener.ts
+++ b/apps/meteor/client/hooks/useUserPresenceListener.ts
@@ -11,8 +11,15 @@ export const useUserPresenceListener = (): void => {
 
 	useEffect(
 		() =>
-			subscribe((uid, [[username, statusChanged, statusText]]) => {
-				Presence.notify({ _id: uid, username, status: STATUS_MAP[statusChanged as any], statusText });
+			subscribe((uid, [[username, statusChanged, statusText, statusSource, statusExpiresAt]]) => {
+				Presence.notify({
+					_id: uid,
+					username,
+					status: STATUS_MAP[statusChanged as any],
+					statusText,
+					statusSource,
+					statusExpiresAt,
+				});
 			}),
 		[subscribe],
 	);
diff --git a/apps/meteor/client/hooks/useUserStatusTooltip.tsx b/apps/meteor/client/hooks/useUserStatusTooltip.tsx
new file mode 100644
index 0000000000000..4969346c991e7
--- /dev/null
+++ b/apps/meteor/client/hooks/useUserStatusTooltip.tsx
@@ -0,0 +1,30 @@
+import { useTooltipClose, useTooltipOpen, useUserPresence } from '@rocket.chat/ui-contexts';
+import type { MouseEvent } from 'react';
+import { useCallback, useMemo } from 'react';
+
+import { UserStatusText } from '../components/UserStatusText';
+
+export function useUserStatusTooltip(uid: string | undefined, title?: string) {
+	const presence = useUserPresence(uid);
+
+	const openTooltip = useTooltipOpen();
+	const closeTooltip = useTooltipClose();
+
+	const onMouseEnter = useCallback(
+		(e: MouseEvent<HTMLElement>) => {
+			const target = e.currentTarget;
+
+			if (!uid) {
+				return openTooltip(title, target);
+			}
+
+			openTooltip(
+				<UserStatusText status={presence?.status} statusText={presence?.statusText} statusExpiresAt={presence?.statusExpiresAt} />,
+				target,
+			);
+		},
+		[uid, openTooltip, presence, title],
+	);
+
+	return useMemo(() => ({ 'data-tooltip': '', onMouseEnter, 'onMouseLeave': closeTooltip }), [onMouseEnter, closeTooltip]);
+}
diff --git a/apps/meteor/client/lib/getUserInitialStatus.ts b/apps/meteor/client/lib/getUserInitialStatus.ts
new file mode 100644
index 0000000000000..cdc1e0f1fd87f
--- /dev/null
+++ b/apps/meteor/client/lib/getUserInitialStatus.ts
@@ -0,0 +1,24 @@
+import type { IUser } from '@rocket.chat/core-typings';
+import { UserStatus as UserStatusType } from '@rocket.chat/core-typings';
+
+export type UserStatusInitialValues = {
+	statusText: string;
+	statusType: IUser['status'];
+	statusDuration: string;
+	statusCustomDate: string;
+	statusCustomTime: string;
+};
+
+export const getUserStatusInitialValues = (user: IUser | null, initialStatusText?: string) => {
+	const initialExpiration = user?.statusExpiresAt && new Date(user.statusExpiresAt) > new Date() ? new Date(user.statusExpiresAt) : null;
+	const initialDate = initialExpiration ?? new Date();
+
+	return {
+		statusText: user?.statusText ?? initialStatusText ?? '',
+		statusType:
+			user?.status === UserStatusType.AWAY ? (user?.statusDefault ?? UserStatusType.ONLINE) : (user?.status ?? UserStatusType.ONLINE),
+		statusDuration: initialExpiration ? 'custom' : '',
+		statusCustomDate: initialDate.toLocaleDateString('en-CA'),
+		statusCustomTime: initialDate.toTimeString().slice(0, 5),
+	};
+};
diff --git a/apps/meteor/client/lib/presence.ts b/apps/meteor/client/lib/presence.ts
index 6b748c85d3541..f45c2fb19c8ba 100644
--- a/apps/meteor/client/lib/presence.ts
+++ b/apps/meteor/client/lib/presence.ts
@@ -97,11 +97,14 @@ const getPresence = ((): ((uid: UserPresence['_id']) => void) => {
 
 				const fallbackStatus = status === 'disabled' ? UserStatus.DISABLED : UserStatus.OFFLINE;
 
-				users.forEach((user) => {
-					if (!store.has(user._id)) {
-						notify(user);
+				users.forEach(({ statusExpiresAt, ...rest }) => {
+					if (!store.has(rest._id)) {
+						notify({
+							...rest,
+							...(statusExpiresAt && { statusExpiresAt: new Date(statusExpiresAt) }),
+						});
 					}
-					currentUids.delete(user._id);
+					currentUids.delete(rest._id);
 				});
 
 				currentUids.forEach((uid) => {
diff --git a/apps/meteor/client/lib/statusDurations.ts b/apps/meteor/client/lib/statusDurations.ts
new file mode 100644
index 0000000000000..e2b6e69023c28
--- /dev/null
+++ b/apps/meteor/client/lib/statusDurations.ts
@@ -0,0 +1,58 @@
+import type { TranslationContextValue } from '@rocket.chat/ui-contexts';
+
+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;
+		},
+	},
+];
+
+export const validateStatusExpiration = (
+	value: string,
+	{ statusCustomDate, statusCustomTime }: { statusCustomDate?: string; statusCustomTime?: string },
+	t: TranslationContextValue['translate'],
+): string | true => {
+	if (value !== 'custom') {
+		return true;
+	}
+
+	const expiresAt = STATUS_DURATION_OPTIONS.find((o) => o.value === value)?.getExpiresAt?.({
+		now: new Date(),
+		customDate: statusCustomDate,
+		customTime: statusCustomTime,
+	});
+
+	if (!expiresAt) {
+		return t('Status_choose_date_and_time');
+	}
+
+	if (expiresAt <= new Date()) {
+		return t('Status_expiration_must_be_future');
+	}
+
+	return true;
+};
diff --git a/apps/meteor/client/lib/userData.ts b/apps/meteor/client/lib/userData.ts
index 9ae32b29dfca5..0965318545acf 100644
--- a/apps/meteor/client/lib/userData.ts
+++ b/apps/meteor/client/lib/userData.ts
@@ -18,6 +18,7 @@ type RawUserData = Serialized<
 		| 'status'
 		| 'statusDefault'
 		| 'statusText'
+		| 'statusExpiresAt'
 		| 'statusConnection'
 		| 'avatarOrigin'
 		| 'utcOffset'
@@ -158,6 +159,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/utils/getUidDirectMessage.ts b/apps/meteor/client/lib/utils/getUidDirectMessage.ts
index 6f56110629855..16f1561d371dc 100644
--- a/apps/meteor/client/lib/utils/getUidDirectMessage.ts
+++ b/apps/meteor/client/lib/utils/getUidDirectMessage.ts
@@ -1,14 +1,18 @@
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 
-import { Rooms } from '../../stores';
-import { getUserId } from '../user';
+export const getUidDirectMessage = (room: Pick<IRoom, 't' | 'uids' | 'usernames'>, uid?: IUser['_id']) => {
+	if (room.t !== 'd' || !room.uids?.length || room.uids.length > 2) {
+		return undefined;
+	}
 
-export const getUidDirectMessage = (rid: IRoom['_id'], uid: IUser['_id'] | undefined = getUserId() ?? undefined): string | undefined => {
-	const room = Rooms.state.get(rid);
+	const partner = room.uids.find((_uid) => _uid !== uid);
+	if (partner) {
+		return partner;
+	}
 
-	if (!room || room.t !== 'd' || !room.uids || room.uids.length > 2) {
-		return undefined;
+	if (room.uids.length === 1 && room.usernames?.length === 1) {
+		return uid;
 	}
 
-	return room.uids.filter((_uid) => _uid !== uid)[0];
+	return undefined;
 };
diff --git a/apps/meteor/client/lib/utils/normalizeMessagePreview/getMessagePreview.ts b/apps/meteor/client/lib/utils/normalizeMessagePreview/getMessagePreview.ts
index 9842edb58e437..72a49a1ec40bb 100644
--- a/apps/meteor/client/lib/utils/normalizeMessagePreview/getMessagePreview.ts
+++ b/apps/meteor/client/lib/utils/normalizeMessagePreview/getMessagePreview.ts
@@ -1,5 +1,6 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { isDirectMessageRoom, isE2EEMessage, isMultipleDirectMessageRoom, isVideoConfMessage } from '@rocket.chat/core-typings';
+import { escapeHTML } from '@rocket.chat/string-helpers';
 import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
 import type { TFunction } from 'i18next';
 
@@ -30,5 +31,5 @@ export const getMessagePreview = (room: SubscriptionWithRoom, lastMessage: IMess
 	if (isDirectMessageRoom(room) && !isMultipleDirectMessageRoom(room)) {
 		return normalizedMessage;
 	}
-	return `${lastMessage.u.name || lastMessage.u.username}: ${normalizedMessage}`;
+	return `${escapeHTML(lastMessage.u.name || lastMessage.u.username)}: ${normalizedMessage}`;
 };
diff --git a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/EditStatusModal.tsx b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/EditStatusModal.tsx
index 5616da39011d1..a5ff9b29606ac 100644
--- a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/EditStatusModal.tsx
+++ b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/EditStatusModal.tsx
@@ -1,127 +1,192 @@
-import type { IUser } from '@rocket.chat/core-typings';
-import {
-	Field,
-	TextInput,
-	FieldGroup,
-	Modal,
-	Button,
-	Box,
-	FieldLabel,
-	FieldRow,
-	FieldError,
-	FieldHint,
-	ModalHeader,
-	ModalIcon,
-	ModalTitle,
-	ModalClose,
-	ModalContent,
-	ModalFooter,
-	ModalFooterControllers,
-} from '@rocket.chat/fuselage';
-import { useStableCallback, useLocalStorage } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useSetting, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
+import { UserStatus as UserStatusType } from '@rocket.chat/core-typings';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { InputBox, Margins, Box } from '@rocket.chat/fuselage';
+import { Field, FieldGroup, FieldLabel, FieldRow, FieldError, FieldHint, TextInput, Select } from '@rocket.chat/fuselage-forms';
+import { useLocalStorage } from '@rocket.chat/fuselage-hooks';
+import { GenericModal } from '@rocket.chat/ui-client';
+import { useToastMessageDispatch, useSetting, useEndpoint, useUser, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, ComponentProps } from 'react';
-import { useState, useCallback, useId } from 'react';
+import { useEffect, useMemo } from 'react';
+import { Controller, useForm } from 'react-hook-form';
 
 import UserStatusMenu from '../../../components/UserStatusMenu';
 import { USER_STATUS_TEXT_MAX_LENGTH } from '../../../lib/constants';
+import { getUserStatusInitialValues } from '../../../lib/getUserInitialStatus';
+import { STATUS_DURATION_OPTIONS, validateStatusExpiration } from '../../../lib/statusDurations';
 
 type EditStatusModalProps = {
 	onClose: () => void;
-	userStatus: IUser['status'];
-	userStatusText: IUser['statusText'];
 };
 
-const EditStatusModal = ({ onClose, userStatus, userStatusText }: EditStatusModalProps) => {
+type StatusFormValues = {
+	statusText: string;
+	statusType: UserStatusType;
+	statusDuration: string;
+	statusCustomDate: string;
+	statusCustomTime: string;
+};
+
+const EditStatusModal = ({ onClose }: EditStatusModalProps) => {
+	const t = useTranslation();
+	const user = useUser();
 	const allowUserStatusMessageChange = useSetting('Accounts_AllowUserStatusMessageChange');
 	const dispatchToastMessage = useToastMessageDispatch();
 	const [customStatus, setCustomStatus] = useLocalStorage<string>('Local_Custom_Status', '');
-	const initialStatusText = customStatus || userStatusText || '';
 
-	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 {
+		control,
+		handleSubmit,
+		setValue,
+		watch,
+		formState: { errors, isDirty },
+	} = useForm<StatusFormValues>({
+		defaultValues: getUserStatusInitialValues(user, customStatus),
+	});
 
-	const handleStatusText = useStableCallback((e: ChangeEvent<HTMLInputElement>): void => {
-		setStatusText(e.currentTarget.value);
+	const { statusDuration, statusType, statusText } = watch();
+	const isExpirationDisabled = statusType === UserStatusType.ONLINE && !statusText.trim();
 
-		if (statusText && statusText.length > USER_STATUS_TEXT_MAX_LENGTH) {
-			return setStatusTextError(t('Max_length_is', USER_STATUS_TEXT_MAX_LENGTH));
+	useEffect(() => {
+		if (isExpirationDisabled) {
+			setValue('statusDuration', '', { shouldValidate: true });
 		}
+	}, [isExpirationDisabled, setValue]);
 
-		return setStatusTextError(undefined);
-	});
+	const isStatusFromCall = user?.statusSource === 'internal' || user?.statusSource === 'external';
 
-	const handleStatusType = (type: IUser['status']): void => setStatusType(type);
+	const setUserStatus = useEndpoint('POST', '/v1/users.setStatus');
 
-	const handleSaveStatus = useCallback(async () => {
+	const durationOptions: SelectOption[] = useMemo(() => STATUS_DURATION_OPTIONS.map(({ value, labelKey }) => [value, t(labelKey)]), [t]);
+
+	const handleSaveStatus = async ({
+		statusText,
+		statusType,
+		statusDuration,
+		statusCustomDate,
+		statusCustomTime,
+	}: StatusFormValues): Promise<void> => {
+		const expiresAt = STATUS_DURATION_OPTIONS.find((o) => o.value === statusDuration)?.getExpiresAt?.({
+			now: new Date(),
+			customDate: statusCustomDate,
+			customTime: statusCustomTime,
+		});
 		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) => {
-						e.preventDefault();
-						handleSaveStatus();
-					}}
-					{...props}
-				/>
-			)}
+		<GenericModal
+			icon={null}
+			variant='warning'
+			title={t('Status_set_your_status')}
+			onCancel={onClose}
+			confirmText={t('Save')}
+			confirmDisabled={!isDirty}
+			wrapperFunction={(props: ComponentProps<typeof Box>) => <Box is='form' onSubmit={handleSubmit(handleSaveStatus)} {...props} />}
 		>
-			<ModalHeader>
-				<ModalIcon name='info' />
-				<ModalTitle id={`${modalId}-title`}>{t('Edit_Status')}</ModalTitle>
-				<ModalClose onClick={onClose} />
-			</ModalHeader>
-			<ModalContent fontScale='p2'>
-				<FieldGroup>
-					<Field>
-						<FieldLabel htmlFor={`${modalId}-status-message`}>{t('StatusMessage')}</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} />}
-							/>
-						</FieldRow>
-						{!allowUserStatusMessageChange && <FieldHint>{t('StatusMessage_Change_Disabled')}</FieldHint>}
-						<FieldError>{statusTextError}</FieldError>
-					</Field>
-				</FieldGroup>
-			</ModalContent>
-			<ModalFooter>
-				<ModalFooterControllers>
-					<Button secondary onClick={onClose}>
-						{t('Cancel')}
-					</Button>
-					<Button primary type='submit' disabled={!!statusTextError}>
-						{t('Save')}
-					</Button>
-				</ModalFooterControllers>
-			</ModalFooter>
-		</Modal>
+			<FieldGroup>
+				<Field>
+					<FieldLabel>{t('Status')}</FieldLabel>
+					<FieldRow>
+						<Controller
+							control={control}
+							name='statusText'
+							rules={{
+								maxLength: {
+									value: USER_STATUS_TEXT_MAX_LENGTH,
+									message: t('Max_length_is', USER_STATUS_TEXT_MAX_LENGTH),
+								},
+							}}
+							render={({ field }) => (
+								<TextInput
+									{...field}
+									error={errors.statusText?.message}
+									disabled={!allowUserStatusMessageChange}
+									flexGrow={1}
+									placeholder={t(statusType)}
+									startAddon={
+										<Controller
+											control={control}
+											name='statusType'
+											render={({ field: { value, onChange } }) => <UserStatusMenu initialStatus={value} onChange={onChange} />}
+										/>
+									}
+								/>
+							)}
+						/>
+					</FieldRow>
+					<FieldHint>{t(allowUserStatusMessageChange ? 'Status_you_can_use_emoji' : 'StatusMessage_Change_Disabled')}</FieldHint>
+					{errors.statusText && <FieldError>{errors.statusText.message}</FieldError>}
+				</Field>
+				<Field>
+					<FieldLabel>{t('Status_clear_after')}</FieldLabel>
+					<FieldRow>
+						<Controller
+							control={control}
+							name='statusDuration'
+							rules={{
+								deps: ['statusCustomDate', 'statusCustomTime'],
+								validate: (value, { statusCustomDate, statusCustomTime }) =>
+									validateStatusExpiration(value, { statusCustomDate, statusCustomTime }, t),
+							}}
+							render={({ field: { value, onChange } }) => (
+								<Select
+									value={value}
+									options={durationOptions}
+									onChange={(next) => onChange(String(next))}
+									disabled={isExpirationDisabled}
+								/>
+							)}
+						/>
+					</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)}
+											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)}
+										/>
+									)}
+								/>
+							</Margins>
+						</Box>
+					)}
+					{errors.statusDuration && <FieldError>{errors.statusDuration.message}</FieldError>}
+					<FieldHint>{t(isStatusFromCall ? 'Status_new_status_warning_after_call' : 'Status_new_status_warning')}</FieldHint>
+				</Field>
+			</FieldGroup>
+		</GenericModal>
 	);
 };
 
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 a5d7f3663bc87..21a983ecfd952 100644
--- a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx
+++ b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx
@@ -1,22 +1,24 @@
-import type { ICustomUserStatus } from '@rocket.chat/core-typings';
-import { Box } from '@rocket.chat/fuselage';
+import type { ICustomUserStatus, IUser } from '@rocket.chat/core-typings';
+import { UserStatus as UserStatusEnum } from '@rocket.chat/core-typings';
+import { Box, Icon, RadioButton } from '@rocket.chat/fuselage';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { clientCallbacks } from '@rocket.chat/ui-client';
 import { useEndpoint, useSetting, useStream } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
-import { useCallback, useEffect } from 'react';
+import { useCallback, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useCustomStatusModalHandler } from './useCustomStatusModalHandler';
 import MarkdownText from '../../../../components/MarkdownText';
 import { UserStatus } from '../../../../components/UserStatus';
+import { useExpirationText } from '../../../../hooks/useExpirationText';
 import { useFireGlobalEvent } from '../../../../hooks/useFireGlobalEvent';
 import { userStatuses } from '../../../../lib/userStatuses';
 import type { UserStatusDescriptor } from '../../../../lib/userStatuses';
 import { mapCustomUserStatusFromApi } from '../../../../lib/utils/mapCustomUserStatusFromApi';
 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);
@@ -48,18 +50,22 @@ export const useStatusItems = (): GenericMenuItemProps[] => {
 
 	const { t } = useTranslation();
 
+	const presenceDisabled = useSetting('Presence_broadcast_disabled', false);
+	const allowUserStatusMessageChange = useSetting('Accounts_AllowUserStatusMessageChange', true);
+
 	const fireGlobalStatusEvent = useFireGlobalEvent('user-status-manually-set');
 	const setStatus = useEndpoint('POST', '/v1/users.setStatus');
 	const setStatusMutation = useMutation({
 		mutationFn: async (status: UserStatusDescriptor) => {
-			void setStatus({ status: status.statusType, message: userStatuses.isValidType(status.id) ? '' : status.name });
+			void setStatus({
+				status: status.statusType,
+				...(allowUserStatusMessageChange && { message: userStatuses.isValidType(status.id) ? '' : status.name }),
+			});
 			void clientCallbacks.run('userStatusManuallySet', status);
 			await fireGlobalStatusEvent.mutateAsync(status);
 		},
 	});
 
-	const presenceDisabled = useSetting('Presence_broadcast_disabled', false);
-
 	const { data: statuses } = useQuery({
 		queryKey: ['user-statuses'],
 		queryFn: async () => {
@@ -67,41 +73,106 @@ 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 useMemo<GenericMenuItemProps[]>(() => {
+		if (presenceDisabled) {
+			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 items: GenericMenuItemProps[] = [];
 
-	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')}
-								</Box>
+		// Top: user's currently-active custom status (display only — clicking does nothing, already selected).
+		if (user?.statusText || customStatusExpiration) {
+			const contentValue = user?.statusText || (user?.status ? t(user.status) : undefined);
+			items.push({
+				id: 'current-custom-status',
+				status: <UserStatus status={user?.status} />,
+				content: (
+					<>
+						{contentValue && <MarkdownText content={contentValue} parseEmoji variant='inline' />}
+						{customStatusExpiration && (
+							<Box color='secondary-info' display='flex' alignItems='center'>
+								<Icon name='clock' size='x16' mie={4} />
+								{customStatusExpiration}
 							</Box>
-						),
-					},
-				]
-			: []),
-		...(statuses ?? []),
-		{ id: 'custom-status', icon: 'emoji', content: t('Custom_Status'), onClick: handleCustomStatus, disabled: presenceDisabled },
-	];
+						)}
+					</>
+				),
+				addon: <RadioButton checked readOnly />,
+			});
+		}
+
+		// "Custom..." action opens the edit modal
+		if (allowUserStatusMessageChange) {
+			items.push({
+				id: 'custom-status-edit',
+				icon: 'edit',
+				content: t('Custom_Status'),
+				onClick: handleCustomStatus,
+			});
+		}
+
+		// Presets: filter to Online / Busy / Offline. Keep Away only if user is currently on Away (legacy).
+		const isPresetSelected = (statusType: UserStatusEnum): boolean =>
+			!user?.statusText && !customStatusExpiration && user?.status === statusType;
+		const presetItems = (statuses ?? [])
+			.filter((s) => userStatuses.isValidType(s.id))
+			.filter((s) => s.statusType !== UserStatusEnum.AWAY || isPresetSelected(UserStatusEnum.AWAY))
+			.map(
+				(status): GenericMenuItemProps => ({
+					id: status.id,
+					status: <UserStatus status={status.statusType} />,
+					content: <MarkdownText content={status.localizeName ? t(status.name) : status.name} parseEmoji variant='inline' />,
+					addon: <RadioButton checked={isPresetSelected(status.statusType)} readOnly />,
+					onClick: () => setStatusMutation.mutate(status),
+				}),
+			);
+
+		// Admin-defined custom statuses
+		const customItems = allowUserStatusMessageChange
+			? (statuses ?? [])
+					.filter((s) => !userStatuses.isValidType(s.id))
+					.map(
+						(status): GenericMenuItemProps => ({
+							id: status.id,
+							status: <UserStatus status={status.statusType} />,
+							content: <MarkdownText content={status.localizeName ? t(status.name) : status.name} parseEmoji variant='inline' />,
+							addon: <RadioButton checked={user?.statusText === status.name} readOnly />,
+							onClick: () => setStatusMutation.mutate(status),
+						}),
+					)
+			: [];
+
+		return [...items, ...presetItems, ...customItems];
+	}, [
+		presenceDisabled,
+		allowUserStatusMessageChange,
+		t,
+		handleStatusDisabledModal,
+		user?.status,
+		user?.statusText,
+		customStatusExpiration,
+		statuses,
+		handleCustomStatus,
+		setStatusMutation,
+	]);
 };
diff --git a/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx b/apps/meteor/client/navbar/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
index b29aafb769842..2385cc7ab8723 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/Item/Condensed.tsx b/apps/meteor/client/sidebar/Item/Condensed.tsx
index df447822de00f..c8b9131067987 100644
--- a/apps/meteor/client/sidebar/Item/Condensed.tsx
+++ b/apps/meteor/client/sidebar/Item/Condensed.tsx
@@ -23,7 +23,7 @@ const Condensed = ({ icon, title, avatar, actions, unread, menu, badges, ...prop
 	const { mounted: menuVisibility, requestMount, mountNow } = useDeferredMenuMount();
 
 	return (
-		<SidebarV2Item title={title} {...props} onFocus={mountNow} onPointerEnter={requestMount}>
+		<SidebarV2Item {...props} onFocus={mountNow} onPointerEnter={requestMount}>
 			{avatar && <SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>}
 			{icon}
 			<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>
diff --git a/apps/meteor/client/sidebar/Item/Extended.tsx b/apps/meteor/client/sidebar/Item/Extended.tsx
index 17550a58aa1d9..b1b07d49e655d 100644
--- a/apps/meteor/client/sidebar/Item/Extended.tsx
+++ b/apps/meteor/client/sidebar/Item/Extended.tsx
@@ -53,7 +53,7 @@ const Extended = ({
 	const { mounted: menuVisibility, requestMount, mountNow } = useDeferredMenuMount();
 
 	return (
-		<SidebarV2Item title={title} href={href} selected={selected} {...props} onFocus={mountNow} onPointerEnter={requestMount}>
+		<SidebarV2Item href={href} selected={selected} {...props} onFocus={mountNow} onPointerEnter={requestMount}>
 			{avatar && <SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>}
 			<SidebarV2ItemCol>
 				<SidebarV2ItemRow>
diff --git a/apps/meteor/client/sidebar/Item/Medium.tsx b/apps/meteor/client/sidebar/Item/Medium.tsx
index 07bd19f4e096c..e47d705350c09 100644
--- a/apps/meteor/client/sidebar/Item/Medium.tsx
+++ b/apps/meteor/client/sidebar/Item/Medium.tsx
@@ -22,7 +22,7 @@ const Medium = ({ icon, title, avatar, actions, badges, unread, menu, ...props }
 	const { mounted: menuVisibility, requestMount, mountNow } = useDeferredMenuMount();
 
 	return (
-		<SidebarV2Item title={title} {...props} onFocus={mountNow} onPointerEnter={requestMount}>
+		<SidebarV2Item {...props} onFocus={mountNow} onPointerEnter={requestMount}>
 			<SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>
 			{icon}
 			<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>
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 e86949055b943..c896399b4edbd 100644
--- a/apps/meteor/client/sidebar/RoomList/SidebarItemTemplateWithData.tsx
+++ b/apps/meteor/client/sidebar/RoomList/SidebarItemTemplateWithData.tsx
@@ -7,7 +7,9 @@ import type { AllHTMLAttributes, ComponentType, ReactNode } from 'react';
 import { memo, useMemo } from 'react';
 
 import { RoomIcon } from '../../components/RoomIcon';
+import { useUserStatusTooltip } from '../../hooks/useUserStatusTooltip';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
+import { getUidDirectMessage } from '../../lib/utils/getUidDirectMessage';
 import { isIOsDevice } from '../../lib/utils/isIOsDevice';
 import { getMessagePreview } from '../../lib/utils/normalizeMessagePreview/getMessagePreview';
 import { useOmnichannelPriorities } from '../../views/omnichannel/hooks/useOmnichannelPriorities';
@@ -42,6 +44,7 @@ type RoomListRowProps = {
 	openedRoom?: string;
 	// sidebarViewMode: 'extended';
 	isAnonymous?: boolean;
+	userId?: string;
 
 	room: SubscriptionWithRoom;
 	id?: string;
@@ -67,12 +70,16 @@ const SidebarItemTemplateWithData = ({
 	t,
 	isAnonymous,
 	videoConfActions,
+	userId,
 }: RoomListRowProps) => {
 	const { sidebar } = useLayout();
 
 	const href = roomCoordinator.getRouteLink(room.t, room) || '';
 	const title = roomCoordinator.getRoomName(room.t, room) || '';
 
+	const dmUserId = getUidDirectMessage(room, userId);
+	const dmStatusTooltipHandlers = useUserStatusTooltip(dmUserId, title);
+
 	const { unreadTitle, showUnread, unreadCount, highlightUnread: highlighted } = useUnreadDisplay(room);
 
 	const { lastMessage, unread = 0, alert, rid, t: type, cl } = room;
@@ -139,6 +146,7 @@ const SidebarItemTemplateWithData = ({
 						)
 					: undefined
 			}
+			{...dmStatusTooltipHandlers}
 		/>
 	);
 };
diff --git a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
index a6dcec996b9a1..92bd114e4457c 100644
--- a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
+++ b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
@@ -1,8 +1,19 @@
 import { VisuallyHidden } from '@react-aria/visually-hidden';
-import type { IUser } from '@rocket.chat/core-typings';
+import { UserStatus } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
-import { Box, Button, Icon } from '@rocket.chat/fuselage';
-import { Field, FieldGroup, FieldLabel, FieldRow, FieldError, FieldHint, TextInput, TextAreaInput } from '@rocket.chat/fuselage-forms';
+import type { SelectOption } from '@rocket.chat/fuselage';
+import { Box, Button, Divider, Icon, InputBox, Margins } from '@rocket.chat/fuselage';
+import {
+	Field,
+	FieldGroup,
+	FieldLabel,
+	FieldRow,
+	FieldError,
+	FieldHint,
+	TextInput,
+	TextAreaInput,
+	Select,
+} from '@rocket.chat/fuselage-forms';
 import { validateEmail } from '@rocket.chat/tools';
 import { CustomFieldsForm } from '@rocket.chat/ui-client';
 import {
@@ -14,8 +25,8 @@ import {
 	useLayout,
 } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
-import type { AllHTMLAttributes } from 'react';
-import { useCallback } from 'react';
+import type { AllHTMLAttributes, ChangeEvent } from 'react';
+import { useCallback, useEffect, useMemo } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 
 import type { AccountProfileFormValues } from './getProfileInitialValues';
@@ -25,6 +36,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, validateStatusExpiration } from '../../../lib/statusDurations';
 
 const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>) => {
 	const t = useTranslation();
@@ -52,10 +64,24 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>) => {
 		watch,
 		handleSubmit,
 		reset,
-		formState: { errors },
+		setValue,
+		formState: { errors, dirtyFields },
 	} = useFormContext<AccountProfileFormValues>();
 
-	const { email, avatar, username, name: userFullName } = watch();
+	const { email, avatar, username, name: userFullName, statusDuration, statusType, statusText } = watch();
+
+	const isExpirationDisabled = statusType === UserStatus.ONLINE && !statusText?.trim();
+
+	useEffect(() => {
+		if (isExpirationDisabled) {
+			setValue('statusDuration', '', { shouldValidate: true });
+		}
+	}, [isExpirationDisabled, setValue]);
+
+	const statusDurationOptions: SelectOption[] = useMemo(
+		() => STATUS_DURATION_OPTIONS.map(({ value, labelKey }) => [value, t(labelKey)]),
+		[t],
+	);
 
 	const previousEmail = user ? getUserEmailAddress(user) : '';
 	const previousUsername = user?.username || '';
@@ -95,30 +121,63 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>) => {
 	};
 
 	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,
+		});
+
+		const statusDirty =
+			dirtyFields.statusText ||
+			dirtyFields.statusType ||
+			dirtyFields.statusDuration ||
+			dirtyFields.statusCustomDate ||
+			dirtyFields.statusCustomTime;
+
 		try {
 			await updateOwnBasicInfo({
 				data: {
 					name,
 					...(user ? getUserEmailAddress(user) !== email && { email } : {}),
 					username,
-					statusText,
-					statusType,
 					nickname,
 					bio,
 				},
 				customFields,
 			});
 
+			if (statusDirty) {
+				await setUserStatus({
+					status: statusType,
+					...(allowUserStatusMessageChange && { message: statusText }),
+					...(allowUserStatusMessageChange && expiresAt && { expiresAt: expiresAt.toISOString() }),
+				});
+			}
+
 			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 +244,9 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>) => {
 						{!canChangeUsername && <FieldHint>{t('Username_Change_Disabled')}</FieldHint>}
 					</Field>
 				</Box>
+				<Divider mbs={24} mbe={0} />
 				<Field>
-					<FieldLabel>{t('StatusMessage')}</FieldLabel>
+					<FieldLabel>{t('Status')}</FieldLabel>
 					<FieldRow>
 						<Controller
 							control={control}
@@ -204,13 +264,11 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>) => {
 									disabled={!allowUserStatusMessageChange}
 									flexGrow={1}
 									error={errors.statusText?.message}
-									addon={
+									startAddon={
 										<Controller
 											control={control}
 											name='statusType'
-											render={({ field: { value, onChange } }) => (
-												<UserStatusMenu margin='neg-x2' onChange={onChange} initialStatus={value as IUser['status']} />
-											)}
+											render={({ field: { value, onChange } }) => <UserStatusMenu onChange={onChange} initialStatus={value} />}
 										/>
 									}
 								/>
@@ -219,7 +277,68 @@ const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>) => {
 					</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'
+							rules={{
+								deps: ['statusCustomDate', 'statusCustomTime'],
+								validate: (value, { statusCustomDate, statusCustomTime }) =>
+									validateStatusExpiration(value, { statusCustomDate, statusCustomTime }, t),
+							}}
+							render={({ field: { value, onChange } }) => (
+								<Select
+									value={value}
+									options={statusDurationOptions}
+									disabled={!allowUserStatusMessageChange || isExpirationDisabled}
+									onChange={(next) => onChange(String(next))}
+								/>
+							)}
+						/>
+					</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'
+											disabled={!allowUserStatusMessageChange}
+											flexGrow={1}
+											value={value}
+											onChange={(e: ChangeEvent<HTMLInputElement>) => onChange(e.currentTarget.value)}
+											min={new Date().toLocaleDateString('en-CA')}
+										/>
+									)}
+								/>
+								<Controller
+									control={control}
+									name='statusCustomTime'
+									render={({ field: { value, onChange } }) => (
+										<InputBox
+											aria-label={t('Status_expiration_time')}
+											type='time'
+											disabled={!allowUserStatusMessageChange}
+											flexGrow={1}
+											value={value}
+											onChange={(e: ChangeEvent<HTMLInputElement>) => onChange(e.currentTarget.value)}
+										/>
+									)}
+								/>
+							</Margins>
+						</Box>
+					)}
+					{errors.statusDuration && <FieldError>{errors.statusDuration.message}</FieldError>}
+					<FieldHint>{t('Status_new_status_warning')}</FieldHint>
 				</Field>
+				<Divider mbs={24} mbe={0} />
 				<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..a1132a7b0d618 100644
--- a/apps/meteor/client/views/account/profile/getProfileInitialValues.ts
+++ b/apps/meteor/client/views/account/profile/getProfileInitialValues.ts
@@ -1,6 +1,8 @@
 import type { AvatarObject, IUser } from '@rocket.chat/core-typings';
 
 import { getUserEmailAddress } from '../../../../lib/getUserEmailAddress';
+import type { UserStatusInitialValues } from '../../../lib/getUserInitialStatus';
+import { getUserStatusInitialValues } from '../../../lib/getUserInitialStatus';
 
 export type AccountProfileFormValues = {
 	email: string;
@@ -8,22 +10,21 @@ export type AccountProfileFormValues = {
 	username: string;
 	avatar: AvatarObject;
 	url: string;
-	statusText: string;
-	statusType: string;
 	bio: string;
 	customFields: Record<string, string>;
 	nickname: string;
-};
+} & UserStatusInitialValues;
 
-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 => {
+	return {
+		email: user ? getUserEmailAddress(user) || '' : '',
+		name: user?.name ?? '',
+		username: user?.username ?? '',
+		avatar: '' as AvatarObject,
+		url: '',
+		bio: user?.bio ?? '',
+		customFields: user?.customFields ?? {},
+		nickname: user?.nickname ?? '',
+		...getUserStatusInitialValues(user),
+	};
+};
diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
index bd4aafe002f4d..3c86835dd8964 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
@@ -13,6 +13,7 @@ import { FormSkeleton } from '../../../components/Skeleton';
 import { UserCardRole } from '../../../components/UserCard';
 import { UserInfo } from '../../../components/UserInfo';
 import { UserStatus } from '../../../components/UserStatus';
+import { UserStatusText } from '../../../components/UserStatusText';
 import { getUserEmailVerified } from '../../../lib/utils/getUserEmailVerified';
 
 type AdminUserInfoWithDataProps = {
@@ -60,6 +61,7 @@ const AdminUserInfoWithData = ({ uid, onReload, tab }: AdminUserInfoWithDataProp
 			roles = [],
 			status,
 			statusText,
+			statusExpiresAt,
 			bio,
 			utcOffset,
 			lastLogin,
@@ -88,7 +90,7 @@ const AdminUserInfoWithData = ({ uid, onReload, tab }: AdminUserInfoWithDataProp
 			email: getUserEmailAddress(data.user),
 			createdAt,
 			status: <UserStatus status={status} />,
-			statusText,
+			customStatus: <UserStatusText status={status} statusText={statusText} statusExpiresAt={statusExpiresAt} />,
 			nickname,
 			reason,
 			freeSwitchExtension,
diff --git a/apps/meteor/client/views/navigation/sidebar/RoomList/SidebarItem.tsx b/apps/meteor/client/views/navigation/sidebar/RoomList/SidebarItem.tsx
index f94a30524625e..4a4c7541ec6f5 100644
--- a/apps/meteor/client/views/navigation/sidebar/RoomList/SidebarItem.tsx
+++ b/apps/meteor/client/views/navigation/sidebar/RoomList/SidebarItem.tsx
@@ -25,7 +25,7 @@ const SidebarItem = ({ icon, title, actions, unread, menu, badges, room, ...prop
 	const { mounted: menuVisibility, requestMount, mountNow } = useDeferredMenuMount();
 
 	return (
-		<SidebarV2Item {...props} title={title} onFocus={mountNow} onPointerEnter={requestMount} aria-selected={props.selected}>
+		<SidebarV2Item {...props} onFocus={mountNow} onPointerEnter={requestMount} aria-selected={props.selected}>
 			<SidebarV2ItemAvatarWrapper>
 				<RoomAvatar size='x20' room={{ ...room, _id: room.rid || room._id, type: room.t }} />
 			</SidebarV2ItemAvatarWrapper>
diff --git a/apps/meteor/client/views/navigation/sidebar/RoomList/SidebarItemWithData.tsx b/apps/meteor/client/views/navigation/sidebar/RoomList/SidebarItemWithData.tsx
index 79b933e59ca3d..39ff4b678b081 100644
--- a/apps/meteor/client/views/navigation/sidebar/RoomList/SidebarItemWithData.tsx
+++ b/apps/meteor/client/views/navigation/sidebar/RoomList/SidebarItemWithData.tsx
@@ -2,13 +2,16 @@ import { isOmnichannelRoom } from '@rocket.chat/core-typings';
 import { SidebarV2Action, SidebarV2Actions, SidebarV2ItemIcon } from '@rocket.chat/fuselage';
 import { useButtonPattern } from '@rocket.chat/fuselage-hooks';
 import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
+import { useUserId } from '@rocket.chat/ui-contexts';
 import type { TFunction } from 'i18next';
 import type { AllHTMLAttributes } from 'react';
 import { memo, useMemo } from 'react';
 
 import SidebarItem from './SidebarItem';
 import { RoomIcon } from '../../../../components/RoomIcon';
+import { useUserStatusTooltip } from '../../../../hooks/useUserStatusTooltip';
 import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
+import { getUidDirectMessage } from '../../../../lib/utils/getUidDirectMessage';
 import { useRoomsListContext, useIsRoomFilter, useRedirectToFilter } from '../../contexts/RoomsNavigationContext';
 import SidebarItemBadges from '../badges/SidebarItemBadges';
 import { useUnreadDisplay } from '../hooks/useUnreadDisplay';
@@ -32,6 +35,9 @@ const SidebarItemWithData = ({ room, id, style, t, videoConfActions }: RoomListR
 	const title = roomCoordinator.getRoomName(room.t, room) || '';
 	const href = roomCoordinator.getRouteLink(room.t, room) || '';
 
+	const dmUserId = getUidDirectMessage(room, useUserId());
+	const dmStatusTooltipHandlers = useUserStatusTooltip(dmUserId, title);
+
 	const { unreadTitle, showUnread, highlightUnread: highlighted } = useUnreadDisplay(room);
 
 	const icon = (
@@ -76,6 +82,7 @@ const SidebarItemWithData = ({ room, id, style, t, videoConfActions }: RoomListR
 			room={room}
 			actions={actions}
 			{...buttonProps}
+			{...dmStatusTooltipHandlers}
 		/>
 	);
 };
diff --git a/apps/meteor/client/views/room/Header/RoomHeader.tsx b/apps/meteor/client/views/room/Header/RoomHeader.tsx
index 3d0cb83ebbcc6..0f6f1ad3c2f2a 100644
--- a/apps/meteor/client/views/room/Header/RoomHeader.tsx
+++ b/apps/meteor/client/views/room/Header/RoomHeader.tsx
@@ -7,6 +7,7 @@ import { useTranslation } from 'react-i18next';
 
 import FederatedRoomOriginServer from './FederatedRoomOriginServer';
 import ParentRoom from './ParentRoom';
+import RoomMemberStatus from './RoomMemberStatus';
 import RoomTitle from './RoomTitle';
 import RoomToolbox from './RoomToolbox';
 import RoomTopic from './RoomTopic';
@@ -47,6 +48,7 @@ const RoomHeader = ({ room, slots = {} }: RoomHeaderProps) => {
 					<Encrypted room={room} />
 					<Translate room={room} />
 					<RoomTopic room={room} />
+					<RoomMemberStatus room={room} />
 					{slots?.insideContent}
 				</HeaderContentRow>
 			</HeaderContent>
diff --git a/apps/meteor/client/views/room/Header/RoomMemberStatus.spec.tsx b/apps/meteor/client/views/room/Header/RoomMemberStatus.spec.tsx
new file mode 100644
index 0000000000000..dd7502b31edc6
--- /dev/null
+++ b/apps/meteor/client/views/room/Header/RoomMemberStatus.spec.tsx
@@ -0,0 +1,122 @@
+import { UserStatus } from '@rocket.chat/core-typings';
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
+import { render, screen } from '@testing-library/react';
+
+import RoomMemberStatus from './RoomMemberStatus';
+import FakeRoomProvider from '../../../../tests/mocks/client/FakeRoomProvider';
+import { createFakeRoom, createFakeSubscription, createFakeUser } from '../../../../tests/mocks/data';
+
+const user = createFakeUser({
+	active: true,
+	roles: ['admin'],
+	type: 'user',
+	status: UserStatus.ONLINE,
+});
+
+const user2 = createFakeUser({
+	active: true,
+	roles: ['admin'],
+	type: 'user',
+	statusText: 'Sample Status',
+	status: UserStatus.ONLINE,
+});
+
+const user3 = createFakeUser({
+	active: true,
+	roles: ['admin'],
+	type: 'user',
+	status: UserStatus.ONLINE,
+});
+
+const userWithExpiration = createFakeUser({
+	active: true,
+	roles: ['admin'],
+	type: 'user',
+	statusText: 'In a meeting',
+	statusExpiresAt: new Date(Date.now() + 60 * 60 * 1000),
+	status: UserStatus.BUSY,
+});
+
+describe('RoomMemberStatus', () => {
+	it('should render the statusText of the DM partner', () => {
+		const room = createFakeRoom({ t: 'd', uids: [user._id, user2._id] });
+		const subscription = createFakeSubscription({ t: 'd', rid: room._id });
+
+		render(
+			<FakeRoomProvider roomOverrides={room} subscriptionOverrides={subscription}>
+				<RoomMemberStatus room={room} />
+			</FakeRoomProvider>,
+			{
+				wrapper: mockAppRoot()
+					.withSubscriptions([{ ...subscription, ...room }] as unknown as SubscriptionWithRoom[])
+					.withUser(user)
+					.withUsers([user2])
+					.build(),
+			},
+		);
+
+		expect(screen.getByText('Sample Status')).toBeInTheDocument();
+	});
+
+	it('should expose the expiration text on the title attribute when the partner has one', () => {
+		const room = createFakeRoom({ t: 'd', uids: [user._id, userWithExpiration._id] });
+		const subscription = createFakeSubscription({ t: 'd', rid: room._id });
+
+		render(
+			<FakeRoomProvider roomOverrides={room} subscriptionOverrides={subscription}>
+				<RoomMemberStatus room={room} />
+			</FakeRoomProvider>,
+			{
+				wrapper: mockAppRoot()
+					.withSubscriptions([{ ...subscription, ...room }] as unknown as SubscriptionWithRoom[])
+					.withUser(user)
+					.withUsers([userWithExpiration])
+					.build(),
+			},
+		);
+
+		const wrapper = screen.getByText('In a meeting').closest('[title]');
+		expect(wrapper).toHaveAttribute('title');
+		expect(wrapper?.getAttribute('title')).not.toBe('');
+	});
+
+	it('should not render statusText for multi-user DMs (3+ participants)', () => {
+		const room = createFakeRoom({ t: 'd', uids: [user._id, user2._id, user3._id] });
+		const subscription = createFakeSubscription({ t: 'd', rid: room._id });
+
+		render(
+			<FakeRoomProvider roomOverrides={room} subscriptionOverrides={subscription}>
+				<RoomMemberStatus room={room} />
+			</FakeRoomProvider>,
+			{
+				wrapper: mockAppRoot()
+					.withSubscriptions([{ ...subscription, ...room }] as unknown as SubscriptionWithRoom[])
+					.withUser(user)
+					.withUsers([user2, user3])
+					.build(),
+			},
+		);
+
+		expect(screen.queryByText('Sample Status')).not.toBeInTheDocument();
+	});
+
+	it('should not render statusText for non-DM rooms', () => {
+		const room = createFakeRoom({ t: 'c' });
+		const subscription = createFakeSubscription({ t: 'c', rid: room._id });
+
+		render(
+			<FakeRoomProvider roomOverrides={room} subscriptionOverrides={subscription}>
+				<RoomMemberStatus room={room} />
+			</FakeRoomProvider>,
+			{
+				wrapper: mockAppRoot()
+					.withSubscriptions([{ ...subscription, ...room }] as unknown as SubscriptionWithRoom[])
+					.withUser(user)
+					.build(),
+			},
+		);
+
+		expect(screen.queryByText('Sample Status')).not.toBeInTheDocument();
+	});
+});
diff --git a/apps/meteor/client/views/room/Header/RoomMemberStatus.tsx b/apps/meteor/client/views/room/Header/RoomMemberStatus.tsx
new file mode 100644
index 0000000000000..60ec21bc7c57f
--- /dev/null
+++ b/apps/meteor/client/views/room/Header/RoomMemberStatus.tsx
@@ -0,0 +1,30 @@
+import type { IRoom } from '@rocket.chat/core-typings';
+import { Box } from '@rocket.chat/fuselage';
+import { useUserId, useUserPresence } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+
+import MarkdownText from '../../../components/MarkdownText';
+import { useExpirationText } from '../../../hooks/useExpirationText';
+import { getUidDirectMessage } from '../../../lib/utils/getUidDirectMessage';
+
+type RoomMemberStatusProps = {
+	room: IRoom;
+};
+
+const RoomMemberStatus = ({ room }: RoomMemberStatusProps): ReactElement | null => {
+	const directUserId = getUidDirectMessage(room, useUserId());
+	const presence = useUserPresence(directUserId);
+	const expirationText = useExpirationText(presence?.statusExpiresAt);
+
+	if (!presence?.statusText && !presence?.statusExpiresAt) {
+		return null;
+	}
+
+	return (
+		<Box title={expirationText}>
+			<MarkdownText content={presence?.statusText} parseEmoji={true} variant='inline' />
+		</Box>
+	);
+};
+
+export default RoomMemberStatus;
diff --git a/apps/meteor/client/views/room/Header/RoomTopic.spec.tsx b/apps/meteor/client/views/room/Header/RoomTopic.spec.tsx
index f360a20f40e3c..021d1565b486f 100644
--- a/apps/meteor/client/views/room/Header/RoomTopic.spec.tsx
+++ b/apps/meteor/client/views/room/Header/RoomTopic.spec.tsx
@@ -109,7 +109,7 @@ describe('RoomTopic', () => {
 		expect(screen.getByText('Sample Topic')).toBeInTheDocument();
 	});
 
-	it('should render statusText when statusText is present for direct message user and users length < 3', () => {
+	it('should not render the DM partner statusText (handled by RoomMemberStatus)', () => {
 		const room = createFakeRoom({ topic: '', t: 'd', uids: [user._id, user2._id] });
 		const subscription = createFakeSubscription({ t: 'd', rid: room._id });
 
@@ -127,28 +127,6 @@ describe('RoomTopic', () => {
 			},
 		);
 
-		expect(screen.queryByText('Add_topic')).not.toBeInTheDocument();
-		expect(screen.getByText('Sample Status')).toBeInTheDocument();
-	});
-
-	it('should not render statusText when statusText is present for direct message user and users length >= 3', () => {
-		const room = createFakeRoom({ topic: '', t: 'd', uids: [user._id, user2._id, user3._id] });
-		const subscription = createFakeSubscription({ t: 'd', rid: room._id });
-
-		render(
-			<FakeRoomProvider roomOverrides={room} subscriptionOverrides={subscription}>
-				<RoomTopic room={room} />
-			</FakeRoomProvider>,
-			{
-				wrapper: mockAppRoot()
-					.withSubscriptions([{ ...subscription, ...room }] as unknown as SubscriptionWithRoom[])
-					.withPermission('edit-room')
-					.withUser(user)
-					.withUsers([user2, user3])
-					.build(),
-			},
-		);
-
 		expect(screen.queryByText('Add_topic')).not.toBeInTheDocument();
 		expect(screen.queryByText('Sample Status')).not.toBeInTheDocument();
 	});
diff --git a/apps/meteor/client/views/room/Header/RoomTopic.tsx b/apps/meteor/client/views/room/Header/RoomTopic.tsx
index abe34ab0f3252..da8e54007ebd2 100644
--- a/apps/meteor/client/views/room/Header/RoomTopic.tsx
+++ b/apps/meteor/client/views/room/Header/RoomTopic.tsx
@@ -1,7 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { isDirectMessageRoom, isPrivateRoom, isPublicRoom, isTeamRoom } from '@rocket.chat/core-typings';
+import { 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 { useTranslation, useRouter } from '@rocket.chat/ui-contexts';
 
 import MarkdownText from '../../../components/MarkdownText';
 import { useCanEditRoom } from '../contextualBar/Info/hooks/useCanEditRoom';
@@ -13,15 +13,12 @@ type RoomTopicProps = {
 const RoomTopic = ({ room }: RoomTopicProps) => {
 	const t = useTranslation();
 	const canEdit = useCanEditRoom(room);
-	const userId = useUserId();
-	const directUserId = room.uids?.filter((uid) => uid !== userId).shift();
-	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 { topic } = room;
 	const canEditTopic = canEdit && (isPublicRoom(room) || isPrivateRoom(room));
 
 	if (!topic && !canEditTopic) {
diff --git a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
index 3b0c80db3351f..9029daaebb402 100644
--- a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
+++ b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
@@ -9,6 +9,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 { ReactiveUserStatusText } from '../../../components/UserStatusText';
 import { useUserInfoQuery } from '../../../hooks/useUserInfoQuery';
 import { useMemberExists } from '../../hooks/useMemberExists';
 import { useUserInfoActions } from '../hooks/useUserInfoActions';
@@ -44,7 +45,6 @@ const UserCardWithData = ({ username, rid, onOpenUserInfo, onClose }: UserCardWi
 			_id,
 			name,
 			roles = defaultValue,
-			statusText = defaultValue,
 			bio = defaultValue,
 			utcOffset = defaultValue,
 			nickname,
@@ -61,7 +61,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: _id && <ReactiveUserStatusText uid={_id} />,
 			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 f1d56343fe191..afd6601d5478c 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx
@@ -20,6 +20,7 @@ import { getUserDisplayNames } from '../../../../../lib/getUserDisplayNames';
 import InvitationBadge from '../../../../components/InvitationBadge';
 import { ReactiveUserStatus } from '../../../../components/UserStatus';
 import { usePreventPropagation } from '../../../../hooks/usePreventPropagation';
+import { useUserStatusTooltip } from '../../../../hooks/useUserStatusTooltip';
 import type { RoomMember } from '../../../hooks/useMembersList';
 
 type RoomMembersItemProps = Pick<RoomMember, 'federated' | 'username' | 'name' | '_id' | 'freeSwitchExtension' | 'subscription'> & {
@@ -41,18 +42,28 @@ const RoomMembersItem = ({
 	reload,
 	useRealName,
 }: RoomMembersItemProps) => {
-	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 statusTooltipHandlers = useUserStatusTooltip(_id);
+
+	const handleMenuEvent = isReduceMotionEnabled
+		? {
+				...statusTooltipHandlers,
+				onMouseEnter: (e: MouseEvent<HTMLElement>) => {
+					setShowButton(true);
+					statusTooltipHandlers.onMouseEnter(e);
+				},
+			}
+		: {
+				...statusTooltipHandlers,
+				onTransitionEnd: () => setShowButton(true),
+			};
+
 	return (
 		<Option
 			data-username={username}
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
index b84c0fdc6c800..96802025d20a5 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
@@ -20,6 +20,7 @@ import { FormSkeleton } from '../../../../components/Skeleton';
 import { UserCardRole } from '../../../../components/UserCard';
 import { UserInfo } from '../../../../components/UserInfo';
 import { ReactiveUserStatus } from '../../../../components/UserStatus';
+import { ReactiveUserStatusText } from '../../../../components/UserStatusText';
 import { usersQueryKeys } from '../../../../lib/queryKeys';
 import { getUserEmailVerified } from '../../../../lib/utils/getUserEmailVerified';
 
@@ -56,7 +57,6 @@ const UserInfoWithData = ({ uid, username, rid, invitationDate, onClose, onClick
 			name,
 			username,
 			roles = [],
-			statusText,
 			bio,
 			utcOffset,
 			lastLogin,
@@ -86,7 +86,7 @@ const UserInfoWithData = ({ uid, username, rid, invitationDate, onClose, onClick
 			utcOffset,
 			createdAt,
 			status: <ReactiveUserStatus uid={_id} />,
-			statusText,
+			customStatus: <ReactiveUserStatusText uid={_id} />,
 			nickname,
 			freeSwitchExtension,
 		};
diff --git a/apps/meteor/server/services/calendar/service.ts b/apps/meteor/server/services/calendar/service.ts
index 853ecab6c95a2..9e842397a5202 100644
--- a/apps/meteor/server/services/calendar/service.ts
+++ b/apps/meteor/server/services/calendar/service.ts
@@ -1,5 +1,5 @@
 import type { ICalendarService } from '@rocket.chat/core-services';
-import { ServiceClassInternal, api } from '@rocket.chat/core-services';
+import { Presence, ServiceClassInternal, api } from '@rocket.chat/core-services';
 import type { IUser, ICalendarEvent } from '@rocket.chat/core-typings';
 import { UserStatus } from '@rocket.chat/core-typings';
 import { cronJobs } from '@rocket.chat/cron';
@@ -8,12 +8,10 @@ import type { InsertionModel } from '@rocket.chat/model-typings';
 import { CalendarEvent, Users } from '@rocket.chat/models';
 import type { UpdateResult, DeleteResult } from 'mongodb';
 
-import { applyStatusChange } from './statusEvents/applyStatusChange';
-import { cancelUpcomingStatusChanges } from './statusEvents/cancelUpcomingStatusChanges';
-import { removeCronJobs } from './statusEvents/removeCronJobs';
 import { getShiftedTime } from './utils/getShiftedTime';
 import { settings } from '../../../app/settings/server';
 import { getUserPreference } from '../../../app/utils/server/lib/getUserPreference';
+import { i18n } from '../../lib/i18n';
 
 const logger = new Logger('Calendar');
 
@@ -44,6 +42,7 @@ export class CalendarService extends ServiceClassInternal implements ICalendarSe
 		await this.setupNextNotification();
 		if (busy !== false) {
 			await this.setupNextStatusChange();
+			await this.reconcileInProgressEvent(insertResult.insertedId);
 		}
 
 		return insertResult.insertedId;
@@ -83,6 +82,7 @@ export class CalendarService extends ServiceClassInternal implements ICalendarSe
 			await this.setupNextNotification();
 			if (busy !== false) {
 				await this.setupNextStatusChange();
+				await this.reconcileInProgressEvent(insertResult.insertedId);
 			}
 
 			return insertResult.insertedId;
@@ -93,6 +93,7 @@ export class CalendarService extends ServiceClassInternal implements ICalendarSe
 			await this.setupNextNotification();
 			if (busy !== false) {
 				await this.setupNextStatusChange();
+				await this.reconcileInProgressEvent(event._id);
 			}
 		}
 
@@ -135,10 +136,10 @@ export class CalendarService extends ServiceClassInternal implements ICalendarSe
 			await this.setupNextNotification();
 
 			if (startTime || endTime) {
-				await removeCronJobs(eventId, event.uid);
 				const isBusy = busy !== undefined ? busy : event.busy !== false;
 				if (isBusy) {
 					await this.setupNextStatusChange();
+					await this.reconcileInProgressEvent(eventId);
 				}
 			}
 		}
@@ -148,9 +149,8 @@ export class CalendarService extends ServiceClassInternal implements ICalendarSe
 
 	public async delete(eventId: ICalendarEvent['_id']): Promise<DeleteResult> {
 		const event = await this.get(eventId);
-		if (event) {
-			await removeCronJobs(eventId, event.uid);
-		}
+		const now = new Date();
+		const wasInProgress = Boolean(event && event.busy !== false && event.startTime <= now && (!event.endTime || event.endTime > now));
 
 		const result = await CalendarEvent.deleteOne({
 			_id: eventId,
@@ -158,6 +158,11 @@ export class CalendarService extends ServiceClassInternal implements ICalendarSe
 
 		if (result.deletedCount > 0) {
 			await this.setupNextStatusChange();
+
+			// deleting an in-progress busy event: recompute the claim from the events still active
+			if (event && wasInProgress) {
+				await this.syncBusyPresence(event.uid, { excludeEventId: eventId, now });
+			}
 		}
 
 		return result;
@@ -171,10 +176,6 @@ export class CalendarService extends ServiceClassInternal implements ICalendarSe
 		return this.doSetupNextStatusChange();
 	}
 
-	public async cancelUpcomingStatusChanges(uid: IUser['_id'], endTime = new Date()): Promise<void> {
-		return cancelUpcomingStatusChanges(uid, endTime);
-	}
-
 	private async getMeetingUrl(eventData: Partial<ICalendarEvent>): Promise<string | undefined> {
 		if (eventData.meetingUrl !== undefined) {
 			return eventData.meetingUrl || undefined;
@@ -205,139 +206,104 @@ export class CalendarService extends ServiceClassInternal implements ICalendarSe
 	}
 
 	private async doSetupNextStatusChange(): Promise<void> {
-		// This method is called in the following moments:
-		// 1. When a new busy event is created or imported
-		// 2. When a busy event is updated (time/busy status changes)
-		// 3. When a busy event is deleted
-		// 4. When a status change job executes and completes
-		// 5. When an event ends and the status is restored
-		// 6. From Outlook Calendar integration (ee/server/configuration/outlookCalendar.ts)
+		// Schedules only event starts; event end is handled by the presence engine's expiration cron.
+
+		const schedulerJobId = 'calendar-status-scheduler';
 
 		const busyStatusEnabled = settings.get<boolean>('Calendar_BusyStatus_Enabled');
 		if (!busyStatusEnabled) {
-			const schedulerJobId = 'calendar-status-scheduler';
 			if (await cronJobs.has(schedulerJobId)) {
 				await cronJobs.remove(schedulerJobId);
 			}
 			return;
 		}
 
-		const schedulerJobId = 'calendar-status-scheduler';
 		if (await cronJobs.has(schedulerJobId)) {
 			await cronJobs.remove(schedulerJobId);
 		}
 
-		const now = new Date();
-		const nextStartEvent = await CalendarEvent.findNextFutureEvent(now);
-		const inProgressEvents = await CalendarEvent.findInProgressEvents(now).toArray();
-		const eventsWithEndTime = inProgressEvents.filter((event) => event.endTime && event.busy !== false);
-		if (eventsWithEndTime.length === 0 && !nextStartEvent) {
-			return;
-		}
-
-		let nextEndTime: Date | null = null;
-		if (eventsWithEndTime.length > 0 && eventsWithEndTime[0].endTime) {
-			nextEndTime = eventsWithEndTime.reduce((earliest, event) => {
-				if (!event.endTime) return earliest;
-				return event.endTime.getTime() < earliest.getTime() ? event.endTime : earliest;
-			}, eventsWithEndTime[0].endTime);
-		}
-
-		let nextProcessTime: Date;
-		if (nextStartEvent && nextEndTime) {
-			nextProcessTime = nextStartEvent.startTime.getTime() < nextEndTime.getTime() ? nextStartEvent.startTime : nextEndTime;
-		} else if (nextStartEvent) {
-			nextProcessTime = nextStartEvent.startTime;
-		} else if (nextEndTime) {
-			nextProcessTime = nextEndTime;
-		} else {
-			// This should never happen due to the earlier check, but just in case
+		const nextStartEvent = await CalendarEvent.findNextFutureEvent(new Date());
+		if (!nextStartEvent) {
 			return;
 		}
 
-		await cronJobs.addAtTimestamp(schedulerJobId, nextProcessTime, async () => this.processStatusChangesAtTime());
+		await cronJobs.addAtTimestamp(schedulerJobId, nextStartEvent.startTime, async () => this.processStatusChangesAtTime());
 	}
 
 	private async processStatusChangesAtTime(): Promise<void> {
 		const processTime = new Date();
 
-		const eventsStartingNow = await CalendarEvent.findEventsStartingNow({ now: processTime, offset: 5000 }).toArray();
-		for await (const event of eventsStartingNow) {
-			if (event.busy === false) {
-				continue;
-			}
-			await this.processEventStart(event);
-		}
-
-		const eventsEndingNow = await CalendarEvent.findEventsEndingNow({ now: processTime, offset: 5000 }).toArray();
-		for await (const event of eventsEndingNow) {
-			if (event.busy === false) {
-				continue;
+		try {
+			const eventsStartingNow = await CalendarEvent.findEventsStartingNow({ now: processTime, offset: 5000 }).toArray();
+			for await (const event of eventsStartingNow) {
+				if (event.busy === false) {
+					continue;
+				}
+				await this.processEventStart(event);
 			}
-			await this.processEventEnd(event);
+		} catch (err) {
+			logger.error({ msg: 'Failed to process calendar status changes', err });
 		}
 
 		await this.doSetupNextStatusChange();
 	}
 
 	private async processEventStart(event: ICalendarEvent): Promise<void> {
+		// no endTime → no expiry to set, so the claim could never auto-clear
 		if (!event.endTime) {
 			return;
 		}
 
-		const user = await Users.findOneById(event.uid, { projection: { statusDefault: 1 } });
-		if (!user || user.statusDefault === UserStatus.OFFLINE) {
+		await this.syncBusyPresence(event.uid, { excludeEventId: event._id, seedEndTime: event.endTime });
+	}
+
+	// The start scheduler only fires at start times, so it misses an event imported already in progress.
+	private async reconcileInProgressEvent(eventId: ICalendarEvent['_id']): Promise<void> {
+		const event = await CalendarEvent.findOne({ _id: eventId });
+		if (!event?.endTime || event.busy === false) {
 			return;
 		}
 
-		const overlappingEvents = await CalendarEvent.findOverlappingEvents(event._id, event.uid, event.startTime, event.endTime)
-			.sort({ startTime: -1 })
-			.toArray();
-		const previousStatus = overlappingEvents.at(0)?.previousStatus ?? user.statusDefault;
-
-		if (previousStatus) {
-			await CalendarEvent.updateEvent(event._id, { previousStatus });
+		const now = new Date();
+		if (event.startTime > now || event.endTime <= now) {
+			return;
 		}
 
-		await applyStatusChange({
-			eventId: event._id,
-			uid: event.uid,
-			startTime: event.startTime,
-			endTime: event.endTime,
-			status: UserStatus.BUSY,
-		});
+		await this.syncBusyPresence(event.uid, { excludeEventId: event._id, seedEndTime: event.endTime, now });
 	}
 
-	private async processEventEnd(event: ICalendarEvent): Promise<void> {
-		if (!event.endTime) {
+	// Derives "busy until the latest active meeting ends" from the events in progress now and applies
+	// it as one calendar claim. `excludeEventId`/`seedEndTime` re-add the triggering event's own end.
+	private async syncBusyPresence(
+		uid: IUser['_id'],
+		{ excludeEventId, seedEndTime, now = new Date() }: { excludeEventId?: ICalendarEvent['_id']; seedEndTime?: Date; now?: Date } = {},
+	): Promise<void> {
+		if (!settings.get<boolean>('Calendar_BusyStatus_Enabled')) {
 			return;
 		}
 
-		const user = await Users.findOneById(event.uid, { projection: { statusDefault: 1 } });
-		if (!user) {
+		const overlappingEvents = await CalendarEvent.findOverlappingEvents(excludeEventId ?? '', uid, now, now).toArray();
+		const endTimes = [...(seedEndTime ? [seedEndTime] : []), ...overlappingEvents.map((event) => event.endTime)].filter(
+			(date): date is Date => Boolean(date),
+		);
+
+		// No busy event left → end the calendar claim (no-op if a higher-priority status took over).
+		if (endTimes.length === 0) {
+			await Presence.endActiveState(uid, this.name);
 			return;
 		}
 
-		// Only restore status if:
-		// 1. The current statusDefault is BUSY (meaning it was set by our system, not manually changed by user)
-		// 2. We have a previousStatus stored from before the event started
-
-		if (user.statusDefault === UserStatus.BUSY && event.previousStatus && event.previousStatus !== user.statusDefault) {
-			await applyStatusChange({
-				eventId: event._id,
-				uid: event.uid,
-				startTime: event.startTime,
-				endTime: event.endTime,
-				status: event.previousStatus,
-			});
-		} else {
-			logger.debug({
-				msg: 'Not restoring status for user',
-				userId: event.uid,
-				currentStatusDefault: user.statusDefault,
-				previousStatus: event.previousStatus,
-			});
-		}
+		const statusExpiresAt = endTimes.reduce((latest, date) => (date > latest ? date : latest));
+		const user = await Users.findOneById<Pick<IUser, '_id' | 'language'>>(uid, { projection: { language: 1 } });
+		const lng = user?.language || settings.get<string>('Language') || 'en';
+
+		await Presence.setActiveState(uid, {
+			statusDefault: UserStatus.BUSY,
+			statusText: i18n.t('Presence_status_outlook_in_a_meeting', { lng }),
+			statusSource: 'external',
+			statusExpiresAt,
+			statusId: this.name,
+		});
 	}
 
 	private async sendCurrentNotifications(date: Date): Promise<void> {
diff --git a/apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts b/apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
deleted file mode 100644
index 83ef6d78a0f6b..0000000000000
--- a/apps/meteor/server/services/calendar/statusEvents/applyStatusChange.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import { api } from '@rocket.chat/core-services';
-import { UserStatus } from '@rocket.chat/core-typings';
-import type { ICalendarEvent, IUser } from '@rocket.chat/core-typings';
-import { Logger } from '@rocket.chat/logger';
-import { Users } from '@rocket.chat/models';
-
-const logger = new Logger('Calendar');
-
-export async function applyStatusChange({
-	eventId,
-	uid,
-	startTime,
-	endTime,
-	status,
-}: {
-	eventId: ICalendarEvent['_id'];
-	uid: IUser['_id'];
-	startTime: Date;
-	endTime?: Date;
-	status?: UserStatus;
-	shouldScheduleRemoval?: boolean;
-}): Promise<void> {
-	const user = await Users.findOneById(uid, { projection: { roles: 1, username: 1, name: 1, statusDefault: 1 } });
-
-	if (!user || user.statusDefault === UserStatus.OFFLINE) {
-		logger.debug({
-			msg: 'Cannot apply status change for event, user is offline or does not exist',
-			eventId,
-			uid,
-		});
-
-		return;
-	}
-
-	const newStatus = status ?? UserStatus.BUSY;
-	const previousStatus = user.statusDefault;
-
-	logger.debug({
-		msg: 'Applying status change for event',
-		eventId,
-		user: { _id: uid, statusDefault: user?.statusDefault },
-		startTime,
-		endTime,
-		newStatus,
-		previousStatus,
-	});
-
-	let statusChanged = false;
-
-	if (newStatus === UserStatus.BUSY) {
-		await Users.updateStatusAndStatusDefault(uid, newStatus, newStatus);
-		statusChanged = true;
-	} else if (user.statusDefault === UserStatus.BUSY) {
-		await Users.updateStatusAndStatusDefault(uid, newStatus, newStatus);
-		statusChanged = true;
-	}
-
-	if (statusChanged) {
-		await api.broadcast('presence.status', {
-			user: {
-				status: newStatus,
-				_id: uid,
-				roles: user.roles,
-				username: user.username,
-				name: user.name,
-			},
-			previousStatus,
-		});
-	}
-}
diff --git a/apps/meteor/server/services/calendar/statusEvents/cancelUpcomingStatusChanges.ts b/apps/meteor/server/services/calendar/statusEvents/cancelUpcomingStatusChanges.ts
deleted file mode 100644
index aab3df3a7c7e2..0000000000000
--- a/apps/meteor/server/services/calendar/statusEvents/cancelUpcomingStatusChanges.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { IUser } from '@rocket.chat/core-typings';
-import { cronJobs } from '@rocket.chat/cron';
-import { CalendarEvent } from '@rocket.chat/models';
-
-import { generateCronJobId } from './generateCronJobId';
-import { settings } from '../../../../app/settings/server';
-
-export async function cancelUpcomingStatusChanges(uid: IUser['_id'], endTime = new Date()): Promise<void> {
-	const hasBusyStatusSetting = settings.get<boolean>('Calendar_BusyStatus_Enabled');
-	if (!hasBusyStatusSetting) {
-		return;
-	}
-
-	const events = await CalendarEvent.findEligibleEventsForCancelation(uid, endTime).toArray();
-
-	for await (const event of events) {
-		const statusChangeJobId = generateCronJobId(event._id, event.uid, 'status');
-		if (await cronJobs.has(statusChangeJobId)) {
-			await cronJobs.remove(statusChangeJobId);
-		}
-	}
-}
diff --git a/apps/meteor/server/services/calendar/statusEvents/generateCronJobId.ts b/apps/meteor/server/services/calendar/statusEvents/generateCronJobId.ts
deleted file mode 100644
index b007efb607eb2..0000000000000
--- a/apps/meteor/server/services/calendar/statusEvents/generateCronJobId.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { ICalendarEvent, IUser } from '@rocket.chat/core-typings';
-
-export function generateCronJobId(eventId: ICalendarEvent['_id'], uid: IUser['_id'], eventType: 'status' | 'reminder'): string {
-	if (!eventId || !uid || !eventType || (eventType !== 'status' && eventType !== 'reminder')) {
-		throw new Error('Missing required parameters. Please provide eventId, uid and eventType (status or reminder)');
-	}
-
-	if (eventType === 'status') {
-		return `calendar-presence-status-${eventId}-${uid}`;
-	}
-
-	return `calendar-reminder-${eventId}-${uid}`;
-}
diff --git a/apps/meteor/server/services/calendar/statusEvents/removeCronJobs.ts b/apps/meteor/server/services/calendar/statusEvents/removeCronJobs.ts
deleted file mode 100644
index 30c79098a3eaf..0000000000000
--- a/apps/meteor/server/services/calendar/statusEvents/removeCronJobs.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { ICalendarEvent, IUser } from '@rocket.chat/core-typings';
-import { cronJobs } from '@rocket.chat/cron';
-
-import { generateCronJobId } from './generateCronJobId';
-
-export async function removeCronJobs(eventId: ICalendarEvent['_id'], uid: IUser['_id']): Promise<void> {
-	const statusChangeJobId = generateCronJobId(eventId, uid, 'status');
-	const reminderJobId = generateCronJobId(eventId, uid, 'reminder');
-
-	if (await cronJobs.has(statusChangeJobId)) {
-		await cronJobs.remove(statusChangeJobId);
-	}
-
-	if (await cronJobs.has(reminderJobId)) {
-		await cronJobs.remove(reminderJobId);
-	}
-}
diff --git a/apps/meteor/server/services/media-call/service.ts b/apps/meteor/server/services/media-call/service.ts
index a4f3b39a13f25..df3e7838e3fbc 100644
--- a/apps/meteor/server/services/media-call/service.ts
+++ b/apps/meteor/server/services/media-call/service.ts
@@ -1,4 +1,4 @@
-import { api, ServiceClassInternal, type IMediaCallService, Authorization } from '@rocket.chat/core-services';
+import { api, Presence, ServiceClassInternal, type IMediaCallService, Authorization } from '@rocket.chat/core-services';
 import type {
 	IMediaCall,
 	IUser,
@@ -7,6 +7,7 @@ import type {
 	CallHistoryItemState,
 	IExternalMediaCallHistoryItem,
 } from '@rocket.chat/core-typings';
+import { UserStatus } from '@rocket.chat/core-typings';
 import { callServer, type IMediaCallServerSettings, getSignalsForExistingCall } from '@rocket.chat/media-calls';
 import type {
 	CallFeature,
@@ -34,6 +35,8 @@ export class MediaCallService extends ServiceClassInternal implements IMediaCall
 		super();
 		callServer.emitter.on('signalRequest', ({ toUid, signal }) => this.sendSignal(toUid, signal));
 		callServer.emitter.on('callUpdated', (params) => api.broadcast('media-call.updated', params));
+		callServer.emitter.on('callActivated', ({ callId, uids }) => this.setPresenceForUsers(uids, callId));
+		callServer.emitter.on('callEnded', ({ callId, uids }) => this.clearPresenceForUsers(uids, callId));
 		callServer.emitter.on('historyUpdate', ({ callId }) => setImmediate(() => this.saveCallToHistory(callId)));
 		callServer.emitter.on('pushNotificationRequest', ({ callId, event }) => sendVoipPushNotification(callId, event));
 		this.onEvent('media-call.updated', (params) => callServer.receiveCallUpdate(params));
@@ -258,8 +261,8 @@ export class MediaCallService extends ServiceClassInternal implements IMediaCall
 		}
 	}
 
-	private getLanguageForUser(user: IUser): string {
-		return user.language || settings.get('Language') || 'en';
+	private getLanguageForUser(language?: string): string {
+		return language || settings.get('Language') || 'en';
 	}
 
 	private async sendHistoryMessage(call: IMediaCall, room: IRoom): Promise<void> {
@@ -274,7 +277,7 @@ export class MediaCallService extends ServiceClassInternal implements IMediaCall
 		const skipNotifications = state !== 'not-answered' || call.hangupReason === 'rejected';
 		const i18nKey = callStateToTranslationKey(state).i18n?.key;
 
-		const msg = i18nKey ? i18n.t(i18nKey, { lng: this.getLanguageForUser(user) }) : '';
+		const msg = i18nKey ? i18n.t(i18nKey, { lng: this.getLanguageForUser(user.language) }) : '';
 		const duration = this.getCallDuration(call);
 
 		const record = getHistoryMessagePayload(state, duration, call._id, msg);
@@ -366,6 +369,37 @@ export class MediaCallService extends ServiceClassInternal implements IMediaCall
 		};
 	}
 
+	private async setPresenceForUsers(uids: IUser['_id'][], callId: IMediaCall['_id']): Promise<void> {
+		const users = await Users.findByIds<Pick<IUser, '_id' | 'language'>>(uids, { projection: { language: 1 } }).toArray();
+		const languageByUid = new Map(users.map((user) => [user._id, user.language]));
+
+		await Promise.all(
+			uids.map(async (uid) => {
+				try {
+					await Presence.setActiveState(uid, {
+						statusDefault: UserStatus.BUSY,
+						statusText: i18n.t('Presence_status_on_a_call', { lng: this.getLanguageForUser(languageByUid.get(uid)) }),
+						statusSource: 'internal',
+						statusId: callId,
+					});
+				} catch (err) {
+					logger.error({ msg: 'Failed to set presence for user on call', uid, err });
+				}
+			}),
+		);
+	}
+
+	private async clearPresenceForUsers(uids: IUser['_id'][], callId: IMediaCall['_id']): Promise<void> {
+		// pass callId so only this call's claim is cleared, never another claim that took over
+		await Promise.all(
+			uids.map((uid) =>
+				Presence.endActiveState(uid, callId).catch((err) =>
+					logger.error({ msg: 'Failed to clear presence for user after call', uid, err }),
+				),
+			),
+		);
+	}
+
 	private async sendSignal(toUid: IUser['_id'], signal: ServerMediaSignal): Promise<void> {
 		void api.broadcast('user.media-signal', { userId: toUid, signal });
 	}
diff --git a/apps/meteor/tests/data/utils.ts b/apps/meteor/tests/data/utils.ts
index ca6c85503d785..fe0c942e3f07a 100644
--- a/apps/meteor/tests/data/utils.ts
+++ b/apps/meteor/tests/data/utils.ts
@@ -4,6 +4,18 @@ import { expect } from 'chai';
 
 import { api, request, type PathWithoutPrefix } from './api-data';
 
+export function withTimeout<T>(fn: (signal: AbortSignal) => Promise<T>, ms: number): Promise<T> {
+	const controller = new AbortController();
+
+	const timeoutId = setTimeout(() => {
+		controller.abort();
+	}, ms);
+
+	return fn(controller.signal).finally(() => {
+		clearTimeout(timeoutId);
+	});
+}
+
 export const pagination = <TPath extends PathWithoutPrefix<Path>>(
 	apiEndpoint: TPath,
 	credentials: Credentials,
diff --git a/apps/meteor/tests/e2e/page-objects/account-profile.ts b/apps/meteor/tests/e2e/page-objects/account-profile.ts
index 0c1b9924ba45e..a64ad3aabc599 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.getByLabel('Clear status after');
+	}
+
+	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..3bb996564abc8 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,17 +7,89 @@ 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.getByLabel('Clear status 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.getByRole('alert').filter({ hasText: 'Expiration must be in the future' });
+	}
+
+	get durationMissingError() {
+		return this.root.getByRole('alert').filter({ hasText: 'Choose date and time' });
+	}
+
+	async selectStatusType(status: string): Promise<void> {
+		await this.statusTypeButton.click();
+		await this.page!.getByRole('option', { name: status }).click();
+	}
+
+	async setStatusMessage(message: string): Promise<void> {
+		await this.statusMessageInput.fill(message);
+	}
+
+	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> {
 		if (statusMessage !== undefined) {
-			await this.statusMessageInput.fill(statusMessage);
+			await this.setStatusMessage(statusMessage);
+		}
+		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.setStatusMessage(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..8fe76426b06ac 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/navbar.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/navbar.ts
@@ -119,6 +119,10 @@ export class Navbar {
 		return this.userMenu.getByRole('menuitemcheckbox', { name: 'Logout' });
 	}
 
+	get btnCustomStatus(): Locator {
+		return this.userMenu.getByRole('menuitemcheckbox', { name: 'Custom...' });
+	}
+
 	getUserProfileMenuOption(name: string): Locator {
 		return this.userMenu.getByRole('menuitemcheckbox', { name });
 	}
@@ -239,11 +243,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.btnCustomStatus.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..be956fa1b56c3 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');
 	});
@@ -64,14 +66,180 @@ test.describe.serial('Presence', () => {
 		});
 
 		test('should not save custom status as `undefined` if nothing changes', async ({ page }) => {
-			await test.step('change to empty status', async () => {
-				await poHomeChannel.navbar.changeUserCustomStatus();
-				expect(await page.evaluate(() => localStorage.getItem('fuselage-localStorage-Local_Custom_Status'))).not.toBe('undefined');
+			await poHomeChannel.navbar.openEditStatusModal();
+
+			const { editStatusModal } = poHomeChannel.navbar;
+
+			await test.step('Save stays disabled while the form is untouched', async () => {
+				await expect(editStatusModal.btnSubmit).toBeDisabled();
 			});
-			await test.step('save without changes', async () => {
-				await poHomeChannel.navbar.changeUserCustomStatus();
+
+			await test.step('closing without changes leaves stored status untouched', async () => {
+				await editStatusModal.close();
 				expect(await page.evaluate(() => localStorage.getItem('fuselage-localStorage-Local_Custom_Status'))).not.toBe('undefined');
 			});
 		});
+
+		test('should show both Custom Status action and 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.btnCustomStatus).toBeVisible();
+				await page.keyboard.press('Escape');
+			});
+
+			await test.step('after setting a status, Custom Status entry stays visible alongside the active row', async () => {
+				await poHomeChannel.navbar.changeUserCustomStatus(text);
+				await poHomeChannel.navbar.btnUserMenu.click();
+				await expect(poHomeChannel.navbar.btnCustomStatus).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.setStatusMessage('available');
+
+			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.setStatusMessage('available');
+
+			await editStatusModal.selectDuration('Choose date and time');
+
+			const today = new Date().toLocaleDateString('en-CA');
+
+			await editStatusModal.customDateInput.fill(today);
+			await editStatusModal.customTimeInput.fill('00:00');
+			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.setStatusMessage('available');
+
+			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.changeUserStatus('online');
+			});
+		});
+
+		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.changeUserStatus('online');
+
+				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/apps/meteor/tests/end-to-end/api/calendar.ts b/apps/meteor/tests/end-to-end/api/calendar.ts
index c15e26b9948d6..f80f4354172f0 100644
--- a/apps/meteor/tests/end-to-end/api/calendar.ts
+++ b/apps/meteor/tests/end-to-end/api/calendar.ts
@@ -8,6 +8,7 @@ import { sleep } from '../../../lib/utils/sleep';
 import { getCredentials, api, request, credentials } from '../../data/api-data';
 import { password } from '../../data/user';
 import { createUser, deleteUser, login } from '../../data/users.helper';
+import { withTimeout } from '../../data/utils';
 import { IS_EE } from '../../e2e/config/constants';
 
 describe('[Calendar Events]', () => {
@@ -668,14 +669,29 @@ describe('[Calendar Events]', () => {
 
 	(IS_EE ? describe : describe.skip)('[Calendar Events Status Sync]', () => {
 		before(async () => {
-			await request.post('/api/v1/users.setStatus').set(userCredentials).send({ status: 'away' }).expect(200);
-		});
-
-		it('should set user status to busy during event and restore manual status after event ends', async () => {
+			await request.post('/api/v1/users.setStatus').set(userCredentials).send({ status: 'online' }).expect(200);
+		});
+
+		// claim apply/clear land asynchronously, so poll instead of asserting on a fixed sleep
+		const waitForStatusSource = (
+			predicate: (source: string | undefined) => boolean,
+			{ timeout = 15000, interval = 500 } = {},
+		): Promise<string | undefined> =>
+			withTimeout(async (signal) => {
+				for (;;) {
+					const res = await request.get('/api/v1/users.getStatus').set(userCredentials).expect(200);
+					const source = res.body.statusSource;
+					if (predicate(source) || signal.aborted) {
+						return source;
+					}
+					await sleep(interval);
+				}
+			}, timeout);
+
+		it('should apply a calendar (external) claim for an in-progress event and clear it when removed', async () => {
 			const now = new Date();
-			const startTime = new Date(now.getTime() + 1000);
-			// Event cannot be less than 5 secs in duration, otherwise `processStatusChangesAtTime` would trigger both start/end status changes at the same time, due to the 5s offset
-			const endTime = new Date(startTime.getTime() + 6000);
+			const startTime = new Date(now.getTime() - 1000);
+			const endTime = new Date(now.getTime() + 60 * 60 * 1000);
 
 			const eventPayload = {
 				startTime: startTime.toISOString(),
@@ -689,17 +705,16 @@ describe('[Calendar Events]', () => {
 			const createResponse = await request.post('/api/v1/calendar-events.create').set(userCredentials).send(eventPayload).expect(200);
 			const eventId = createResponse.body.id;
 
-			await sleep(3000);
-
-			const statusResponseDuring = await request.get('/api/v1/users.getStatus').set(userCredentials).expect(200);
-			expect(statusResponseDuring.body.status).to.equal('busy');
+			// REST-only user has no DDP session, so assert the claim via statusSource, not display status
+			expect(await waitForStatusSource((source) => source === 'external')).to.equal('external');
 
-			await sleep(5000);
-
-			const statusResponseAfter = await request.get('/api/v1/users.getStatus').set(userCredentials).expect(200);
-			expect(statusResponseAfter.body.status).to.equal('away');
+			// the claim must carry the event's endTime as its expiry, so the presence engine can auto-clear it
+			const status = await request.get('/api/v1/users.getStatus').set(userCredentials).expect(200);
+			expect(new Date(status.body.statusExpiresAt).getTime()).to.equal(endTime.getTime());
 
 			await request.post('/api/v1/calendar-events.delete').set(userCredentials).send({ eventId }).expect(200);
+
+			expect(await waitForStatusSource((source) => source === undefined)).to.be.undefined;
 		});
 	});
 });
diff --git a/apps/meteor/tests/end-to-end/api/users.ts b/apps/meteor/tests/end-to-end/api/users.ts
index f5ea0a1f11d64..06558c10fcfd6 100644
--- a/apps/meteor/tests/end-to-end/api/users.ts
+++ b/apps/meteor/tests/end-to-end/api/users.ts
@@ -1848,6 +1848,34 @@ describe('[Users]', () => {
 					})
 					.end(done);
 			});
+
+			it('should return an offline user that still carries a custom status (vacation text/expiration survives offline)', async () => {
+				const vacationUser = await createUser();
+				const vacationCredentials = await login(vacationUser.username, password);
+				const expiresAt = new Date(Date.now() + 60 * 60 * 1000).toISOString();
+
+				await request
+					.post(api('users.setStatus'))
+					.set(vacationCredentials)
+					.send({ status: 'offline', message: 'On vacation', expiresAt })
+					.expect(200);
+
+				const res = await request
+					.get(api('users.presence'))
+					.query({ ids: vacationUser._id })
+					.set(credentials)
+					.expect('Content-Type', 'application/json')
+					.expect(200);
+
+				expect(res.body).to.have.property('success', true);
+				const returned = (res.body.users as IUser[]).find((u) => u._id === vacationUser._id);
+				expect(returned, 'offline user with a custom status must be returned by users.presence').to.not.be.undefined;
+				expect(returned).to.have.property('status', 'offline');
+				expect(returned).to.have.property('statusText', 'On vacation');
+				expect(returned).to.have.property('statusExpiresAt');
+
+				await deleteUser(vacationUser);
+			});
 		});
 	});
 
@@ -5658,7 +5686,7 @@ describe('[Users]', () => {
 					.set(credentials)
 					.send({
 						status: 'busy',
-						message: '',
+						message: 'test',
 					})
 					.expect('Content-Type', 'application/json')
 					.expect(400)
diff --git a/apps/meteor/tests/end-to-end/apps/presence-state.ts b/apps/meteor/tests/end-to-end/apps/presence-state.ts
index 41fec5458a575..a52f40a553008 100644
--- a/apps/meteor/tests/end-to-end/apps/presence-state.ts
+++ b/apps/meteor/tests/end-to-end/apps/presence-state.ts
@@ -1,6 +1,6 @@
 import type { App } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
-import { after, before, describe, it } from 'mocha';
+import { after, afterEach, before, describe, it } from 'mocha';
 
 import { getCredentials, request, credentials } from '../../data/api-data';
 import { appPresenceStateTest } from '../../data/apps/app-packages';
@@ -22,6 +22,15 @@ import { IS_EE } from '../../e2e/config/constants';
 
 	after(() => cleanupApps());
 
+	afterEach(async () => {
+		const user = await getUserByUsername(adminUsername);
+		await request
+			.post(apps(`/public/${app.id}/end-active-state`))
+			.set(credentials)
+			.send({ userId: user._id })
+			.expect(200);
+	});
+
 	describe('[setActiveState]', () => {
 		it('should set the user presence with status text and source', async () => {
 			const user = await getUserByUsername(adminUsername);
@@ -44,10 +53,20 @@ import { IS_EE } from '../../e2e/config/constants';
 	});
 
 	describe('[endActiveState]', () => {
-		it('should restore the user presence to previous state', async () => {
+		it('should restore the displaced same-priority state and reset once the queue is exhausted', async () => {
 			const user = await getUserByUsername(adminUsername);
 
-			// First set an active state
+			await request
+				.post(apps(`/public/${app.id}/set-active-state`))
+				.set(credentials)
+				.send({
+					userId: user._id,
+					statusDefault: 'busy',
+					statusText: 'In a meeting',
+					statusSource: 'internal',
+				})
+				.expect(200);
+
 			await request
 				.post(apps(`/public/${app.id}/set-active-state`))
 				.set(credentials)
@@ -59,16 +78,25 @@ import { IS_EE } from '../../e2e/config/constants';
 				})
 				.expect(200);
 
-			// Then end it
 			await request
 				.post(apps(`/public/${app.id}/end-active-state`))
 				.set(credentials)
 				.send({ userId: user._id })
 				.expect(200);
 
-			const updatedUser = await getUserByUsername(adminUsername);
-			expect(updatedUser.statusText).to.not.equal('On a call');
-			expect(updatedUser.statusSource).to.not.equal('internal');
+			const restoredUser = await getUserByUsername(adminUsername);
+			expect(restoredUser.statusText).to.equal('In a meeting');
+			expect(restoredUser.statusSource).to.equal('internal');
+
+			await request
+				.post(apps(`/public/${app.id}/end-active-state`))
+				.set(credentials)
+				.send({ userId: user._id })
+				.expect(200);
+
+			const clearedUser = await getUserByUsername(adminUsername);
+			expect(clearedUser.statusText).to.equal('');
+			expect(clearedUser.statusSource).to.be.undefined;
 		});
 	});
 });
diff --git a/apps/meteor/tests/unit/server/services/calendar/service.tests.ts b/apps/meteor/tests/unit/server/services/calendar/service.tests.ts
index e071b65c763e8..740ab5fb0e56b 100644
--- a/apps/meteor/tests/unit/server/services/calendar/service.tests.ts
+++ b/apps/meteor/tests/unit/server/services/calendar/service.tests.ts
@@ -21,32 +21,32 @@ const CalendarEventMock = {
 	findEventsToNotify: sinon.stub(),
 	flagNotificationSent: sinon.stub(),
 	findOneByExternalIdAndUserId: sinon.stub(),
-	findEventsToScheduleNow: sinon.stub(),
 	findNextFutureEvent: sinon.stub(),
-	findInProgressEvents: sinon.stub(),
+	findOverlappingEvents: sinon.stub(),
 };
 
-const UsersMock = {
-	findOne: sinon.stub(),
+const PresenceMock = {
+	setActiveState: sinon.stub().resolves(),
+	endActiveState: sinon.stub().resolves(),
 };
 
-const statusEventManagerMock = {
-	removeCronJobs: sinon.stub().resolves(),
-	cancelUpcomingStatusChanges: sinon.stub().resolves(),
-	applyStatusChange: sinon.stub().resolves(),
+const UsersMock = {
+	findOneById: sinon.stub().resolves({ language: 'en' }),
 };
 
 const getUserPreferenceMock = sinon.stub();
 
 const serviceMocks = {
-	'./statusEvents/cancelUpcomingStatusChanges': { cancelUpcomingStatusChanges: statusEventManagerMock.cancelUpcomingStatusChanges },
-	'./statusEvents/removeCronJobs': { removeCronJobs: statusEventManagerMock.removeCronJobs },
-	'./statusEvents/applyStatusChange': { applyStatusChange: statusEventManagerMock.applyStatusChange },
 	'../../../app/settings/server': { settings: settingsMock },
-	'@rocket.chat/core-services': { api, ServiceClassInternal: class {} },
+	'@rocket.chat/core-services': {
+		api,
+		ServiceClassInternal: class {},
+		Presence: PresenceMock,
+	},
 	'@rocket.chat/cron': { cronJobs: cronJobsMock },
 	'@rocket.chat/models': { CalendarEvent: CalendarEventMock, Users: UsersMock },
 	'../../../app/utils/server/lib/getUserPreference': { getUserPreference: getUserPreferenceMock },
+	'../../lib/i18n': { i18n: { t: sinon.stub().returns('Outlook: In a meeting') } },
 };
 
 const { CalendarService } = proxyquire.noCallThru().load('../../../../../server/services/calendar/service', serviceMocks);
@@ -68,7 +68,7 @@ describe('CalendarService', () => {
 		service = new CalendarService();
 		stubServiceMethods();
 		setupCalendarEventMocks();
-		setupStatusEventManagerMocks();
+		setupPresenceMocks();
 		setupOtherMocks();
 	});
 
@@ -102,11 +102,9 @@ describe('CalendarService', () => {
 			}),
 			flagNotificationSent: sinon.stub().resolves(),
 			findOneByExternalIdAndUserId: sinon.stub().resolves(null),
-			findEventsToScheduleNow: sinon.stub().returns({
-				toArray: sinon.stub().resolves([]),
-			}),
 			findNextFutureEvent: sinon.stub().resolves(null),
-			findInProgressEvents: sinon.stub().returns({
+			findOverlappingEvents: sinon.stub().returns({
+				next: sinon.stub().resolves(null),
 				toArray: sinon.stub().resolves([]),
 			}),
 		};
@@ -114,8 +112,11 @@ describe('CalendarService', () => {
 		Object.assign(CalendarEventMock, freshMocks);
 	}
 
-	function setupStatusEventManagerMocks() {
-		Object.values(statusEventManagerMock).forEach((stub) => stub.resetHistory());
+	function setupPresenceMocks() {
+		PresenceMock.setActiveState.resetHistory();
+		PresenceMock.endActiveState.resetHistory();
+		UsersMock.findOneById.resetHistory();
+		UsersMock.findOneById.resolves({ language: 'en' });
 	}
 
 	function setupOtherMocks() {
@@ -227,7 +228,7 @@ describe('CalendarService', () => {
 			sinon.assert.calledWith(CalendarEventMock.updateEvent, fakeEventId, sinon.match.has('subject', 'Updated Subject'));
 		});
 
-		it('should update cron jobs when start/end times change', async () => {
+		it('should reschedule the status change when start/end times change', async () => {
 			const fakeEvent = {
 				_id: fakeEventId,
 				uid: fakeUserId,
@@ -246,13 +247,12 @@ describe('CalendarService', () => {
 				endTime: newEndTime,
 			});
 
-			sinon.assert.calledOnce(statusEventManagerMock.removeCronJobs);
 			sinon.assert.calledOnce(service.setupNextStatusChange);
 		});
 	});
 
 	describe('#delete', () => {
-		it('should delete an event and remove cron jobs', async () => {
+		it('should delete an event', async () => {
 			const fakeEvent = {
 				_id: fakeEventId,
 				uid: fakeUserId,
@@ -264,9 +264,64 @@ describe('CalendarService', () => {
 
 			await service.delete(fakeEventId);
 
-			sinon.assert.calledOnce(statusEventManagerMock.removeCronJobs);
 			sinon.assert.calledWith(CalendarEventMock.deleteOne, { _id: fakeEventId });
 		});
+
+		it('should lower the busy expiry to the remaining active event when deleting an overlapping in-progress event', async () => {
+			const t = Date.now();
+			CalendarEventMock.findOne.resolves({
+				_id: fakeEventId,
+				uid: fakeUserId,
+				startTime: new Date(t - 60 * 1000),
+				endTime: new Date(t + 120 * 60 * 1000),
+			});
+			CalendarEventMock.findOverlappingEvents.returns({
+				next: sinon.stub().resolves(null),
+				toArray: sinon.stub().resolves([{ _id: 'remaining', endTime: new Date(t + 30 * 60 * 1000) }]),
+			});
+
+			await service.delete(fakeEventId);
+
+			sinon.assert.calledOnce(PresenceMock.setActiveState);
+			sinon.assert.notCalled(PresenceMock.endActiveState);
+			const [uid, state] = PresenceMock.setActiveState.firstCall.args;
+			expect(uid).to.equal(fakeUserId);
+			expect(state.statusExpiresAt.getTime()).to.equal(t + 30 * 60 * 1000);
+		});
+
+		it('should end the busy state when deleting the only active in-progress event', async () => {
+			const t = Date.now();
+			CalendarEventMock.findOne.resolves({
+				_id: fakeEventId,
+				uid: fakeUserId,
+				startTime: new Date(t - 60 * 1000),
+				endTime: new Date(t + 60 * 60 * 1000),
+			});
+			CalendarEventMock.findOverlappingEvents.returns({
+				next: sinon.stub().resolves(null),
+				toArray: sinon.stub().resolves([]),
+			});
+
+			await service.delete(fakeEventId);
+
+			sinon.assert.calledOnceWithExactly(PresenceMock.endActiveState, fakeUserId, 'calendar');
+			sinon.assert.notCalled(PresenceMock.setActiveState);
+		});
+
+		it('should not touch presence when deleting an event that is not in progress', async () => {
+			const t = Date.now();
+			CalendarEventMock.findOne.resolves({
+				_id: fakeEventId,
+				uid: fakeUserId,
+				startTime: new Date(t + 60 * 60 * 1000),
+				endTime: new Date(t + 120 * 60 * 1000),
+			});
+
+			await service.delete(fakeEventId);
+
+			sinon.assert.notCalled(PresenceMock.endActiveState);
+			sinon.assert.notCalled(PresenceMock.setActiveState);
+		});
 	});
 
 	describe('#setupNextNotification', () => {
@@ -331,8 +386,8 @@ describe('CalendarService', () => {
 
 				try {
 					await method();
-					sinon.assert.calledWith(hasStub, 'calendar-next-status-change');
-					sinon.assert.calledWith(removeStub, 'calendar-next-status-change');
+					sinon.assert.calledWith(hasStub, 'calendar-status-scheduler');
+					sinon.assert.calledWith(removeStub, 'calendar-status-scheduler');
 					sinon.assert.notCalled(addAtTimestampStub);
 				} finally {
 					cronJobsMock.has = originalHas;
@@ -342,34 +397,17 @@ describe('CalendarService', () => {
 			});
 		});
 
-		it('should schedule a single chain job to handle all events when busy status setting is enabled', async () => {
+		it('should schedule a job at the next event start time', async () => {
 			await testPrivateMethod(service, 'doSetupNextStatusChange', async (method) => {
 				settingsMock.set('Calendar_BusyStatus_Enabled', true);
 
-				const startOfNextMinute = new Date();
-				startOfNextMinute.setSeconds(0, 0);
-				startOfNextMinute.setMinutes(startOfNextMinute.getMinutes() + 1);
-
-				const endOfNextMinute = new Date(startOfNextMinute);
-				endOfNextMinute.setMinutes(startOfNextMinute.getMinutes() + 1);
-
-				const eventStartingSoon = {
-					_id: 'soon123',
-					uid: fakeUserId,
-					startTime: startOfNextMinute,
-					endTime: new Date(startOfNextMinute.getTime() + 3600000), // 1 hour later
-				};
-
 				const futureEvent = {
 					_id: 'future123',
 					uid: fakeUserId,
-					startTime: endOfNextMinute,
-					endTime: new Date(endOfNextMinute.getTime() + 3600000), // 1 hour later
+					startTime: new Date(Date.now() + 60000),
+					endTime: new Date(Date.now() + 3660000),
 				};
 
-				CalendarEventMock.findEventsToScheduleNow.returns({
-					toArray: sinon.stub().resolves([eventStartingSoon]),
-				});
 				CalendarEventMock.findNextFutureEvent.resolves(futureEvent);
 
 				const originalHas = cronJobsMock.has;
@@ -387,14 +425,8 @@ describe('CalendarService', () => {
 				try {
 					await method();
 
-					sinon.assert.calledWith(hasStub, 'calendar-next-status-change');
-					sinon.assert.notCalled(removeStub);
-
 					sinon.assert.calledOnce(addAtTimestampStub);
-
-					sinon.assert.calledWith(addAtTimestampStub, 'calendar-next-status-change', futureEvent.startTime, sinon.match.func);
-
-					sinon.assert.neverCalledWith(addAtTimestampStub, sinon.match(/^calendar-status-/), sinon.match.any, sinon.match.any);
+					sinon.assert.calledWith(addAtTimestampStub, 'calendar-status-scheduler', futureEvent.startTime, sinon.match.func);
 				} finally {
 					cronJobsMock.has = originalHas;
 					cronJobsMock.remove = originalRemove;
@@ -403,21 +435,10 @@ describe('CalendarService', () => {
 			});
 		});
 
-		it('should fetch events at execution time rather than scheduling them individually', async () => {
+		it('should not schedule a job when there are no future events', async () => {
 			await testPrivateMethod(service, 'doSetupNextStatusChange', async (method) => {
 				settingsMock.set('Calendar_BusyStatus_Enabled', true);
 
-				const now = new Date();
-				const startOfNextMinute = new Date(now);
-				startOfNextMinute.setSeconds(0, 0);
-				startOfNextMinute.setMinutes(startOfNextMinute.getMinutes() + 1);
-
-				const endOfNextMinute = new Date(startOfNextMinute);
-				endOfNextMinute.setMinutes(startOfNextMinute.getMinutes() + 1);
-
-				CalendarEventMock.findEventsToScheduleNow.returns({
-					toArray: sinon.stub().resolves([]),
-				});
 				CalendarEventMock.findNextFutureEvent.resolves(null);
 
 				const originalHas = cronJobsMock.has;
@@ -435,14 +456,7 @@ describe('CalendarService', () => {
 				try {
 					await method();
 
-					sinon.assert.calledWith(addAtTimestampStub, 'calendar-next-status-change', endOfNextMinute, sinon.match.func);
-
-					const callback = addAtTimestampStub.firstCall.args[2];
-					const doSetupNextStatusChangeStub = sinon.stub(service, 'doSetupNextStatusChange').resolves();
-					await callback();
-
-					sinon.assert.calledOnce(doSetupNextStatusChangeStub);
-					doSetupNextStatusChangeStub.restore();
+					sinon.assert.notCalled(addAtTimestampStub);
 				} finally {
 					cronJobsMock.has = originalHas;
 					cronJobsMock.remove = originalRemove;
@@ -452,14 +466,171 @@ describe('CalendarService', () => {
 		});
 	});
 
-	describe('Overlapping events', () => {
-		it('should cancel upcoming status changes for a user', async () => {
-			const customDate = new Date('2025-02-01');
+	describe('Private: processEventStart', () => {
+		// await directly: testPrivateMethod doesn't await its callback, so async assertions wouldn't fail
+		const callProcessEventStart = (event: unknown) => (service as any).processEventStart(event);
+
+		it('should set statusExpiresAt to the latest endTime among overlapping active events', async () => {
+			const now = Date.now();
+			const event = {
+				_id: fakeEventId,
+				uid: fakeUserId,
+				startTime: new Date(now - 1000),
+				endTime: new Date(now + 60 * 60 * 1000),
+			};
+
+			CalendarEventMock.findOverlappingEvents.returns({
+				next: sinon.stub().resolves(null),
+				toArray: sinon.stub().resolves([
+					{ _id: 'later', endTime: new Date(now + 120 * 60 * 1000) },
+					{ _id: 'earlier', endTime: new Date(now + 30 * 60 * 1000) },
+				]),
+			});
+
+			await callProcessEventStart(event);
+
+			sinon.assert.calledOnce(PresenceMock.setActiveState);
+			const [uid, state] = PresenceMock.setActiveState.firstCall.args;
+			expect(uid).to.equal(fakeUserId);
+			expect(state.statusSource).to.equal('external');
+			expect(state.statusExpiresAt.getTime()).to.equal(now + 120 * 60 * 1000);
+			expect(state.statusId).to.equal('calendar');
+			expect(state.statusText).to.equal('Outlook: In a meeting');
+		});
+
+		it('should use the event own endTime when there are no overlapping events', async () => {
+			const now = Date.now();
+			const endTime = new Date(now + 60 * 60 * 1000);
+			const event = {
+				_id: fakeEventId,
+				uid: fakeUserId,
+				startTime: new Date(now - 1000),
+				endTime,
+			};
+
+			await callProcessEventStart(event);
+
+			sinon.assert.calledOnce(PresenceMock.setActiveState);
+			const [, state] = PresenceMock.setActiveState.firstCall.args;
+			expect(state.statusExpiresAt.getTime()).to.equal(endTime.getTime());
+		});
+
+		it('should not apply busy status when the event has no endTime', async () => {
+			const event = {
+				_id: fakeEventId,
+				uid: fakeUserId,
+				startTime: new Date(),
+			};
+
+			await callProcessEventStart(event);
+
+			sinon.assert.notCalled(PresenceMock.setActiveState);
+		});
+	});
+
+	describe('Private: reconcileInProgressEvent', () => {
+		const callReconcile = (eventId: string) => (service as any).reconcileInProgressEvent(eventId);
+		const now = () => Date.now();
+
+		it('applies the busy claim for an in-progress event using its endTime', async () => {
+			const t = now();
+			CalendarEventMock.findOne.resolves({
+				_id: fakeEventId,
+				uid: fakeUserId,
+				startTime: new Date(t - 60 * 1000),
+				endTime: new Date(t + 60 * 60 * 1000),
+			});
+
+			await callReconcile(fakeEventId);
+
+			sinon.assert.calledOnce(PresenceMock.setActiveState);
+			sinon.assert.notCalled(PresenceMock.endActiveState);
+			const [uid, state] = PresenceMock.setActiveState.firstCall.args;
+			expect(uid).to.equal(fakeUserId);
+			expect(state.statusSource).to.equal('external');
+			expect(state.statusExpiresAt.getTime()).to.equal(t + 60 * 60 * 1000);
+		});
+
+		it('extends the busy claim to the latest end among overlapping in-progress events', async () => {
+			const t = now();
+			CalendarEventMock.findOne.resolves({
+				_id: fakeEventId,
+				uid: fakeUserId,
+				startTime: new Date(t - 60 * 1000),
+				endTime: new Date(t + 30 * 60 * 1000),
+			});
+			CalendarEventMock.findOverlappingEvents.returns({
+				next: sinon.stub().resolves(null),
+				toArray: sinon.stub().resolves([{ _id: 'longer', endTime: new Date(t + 90 * 60 * 1000) }]),
+			});
+
+			await callReconcile(fakeEventId);
+
+			sinon.assert.calledOnce(PresenceMock.setActiveState);
+			const [, state] = PresenceMock.setActiveState.firstCall.args;
+			expect(state.statusExpiresAt.getTime()).to.equal(t + 90 * 60 * 1000);
+		});
+
+		it('does nothing for an event that has not started yet', async () => {
+			const t = now();
+			CalendarEventMock.findOne.resolves({
+				_id: fakeEventId,
+				uid: fakeUserId,
+				startTime: new Date(t + 60 * 60 * 1000),
+				endTime: new Date(t + 120 * 60 * 1000),
+			});
+
+			await callReconcile(fakeEventId);
+
+			sinon.assert.notCalled(PresenceMock.setActiveState);
+			sinon.assert.notCalled(PresenceMock.endActiveState);
+		});
+
+		it('does nothing for an event that has already ended', async () => {
+			const t = now();
+			CalendarEventMock.findOne.resolves({
+				_id: fakeEventId,
+				uid: fakeUserId,
+				startTime: new Date(t - 120 * 60 * 1000),
+				endTime: new Date(t - 60 * 60 * 1000),
+			});
+
+			await callReconcile(fakeEventId);
+
+			sinon.assert.notCalled(PresenceMock.setActiveState);
+			sinon.assert.notCalled(PresenceMock.endActiveState);
+		});
+
+		it('does nothing for a non-busy event', async () => {
+			const t = now();
+			CalendarEventMock.findOne.resolves({
+				_id: fakeEventId,
+				uid: fakeUserId,
+				startTime: new Date(t - 60 * 1000),
+				endTime: new Date(t + 60 * 60 * 1000),
+				busy: false,
+			});
+
+			await callReconcile(fakeEventId);
+
+			sinon.assert.notCalled(PresenceMock.setActiveState);
+			sinon.assert.notCalled(PresenceMock.endActiveState);
+		});
+
+		it('does nothing when busy status is disabled', async () => {
+			settingsMock.set('Calendar_BusyStatus_Enabled', false);
+			const t = now();
+			CalendarEventMock.findOne.resolves({
+				_id: fakeEventId,
+				uid: fakeUserId,
+				startTime: new Date(t - 60 * 1000),
+				endTime: new Date(t + 60 * 60 * 1000),
+			});
 
-			await service.cancelUpcomingStatusChanges(fakeUserId, customDate);
+			await callReconcile(fakeEventId);
 
-			sinon.assert.calledOnce(statusEventManagerMock.cancelUpcomingStatusChanges);
-			sinon.assert.calledWith(statusEventManagerMock.cancelUpcomingStatusChanges, fakeUserId, customDate);
+			sinon.assert.notCalled(PresenceMock.setActiveState);
+			sinon.assert.notCalled(PresenceMock.endActiveState);
 		});
 	});
 });
diff --git a/apps/meteor/tests/unit/server/services/calendar/statusEvents/applyStatusChange.ts b/apps/meteor/tests/unit/server/services/calendar/statusEvents/applyStatusChange.ts
deleted file mode 100644
index 65818c9d1f09a..0000000000000
--- a/apps/meteor/tests/unit/server/services/calendar/statusEvents/applyStatusChange.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import { api } from '@rocket.chat/core-services';
-import { UserStatus } from '@rocket.chat/core-typings';
-import { expect } from 'chai';
-import { describe, it, beforeEach, afterEach } from 'mocha';
-import proxyquire from 'proxyquire';
-import sinon from 'sinon';
-
-const UsersMock = {
-	findOneById: sinon.stub(),
-	updateOne: sinon.stub(),
-	updateStatusAndStatusDefault: sinon.stub().resolves(),
-};
-
-const { applyStatusChange } = proxyquire.noCallThru().load('../../../../../../server/services/calendar/statusEvents/applyStatusChange', {
-	'@rocket.chat/core-services': { api },
-	'@rocket.chat/models': {
-		Users: UsersMock,
-	},
-});
-
-describe('Calendar.StatusEvents', () => {
-	let sandbox: sinon.SinonSandbox;
-	const fakeEventId = 'eventId123';
-	const fakeUserId = 'userId456';
-	const fakeStartTime = new Date('2025-01-01T10:00:00Z');
-	const fakeEndTime = new Date('2025-01-01T11:00:00Z');
-
-	beforeEach(() => {
-		sandbox = sinon.createSandbox();
-		setupUsersMocks();
-		setupOtherMocks();
-	});
-
-	function setupUsersMocks() {
-		const freshMocks = {
-			findOneById: sinon.stub().resolves({
-				_id: fakeUserId,
-				status: UserStatus.ONLINE,
-				roles: ['user'],
-				username: 'testuser',
-				name: 'Test User',
-			} as any),
-			updateOne: sinon.stub().resolves({ modifiedCount: 1 } as any),
-			updateStatusAndStatusDefault: sinon.stub().resolves(),
-		};
-
-		Object.assign(UsersMock, freshMocks);
-	}
-
-	function setupOtherMocks() {
-		sandbox.stub(api, 'broadcast').resolves();
-	}
-
-	afterEach(() => {
-		sandbox.restore();
-	});
-
-	describe('#applyStatusChange', () => {
-		it('should do nothing if user is not found', async () => {
-			UsersMock.findOneById.resolves(null);
-
-			await applyStatusChange({
-				eventId: fakeEventId,
-				uid: fakeUserId,
-				startTime: fakeStartTime,
-				endTime: fakeEndTime,
-				status: undefined,
-				shouldScheduleRemoval: false,
-			});
-
-			expect(UsersMock.updateStatusAndStatusDefault.callCount).to.equal(0);
-			expect((api.broadcast as sinon.SinonStub).callCount).to.equal(0);
-		});
-
-		it('should do nothing if user is offline', async () => {
-			UsersMock.findOneById.resolves({
-				_id: fakeUserId,
-				status: UserStatus.OFFLINE,
-			});
-
-			await applyStatusChange({
-				eventId: fakeEventId,
-				uid: fakeUserId,
-				startTime: fakeStartTime,
-				endTime: fakeEndTime,
-				status: undefined,
-				shouldScheduleRemoval: false,
-			});
-
-			expect(UsersMock.updateStatusAndStatusDefault.callCount).to.equal(0);
-			expect((api.broadcast as sinon.SinonStub).callCount).to.equal(0);
-		});
-
-		it('should use UserStatus.BUSY as default if no status provided', async () => {
-			UsersMock.updateStatusAndStatusDefault.resetHistory();
-
-			await applyStatusChange({
-				eventId: fakeEventId,
-				uid: fakeUserId,
-				startTime: fakeStartTime,
-				endTime: fakeEndTime,
-				status: undefined,
-				shouldScheduleRemoval: false,
-			});
-
-			expect(UsersMock.updateStatusAndStatusDefault.callCount).to.equal(1);
-			expect(UsersMock.updateStatusAndStatusDefault.firstCall.args[1]).to.equal(UserStatus.BUSY);
-		});
-
-		it('should update user status and broadcast presence update', async () => {
-			const previousStatus = UserStatus.ONLINE;
-			const newStatus = UserStatus.AWAY;
-
-			UsersMock.updateStatusAndStatusDefault.resetHistory();
-			(api.broadcast as sinon.SinonStub).resetHistory();
-
-			UsersMock.findOneById.resolves({
-				_id: fakeUserId,
-				status: previousStatus,
-				roles: ['user'],
-				username: 'testuser',
-				name: 'Test User',
-			});
-
-			await applyStatusChange({
-				eventId: fakeEventId,
-				uid: fakeUserId,
-				startTime: fakeStartTime,
-				endTime: fakeEndTime,
-				status: newStatus,
-				shouldScheduleRemoval: false,
-			});
-
-			expect(UsersMock.updateStatusAndStatusDefault.callCount).to.equal(1);
-			expect(UsersMock.updateStatusAndStatusDefault.firstCall.args).to.deep.equal([fakeUserId, newStatus, newStatus]);
-
-			expect((api.broadcast as sinon.SinonStub).callCount).to.equal(1);
-			expect((api.broadcast as sinon.SinonStub).firstCall.args[0]).to.equal('presence.status');
-		});
-
-		it('should schedule status revert when shouldScheduleRemoval=true', async () => {
-			await applyStatusChange({
-				eventId: fakeEventId,
-				uid: fakeUserId,
-				startTime: fakeStartTime,
-				endTime: fakeEndTime,
-				status: UserStatus.BUSY,
-			});
-		});
-	});
-});
diff --git a/apps/meteor/tests/unit/server/services/calendar/statusEvents/cancelUpcomingStatusChanges.tests.ts b/apps/meteor/tests/unit/server/services/calendar/statusEvents/cancelUpcomingStatusChanges.tests.ts
deleted file mode 100644
index 3b0e23b8ffd32..0000000000000
--- a/apps/meteor/tests/unit/server/services/calendar/statusEvents/cancelUpcomingStatusChanges.tests.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { expect } from 'chai';
-import { describe, it } from 'mocha';
-import proxyquire from 'proxyquire';
-import sinon from 'sinon';
-
-import { MockedCronJobs } from '../mocks/cronJobs';
-
-const settingsMock = new Map<string, any>();
-
-const fakeUserId = 'userId456';
-const CalendarEventMock = {
-	findEligibleEventsForCancelation: sinon.stub().returns({
-		toArray: sinon.stub().resolves([
-			{ _id: 'event1', uid: fakeUserId },
-			{ _id: 'event2', uid: fakeUserId },
-		]),
-	}),
-};
-
-const cronJobsMock = new MockedCronJobs();
-
-const { cancelUpcomingStatusChanges } = proxyquire
-	.noCallThru()
-	.load('../../../../../../server/services/calendar/statusEvents/cancelUpcomingStatusChanges', {
-		'../../../../app/settings/server': { settings: settingsMock },
-		'@rocket.chat/cron': { cronJobs: cronJobsMock },
-		'@rocket.chat/models': {
-			CalendarEvent: CalendarEventMock,
-		},
-	});
-
-describe('Calendar.StatusEvents', () => {
-	describe('#cancelUpcomingStatusChanges', () => {
-		it('should do nothing if busy status setting is disabled', async () => {
-			settingsMock.set('Calendar_BusyStatus_Enabled', false);
-
-			const events = [
-				{ _id: 'event1', uid: fakeUserId },
-				{ _id: 'event2', uid: fakeUserId },
-			];
-
-			cronJobsMock.jobNames.clear();
-			cronJobsMock.jobNames.add(`calendar-presence-status-event1-${fakeUserId}`);
-			cronJobsMock.jobNames.add(`calendar-presence-status-event2-${fakeUserId}`);
-			cronJobsMock.jobNames.add(`calendar-presence-status-event3-${fakeUserId}`);
-
-			CalendarEventMock.findEligibleEventsForCancelation.returns({
-				toArray: sinon.stub().resolves(events),
-			});
-
-			await cancelUpcomingStatusChanges(fakeUserId);
-
-			expect(cronJobsMock.jobNames.has(`calendar-presence-status-event1-${fakeUserId}`)).to.true;
-			expect(cronJobsMock.jobNames.has(`calendar-presence-status-event2-${fakeUserId}`)).to.true;
-			expect(cronJobsMock.jobNames.has(`calendar-presence-status-event3-${fakeUserId}`)).to.true;
-		});
-
-		it('should find and cancel active events', async () => {
-			settingsMock.set('Calendar_BusyStatus_Enabled', true);
-
-			const events = [
-				{ _id: 'event1', uid: fakeUserId },
-				{ _id: 'event2', uid: fakeUserId },
-			];
-
-			cronJobsMock.jobNames.clear();
-			cronJobsMock.jobNames.add(`calendar-presence-status-event1-${fakeUserId}`);
-			cronJobsMock.jobNames.add(`calendar-presence-status-event2-${fakeUserId}`);
-			cronJobsMock.jobNames.add(`calendar-presence-status-event3-${fakeUserId}`);
-
-			CalendarEventMock.findEligibleEventsForCancelation.returns({
-				toArray: sinon.stub().resolves(events),
-			});
-
-			await cancelUpcomingStatusChanges(fakeUserId);
-
-			expect(cronJobsMock.jobNames.has(`calendar-presence-status-event1-${fakeUserId}`)).to.false;
-			expect(cronJobsMock.jobNames.has(`calendar-presence-status-event2-${fakeUserId}`)).to.false;
-			expect(cronJobsMock.jobNames.has(`calendar-presence-status-event3-${fakeUserId}`)).to.true;
-		});
-	});
-});
diff --git a/apps/meteor/tests/unit/server/services/calendar/statusEvents/generateCronJobId.tests.ts b/apps/meteor/tests/unit/server/services/calendar/statusEvents/generateCronJobId.tests.ts
deleted file mode 100644
index cbc8ab277c5b1..0000000000000
--- a/apps/meteor/tests/unit/server/services/calendar/statusEvents/generateCronJobId.tests.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { expect } from 'chai';
-import { describe, it } from 'mocha';
-import proxyquire from 'proxyquire';
-
-const { generateCronJobId } = proxyquire.noCallThru().load('../../../../../../server/services/calendar/statusEvents/generateCronJobId', {});
-
-describe('#generateCronJobId', () => {
-	const fakeEventId = 'eventId123';
-	const fakeUserId = 'userId456';
-
-	it('should generate correct ID for status events', () => {
-		const id = generateCronJobId(fakeEventId, fakeUserId, 'status');
-		expect(id).to.equal(`calendar-presence-status-${fakeEventId}-${fakeUserId}`);
-	});
-
-	it('should generate correct ID for reminder events', () => {
-		const id = generateCronJobId(fakeEventId, fakeUserId, 'reminder');
-		expect(id).to.equal(`calendar-reminder-${fakeEventId}-${fakeUserId}`);
-	});
-
-	it('should throw an error if some required parameters are missing', () => {
-		expect(() => generateCronJobId(undefined, fakeUserId, 'status')).to.throw(
-			'Missing required parameters. Please provide eventId, uid and eventType (status or reminder)',
-		);
-		expect(() => generateCronJobId(fakeEventId, undefined, 'status')).to.throw(
-			'Missing required parameters. Please provide eventId, uid and eventType (status or reminder)',
-		);
-		expect(() => generateCronJobId(fakeEventId, fakeUserId)).to.throw(
-			'Missing required parameters. Please provide eventId, uid and eventType (status or reminder)',
-		);
-	});
-
-	it('should throw an error if eventType is not "status" or "reminder"', () => {
-		expect(() => generateCronJobId(fakeEventId, fakeUserId, 'invalid' as any)).to.throw(
-			'Missing required parameters. Please provide eventId, uid and eventType (status or reminder)',
-		);
-	});
-});
diff --git a/apps/meteor/tests/unit/server/services/calendar/statusEvents/handleOverlappingEvents.ts b/apps/meteor/tests/unit/server/services/calendar/statusEvents/handleOverlappingEvents.ts
deleted file mode 100644
index d9997d4bac80f..0000000000000
--- a/apps/meteor/tests/unit/server/services/calendar/statusEvents/handleOverlappingEvents.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import { UserStatus } from '@rocket.chat/core-typings';
-import { expect } from 'chai';
-import { describe, it, beforeEach } from 'mocha';
-import proxyquire from 'proxyquire';
-import sinon from 'sinon';
-
-import { MockedCronJobs } from '../mocks/cronJobs';
-
-const CalendarEventMock = {
-	findOverlappingEvents: sinon.stub(),
-};
-
-const cronJobsMock = new MockedCronJobs();
-
-const applyStatusChange = sinon.stub();
-
-const { handleOverlappingEvents } = proxyquire
-	.noCallThru()
-	.load('../../../../../../server/services/calendar/statusEvents/handleOverlappingEvents', {
-		'./applyStatusChange': { applyStatusChange },
-		'@rocket.chat/cron': { cronJobs: cronJobsMock },
-		'@rocket.chat/models': {
-			CalendarEvent: CalendarEventMock,
-		},
-	});
-
-describe('Calendar.StatusEvents', () => {
-	const fakeEventId = 'eventId123';
-	const fakeUserId = 'userId456';
-	const fakeStartTime = new Date('2025-01-01T10:00:00Z');
-	const fakeEndTime = new Date('2025-01-01T11:00:00Z');
-	const statusId = `calendar-presence-status-${fakeEventId}-${fakeUserId}`;
-	const containedStatusId = `calendar-presence-status-containedEvent-${fakeUserId}`;
-
-	beforeEach(() => {
-		cronJobsMock.jobNames.clear();
-		setupCalendarEventMocks();
-		applyStatusChange.resetHistory();
-	});
-
-	function setupCalendarEventMocks() {
-		CalendarEventMock.findOverlappingEvents.reset();
-		CalendarEventMock.findOverlappingEvents.returns({
-			toArray: sinon.stub().resolves([]),
-		});
-	}
-
-	describe('#handleOverlappingEvents', () => {
-		it('should return shouldProceed=true when no overlapping events', async () => {
-			// Clear previous calls
-			CalendarEventMock.findOverlappingEvents.reset();
-
-			// Set up the mock to return no overlapping events
-			CalendarEventMock.findOverlappingEvents.returns({
-				toArray: sinon.stub().resolves([]),
-			});
-
-			const result = await handleOverlappingEvents(fakeEventId, fakeUserId, fakeStartTime, fakeEndTime, UserStatus.BUSY);
-
-			expect(result).to.deep.equal({ shouldProceed: true });
-			expect(cronJobsMock.jobNames.size).to.equal(0);
-			sinon.assert.calledWith(CalendarEventMock.findOverlappingEvents, fakeEventId, fakeUserId, fakeStartTime, fakeEndTime);
-		});
-
-		it('should handle case when current event is not the latest ending', async () => {
-			const laterEvent = {
-				_id: 'laterEvent',
-				startTime: fakeStartTime,
-				endTime: new Date('2025-01-01T12:00:00Z'), // Later than fakeEndTime
-			};
-
-			// Mock a specific response for this test
-			CalendarEventMock.findOverlappingEvents.returns({
-				toArray: sinon.stub().resolves([laterEvent]),
-			});
-
-			const result = await handleOverlappingEvents(fakeEventId, fakeUserId, fakeStartTime, fakeEndTime, UserStatus.BUSY);
-
-			expect(result).to.deep.equal({ shouldProceed: false });
-			expect(cronJobsMock.jobNames.has(statusId)).to.equal(true);
-		});
-
-		it('should remove status jobs for events ending before the current one', async () => {
-			const earlierEvent = {
-				_id: 'earlierEvent',
-				startTime: new Date('2025-01-01T09:00:00Z'),
-				endTime: new Date('2025-01-01T10:30:00Z'), // Earlier than fakeEndTime
-			};
-
-			// Set up has to return true for the specific job ID
-			cronJobsMock.jobNames.add(statusId);
-
-			// Mock a specific response for this test
-			CalendarEventMock.findOverlappingEvents.returns({
-				toArray: sinon.stub().resolves([earlierEvent]),
-			});
-
-			const result = await handleOverlappingEvents(fakeEventId, fakeUserId, fakeStartTime, fakeEndTime, UserStatus.BUSY);
-
-			expect(result).to.deep.equal({ shouldProceed: true });
-			expect(cronJobsMock.jobNames.has(statusId)).to.equal(false);
-		});
-
-		it('should handle multiple overlapping events with different end times', async () => {
-			const earlierEvent = {
-				_id: 'earlierEvent',
-				startTime: new Date('2025-01-01T09:00:00Z'),
-				endTime: new Date('2025-01-01T10:30:00Z'), // Earlier than fakeEndTime
-			};
-
-			const laterEvent = {
-				_id: 'laterEvent',
-				startTime: new Date('2025-01-01T10:30:00Z'),
-				endTime: new Date('2025-01-01T12:00:00Z'), // Later than fakeEndTime
-			};
-
-			CalendarEventMock.findOverlappingEvents.returns({
-				toArray: sinon.stub().resolves([earlierEvent, laterEvent]),
-			});
-
-			const result = await handleOverlappingEvents(fakeEventId, fakeUserId, fakeStartTime, fakeEndTime, UserStatus.BUSY);
-
-			expect(result).to.deep.equal({ shouldProceed: false });
-			expect(cronJobsMock.jobNames.has(statusId)).to.be.true;
-		});
-
-		it('should handle an event completely contained within the current event', async () => {
-			const containedEvent = {
-				_id: 'containedEvent',
-				startTime: new Date('2025-01-01T10:15:00Z'), // After fakeStartTime
-				endTime: new Date('2025-01-01T10:45:00Z'), // Before fakeEndTime
-			};
-
-			cronJobsMock.jobNames.add(statusId);
-
-			CalendarEventMock.findOverlappingEvents.returns({
-				toArray: sinon.stub().resolves([containedEvent]),
-			});
-
-			const result = await handleOverlappingEvents(fakeEventId, fakeUserId, fakeStartTime, fakeEndTime, UserStatus.BUSY);
-
-			expect(result).to.deep.equal({ shouldProceed: true });
-			expect(cronJobsMock.jobNames.has(statusId)).to.be.false;
-			expect(cronJobsMock.jobNames.has(containedStatusId)).to.be.true;
-		});
-
-		it('should handle an event that completely contains the current event', async () => {
-			const containingEvent = {
-				_id: 'containingEvent',
-				startTime: new Date('2025-01-01T09:00:00Z'), // Before fakeStartTime
-				endTime: new Date('2025-01-01T12:00:00Z'), // After fakeEndTime
-			};
-
-			CalendarEventMock.findOverlappingEvents.returns({
-				toArray: sinon.stub().resolves([containingEvent]),
-			});
-
-			const result = await handleOverlappingEvents(fakeEventId, fakeUserId, fakeStartTime, fakeEndTime, UserStatus.BUSY);
-
-			expect(result).to.deep.equal({ shouldProceed: false });
-			expect(cronJobsMock.jobNames.has(statusId)).to.be.true;
-		});
-	});
-});
diff --git a/apps/meteor/tests/unit/server/services/calendar/statusEvents/removeCronJobs.tests.ts b/apps/meteor/tests/unit/server/services/calendar/statusEvents/removeCronJobs.tests.ts
deleted file mode 100644
index ec160abe51d25..0000000000000
--- a/apps/meteor/tests/unit/server/services/calendar/statusEvents/removeCronJobs.tests.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { expect } from 'chai';
-import { describe, it, beforeEach } from 'mocha';
-import proxyquire from 'proxyquire';
-
-import { MockedCronJobs } from '../mocks/cronJobs';
-
-const cronJobsMock = new MockedCronJobs();
-
-const { removeCronJobs } = proxyquire.noCallThru().load('../../../../../../server/services/calendar/statusEvents/removeCronJobs', {
-	'@rocket.chat/cron': { cronJobs: cronJobsMock },
-});
-
-describe('Calendar.StatusEvents', () => {
-	const fakeEventId = 'eventId123';
-	const fakeUserId = 'userId456';
-	const fakeUserId2 = 'userId4562';
-
-	const statusId = `calendar-presence-status-${fakeEventId}-${fakeUserId}`;
-	const reminderId = `calendar-reminder-${fakeEventId}-${fakeUserId}`;
-	const statusId2 = `calendar-presence-status-${fakeEventId}-${fakeUserId2}`;
-	const reminderId2 = `calendar-reminder-${fakeEventId}-${fakeUserId2}`;
-
-	beforeEach(() => {
-		cronJobsMock.jobNames.clear();
-	});
-
-	describe('#removeCronJobs', () => {
-		it('should check and remove status and reminder jobs', async () => {
-			cronJobsMock.jobNames.clear();
-			cronJobsMock.jobNames.add(statusId);
-			cronJobsMock.jobNames.add(reminderId);
-
-			await removeCronJobs(fakeEventId, fakeUserId);
-
-			expect(cronJobsMock.jobNames.has(statusId)).to.equal(false);
-			expect(cronJobsMock.jobNames.has(reminderId)).to.equal(false);
-		});
-
-		it('should not remove jobs from other users', async () => {
-			cronJobsMock.jobNames.clear();
-			cronJobsMock.jobNames.add(statusId);
-			cronJobsMock.jobNames.add(reminderId);
-			cronJobsMock.jobNames.add(statusId2);
-			cronJobsMock.jobNames.add(reminderId2);
-
-			await removeCronJobs(fakeEventId, fakeUserId);
-
-			expect(cronJobsMock.jobNames.has(statusId)).to.equal(false);
-			expect(cronJobsMock.jobNames.has(reminderId)).to.equal(false);
-			expect(cronJobsMock.jobNames.has(statusId2)).to.equal(true);
-			expect(cronJobsMock.jobNames.has(reminderId2)).to.equal(true);
-		});
-	});
-});
diff --git a/ee/packages/media-calls/src/definition/IMediaCallServer.ts b/ee/packages/media-calls/src/definition/IMediaCallServer.ts
index 8449819ddb08b..37b119e4df5c3 100644
--- a/ee/packages/media-calls/src/definition/IMediaCallServer.ts
+++ b/ee/packages/media-calls/src/definition/IMediaCallServer.ts
@@ -9,6 +9,8 @@ export type VoipPushNotificationEventType = 'new' | 'answer' | 'end';
 
 export type MediaCallServerEvents = {
 	callUpdated: { callId: string; dtmf?: ClientMediaSignalBody<'dtmf'> };
+	callActivated: { callId: string; uids: IUser['_id'][] };
+	callEnded: { callId: string; uids: IUser['_id'][] };
 	signalRequest: { toUid: IUser['_id']; signal: ServerMediaSignal };
 	historyUpdate: { callId: string };
 	pushNotificationRequest: { callId: string; event: VoipPushNotificationEventType };
diff --git a/ee/packages/media-calls/src/server/CallDirector.ts b/ee/packages/media-calls/src/server/CallDirector.ts
index 6387a373e2bce..fdb7dec8b48c5 100644
--- a/ee/packages/media-calls/src/server/CallDirector.ts
+++ b/ee/packages/media-calls/src/server/CallDirector.ts
@@ -55,6 +55,7 @@ class MediaCallDirector {
 
 		logger.info({ msg: 'Call was flagged as active', callId: call._id });
 		this.scheduleExpirationCheckByCallId(call._id);
+		getMediaCallServer().emitter.emit('callActivated', { callId: call._id, uids: call.uids });
 		return actorAgent.oppositeAgent?.onCallActive(call._id);
 	}
 
@@ -400,6 +401,10 @@ class MediaCallDirector {
 		if (ended) {
 			logger.info({ msg: 'Call was flagged as ended', callId, reason: params?.reason });
 			getMediaCallServer().updateCallHistory({ callId });
+			const call = await MediaCalls.findOneById<Pick<IMediaCall, '_id' | 'uids'>>(callId, { projection: { uids: 1 } });
+			if (call) {
+				getMediaCallServer().emitter.emit('callEnded', { callId, uids: call.uids });
+			}
 		}
 
 		return ended;
diff --git a/ee/packages/presence/src/Presence.ts b/ee/packages/presence/src/Presence.ts
index 6764364aa319e..013173aabaf21 100755
--- a/ee/packages/presence/src/Presence.ts
+++ b/ee/packages/presence/src/Presence.ts
@@ -17,6 +17,7 @@ type PresenceUser = Pick<
 	IUser,
 	| '_id'
 	| 'username'
+	| 'type'
 	| 'roles'
 	| 'status'
 	| 'statusDefault'
@@ -24,6 +25,7 @@ type PresenceUser = Pick<
 	| 'statusText'
 	| 'statusExpiresAt'
 	| 'statusConnection'
+	| 'statusId'
 	| 'previousState'
 >;
 
@@ -327,7 +329,7 @@ export class Presence extends ServiceClass implements IPresence {
 	 */
 	async setActiveState(
 		userId: string,
-		newState: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt'>,
+		newState: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt' | 'statusId'>,
 	): Promise<boolean> {
 		if (newState.statusExpiresAt) {
 			const expiresAt = new Date(newState.statusExpiresAt).getTime();
@@ -346,11 +348,11 @@ export class Presence extends ServiceClass implements IPresence {
 	}
 
 	/**
-	 * Ends the current active claim. Restores previous if valid, otherwise
-	 * falls back to system-managed.
+	 * Ends a presence claim. With `statusId`, only that claim is affected (so concurrent voice/video
+	 * claims end in either order); without it, the displaced claim is restored.
 	 */
-	async endActiveState(userId: string): Promise<boolean> {
-		return this.updatePresenceAndReschedule(userId, { type: 'endActive' });
+	async endActiveState(userId: string, statusId?: string): Promise<boolean> {
+		return this.updatePresenceAndReschedule(userId, { type: 'endActive', ...(statusId && { statusId }) });
 	}
 
 	/**
@@ -378,6 +380,7 @@ export class Presence extends ServiceClass implements IPresence {
 				? await Users.findOneById<PresenceUser>(uidOrUser, {
 						projection: {
 							username: 1,
+							type: 1,
 							roles: 1,
 							status: 1,
 							statusDefault: 1,
@@ -385,6 +388,7 @@ export class Presence extends ServiceClass implements IPresence {
 							statusText: 1,
 							statusExpiresAt: 1,
 							statusConnection: 1,
+							statusId: 1,
 							previousState: 1,
 						},
 					})
diff --git a/ee/packages/presence/src/lib/presenceEngine.spec.ts b/ee/packages/presence/src/lib/presenceEngine.spec.ts
index 72f8eb80fec48..6023eddd31b00 100644
--- a/ee/packages/presence/src/lib/presenceEngine.spec.ts
+++ b/ee/packages/presence/src/lib/presenceEngine.spec.ts
@@ -5,7 +5,10 @@ import { processPresence } from './presenceEngine';
 
 const ONE_HOUR = 3600_000;
 
-type PresenceUser = Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt' | 'previousState'>;
+type PresenceUser = Pick<
+	IUser,
+	'type' | 'roles' | 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt' | 'statusId' | 'previousState'
+>;
 
 const user = (data: Partial<PresenceUser> = {}): PresenceUser => ({
 	statusDefault: UserStatus.ONLINE,
@@ -13,6 +16,8 @@ const user = (data: Partial<PresenceUser> = {}): PresenceUser => ({
 	...data,
 });
 
+const bot = (data: Partial<PresenceUser> = {}): PresenceUser => user({ type: 'bot', ...data });
+
 const session = (status: UserStatus = UserStatus.ONLINE): IUserSessionConnection => ({
 	id: 'random',
 	instanceId: 'random',
@@ -43,6 +48,21 @@ describe('processPresence', () => {
 			expect(result.values).toMatchObject({ status: UserStatus.OFFLINE, statusConnection: UserStatus.OFFLINE });
 		});
 
+		test('should not clear a custom status when going OFFLINE (vacation text survives disconnect)', () => {
+			const result = processPresence(
+				user({
+					statusDefault: UserStatus.AWAY,
+					statusSource: 'manual',
+					statusText: 'On vacation',
+					statusExpiresAt: new Date(Date.now() + ONE_HOUR),
+				}),
+				[],
+			);
+			expect(result.values).toEqual({ status: UserStatus.OFFLINE, statusConnection: UserStatus.OFFLINE });
+			expect(result.values).not.toHaveProperty('statusText');
+			expect(result.clear).toBeUndefined();
+		});
+
 		test('should stay OFFLINE when user is invisible (OFFLINE statusDefault with sessions)', () => {
 			const result = processPresence(user({ statusDefault: UserStatus.OFFLINE }), [session(UserStatus.ONLINE)]);
 			expect(result.values).toMatchObject({ status: UserStatus.OFFLINE, statusConnection: UserStatus.ONLINE });
@@ -61,6 +81,40 @@ describe('processPresence', () => {
 		});
 	});
 
+	describe('auto-away over an existing claim (claimless recompute)', () => {
+		test('a manual online claim still goes AWAY on idle, without touching the claim or statusText', () => {
+			const result = processPresence(user({ statusSource: 'manual', statusDefault: UserStatus.ONLINE, statusText: 'Working' }), [
+				session(UserStatus.AWAY),
+			]);
+
+			expect(result.values).toMatchObject({ status: UserStatus.AWAY, statusConnection: UserStatus.AWAY });
+			expect(result.values).not.toHaveProperty('statusText');
+			expect(result.values).not.toHaveProperty('statusSource');
+			expect(result.values).not.toHaveProperty('statusDefault');
+			expect(result.clear).toBeUndefined();
+		});
+
+		test('a manual busy claim stays BUSY on idle (auto-away suppressed), claim preserved', () => {
+			const result = processPresence(user({ statusSource: 'manual', statusDefault: UserStatus.BUSY, statusText: 'Focusing' }), [
+				session(UserStatus.AWAY),
+			]);
+
+			expect(result.values).toMatchObject({ status: UserStatus.BUSY, statusConnection: UserStatus.AWAY });
+			expect(result.values).not.toHaveProperty('statusText');
+			expect(result.values).not.toHaveProperty('statusSource');
+			expect(result.clear).toBeUndefined();
+		});
+
+		test('when the user becomes active again the manual online claim resolves back to ONLINE', () => {
+			const result = processPresence(user({ statusSource: 'manual', statusDefault: UserStatus.ONLINE, statusText: 'Working' }), [
+				session(UserStatus.ONLINE),
+			]);
+
+			expect(result.values).toMatchObject({ status: UserStatus.ONLINE, statusConnection: UserStatus.ONLINE });
+			expect(result.values).not.toHaveProperty('statusText');
+		});
+	});
+
 	describe('setActive', () => {
 		test('should apply manual claim when user is online', () => {
 			const result = processPresence(user(), [session()], {
@@ -103,7 +157,7 @@ describe('processPresence', () => {
 			expect(result.values.previousState).toBeUndefined();
 		});
 
-		test('should overwrite when same priority claim arrives', () => {
+		test('should display the new claim and save the displaced one as previousState on same priority', () => {
 			const result = processPresence(
 				user({ statusSource: 'internal', statusDefault: UserStatus.BUSY, statusText: 'On a call' }),
 				[session()],
@@ -111,6 +165,7 @@ describe('processPresence', () => {
 			);
 			expect(result.values.statusText).toBe('In a meeting');
 			expect(result.values.statusSource).toBe('internal');
+			expect(result.values.previousState).toMatchObject({ statusSource: 'internal', statusText: 'On a call' });
 		});
 
 		test('should queue lower priority claim as previousState', () => {
@@ -205,6 +260,30 @@ describe('processPresence', () => {
 			expect(result.values.statusText).toBe('Heads down');
 			expect(result.clear).toContain('previousState');
 		});
+
+		test('should update a same-source external claim in place without stashing it (calendar re-apply)', () => {
+			const oldExp = new Date(Date.now() + ONE_HOUR);
+			const newExp = new Date(Date.now() + 2 * ONE_HOUR);
+			const result = processPresence(
+				user({ statusSource: 'external', statusDefault: UserStatus.BUSY, statusText: 'In a meeting', statusExpiresAt: oldExp }),
+				[session()],
+				{
+					type: 'setActive',
+					newState: { statusDefault: UserStatus.BUSY, statusText: 'In a meeting', statusSource: 'external', statusExpiresAt: newExp },
+				},
+			);
+			expect(result.values.statusExpiresAt).toEqual(newExp);
+			expect(result.values.previousState).toBeUndefined();
+		});
+
+		test('should still stash a same-source internal claim (voice + video stack)', () => {
+			const result = processPresence(
+				user({ statusSource: 'internal', statusDefault: UserStatus.BUSY, statusText: 'On a call' }),
+				[session()],
+				{ type: 'setActive', newState: { statusDefault: UserStatus.BUSY, statusText: 'In a meeting', statusSource: 'internal' } },
+			);
+			expect(result.values.previousState).toMatchObject({ statusSource: 'internal', statusText: 'On a call' });
+		});
 	});
 
 	describe('endActive', () => {
@@ -272,6 +351,90 @@ describe('processPresence', () => {
 		});
 	});
 
+	describe('endActive with statusId (claim identity)', () => {
+		test('should drop the stash and keep displaying when the stashed claim ends (older-first)', () => {
+			const result = processPresence(
+				user({
+					statusSource: 'internal',
+					statusDefault: UserStatus.BUSY,
+					statusText: 'In a meeting',
+					statusId: 'confB',
+					previousState: { statusDefault: UserStatus.BUSY, statusText: 'On a call', statusSource: 'internal', statusId: 'callA' },
+				}),
+				[session()],
+				{ type: 'endActive', statusId: 'callA' },
+			);
+			expect(result.values.statusText).toBeUndefined();
+			expect(result.values.statusSource).toBeUndefined();
+			expect(result.values.status).toBe(UserStatus.BUSY);
+			expect(result.clear).toContain('previousState');
+		});
+
+		test('should restore the stashed claim with its statusId when the active claim ends (newest-first)', () => {
+			const result = processPresence(
+				user({
+					statusSource: 'internal',
+					statusDefault: UserStatus.BUSY,
+					statusText: 'In a meeting',
+					statusId: 'confB',
+					previousState: { statusDefault: UserStatus.BUSY, statusText: 'On a call', statusSource: 'internal', statusId: 'callA' },
+				}),
+				[session()],
+				{ type: 'endActive', statusId: 'confB' },
+			);
+			expect(result.values).toMatchObject({ statusSource: 'internal', statusText: 'On a call', statusId: 'callA' });
+			expect(result.clear).toContain('previousState');
+		});
+
+		test('should no-op when the statusId matches neither the active nor the stashed claim', () => {
+			const result = processPresence(
+				user({
+					statusSource: 'internal',
+					statusDefault: UserStatus.BUSY,
+					statusText: 'In a meeting',
+					statusId: 'confB',
+					previousState: { statusDefault: UserStatus.BUSY, statusText: 'On a call', statusSource: 'internal', statusId: 'callA' },
+				}),
+				[session()],
+				{ type: 'endActive', statusId: 'unknown' },
+			);
+			expect(result.values).toStrictEqual({});
+		});
+
+		test('should reset to ONLINE when the active claim ends and there is no stash', () => {
+			const result = processPresence(
+				user({ statusSource: 'internal', statusDefault: UserStatus.BUSY, statusText: 'On a call', statusId: 'callA' }),
+				[session()],
+				{ type: 'endActive', statusId: 'callA' },
+			);
+			expect(result.values).toMatchObject({ statusDefault: UserStatus.ONLINE });
+			expect(result.clear).toEqual(expect.arrayContaining(['statusSource', 'statusExpiresAt', 'previousState', 'statusId']));
+		});
+	});
+
+	describe('setActive with statusId (claim identity)', () => {
+		test('should store the statusId on a new claim', () => {
+			const result = processPresence(user(), [session()], {
+				type: 'setActive',
+				newState: { statusDefault: UserStatus.BUSY, statusText: 'On a call', statusSource: 'internal', statusId: 'callA' },
+			});
+			expect(result.values).toMatchObject({ statusSource: 'internal', statusId: 'callA' });
+		});
+
+		test('should stash the displaced claim with its statusId and store the new id (voice + video)', () => {
+			const result = processPresence(
+				user({ statusSource: 'internal', statusDefault: UserStatus.BUSY, statusText: 'On a call', statusId: 'callA' }),
+				[session()],
+				{
+					type: 'setActive',
+					newState: { statusDefault: UserStatus.BUSY, statusText: 'In a meeting', statusSource: 'internal', statusId: 'confB' },
+				},
+			);
+			expect(result.values).toMatchObject({ statusText: 'In a meeting', statusId: 'confB' });
+			expect(result.values.previousState).toMatchObject({ statusText: 'On a call', statusId: 'callA' });
+		});
+	});
+
 	describe('clearActive', () => {
 		test('should reset to ONLINE and clear all claim fields', () => {
 			const result = processPresence(user({ statusSource: 'manual', statusDefault: UserStatus.BUSY }), [session()], {
@@ -331,4 +494,44 @@ describe('processPresence', () => {
 			expect(result.values.status).toBe(UserStatus.OFFLINE);
 		});
 	});
+
+	describe('no connection - humans (connection-bound)', () => {
+		test('clearActive: explicit "set online" is honored (stays online)', () => {
+			const result = processPresence(user({ statusSource: 'manual', statusDefault: UserStatus.BUSY }), [], { type: 'clearActive' });
+			expect(result.values.status).toBe(UserStatus.ONLINE);
+		});
+
+		test('setActive: busy claim is persisted but display is OFFLINE', () => {
+			const result = processPresence(user(), [], {
+				type: 'setActive',
+				newState: { statusDefault: UserStatus.BUSY, statusSource: 'manual', statusText: 'Focus' },
+			});
+			expect(result.values.status).toBe(UserStatus.OFFLINE);
+			expect(result.values.statusDefault).toBe(UserStatus.BUSY); // claim persisted for reconnect
+		});
+
+		test('endActive: ending a claim reverts to connection reality (OFFLINE), not statusDefault', () => {
+			const result = processPresence(user({ statusSource: 'manual', statusDefault: UserStatus.BUSY }), [], { type: 'endActive' });
+			expect(result.values.status).toBe(UserStatus.OFFLINE);
+		});
+	});
+
+	describe('no connection - service users (bots/apps) hold their declared status', () => {
+		test.each([
+			['type "bot"', bot(), UserStatus.BUSY, 'manual' as const],
+			['type "app"', user({ type: 'app' }), UserStatus.AWAY, 'external' as const],
+			['role "bot" (type "user")', user({ type: 'user', roles: ['bot'] }), UserStatus.BUSY, 'manual' as const],
+		])('setActive: a service user (%s) displays its declared status, not OFFLINE', (_label, serviceUser, statusDefault, statusSource) => {
+			const result = processPresence(serviceUser, [], {
+				type: 'setActive',
+				newState: { statusDefault, statusSource },
+			});
+			expect(result.values.status).toBe(statusDefault);
+		});
+
+		test('endActive: a bot whose claim is released reverts to OFFLINE (re-assert to restore)', () => {
+			const result = processPresence(bot({ statusSource: 'manual', statusDefault: UserStatus.BUSY }), [], { type: 'endActive' });
+			expect(result.values.status).toBe(UserStatus.OFFLINE);
+		});
+	});
 });
diff --git a/ee/packages/presence/src/lib/presenceEngine.ts b/ee/packages/presence/src/lib/presenceEngine.ts
index 48e0b0839b993..d89cb06c863eb 100644
--- a/ee/packages/presence/src/lib/presenceEngine.ts
+++ b/ee/packages/presence/src/lib/presenceEngine.ts
@@ -2,8 +2,8 @@ import type { IUser, IUserSessionConnection } from '@rocket.chat/core-typings';
 import { UserStatus } from '@rocket.chat/core-typings';
 
 export type ClaimUpdate =
-	| { type: 'setActive'; newState: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt'> }
-	| { type: 'endActive' }
+	| { type: 'setActive'; newState: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt' | 'statusId'> }
+	| { type: 'endActive'; statusId?: string }
 	| { type: 'clearActive' };
 
 // Priority: internal > manual > external (lower number = higher priority).
@@ -13,7 +13,7 @@ const NO_PRIORITY = 4;
 
 const RESET_TO_ONLINE = {
 	set: { statusDefault: UserStatus.ONLINE, statusText: '' },
-	unset: ['statusSource', 'statusExpiresAt', 'previousState'],
+	unset: ['statusSource', 'statusExpiresAt', 'previousState', 'statusId'],
 };
 
 function isExpired(expiresAt?: Date): boolean {
@@ -54,12 +54,23 @@ function computeStatus(statusConnection: UserStatus, statusDefault: UserStatus):
 	return statusDefault;
 }
 
+function disconnectedStatus(claimType: ClaimUpdate['type'], isServiceUser: boolean, statusDefault: UserStatus): UserStatus {
+	switch (claimType) {
+		case 'clearActive':
+			return statusDefault;
+		case 'setActive':
+			return isServiceUser ? statusDefault : UserStatus.OFFLINE;
+		case 'endActive':
+			return UserStatus.OFFLINE;
+	}
+}
+
 /**
  * Resolves a claim update against the user's current state using the priority system.
  * Returns the DB fields to set/unset, or null if the claim is rejected.
  */
 function resolveIntent(
-	user: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt' | 'previousState'>,
+	user: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt' | 'statusId' | 'previousState'>,
 	claimUpdate: ClaimUpdate,
 ): { set: Record<string, unknown> & { statusDefault?: UserStatus }; unset: string[] } | null {
 	const currentStatusDefault = user.statusDefault ?? UserStatus.ONLINE;
@@ -69,6 +80,18 @@ function resolveIntent(
 	}
 
 	if (claimUpdate.type === 'endActive') {
+		const { statusId } = claimUpdate;
+		if (statusId) {
+			const matchesActive = user.statusId === statusId;
+			const matchesStash = user.previousState?.statusId === statusId;
+			// stashed claim ended: drop it, keep displaying the still-active claim
+			if (matchesStash && !matchesActive) {
+				return { set: {}, unset: ['previousState'] };
+			}
+			if (!matchesActive && !matchesStash) {
+				return null;
+			}
+		}
 		if (user.previousState && !isExpired(user.previousState.statusExpiresAt)) {
 			const prev = user.previousState;
 			return {
@@ -77,8 +100,9 @@ function resolveIntent(
 					statusSource: prev.statusSource,
 					...(prev.statusText != null && { statusText: prev.statusText }),
 					...(prev.statusExpiresAt && { statusExpiresAt: prev.statusExpiresAt }),
+					...(prev.statusId && { statusId: prev.statusId }),
 				},
-				unset: fieldsToUnset(prev, ['previousState']),
+				unset: fieldsToUnset(prev, prev.statusId ? ['previousState'] : ['previousState', 'statusId']),
 			};
 		}
 		return RESET_TO_ONLINE;
@@ -86,6 +110,7 @@ function resolveIntent(
 
 	// type === 'setActive'
 	const { newState } = claimUpdate;
+	const { statusId } = newState;
 
 	// offline users can only have their status changed by manual sources
 	if (currentStatusDefault === UserStatus.OFFLINE && newState.statusSource !== 'manual') {
@@ -95,21 +120,26 @@ function resolveIntent(
 	const currentPriority = user.statusSource ? PRIORITY[user.statusSource] : NO_PRIORITY;
 	const newPriority = newState.statusSource ? PRIORITY[newState.statusSource] : NO_PRIORITY;
 
-	// a manual claim is the user's explicit intent: when it wins it doesn't stash the
-	// displaced claim and clears any queued one, so it never gets auto-reverted.
+	// manual is the user's explicit intent: it never stashes and clears any queued claim
 	const isManual = newState.statusSource === 'manual';
 
-	// higher priority -> apply new; stash displaced claim unless the new claim is manual
-	if (newPriority < currentPriority) {
-		const previousState =
-			!isManual && user.statusSource
-				? {
-						statusDefault: currentStatusDefault,
-						statusText: user.statusText ?? '',
-						statusSource: user.statusSource,
-						statusExpiresAt: user.statusExpiresAt,
-					}
-				: undefined;
+	// higher or equal priority -> apply new; equal-priority internals (voice + video) stash so statusId
+	// can restore either order. Single slot: a 3rd concurrent internal claim evicts the oldest.
+	if (newPriority <= currentPriority) {
+		// re-applying the same non-stacking source (calendar) updates in place; only internal stacks
+		const sameSourceReapply = user.statusSource === newState.statusSource;
+		const sourceStacks = newState.statusSource === 'internal';
+		const shouldStash = !isManual && Boolean(user.statusSource) && (!sameSourceReapply || sourceStacks);
+
+		const previousState = shouldStash
+			? {
+					statusDefault: currentStatusDefault,
+					statusText: user.statusText ?? '',
+					statusSource: user.statusSource,
+					statusExpiresAt: user.statusExpiresAt,
+					...(user.statusId && { statusId: user.statusId }),
+				}
+			: undefined;
 
 		return {
 			set: {
@@ -117,22 +147,10 @@ function resolveIntent(
 				statusSource: newState.statusSource,
 				...(newState.statusText != null && { statusText: newState.statusText }),
 				...(newState.statusExpiresAt && { statusExpiresAt: newState.statusExpiresAt }),
+				...(statusId && { statusId }),
 				...(previousState && { previousState }),
 			},
-			unset: fieldsToUnset(newState, isManual ? ['previousState'] : []),
-		};
-	}
-
-	// same priority -> overwrite; manual also drops any queued previous
-	if (newPriority === currentPriority) {
-		return {
-			set: {
-				statusDefault: newState.statusDefault,
-				statusSource: newState.statusSource,
-				...(newState.statusText != null && { statusText: newState.statusText }),
-				...(newState.statusExpiresAt && { statusExpiresAt: newState.statusExpiresAt }),
-			},
-			unset: fieldsToUnset(newState, isManual ? ['previousState'] : []),
+			unset: fieldsToUnset(newState, [...(isManual ? ['previousState'] : []), ...(statusId ? [] : ['statusId'])]),
 		};
 	}
 
@@ -141,6 +159,7 @@ function resolveIntent(
 		statusSource: newState.statusSource,
 		...(newState.statusText != null && { statusText: newState.statusText }),
 		...(newState.statusExpiresAt && { statusExpiresAt: newState.statusExpiresAt }),
+		...(statusId && { statusId }),
 	};
 
 	// lower priority -> save as previous if slot available
@@ -171,7 +190,7 @@ function resolveIntent(
  * Returns the DB fields to $set and optionally $unset.
  */
 export function processPresence(
-	user: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt' | 'previousState'>,
+	user: Pick<IUser, 'type' | 'roles' | 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt' | 'statusId' | 'previousState'>,
 	sessions: IUserSessionConnection[],
 	claimUpdate?: ClaimUpdate,
 ): { values: Record<string, unknown>; clear?: string[] } {
@@ -194,11 +213,10 @@ export function processPresence(
 	const statusDefault = set.statusDefault ?? user.statusDefault ?? UserStatus.ONLINE;
 	const clear = unset.length ? unset : undefined;
 
-	// setActive with no DDP sessions: user is disconnected but holding a claim — persist
-	// it for reconnect but display OFFLINE. Other types (clearActive/endActive) use
-	// statusDefault so REST-only callers and bots can appear online.
+	// no live connection: humans fall back to offline; bots/apps keep their declared status
 	if (!sessions.length) {
-		const status = claimUpdate.type === 'setActive' ? UserStatus.OFFLINE : statusDefault;
+		const isServiceUser = user.type === 'bot' || user.type === 'app' || (user.roles?.includes('bot') ?? false);
+		const status = disconnectedStatus(claimUpdate.type, isServiceUser, statusDefault);
 		return { values: { ...set, status, statusConnection: UserStatus.OFFLINE }, clear };
 	}
 
diff --git a/packages/apps-engine/src/definition/accessors/IUserUpdater.ts b/packages/apps-engine/src/definition/accessors/IUserUpdater.ts
index f73394003ca79..b9cb5d2842cf0 100644
--- a/packages/apps-engine/src/definition/accessors/IUserUpdater.ts
+++ b/packages/apps-engine/src/definition/accessors/IUserUpdater.ts
@@ -17,7 +17,7 @@ export interface IUserUpdater {
 	deactivate(userId: IUser['id'], confirmRelinquish: boolean): Promise<boolean>;
 	setActiveState(
 		userId: IUser['id'],
-		state: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt'>,
+		state: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt' | 'statusId'>,
 	): Promise<void>;
-	endActiveState(userId: IUser['id']): Promise<void>;
+	endActiveState(userId: IUser['id'], statusId?: string): Promise<void>;
 }
diff --git a/packages/apps-engine/src/definition/users/IUser.ts b/packages/apps-engine/src/definition/users/IUser.ts
index 7bc5b09550da4..e4fe776f3a228 100644
--- a/packages/apps-engine/src/definition/users/IUser.ts
+++ b/packages/apps-engine/src/definition/users/IUser.ts
@@ -19,6 +19,7 @@ export interface IUser {
 	statusDefault?: string;
 	statusSource?: 'internal' | 'external' | 'manual';
 	statusExpiresAt?: Date;
+	statusId?: string;
 	utcOffset: number;
 	createdAt: Date;
 	updatedAt: Date;
diff --git a/packages/apps/src/server/accessors/UserUpdater.ts b/packages/apps/src/server/accessors/UserUpdater.ts
index 086e7fa357a01..4eb2e5f11b42b 100644
--- a/packages/apps/src/server/accessors/UserUpdater.ts
+++ b/packages/apps/src/server/accessors/UserUpdater.ts
@@ -32,12 +32,12 @@ export class UserUpdater implements IUserUpdater {
 
 	public async setActiveState(
 		userId: IUser['id'],
-		state: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt'>,
+		state: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt' | 'statusId'>,
 	) {
 		return this.bridges.getUserBridge().doSetActiveState(userId, state, this.appId);
 	}
 
-	public async endActiveState(userId: IUser['id']) {
-		return this.bridges.getUserBridge().doEndActiveState(userId, this.appId);
+	public async endActiveState(userId: IUser['id'], statusId?: string) {
+		return this.bridges.getUserBridge().doEndActiveState(userId, this.appId, statusId);
 	}
 }
diff --git a/packages/apps/src/server/bridges/UserBridge.ts b/packages/apps/src/server/bridges/UserBridge.ts
index a8bd300ee3094..bd7dbe71bf347 100644
--- a/packages/apps/src/server/bridges/UserBridge.ts
+++ b/packages/apps/src/server/bridges/UserBridge.ts
@@ -72,7 +72,7 @@ export abstract class UserBridge extends BaseBridge {
 
 	public async doSetActiveState(
 		userId: IUser['id'],
-		state: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt'>,
+		state: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt' | 'statusId'>,
 		appId: string,
 	): Promise<void> {
 		if (this.hasWritePermission(appId)) {
@@ -80,9 +80,9 @@ export abstract class UserBridge extends BaseBridge {
 		}
 	}
 
-	public async doEndActiveState(userId: IUser['id'], appId: string): Promise<void> {
+	public async doEndActiveState(userId: IUser['id'], appId: string, statusId?: string): Promise<void> {
 		if (this.hasWritePermission(appId)) {
-			await this.endActiveState(userId, appId);
+			await this.endActiveState(userId, appId, statusId);
 		}
 	}
 
@@ -152,11 +152,11 @@ export abstract class UserBridge extends BaseBridge {
 
 	protected abstract setActiveState(
 		userId: IUser['id'],
-		state: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt'>,
+		state: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt' | 'statusId'>,
 		appId: string,
 	): Promise<void>;
 
-	protected abstract endActiveState(userId: IUser['id'], appId: string): Promise<void>;
+	protected abstract endActiveState(userId: IUser['id'], appId: string, statusId?: string): Promise<void>;
 
 	private hasReadPermission(appId: string): boolean {
 		if (AppPermissionManager.hasPermission(appId, AppPermissions.user.read)) {
diff --git a/packages/apps/tests/test-data/bridges/userBridge.ts b/packages/apps/tests/test-data/bridges/userBridge.ts
index b8634a0e07e79..8f9d3d7f63e4d 100644
--- a/packages/apps/tests/test-data/bridges/userBridge.ts
+++ b/packages/apps/tests/test-data/bridges/userBridge.ts
@@ -49,13 +49,13 @@ export class TestsUserBridge extends UserBridge {
 
 	protected setActiveState(
 		userId: IUser['id'],
-		state: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt'>,
+		state: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt' | 'statusId'>,
 		appId: string,
 	): Promise<void> {
 		throw new Error('Method not implemented.');
 	}
 
-	protected endActiveState(userId: IUser['id'], appId: string): Promise<void> {
+	protected endActiveState(userId: IUser['id'], appId: string, statusId?: string): Promise<void> {
 		throw new Error('Method not implemented.');
 	}
 }
diff --git a/packages/core-services/src/types/ICalendarService.ts b/packages/core-services/src/types/ICalendarService.ts
index a7744ddd7c12d..e22213c39615b 100644
--- a/packages/core-services/src/types/ICalendarService.ts
+++ b/packages/core-services/src/types/ICalendarService.ts
@@ -11,5 +11,4 @@ export interface ICalendarService {
 	delete(eventId: ICalendarEvent['_id']): Promise<DeleteResult>;
 	setupNextNotification(): Promise<void>;
 	setupNextStatusChange(): Promise<void>;
-	cancelUpcomingStatusChanges(uid: IUser['_id'], endTime?: Date): Promise<void>;
 }
diff --git a/packages/core-services/src/types/IPresence.ts b/packages/core-services/src/types/IPresence.ts
index bc414a956801a..95b6c957478b2 100644
--- a/packages/core-services/src/types/IPresence.ts
+++ b/packages/core-services/src/types/IPresence.ts
@@ -18,9 +18,9 @@ export interface IPresence extends IServiceClass {
 	setStatus(userId: string, status: UserStatus, statusText?: string, statusExpiresAt?: Date): Promise<boolean>;
 	setActiveState(
 		userId: string,
-		newState: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt'>,
+		newState: Pick<IUser, 'statusDefault' | 'statusSource' | 'statusText' | 'statusExpiresAt' | 'statusId'>,
 	): Promise<boolean>;
-	endActiveState(userId: string): Promise<boolean>;
+	endActiveState(userId: string, statusId?: string): Promise<boolean>;
 	clearActiveState(userId: string): Promise<boolean>;
 	setConnectionStatus(uid: string, status: UserStatus, session: string): Promise<boolean>;
 	toggleBroadcast(enabled: boolean): void;
diff --git a/packages/core-typings/src/ICalendarEvent.ts b/packages/core-typings/src/ICalendarEvent.ts
index 6d9e0fd08908d..2c5ad1e1ec959 100644
--- a/packages/core-typings/src/ICalendarEvent.ts
+++ b/packages/core-typings/src/ICalendarEvent.ts
@@ -1,6 +1,5 @@
 import type { IRocketChatRecord } from './IRocketChatRecord';
 import type { IUser } from './IUser';
-import type { UserStatus } from './UserStatus';
 
 export interface ICalendarEvent extends IRocketChatRecord {
 	startTime: Date;
@@ -18,5 +17,4 @@ export interface ICalendarEvent extends IRocketChatRecord {
 	reminderTime?: Date;
 
 	busy?: boolean;
-	previousStatus?: UserStatus;
 }
diff --git a/packages/core-typings/src/IUser.ts b/packages/core-typings/src/IUser.ts
index aedcdfec0d759..d39969fe266ee 100644
--- a/packages/core-typings/src/IUser.ts
+++ b/packages/core-typings/src/IUser.ts
@@ -189,11 +189,13 @@ export interface IUser extends IRocketChatRecord {
 	statusText?: string;
 	statusSource?: PresenceSource;
 	statusExpiresAt?: Date;
+	statusId?: string;
 	previousState?: {
 		statusDefault: UserStatus;
 		statusText: string;
 		statusSource: PresenceSource;
 		statusExpiresAt?: Date;
+		statusId?: string;
 	};
 	oauth?: {
 		authorizedClients: string[];
@@ -295,7 +297,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 b29ec32dc1295..811d28b715f03 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -1675,7 +1675,7 @@
   "Custom_Sound_Has_Been_Deleted": "The custom sound has been deleted.",
   "Custom_Sound_Info": "Custom Sound Info",
   "Custom_Sound_Saved_Successfully": "Custom sound saved successfully",
-  "Custom_Status": "Custom Status",
+  "Custom_Status": "Custom...",
   "Custom_time_range": "Custom time range",
   "Custom_Translations": "Custom Translations",
   "Custom_Translations_Description": "Should be a valid JSON where keys are languages containing a dictionary of key and translations. Example: `{\"en\": {\"Channels\": \"Rooms\"},\"pt\": {\"Channels\": \"Salas\"}}`",
@@ -4273,6 +4273,8 @@
   "Presence_broadcast_disabled_Description": "This shows if the presence broadcast has been disabled automatically. This can happen if you don't have an Premium License and have more than 200 concurrent connections.",
   "Presence_service": "Presence service",
   "Presence_service_cap": "Presence service cap",
+  "Presence_status_on_a_call": "On a call",
+  "Presence_status_outlook_in_a_meeting": "Outlook: In a meeting",
   "Preview": "Preview",
   "Previous_image": "Previous image",
   "Previous_month": "Previous Month",
@@ -5180,6 +5182,18 @@
   "StatusMessage_Changed_Successfully": "Status message changed successfully.",
   "StatusMessage_Placeholder": "What are you doing right now?",
   "StatusMessage_Too_Long": "Status message must be shorter than 120 characters.",
+  "Status_set_your_status": "Set your status",
+  "Status_clear_after": "Clear status after",
+  "Status_dont_clear": "Don't clear",
+  "Status_30_minutes": "30 minutes",
+  "Status_1_hour": "1 hour",
+  "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_you_can_use_emoji": "You can use emoji",
+  "Status_new_status_warning": "New status can be changed by: calendar integrations, voice calls or videoconferencing",
+  "Status_new_status_warning_after_call": "New status will be applied after the current call ends",
   "Step": "Step",
   "Stop_Recording": "Stop Recording",
   "Stop_call": "Stop call",
@@ -5609,6 +5623,9 @@
   "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",
+  "Until_date": "Until {{date}}",
+  "Until_time": "Until {{time}}",
   "Update_anyway": "Update anyway",
   "Update_every": "Update every",
   "Update_to_access_marketplace": "Update to access marketplace",
diff --git a/packages/model-typings/src/models/ICalendarEventModel.ts b/packages/model-typings/src/models/ICalendarEventModel.ts
index 9aae06964d25a..9636185a90cfc 100644
--- a/packages/model-typings/src/models/ICalendarEventModel.ts
+++ b/packages/model-typings/src/models/ICalendarEventModel.ts
@@ -14,10 +14,6 @@ export interface ICalendarEventModel extends IBaseModel<ICalendarEvent> {
 		uid: ICalendarEvent['uid'],
 	): Promise<ICalendarEvent | null>;
 	findOverlappingEvents(eventId: ICalendarEvent['_id'], uid: IUser['_id'], startTime: Date, endTime: Date): FindCursor<ICalendarEvent>;
-	findEligibleEventsForCancelation(uid: IUser['_id'], endTime: Date): FindCursor<ICalendarEvent>;
-	findEventsToScheduleNow(now: Date, endTime: Date): FindCursor<ICalendarEvent>;
 	findNextFutureEvent(startTime: Date): Promise<ICalendarEvent | null>;
-	findInProgressEvents(now: Date): FindCursor<ICalendarEvent>;
 	findEventsStartingNow({ now, offset }: { now: Date; offset?: number }): FindCursor<ICalendarEvent>;
-	findEventsEndingNow({ now, offset }: { now: Date; offset?: number }): FindCursor<ICalendarEvent>;
 }
diff --git a/packages/model-typings/src/models/IUsersModel.ts b/packages/model-typings/src/models/IUsersModel.ts
index 43282b597762a..6e748b49fa2d4 100644
--- a/packages/model-typings/src/models/IUsersModel.ts
+++ b/packages/model-typings/src/models/IUsersModel.ts
@@ -177,6 +177,7 @@ export interface IUsersModel extends IBaseModel<IUser> {
 			IUser,
 			| '_id'
 			| 'username'
+			| 'type'
 			| 'roles'
 			| 'status'
 			| 'statusDefault'
@@ -184,6 +185,7 @@ export interface IUsersModel extends IBaseModel<IUser> {
 			| 'statusText'
 			| 'statusExpiresAt'
 			| 'statusConnection'
+			| 'statusId'
 			| 'previousState'
 		>
 	>;
@@ -379,7 +381,7 @@ export interface IUsersModel extends IBaseModel<IUser> {
 	findOneActiveById(userId: string, options?: FindOptions<IUser>): Promise<IUser | null>;
 	findOneByIdOrUsername(userId: string, options?: FindOptions<IUser>): Promise<IUser | null>;
 	findOneByRolesAndType<T extends Document = IUser>(roles: IRole['_id'][], type: string, options?: FindOptions<IUser>): Promise<T | null>;
-	findNotOfflineByIds(userIds: string[], options?: FindOptions<IUser>): FindCursor<IUser>;
+	findPresenceUsersByIds(userIds: string[], options?: FindOptions<IUser>): FindCursor<IUser>;
 	findUsersNotOffline(options?: FindOptions<IUser>): FindCursor<IUser>;
 	countUsersNotOffline(options?: FindOptions<IUser>): Promise<number>;
 	findNotIdUpdatedFrom(userId: string, updatedFrom: Date, options?: FindOptions<IUser>): FindCursor<IUser>;
diff --git a/packages/models/src/models/CalendarEvent.ts b/packages/models/src/models/CalendarEvent.ts
index 87a64ee7d0944..2c7a567080f2e 100644
--- a/packages/models/src/models/CalendarEvent.ts
+++ b/packages/models/src/models/CalendarEvent.ts
@@ -50,17 +50,7 @@ export class CalendarEventRaw extends BaseRaw<ICalendarEvent> implements ICalend
 
 	public async updateEvent(
 		eventId: ICalendarEvent['_id'],
-		{
-			subject,
-			description,
-			startTime,
-			endTime,
-			meetingUrl,
-			reminderMinutesBeforeStart,
-			reminderTime,
-			previousStatus,
-			busy,
-		}: Partial<ICalendarEvent>,
+		{ subject, description, startTime, endTime, meetingUrl, reminderMinutesBeforeStart, reminderTime, busy }: Partial<ICalendarEvent>,
 	): Promise<UpdateResult> {
 		return this.updateOne(
 			{ _id: eventId },
@@ -73,7 +63,6 @@ export class CalendarEventRaw extends BaseRaw<ICalendarEvent> implements ICalend
 					...(meetingUrl !== undefined ? { meetingUrl } : {}),
 					...(reminderMinutesBeforeStart ? { reminderMinutesBeforeStart } : {}),
 					...(reminderTime ? { reminderTime } : {}),
-					...(previousStatus ? { previousStatus } : {}),
 					...(typeof busy === 'boolean' && { busy }),
 				},
 			},
@@ -156,33 +145,6 @@ export class CalendarEventRaw extends BaseRaw<ICalendarEvent> implements ICalend
 		});
 	}
 
-	public findEligibleEventsForCancelation(uid: IUser['_id'], endTime: Date): FindCursor<ICalendarEvent> {
-		return this.find({
-			uid,
-			startTime: { $exists: true, $lte: endTime },
-			endTime: { $exists: true, $gte: endTime },
-		});
-	}
-
-	public findEventsToScheduleNow(now: Date, endTime: Date): FindCursor<ICalendarEvent> {
-		return this.find(
-			{
-				startTime: { $gte: now, $lt: endTime },
-				busy: { $ne: false },
-				endTime: { $exists: true },
-			},
-			{
-				sort: { startTime: 1 },
-				projection: {
-					_id: 1,
-					uid: 1,
-					startTime: 1,
-					endTime: 1,
-				},
-			},
-		);
-	}
-
 	public async findNextFutureEvent(startTime: Date): Promise<ICalendarEvent | null> {
 		return this.findOne(
 			{
@@ -218,43 +180,4 @@ export class CalendarEventRaw extends BaseRaw<ICalendarEvent> implements ICalend
 			},
 		);
 	}
-
-	public findEventsEndingNow({ now, offset = 1000 }: { now: Date; offset?: number }): FindCursor<ICalendarEvent> {
-		return this.find(
-			{
-				endTime: {
-					$gte: new Date(now.getTime() - offset),
-					$lt: new Date(now.getTime() + offset),
-				},
-				busy: { $ne: false },
-			},
-			{
-				projection: {
-					_id: 1,
-					uid: 1,
-					startTime: 1,
-					endTime: 1,
-					previousStatus: 1,
-				},
-			},
-		);
-	}
-
-	public findInProgressEvents(now: Date): FindCursor<ICalendarEvent> {
-		return this.find(
-			{
-				startTime: { $lt: now },
-				endTime: { $gt: now },
-				busy: { $ne: false },
-			},
-			{
-				projection: {
-					_id: 1,
-					uid: 1,
-					startTime: 1,
-					endTime: 1,
-				},
-			},
-		);
-	}
 }
diff --git a/packages/models/src/models/Users.ts b/packages/models/src/models/Users.ts
index 6a84f20530369..8c18f2dbdf8f5 100644
--- a/packages/models/src/models/Users.ts
+++ b/packages/models/src/models/Users.ts
@@ -1103,6 +1103,7 @@ export class UsersRaw extends BaseRaw<IUser, DefaultFields<IUser>> implements IU
 				IUser,
 				| '_id'
 				| 'username'
+				| 'type'
 				| 'roles'
 				| 'status'
 				| 'statusDefault'
@@ -1110,6 +1111,7 @@ export class UsersRaw extends BaseRaw<IUser, DefaultFields<IUser>> implements IU
 				| 'statusText'
 				| 'statusExpiresAt'
 				| 'statusConnection'
+				| 'statusId'
 				| 'previousState'
 			>
 		>(
@@ -1117,6 +1119,7 @@ export class UsersRaw extends BaseRaw<IUser, DefaultFields<IUser>> implements IU
 			{
 				projection: {
 					username: 1,
+					type: 1,
 					roles: 1,
 					status: 1,
 					statusDefault: 1,
@@ -1124,6 +1127,7 @@ export class UsersRaw extends BaseRaw<IUser, DefaultFields<IUser>> implements IU
 					statusText: 1,
 					statusExpiresAt: 1,
 					statusConnection: 1,
+					statusId: 1,
 					previousState: 1,
 				},
 				sort: { statusExpiresAt: 1 },
@@ -2484,12 +2488,14 @@ export class UsersRaw extends BaseRaw<IUser, DefaultFields<IUser>> implements IU
 		return this.findOne<T>(query, options);
 	}
 
-	findNotOfflineByIds(users?: IUser['_id'][], options?: FindOptions<IUser>) {
+	findPresenceUsersByIds(users: IUser['_id'][], options?: FindOptions<IUser>) {
 		const query = {
 			_id: { $in: users },
-			status: {
-				$in: [UserStatus.ONLINE, UserStatus.AWAY, UserStatus.BUSY],
-			},
+			$or: [
+				{ status: { $in: [UserStatus.ONLINE, UserStatus.AWAY, UserStatus.BUSY] } },
+				{ statusText: { $exists: true, $ne: '' } },
+				{ statusExpiresAt: { $exists: true } },
+			],
 		};
 		return this.find(query, options);
 	}
diff --git a/packages/rest-typings/src/v1/users.ts b/packages/rest-typings/src/v1/users.ts
index 884fe2eeb7735..99a8cbcb66b90 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 };