diff --git a/com.woltlab.wcf/aclOption.xml b/com.woltlab.wcf/aclOption.xml
index 3b21faa817b..264c65159b9 100644
--- a/com.woltlab.wcf/aclOption.xml
+++ b/com.woltlab.wcf/aclOption.xml
@@ -14,6 +14,12 @@
 			<option name="canReadArticle">
 				<objecttype>com.woltlab.wcf.article.category</objecttype>
 			</option>
+			<option name="canViewPoll">
+				<objecttype>com.woltlab.wcf.poll</objecttype>
+			</option>
+			<option name="canVotePoll">
+				<objecttype>com.woltlab.wcf.poll</objecttype>
+			</option>
 		</options>
 	</import>
 </data>
diff --git a/com.woltlab.wcf/bbcode.xml b/com.woltlab.wcf/bbcode.xml
index 3d4c6c554c9..4628366c5e0 100644
--- a/com.woltlab.wcf/bbcode.xml
+++ b/com.woltlab.wcf/bbcode.xml
@@ -212,6 +212,16 @@
 				</attribute>
 			</attributes>
 		</bbcode>
+		<bbcode name="poll">
+			<classname>wcf\system\bbcode\PollBBCode</classname>
+			<isBlockElement>1</isBlockElement>
+			<attributes>
+				<attribute name="0">
+					<validationpattern><![CDATA[^\d+$]]></validationpattern>
+					<required>1</required>
+				</attribute>
+			</attributes>
+		</bbcode>
 		<bbcode name="wsp">
 			<classname>wcf\system\bbcode\WoltLabSuitePageBBCode</classname>
 			<attributes>
diff --git a/com.woltlab.wcf/objectType.xml b/com.woltlab.wcf/objectType.xml
index 9680b6b5f35..399cbd9afee 100644
--- a/com.woltlab.wcf/objectType.xml
+++ b/com.woltlab.wcf/objectType.xml
@@ -408,6 +408,10 @@
 			<name>com.woltlab.wcf.label</name>
 			<definitionname>com.woltlab.wcf.acl</definitionname>
 		</type>
+		<type>
+			<name>com.woltlab.wcf.poll</name>
+			<definitionname>com.woltlab.wcf.acl</definitionname>
+		</type>
 		<!-- importers -->
 		<type>
 			<name>com.woltlab.wcf.user</name>
@@ -675,6 +679,11 @@
 			<definitionname>com.woltlab.wcf.message.embeddedObject</definitionname>
 			<classname>wcf\system\message\embedded\object\MediaMessageEmbeddedObjectHandler</classname>
 		</type>
+		<type>
+			<name>com.woltlab.wcf.poll</name>
+			<definitionname>com.woltlab.wcf.message.embeddedObject</definitionname>
+			<classname>wcf\system\message\embedded\object\PollMessageEmbeddedObjectHandler</classname>
+		</type>
 		<type>
 			<name>com.woltlab.wcf.user</name>
 			<definitionname>com.woltlab.wcf.message.embeddedObject</definitionname>
diff --git a/com.woltlab.wcf/objectTypeDefinition.xml b/com.woltlab.wcf/objectTypeDefinition.xml
index 247fa14e993..13deccedc08 100644
--- a/com.woltlab.wcf/objectTypeDefinition.xml
+++ b/com.woltlab.wcf/objectTypeDefinition.xml
@@ -93,6 +93,7 @@
 		<definition>
 			<name>com.woltlab.wcf.searchableObjectType</name>
 		</definition>
+		<!-- deprecated since 6.3, use standalone polls that are embedded through the `[poll]` BBCode instead -->
 		<definition>
 			<name>com.woltlab.wcf.poll</name>
 			<interfacename>wcf\system\poll\IPollHandler</interfacename>
diff --git a/com.woltlab.wcf/option.xml b/com.woltlab.wcf/option.xml
index 2d7887f5191..adb6300c1af 100644
--- a/com.woltlab.wcf/option.xml
+++ b/com.woltlab.wcf/option.xml
@@ -1442,6 +1442,7 @@ DESC:wcf.global.sortOrder.descending</selectoptions>
 				<minvalue>2</minvalue>
 				<maxvalue>100</maxvalue>
 			</option>
+			<!-- deprecated since 6.3, only affects the legacy polls, the widget of standalone polls always uses the full width -->
 			<option name="poll_full_width">
 				<categoryname>message.general.poll</categoryname>
 				<optiontype>boolean</optiontype>
diff --git a/com.woltlab.wcf/package.xml b/com.woltlab.wcf/package.xml
index bc136faa0db..51930330813 100644
--- a/com.woltlab.wcf/package.xml
+++ b/com.woltlab.wcf/package.xml
@@ -83,6 +83,7 @@
 	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_captchaQuestionL10n.php</instruction>
 	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_userOptionConfiguration.php</instruction>
 	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_mediaL10n.php</instruction>
+	<instruction type="script" run="standalone">acp/update_com.woltlab.wcf_6.3_pollL10n.php</instruction>
 	<instruction type="database" run="standalone">acp/database/update_com.woltlab.wcf_6.3_step3.php</instruction>
 
 	The following step requires the new files and must run before the `cronjob` PIP, which precedes the `objectType` PIP:
diff --git a/com.woltlab.wcf/templates/__messageFormPoll.tpl b/com.woltlab.wcf/templates/__messageFormPoll.tpl
index 9782c3c5a20..8e61e85864b 100644
--- a/com.woltlab.wcf/templates/__messageFormPoll.tpl
+++ b/com.woltlab.wcf/templates/__messageFormPoll.tpl
@@ -1,3 +1,4 @@
+{* deprecated since 6.3: use standalone polls that are embedded through the `[poll]` BBCode instead *}
 {if $__showPoll|isset && $__showPoll}
 	<script data-relocate="true">
 		require(["WoltLabSuite/Core/Ui/Poll/Editor"], (UiPollEditor) => {
diff --git a/com.woltlab.wcf/templates/__messageFormPollInline.tpl b/com.woltlab.wcf/templates/__messageFormPollInline.tpl
index 99a1e7bce29..b62fca4880a 100644
--- a/com.woltlab.wcf/templates/__messageFormPollInline.tpl
+++ b/com.woltlab.wcf/templates/__messageFormPollInline.tpl
@@ -1,3 +1,4 @@
+{* deprecated since 6.3: use standalone polls that are embedded through the `[poll]` BBCode instead *}
 {if $__showPoll|isset && $__showPoll}
 	<script data-relocate="true">
 		require(["WoltLabSuite/Core/Ui/Poll/Editor"], (UiPollEditor) => {
diff --git a/com.woltlab.wcf/templates/poll.tpl b/com.woltlab.wcf/templates/poll.tpl
index 6ad66254ab0..e6dfbecbc40 100644
--- a/com.woltlab.wcf/templates/poll.tpl
+++ b/com.woltlab.wcf/templates/poll.tpl
@@ -1,3 +1,4 @@
+{* deprecated since 6.3: use standalone polls that are embedded through the `[poll]` BBCode instead *}
 {if (!$__wcf->getUser()->isGuest() || $poll->canSeeResult() || $poll->canViewParticipants()) && !$__pollLoadedJavaScript|isset}
 	{assign var=__pollLoadedJavaScript value=true}
 	<script data-relocate="true">
diff --git a/com.woltlab.wcf/templates/pollResult.tpl b/com.woltlab.wcf/templates/pollResult.tpl
index 2da65d7de5e..1f3ce257d41 100644
--- a/com.woltlab.wcf/templates/pollResult.tpl
+++ b/com.woltlab.wcf/templates/pollResult.tpl
@@ -1,3 +1,4 @@
+{* deprecated since 6.3: use standalone polls that are embedded through the `[poll]` BBCode instead *}
 <ol class="pollResultList">
 	{foreach from=$poll->getOptions(true) item=option}
 		<li class="pollResultItem">
diff --git a/com.woltlab.wcf/templates/pollVote.tpl b/com.woltlab.wcf/templates/pollVote.tpl
index c9ccf9e3d69..b24afa4d91a 100644
--- a/com.woltlab.wcf/templates/pollVote.tpl
+++ b/com.woltlab.wcf/templates/pollVote.tpl
@@ -1,3 +1,4 @@
+{* deprecated since 6.3: use standalone polls that are embedded through the `[poll]` BBCode instead *}
 <dl class="wide pollVoteContainer" data-max-votes="{$poll->maxVotes}">
 	{foreach from=$poll->getOptions() item=option}
 		<dt></dt>
diff --git a/com.woltlab.wcf/templates/shared_aclPermissionJavaScript.tpl b/com.woltlab.wcf/templates/shared_aclPermissionJavaScript.tpl
index 3d8c9b29047..39734866a61 100644
--- a/com.woltlab.wcf/templates/shared_aclPermissionJavaScript.tpl
+++ b/com.woltlab.wcf/templates/shared_aclPermissionJavaScript.tpl
@@ -89,7 +89,7 @@
 		{/if}
 
 		var aclList = new AclList(
-			'#{unsafe:$containerID|encodeJS}',
+			'#' + CSS.escape('{unsafe:$containerID|encodeJS}'),
 			{$objectTypeID},
 			{if $categoryName|isset}'{unsafe:$categoryName|encodeJS}'{else}null{/if},
 			{if $objectID|isset}{$objectID}{else}0{/if},
diff --git a/com.woltlab.wcf/templates/shared_bbcode_poll.tpl b/com.woltlab.wcf/templates/shared_bbcode_poll.tpl
new file mode 100644
index 00000000000..62ab870367a
--- /dev/null
+++ b/com.woltlab.wcf/templates/shared_bbcode_poll.tpl
@@ -0,0 +1,141 @@
+<section class="pollWidget" id="{$elementID}" data-interaction-container aria-labelledby="{$elementID}_question"{*
+	*} data-poll-id="{$poll->pollID}"{*
+	*} data-state="{$initialState}"{*
+	*} data-can-vote="{if $poll->canVote()}true{else}false{/if}"{*
+	*} data-max-votes="{$poll->maxVotes}"{*
+	*} data-required-votes="{$poll->getRequiredVotes()}"{*
+	*} data-question="{$poll->getQuestion()}">
+	<header class="pollWidget__header">
+		<div class="pollWidget__eyebrow">
+			{icon name='chart-simple' type='solid'}
+			<span class="pollWidget__label">{lang}wcf.poll.widget.label{/lang}</span>
+			<span class="pollWidget__separator" aria-hidden="true"></span>
+			<span class="pollWidget__totalVotes">{lang}wcf.poll.widget.votes{/lang}</span>
+			{unsafe:$interactionButton}
+		</div>
+
+		<h3 class="pollWidget__question" id="{$elementID}_question" tabindex="-1">{$poll->getQuestion()}</h3>
+
+		{if $poll->canVote()}
+			{if $poll->maxVotes > 1}
+				<div class="pollWidget__hint pollWidget__hint--vote">
+					{if $poll->getRequiredVotes() == $poll->maxVotes}
+						{lang}wcf.poll.widget.hint.exactly{/lang}
+					{elseif $poll->getRequiredVotes() > 1}
+						{lang}wcf.poll.widget.hint.range{/lang}
+					{else}
+						{lang}wcf.poll.widget.hint.multiple{/lang}
+					{/if}
+				</div>
+			{/if}
+		{elseif !$poll->canSeeResult() && !$poll->resultsRequireEnd}
+			<div class="pollWidget__hint pollWidget__hint--vote">{lang}wcf.poll.restrictedResult{/lang}</div>
+		{/if}
+		{if $poll->isParticipant()}
+			{if $poll->canSeeResult()}
+				<div class="pollWidget__hint pollWidget__hint--results">{lang}wcf.poll.widget.hint.voted{/lang}</div>
+			{else}
+				{* Participants remain in the vote state while the results are hidden until the end. *}
+				<div class="pollWidget__hint">{lang}wcf.poll.widget.hint.voted{/lang}</div>
+			{/if}
+		{/if}
+		{if $poll->resultsRequireEnd && !$poll->isFinished()}
+			<div class="pollWidget__hint">{lang}wcf.poll.widget.hint.resultsAfterEnd{/lang}</div>
+		{/if}
+	</header>
+
+	<div class="pollWidget__options">
+		{foreach from=$options item=option}
+			<label class="pollWidget__option{if $poll->canSeeResult() && $leadingVotes && $option->votes == $leadingVotes} pollWidget__option--leading{/if}"{*
+				*}{if $poll->canSeeResult()} style="--pollWidget-percent: {$option->getRelativeVotes($poll)}%; --pollWidget-order: {$resultPositions[$option->optionID]}"{/if}>
+				<input type="{if $poll->maxVotes > 1}checkbox{else}radio{/if}" class="pollWidget__input visuallyHidden" name="{$elementID}" value="{$option->optionID}"{if $option->voted} checked{/if}{if !$poll->canVote()} disabled{/if}>
+				<span class="pollWidget__indicator" aria-hidden="true"></span>
+				{if $poll->canSeeResult()}
+					<span class="pollWidget__bar" aria-hidden="true"></span>
+				{/if}
+				<span class="pollWidget__text">{$option->getOptionValue()}</span>
+				{if $option->voted}
+					<span class="pollWidget__ownVote" title="{lang}wcf.poll.widget.ownVote{/lang}" role="img" aria-label="{lang}wcf.poll.widget.ownVote{/lang}"></span>
+				{/if}
+				{if $poll->canSeeResult()}
+					<span class="pollWidget__value" aria-hidden="true">
+						<span class="pollWidget__count">{#$option->votes}</span>
+						<span class="pollWidget__percent">{#$option->getRelativeVotes($poll)} %</span>
+					</span>
+					<span class="pollWidget__resultLabel visuallyHidden">{lang}wcf.poll.widget.optionResult{/lang}</span>
+				{/if}
+			</label>
+		{/foreach}
+	</div>
+
+	<footer class="pollWidget__footer">
+		{hascontent}
+			<div class="pollWidget__meta">
+				{content}
+					{if $poll->endTime}
+						<div class="pollWidget__metaItem">
+							{icon name='clock'}
+							<span>
+								{if $poll->isFinished()}
+									{lang}wcf.poll.widget.ended{/lang}
+								{else}
+									{lang}wcf.poll.widget.endTime{/lang}
+								{/if}
+							</span>
+						</div>
+					{/if}
+					{if $poll->isPublic}
+						<div class="pollWidget__metaItem">
+							{icon name='eye'}
+							<span>{lang}wcf.poll.isPublic{/lang}</span>
+						</div>
+					{/if}
+
+					{event name='meta'}
+				{/content}
+			</div>
+		{/hascontent}
+
+		{hascontent}
+			<div class="pollWidget__actions pollWidget__actions--vote">
+				{content}
+					{if $poll->canVote()}
+						<button type="button" class="button buttonPrimary pollWidget__vote" disabled>
+							{lang}wcf.poll.button.vote{/lang}
+						</button>
+					{/if}
+					{if $poll->canSeeResult()}
+						<button type="button" class="pollWidget__link pollWidget__showResults">
+							{lang}wcf.poll.button.showResult{/lang}
+						</button>
+					{/if}
+				{/content}
+			</div>
+		{/hascontent}
+
+		{hascontent}
+			<div class="pollWidget__actions pollWidget__actions--results">
+				{content}
+					{if $poll->canVote()}
+						<button type="button" class="button buttonPrimary pollWidget__showVote">
+							{if $poll->isParticipant()}
+								{lang}wcf.poll.button.changeVote{/lang}
+							{else}
+								{lang}wcf.poll.button.showVote{/lang}
+							{/if}
+						</button>
+					{/if}
+					{if $poll->canViewParticipants()}
+						<button type="button" class="pollWidget__link pollWidget__showParticipants">
+							{lang}wcf.poll.button.showParticipants{/lang}
+						</button>
+					{/if}
+				{/content}
+			</div>
+		{/hascontent}
+
+		{event name='footer'}
+	</footer>
+
+	{unsafe:$interactionInitialization}
+</section>
diff --git a/com.woltlab.wcf/templates/shared_pollManagerListItems.tpl b/com.woltlab.wcf/templates/shared_pollManagerListItems.tpl
new file mode 100644
index 00000000000..0b4862619ef
--- /dev/null
+++ b/com.woltlab.wcf/templates/shared_pollManagerListItems.tpl
@@ -0,0 +1,24 @@
+{foreach from=$view->getItems() item='poll'}
+	<div class="pollManager__item listView__item"
+		 role="option"
+		 aria-selected="false"
+		 tabindex="-1"
+		 data-object-id="{$poll->getObjectID()}"
+		 data-question="{$poll->getQuestion()}"
+	>
+		<span class="pollManager__item__indicator" aria-hidden="true">{icon name='check'}</span>
+
+		<div class="pollManager__item__content">
+			<div class="pollManager__item__question">{$poll->getQuestion()}</div>
+			<div class="pollManager__item__meta">
+				{lang}wcf.poll.manager.item.meta{/lang}
+			</div>
+		</div>
+
+		{hascontent}
+			<div class="pollManager__item__menu">
+				{content}{unsafe:$view->renderInteractionContextMenuButton($poll)}{/content}
+			</div>
+		{/hascontent}
+	</div>
+{/foreach}
diff --git a/com.woltlab.wcf/templates/shared_pollOptionListFormField.tpl b/com.woltlab.wcf/templates/shared_pollOptionListFormField.tpl
new file mode 100644
index 00000000000..17f04aebfae
--- /dev/null
+++ b/com.woltlab.wcf/templates/shared_pollOptionListFormField.tpl
@@ -0,0 +1,24 @@
+<input type="hidden" {*
+	*}id="{$field->getPrefixedId()}" {*
+	*}name="{$field->getPrefixedId()}" {*
+	*}value="{$field->getValue()|json}"{*
+*}>
+<template id="{$field->getPrefixedId()}_template">
+	<span class="pollOptionListItem__handle">{icon name='grip-vertical'}</span>
+	<input type="text" class="long pollOptionListItem__value" maxlength="255">
+	<button type="button" class="button small pollOptionListItem__remove jsTooltip" title="{lang}wcf.poll.button.removeOption{/lang}">
+		{icon name='xmark'}
+	</button>
+</template>
+
+<script data-relocate="true">
+	require(['WoltLabSuite/Core/Component/Poll/OptionList'], ({ setup }) => {
+		{jsphrase name='wcf.poll.button.addOption'}
+
+		setup(
+			document.getElementById('{unsafe:$field->getPrefixedId()|encodeJS}'),
+			{unsafe:$availableLanguages|json},
+			{POLL_MAX_OPTIONS}
+		);
+	});
+</script>
diff --git a/com.woltlab.wcf/templates/shared_pollOptionsFormField.tpl b/com.woltlab.wcf/templates/shared_pollOptionsFormField.tpl
index bdf7dbdea5a..b0622c383cb 100644
--- a/com.woltlab.wcf/templates/shared_pollOptionsFormField.tpl
+++ b/com.woltlab.wcf/templates/shared_pollOptionsFormField.tpl
@@ -1,3 +1,4 @@
+{* deprecated since 6.3: use `shared_pollOptionListFormField.tpl` instead *}
 <ol class="sortableList"></ol>
 
 <script data-relocate="true">
diff --git a/com.woltlab.wcf/templates/shared_wysiwyg.tpl b/com.woltlab.wcf/templates/shared_wysiwyg.tpl
index 8447439b6e6..edf7e877b95 100644
--- a/com.woltlab.wcf/templates/shared_wysiwyg.tpl
+++ b/com.woltlab.wcf/templates/shared_wysiwyg.tpl
@@ -50,6 +50,10 @@
 		{jsphrase name='wcf.editor.restoreDraft'}
 		{jsphrase name='wcf.editor.restoreDraft.preview'}
 		{jsphrase name='wcf.editor.restoreDraft.restoreOrDiscard'}
+		{if MODULE_POLL && $__wcf->session->getPermission('user.poll.canCreatePoll')}
+			{jsphrase name='wcf.poll.manager'}
+			{jsphrase name='wcf.poll.manager.selection.none'}
+		{/if}
 
 		{if $__wcf->language->languageCode !== 'en'}
 		window.CKEDITOR_TRANSLATIONS['{unsafe:$__wcf->getBBCodeHandler()->getEditorLocalization(true)|strtolower|encodeJS}'].dictionary["Single line code"] = '{jslang}wcf.editor.button.code{/jslang}';
@@ -82,6 +86,7 @@
 			mark: {if $__wcf->getBBCodeHandler()->isAvailableBBCode('mark')}true{else}false{/if},
 			media: {if $__wcf->session->getPermission('admin.content.cms.canUseMedia')}true{else}false{/if},
 			mention: {if $__wcf->session->hasPermission('user.message.canMention')}element.dataset.supportMention === "true"{else}false{/if},
+			poll: {if MODULE_POLL && $__wcf->session->getPermission('user.poll.canCreatePoll') && $__wcf->getBBCodeHandler()->isAvailableBBCode('poll')}true{else}false{/if},
 			quoteBlock: true,
 			strikethrough: true,
 			submitOnEnter: false,
@@ -109,6 +114,13 @@
 				label: '{jslang}wcf.editor.button.media{/jslang}',
 			});
 		}
+		if (features.poll) {
+			bbcodes.push({
+				icon: "chart-bar;false",
+				name: "poll",
+				label: '{jslang}wcf.editor.button.poll{/jslang}',
+			});
+		}
 		const smileys = [
 			{foreach from=$__wcf->getSmileyCache()->getEmojis() key=__code item=__smiley}
 			{
diff --git a/com.woltlab.wcf/userGroupOption.xml b/com.woltlab.wcf/userGroupOption.xml
index c00134d16ca..048de9f162b 100644
--- a/com.woltlab.wcf/userGroupOption.xml
+++ b/com.woltlab.wcf/userGroupOption.xml
@@ -39,6 +39,10 @@
 			<category name="user.message.contactForm">
 				<parent>user.message</parent>
 			</category>
+			<category name="user.message.poll">
+				<parent>user.message</parent>
+				<options>module_poll</options>
+			</category>
 			<category name="user.cms">
 				<parent>user</parent>
 			</category>
@@ -64,6 +68,10 @@
 			<category name="mod.article">
 				<parent>mod.cms</parent>
 			</category>
+			<category name="mod.poll">
+				<parent>mod.general</parent>
+				<options>module_poll</options>
+			</category>
 			<category name="admin"/>
 			<category name="admin.general">
 				<parent>admin</parent>
@@ -991,6 +999,35 @@ bmp</defaultvalue>
 				<moddefaultvalue>1</moddefaultvalue>
 				<usersonly>1</usersonly>
 			</option>
+			<option name="user.poll.canVotePoll">
+				<categoryname>user.message.poll</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<userdefaultvalue>1</userdefaultvalue>
+				<usersonly>1</usersonly>
+			</option>
+			<option name="user.poll.canCreatePoll">
+				<categoryname>user.message.poll</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<userdefaultvalue>1</userdefaultvalue>
+				<usersonly>1</usersonly>
+				<enableoptions>user.poll.canStartPublicPoll</enableoptions>
+			</option>
+			<option name="user.poll.canStartPublicPoll">
+				<categoryname>user.message.poll</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<userdefaultvalue>1</userdefaultvalue>
+				<usersonly>1</usersonly>
+			</option>
+			<option name="mod.poll.canManagePoll">
+				<categoryname>mod.poll</categoryname>
+				<optiontype>boolean</optiontype>
+				<defaultvalue>0</defaultvalue>
+				<moddefaultvalue>1</moddefaultvalue>
+				<usersonly>1</usersonly>
+			</option>
 			<option name="mod.article.canEditComment">
 				<categoryname>mod.article</categoryname>
 				<optiontype>boolean</optiontype>
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 28a9b3183b7..05d48321cf1 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -492,16 +492,10 @@ parameters:
 			count: 10
 			path: wcfsetup/install/files/lib/data/page/PageAction.class.php
 
-		-
-			message: '#^Call to function array_search\(\) requires parameter \#3 to be set\.$#'
-			identifier: function.strict
-			count: 1
-			path: wcfsetup/install/files/lib/data/poll/PollAction.class.php
-
 		-
 			message: '#^Construct empty\(\) is not allowed\. Use more strict comparison\.$#'
 			identifier: empty.notAllowed
-			count: 2
+			count: 1
 			path: wcfsetup/install/files/lib/data/poll/PollAction.class.php
 
 		-
diff --git a/ts/WoltLabSuite/Core/Api/Polls/GetPoll.ts b/ts/WoltLabSuite/Core/Api/Polls/GetPoll.ts
new file mode 100644
index 00000000000..9c6db4c00ac
--- /dev/null
+++ b/ts/WoltLabSuite/Core/Api/Polls/GetPoll.ts
@@ -0,0 +1,28 @@
+/**
+ * Gets the data of a standalone poll that is required to embed it.
+ *
+ * @author  Marcel Werk
+ * @copyright  2001-2026 WoltLab GmbH
+ * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+
+import { prepareRequest } from "WoltLabSuite/Core/Ajax/Backend";
+import { fromInfallibleApiRequest } from "WoltLabSuite/Core/Api/Result";
+
+export type PollData = {
+  pollID: number;
+  question: string;
+  votes: number;
+  time: number;
+  endTime: number;
+  isFinished: boolean;
+};
+
+export async function getPoll(pollId: number): Promise<PollData> {
+  const url = new URL(`${window.WSC_RPC_API_URL}core/polls/${pollId}`);
+
+  return fromInfallibleApiRequest(() => {
+    return prepareRequest(url).get().fetchAsJson();
+  });
+}
diff --git a/ts/WoltLabSuite/Core/Api/Polls/GetWidget.ts b/ts/WoltLabSuite/Core/Api/Polls/GetWidget.ts
new file mode 100644
index 00000000000..a787911076f
--- /dev/null
+++ b/ts/WoltLabSuite/Core/Api/Polls/GetWidget.ts
@@ -0,0 +1,23 @@
+/**
+ * Gets the rendered widget of a standalone poll.
+ *
+ * @author  Marcel Werk
+ * @copyright  2001-2026 WoltLab GmbH
+ * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+
+import { prepareRequest } from "WoltLabSuite/Core/Ajax/Backend";
+import { fromInfallibleApiRequest } from "WoltLabSuite/Core/Api/Result";
+
+type Response = {
+  template: string;
+};
+
+export async function getWidget(pollId: number): Promise<Response> {
+  const url = new URL(`${window.WSC_RPC_API_URL}core/polls/${pollId}/widget`);
+
+  return fromInfallibleApiRequest(() => {
+    return prepareRequest(url).get().fetchAsJson();
+  });
+}
diff --git a/ts/WoltLabSuite/Core/Api/Polls/Vote.ts b/ts/WoltLabSuite/Core/Api/Polls/Vote.ts
new file mode 100644
index 00000000000..f4986a5dd7a
--- /dev/null
+++ b/ts/WoltLabSuite/Core/Api/Polls/Vote.ts
@@ -0,0 +1,24 @@
+/**
+ * Stores the vote of the active user in a poll.
+ *
+ * @author  Marcel Werk
+ * @copyright  2001-2026 WoltLab GmbH
+ * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+
+import { prepareRequest } from "WoltLabSuite/Core/Ajax/Backend";
+import { fromInfallibleApiRequest } from "WoltLabSuite/Core/Api/Result";
+
+export type VoteResponse = {
+  // The updated widget of the standalone poll.
+  template: string;
+};
+
+export async function vote(pollId: number, optionIDs: number[]): Promise<VoteResponse> {
+  const url = new URL(`${window.WSC_RPC_API_URL}core/polls/${pollId}/vote`);
+
+  return fromInfallibleApiRequest(() => {
+    return prepareRequest(url).post({ optionIDs }).fetchAsJson();
+  });
+}
diff --git a/ts/WoltLabSuite/Core/Bootstrap.ts b/ts/WoltLabSuite/Core/Bootstrap.ts
index 7fe4235971f..b2d80366e54 100644
--- a/ts/WoltLabSuite/Core/Bootstrap.ts
+++ b/ts/WoltLabSuite/Core/Bootstrap.ts
@@ -199,6 +199,10 @@ export function setup(options: BoostrapOptions): void {
     void import("./Component/Media/Gallery").then(({ setup }) => setup());
   });
 
+  whenFirstSeen(".pollWidget", () => {
+    void import("./Component/Poll/Widget").then(({ setup }) => setup());
+  });
+
   whenFirstSeen("[data-fancybox]", () => {
     void import("./Component/Image/Viewer").then(({ setup }) => setup());
   });
diff --git a/ts/WoltLabSuite/Core/Component/Ckeditor.ts b/ts/WoltLabSuite/Core/Component/Ckeditor.ts
index 09f3424c3ea..16ba3c84505 100644
--- a/ts/WoltLabSuite/Core/Component/Ckeditor.ts
+++ b/ts/WoltLabSuite/Core/Component/Ckeditor.ts
@@ -16,6 +16,7 @@
 import type { CKEditor5 } from "@woltlab/editor";
 import { setup as setupAttachment } from "./Ckeditor/Attachment";
 import { setup as setupMedia } from "./Ckeditor/Media";
+import { setup as setupPoll } from "./Ckeditor/Poll";
 import { setup as setupMention } from "./Ckeditor/Mention";
 import { setup as setupQuote } from "./Ckeditor/Quote";
 import { deleteDraft, initializeAutosave, setupRestoreDraft } from "./Ckeditor/Autosave";
@@ -308,6 +309,11 @@ export async function setupCkeditor(
   } else {
     bbcodes = bbcodes.filter((item) => item.name !== "media");
   }
+  if (features.poll) {
+    setupPoll(element);
+  } else {
+    bbcodes = bbcodes.filter((item) => item.name !== "poll");
+  }
 
   setupMention(element);
   if (features.quoteBlock) {
diff --git a/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts b/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
index 7f5b105fe95..81bd2f8c18f 100644
--- a/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
+++ b/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
@@ -392,6 +392,7 @@ export type Features = {
   mark: boolean;
   media: boolean;
   mention: boolean;
+  poll: boolean;
   quoteBlock: boolean;
   spoiler: boolean;
   strikethrough: boolean;
diff --git a/ts/WoltLabSuite/Core/Component/Ckeditor/Poll.ts b/ts/WoltLabSuite/Core/Component/Ckeditor/Poll.ts
new file mode 100644
index 00000000000..9a758c8915e
--- /dev/null
+++ b/ts/WoltLabSuite/Core/Component/Ckeditor/Poll.ts
@@ -0,0 +1,44 @@
+/**
+ * Embeds standalone polls into the editor through the poll manager.
+ *
+ * @author Marcel Werk
+ * @copyright 2001-2026 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ * @woltlabExcludeBundle tiny
+ */
+
+import { listenToCkeditor } from "./Event";
+import { promiseMutex } from "../../Helper/PromiseMutex";
+import type { CKEditor } from "../Ckeditor";
+
+async function insertPoll(ckeditor: CKEditor): Promise<void> {
+  const { openPollManager } = await import("../Poll/Manager");
+
+  const poll = await openPollManager();
+  if (poll === undefined) {
+    return;
+  }
+
+  ckeditor.insertText(`[poll='${poll.pollID}'][/poll]`);
+}
+
+export function setup(element: HTMLElement): void {
+  listenToCkeditor(element).ready(({ ckeditor }) => {
+    if (!ckeditor.features.poll) {
+      return;
+    }
+
+    // The poll manager is loaded asynchronously, repeated clicks must not open it twice.
+    const openManager = promiseMutex(() => insertPoll(ckeditor));
+    listenToCkeditor(ckeditor.sourceElement).bbcode(({ bbcode }) => {
+      if (bbcode !== "poll") {
+        return false;
+      }
+
+      openManager();
+
+      return true;
+    });
+  });
+}
diff --git a/ts/WoltLabSuite/Core/Component/GridView.ts b/ts/WoltLabSuite/Core/Component/GridView.ts
index 44fc6b7c49d..f012f271c68 100644
--- a/ts/WoltLabSuite/Core/Component/GridView.ts
+++ b/ts/WoltLabSuite/Core/Component/GridView.ts
@@ -17,6 +17,7 @@ import { promiseMutex } from "../Helper/PromiseMutex";
 import { wheneverFirstSeen } from "../Helper/Selector";
 import UiDropdownSimple from "../Ui/Dropdown/Simple";
 import { State, StateChangeCause } from "./GridView/State";
+import { isOwnInteraction } from "./Interaction/Container";
 
 export class GridView {
   readonly #gridClassName: string;
@@ -112,6 +113,10 @@ export class GridView {
       const containers = [row];
 
       row.querySelectorAll<HTMLElement>(".dropdownToggle").forEach((element) => {
+        if (!isOwnInteraction(row, element)) {
+          return;
+        }
+
         const dropdown = UiDropdownSimple.getDropdownMenu(element.dataset.target!);
         if (dropdown) {
           containers.push(dropdown);
@@ -120,6 +125,10 @@ export class GridView {
 
       for (const container of containers) {
         container.querySelectorAll<HTMLButtonElement>("[data-interaction]").forEach((element) => {
+          if (container === row && !isOwnInteraction(row, element)) {
+            return;
+          }
+
           element.addEventListener("click", () => {
             row.dispatchEvent(
               new CustomEvent("interaction:execute", {
diff --git a/ts/WoltLabSuite/Core/Component/Interaction/Container.ts b/ts/WoltLabSuite/Core/Component/Interaction/Container.ts
new file mode 100644
index 00000000000..42f37e8e291
--- /dev/null
+++ b/ts/WoltLabSuite/Core/Component/Interaction/Container.ts
@@ -0,0 +1,19 @@
+/**
+ * Helper functions for containers that handle interactions.
+ *
+ * @author Marcel Werk
+ * @copyright 2001-2026 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+
+/**
+ * Returns true if the element belongs to the interactions of the given
+ * container rather than to a nested container that handles its own
+ * interactions, such as an embedded poll widget.
+ */
+export function isOwnInteraction(container: HTMLElement, element: HTMLElement): boolean {
+  const nested = element.closest("[data-interaction-container]");
+
+  return nested === null || nested === container || !container.contains(nested);
+}
diff --git a/ts/WoltLabSuite/Core/Component/ListView.ts b/ts/WoltLabSuite/Core/Component/ListView.ts
index 541dd9369e8..ed7f05790d8 100644
--- a/ts/WoltLabSuite/Core/Component/ListView.ts
+++ b/ts/WoltLabSuite/Core/Component/ListView.ts
@@ -17,6 +17,7 @@ import UiDropdownSimple from "../Ui/Dropdown/Simple";
 import { getItem } from "../Api/ListViews/GetItem";
 import { getBulkContextMenuOptions } from "../Api/Interactions/GetBulkContextMenuOptions";
 import { promiseMutex } from "../Helper/PromiseMutex";
+import { isOwnInteraction } from "./Interaction/Container";
 
 export class ListView {
   readonly #viewClassName: string;
@@ -104,6 +105,10 @@ export class ListView {
   #initInteractions(): void {
     wheneverFirstSeen(`#${this.#viewElement.id} .listView__item`, (item) => {
       item.querySelectorAll<HTMLElement>(".dropdownToggle").forEach((element) => {
+        if (!isOwnInteraction(item, element)) {
+          return;
+        }
+
         let dropdown = UiDropdownSimple.getDropdownMenu(element.dataset.target!);
         if (!dropdown) {
           dropdown = element.closest(".dropdown")!.querySelector<HTMLElement>(".dropdownMenu")!;
diff --git a/ts/WoltLabSuite/Core/Component/NodeTreeView.ts b/ts/WoltLabSuite/Core/Component/NodeTreeView.ts
index a7b0e14f618..fd6118f7e52 100644
--- a/ts/WoltLabSuite/Core/Component/NodeTreeView.ts
+++ b/ts/WoltLabSuite/Core/Component/NodeTreeView.ts
@@ -15,6 +15,7 @@ import { wheneverFirstSeen } from "../Helper/Selector";
 import { createFragmentFromHtml, setInnerHtml } from "../Dom/Util";
 import UiDropdownSimple from "../Ui/Dropdown/Simple";
 import Sortable from "sortablejs";
+import { isOwnInteraction } from "./Interaction/Container";
 
 export class NodeTreeView {
   readonly #id: string;
@@ -48,6 +49,10 @@ export class NodeTreeView {
       const containers = [content];
 
       content.querySelectorAll<HTMLElement>(".dropdownToggle").forEach((element) => {
+        if (!isOwnInteraction(content, element)) {
+          return;
+        }
+
         const dropdown = UiDropdownSimple.getDropdownMenu(element.dataset.target!);
         if (dropdown) {
           containers.push(dropdown);
@@ -56,6 +61,10 @@ export class NodeTreeView {
 
       for (const container of containers) {
         container.querySelectorAll<HTMLButtonElement>("[data-interaction]").forEach((element) => {
+          if (container === content && !isOwnInteraction(content, element)) {
+            return;
+          }
+
           element.addEventListener("click", () => {
             node.dispatchEvent(
               new CustomEvent("interaction:execute", {
diff --git a/ts/WoltLabSuite/Core/Component/Poll/Manager.ts b/ts/WoltLabSuite/Core/Component/Poll/Manager.ts
new file mode 100644
index 00000000000..759c8d4b29e
--- /dev/null
+++ b/ts/WoltLabSuite/Core/Component/Poll/Manager.ts
@@ -0,0 +1,301 @@
+/**
+ * Shows the poll manager in a dialog to select a standalone poll, which can be
+ * created or edited from within the dialog.
+ *
+ * @author Marcel Werk
+ * @copyright 2001-2026 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ * @woltlabExcludeBundle tiny
+ */
+
+import { dialogFactory } from "WoltLabSuite/Core/Component/Dialog";
+import { getPoll, PollData } from "WoltLabSuite/Core/Api/Polls/GetPoll";
+import { getPhrase } from "WoltLabSuite/Core/Language";
+import { escapeHTML } from "WoltLabSuite/Core/StringUtil";
+import { showDefaultSuccessSnackbar } from "WoltLabSuite/Core/Component/Snackbar";
+import type WoltlabCoreDialogElement from "WoltLabSuite/Core/Element/woltlab-core-dialog";
+
+type PollEditResult = {
+  pollID: number;
+  question: string;
+};
+
+/**
+ * Keeps track of the selected poll, which survives the reloading of the list.
+ */
+class PollSelection {
+  readonly #dialog: WoltlabCoreDialogElement;
+  readonly #listViewItems: HTMLElement;
+  readonly #selectionInfo: HTMLElement;
+  #selectedId: number | undefined = undefined;
+  #selectedQuestion = "";
+
+  constructor(dialog: WoltlabCoreDialogElement, listViewItems: HTMLElement) {
+    this.#dialog = dialog;
+    this.#listViewItems = listViewItems;
+
+    this.#selectionInfo = document.createElement("div");
+    this.#selectionInfo.classList.add("pollManager__selectionInfo");
+    dialog.querySelector("woltlab-core-dialog-control")!.append(this.#selectionInfo);
+
+    listViewItems.setAttribute("role", "listbox");
+
+    // The items are replaced whenever the list is reloaded.
+    new MutationObserver(() => this.render()).observe(listViewItems, { childList: true });
+
+    this.#initEventListeners();
+    this.render();
+  }
+
+  getSelectedId(): number | undefined {
+    return this.#selectedId;
+  }
+
+  select(item: HTMLElement): void {
+    this.#selectedId = parseInt(item.dataset.objectId!);
+    this.#selectedQuestion = item.dataset.question!;
+    this.render();
+  }
+
+  getItem(pollId: number): HTMLElement | null {
+    return this.#listViewItems.querySelector<HTMLElement>(`.pollManager__item[data-object-id="${pollId}"]`);
+  }
+
+  render(): void {
+    const items = Array.from(this.#listViewItems.querySelectorAll<HTMLElement>(".pollManager__item"));
+
+    let focusableItem = items.find((item) => parseInt(item.dataset.objectId!) === this.#selectedId);
+    focusableItem ??= items[0];
+
+    for (const item of items) {
+      const isSelected = parseInt(item.dataset.objectId!) === this.#selectedId;
+      item.classList.toggle("pollManager__item--selected", isSelected);
+      item.setAttribute("aria-selected", isSelected ? "true" : "false");
+      item.tabIndex = item === focusableItem ? 0 : -1;
+    }
+
+    if (this.#selectedId === undefined) {
+      this.#selectionInfo.textContent = getPhrase("wcf.poll.manager.selection.none");
+    } else {
+      this.#selectionInfo.innerHTML = `<strong>${escapeHTML(this.#selectedQuestion)}</strong>`;
+    }
+    this.#selectionInfo.title = this.#selectionInfo.textContent || "";
+
+    this.#dialog.incomplete = this.#selectedId === undefined;
+  }
+
+  confirm(): void {
+    if (this.#selectedId === undefined) {
+      return;
+    }
+
+    // The `disabled` state of the primary button is updated asynchronously
+    // when `incomplete` changes, `click()` would be a no-op immediately after
+    // selecting the first item.
+    const button = this.#dialog.querySelector<HTMLButtonElement>(".dialog__control__button--primary")!;
+    button.form!.requestSubmit(button);
+  }
+
+  #initEventListeners(): void {
+    this.#listViewItems.addEventListener("click", (event) => {
+      const item = this.#getItemFromEvent(event);
+      if (item !== null) {
+        this.select(item);
+      }
+    });
+
+    // Deleted polls must not remain selected.
+    this.#listViewItems.addEventListener("interaction:remove", (event) => {
+      const pollId = parseInt((event.target as HTMLElement).dataset.objectId!);
+      if (pollId === this.#selectedId) {
+        this.#selectedId = undefined;
+        this.render();
+      }
+    });
+
+    this.#listViewItems.addEventListener("dblclick", (event) => {
+      const item = this.#getItemFromEvent(event);
+      if (item !== null) {
+        this.select(item);
+        this.confirm();
+      }
+    });
+
+    this.#listViewItems.addEventListener("keydown", (event) => {
+      const item = this.#getItemFromEvent(event);
+      if (item === null || event.target !== item) {
+        return;
+      }
+
+      switch (event.key) {
+        case " ":
+          event.preventDefault();
+          this.select(item);
+          break;
+
+        case "Enter":
+          event.preventDefault();
+          this.select(item);
+          this.confirm();
+          break;
+
+        case "ArrowUp":
+        case "ArrowDown": {
+          event.preventDefault();
+          const sibling = (
+            event.key === "ArrowUp" ? item.previousElementSibling : item.nextElementSibling
+          ) as HTMLElement | null;
+          if (sibling?.classList.contains("pollManager__item")) {
+            item.tabIndex = -1;
+            sibling.tabIndex = 0;
+            sibling.focus();
+          }
+          break;
+        }
+      }
+    });
+  }
+
+  #getItemFromEvent(event: Event): HTMLElement | null {
+    const target = event.target as HTMLElement;
+
+    // The context menu must not change the selection.
+    if (target.closest(".pollManager__item__menu") !== null) {
+      return null;
+    }
+
+    return target.closest<HTMLElement>(".pollManager__item");
+  }
+}
+
+/**
+ * Resolves with the item of the given poll once the list has been reloaded.
+ */
+function waitForItem(
+  selection: PollSelection,
+  listViewItems: HTMLElement,
+  pollId: number,
+): Promise<HTMLElement | null> {
+  return new Promise((resolve) => {
+    const observer = new MutationObserver(() => {
+      observer.disconnect();
+      window.clearTimeout(timeout);
+      resolve(selection.getItem(pollId));
+    });
+    observer.observe(listViewItems, { childList: true });
+
+    // An empty list that remains empty does not cause any mutation.
+    const timeout = window.setTimeout(() => {
+      observer.disconnect();
+      resolve(selection.getItem(pollId));
+    }, 5_000);
+  });
+}
+
+function setupSearch(dialog: WoltlabCoreDialogElement, listViewItems: HTMLElement): void {
+  const input = dialog.content.querySelector<HTMLInputElement>(".pollManager__searchInput");
+  if (input === null) {
+    return;
+  }
+
+  let timeout: number | undefined = undefined;
+  input.addEventListener("input", () => {
+    window.clearTimeout(timeout);
+    timeout = window.setTimeout(() => {
+      listViewItems.dispatchEvent(
+        new CustomEvent("interaction:set-parameters", {
+          detail: { searchString: input.value.trim() },
+        }),
+      );
+    }, 200);
+  });
+
+  // Prevent Enter from submitting the prompt form of the dialog.
+  input.addEventListener("keydown", (event) => {
+    if (event.key === "Enter") {
+      event.preventDefault();
+    }
+  });
+}
+
+function setupAddButton(dialog: WoltlabCoreDialogElement, listViewItems: HTMLElement, selection: PollSelection): void {
+  const addButton = dialog.content.querySelector<HTMLButtonElement>(".pollManager__addButton");
+  const endpoint = dialog.content.querySelector<HTMLElement>(".pollManager__config")?.dataset.addEndpoint;
+  if (addButton === null || endpoint === undefined) {
+    return;
+  }
+
+  addButton.addEventListener("click", async () => {
+    const { ok, result } = await dialogFactory().usingFormBuilder().fromEndpoint<PollEditResult>(endpoint);
+    if (!ok || !listViewItems.isConnected) {
+      return;
+    }
+
+    showDefaultSuccessSnackbar();
+
+    const itemPromise = waitForItem(selection, listViewItems, result.pollID);
+    listViewItems.dispatchEvent(new CustomEvent("interaction:invalidate-all"));
+
+    const item = await itemPromise;
+    if (item !== null) {
+      selection.select(item);
+      item.scrollIntoView({ block: "nearest" });
+    }
+  });
+}
+
+/**
+ * Opens the poll manager and resolves with the selected poll, `undefined` is
+ * returned if the dialog was closed.
+ */
+export async function openPollManager(): Promise<PollData | undefined> {
+  const dialog = await dialogFactory()
+    .usingListView()
+    .fromPreset(
+      getPhrase("wcf.poll.manager"),
+      "wcf\\system\\listView\\user\\PollManagerListView",
+      new Map(),
+      undefined,
+      "time",
+      "DESC",
+      1,
+      {
+        primary: getPhrase("wcf.global.button.insert"),
+      },
+    );
+  dialog.dialog.classList.add("dialog--pollManager");
+
+  const listViewItems = dialog.content.querySelector<HTMLElement>(".listView__items")!;
+
+  const selection = new PollSelection(dialog, listViewItems);
+  setupSearch(dialog, listViewItems);
+  setupAddButton(dialog, listViewItems, selection);
+
+  return new Promise<PollData | undefined>((resolve) => {
+    let completed = false;
+
+    dialog.addEventListener("primary", async () => {
+      const pollId = selection.getSelectedId();
+      if (completed || pollId === undefined) {
+        return;
+      }
+      completed = true;
+
+      try {
+        resolve(await getPoll(pollId));
+      } finally {
+        if (dialog.isConnected) {
+          dialog.close();
+        }
+      }
+    });
+
+    dialog.addEventListener("afterClose", () => {
+      if (!completed) {
+        completed = true;
+        resolve(undefined);
+      }
+    });
+  });
+}
diff --git a/ts/WoltLabSuite/Core/Component/Poll/OptionList.ts b/ts/WoltLabSuite/Core/Component/Poll/OptionList.ts
new file mode 100644
index 00000000000..9699e5929a0
--- /dev/null
+++ b/ts/WoltLabSuite/Core/Component/Poll/OptionList.ts
@@ -0,0 +1,200 @@
+/**
+ * Manages the list of options of a poll, each option can either have a single
+ * value or a value per language.
+ *
+ * @author  Marcel Werk
+ * @copyright  2001-2026 WoltLab GmbH
+ * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+
+import { identify } from "WoltLabSuite/Core/Dom/Util";
+import { getPhrase } from "WoltLabSuite/Core/Language";
+import { getValues, init as initI18n, unregister as unregisterI18n } from "WoltLabSuite/Core/Language/Input";
+import { escapeHTML } from "WoltLabSuite/Core/StringUtil";
+import Sortable from "sortablejs";
+
+export type PollOptionData = {
+  optionID: number;
+  optionValue: Record<string, string>;
+};
+
+type Languages = Record<string, string>;
+
+class PollOptionList {
+  readonly #languages: Languages;
+  readonly #list: HTMLOListElement;
+  readonly #addButton: HTMLButtonElement;
+  readonly #maxOptions: number;
+  readonly #template: HTMLTemplateElement;
+
+  constructor(formField: HTMLInputElement, languages: Languages, maxOptions: number) {
+    const template = document.getElementById(`${formField.id}_template`);
+    if (!(template instanceof HTMLTemplateElement)) {
+      throw new Error(`Cannot find the template '${formField.id}_template' for the poll options.`, {
+        cause: {
+          formField,
+        },
+      });
+    }
+
+    this.#languages = languages;
+    this.#maxOptions = maxOptions;
+    this.#template = template;
+
+    this.#list = document.createElement("ol");
+    this.#list.classList.add("pollOptionList");
+    formField.insertAdjacentElement("afterend", this.#list);
+
+    this.#addButton = document.createElement("button");
+    this.#addButton.type = "button";
+    this.#addButton.classList.add("button", "small", "pollOptionList__addItem");
+    this.#addButton.textContent = getPhrase("wcf.poll.button.addOption");
+    this.#addButton.addEventListener("click", () => {
+      this.#createRow(undefined, true);
+    });
+    this.#list.insertAdjacentElement("afterend", this.#addButton);
+
+    const options = formField.value ? (JSON.parse(formField.value) as PollOptionData[]) : [];
+    options.forEach((option) => this.#createRow(option));
+    if (options.length === 0) {
+      this.#createRow();
+      this.#createRow();
+    }
+
+    new Sortable(this.#list, {
+      direction: "vertical",
+      animation: 150,
+      fallbackOnBody: true,
+      draggable: "li",
+      handle: ".pollOptionListItem__handle",
+    });
+  }
+
+  #createRow(option?: PollOptionData, autoFocus: boolean = false, previousRow?: HTMLLIElement): void {
+    if (this.#list.childElementCount >= this.#maxOptions) {
+      return;
+    }
+
+    const li = document.createElement("li");
+    li.classList.add("pollOptionListItem");
+    li.dataset.optionId = option ? option.optionID.toString() : "0";
+    li.append(this.#template.content.cloneNode(true));
+
+    if (previousRow) {
+      previousRow.after(li);
+    } else {
+      this.#list.append(li);
+    }
+
+    const valueInput = li.querySelector(".pollOptionListItem__value") as HTMLInputElement;
+    identify(valueInput);
+
+    li.querySelector(".pollOptionListItem__remove")!.addEventListener("click", () => {
+      const siblingRow = li.nextElementSibling ?? li.previousElementSibling;
+
+      if (this.#hasLanguageSelection()) {
+        unregisterI18n(valueInput.id);
+      }
+      li.remove();
+
+      if (siblingRow === null) {
+        this.#createRow(undefined, true);
+      } else {
+        siblingRow.querySelector<HTMLInputElement>(".pollOptionListItem__value")!.focus();
+      }
+
+      this.#updateAddButton();
+    });
+
+    valueInput.addEventListener("keydown", (event) => {
+      if (event.key === "Enter") {
+        event.preventDefault();
+        this.#createRow(undefined, true, li);
+      }
+    });
+
+    const hasI18nValues = option !== undefined && !Object.hasOwn(option.optionValue, 0);
+    if (this.#hasLanguageSelection()) {
+      // `initI18n()` expects HTML-escaped values, but the values are raw JSON data.
+      const i18nValues = hasI18nValues
+        ? Object.fromEntries(
+            Object.entries(option.optionValue).map(([languageId, value]) => [languageId, escapeHTML(value)]),
+          )
+        : {};
+      initI18n(valueInput.id, i18nValues, this.#languages, false);
+    }
+
+    if (!hasI18nValues) {
+      valueInput.value = option?.optionValue[0] ?? "";
+    }
+
+    if (autoFocus) {
+      valueInput.focus();
+    }
+
+    this.#updateAddButton();
+  }
+
+  #hasLanguageSelection(): boolean {
+    return Object.keys(this.#languages).length > 1;
+  }
+
+  #updateAddButton(): void {
+    this.#addButton.disabled = this.#list.childElementCount >= this.#maxOptions;
+  }
+
+  destroy(): void {
+    if (!this.#hasLanguageSelection()) {
+      return;
+    }
+
+    this.#list.querySelectorAll<HTMLInputElement>(".pollOptionListItem__value").forEach((valueInput) => {
+      unregisterI18n(valueInput.id);
+    });
+  }
+
+  getData(): PollOptionData[] {
+    const data: PollOptionData[] = [];
+
+    this.#list.querySelectorAll<HTMLLIElement>(".pollOptionListItem").forEach((li) => {
+      const valueInput = li.querySelector<HTMLInputElement>(".pollOptionListItem__value")!;
+
+      data.push({
+        optionID: parseInt(li.dataset.optionId!, 10),
+        optionValue: this.#hasLanguageSelection()
+          ? Object.fromEntries(getValues(valueInput.id))
+          : { 0: valueInput.value },
+      });
+    });
+
+    return data;
+  }
+}
+
+const optionLists = new Map<string, PollOptionList>();
+
+export function setup(formField: HTMLInputElement, languages: Languages, maxOptions: number): void {
+  optionLists.set(formField.id, new PollOptionList(formField, languages, maxOptions));
+}
+
+/**
+ * Returns the serialized options of the poll option list with the given id.
+ */
+export function getOptionListValue(fieldId: string): string {
+  const optionList = optionLists.get(fieldId);
+  if (optionList === undefined) {
+    throw new Error(`Unknown poll option list '${fieldId}'.`);
+  }
+
+  return JSON.stringify(optionList.getData());
+}
+
+/**
+ * Removes the poll option list with the given id, e.g. after the dialog has
+ * been closed.
+ */
+export function removeOptionList(fieldId: string): void {
+  optionLists.get(fieldId)?.destroy();
+  optionLists.delete(fieldId);
+}
diff --git a/ts/WoltLabSuite/Core/Component/Poll/Widget.ts b/ts/WoltLabSuite/Core/Component/Poll/Widget.ts
new file mode 100644
index 00000000000..bbe7dd956c5
--- /dev/null
+++ b/ts/WoltLabSuite/Core/Component/Poll/Widget.ts
@@ -0,0 +1,258 @@
+/**
+ * Handles the widget of standalone polls that have been embedded into a
+ * message. The widget contains both the vote form and the results, switching
+ * between them does not require a request.
+ *
+ * @author Marcel Werk
+ * @copyright 2001-2026 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+
+import { getWidget } from "WoltLabSuite/Core/Api/Polls/GetWidget";
+import { vote } from "WoltLabSuite/Core/Api/Polls/Vote";
+import { dialogFactory } from "WoltLabSuite/Core/Component/Dialog";
+import { trigger as triggerDomChange } from "WoltLabSuite/Core/Dom/Change/Listener";
+import DomUtil from "WoltLabSuite/Core/Dom/Util";
+import { promiseMutex } from "WoltLabSuite/Core/Helper/PromiseMutex";
+import { wheneverFirstSeen } from "WoltLabSuite/Core/Helper/Selector";
+import UiDropdownSimple from "WoltLabSuite/Core/Ui/Dropdown/Simple";
+
+type State = "vote" | "results";
+
+class PollWidget {
+  readonly #element: HTMLElement;
+  readonly #inputs: HTMLInputElement[];
+  readonly #maxVotes: number;
+  readonly #requiredVotes: number;
+  readonly #pollId: number;
+  readonly #voteButton: HTMLButtonElement | null;
+
+  constructor(element: HTMLElement) {
+    this.#element = element;
+    this.#inputs = Array.from(element.querySelectorAll<HTMLInputElement>(".pollWidget__input"));
+    this.#maxVotes = parseInt(element.dataset.maxVotes!);
+    this.#requiredVotes = parseInt(element.dataset.requiredVotes!);
+    this.#pollId = parseInt(element.dataset.pollId!);
+    this.#voteButton = element.querySelector<HTMLButtonElement>(".pollWidget__vote");
+
+    this.#initEventListeners();
+    this.#initInteractions();
+    this.#setState(element.dataset.state as State, false);
+    this.#updateInputs();
+  }
+
+  #initEventListeners(): void {
+    for (const input of this.#inputs) {
+      input.addEventListener("change", () => this.#updateInputs());
+    }
+
+    // The inputs remain part of the rows while the results are displayed.
+    this.#element.querySelector(".pollWidget__options")!.addEventListener("click", (event) => {
+      if (this.#state === "results") {
+        event.preventDefault();
+      }
+    });
+
+    this.#element.querySelector(".pollWidget__showResults")?.addEventListener("click", () => {
+      this.#setState("results");
+    });
+
+    this.#element.querySelector(".pollWidget__showVote")?.addEventListener("click", () => {
+      this.#setState("vote");
+    });
+
+    this.#voteButton?.addEventListener(
+      "click",
+      promiseMutex(() => this.#submit()),
+    );
+
+    this.#element.querySelector(".pollWidget__showParticipants")?.addEventListener(
+      "click",
+      promiseMutex(() => {
+        return dialogFactory()
+          .usingListView()
+          .fromPreset(
+            this.#element.dataset.question!,
+            "wcf\\system\\listView\\user\\PollParticipantListView",
+            new Map([["pollID", this.#pollId.toString()]]),
+          );
+      }),
+    );
+  }
+
+  /**
+   * The widget serves as the container of the interactions, which allow the
+   * owner and moderators to edit or delete the poll.
+   */
+  #initInteractions(): void {
+    const toggle = this.#element.querySelector<HTMLElement>(".pollWidget__interactions .dropdownToggle");
+    if (toggle === null) {
+      return;
+    }
+
+    let dropdown = UiDropdownSimple.getDropdownMenu(toggle.dataset.target!);
+    dropdown ??= toggle.closest(".dropdown")!.querySelector<HTMLElement>(".dropdownMenu")!;
+
+    dropdown.querySelectorAll<HTMLElement>("[data-interaction]").forEach((button) => {
+      button.addEventListener("click", () => {
+        // The interactions are set up on the widget itself, the event must not
+        // reach the interactions of a surrounding container.
+        this.#element.dispatchEvent(
+          new CustomEvent("interaction:execute", {
+            detail: button.dataset,
+          }),
+        );
+      });
+    });
+
+    this.#element.addEventListener("interaction:invalidate", (event: CustomEvent<Record<string, string>>) => {
+      event.stopPropagation();
+
+      if (event.detail._reloadPage === "true") {
+        window.location.reload();
+      } else {
+        void refreshWidgets(this.#pollId, this.#element);
+      }
+    });
+
+    this.#element.addEventListener("interaction:remove", (event) => {
+      event.stopPropagation();
+
+      getWidgets(this.#pollId).forEach((element) => {
+        destroyInteractions(element);
+        element.remove();
+      });
+    });
+  }
+
+  get #state(): State {
+    return this.#element.dataset.state as State;
+  }
+
+  #setState(state: State, moveFocus = true): void {
+    this.#element.dataset.state = state;
+
+    for (const input of this.#inputs) {
+      input.inert = state === "results";
+    }
+
+    if (!moveFocus) {
+      return;
+    }
+
+    if (state === "vote") {
+      const input = this.#inputs.find((input) => input.checked) ?? this.#inputs.find((input) => !input.disabled);
+      input?.focus();
+    } else {
+      this.#getQuestion().focus();
+    }
+  }
+
+  #updateInputs(): void {
+    if (this.#voteButton === null) {
+      return;
+    }
+
+    const selectedCount = this.#getSelectedOptionIds().length;
+    this.#voteButton.disabled = selectedCount < this.#requiredVotes;
+
+    if (this.#maxVotes > 1) {
+      for (const input of this.#inputs) {
+        input.disabled = !input.checked && selectedCount >= this.#maxVotes;
+      }
+    }
+  }
+
+  #getSelectedOptionIds(): number[] {
+    return this.#inputs.filter((input) => input.checked).map((input) => parseInt(input.value));
+  }
+
+  #getQuestion(): HTMLElement {
+    return this.#element.querySelector<HTMLElement>(".pollWidget__question")!;
+  }
+
+  async #submit(): Promise<void> {
+    const optionIds = this.#getSelectedOptionIds();
+    if (optionIds.length === 0) {
+      return;
+    }
+
+    this.#voteButton!.disabled = true;
+    this.#element.setAttribute("aria-busy", "true");
+
+    try {
+      const { template } = await vote(this.#pollId, optionIds);
+
+      replaceWidget(this.#element, template)?.querySelector<HTMLElement>(".pollWidget__question")!.focus();
+    } finally {
+      if (this.#element.isConnected) {
+        this.#element.removeAttribute("aria-busy");
+        this.#updateInputs();
+      }
+    }
+  }
+}
+
+/**
+ * The same poll can be embedded multiple times on a page.
+ */
+function getWidgets(pollId: number): HTMLElement[] {
+  return Array.from(document.querySelectorAll<HTMLElement>(`.pollWidget[data-poll-id="${pollId}"]`));
+}
+
+/**
+ * The dropdown menu of the interactions has been moved into the global
+ * container and must be removed together with the widget.
+ */
+function destroyInteractions(element: HTMLElement): void {
+  const toggle = element.querySelector<HTMLElement>(".pollWidget__interactions .dropdownToggle");
+  if (toggle?.dataset.target) {
+    UiDropdownSimple.destroy(toggle.dataset.target);
+  }
+}
+
+/**
+ * Replaces the widget with the rendered template and returns the new widget,
+ * which is set up by the selector observer.
+ */
+function replaceWidget(element: HTMLElement, template: string): HTMLElement | null {
+  const fragment = DomUtil.createFragmentFromHtml(template);
+  const widget = fragment.querySelector<HTMLElement>(".pollWidget");
+  if (widget === null) {
+    return null;
+  }
+
+  // The scripts initialize the interactions and are executed on insertion.
+  const scripts = Array.from(fragment.querySelectorAll("script"));
+  destroyInteractions(element);
+  element.replaceWith(fragment);
+  scripts.forEach((script) => script.remove());
+
+  triggerDomChange();
+
+  return widget;
+}
+
+async function refreshWidgets(pollId: number, source: HTMLElement): Promise<void> {
+  await Promise.all(
+    getWidgets(pollId).map(async (element) => {
+      // Every instance requires its own rendering because of the unique ids.
+      const { template } = await getWidget(pollId);
+      if (!element.isConnected) {
+        return;
+      }
+
+      const widget = replaceWidget(element, template);
+      if (element === source) {
+        widget?.querySelector<HTMLElement>(".pollWidget__question")!.focus();
+      }
+    }),
+  );
+}
+
+export function setup(): void {
+  wheneverFirstSeen(".pollWidget", (element) => {
+    new PollWidget(element);
+  });
+}
diff --git a/ts/WoltLabSuite/Core/Form/Builder/Field/PollOptionList.ts b/ts/WoltLabSuite/Core/Form/Builder/Field/PollOptionList.ts
new file mode 100644
index 00000000000..fbf113ac95f
--- /dev/null
+++ b/ts/WoltLabSuite/Core/Form/Builder/Field/PollOptionList.ts
@@ -0,0 +1,26 @@
+/**
+ * Data handler for the options of a poll.
+ *
+ * @author  Marcel Werk
+ * @copyright  2001-2026 WoltLab GmbH
+ * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+
+import Field from "./Field";
+import { FormBuilderData } from "../Data";
+import { getOptionListValue, removeOptionList } from "WoltLabSuite/Core/Component/Poll/OptionList";
+
+class PollOptionList extends Field {
+  protected _getData(): FormBuilderData {
+    return {
+      [this._fieldId]: getOptionListValue(this._fieldId),
+    };
+  }
+
+  destroy(): void {
+    removeOptionList(this._fieldId);
+  }
+}
+
+export = PollOptionList;
diff --git a/ts/WoltLabSuite/Core/Form/Builder/Field/Wysiwyg/Poll.ts b/ts/WoltLabSuite/Core/Form/Builder/Field/Wysiwyg/Poll.ts
index 501e0c759ef..3a2063c0cf8 100644
--- a/ts/WoltLabSuite/Core/Form/Builder/Field/Wysiwyg/Poll.ts
+++ b/ts/WoltLabSuite/Core/Form/Builder/Field/Wysiwyg/Poll.ts
@@ -5,6 +5,7 @@
  * @copyright 2001-2020 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 5.2
+ * @deprecated 6.3 Use `WoltLabSuite/Core/Form/Builder/Field/PollOptionList` instead.
  */
 
 import Field from "../Field";
diff --git a/ts/WoltLabSuite/Core/Ui/Acl/List.ts b/ts/WoltLabSuite/Core/Ui/Acl/List.ts
index ae1d308a207..c986de53228 100644
--- a/ts/WoltLabSuite/Core/Ui/Acl/List.ts
+++ b/ts/WoltLabSuite/Core/Ui/Acl/List.ts
@@ -473,7 +473,7 @@ class AclList {
   #save(type: string) {
     const form = this.#container.closest("form")!;
     const name = this.#aclValuesFieldName + "[" + type + "]";
-    let input = form.querySelector<HTMLInputElement>("input[name='" + name + "']");
+    let input = form.querySelector<HTMLInputElement>(`input[name="${CSS.escape(name)}"]`);
     if (input) {
       // combine json values
       input.value = JSON.stringify(extend(JSON.parse(input.value), this.#values[type]));
diff --git a/ts/WoltLabSuite/Core/Ui/Poll/Editor.ts b/ts/WoltLabSuite/Core/Ui/Poll/Editor.ts
index f47fd43a8b6..5419d8f24bb 100644
--- a/ts/WoltLabSuite/Core/Ui/Poll/Editor.ts
+++ b/ts/WoltLabSuite/Core/Ui/Poll/Editor.ts
@@ -5,6 +5,7 @@
  * @copyright  2001-2020 WoltLab GmbH
  * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @woltlabExcludeBundle all
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 
 import * as Core from "../../Core";
diff --git a/ts/WoltLabSuite/Core/Ui/Poll/Poll.ts b/ts/WoltLabSuite/Core/Ui/Poll/Poll.ts
index 140aaa35672..4ac3226f3b3 100644
--- a/ts/WoltLabSuite/Core/Ui/Poll/Poll.ts
+++ b/ts/WoltLabSuite/Core/Ui/Poll/Poll.ts
@@ -5,6 +5,7 @@
  * @copyright  2001-2022 WoltLab GmbH
  * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since   5.5
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 
 import DomChangeListener from "../../Dom/Change/Listener";
diff --git a/ts/WoltLabSuite/Core/Ui/Poll/View/Participants.ts b/ts/WoltLabSuite/Core/Ui/Poll/View/Participants.ts
index 4d7ae5f932f..50fb78133e7 100644
--- a/ts/WoltLabSuite/Core/Ui/Poll/View/Participants.ts
+++ b/ts/WoltLabSuite/Core/Ui/Poll/View/Participants.ts
@@ -5,6 +5,7 @@
  * @copyright  2001-2022 WoltLab GmbH
  * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since   5.5
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 
 import { Poll } from "../Poll";
diff --git a/ts/WoltLabSuite/Core/Ui/Poll/View/Results.ts b/ts/WoltLabSuite/Core/Ui/Poll/View/Results.ts
index 897b4f8ba1a..5f7d5c4c623 100644
--- a/ts/WoltLabSuite/Core/Ui/Poll/View/Results.ts
+++ b/ts/WoltLabSuite/Core/Ui/Poll/View/Results.ts
@@ -5,6 +5,7 @@
  * @copyright  2001-2022 WoltLab GmbH
  * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since   5.5
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 
 import * as Ajax from "../../../Ajax";
diff --git a/ts/WoltLabSuite/Core/Ui/Poll/View/Vote.ts b/ts/WoltLabSuite/Core/Ui/Poll/View/Vote.ts
index 19f3b5b9ccf..33857b7034e 100644
--- a/ts/WoltLabSuite/Core/Ui/Poll/View/Vote.ts
+++ b/ts/WoltLabSuite/Core/Ui/Poll/View/Vote.ts
@@ -5,6 +5,7 @@
  * @copyright  2001-2022 WoltLab GmbH
  * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since   5.5
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 
 import * as Ajax from "../../../Ajax";
diff --git a/ts/WoltLabSuite/Core/Ui/Poll/Vote.ts b/ts/WoltLabSuite/Core/Ui/Poll/Vote.ts
index ddf323cf765..54088e55ae4 100644
--- a/ts/WoltLabSuite/Core/Ui/Poll/Vote.ts
+++ b/ts/WoltLabSuite/Core/Ui/Poll/Vote.ts
@@ -5,6 +5,7 @@
  * @copyright  2001-2022 WoltLab GmbH
  * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since   5.5
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 
 import { PollViews, Poll } from "./Poll";
diff --git a/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php b/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php
index ea89f87ca72..4274bef53e9 100644
--- a/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php
+++ b/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step1.php
@@ -155,6 +155,76 @@
                 ->onDelete('CASCADE')
                 ->onUpdate('NO ACTION'),
         ]),
+    PartialDatabaseTable::create('wcf1_poll')
+        ->columns([
+            // `NULL` represents a standalone poll that is embedded via bbcode.
+            IntDatabaseTableColumn::create('objectTypeID'),
+            IntDatabaseTableColumn::create('userID'),
+            NotNullVarchar255DatabaseTableColumn::create('username')
+                ->defaultValue(''),
+            DefaultFalseBooleanDatabaseTableColumn::create('isMultilingual'),
+            DefaultFalseBooleanDatabaseTableColumn::create('resultsRequireEnd'),
+            NotNullInt10DatabaseTableColumn::create('minVotes')
+                ->defaultValue(1),
+        ])
+        ->foreignKeys([
+            DatabaseTableForeignKey::create()
+                ->columns(['userID'])
+                ->referencedTable('wcf1_user')
+                ->referencedColumns(['userID'])
+                ->onDelete('SET NULL')
+                ->onUpdate('NO ACTION'),
+        ]),
+    DatabaseTable::create('wcf1_poll_l10n')
+        ->columns([
+            NotNullInt10DatabaseTableColumn::create('pollID'),
+            IntDatabaseTableColumn::create('languageID'),
+            VarcharDatabaseTableColumn::create('question')
+                ->length(255),
+        ])
+        ->indices([
+            DatabaseTableIndex::create('pollID')
+                ->columns(['pollID', 'languageID']),
+        ])
+        ->foreignKeys([
+            DatabaseTableForeignKey::create()
+                ->columns(['pollID'])
+                ->referencedTable('wcf1_poll')
+                ->referencedColumns(['pollID'])
+                ->onDelete('CASCADE')
+                ->onUpdate('NO ACTION'),
+            DatabaseTableForeignKey::create()
+                ->columns(['languageID'])
+                ->referencedTable('wcf1_language')
+                ->referencedColumns(['languageID'])
+                ->onDelete('CASCADE')
+                ->onUpdate('NO ACTION'),
+        ]),
+    DatabaseTable::create('wcf1_poll_option_l10n')
+        ->columns([
+            NotNullInt10DatabaseTableColumn::create('optionID'),
+            IntDatabaseTableColumn::create('languageID'),
+            VarcharDatabaseTableColumn::create('optionValue')
+                ->length(255),
+        ])
+        ->indices([
+            DatabaseTableIndex::create('optionID')
+                ->columns(['optionID', 'languageID']),
+        ])
+        ->foreignKeys([
+            DatabaseTableForeignKey::create()
+                ->columns(['optionID'])
+                ->referencedTable('wcf1_poll_option')
+                ->referencedColumns(['optionID'])
+                ->onDelete('CASCADE')
+                ->onUpdate('NO ACTION'),
+            DatabaseTableForeignKey::create()
+                ->columns(['languageID'])
+                ->referencedTable('wcf1_language')
+                ->referencedColumns(['languageID'])
+                ->onDelete('CASCADE')
+                ->onUpdate('NO ACTION'),
+        ]),
     PartialDatabaseTable::create('wcf1_like_object')
         ->columns([
             TextDatabaseTableColumn::create('cachedUsers')
diff --git a/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step3.php b/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step3.php
index 59fada45572..f3cf57732ef 100644
--- a/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step3.php
+++ b/wcfsetup/install/files/acp/database/update_com.woltlab.wcf_6.3_step3.php
@@ -85,6 +85,20 @@
     // The localized content is migrated to `wcf1_media_l10n`.
     DatabaseTable::create('wcf1_media_content')
         ->drop(),
+    // The question and option values are migrated to `wcf1_poll_l10n` and `wcf1_poll_option_l10n`.
+    PartialDatabaseTable::create('wcf1_poll')
+        ->columns([
+            VarcharDatabaseTableColumn::create('question')
+                ->length(255)
+                ->defaultValue('')
+                ->drop(),
+        ]),
+    PartialDatabaseTable::create('wcf1_poll_option')
+        ->columns([
+            NotNullVarchar255DatabaseTableColumn::create('optionValue')
+                ->defaultValue('')
+                ->drop(),
+        ]),
     // The link pattern is migrated to the configuration of the user options.
     PartialDatabaseTable::create('wcf1_user_option')
         ->columns([
diff --git a/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_pollL10n.php b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_pollL10n.php
new file mode 100644
index 00000000000..630f9165b54
--- /dev/null
+++ b/wcfsetup/install/files/acp/update_com.woltlab.wcf_6.3_pollL10n.php
@@ -0,0 +1,35 @@
+<?php
+
+/**
+ * Migrates the question of polls and the values of poll options into the
+ * `wcf1_poll_l10n` and `wcf1_poll_option_l10n` tables. Existing polls are
+ * monolingual and are stored as a single row with `languageID = NULL`.
+ *
+ * IMPORTANT ordering constraints for package.xml:
+ * - The database script `acp/database/update_com.woltlab.wcf_6.3_step1.php`
+ *   (creating the `*_l10n` tables) must run BEFORE this script.
+ * - The database script `acp/database/update_com.woltlab.wcf_6.3_step3.php`
+ *   (dropping the `question` and `optionValue` columns) must run AFTER this script.
+ *
+ * @author    Marcel Werk
+ * @copyright 2001-2026 WoltLab GmbH
+ * @license   GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ */
+
+use wcf\system\WCF;
+
+// This script owns the tables' content at this point (idempotency on re-runs).
+WCF::getDB()->prepare("DELETE FROM wcf1_poll_l10n")->execute();
+WCF::getDB()->prepare("DELETE FROM wcf1_poll_option_l10n")->execute();
+
+$sql = "INSERT INTO wcf1_poll_l10n
+                    (pollID, languageID, question)
+        SELECT      pollID, NULL, COALESCE(question, '')
+        FROM        wcf1_poll";
+WCF::getDB()->prepare($sql)->execute();
+
+$sql = "INSERT INTO wcf1_poll_option_l10n
+                    (optionID, languageID, optionValue)
+        SELECT      optionID, NULL, optionValue
+        FROM        wcf1_poll_option";
+WCF::getDB()->prepare($sql)->execute();
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Api/Polls/GetPoll.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Api/Polls/GetPoll.js
new file mode 100644
index 00000000000..512a653d75f
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Api/Polls/GetPoll.js
@@ -0,0 +1,19 @@
+/**
+ * Gets the data of a standalone poll that is required to embed it.
+ *
+ * @author  Marcel Werk
+ * @copyright  2001-2026 WoltLab GmbH
+ * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+define(["require", "exports", "WoltLabSuite/Core/Ajax/Backend", "WoltLabSuite/Core/Api/Result"], function (require, exports, Backend_1, Result_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.getPoll = getPoll;
+    async function getPoll(pollId) {
+        const url = new URL(`${window.WSC_RPC_API_URL}core/polls/${pollId}`);
+        return (0, Result_1.fromInfallibleApiRequest)(() => {
+            return (0, Backend_1.prepareRequest)(url).get().fetchAsJson();
+        });
+    }
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Api/Polls/GetWidget.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Api/Polls/GetWidget.js
new file mode 100644
index 00000000000..4932b2d4b3c
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Api/Polls/GetWidget.js
@@ -0,0 +1,19 @@
+/**
+ * Gets the rendered widget of a standalone poll.
+ *
+ * @author  Marcel Werk
+ * @copyright  2001-2026 WoltLab GmbH
+ * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+define(["require", "exports", "WoltLabSuite/Core/Ajax/Backend", "WoltLabSuite/Core/Api/Result"], function (require, exports, Backend_1, Result_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.getWidget = getWidget;
+    async function getWidget(pollId) {
+        const url = new URL(`${window.WSC_RPC_API_URL}core/polls/${pollId}/widget`);
+        return (0, Result_1.fromInfallibleApiRequest)(() => {
+            return (0, Backend_1.prepareRequest)(url).get().fetchAsJson();
+        });
+    }
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Api/Polls/Vote.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Api/Polls/Vote.js
new file mode 100644
index 00000000000..dff7e25ac8c
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Api/Polls/Vote.js
@@ -0,0 +1,19 @@
+/**
+ * Stores the vote of the active user in a poll.
+ *
+ * @author  Marcel Werk
+ * @copyright  2001-2026 WoltLab GmbH
+ * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+define(["require", "exports", "WoltLabSuite/Core/Ajax/Backend", "WoltLabSuite/Core/Api/Result"], function (require, exports, Backend_1, Result_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.vote = vote;
+    async function vote(pollId, optionIDs) {
+        const url = new URL(`${window.WSC_RPC_API_URL}core/polls/${pollId}/vote`);
+        return (0, Result_1.fromInfallibleApiRequest)(() => {
+            return (0, Backend_1.prepareRequest)(url).post({ optionIDs }).fetchAsJson();
+        });
+    }
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Bootstrap.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Bootstrap.js
index 08d1b177890..deff1c7a2b9 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Bootstrap.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Bootstrap.js
@@ -160,18 +160,21 @@ define(["require", "exports", "tslib", "./Core", "./Date/Picker", "./Devtools",
         (0, LazyLoader_1.whenFirstSeen)(".mediaGallery", () => {
             void new Promise((resolve_13, reject_13) => { require(["./Component/Media/Gallery"], resolve_13, reject_13); }).then(tslib_1.__importStar).then(({ setup }) => setup());
         });
+        (0, LazyLoader_1.whenFirstSeen)(".pollWidget", () => {
+            void new Promise((resolve_14, reject_14) => { require(["./Component/Poll/Widget"], resolve_14, reject_14); }).then(tslib_1.__importStar).then(({ setup }) => setup());
+        });
         (0, LazyLoader_1.whenFirstSeen)("[data-fancybox]", () => {
-            void new Promise((resolve_14, reject_14) => { require(["./Component/Image/Viewer"], resolve_14, reject_14); }).then(tslib_1.__importStar).then(({ setup }) => setup());
+            void new Promise((resolve_15, reject_15) => { require(["./Component/Image/Viewer"], resolve_15, reject_15); }).then(tslib_1.__importStar).then(({ setup }) => setup());
         });
         (0, LazyLoader_1.whenFirstSeen)(".jsImageViewer", () => {
             console.warn("The class `jsImageViewer` is deprecated. Use the attribute `data-fancybox` instead.");
-            void new Promise((resolve_15, reject_15) => { require(["./Component/Image/Viewer"], resolve_15, reject_15); }).then(tslib_1.__importStar).then(({ setupLegacy }) => setupLegacy());
+            void new Promise((resolve_16, reject_16) => { require(["./Component/Image/Viewer"], resolve_16, reject_16); }).then(tslib_1.__importStar).then(({ setupLegacy }) => setupLegacy());
         });
         (0, LazyLoader_1.whenFirstSeen)(".jsEnablesOptions", () => {
-            void new Promise((resolve_16, reject_16) => { require(["./Component/Option/Enable"], resolve_16, reject_16); }).then(tslib_1.__importStar).then(({ setup }) => setup());
+            void new Promise((resolve_17, reject_17) => { require(["./Component/Option/Enable"], resolve_17, reject_17); }).then(tslib_1.__importStar).then(({ setup }) => setup());
         });
         (0, LazyLoader_1.whenFirstSeen)("[data-edit-cover-photo]", () => {
-            void new Promise((resolve_17, reject_17) => { require(["./Component/User/CoverPhoto"], resolve_17, reject_17); }).then(tslib_1.__importStar).then(({ setup }) => setup());
+            void new Promise((resolve_18, reject_18) => { require(["./Component/User/CoverPhoto"], resolve_18, reject_18); }).then(tslib_1.__importStar).then(({ setup }) => setup());
         });
         // Move the reCAPTCHA widget overlay to the `pageOverlayContainer`
         // when widget form elements are placed in a dialog.
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor.js
index b175c50b5c5..34005679229 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor.js
@@ -12,7 +12,7 @@
  * @since 6.0
  * @woltlabExcludeBundle tiny
  */
-define(["require", "exports", "tslib", "./Ckeditor/Attachment", "./Ckeditor/Media", "./Ckeditor/Mention", "./Ckeditor/Quote", "./Ckeditor/Autosave", "./Ckeditor/Configuration", "./Ckeditor/Event", "./Ckeditor/SubmitOnEnter", "./Ckeditor/Normalizer", "../Ui/Scroll", "../Devtools", "./Ckeditor/Keyboard", "./Ckeditor/BalloonPanel", "../Environment", "../Helper/PageOverlay"], function (require, exports, tslib_1, Attachment_1, Media_1, Mention_1, Quote_1, Autosave_1, Configuration_1, Event_1, SubmitOnEnter_1, Normalizer_1, Scroll_1, Devtools_1, Keyboard_1, BalloonPanel_1, Environment_1, PageOverlay_1) {
+define(["require", "exports", "tslib", "./Ckeditor/Attachment", "./Ckeditor/Media", "./Ckeditor/Poll", "./Ckeditor/Mention", "./Ckeditor/Quote", "./Ckeditor/Autosave", "./Ckeditor/Configuration", "./Ckeditor/Event", "./Ckeditor/SubmitOnEnter", "./Ckeditor/Normalizer", "../Ui/Scroll", "../Devtools", "./Ckeditor/Keyboard", "./Ckeditor/BalloonPanel", "../Environment", "../Helper/PageOverlay"], function (require, exports, tslib_1, Attachment_1, Media_1, Poll_1, Mention_1, Quote_1, Autosave_1, Configuration_1, Event_1, SubmitOnEnter_1, Normalizer_1, Scroll_1, Devtools_1, Keyboard_1, BalloonPanel_1, Environment_1, PageOverlay_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.setupCkeditor = setupCkeditor;
@@ -220,6 +220,12 @@ define(["require", "exports", "tslib", "./Ckeditor/Attachment", "./Ckeditor/Medi
         else {
             bbcodes = bbcodes.filter((item) => item.name !== "media");
         }
+        if (features.poll) {
+            (0, Poll_1.setup)(element);
+        }
+        else {
+            bbcodes = bbcodes.filter((item) => item.name !== "poll");
+        }
         (0, Mention_1.setup)(element);
         if (features.quoteBlock) {
             (0, Quote_1.setup)(element);
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Poll.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Poll.js
new file mode 100644
index 00000000000..b75559022d9
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Poll.js
@@ -0,0 +1,71 @@
+/**
+ * Embeds standalone polls into the editor through the poll manager.
+ *
+ * @author Marcel Werk
+ * @copyright 2001-2026 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ * @woltlabExcludeBundle tiny
+ */
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+define(["require", "exports", "./Event", "../../Helper/PromiseMutex"], function (require, exports, Event_1, PromiseMutex_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.setup = setup;
+    async function insertPoll(ckeditor) {
+        const { openPollManager } = await new Promise((resolve_1, reject_1) => { require(["../Poll/Manager"], resolve_1, reject_1); }).then(__importStar);
+        const poll = await openPollManager();
+        if (poll === undefined) {
+            return;
+        }
+        ckeditor.insertText(`[poll='${poll.pollID}'][/poll]`);
+    }
+    function setup(element) {
+        (0, Event_1.listenToCkeditor)(element).ready(({ ckeditor }) => {
+            if (!ckeditor.features.poll) {
+                return;
+            }
+            // The poll manager is loaded asynchronously, repeated clicks must not open it twice.
+            const openManager = (0, PromiseMutex_1.promiseMutex)(() => insertPoll(ckeditor));
+            (0, Event_1.listenToCkeditor)(ckeditor.sourceElement).bbcode(({ bbcode }) => {
+                if (bbcode !== "poll") {
+                    return false;
+                }
+                openManager();
+                return true;
+            });
+        });
+    }
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/GridView.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/GridView.js
index 9b8db3d3a2b..c0254d1ae5c 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/GridView.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/GridView.js
@@ -6,7 +6,7 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.2
  */
-define(["require", "exports", "tslib", "../Api/GridViews/GetRow", "../Api/GridViews/GetRows", "../Api/Interactions/GetBulkContextMenuOptions", "../Api/PostObject", "../Dom/Change/Listener", "../Dom/Util", "../Helper/PromiseMutex", "../Helper/Selector", "../Ui/Dropdown/Simple", "./GridView/State"], function (require, exports, tslib_1, GetRow_1, GetRows_1, GetBulkContextMenuOptions_1, PostObject_1, Listener_1, Util_1, PromiseMutex_1, Selector_1, Simple_1, State_1) {
+define(["require", "exports", "tslib", "../Api/GridViews/GetRow", "../Api/GridViews/GetRows", "../Api/Interactions/GetBulkContextMenuOptions", "../Api/PostObject", "../Dom/Change/Listener", "../Dom/Util", "../Helper/PromiseMutex", "../Helper/Selector", "../Ui/Dropdown/Simple", "./GridView/State", "./Interaction/Container"], function (require, exports, tslib_1, GetRow_1, GetRows_1, GetBulkContextMenuOptions_1, PostObject_1, Listener_1, Util_1, PromiseMutex_1, Selector_1, Simple_1, State_1, Container_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.GridView = void 0;
@@ -60,6 +60,9 @@ define(["require", "exports", "tslib", "../Api/GridViews/GetRow", "../Api/GridVi
             (0, Selector_1.wheneverFirstSeen)(`#${this.#table.id} tbody tr`, (row) => {
                 const containers = [row];
                 row.querySelectorAll(".dropdownToggle").forEach((element) => {
+                    if (!(0, Container_1.isOwnInteraction)(row, element)) {
+                        return;
+                    }
                     const dropdown = Simple_1.default.getDropdownMenu(element.dataset.target);
                     if (dropdown) {
                         containers.push(dropdown);
@@ -67,6 +70,9 @@ define(["require", "exports", "tslib", "../Api/GridViews/GetRow", "../Api/GridVi
                 });
                 for (const container of containers) {
                     container.querySelectorAll("[data-interaction]").forEach((element) => {
+                        if (container === row && !(0, Container_1.isOwnInteraction)(row, element)) {
+                            return;
+                        }
                         element.addEventListener("click", () => {
                             row.dispatchEvent(new CustomEvent("interaction:execute", {
                                 detail: element.dataset,
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Interaction/Container.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Interaction/Container.js
new file mode 100644
index 00000000000..b3863718c9d
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Interaction/Container.js
@@ -0,0 +1,22 @@
+/**
+ * Helper functions for containers that handle interactions.
+ *
+ * @author Marcel Werk
+ * @copyright 2001-2026 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+define(["require", "exports"], function (require, exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.isOwnInteraction = isOwnInteraction;
+    /**
+     * Returns true if the element belongs to the interactions of the given
+     * container rather than to a nested container that handles its own
+     * interactions, such as an embedded poll widget.
+     */
+    function isOwnInteraction(container, element) {
+        const nested = element.closest("[data-interaction-container]");
+        return nested === null || nested === container || !container.contains(nested);
+    }
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/ListView.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/ListView.js
index b24b52b24ec..32626ed4217 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/ListView.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/ListView.js
@@ -6,7 +6,7 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.2
  */
-define(["require", "exports", "tslib", "./ListView/State", "../Dom/Change/Listener", "../Dom/Util", "../Api/ListViews/GetItems", "WoltLabSuite/Core/Ui/Scroll", "../Helper/Selector", "../Ui/Dropdown/Simple", "../Api/ListViews/GetItem", "../Api/Interactions/GetBulkContextMenuOptions", "../Helper/PromiseMutex"], function (require, exports, tslib_1, State_1, Listener_1, Util_1, GetItems_1, Scroll_1, Selector_1, Simple_1, GetItem_1, GetBulkContextMenuOptions_1, PromiseMutex_1) {
+define(["require", "exports", "tslib", "./ListView/State", "../Dom/Change/Listener", "../Dom/Util", "../Api/ListViews/GetItems", "WoltLabSuite/Core/Ui/Scroll", "../Helper/Selector", "../Ui/Dropdown/Simple", "../Api/ListViews/GetItem", "../Api/Interactions/GetBulkContextMenuOptions", "../Helper/PromiseMutex", "./Interaction/Container"], function (require, exports, tslib_1, State_1, Listener_1, Util_1, GetItems_1, Scroll_1, Selector_1, Simple_1, GetItem_1, GetBulkContextMenuOptions_1, PromiseMutex_1, Container_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.ListView = void 0;
@@ -58,6 +58,9 @@ define(["require", "exports", "tslib", "./ListView/State", "../Dom/Change/Listen
         #initInteractions() {
             (0, Selector_1.wheneverFirstSeen)(`#${this.#viewElement.id} .listView__item`, (item) => {
                 item.querySelectorAll(".dropdownToggle").forEach((element) => {
+                    if (!(0, Container_1.isOwnInteraction)(item, element)) {
+                        return;
+                    }
                     let dropdown = Simple_1.default.getDropdownMenu(element.dataset.target);
                     if (!dropdown) {
                         dropdown = element.closest(".dropdown").querySelector(".dropdownMenu");
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/NodeTreeView.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/NodeTreeView.js
index 517e72bf62c..f09986a1794 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/NodeTreeView.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/NodeTreeView.js
@@ -6,7 +6,7 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 6.3
  */
-define(["require", "exports", "tslib", "../Api/PostObject", "../Api/NodeTreeViews/GetNode", "../Api/NodeTreeViews/GetNodes", "../Helper/PromiseMutex", "../Helper/Selector", "../Dom/Util", "../Ui/Dropdown/Simple", "sortablejs"], function (require, exports, tslib_1, PostObject_1, GetNode_1, GetNodes_1, PromiseMutex_1, Selector_1, Util_1, Simple_1, sortablejs_1) {
+define(["require", "exports", "tslib", "../Api/PostObject", "../Api/NodeTreeViews/GetNode", "../Api/NodeTreeViews/GetNodes", "../Helper/PromiseMutex", "../Helper/Selector", "../Dom/Util", "../Ui/Dropdown/Simple", "sortablejs", "./Interaction/Container"], function (require, exports, tslib_1, PostObject_1, GetNode_1, GetNodes_1, PromiseMutex_1, Selector_1, Util_1, Simple_1, sortablejs_1, Container_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.NodeTreeView = void 0;
@@ -34,6 +34,9 @@ define(["require", "exports", "tslib", "../Api/PostObject", "../Api/NodeTreeView
                 const content = node.querySelector(":scope > .nodeTreeView__item__content");
                 const containers = [content];
                 content.querySelectorAll(".dropdownToggle").forEach((element) => {
+                    if (!(0, Container_1.isOwnInteraction)(content, element)) {
+                        return;
+                    }
                     const dropdown = Simple_1.default.getDropdownMenu(element.dataset.target);
                     if (dropdown) {
                         containers.push(dropdown);
@@ -41,6 +44,9 @@ define(["require", "exports", "tslib", "../Api/PostObject", "../Api/NodeTreeView
                 });
                 for (const container of containers) {
                     container.querySelectorAll("[data-interaction]").forEach((element) => {
+                        if (container === content && !(0, Container_1.isOwnInteraction)(content, element)) {
+                            return;
+                        }
                         element.addEventListener("click", () => {
                             node.dispatchEvent(new CustomEvent("interaction:execute", {
                                 detail: element.dataset,
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Poll/Manager.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Poll/Manager.js
new file mode 100644
index 00000000000..476e40d2fe5
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Poll/Manager.js
@@ -0,0 +1,236 @@
+/**
+ * Shows the poll manager in a dialog to select a standalone poll, which can be
+ * created or edited from within the dialog.
+ *
+ * @author Marcel Werk
+ * @copyright 2001-2026 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ * @woltlabExcludeBundle tiny
+ */
+define(["require", "exports", "WoltLabSuite/Core/Component/Dialog", "WoltLabSuite/Core/Api/Polls/GetPoll", "WoltLabSuite/Core/Language", "WoltLabSuite/Core/StringUtil", "WoltLabSuite/Core/Component/Snackbar"], function (require, exports, Dialog_1, GetPoll_1, Language_1, StringUtil_1, Snackbar_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.openPollManager = openPollManager;
+    /**
+     * Keeps track of the selected poll, which survives the reloading of the list.
+     */
+    class PollSelection {
+        #dialog;
+        #listViewItems;
+        #selectionInfo;
+        #selectedId = undefined;
+        #selectedQuestion = "";
+        constructor(dialog, listViewItems) {
+            this.#dialog = dialog;
+            this.#listViewItems = listViewItems;
+            this.#selectionInfo = document.createElement("div");
+            this.#selectionInfo.classList.add("pollManager__selectionInfo");
+            dialog.querySelector("woltlab-core-dialog-control").append(this.#selectionInfo);
+            listViewItems.setAttribute("role", "listbox");
+            // The items are replaced whenever the list is reloaded.
+            new MutationObserver(() => this.render()).observe(listViewItems, { childList: true });
+            this.#initEventListeners();
+            this.render();
+        }
+        getSelectedId() {
+            return this.#selectedId;
+        }
+        select(item) {
+            this.#selectedId = parseInt(item.dataset.objectId);
+            this.#selectedQuestion = item.dataset.question;
+            this.render();
+        }
+        getItem(pollId) {
+            return this.#listViewItems.querySelector(`.pollManager__item[data-object-id="${pollId}"]`);
+        }
+        render() {
+            const items = Array.from(this.#listViewItems.querySelectorAll(".pollManager__item"));
+            let focusableItem = items.find((item) => parseInt(item.dataset.objectId) === this.#selectedId);
+            focusableItem ??= items[0];
+            for (const item of items) {
+                const isSelected = parseInt(item.dataset.objectId) === this.#selectedId;
+                item.classList.toggle("pollManager__item--selected", isSelected);
+                item.setAttribute("aria-selected", isSelected ? "true" : "false");
+                item.tabIndex = item === focusableItem ? 0 : -1;
+            }
+            if (this.#selectedId === undefined) {
+                this.#selectionInfo.textContent = (0, Language_1.getPhrase)("wcf.poll.manager.selection.none");
+            }
+            else {
+                this.#selectionInfo.innerHTML = `<strong>${(0, StringUtil_1.escapeHTML)(this.#selectedQuestion)}</strong>`;
+            }
+            this.#selectionInfo.title = this.#selectionInfo.textContent || "";
+            this.#dialog.incomplete = this.#selectedId === undefined;
+        }
+        confirm() {
+            if (this.#selectedId === undefined) {
+                return;
+            }
+            // The `disabled` state of the primary button is updated asynchronously
+            // when `incomplete` changes, `click()` would be a no-op immediately after
+            // selecting the first item.
+            const button = this.#dialog.querySelector(".dialog__control__button--primary");
+            button.form.requestSubmit(button);
+        }
+        #initEventListeners() {
+            this.#listViewItems.addEventListener("click", (event) => {
+                const item = this.#getItemFromEvent(event);
+                if (item !== null) {
+                    this.select(item);
+                }
+            });
+            // Deleted polls must not remain selected.
+            this.#listViewItems.addEventListener("interaction:remove", (event) => {
+                const pollId = parseInt(event.target.dataset.objectId);
+                if (pollId === this.#selectedId) {
+                    this.#selectedId = undefined;
+                    this.render();
+                }
+            });
+            this.#listViewItems.addEventListener("dblclick", (event) => {
+                const item = this.#getItemFromEvent(event);
+                if (item !== null) {
+                    this.select(item);
+                    this.confirm();
+                }
+            });
+            this.#listViewItems.addEventListener("keydown", (event) => {
+                const item = this.#getItemFromEvent(event);
+                if (item === null || event.target !== item) {
+                    return;
+                }
+                switch (event.key) {
+                    case " ":
+                        event.preventDefault();
+                        this.select(item);
+                        break;
+                    case "Enter":
+                        event.preventDefault();
+                        this.select(item);
+                        this.confirm();
+                        break;
+                    case "ArrowUp":
+                    case "ArrowDown": {
+                        event.preventDefault();
+                        const sibling = (event.key === "ArrowUp" ? item.previousElementSibling : item.nextElementSibling);
+                        if (sibling?.classList.contains("pollManager__item")) {
+                            item.tabIndex = -1;
+                            sibling.tabIndex = 0;
+                            sibling.focus();
+                        }
+                        break;
+                    }
+                }
+            });
+        }
+        #getItemFromEvent(event) {
+            const target = event.target;
+            // The context menu must not change the selection.
+            if (target.closest(".pollManager__item__menu") !== null) {
+                return null;
+            }
+            return target.closest(".pollManager__item");
+        }
+    }
+    /**
+     * Resolves with the item of the given poll once the list has been reloaded.
+     */
+    function waitForItem(selection, listViewItems, pollId) {
+        return new Promise((resolve) => {
+            const observer = new MutationObserver(() => {
+                observer.disconnect();
+                window.clearTimeout(timeout);
+                resolve(selection.getItem(pollId));
+            });
+            observer.observe(listViewItems, { childList: true });
+            // An empty list that remains empty does not cause any mutation.
+            const timeout = window.setTimeout(() => {
+                observer.disconnect();
+                resolve(selection.getItem(pollId));
+            }, 5_000);
+        });
+    }
+    function setupSearch(dialog, listViewItems) {
+        const input = dialog.content.querySelector(".pollManager__searchInput");
+        if (input === null) {
+            return;
+        }
+        let timeout = undefined;
+        input.addEventListener("input", () => {
+            window.clearTimeout(timeout);
+            timeout = window.setTimeout(() => {
+                listViewItems.dispatchEvent(new CustomEvent("interaction:set-parameters", {
+                    detail: { searchString: input.value.trim() },
+                }));
+            }, 200);
+        });
+        // Prevent Enter from submitting the prompt form of the dialog.
+        input.addEventListener("keydown", (event) => {
+            if (event.key === "Enter") {
+                event.preventDefault();
+            }
+        });
+    }
+    function setupAddButton(dialog, listViewItems, selection) {
+        const addButton = dialog.content.querySelector(".pollManager__addButton");
+        const endpoint = dialog.content.querySelector(".pollManager__config")?.dataset.addEndpoint;
+        if (addButton === null || endpoint === undefined) {
+            return;
+        }
+        addButton.addEventListener("click", async () => {
+            const { ok, result } = await (0, Dialog_1.dialogFactory)().usingFormBuilder().fromEndpoint(endpoint);
+            if (!ok || !listViewItems.isConnected) {
+                return;
+            }
+            (0, Snackbar_1.showDefaultSuccessSnackbar)();
+            const itemPromise = waitForItem(selection, listViewItems, result.pollID);
+            listViewItems.dispatchEvent(new CustomEvent("interaction:invalidate-all"));
+            const item = await itemPromise;
+            if (item !== null) {
+                selection.select(item);
+                item.scrollIntoView({ block: "nearest" });
+            }
+        });
+    }
+    /**
+     * Opens the poll manager and resolves with the selected poll, `undefined` is
+     * returned if the dialog was closed.
+     */
+    async function openPollManager() {
+        const dialog = await (0, Dialog_1.dialogFactory)()
+            .usingListView()
+            .fromPreset((0, Language_1.getPhrase)("wcf.poll.manager"), "wcf\\system\\listView\\user\\PollManagerListView", new Map(), undefined, "time", "DESC", 1, {
+            primary: (0, Language_1.getPhrase)("wcf.global.button.insert"),
+        });
+        dialog.dialog.classList.add("dialog--pollManager");
+        const listViewItems = dialog.content.querySelector(".listView__items");
+        const selection = new PollSelection(dialog, listViewItems);
+        setupSearch(dialog, listViewItems);
+        setupAddButton(dialog, listViewItems, selection);
+        return new Promise((resolve) => {
+            let completed = false;
+            dialog.addEventListener("primary", async () => {
+                const pollId = selection.getSelectedId();
+                if (completed || pollId === undefined) {
+                    return;
+                }
+                completed = true;
+                try {
+                    resolve(await (0, GetPoll_1.getPoll)(pollId));
+                }
+                finally {
+                    if (dialog.isConnected) {
+                        dialog.close();
+                    }
+                }
+            });
+            dialog.addEventListener("afterClose", () => {
+                if (!completed) {
+                    completed = true;
+                    resolve(undefined);
+                }
+            });
+        });
+    }
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Poll/OptionList.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Poll/OptionList.js
new file mode 100644
index 00000000000..d4757d9a146
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Poll/OptionList.js
@@ -0,0 +1,162 @@
+/**
+ * Manages the list of options of a poll, each option can either have a single
+ * value or a value per language.
+ *
+ * @author  Marcel Werk
+ * @copyright  2001-2026 WoltLab GmbH
+ * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+define(["require", "exports", "tslib", "WoltLabSuite/Core/Dom/Util", "WoltLabSuite/Core/Language", "WoltLabSuite/Core/Language/Input", "WoltLabSuite/Core/StringUtil", "sortablejs"], function (require, exports, tslib_1, Util_1, Language_1, Input_1, StringUtil_1, sortablejs_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.setup = setup;
+    exports.getOptionListValue = getOptionListValue;
+    exports.removeOptionList = removeOptionList;
+    sortablejs_1 = tslib_1.__importDefault(sortablejs_1);
+    class PollOptionList {
+        #languages;
+        #list;
+        #addButton;
+        #maxOptions;
+        #template;
+        constructor(formField, languages, maxOptions) {
+            const template = document.getElementById(`${formField.id}_template`);
+            if (!(template instanceof HTMLTemplateElement)) {
+                throw new Error(`Cannot find the template '${formField.id}_template' for the poll options.`, {
+                    cause: {
+                        formField,
+                    },
+                });
+            }
+            this.#languages = languages;
+            this.#maxOptions = maxOptions;
+            this.#template = template;
+            this.#list = document.createElement("ol");
+            this.#list.classList.add("pollOptionList");
+            formField.insertAdjacentElement("afterend", this.#list);
+            this.#addButton = document.createElement("button");
+            this.#addButton.type = "button";
+            this.#addButton.classList.add("button", "small", "pollOptionList__addItem");
+            this.#addButton.textContent = (0, Language_1.getPhrase)("wcf.poll.button.addOption");
+            this.#addButton.addEventListener("click", () => {
+                this.#createRow(undefined, true);
+            });
+            this.#list.insertAdjacentElement("afterend", this.#addButton);
+            const options = formField.value ? JSON.parse(formField.value) : [];
+            options.forEach((option) => this.#createRow(option));
+            if (options.length === 0) {
+                this.#createRow();
+                this.#createRow();
+            }
+            new sortablejs_1.default(this.#list, {
+                direction: "vertical",
+                animation: 150,
+                fallbackOnBody: true,
+                draggable: "li",
+                handle: ".pollOptionListItem__handle",
+            });
+        }
+        #createRow(option, autoFocus = false, previousRow) {
+            if (this.#list.childElementCount >= this.#maxOptions) {
+                return;
+            }
+            const li = document.createElement("li");
+            li.classList.add("pollOptionListItem");
+            li.dataset.optionId = option ? option.optionID.toString() : "0";
+            li.append(this.#template.content.cloneNode(true));
+            if (previousRow) {
+                previousRow.after(li);
+            }
+            else {
+                this.#list.append(li);
+            }
+            const valueInput = li.querySelector(".pollOptionListItem__value");
+            (0, Util_1.identify)(valueInput);
+            li.querySelector(".pollOptionListItem__remove").addEventListener("click", () => {
+                const siblingRow = li.nextElementSibling ?? li.previousElementSibling;
+                if (this.#hasLanguageSelection()) {
+                    (0, Input_1.unregister)(valueInput.id);
+                }
+                li.remove();
+                if (siblingRow === null) {
+                    this.#createRow(undefined, true);
+                }
+                else {
+                    siblingRow.querySelector(".pollOptionListItem__value").focus();
+                }
+                this.#updateAddButton();
+            });
+            valueInput.addEventListener("keydown", (event) => {
+                if (event.key === "Enter") {
+                    event.preventDefault();
+                    this.#createRow(undefined, true, li);
+                }
+            });
+            const hasI18nValues = option !== undefined && !Object.hasOwn(option.optionValue, 0);
+            if (this.#hasLanguageSelection()) {
+                // `initI18n()` expects HTML-escaped values, but the values are raw JSON data.
+                const i18nValues = hasI18nValues
+                    ? Object.fromEntries(Object.entries(option.optionValue).map(([languageId, value]) => [languageId, (0, StringUtil_1.escapeHTML)(value)]))
+                    : {};
+                (0, Input_1.init)(valueInput.id, i18nValues, this.#languages, false);
+            }
+            if (!hasI18nValues) {
+                valueInput.value = option?.optionValue[0] ?? "";
+            }
+            if (autoFocus) {
+                valueInput.focus();
+            }
+            this.#updateAddButton();
+        }
+        #hasLanguageSelection() {
+            return Object.keys(this.#languages).length > 1;
+        }
+        #updateAddButton() {
+            this.#addButton.disabled = this.#list.childElementCount >= this.#maxOptions;
+        }
+        destroy() {
+            if (!this.#hasLanguageSelection()) {
+                return;
+            }
+            this.#list.querySelectorAll(".pollOptionListItem__value").forEach((valueInput) => {
+                (0, Input_1.unregister)(valueInput.id);
+            });
+        }
+        getData() {
+            const data = [];
+            this.#list.querySelectorAll(".pollOptionListItem").forEach((li) => {
+                const valueInput = li.querySelector(".pollOptionListItem__value");
+                data.push({
+                    optionID: parseInt(li.dataset.optionId, 10),
+                    optionValue: this.#hasLanguageSelection()
+                        ? Object.fromEntries((0, Input_1.getValues)(valueInput.id))
+                        : { 0: valueInput.value },
+                });
+            });
+            return data;
+        }
+    }
+    const optionLists = new Map();
+    function setup(formField, languages, maxOptions) {
+        optionLists.set(formField.id, new PollOptionList(formField, languages, maxOptions));
+    }
+    /**
+     * Returns the serialized options of the poll option list with the given id.
+     */
+    function getOptionListValue(fieldId) {
+        const optionList = optionLists.get(fieldId);
+        if (optionList === undefined) {
+            throw new Error(`Unknown poll option list '${fieldId}'.`);
+        }
+        return JSON.stringify(optionList.getData());
+    }
+    /**
+     * Removes the poll option list with the given id, e.g. after the dialog has
+     * been closed.
+     */
+    function removeOptionList(fieldId) {
+        optionLists.get(fieldId)?.destroy();
+        optionLists.delete(fieldId);
+    }
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Poll/Widget.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Poll/Widget.js
new file mode 100644
index 00000000000..13ab92d04f5
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Poll/Widget.js
@@ -0,0 +1,204 @@
+/**
+ * Handles the widget of standalone polls that have been embedded into a
+ * message. The widget contains both the vote form and the results, switching
+ * between them does not require a request.
+ *
+ * @author Marcel Werk
+ * @copyright 2001-2026 WoltLab GmbH
+ * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+define(["require", "exports", "tslib", "WoltLabSuite/Core/Api/Polls/GetWidget", "WoltLabSuite/Core/Api/Polls/Vote", "WoltLabSuite/Core/Component/Dialog", "WoltLabSuite/Core/Dom/Change/Listener", "WoltLabSuite/Core/Dom/Util", "WoltLabSuite/Core/Helper/PromiseMutex", "WoltLabSuite/Core/Helper/Selector", "WoltLabSuite/Core/Ui/Dropdown/Simple"], function (require, exports, tslib_1, GetWidget_1, Vote_1, Dialog_1, Listener_1, Util_1, PromiseMutex_1, Selector_1, Simple_1) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.setup = setup;
+    Util_1 = tslib_1.__importDefault(Util_1);
+    Simple_1 = tslib_1.__importDefault(Simple_1);
+    class PollWidget {
+        #element;
+        #inputs;
+        #maxVotes;
+        #requiredVotes;
+        #pollId;
+        #voteButton;
+        constructor(element) {
+            this.#element = element;
+            this.#inputs = Array.from(element.querySelectorAll(".pollWidget__input"));
+            this.#maxVotes = parseInt(element.dataset.maxVotes);
+            this.#requiredVotes = parseInt(element.dataset.requiredVotes);
+            this.#pollId = parseInt(element.dataset.pollId);
+            this.#voteButton = element.querySelector(".pollWidget__vote");
+            this.#initEventListeners();
+            this.#initInteractions();
+            this.#setState(element.dataset.state, false);
+            this.#updateInputs();
+        }
+        #initEventListeners() {
+            for (const input of this.#inputs) {
+                input.addEventListener("change", () => this.#updateInputs());
+            }
+            // The inputs remain part of the rows while the results are displayed.
+            this.#element.querySelector(".pollWidget__options").addEventListener("click", (event) => {
+                if (this.#state === "results") {
+                    event.preventDefault();
+                }
+            });
+            this.#element.querySelector(".pollWidget__showResults")?.addEventListener("click", () => {
+                this.#setState("results");
+            });
+            this.#element.querySelector(".pollWidget__showVote")?.addEventListener("click", () => {
+                this.#setState("vote");
+            });
+            this.#voteButton?.addEventListener("click", (0, PromiseMutex_1.promiseMutex)(() => this.#submit()));
+            this.#element.querySelector(".pollWidget__showParticipants")?.addEventListener("click", (0, PromiseMutex_1.promiseMutex)(() => {
+                return (0, Dialog_1.dialogFactory)()
+                    .usingListView()
+                    .fromPreset(this.#element.dataset.question, "wcf\\system\\listView\\user\\PollParticipantListView", new Map([["pollID", this.#pollId.toString()]]));
+            }));
+        }
+        /**
+         * The widget serves as the container of the interactions, which allow the
+         * owner and moderators to edit or delete the poll.
+         */
+        #initInteractions() {
+            const toggle = this.#element.querySelector(".pollWidget__interactions .dropdownToggle");
+            if (toggle === null) {
+                return;
+            }
+            let dropdown = Simple_1.default.getDropdownMenu(toggle.dataset.target);
+            dropdown ??= toggle.closest(".dropdown").querySelector(".dropdownMenu");
+            dropdown.querySelectorAll("[data-interaction]").forEach((button) => {
+                button.addEventListener("click", () => {
+                    // The interactions are set up on the widget itself, the event must not
+                    // reach the interactions of a surrounding container.
+                    this.#element.dispatchEvent(new CustomEvent("interaction:execute", {
+                        detail: button.dataset,
+                    }));
+                });
+            });
+            this.#element.addEventListener("interaction:invalidate", (event) => {
+                event.stopPropagation();
+                if (event.detail._reloadPage === "true") {
+                    window.location.reload();
+                }
+                else {
+                    void refreshWidgets(this.#pollId, this.#element);
+                }
+            });
+            this.#element.addEventListener("interaction:remove", (event) => {
+                event.stopPropagation();
+                getWidgets(this.#pollId).forEach((element) => {
+                    destroyInteractions(element);
+                    element.remove();
+                });
+            });
+        }
+        get #state() {
+            return this.#element.dataset.state;
+        }
+        #setState(state, moveFocus = true) {
+            this.#element.dataset.state = state;
+            for (const input of this.#inputs) {
+                input.inert = state === "results";
+            }
+            if (!moveFocus) {
+                return;
+            }
+            if (state === "vote") {
+                const input = this.#inputs.find((input) => input.checked) ?? this.#inputs.find((input) => !input.disabled);
+                input?.focus();
+            }
+            else {
+                this.#getQuestion().focus();
+            }
+        }
+        #updateInputs() {
+            if (this.#voteButton === null) {
+                return;
+            }
+            const selectedCount = this.#getSelectedOptionIds().length;
+            this.#voteButton.disabled = selectedCount < this.#requiredVotes;
+            if (this.#maxVotes > 1) {
+                for (const input of this.#inputs) {
+                    input.disabled = !input.checked && selectedCount >= this.#maxVotes;
+                }
+            }
+        }
+        #getSelectedOptionIds() {
+            return this.#inputs.filter((input) => input.checked).map((input) => parseInt(input.value));
+        }
+        #getQuestion() {
+            return this.#element.querySelector(".pollWidget__question");
+        }
+        async #submit() {
+            const optionIds = this.#getSelectedOptionIds();
+            if (optionIds.length === 0) {
+                return;
+            }
+            this.#voteButton.disabled = true;
+            this.#element.setAttribute("aria-busy", "true");
+            try {
+                const { template } = await (0, Vote_1.vote)(this.#pollId, optionIds);
+                replaceWidget(this.#element, template)?.querySelector(".pollWidget__question").focus();
+            }
+            finally {
+                if (this.#element.isConnected) {
+                    this.#element.removeAttribute("aria-busy");
+                    this.#updateInputs();
+                }
+            }
+        }
+    }
+    /**
+     * The same poll can be embedded multiple times on a page.
+     */
+    function getWidgets(pollId) {
+        return Array.from(document.querySelectorAll(`.pollWidget[data-poll-id="${pollId}"]`));
+    }
+    /**
+     * The dropdown menu of the interactions has been moved into the global
+     * container and must be removed together with the widget.
+     */
+    function destroyInteractions(element) {
+        const toggle = element.querySelector(".pollWidget__interactions .dropdownToggle");
+        if (toggle?.dataset.target) {
+            Simple_1.default.destroy(toggle.dataset.target);
+        }
+    }
+    /**
+     * Replaces the widget with the rendered template and returns the new widget,
+     * which is set up by the selector observer.
+     */
+    function replaceWidget(element, template) {
+        const fragment = Util_1.default.createFragmentFromHtml(template);
+        const widget = fragment.querySelector(".pollWidget");
+        if (widget === null) {
+            return null;
+        }
+        // The scripts initialize the interactions and are executed on insertion.
+        const scripts = Array.from(fragment.querySelectorAll("script"));
+        destroyInteractions(element);
+        element.replaceWith(fragment);
+        scripts.forEach((script) => script.remove());
+        (0, Listener_1.trigger)();
+        return widget;
+    }
+    async function refreshWidgets(pollId, source) {
+        await Promise.all(getWidgets(pollId).map(async (element) => {
+            // Every instance requires its own rendering because of the unique ids.
+            const { template } = await (0, GetWidget_1.getWidget)(pollId);
+            if (!element.isConnected) {
+                return;
+            }
+            const widget = replaceWidget(element, template);
+            if (element === source) {
+                widget?.querySelector(".pollWidget__question").focus();
+            }
+        }));
+    }
+    function setup() {
+        (0, Selector_1.wheneverFirstSeen)(".pollWidget", (element) => {
+            new PollWidget(element);
+        });
+    }
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/PollOptionList.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/PollOptionList.js
new file mode 100644
index 00000000000..f9d516ec73f
--- /dev/null
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/PollOptionList.js
@@ -0,0 +1,23 @@
+/**
+ * Data handler for the options of a poll.
+ *
+ * @author  Marcel Werk
+ * @copyright  2001-2026 WoltLab GmbH
+ * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since 6.3
+ */
+define(["require", "exports", "tslib", "./Field", "WoltLabSuite/Core/Component/Poll/OptionList"], function (require, exports, tslib_1, Field_1, OptionList_1) {
+    "use strict";
+    Field_1 = tslib_1.__importDefault(Field_1);
+    class PollOptionList extends Field_1.default {
+        _getData() {
+            return {
+                [this._fieldId]: (0, OptionList_1.getOptionListValue)(this._fieldId),
+            };
+        }
+        destroy() {
+            (0, OptionList_1.removeOptionList)(this._fieldId);
+        }
+    }
+    return PollOptionList;
+});
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Wysiwyg/Poll.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Wysiwyg/Poll.js
index c6d4f64d3c6..ae5a41ca104 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Wysiwyg/Poll.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Form/Builder/Field/Wysiwyg/Poll.js
@@ -5,6 +5,7 @@
  * @copyright 2001-2020 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since 5.2
+ * @deprecated 6.3 Use `WoltLabSuite/Core/Form/Builder/Field/PollOptionList` instead.
  */
 define(["require", "exports", "tslib", "../Field"], function (require, exports, tslib_1, Field_1) {
     "use strict";
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Acl/List.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Acl/List.js
index d84c6474c6d..e517c227e57 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Acl/List.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Acl/List.js
@@ -356,7 +356,7 @@ define(["require", "exports", "tslib", "WoltLabSuite/Core/Ui/User/Search/Input",
         #save(type) {
             const form = this.#container.closest("form");
             const name = this.#aclValuesFieldName + "[" + type + "]";
-            let input = form.querySelector("input[name='" + name + "']");
+            let input = form.querySelector(`input[name="${CSS.escape(name)}"]`);
             if (input) {
                 // combine json values
                 input.value = JSON.stringify((0, Core_1.extend)(JSON.parse(input.value), this.#values[type]));
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Editor.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Editor.js
index 8f288ce4081..ea480018939 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Editor.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Editor.js
@@ -5,6 +5,7 @@
  * @copyright  2001-2020 WoltLab GmbH
  * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @woltlabExcludeBundle all
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 define(["require", "exports", "tslib", "../../Core", "WoltLabSuite/Core/Language", "../Sortable/List", "../../Event/Handler", "../../Date/Picker", "../../Component/Ckeditor/Event", "WoltLabSuite/Core/Dom/Util"], function (require, exports, tslib_1, Core, Language_1, List_1, EventHandler, DatePicker, Event_1, Util_1) {
     "use strict";
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Poll.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Poll.js
index 713a862e6df..99bb816464d 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Poll.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Poll.js
@@ -5,6 +5,7 @@
  * @copyright  2001-2022 WoltLab GmbH
  * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since   5.5
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 define(["require", "exports", "tslib", "../../Dom/Change/Listener", "../../Dom/Util", "../../StringUtil", "./View/Participants", "./View/Results", "./View/Vote", "./Vote"], function (require, exports, tslib_1, Listener_1, Util_1, StringUtil_1, Participants_1, Results_1, Vote_1, Vote_2) {
     "use strict";
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/View/Participants.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/View/Participants.js
index 4dd2df3ad0a..880ca774253 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/View/Participants.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/View/Participants.js
@@ -5,6 +5,7 @@
  * @copyright  2001-2022 WoltLab GmbH
  * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since   5.5
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 define(["require", "exports", "WoltLabSuite/Core/Helper/PromiseMutex", "WoltLabSuite/Core/Component/Dialog"], function (require, exports, PromiseMutex_1, Dialog_1) {
     "use strict";
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/View/Results.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/View/Results.js
index 2d6ea9a5254..f3b2caba1b7 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/View/Results.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/View/Results.js
@@ -5,6 +5,7 @@
  * @copyright  2001-2022 WoltLab GmbH
  * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since   5.5
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 define(["require", "exports", "tslib", "../../../Ajax", "../Poll"], function (require, exports, tslib_1, Ajax, Poll_1) {
     "use strict";
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/View/Vote.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/View/Vote.js
index e0674bb8af2..935b7a9cf14 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/View/Vote.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/View/Vote.js
@@ -5,6 +5,7 @@
  * @copyright  2001-2022 WoltLab GmbH
  * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since   5.5
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 define(["require", "exports", "tslib", "../../../Ajax", "../Poll"], function (require, exports, tslib_1, Ajax, Poll_1) {
     "use strict";
diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Vote.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Vote.js
index 04975a762e1..4054644b07d 100644
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Vote.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ui/Poll/Vote.js
@@ -5,6 +5,7 @@
  * @copyright  2001-2022 WoltLab GmbH
  * @license  GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since   5.5
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 define(["require", "exports", "tslib", "./Poll", "../../Ajax"], function (require, exports, tslib_1, Poll_1, Ajax) {
     "use strict";
diff --git a/wcfsetup/install/files/lib/action/PollEditAction.class.php b/wcfsetup/install/files/lib/action/PollEditAction.class.php
new file mode 100644
index 00000000000..0de8bb39287
--- /dev/null
+++ b/wcfsetup/install/files/lib/action/PollEditAction.class.php
@@ -0,0 +1,335 @@
+<?php
+
+namespace wcf\action;
+
+use Laminas\Diactoros\Response\JsonResponse;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Server\RequestHandlerInterface;
+use wcf\command\poll\CreatePoll;
+use wcf\command\poll\UpdatePoll;
+use wcf\data\poll\Poll;
+use wcf\data\poll\PollBuilder;
+use wcf\http\Helper;
+use wcf\system\acl\ACLHandler;
+use wcf\system\exception\IllegalLinkException;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\form\builder\container\FormContainer;
+use wcf\system\form\builder\field\acl\AclFormField;
+use wcf\system\form\builder\field\BooleanFormField;
+use wcf\system\form\builder\field\DateFormField;
+use wcf\system\form\builder\field\IFormField;
+use wcf\system\form\builder\field\IntegerFormField;
+use wcf\system\form\builder\field\poll\PollOptionListFormField;
+use wcf\system\form\builder\field\TextFormField;
+use wcf\system\form\builder\field\validation\FormFieldValidationError;
+use wcf\system\form\builder\field\validation\FormFieldValidator;
+use wcf\system\form\builder\IFormDocument;
+use wcf\system\form\builder\Psr15BuilderDialogForm;
+use wcf\system\l10n\L10nStorage;
+use wcf\system\WCF;
+
+/**
+ * Creates or edits a standalone poll in a dialog.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class PollEditAction implements RequestHandlerInterface
+{
+    private ?Poll $poll = null;
+
+    #[\Override]
+    public function handle(ServerRequestInterface $request): ResponseInterface
+    {
+        $parameters = Helper::mapQueryParameters(
+            $request->getQueryParams(),
+            <<<'EOT'
+                array {
+                    id?: positive-int
+                }
+                EOT
+        );
+
+        if (isset($parameters['id'])) {
+            $poll = new Poll($parameters['id']);
+            if ($poll->isNil()) {
+                throw new IllegalLinkException();
+            }
+            if (!$poll->canManage()) {
+                throw new PermissionDeniedException();
+            }
+
+            $this->poll = $poll;
+        } elseif (\MODULE_POLL === 0 || !WCF::getSession()->hasPermission('user.poll.canCreatePoll')) {
+            throw new PermissionDeniedException();
+        }
+
+        $form = $this->getForm($request->getMethod() === 'GET');
+
+        if ($request->getMethod() === 'GET') {
+            return $form->toResponse();
+        } elseif ($request->getMethod() === 'POST') {
+            $response = $form->validateRequest($request);
+            if ($response !== null) {
+                return $response;
+            }
+
+            if ($this->poll === null) {
+                $builder = PollBuilder::forCreate()
+                    ->setUser(WCF::getUser()->userID, WCF::getUser()->username)
+                    ->setTime(\TIME_NOW);
+            } else {
+                $builder = PollBuilder::forUpdate($this->poll);
+            }
+
+            $form->applyValuesToBuilder($builder);
+            $builder->setMultilingual($this->hasL10nValues($form));
+
+            if ($this->poll === null) {
+                $poll = (new CreatePoll($builder))();
+            } else {
+                $poll = (new UpdatePoll($builder))();
+            }
+
+            // The acl values have been read by the acl form field.
+            ACLHandler::getInstance()->save(
+                $poll->pollID,
+                ACLHandler::getInstance()->getObjectTypeID('com.woltlab.wcf.poll')
+            );
+
+            return new JsonResponse([
+                'result' => [
+                    'pollID' => $poll->pollID,
+                    'question' => $poll->getQuestion(),
+                ],
+            ]);
+        } else {
+            throw new \LogicException('Unreachable');
+        }
+    }
+
+    private function getForm(bool $loadValues): Psr15BuilderDialogForm
+    {
+        $form = new Psr15BuilderDialogForm(
+            static::class,
+            WCF::getLanguage()->get($this->poll === null ? 'wcf.poll.add' : 'wcf.poll.edit')
+        );
+
+        $poll = $this->poll;
+
+        $form->appendChildren([
+            FormContainer::create('general')
+                ->appendChildren([
+                    TextFormField::create('question')
+                        ->label('wcf.poll.question')
+                        ->l10n()
+                        ->required()
+                        ->maximumLength(255)
+                        ->saveValueCallback(static function (PollBuilder $builder, TextFormField $field): void {
+                            $builder->setQuestion($field->getL10nValues());
+                        })
+                        ->loadValueCallback(static function (Poll $object, IFormField $field): void {
+                            $field->value($object->getL10nValues('question'));
+                        }),
+                    PollOptionListFormField::create('options')
+                        ->required()
+                        ->saveValueCallback(static function (PollBuilder $builder, PollOptionListFormField $field): void {
+                            $builder->setOptions($field->getValue());
+                        })
+                        ->loadValueCallback(static function (Poll $object, IFormField $field): void {
+                            $field->value(\array_values($object->getOptions()));
+                        }),
+                ]),
+            FormContainer::create('settings')
+                ->label('wcf.global.settings')
+                ->appendChildren([
+                    DateFormField::create('endTime')
+                        ->label('wcf.poll.endTime')
+                        ->supportTime()
+                        ->addValidator(new FormFieldValidator(
+                            'futureTime',
+                            static function (DateFormField $field) use ($poll): void {
+                                $endTime = (int)$field->getSaveValue();
+                                if ($endTime === 0 || $endTime > \TIME_NOW) {
+                                    return;
+                                }
+
+                                // A poll that has already ended may keep its end time.
+                                if ($poll !== null && $poll->endTime === $endTime) {
+                                    return;
+                                }
+
+                                $field->addValidationError(new FormFieldValidationError(
+                                    'invalid',
+                                    'wcf.poll.endTime.error.invalid'
+                                ));
+                            }
+                        ))
+                        ->saveValueCallback(static function (PollBuilder $builder, DateFormField $field): void {
+                            $builder->setEndTime((int)$field->getSaveValue());
+                        })
+                        ->loadValueCallback(static function (Poll $object, IFormField $field): void {
+                            $field->value($object->endTime);
+                        }),
+                    IntegerFormField::create('minVotes')
+                        ->label('wcf.poll.minVotes')
+                        ->description('wcf.poll.minVotes.description')
+                        ->minimum(1)
+                        ->maximum(\POLL_MAX_OPTIONS)
+                        ->value(1)
+                        ->addValidator(new FormFieldValidator(
+                            'minVotes',
+                            static function (IntegerFormField $field): void {
+                                $maxVotesField = $field->getDocument()->getNodeById('maxVotes');
+                                \assert($maxVotesField instanceof IntegerFormField);
+
+                                if ($field->getSaveValue() > $maxVotesField->getSaveValue()) {
+                                    $field->addValidationError(new FormFieldValidationError(
+                                        'invalid',
+                                        'wcf.poll.minVotes.error.invalid'
+                                    ));
+                                }
+                            }
+                        ))
+                        ->saveValueCallback(static function (PollBuilder $builder, IntegerFormField $field): void {
+                            $builder->setMinVotes($field->getSaveValue());
+                        })
+                        ->loadValueCallback(static function (Poll $object, IFormField $field): void {
+                            $field->value($object->minVotes);
+                        }),
+                    IntegerFormField::create('maxVotes')
+                        ->label('wcf.poll.maxVotes')
+                        ->minimum(1)
+                        ->maximum(\POLL_MAX_OPTIONS)
+                        ->value(1)
+                        ->addValidator(new FormFieldValidator(
+                            'maxVotes',
+                            static function (IntegerFormField $field): void {
+                                $optionsField = $field->getDocument()->getNodeById('options');
+                                \assert($optionsField instanceof PollOptionListFormField);
+
+                                if ($field->getSaveValue() > \count($optionsField->getValue())) {
+                                    $field->addValidationError(new FormFieldValidationError(
+                                        'invalid',
+                                        'wcf.poll.maxVotes.error.invalid'
+                                    ));
+                                }
+                            }
+                        ))
+                        ->saveValueCallback(static function (PollBuilder $builder, IntegerFormField $field): void {
+                            $builder->setMaxVotes($field->getSaveValue());
+                        })
+                        ->loadValueCallback(static function (Poll $object, IFormField $field): void {
+                            $field->value($object->maxVotes);
+                        }),
+                    BooleanFormField::create('isChangeable')
+                        ->label('wcf.poll.isChangeable')
+                        ->saveValueCallback(static function (PollBuilder $builder, BooleanFormField $field): void {
+                            $builder->setIsChangeable($field->getSaveValue() !== 0);
+                        })
+                        ->loadValueCallback(static function (Poll $object, IFormField $field): void {
+                            $field->value($object->isChangeable);
+                        }),
+                    // The visibility of the participants cannot be changed after creation.
+                    BooleanFormField::create('isPublic')
+                        ->label('wcf.poll.isPublic')
+                        ->available(
+                            $this->poll === null
+                            && WCF::getSession()->hasPermission('user.poll.canStartPublicPoll')
+                        )
+                        ->saveValueCallback(static function (PollBuilder $builder, BooleanFormField $field): void {
+                            $builder->setIsPublic($field->getSaveValue() !== 0);
+                        }),
+                    BooleanFormField::create('resultsRequireVote')
+                        ->label('wcf.poll.resultsRequireVote')
+                        ->description('wcf.poll.resultsRequireVote.description')
+                        ->saveValueCallback(static function (PollBuilder $builder, BooleanFormField $field): void {
+                            $builder->setResultsRequireVote($field->getSaveValue() !== 0);
+                        })
+                        ->loadValueCallback(static function (Poll $object, IFormField $field): void {
+                            $field->value($object->resultsRequireVote);
+                        }),
+                    BooleanFormField::create('resultsRequireEnd')
+                        ->label('wcf.poll.resultsRequireEnd')
+                        ->description('wcf.poll.resultsRequireEnd.description')
+                        ->addValidator(new FormFieldValidator(
+                            'endTimeRequired',
+                            static function (BooleanFormField $field): void {
+                                if ($field->getSaveValue() === 0) {
+                                    return;
+                                }
+
+                                $endTimeField = $field->getDocument()->getNodeById('endTime');
+                                \assert($endTimeField instanceof DateFormField);
+
+                                // A malformed end time is already reported by the field itself.
+                                if ($endTimeField->getValidationErrors() !== []) {
+                                    return;
+                                }
+
+                                if ($endTimeField->getValue() === null) {
+                                    $field->addValidationError(new FormFieldValidationError(
+                                        'endTimeRequired',
+                                        'wcf.poll.resultsRequireEnd.error.endTimeRequired'
+                                    ));
+                                }
+                            }
+                        ))
+                        ->saveValueCallback(static function (PollBuilder $builder, BooleanFormField $field): void {
+                            $builder->setResultsRequireEnd($field->getSaveValue() !== 0);
+                        })
+                        ->loadValueCallback(static function (Poll $object, IFormField $field): void {
+                            $field->value($object->resultsRequireEnd);
+                        }),
+                    BooleanFormField::create('sortByVotes')
+                        ->label('wcf.poll.sortByVotes')
+                        ->saveValueCallback(static function (PollBuilder $builder, BooleanFormField $field): void {
+                            $builder->setSortByVotes($field->getSaveValue() !== 0);
+                        })
+                        ->loadValueCallback(static function (Poll $object, IFormField $field): void {
+                            $field->value($object->sortByVotes);
+                        }),
+                ]),
+            FormContainer::create('access')
+                ->label('wcf.poll.access')
+                ->appendChildren([
+                    AclFormField::create('acl')
+                        ->label('wcf.acl.permissions')
+                        ->objectType('com.woltlab.wcf.poll'),
+                ]),
+        ]);
+
+        // The values must be loaded after building the form, because the l10n
+        // fields reset their values when they are populated.
+        if ($this->poll === null) {
+            $form->formMode(IFormDocument::FORM_MODE_CREATE);
+            $form->build();
+        } else {
+            $form->formMode(IFormDocument::FORM_MODE_UPDATE);
+            $form->build();
+            $form->updatedObject($this->poll, $loadValues);
+        }
+
+        return $form;
+    }
+
+    /**
+     * Returns true if the question or any option has been provided per language.
+     */
+    private function hasL10nValues(IFormDocument $form): bool
+    {
+        $questionField = $form->getNodeById('question');
+        \assert($questionField instanceof TextFormField);
+        if (!isset($questionField->getL10nValues()[L10nStorage::MONOLINGUAL])) {
+            return true;
+        }
+
+        $optionsField = $form->getNodeById('options');
+        \assert($optionsField instanceof PollOptionListFormField);
+
+        return $optionsField->hasL10nValues();
+    }
+}
diff --git a/wcfsetup/install/files/lib/command/poll/CreatePoll.class.php b/wcfsetup/install/files/lib/command/poll/CreatePoll.class.php
new file mode 100644
index 00000000000..5a9e7965bd2
--- /dev/null
+++ b/wcfsetup/install/files/lib/command/poll/CreatePoll.class.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace wcf\command\poll;
+
+use wcf\data\poll\Poll;
+use wcf\data\poll\PollBuilder;
+use wcf\event\poll\PollCreated;
+use wcf\system\event\EventHandler;
+
+/**
+ * Creates a new poll.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class CreatePoll
+{
+    public function __construct(
+        private readonly PollBuilder $builder,
+    ) {}
+
+    public function __invoke(): Poll
+    {
+        $poll = $this->builder->create();
+
+        EventHandler::getInstance()->fire(new PollCreated($poll, $this->builder));
+
+        return $poll;
+    }
+}
diff --git a/wcfsetup/install/files/lib/command/poll/DeletePolls.class.php b/wcfsetup/install/files/lib/command/poll/DeletePolls.class.php
new file mode 100644
index 00000000000..2b6f8cc7afe
--- /dev/null
+++ b/wcfsetup/install/files/lib/command/poll/DeletePolls.class.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace wcf\command\poll;
+
+use wcf\data\poll\Poll;
+use wcf\data\poll\PollBuilder;
+use wcf\event\poll\PollsDeleted;
+use wcf\system\event\EventHandler;
+
+/**
+ * Deletes polls including their options and votes.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class DeletePolls
+{
+    /**
+     * @param Poll[] $polls
+     */
+    public function __construct(
+        private readonly array $polls,
+    ) {}
+
+    public function __invoke(): void
+    {
+        if ($this->polls === []) {
+            return;
+        }
+
+        PollBuilder::deleteAll(\array_values(\array_map(
+            static fn(Poll $poll) => $poll->pollID,
+            $this->polls
+        )));
+
+        EventHandler::getInstance()->fire(new PollsDeleted($this->polls));
+    }
+}
diff --git a/wcfsetup/install/files/lib/command/poll/UpdatePoll.class.php b/wcfsetup/install/files/lib/command/poll/UpdatePoll.class.php
new file mode 100644
index 00000000000..44c29def2a3
--- /dev/null
+++ b/wcfsetup/install/files/lib/command/poll/UpdatePoll.class.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace wcf\command\poll;
+
+use wcf\data\poll\Poll;
+use wcf\data\poll\PollBuilder;
+use wcf\event\poll\PollUpdated;
+use wcf\system\event\EventHandler;
+
+/**
+ * Updates an existing poll.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class UpdatePoll
+{
+    public function __construct(
+        private readonly PollBuilder $builder,
+    ) {}
+
+    public function __invoke(): Poll
+    {
+        $poll = $this->builder->update();
+
+        EventHandler::getInstance()->fire(new PollUpdated($poll, $this->builder));
+
+        return $poll;
+    }
+}
diff --git a/wcfsetup/install/files/lib/command/poll/VotePoll.class.php b/wcfsetup/install/files/lib/command/poll/VotePoll.class.php
new file mode 100644
index 00000000000..81a095ba6d8
--- /dev/null
+++ b/wcfsetup/install/files/lib/command/poll/VotePoll.class.php
@@ -0,0 +1,110 @@
+<?php
+
+namespace wcf\command\poll;
+
+use wcf\data\poll\Poll;
+use wcf\data\user\User;
+use wcf\event\poll\PollVoted;
+use wcf\system\event\EventHandler;
+use wcf\system\WCF;
+
+/**
+ * Stores the vote of a user in a poll, replacing a previous vote. The given
+ * option ids must have been validated against the options of the poll.
+ *
+ * @author      Alexander Ebert, Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class VotePoll
+{
+    /**
+     * @param list<int> $optionIDs
+     */
+    public function __construct(
+        private readonly Poll $poll,
+        private readonly User $user,
+        private readonly array $optionIDs,
+    ) {}
+
+    public function __invoke(): void
+    {
+        $sql = "SELECT  optionID
+                FROM    wcf1_poll_option_vote
+                WHERE   pollID = ?
+                    AND userID = ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([
+            $this->poll->pollID,
+            $this->user->userID,
+        ]);
+        $previousOptionIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
+        $alreadyVoted = $previousOptionIDs !== [];
+
+        $addedOptionIDs = \array_values(\array_diff($this->optionIDs, $previousOptionIDs));
+        $removedOptionIDs = \array_values(\array_diff($previousOptionIDs, $this->optionIDs));
+
+        WCF::getDB()->beginTransaction();
+        $committed = false;
+        try {
+            if ($addedOptionIDs !== []) {
+                $sql = "INSERT IGNORE INTO  wcf1_poll_option_vote
+                                            (pollID, optionID, userID)
+                        VALUES              (?, ?, ?)";
+                $insertStatement = WCF::getDB()->prepare($sql);
+
+                $sql = "UPDATE  wcf1_poll_option
+                        SET     votes = votes + 1
+                        WHERE   optionID = ?";
+                $updateStatement = WCF::getDB()->prepare($sql);
+
+                foreach ($addedOptionIDs as $optionID) {
+                    $insertStatement->execute([
+                        $this->poll->pollID,
+                        $optionID,
+                        $this->user->userID,
+                    ]);
+                    $updateStatement->execute([$optionID]);
+                }
+            }
+
+            if ($removedOptionIDs !== []) {
+                $sql = "DELETE FROM wcf1_poll_option_vote
+                        WHERE       optionID = ?
+                                AND userID = ?";
+                $deleteStatement = WCF::getDB()->prepare($sql);
+
+                $sql = "UPDATE  wcf1_poll_option
+                        SET     votes = votes - 1
+                        WHERE   optionID = ?";
+                $updateStatement = WCF::getDB()->prepare($sql);
+
+                foreach ($removedOptionIDs as $optionID) {
+                    $deleteStatement->execute([
+                        $optionID,
+                        $this->user->userID,
+                    ]);
+                    $updateStatement->execute([$optionID]);
+                }
+            }
+
+            if (!$alreadyVoted) {
+                $sql = "UPDATE  wcf1_poll
+                        SET     votes = votes + 1
+                        WHERE   pollID = ?";
+                $statement = WCF::getDB()->prepare($sql);
+                $statement->execute([$this->poll->pollID]);
+            }
+
+            WCF::getDB()->commitTransaction();
+            $committed = true;
+        } finally {
+            if (!$committed) {
+                WCF::getDB()->rollBackTransaction();
+            }
+        }
+
+        EventHandler::getInstance()->fire(new PollVoted($this->poll, $this->user, $this->optionIDs));
+    }
+}
diff --git a/wcfsetup/install/files/lib/command/user/MergeUsers.class.php b/wcfsetup/install/files/lib/command/user/MergeUsers.class.php
index cebe3e49067..2bb67d41e2b 100644
--- a/wcfsetup/install/files/lib/command/user/MergeUsers.class.php
+++ b/wcfsetup/install/files/lib/command/user/MergeUsers.class.php
@@ -71,6 +71,7 @@ public function __invoke(): void
     private function getUserColumns(): array
     {
         return [
+            new UserColumn('wcf1_poll', usernameColumn: 'username'),
             new UserColumn('wcf1_poll_option_vote', ignore: true),
             new UserColumn('wcf1_comment', usernameColumn: 'username'),
             new UserColumn('wcf1_comment_response', usernameColumn: 'username'),
diff --git a/wcfsetup/install/files/lib/command/user/UpdateUser.class.php b/wcfsetup/install/files/lib/command/user/UpdateUser.class.php
index 33b58d85eba..64228628033 100644
--- a/wcfsetup/install/files/lib/command/user/UpdateUser.class.php
+++ b/wcfsetup/install/files/lib/command/user/UpdateUser.class.php
@@ -122,6 +122,7 @@ private function getUsernameColumns(): array
             new UsernameColumn('wcf1_comment_response'),
             new UsernameColumn('wcf1_media'),
             new UsernameColumn('wcf1_modification_log'),
+            new UsernameColumn('wcf1_poll'),
         ];
     }
 }
diff --git a/wcfsetup/install/files/lib/data/IPollContainer.class.php b/wcfsetup/install/files/lib/data/IPollContainer.class.php
index 9c25c0e8b07..4a84955c907 100644
--- a/wcfsetup/install/files/lib/data/IPollContainer.class.php
+++ b/wcfsetup/install/files/lib/data/IPollContainer.class.php
@@ -9,6 +9,7 @@
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since   5.2
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 interface IPollContainer extends IIDObject, IPollObject
 {
diff --git a/wcfsetup/install/files/lib/data/IPollObject.class.php b/wcfsetup/install/files/lib/data/IPollObject.class.php
index a87200ab727..8b7a8754492 100644
--- a/wcfsetup/install/files/lib/data/IPollObject.class.php
+++ b/wcfsetup/install/files/lib/data/IPollObject.class.php
@@ -8,6 +8,7 @@
  * @author  Alexander Ebert
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 interface IPollObject
 {
diff --git a/wcfsetup/install/files/lib/data/poll/Poll.class.php b/wcfsetup/install/files/lib/data/poll/Poll.class.php
index 61b6aaffa13..587bf928cba 100644
--- a/wcfsetup/install/files/lib/data/poll/Poll.class.php
+++ b/wcfsetup/install/files/lib/data/poll/Poll.class.php
@@ -2,34 +2,60 @@
 
 namespace wcf\data\poll;
 
-use wcf\data\DatabaseObject;
+use wcf\data\CollectionDatabaseObject;
 use wcf\data\IPollObject;
+use wcf\data\ITitledObject;
 use wcf\data\poll\option\PollOption;
-use wcf\system\poll\PollManager;
+use wcf\data\user\UserProfile;
+use wcf\system\l10n\L10nDefinition;
+use wcf\system\l10n\L10nStorage;
 use wcf\system\WCF;
 
 /**
  * Represents a poll.
  *
- * @author  Alexander Ebert
- * @copyright   2001-2019 WoltLab GmbH
+ * A poll either belongs to a poll container (`objectTypeID` references an object
+ * type of the definition `com.woltlab.wcf.poll`) or it is a standalone poll
+ * (`objectTypeID = NULL`) that is owned by a user and embedded into messages
+ * via the `[poll]` bbcode.
+ *
+ * The localized question is stored in the `wcf1_poll_l10n` table. A poll is
+ * either monolingual (`isMultilingual = 0`), storing a single value, or it is
+ * multilingual, storing a value per language.
+ *
+ * @author  Alexander Ebert, Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
  * @property-read   int     $pollID             unique id of the poll
- * @property-read   int     $objectTypeID       id of the `com.woltlab.wcf.poll` object type
- * @property-read   int     $objectID           id of the poll container object the poll belongs to
- * @property-read   ?string $question           question of the poll
+ * @property-read   ?int    $objectTypeID       id of the `com.woltlab.wcf.poll` object type or `null` for standalone polls
+ * @property-read   int     $objectID           id of the poll container object the poll belongs to or `0` for standalone polls
+ * @property-read   ?int    $userID             id of the user who created the standalone poll or `null` if the user does not exist anymore
+ * @property-read   string  $username           name of the user who created the standalone poll
+ * @property-read   0|1     $isMultilingual     is `1` if the question and the options are available in multiple languages, otherwise `0`
+ * @property-read   string  $question           localized question of the poll
  * @property-read   int     $time               timestamp at which the poll has been created
  * @property-read   int     $endTime            timestamp at which the poll has been/will be closed
  * @property-read   0|1     $isChangeable       is `1` if participants can change their vote, otherwise `0`
  * @property-read   0|1     $isPublic           is `1` if the result of the poll is public, otherwise `0`
  * @property-read   0|1     $sortByVotes        is `1` if the results will be sorted by votes, otherwise `0`
  * @property-read   0|1     $resultsRequireVote is `1` if a user has to have voted to see the results, otherwise `0`
+ * @property-read   0|1     $resultsRequireEnd  is `1` if the results are hidden from everyone until the poll has ended, otherwise `0`
+ * @property-read   int     $minVotes           minimum number of options the user has to select
  * @property-read   int     $maxVotes           maximum number of options the user can select
  * @property-read   int     $votes              number of votes in the poll
+ *
+ * @extends CollectionDatabaseObject<PollCollection>
+ *
+ * @phpstan-import-type L10nValue from L10nStorage
  */
-class Poll extends DatabaseObject
+class Poll extends CollectionDatabaseObject implements ITitledObject, \Stringable
 {
+    /**
+     * names of the localized columns that are exposed as properties
+     */
+    private const L10N_COLUMNS = ['question'];
+
     /**
      * participation status
      * @var bool
@@ -45,6 +71,7 @@ class Poll extends DatabaseObject
     /**
      * related object
      * @var ?IPollObject
+     * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
      */
     protected $relatedObject;
 
@@ -115,17 +142,22 @@ protected function loadOptions()
             return;
         }
 
-        $optionList = PollManager::getInstance()->getPollOptions([$this->pollID]);
-        foreach ($optionList as $option) {
-            $this->options[$option->optionID] = $option;
-
-            // @phpstan-ignore property.notFound
-            if ($option->voted) {
-                $this->isParticipant = true;
-            }
+        foreach ($this->getCollection()->getOptions($this) as $option) {
+            $this->addOption($option);
         }
     }
 
+    /**
+     * Returns the number of options the user has to select at least, which
+     * never exceeds the maximum number of votes or the number of options.
+     *
+     * @since 6.3
+     */
+    public function getRequiredVotes(): int
+    {
+        return \max(1, \min($this->minVotes, $this->maxVotes, \count($this->getOptions())));
+    }
+
     /**
      * Returns true if poll is already finished.
      *
@@ -136,6 +168,85 @@ public function isFinished()
         return $this->endTime !== 0 && $this->endTime <= \TIME_NOW;
     }
 
+    /**
+     * Returns true if this poll is not bound to a poll container but embedded
+     * into messages via bbcode.
+     *
+     * @since 6.3
+     */
+    public function isStandalone(): bool
+    {
+        return $this->objectTypeID === null;
+    }
+
+    /**
+     * Returns true if the active user can edit and delete this standalone poll.
+     *
+     * @since 6.3
+     */
+    public function canManage(): bool
+    {
+        if (!$this->isStandalone() || \MODULE_POLL === 0) {
+            return false;
+        }
+
+        if (WCF::getSession()->hasPermission('mod.poll.canManagePoll')) {
+            return true;
+        }
+
+        return $this->userID !== null
+            && $this->userID === WCF::getUser()->userID
+            && WCF::getSession()->hasPermission('user.poll.canCreatePoll');
+    }
+
+    /**
+     * Returns true if the active user can access this poll. The access to polls
+     * of a poll container is controlled by the container itself.
+     *
+     * @since 6.3
+     */
+    public function isAccessible(): bool
+    {
+        if (!$this->isStandalone()) {
+            return true;
+        }
+
+        if (\MODULE_POLL === 0) {
+            return false;
+        }
+
+        if ($this->canManage()) {
+            return true;
+        }
+
+        // Standalone polls are visible unless the acl denies it.
+        return $this->getAclPermission('canViewPoll') ?? true;
+    }
+
+    /**
+     * Returns the value of the acl option for the active user or `null` if
+     * neither the user nor any of the user's groups has a value. The values
+     * of the groups are combined, a value of the user takes precedence.
+     */
+    private function getAclPermission(string $optionName): ?bool
+    {
+        $permissions = $this->getCollection()->getAclPermissions($this);
+        $user = WCF::getUser();
+
+        if (isset($permissions['user'][$user->userID][$optionName])) {
+            return $permissions['user'][$user->userID][$optionName] === 1;
+        }
+
+        $permission = null;
+        foreach ($user->getGroupIDs() as $groupID) {
+            if (isset($permissions['group'][$groupID][$optionName])) {
+                $permission = $permission === true || $permissions['group'][$groupID][$optionName] === 1;
+            }
+        }
+
+        return $permission;
+    }
+
     /**
      * Returns true if current user can vote.
      *
@@ -152,6 +263,11 @@ public function canVote()
             return false;
         }
 
+        if ($this->isStandalone()) {
+            return $this->isAccessible()
+                && ($this->getAclPermission('canVotePoll') ?? WCF::getSession()->hasPermission('user.poll.canVotePoll'));
+        }
+
         if ($this->objectID !== 0) {
             // related object required but not given, deny vote ability
             if ($this->relatedObject === null) {
@@ -174,6 +290,14 @@ public function canVote()
      */
     public function canSeeResult()
     {
+        if (!$this->isAccessible()) {
+            return false;
+        }
+
+        if ($this->resultsRequireEnd === 1) {
+            return $this->isFinished();
+        }
+
         if ($this->isFinished() || $this->isParticipant() || $this->resultsRequireVote === 0) {
             return true;
         }
@@ -199,6 +323,7 @@ public function canViewParticipants()
      * Sets related object for this poll.
      *
      * @return void
+     * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
      */
     public function setRelatedObject(IPollObject $object)
     {
@@ -209,9 +334,90 @@ public function setRelatedObject(IPollObject $object)
      * Returns related object.
      *
      * @return IPollObject
+     * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
      */
     public function getRelatedObject()
     {
         return $this->relatedObject;
     }
+
+    /**
+     * @since 6.3
+     */
+    public function getQuestion(): string
+    {
+        return $this->getCollection()->getResolvedL10nValue($this, 'question');
+    }
+
+    /**
+     * Returns the localized values of the given column as a
+     * `languageID => value` map (see `L10nStorage`).
+     *
+     * @return L10nValue
+     * @since 6.3
+     */
+    public function getL10nValues(string $columnName): array
+    {
+        if (!\in_array($columnName, self::L10N_COLUMNS, true)) {
+            throw new \InvalidArgumentException("Invalid column name given.");
+        }
+
+        return $this->getCollection()->getL10nValues($this, $columnName);
+    }
+
+    /**
+     * Returns the profile of the user who created the standalone poll.
+     *
+     * @since 6.3
+     */
+    public function getUserProfile(): UserProfile
+    {
+        return $this->getCollection()->getUserProfile($this);
+    }
+
+    #[\Override]
+    public function __get(string $name)
+    {
+        if (\in_array($name, self::L10N_COLUMNS, true)) {
+            return $this->getCollection()->getResolvedL10nValue($this, $name);
+        }
+
+        return parent::__get($name);
+    }
+
+    #[\Override]
+    public function __isset(string $name)
+    {
+        if (\in_array($name, self::L10N_COLUMNS, true)) {
+            return true;
+        }
+
+        return parent::__isset($name);
+    }
+
+    #[\Override]
+    public function getTitle(): string
+    {
+        return $this->getQuestion();
+    }
+
+    #[\Override]
+    public function __toString(): string
+    {
+        return $this->getQuestion();
+    }
+
+    /**
+     * @since 6.3
+     */
+    public static function getL10nDefinition(): L10nDefinition
+    {
+        return new L10nDefinition(
+            'wcf1_poll',
+            'wcf1_poll_l10n',
+            'pollID',
+            ['question'],
+            maximumLengths: ['question' => 255],
+        );
+    }
 }
diff --git a/wcfsetup/install/files/lib/data/poll/PollAction.class.php b/wcfsetup/install/files/lib/data/poll/PollAction.class.php
index 3085922b785..af231ab5cf6 100644
--- a/wcfsetup/install/files/lib/data/poll/PollAction.class.php
+++ b/wcfsetup/install/files/lib/data/poll/PollAction.class.php
@@ -2,13 +2,16 @@
 
 namespace wcf\data\poll;
 
+use wcf\command\poll\CreatePoll;
+use wcf\command\poll\DeletePolls;
+use wcf\command\poll\UpdatePoll;
+use wcf\command\poll\VotePoll;
 use wcf\data\AbstractDatabaseObjectAction;
 use wcf\data\IGroupedUserListAction;
 use wcf\data\object\type\ObjectTypeCache;
-use wcf\data\poll\option\PollOptionEditor;
-use wcf\data\poll\option\PollOptionList;
 use wcf\system\exception\PermissionDeniedException;
 use wcf\system\exception\UserInputException;
+use wcf\system\l10n\L10nStorage;
 use wcf\system\poll\PollManager;
 use wcf\system\user\GroupedUserList;
 use wcf\system\WCF;
@@ -16,11 +19,12 @@
 /**
  * Executes poll-related actions.
  *
- * @author  Alexander Ebert
- * @copyright   2001-2019 WoltLab GmbH
+ * @author  Alexander Ebert, Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
  * @extends AbstractDatabaseObjectAction<Poll, PollEditor>
+ * @deprecated 6.3 Use `PollBuilder`, the commands and the RPC endpoints instead.
  */
 class PollAction extends AbstractDatabaseObjectAction implements IGroupedUserListAction
 {
@@ -43,120 +47,97 @@ class PollAction extends AbstractDatabaseObjectAction implements IGroupedUserLis
     #[\Override]
     public function create()
     {
-        if (!isset($this->parameters['data']['time'])) {
-            $this->parameters['data']['time'] = \TIME_NOW;
-        }
-
-        /** @var Poll $poll */
-        $poll = parent::create();
-
-        // create options
-        $sql = "INSERT INTO wcf1_poll_option
-                            (pollID, optionValue, showOrder)
-                VALUES      (?, ?, ?)";
-        $statement = WCF::getDB()->prepare($sql);
-
-        WCF::getDB()->beginTransaction();
-        foreach ($this->parameters['options'] as $showOrder => $option) {
-            $statement->execute([
-                $poll->pollID,
-                $option['optionValue'],
-                $showOrder,
-            ]);
-        }
-        WCF::getDB()->commitTransaction();
+        $builder = PollBuilder::forCreate()
+            ->setTime($this->parameters['data']['time'] ?? \TIME_NOW)
+            ->setOptions($this->getOptionsFromParameter());
+        $this->applyData($builder, $this->parameters['data']);
 
-        return $poll;
+        return (new CreatePoll($builder))();
     }
 
     #[\Override]
     public function update()
     {
-        parent::update();
-
-        // read current poll
-        $pollEditor = \reset($this->objects);
-
-        // get current options
-        $optionList = new PollOptionList();
-        $optionList->getConditionBuilder()->add("poll_option.pollID = ?", [$pollEditor->pollID]);
-        $optionList->sqlOrderBy = "poll_option.showOrder ASC";
-        $optionList->readObjects();
-        $options = $optionList->getObjects();
-
-        $newOptions = $updateOptions = [];
-        foreach ($this->parameters['options'] as $showOrder => $option) {
-            // check if editing an existing option
-            if ($option['optionID'] !== 0) {
-                // check if an update is required
-                if ($options[$option['optionID']]->showOrder !== $showOrder || $options[$option['optionID']]->optionValue !== $option['optionValue']) {
-                    $updateOptions[$option['optionID']] = [
-                        'optionValue' => $option['optionValue'],
-                        'showOrder' => $showOrder,
-                    ];
-                }
-
-                // remove option
-                unset($options[$option['optionID']]);
-            } else {
-                $newOptions[] = [
-                    'optionValue' => $option['optionValue'],
-                    'showOrder' => $showOrder,
-                ];
-            }
+        if ($this->objects === []) {
+            $this->readObjects();
         }
 
-        if ($newOptions !== [] || $updateOptions !== [] || $options !== []) {
-            WCF::getDB()->beginTransaction();
-
-            // check if new options should be created
-            if ($newOptions !== []) {
-                $sql = "INSERT INTO wcf1_poll_option
-                                    (pollID, optionValue, showOrder)
-                        VALUES      (?, ?, ?)";
-                $statement = WCF::getDB()->prepare($sql);
-                foreach ($newOptions as $option) {
-                    $statement->execute([
-                        $pollEditor->pollID,
-                        $option['optionValue'],
-                        $option['showOrder'],
-                    ]);
-                }
+        foreach ($this->getObjects() as $pollEditor) {
+            $builder = PollBuilder::forUpdate($pollEditor->getDecoratedObject());
+            $this->applyData($builder, $this->parameters['data'] ?? []);
+            if (isset($this->parameters['options'])) {
+                $builder->setOptions($this->getOptionsFromParameter());
             }
 
-            // check if existing options should be updated
-            if ($updateOptions !== []) {
-                $sql = "UPDATE  wcf1_poll_option
-                        SET     optionValue = ?,
-                                showOrder = ?
-                        WHERE   optionID = ?";
-                $statement = WCF::getDB()->prepare($sql);
-                foreach ($updateOptions as $optionID => $option) {
-                    $statement->execute([
-                        $option['optionValue'],
-                        $option['showOrder'],
-                        $optionID,
-                    ]);
-                }
-            }
+            (new UpdatePoll($builder))();
+        }
+    }
 
-            // check if options should be removed
-            if ($options !== []) {
-                $sql = "DELETE FROM wcf1_poll_option
-                        WHERE       optionID = ?";
-                $statement = WCF::getDB()->prepare($sql);
-                foreach ($options as $option) {
-                    $statement->execute([$option->optionID]);
-                }
-            }
+    #[\Override]
+    public function delete()
+    {
+        if ($this->objects === []) {
+            $this->readObjects();
+        }
 
-            // force recalculation of poll stats
-            $pollEditor->calculateVotes();
+        (new DeletePolls(\array_map(
+            static fn(PollEditor $editor) => $editor->getDecoratedObject(),
+            $this->getObjects()
+        )))();
+
+        return \count($this->objects);
+    }
 
-            WCF::getDB()->commitTransaction();
+    /**
+     * Maps the legacy `data` parameter to the given builder.
+     *
+     * @param array<string, mixed> $data
+     */
+    private function applyData(PollBuilder $builder, array $data): void
+    {
+        foreach ($data as $key => $value) {
+            match ($key) {
+                'objectTypeID' => $builder->setContainer(
+                    ObjectTypeCache::getInstance()->getObjectType($value)->objectType,
+                    $data['objectID'] ?? 0
+                ),
+                'objectID' => $builder->setObjectID($value),
+                'question' => $builder->setQuestion([L10nStorage::MONOLINGUAL => (string)$value]),
+                'time' => $builder->setTime($value),
+                'endTime' => $builder->setEndTime($value),
+                'isChangeable' => $builder->setIsChangeable((bool)$value),
+                'isPublic' => $builder->setIsPublic((bool)$value),
+                'sortByVotes' => $builder->setSortByVotes((bool)$value),
+                'resultsRequireVote' => $builder->setResultsRequireVote((bool)$value),
+                'resultsRequireEnd' => $builder->setResultsRequireEnd((bool)$value),
+                'minVotes' => $builder->setMinVotes($value),
+                'maxVotes' => $builder->setMaxVotes($value),
+                'votes' => $builder->setVotes($value),
+                default => $builder->setCustomProperty($key, $value),
+            };
         }
     }
 
+    /**
+     * Maps the legacy `options` parameter (`showOrder => [optionID, optionValue]`)
+     * to the options of the builder.
+     *
+     * @return list<array{optionID: int, optionValue: array<int, string>}>
+     */
+    private function getOptionsFromParameter(): array
+    {
+        $options = $this->parameters['options'] ?? [];
+        \ksort($options);
+
+        return \array_values(\array_map(
+            static fn(array $option) => [
+                'optionID' => (int)($option['optionID'] ?? 0),
+                'optionValue' => [L10nStorage::MONOLINGUAL => (string)$option['optionValue']],
+            ],
+            $options
+        ));
+    }
+
     public function validateVote(): void
     {
         $this->poll = $this->getSingleObject();
@@ -187,6 +168,10 @@ public function validateVote(): void
             throw new UserInputException('optionIDs', 'maxVotes');
         }
 
+        if (\count(\array_unique($this->parameters['optionIDs'])) < $this->poll->getRequiredVotes()) {
+            throw new UserInputException('optionIDs', 'minVotes');
+        }
+
         $optionIDs = [];
         foreach ($this->poll->getOptions() as $option) {
             $optionIDs[] = $option->optionID;
@@ -215,80 +200,11 @@ public function vote()
             $this->poll = $this->getSingleObject();
         }
 
-        // get previous vote
-        $sql = "SELECT  optionID
-                FROM    wcf1_poll_option_vote
-                WHERE   pollID = ?
-                    AND userID = ?";
-        $statement = WCF::getDB()->prepare($sql);
-        $statement->execute([
-            $this->poll->pollID,
-            WCF::getUser()->userID,
-        ]);
-        $optionIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
-        $alreadyVoted = $optionIDs !== [];
-
-        // calculate the difference
-        foreach ($this->parameters['optionIDs'] as $index => $optionID) {
-            $optionsIndex = \array_search($optionID, $optionIDs);
-            if ($optionsIndex !== false) {
-                // ignore this option
-                unset($this->parameters['optionIDs'][$index]);
-                unset($optionIDs[$optionsIndex]);
-            }
-        }
-
-        // insert new vote options
-        if (!empty($this->parameters['optionIDs'])) {
-            $sql = "INSERT INTO wcf1_poll_option_vote
-                                (pollID, optionID, userID)
-                    VALUES      (?, ?, ?)";
-            $statement = WCF::getDB()->prepare($sql);
-            foreach ($this->parameters['optionIDs'] as $optionID) {
-                $statement->execute([
-                    $this->poll->pollID,
-                    $optionID,
-                    WCF::getUser()->userID,
-                ]);
-            }
-
-            // increase votes per option
-            $sql = "UPDATE  wcf1_poll_option
-                    SET     votes = votes + 1
-                    WHERE   optionID = ?";
-            $statement = WCF::getDB()->prepare($sql);
-            foreach ($this->parameters['optionIDs'] as $optionID) {
-                $statement->execute([$optionID]);
-            }
-        }
-
-        // remove previous options
-        if ($optionIDs !== []) {
-            $sql = "DELETE FROM wcf1_poll_option_vote
-                    WHERE       optionID = ?
-                            AND userID = ?";
-            $statement = WCF::getDB()->prepare($sql);
-            foreach ($optionIDs as $optionID) {
-                $statement->execute([
-                    $optionID,
-                    WCF::getUser()->userID,
-                ]);
-            }
-
-            // decrease votes per option
-            $sql = "UPDATE  wcf1_poll_option
-                    SET     votes = votes - 1
-                    WHERE   optionID = ?";
-            $statement = WCF::getDB()->prepare($sql);
-            foreach ($optionIDs as $optionID) {
-                $statement->execute([$optionID]);
-            }
-        }
-
-        // increase poll votes
-        if (!$alreadyVoted) {
-            $this->poll->increaseVotes();
-        }
+        (new VotePoll(
+            $this->poll->getDecoratedObject(),
+            WCF::getUser(),
+            \array_values($this->parameters['optionIDs'])
+        ))();
 
         // update poll object
         $polls = PollManager::getInstance()->getPolls([$this->poll->pollID]);
@@ -405,15 +321,9 @@ private function loadRelatedObject(): void
     public function getGroupedUserList()
     {
         // get options
-        $sql = "SELECT      optionID, optionValue
-                FROM        wcf1_poll_option
-                WHERE       pollID = ?
-                ORDER BY    " . ($this->poll->sortByVotes !== 0 ? "votes DESC" : "showOrder ASC");
-        $statement = WCF::getDB()->prepare($sql);
-        $statement->execute([$this->poll->pollID]);
         $options = [];
-        while ($row = $statement->fetchArray()) {
-            $options[$row['optionID']] = new GroupedUserList($row['optionValue'], 'wcf.poll.noVotes');
+        foreach ($this->poll->getOptions(true) as $option) {
+            $options[$option->optionID] = new GroupedUserList($option->getOptionValue(), 'wcf.poll.noVotes');
         }
 
         // get votes
@@ -451,76 +361,63 @@ public function copy()
             'com.woltlab.wcf.poll',
             $this->parameters['sourceObjectType']
         );
-        $targetObjectType = ObjectTypeCache::getInstance()->getObjectTypeByName(
-            'com.woltlab.wcf.poll',
-            $this->parameters['targetObjectType']
-        );
-
-        //
-        // step 1) get data
-        //
 
-        // get poll
-        $sql = "SELECT  *
-                FROM    wcf1_poll
-                WHERE   objectTypeID = ?
-                    AND objectID = ?";
-        $statement = WCF::getDB()->prepare($sql);
-        $statement->execute([
-            $sourceObjectType->objectTypeID,
-            $this->parameters['sourceObjectID'],
-        ]);
-        $row = $statement->fetchArray();
+        $pollList = new PollList();
+        $pollList->getConditionBuilder()->add("poll.objectTypeID = ?", [$sourceObjectType->objectTypeID]);
+        $pollList->getConditionBuilder()->add("poll.objectID = ?", [$this->parameters['sourceObjectID']]);
+        $pollList->sqlLimit = 1;
+        $pollList->readObjects();
+        $poll = $pollList->getSingleObject();
 
-        if ($row === false) {
+        if ($poll === null) {
             return [
                 'pollID' => null,
             ];
         }
 
-        // get options
-        $pollOptionList = new PollOptionList();
-        $pollOptionList->getConditionBuilder()->add("poll_option.pollID = ?", [$row['pollID']]);
-        $pollOptionList->readObjects();
-
-        //
-        // step 2) copy
-        //
-
-        // create poll
-        $pollData = $row;
-        $pollData['objectTypeID'] = $targetObjectType->objectTypeID;
-        $pollData['objectID'] = $this->parameters['targetObjectID'];
-        unset($pollData['pollID']);
-
-        $newPoll = PollEditor::create($pollData);
-
-        // create options
-        $newOptionIDs = [];
-        foreach ($pollOptionList as $pollOption) {
-            $newOption = PollOptionEditor::create([
-                'pollID' => $newPoll->pollID,
-                'optionValue' => $pollOption->optionValue,
-                'votes' => $pollOption->votes,
-                'showOrder' => $pollOption->showOrder,
-            ]);
-
-            $newOptionIDs[$pollOption->optionID] = $newOption->optionID;
-        }
+        $sourceOptions = \array_values($poll->getOptions());
+
+        $builder = PollBuilder::forCreate()
+            ->setContainer($this->parameters['targetObjectType'], (int)$this->parameters['targetObjectID'])
+            ->setMultilingual($poll->isMultilingual === 1)
+            ->setQuestion($poll->getL10nValues('question'))
+            ->setOptions(\array_map(
+                static fn($option) => ['optionValue' => $option->getL10nValues('optionValue')],
+                $sourceOptions
+            ))
+            ->setTime($poll->time)
+            ->setEndTime($poll->endTime)
+            ->setIsChangeable($poll->isChangeable === 1)
+            ->setIsPublic($poll->isPublic === 1)
+            ->setSortByVotes($poll->sortByVotes === 1)
+            ->setResultsRequireVote($poll->resultsRequireVote === 1)
+            ->setResultsRequireEnd($poll->resultsRequireEnd === 1)
+            ->setMinVotes($poll->minVotes)
+            ->setMaxVotes($poll->maxVotes);
+        $newPoll = (new CreatePoll($builder))();
+
+        // The new options are created in the order of the source options.
+        $newOptions = \array_values($newPoll->getOptions());
+
+        $sql = "INSERT INTO wcf1_poll_option_vote
+                            (pollID, optionID, userID)
+                SELECT      ?, ?, userID
+                FROM        wcf1_poll_option_vote
+                WHERE       optionID = ?";
+        $statement = WCF::getDB()->prepare($sql);
 
-        // copy votes
         WCF::getDB()->beginTransaction();
-        foreach ($newOptionIDs as $oldOptionID => $newOptionID) {
-            $sql = "INSERT INTO wcf1_poll_option_vote
-                                (pollID, optionID, userID)
-                    SELECT      " . $newPoll->pollID . ", " . $newOptionID . ", userID
-                    FROM        wcf1_poll_option_vote
-                    WHERE       optionID = ?";
-            $statement = WCF::getDB()->prepare($sql);
-            $statement->execute([$oldOptionID]);
+        foreach ($sourceOptions as $index => $sourceOption) {
+            $statement->execute([
+                $newPoll->pollID,
+                $newOptions[$index]->optionID,
+                $sourceOption->optionID,
+            ]);
         }
         WCF::getDB()->commitTransaction();
 
+        PollBuilder::forUpdate($newPoll)->recalculateVotes()->update();
+
         return [
             'pollID' => $newPoll->pollID,
         ];
diff --git a/wcfsetup/install/files/lib/data/poll/PollBuilder.class.php b/wcfsetup/install/files/lib/data/poll/PollBuilder.class.php
new file mode 100644
index 00000000000..23a7e23aec1
--- /dev/null
+++ b/wcfsetup/install/files/lib/data/poll/PollBuilder.class.php
@@ -0,0 +1,404 @@
+<?php
+
+namespace wcf\data\poll;
+
+use wcf\data\DatabaseObjectBuilder;
+use wcf\data\object\type\ObjectTypeCache;
+use wcf\data\poll\option\PollOption;
+use wcf\data\poll\option\PollOptionBuilder;
+use wcf\data\poll\option\PollOptionList;
+use wcf\system\acl\ACLHandler;
+use wcf\system\l10n\L10nStorage;
+use wcf\system\language\LanguageFactory;
+use wcf\system\WCF;
+
+/**
+ * Builder for creating, updating and deleting polls including their options.
+ *
+ * The localized question and the localized option values are stored in the
+ * `wcf1_poll_l10n` and `wcf1_poll_option_l10n` tables (see `L10nStorage`). The
+ * values are normalized to the mode of the poll: a monolingual poll stores a
+ * single value, a multilingual poll stores a value per language.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @extends DatabaseObjectBuilder<Poll>
+ *
+ * @phpstan-import-type L10nValue from L10nStorage
+ * @phpstan-type PollOptionData array{optionID?: int, optionValue: L10nValue}
+ */
+final class PollBuilder extends DatabaseObjectBuilder
+{
+    /**
+     * @var L10nValue
+     */
+    private array $question;
+
+    /**
+     * @var list<PollOptionData>
+     */
+    private array $options;
+
+    private bool $recalculateVotes = false;
+
+    /**
+     * Assigns the poll to the poll container of the given object type, see the
+     * object type definition `com.woltlab.wcf.poll`.
+     *
+     * @deprecated 6.3 Standalone polls are not bound to a content object.
+     */
+    public function setContainer(string $objectType, int $objectID): static
+    {
+        $objectTypeObj = ObjectTypeCache::getInstance()->getObjectTypeByName('com.woltlab.wcf.poll', $objectType);
+        if ($objectTypeObj === null) {
+            throw new \InvalidArgumentException("Unknown poll object type '{$objectType}'.");
+        }
+
+        $this->properties['objectTypeID'] = $objectTypeObj->objectTypeID;
+        $this->properties['objectID'] = $objectID;
+
+        return $this;
+    }
+
+    /**
+     * Sets the id of the poll container object, the object type must not change.
+     *
+     * @deprecated 6.3 Standalone polls are not bound to a content object.
+     */
+    public function setObjectID(int $objectID): static
+    {
+        $this->properties['objectID'] = $objectID;
+
+        return $this;
+    }
+
+    /**
+     * Sets the user who created the standalone poll.
+     */
+    public function setUser(?int $userID, string $username): static
+    {
+        $this->properties['userID'] = $userID;
+        $this->properties['username'] = $username;
+
+        return $this;
+    }
+
+    /**
+     * Sets whether the question and the options are stored per language.
+     */
+    public function setMultilingual(bool $isMultilingual): static
+    {
+        $this->properties['isMultilingual'] = (int)$isMultilingual;
+
+        return $this;
+    }
+
+    /**
+     * @param L10nValue $question
+     */
+    public function setQuestion(array $question): static
+    {
+        $this->question = $question;
+
+        return $this;
+    }
+
+    /**
+     * Replaces the options of the poll. Options are matched by their `optionID`
+     * on update, options without an id are created, existing options that are
+     * missing are deleted. The order of the list determines the show order.
+     *
+     * @param list<PollOptionData> $options
+     */
+    public function setOptions(array $options): static
+    {
+        $this->options = $options;
+
+        return $this;
+    }
+
+    public function setTime(int $time): static
+    {
+        $this->properties['time'] = $time;
+
+        return $this;
+    }
+
+    /**
+     * Sets the time at which the poll closes, `0` for polls without an end.
+     */
+    public function setEndTime(int $endTime): static
+    {
+        $this->properties['endTime'] = $endTime;
+
+        return $this;
+    }
+
+    public function setIsChangeable(bool $isChangeable): static
+    {
+        $this->properties['isChangeable'] = (int)$isChangeable;
+
+        return $this;
+    }
+
+    public function setIsPublic(bool $isPublic): static
+    {
+        $this->properties['isPublic'] = (int)$isPublic;
+
+        return $this;
+    }
+
+    public function setSortByVotes(bool $sortByVotes): static
+    {
+        $this->properties['sortByVotes'] = (int)$sortByVotes;
+
+        return $this;
+    }
+
+    public function setResultsRequireVote(bool $resultsRequireVote): static
+    {
+        $this->properties['resultsRequireVote'] = (int)$resultsRequireVote;
+
+        return $this;
+    }
+
+    /**
+     * Hides the results from everyone until the poll has ended, this requires
+     * an end time.
+     */
+    public function setResultsRequireEnd(bool $resultsRequireEnd): static
+    {
+        $this->properties['resultsRequireEnd'] = (int)$resultsRequireEnd;
+
+        return $this;
+    }
+
+    public function setMinVotes(int $minVotes): static
+    {
+        $this->properties['minVotes'] = \max($minVotes, 1);
+
+        return $this;
+    }
+
+    public function setMaxVotes(int $maxVotes): static
+    {
+        $this->properties['maxVotes'] = \max($maxVotes, 1);
+
+        return $this;
+    }
+
+    /**
+     * Sets the number of participants, intended for imported polls.
+     */
+    public function setVotes(int $votes): static
+    {
+        $this->properties['votes'] = $votes;
+
+        return $this;
+    }
+
+    /**
+     * Recalculates the number of votes of the poll and its options from the
+     * stored votes.
+     */
+    public function recalculateVotes(): static
+    {
+        $this->recalculateVotes = true;
+
+        return $this;
+    }
+
+    #[\Override]
+    protected function getRequiredProperties(): array
+    {
+        return ['time'];
+    }
+
+    #[\Override]
+    protected function afterValidateCreate(): void
+    {
+        if (!isset($this->question)) {
+            throw new \BadMethodCallException("Missing value for the question.");
+        }
+    }
+
+    #[\Override]
+    protected function afterCreate(): void
+    {
+        $this->saveQuestion($this->getObject());
+        $this->saveOptions($this->getObject());
+
+        if ($this->recalculateVotes) {
+            self::calculateVotes($this->getObject()->pollID);
+        }
+    }
+
+    #[\Override]
+    protected function afterUpdate(): void
+    {
+        $object = $this->getObject();
+
+        $modeChanged = \array_key_exists('isMultilingual', $this->properties)
+            && $this->getExistingObject()->isMultilingual !== $object->isMultilingual;
+
+        if (isset($this->question) || $modeChanged) {
+            $this->saveQuestion($object);
+        }
+
+        if (isset($this->options) || $modeChanged) {
+            $this->saveOptions($object);
+        }
+
+        if ($this->recalculateVotes || isset($this->options)) {
+            self::calculateVotes($object->pollID);
+        }
+    }
+
+    #[\Override]
+    protected static function beforeDeleteAll(array $objectIDs): void
+    {
+        ACLHandler::getInstance()->removeValues(
+            ACLHandler::getInstance()->getObjectTypeID('com.woltlab.wcf.poll'),
+            $objectIDs
+        );
+    }
+
+    private function saveQuestion(Poll $poll): void
+    {
+        $definition = Poll::getL10nDefinition();
+
+        $question = $this->question ?? null;
+        if ($question === null && $this->isUpdate()) {
+            $question = $this->getObject()->getL10nValues('question');
+        }
+
+        (new L10nStorage($definition))->setValues($poll->pollID, [
+            'question' => \array_map(
+                static fn(string $value) => $definition->truncateValue('question', $value),
+                self::normalizeL10nValue($question ?? [], $poll->isMultilingual === 1)
+            ),
+        ]);
+    }
+
+    private function saveOptions(Poll $poll): void
+    {
+        $existingOptions = [];
+        if ($this->isUpdate()) {
+            $optionList = new PollOptionList();
+            $optionList->getConditionBuilder()->add("poll_option.pollID = ?", [$poll->pollID]);
+            $optionList->readObjects();
+            $existingOptions = $optionList->getObjects();
+        }
+
+        $options = $this->options ?? null;
+        if ($options === null) {
+            // Only the mode of the poll has changed, the values must be normalized.
+            $options = \array_map(
+                static fn(PollOption $option) => [
+                    'optionID' => $option->optionID,
+                    'optionValue' => $option->getL10nValues('optionValue'),
+                ],
+                \array_values($existingOptions)
+            );
+            \usort(
+                $options,
+                static fn(array $a, array $b) => $existingOptions[$a['optionID']]->showOrder <=> $existingOptions[$b['optionID']]->showOrder
+            );
+        }
+
+        WCF::getDB()->beginTransaction();
+        $committed = false;
+        try {
+            foreach ($options as $showOrder => $option) {
+                $optionValue = self::normalizeL10nValue($option['optionValue'], $poll->isMultilingual === 1);
+                $optionID = $option['optionID'] ?? 0;
+
+                if (isset($existingOptions[$optionID])) {
+                    PollOptionBuilder::forUpdate($existingOptions[$optionID])
+                        ->setOptionValue($optionValue)
+                        ->setShowOrder($showOrder)
+                        ->update();
+
+                    unset($existingOptions[$optionID]);
+                } else {
+                    PollOptionBuilder::forCreate()
+                        ->setPollID($poll->pollID)
+                        ->setOptionValue($optionValue)
+                        ->setShowOrder($showOrder)
+                        ->create();
+                }
+            }
+
+            if ($existingOptions !== []) {
+                PollOptionBuilder::deleteAll(\array_keys($existingOptions));
+            }
+
+            WCF::getDB()->commitTransaction();
+            $committed = true;
+        } finally {
+            if (!$committed) {
+                WCF::getDB()->rollBackTransaction();
+            }
+        }
+    }
+
+    /**
+     * Converts the given values to match the mode of the poll: a monolingual
+     * poll stores a single value, a multilingual poll stores a value per
+     * language.
+     *
+     * @param L10nValue $values
+     * @return L10nValue
+     */
+    private static function normalizeL10nValue(array $values, bool $isMultilingual): array
+    {
+        if (!$isMultilingual) {
+            if (isset($values[L10nStorage::MONOLINGUAL])) {
+                return [L10nStorage::MONOLINGUAL => $values[L10nStorage::MONOLINGUAL]];
+            }
+
+            return [L10nStorage::MONOLINGUAL => L10nStorage::resolveValue($values)];
+        }
+
+        if ($values !== [] && !isset($values[L10nStorage::MONOLINGUAL])) {
+            return $values;
+        }
+
+        $value = $values[L10nStorage::MONOLINGUAL] ?? '';
+        $normalizedValues = [];
+        foreach (LanguageFactory::getInstance()->getLanguages() as $language) {
+            $normalizedValues[$language->languageID] = $value;
+        }
+
+        return $normalizedValues;
+    }
+
+    /**
+     * Recalculates the number of votes of the given poll and its options.
+     */
+    private static function calculateVotes(int $pollID): void
+    {
+        $sql = "UPDATE  wcf1_poll_option poll_option
+                SET     poll_option.votes = (
+                            SELECT  COUNT(*)
+                            FROM    wcf1_poll_option_vote
+                            WHERE   optionID = poll_option.optionID
+                        )
+                WHERE   poll_option.pollID = ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([$pollID]);
+
+        $sql = "UPDATE  wcf1_poll poll
+                SET     poll.votes = (
+                            SELECT  COUNT(DISTINCT userID)
+                            FROM    wcf1_poll_option_vote
+                            WHERE   pollID = poll.pollID
+                        )
+                WHERE   poll.pollID = ?";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute([$pollID]);
+    }
+}
diff --git a/wcfsetup/install/files/lib/data/poll/PollCollection.class.php b/wcfsetup/install/files/lib/data/poll/PollCollection.class.php
new file mode 100644
index 00000000000..d2c92442391
--- /dev/null
+++ b/wcfsetup/install/files/lib/data/poll/PollCollection.class.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace wcf\data\poll;
+
+use wcf\data\DatabaseObjectCollection;
+use wcf\data\poll\option\PollOption;
+use wcf\data\poll\option\PollOptionList;
+use wcf\data\TCollectionL10n;
+use wcf\data\TCollectionUserProfiles;
+use wcf\system\acl\ACLHandler;
+use wcf\system\l10n\L10nDefinition;
+use wcf\system\WCF;
+
+/**
+ * Represents a collection of polls.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @extends DatabaseObjectCollection<Poll>
+ * @phpstan-type AclPermissions array{group: array<int, array<string, int>>, user: array<int, array<string, int>>}
+ */
+class PollCollection extends DatabaseObjectCollection
+{
+    use TCollectionL10n;
+    use TCollectionUserProfiles;
+
+    /**
+     * @var array<int, array<int, PollOption>>
+     */
+    private array $options;
+
+    /**
+     * @var array<int, AclPermissions>
+     */
+    private array $aclPermissions;
+
+    /**
+     * Returns the options of the given poll including the vote state of the
+     * active user (`voted`).
+     *
+     * @return array<int, PollOption>
+     */
+    public function getOptions(Poll $poll): array
+    {
+        $this->loadOptions();
+
+        return $this->options[$poll->pollID] ?? [];
+    }
+
+    private function loadOptions(): void
+    {
+        if (isset($this->options)) {
+            return;
+        }
+
+        $this->options = [];
+
+        $optionList = new PollOptionList();
+        $optionList->getConditionBuilder()->add("poll_option.pollID IN (?)", [$this->getObjectIDs()]);
+        if (WCF::getUser()->isGuest()) {
+            $optionList->sqlSelects = "'0' AS voted";
+        } else {
+            $optionList->sqlSelects = "CASE WHEN poll_option_vote.optionID IS NULL THEN '0' ELSE '1' END AS voted";
+            $optionList->sqlJoins = "
+                LEFT JOIN   wcf1_poll_option_vote poll_option_vote
+                ON          poll_option_vote.optionID = poll_option.optionID
+                        AND poll_option_vote.userID = " . WCF::getUser()->userID;
+        }
+        $optionList->sqlOrderBy = "poll_option.showOrder ASC";
+        $optionList->readObjects();
+
+        foreach ($optionList as $option) {
+            $this->options[$option->pollID][$option->optionID] = $option;
+        }
+    }
+
+    /**
+     * Returns the acl values of the given standalone poll by option name for
+     * groups and users.
+     *
+     * @return AclPermissions
+     */
+    public function getAclPermissions(Poll $poll): array
+    {
+        $this->loadAclPermissions();
+
+        return $this->aclPermissions[$poll->pollID] ?? ['group' => [], 'user' => []];
+    }
+
+    private function loadAclPermissions(): void
+    {
+        if (isset($this->aclPermissions)) {
+            return;
+        }
+
+        $this->aclPermissions = [];
+
+        $pollIDs = \array_keys(\array_filter(
+            $this->getObjects(),
+            static fn(Poll $poll) => $poll->isStandalone()
+        ));
+        if ($pollIDs === []) {
+            return;
+        }
+
+        $data = ACLHandler::getInstance()->getPermissions(
+            ACLHandler::getInstance()->getObjectTypeID('com.woltlab.wcf.poll'),
+            $pollIDs
+        );
+        $options = $data['options']->getObjects();
+
+        foreach (['group', 'user'] as $type) {
+            foreach ($data[$type] as $pollID => $values) {
+                foreach ($values as $typeID => $optionValues) {
+                    foreach ($optionValues as $optionID => $optionValue) {
+                        $this->aclPermissions[$pollID][$type][$typeID][$options[$optionID]->optionName] = (int)$optionValue;
+                    }
+                }
+            }
+        }
+    }
+
+    #[\Override]
+    protected function getL10nDefinition(): L10nDefinition
+    {
+        return Poll::getL10nDefinition();
+    }
+}
diff --git a/wcfsetup/install/files/lib/data/poll/PollEditor.class.php b/wcfsetup/install/files/lib/data/poll/PollEditor.class.php
index 0efe10deb3f..69503acf28a 100644
--- a/wcfsetup/install/files/lib/data/poll/PollEditor.class.php
+++ b/wcfsetup/install/files/lib/data/poll/PollEditor.class.php
@@ -14,6 +14,7 @@
  *
  * @mixin       Poll
  * @extends DatabaseObjectEditor<Poll>
+ * @deprecated 6.3 Use `PollBuilder` instead.
  */
 class PollEditor extends DatabaseObjectEditor
 {
diff --git a/wcfsetup/install/files/lib/data/poll/option/PollOption.class.php b/wcfsetup/install/files/lib/data/poll/option/PollOption.class.php
index bc6cb589e9f..a0bf772fdfe 100644
--- a/wcfsetup/install/files/lib/data/poll/option/PollOption.class.php
+++ b/wcfsetup/install/files/lib/data/poll/option/PollOption.class.php
@@ -2,24 +2,37 @@
 
 namespace wcf\data\poll\option;
 
-use wcf\data\DatabaseObject;
+use wcf\data\CollectionDatabaseObject;
 use wcf\data\poll\Poll;
+use wcf\system\l10n\L10nDefinition;
+use wcf\system\l10n\L10nStorage;
 
 /**
  * Represents a poll option.
  *
- * @author  Alexander Ebert
- * @copyright   2001-2019 WoltLab GmbH
+ * The localized value is stored in the `wcf1_poll_option_l10n` table.
+ *
+ * @author  Alexander Ebert, Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
  * @property-read   int     $optionID       unique id of the poll option
  * @property-read   int     $pollID         id of the poll the option belongs to
- * @property-read   string  $optionValue    text of the poll option
+ * @property-read   string  $optionValue    localized text of the poll option
  * @property-read   int     $votes          number of votes for the poll option
  * @property-read   int     $showOrder      position of the poll option in relation to the other options of the poll
+ *
+ * @extends CollectionDatabaseObject<PollOptionCollection>
+ *
+ * @phpstan-import-type L10nValue from L10nStorage
  */
-class PollOption extends DatabaseObject
+class PollOption extends CollectionDatabaseObject implements \Stringable
 {
+    /**
+     * names of the localized columns that are exposed as properties
+     */
+    private const L10N_COLUMNS = ['optionValue'];
+
     /**
      * true, if option was selected by current user
      * @var bool
@@ -40,4 +53,68 @@ public function getRelativeVotes(Poll $poll)
 
         return 0;
     }
+
+    /**
+     * @since 6.3
+     */
+    public function getOptionValue(): string
+    {
+        return $this->getCollection()->getResolvedL10nValue($this, 'optionValue');
+    }
+
+    /**
+     * Returns the localized values of the given column as a
+     * `languageID => value` map (see `L10nStorage`).
+     *
+     * @return L10nValue
+     * @since 6.3
+     */
+    public function getL10nValues(string $columnName): array
+    {
+        if (!\in_array($columnName, self::L10N_COLUMNS, true)) {
+            throw new \InvalidArgumentException("Invalid column name given.");
+        }
+
+        return $this->getCollection()->getL10nValues($this, $columnName);
+    }
+
+    #[\Override]
+    public function __get(string $name)
+    {
+        if (\in_array($name, self::L10N_COLUMNS, true)) {
+            return $this->getOptionValue();
+        }
+
+        return parent::__get($name);
+    }
+
+    #[\Override]
+    public function __isset(string $name)
+    {
+        if (\in_array($name, self::L10N_COLUMNS, true)) {
+            return true;
+        }
+
+        return parent::__isset($name);
+    }
+
+    #[\Override]
+    public function __toString(): string
+    {
+        return $this->getOptionValue();
+    }
+
+    /**
+     * @since 6.3
+     */
+    public static function getL10nDefinition(): L10nDefinition
+    {
+        return new L10nDefinition(
+            'wcf1_poll_option',
+            'wcf1_poll_option_l10n',
+            'optionID',
+            ['optionValue'],
+            maximumLengths: ['optionValue' => 255],
+        );
+    }
 }
diff --git a/wcfsetup/install/files/lib/data/poll/option/PollOptionAction.class.php b/wcfsetup/install/files/lib/data/poll/option/PollOptionAction.class.php
index f595386d0cc..fcf0c17b6f5 100644
--- a/wcfsetup/install/files/lib/data/poll/option/PollOptionAction.class.php
+++ b/wcfsetup/install/files/lib/data/poll/option/PollOptionAction.class.php
@@ -12,6 +12,7 @@
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  *
  * @extends AbstractDatabaseObjectAction<PollOption, PollOptionEditor>
+ * @deprecated 6.3 Use `PollBuilder` instead.
  */
 class PollOptionAction extends AbstractDatabaseObjectAction
 {
diff --git a/wcfsetup/install/files/lib/data/poll/option/PollOptionBuilder.class.php b/wcfsetup/install/files/lib/data/poll/option/PollOptionBuilder.class.php
new file mode 100644
index 00000000000..6861e169960
--- /dev/null
+++ b/wcfsetup/install/files/lib/data/poll/option/PollOptionBuilder.class.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace wcf\data\poll\option;
+
+use wcf\data\DatabaseObjectBuilder;
+use wcf\system\l10n\L10nStorage;
+
+/**
+ * Builder for creating, updating and deleting poll options. Poll options are
+ * usually managed through the `PollBuilder`.
+ *
+ * The localized value is stored in the `wcf1_poll_option_l10n` table (see
+ * `L10nStorage`).
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @extends DatabaseObjectBuilder<PollOption>
+ *
+ * @phpstan-import-type L10nValue from L10nStorage
+ */
+final class PollOptionBuilder extends DatabaseObjectBuilder
+{
+    /**
+     * @var L10nValue
+     */
+    private array $optionValue;
+
+    public function setPollID(int $pollID): static
+    {
+        $this->properties['pollID'] = $pollID;
+
+        return $this;
+    }
+
+    /**
+     * @param L10nValue $optionValue
+     */
+    public function setOptionValue(array $optionValue): static
+    {
+        $this->optionValue = $optionValue;
+
+        return $this;
+    }
+
+    public function setShowOrder(int $showOrder): static
+    {
+        $this->properties['showOrder'] = $showOrder;
+
+        return $this;
+    }
+
+    public function setVotes(int $votes): static
+    {
+        $this->properties['votes'] = $votes;
+
+        return $this;
+    }
+
+    #[\Override]
+    protected function getRequiredProperties(): array
+    {
+        return ['pollID'];
+    }
+
+    #[\Override]
+    protected function afterValidateCreate(): void
+    {
+        if (!isset($this->optionValue)) {
+            throw new \BadMethodCallException("Missing value for the option value.");
+        }
+    }
+
+    #[\Override]
+    protected function afterCreate(): void
+    {
+        $this->saveL10nValues($this->getObject());
+    }
+
+    #[\Override]
+    protected function afterUpdate(): void
+    {
+        if (isset($this->optionValue)) {
+            $this->saveL10nValues($this->getObject());
+        }
+    }
+
+    private function saveL10nValues(PollOption $option): void
+    {
+        $definition = PollOption::getL10nDefinition();
+
+        (new L10nStorage($definition))->setValues($option->optionID, [
+            'optionValue' => \array_map(
+                static fn(string $value) => $definition->truncateValue('optionValue', $value),
+                $this->optionValue
+            ),
+        ]);
+    }
+}
diff --git a/wcfsetup/install/files/lib/data/poll/option/PollOptionCollection.class.php b/wcfsetup/install/files/lib/data/poll/option/PollOptionCollection.class.php
new file mode 100644
index 00000000000..9c386a795f6
--- /dev/null
+++ b/wcfsetup/install/files/lib/data/poll/option/PollOptionCollection.class.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace wcf\data\poll\option;
+
+use wcf\data\DatabaseObjectCollection;
+use wcf\data\TCollectionL10n;
+use wcf\system\l10n\L10nDefinition;
+
+/**
+ * Represents a collection of poll options.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @extends DatabaseObjectCollection<PollOption>
+ */
+class PollOptionCollection extends DatabaseObjectCollection
+{
+    use TCollectionL10n;
+
+    #[\Override]
+    protected function getL10nDefinition(): L10nDefinition
+    {
+        return PollOption::getL10nDefinition();
+    }
+}
diff --git a/wcfsetup/install/files/lib/data/poll/option/PollOptionEditor.class.php b/wcfsetup/install/files/lib/data/poll/option/PollOptionEditor.class.php
index 0b72882c679..26a89f03033 100644
--- a/wcfsetup/install/files/lib/data/poll/option/PollOptionEditor.class.php
+++ b/wcfsetup/install/files/lib/data/poll/option/PollOptionEditor.class.php
@@ -13,6 +13,7 @@
  *
  * @mixin       PollOption
  * @extends DatabaseObjectEditor<PollOption>
+ * @deprecated 6.3 Use `PollBuilder` instead.
  */
 class PollOptionEditor extends DatabaseObjectEditor
 {
diff --git a/wcfsetup/install/files/lib/event/interaction/user/PollInteractionCollecting.class.php b/wcfsetup/install/files/lib/event/interaction/user/PollInteractionCollecting.class.php
new file mode 100644
index 00000000000..f0f1d4b8b75
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/interaction/user/PollInteractionCollecting.class.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace wcf\event\interaction\user;
+
+use wcf\event\IPsr14Event;
+use wcf\system\interaction\user\PollInteractions;
+
+/**
+ * Indicates that the provider for standalone polls is collecting interactions.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class PollInteractionCollecting implements IPsr14Event
+{
+    public function __construct(public readonly PollInteractions $provider) {}
+}
diff --git a/wcfsetup/install/files/lib/event/listView/user/PollManagerListViewInitialized.class.php b/wcfsetup/install/files/lib/event/listView/user/PollManagerListViewInitialized.class.php
new file mode 100644
index 00000000000..739a623416a
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/listView/user/PollManagerListViewInitialized.class.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace wcf\event\listView\user;
+
+use wcf\event\IPsr14Event;
+use wcf\system\listView\user\PollManagerListView;
+
+/**
+ * Indicates that the list view of the poll manager has been initialized.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class PollManagerListViewInitialized implements IPsr14Event
+{
+    public function __construct(public readonly PollManagerListView $listView) {}
+}
diff --git a/wcfsetup/install/files/lib/event/poll/PollCreated.class.php b/wcfsetup/install/files/lib/event/poll/PollCreated.class.php
new file mode 100644
index 00000000000..b36b0bacb63
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/poll/PollCreated.class.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace wcf\event\poll;
+
+use wcf\data\poll\Poll;
+use wcf\data\poll\PollBuilder;
+use wcf\event\IPsr14Event;
+
+/**
+ * Indicates that a poll has been created.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class PollCreated implements IPsr14Event
+{
+    public function __construct(
+        public readonly Poll $poll,
+        public readonly PollBuilder $builder,
+    ) {}
+}
diff --git a/wcfsetup/install/files/lib/event/poll/PollUpdated.class.php b/wcfsetup/install/files/lib/event/poll/PollUpdated.class.php
new file mode 100644
index 00000000000..0c1e518304b
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/poll/PollUpdated.class.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace wcf\event\poll;
+
+use wcf\data\poll\Poll;
+use wcf\data\poll\PollBuilder;
+use wcf\event\IPsr14Event;
+
+/**
+ * Indicates that a poll has been updated.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class PollUpdated implements IPsr14Event
+{
+    public function __construct(
+        public readonly Poll $poll,
+        public readonly PollBuilder $builder,
+    ) {}
+}
diff --git a/wcfsetup/install/files/lib/event/poll/PollVoted.class.php b/wcfsetup/install/files/lib/event/poll/PollVoted.class.php
new file mode 100644
index 00000000000..9e7eb5346a6
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/poll/PollVoted.class.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace wcf\event\poll;
+
+use wcf\data\poll\Poll;
+use wcf\data\user\User;
+use wcf\event\IPsr14Event;
+
+/**
+ * Indicates that a user has voted in a poll or changed their vote.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class PollVoted implements IPsr14Event
+{
+    /**
+     * @param list<int> $optionIDs ids of the selected options
+     */
+    public function __construct(
+        public readonly Poll $poll,
+        public readonly User $user,
+        public readonly array $optionIDs,
+    ) {}
+}
diff --git a/wcfsetup/install/files/lib/event/poll/PollsDeleted.class.php b/wcfsetup/install/files/lib/event/poll/PollsDeleted.class.php
new file mode 100644
index 00000000000..32d7d8480e9
--- /dev/null
+++ b/wcfsetup/install/files/lib/event/poll/PollsDeleted.class.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace wcf\event\poll;
+
+use wcf\data\poll\Poll;
+use wcf\event\IPsr14Event;
+
+/**
+ * Indicates that polls have been deleted.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class PollsDeleted implements IPsr14Event
+{
+    /**
+     * @param Poll[] $polls
+     */
+    public function __construct(
+        public readonly array $polls,
+    ) {}
+}
diff --git a/wcfsetup/install/files/lib/system/acl/ACLHandler.class.php b/wcfsetup/install/files/lib/system/acl/ACLHandler.class.php
index 534fc4cc967..972cbbe014b 100644
--- a/wcfsetup/install/files/lib/system/acl/ACLHandler.class.php
+++ b/wcfsetup/install/files/lib/system/acl/ACLHandler.class.php
@@ -175,10 +175,19 @@ public function readValues(int $objectTypeID, ?array $valuesSource = null)
             $options = ACLOption::getOptions($objectTypeID)->getObjects();
 
             foreach (['group', 'user'] as $type) {
-                if (isset($valuesSource[$type])) {
+                if (isset($valuesSource[$type]) && \is_string($valuesSource[$type])) {
                     $this->__readValues[$objectTypeID][$type] = [];
 
-                    foreach (\json_decode($valuesSource[$type], true, flags: \JSON_THROW_ON_ERROR) as $typeID => $optionData) {
+                    $typeData = \json_decode($valuesSource[$type], true, flags: \JSON_THROW_ON_ERROR);
+                    if (!\is_array($typeData)) {
+                        $typeData = [];
+                    }
+
+                    foreach ($typeData as $typeID => $optionData) {
+                        if (!\is_array($optionData)) {
+                            continue;
+                        }
+
                         $this->__readValues[$objectTypeID][$type][$typeID] = [];
 
                         foreach ($optionData as $optionID => $optionValue) {
diff --git a/wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php b/wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
index 744c2fc53c6..af1d3f166b0 100644
--- a/wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
+++ b/wcfsetup/install/files/lib/system/bbcode/HtmlBBCodeParser.class.php
@@ -43,6 +43,7 @@ class HtmlBBCodeParser extends BBCodeParser
         'i',
         'img',
         'media',
+        'poll',
         's',
         'tt',
         'u',
diff --git a/wcfsetup/install/files/lib/system/bbcode/PollBBCode.class.php b/wcfsetup/install/files/lib/system/bbcode/PollBBCode.class.php
new file mode 100644
index 00000000000..08298bb78a2
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/bbcode/PollBBCode.class.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace wcf\system\bbcode;
+
+use wcf\data\poll\Poll;
+use wcf\system\message\embedded\object\MessageEmbeddedObjectManager;
+use wcf\system\view\ContentNotVisibleView;
+use wcf\system\view\poll\PollWidgetView;
+use wcf\util\StringUtil;
+
+/**
+ * Parses the [poll] bbcode tag that embeds a standalone poll.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class PollBBCode extends AbstractBBCode
+{
+    #[\Override]
+    public function getParsedTag(array $openingTag, string $content, array $closingTag, BBCodeParser $parser): string
+    {
+        $pollID = (int)($openingTag['attributes'][0] ?? 0);
+        if ($pollID === 0) {
+            return '';
+        }
+
+        /** @var ?Poll $poll */
+        $poll = MessageEmbeddedObjectManager::getInstance()->getObject('com.woltlab.wcf.poll', $pollID);
+        if ($poll === null || !$poll->isStandalone() || \MODULE_POLL === 0) {
+            // Intentionally don't use `ContentNotVisibleView::forNotAvailable()`,
+            // because deleted polls do not automatically remove the BBCode from the content.
+            return '';
+        }
+
+        if (!$poll->isAccessible()) {
+            return ContentNotVisibleView::forNoPermission();
+        }
+
+        if ($parser->getOutputType() === 'text/html') {
+            return (string)new PollWidgetView($poll);
+        }
+
+        $options = \array_map(
+            static fn($option) => $option->getOptionValue(),
+            \array_values($poll->getOptions())
+        );
+
+        if ($parser->getOutputType() === 'text/simplified-html') {
+            return \sprintf(
+                '<strong>%s</strong><br>%s',
+                StringUtil::encodeHTML($poll->getQuestion()),
+                \implode('<br>', \array_map(
+                    static fn(string $option) => '- ' . StringUtil::encodeHTML($option),
+                    $options
+                ))
+            );
+        }
+
+        return StringUtil::encodeHTML($poll->getQuestion()) . "\n" . \implode("\n", \array_map(
+            static fn(string $option) => '- ' . StringUtil::encodeHTML($option),
+            $options
+        ));
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/polls/DeletePoll.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/polls/DeletePoll.class.php
new file mode 100644
index 00000000000..86bb7601b69
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/endpoint/controller/core/polls/DeletePoll.class.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace wcf\system\endpoint\controller\core\polls;
+
+use Laminas\Diactoros\Response\JsonResponse;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use wcf\command\poll\DeletePolls;
+use wcf\data\poll\Poll;
+use wcf\http\Helper;
+use wcf\system\endpoint\DeleteRequest;
+use wcf\system\endpoint\IController;
+use wcf\system\exception\PermissionDeniedException;
+
+/**
+ * Deletes the standalone poll with the given ID.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+#[DeleteRequest('/core/polls/{id:\d+}')]
+final class DeletePoll implements IController
+{
+    #[\Override]
+    public function __invoke(ServerRequestInterface $request, array $variables): ResponseInterface
+    {
+        $poll = Helper::fetchObjectFromRequestParameter($variables['id'], Poll::class);
+
+        if (!$poll->canManage()) {
+            throw new PermissionDeniedException();
+        }
+
+        new DeletePolls([$poll])();
+
+        return new JsonResponse([]);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/polls/GetPoll.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/polls/GetPoll.class.php
new file mode 100644
index 00000000000..63ef354e81f
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/endpoint/controller/core/polls/GetPoll.class.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace wcf\system\endpoint\controller\core\polls;
+
+use Laminas\Diactoros\Response\JsonResponse;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use wcf\data\poll\Poll;
+use wcf\http\Helper;
+use wcf\system\endpoint\GetRequest;
+use wcf\system\endpoint\IController;
+use wcf\system\exception\PermissionDeniedException;
+
+/**
+ * Returns the data of the standalone poll with the given ID that is required
+ * to embed it.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+#[GetRequest('/core/polls/{id:\d+}')]
+final class GetPoll implements IController
+{
+    #[\Override]
+    public function __invoke(ServerRequestInterface $request, array $variables): ResponseInterface
+    {
+        $poll = Helper::fetchObjectFromRequestParameter($variables['id'], Poll::class);
+
+        if (!$poll->isStandalone() || !$poll->isAccessible()) {
+            throw new PermissionDeniedException();
+        }
+
+        return new JsonResponse([
+            'pollID' => $poll->pollID,
+            'question' => $poll->getQuestion(),
+            'votes' => $poll->votes,
+            'time' => $poll->time,
+            'endTime' => $poll->endTime,
+            'isFinished' => $poll->isFinished(),
+        ]);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/polls/GetWidget.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/polls/GetWidget.class.php
new file mode 100644
index 00000000000..89258b55164
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/endpoint/controller/core/polls/GetWidget.class.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace wcf\system\endpoint\controller\core\polls;
+
+use Laminas\Diactoros\Response\JsonResponse;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use wcf\data\poll\Poll;
+use wcf\http\Helper;
+use wcf\system\endpoint\GetRequest;
+use wcf\system\endpoint\IController;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\view\poll\PollWidgetView;
+
+/**
+ * Returns the rendered widget of the standalone poll with the given ID.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+#[GetRequest('/core/polls/{id:\d+}/widget')]
+final class GetWidget implements IController
+{
+    #[\Override]
+    public function __invoke(ServerRequestInterface $request, array $variables): ResponseInterface
+    {
+        $poll = Helper::fetchObjectFromRequestParameter($variables['id'], Poll::class);
+
+        if (\MODULE_POLL === 0 || !$poll->isStandalone() || !$poll->isAccessible()) {
+            throw new PermissionDeniedException();
+        }
+
+        return new JsonResponse([
+            'template' => (string)new PollWidgetView($poll),
+        ]);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/endpoint/controller/core/polls/Vote.class.php b/wcfsetup/install/files/lib/system/endpoint/controller/core/polls/Vote.class.php
new file mode 100644
index 00000000000..450fea7cf0e
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/endpoint/controller/core/polls/Vote.class.php
@@ -0,0 +1,76 @@
+<?php
+
+namespace wcf\system\endpoint\controller\core\polls;
+
+use Laminas\Diactoros\Response\JsonResponse;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use wcf\command\poll\VotePoll;
+use wcf\data\poll\Poll;
+use wcf\http\Helper;
+use wcf\system\endpoint\IController;
+use wcf\system\endpoint\PostRequest;
+use wcf\system\exception\PermissionDeniedException;
+use wcf\system\exception\UserInputException;
+use wcf\system\view\poll\PollWidgetView;
+use wcf\system\WCF;
+
+/**
+ * Stores the vote of the active user in the standalone poll with the given ID
+ * and returns the updated widget of the poll.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+#[PostRequest('/core/polls/{id:\d+}/vote')]
+final class Vote implements IController
+{
+    #[\Override]
+    public function __invoke(ServerRequestInterface $request, array $variables): ResponseInterface
+    {
+        $poll = Helper::fetchObjectFromRequestParameter($variables['id'], Poll::class);
+
+        if (!$poll->isStandalone() || !$poll->canVote()) {
+            throw new PermissionDeniedException();
+        }
+
+        $parameters = Helper::mapApiParameters($request, VoteParameters::class);
+        $optionIDs = \array_values(\array_unique($parameters->optionIDs));
+
+        if ($optionIDs === []) {
+            throw new UserInputException('optionIDs');
+        }
+
+        if (\count($optionIDs) > $poll->maxVotes) {
+            throw new UserInputException('optionIDs', 'maxVotes');
+        }
+
+        if (\count($optionIDs) < $poll->getRequiredVotes()) {
+            throw new UserInputException('optionIDs', 'minVotes');
+        }
+
+        $options = $poll->getOptions();
+        foreach ($optionIDs as $optionID) {
+            if (!isset($options[$optionID])) {
+                throw new UserInputException('optionIDs', 'unknownOption');
+            }
+        }
+
+        (new VotePoll($poll, WCF::getUser(), $optionIDs))();
+
+        return new JsonResponse([
+            'template' => (string)new PollWidgetView(new Poll($poll->pollID)),
+        ]);
+    }
+}
+
+/** @internal */
+final class VoteParameters
+{
+    public function __construct(
+        /** @var list<positive-int> */
+        public readonly array $optionIDs,
+    ) {}
+}
diff --git a/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygFormContainer.class.php b/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygFormContainer.class.php
index ea9b10e2f53..961fcbad799 100644
--- a/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygFormContainer.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygFormContainer.class.php
@@ -347,6 +347,7 @@ public function getPreselect()
      *
      * @return  WysiwygPollFormContainer
      * @throws  \BadMethodCallException     if the form field container has not been populated yet/form has not been built yet
+     * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
      */
     public function getPollContainer()
     {
@@ -526,6 +527,7 @@ public function updatedObject(array $data, IStorableObject $object, bool $loadVa
      * @param string $pollObjectType poll object type for wysiwyg form field
      * @return  WysiwygFormContainer            this container
      * @throws  \InvalidArgumentException       if the given string is no poll object type
+     * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
      */
     public function pollObjectType(string $pollObjectType)
     {
diff --git a/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygPollFormContainer.class.php b/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygPollFormContainer.class.php
index 405bdf0e62e..0763cfa597e 100644
--- a/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygPollFormContainer.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/container/wysiwyg/WysiwygPollFormContainer.class.php
@@ -28,6 +28,7 @@
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since   5.2
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 class WysiwygPollFormContainer extends FormContainer implements IObjectTypeFormNode
 {
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/acl/AclFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/acl/AclFormField.class.php
index 3bec90c158e..6e561dc62bd 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/acl/AclFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/acl/AclFormField.class.php
@@ -49,6 +49,8 @@ final class AclFormField extends AbstractFormField implements IObjectTypeFormNod
      */
     protected static bool $includedAclJavaScript = false;
 
+    private bool $valuesRead = false;
+
     /**
      * Sets the name of/filter for the name(s) of the shown acl option categories and
      * returns this field.
@@ -86,7 +88,12 @@ public function getCategoryName(): ?string
     #[\Override]
     public function getHtmlVariables(): array
     {
-        ACLHandler::getInstance()->assignVariables($this->getObjectType()->objectTypeID);
+        $objectTypeID = $this->getObjectType()->objectTypeID;
+        if (!$this->valuesRead) {
+            $this->preloadValues($objectTypeID);
+        }
+
+        ACLHandler::getInstance()->assignVariables($objectTypeID);
 
         $includeAclJavaScript = !static::$includedAclJavaScript;
         if (!static::$includedAclJavaScript) {
@@ -159,15 +166,49 @@ public function readValue(): static
                 $this->getDocument()->hasRequestData($this->getPrefixedId())
                 && \is_array($this->getDocument()->getRequestData($this->getPrefixedId()))
             ) {
-                $valueSource = $this->getDocument()->getRequestData($this->getPrefixedId());
+                // Ajax forms submit the values as objects instead of the JSON
+                // strings of the hidden inputs that `ACLHandler` expects.
+                $requestData = $this->getDocument()->getRequestData($this->getPrefixedId());
+                foreach (['group', 'user'] as $type) {
+                    if (isset($requestData[$type]) && \is_array($requestData[$type])) {
+                        $valueSource[$type] = \json_encode($requestData[$type], \JSON_THROW_ON_ERROR);
+                    }
+                }
             }
         }
 
         ACLHandler::getInstance()->readValues($this->getObjectType()->objectTypeID, $valueSource);
+        $this->valuesRead = true;
 
         return $this;
     }
 
+    /**
+     * Provides the stored values of the edited object to the acl list, which
+     * otherwise requests them through an action that requires the ACP.
+     *
+     * @since 6.3
+     */
+    private function preloadValues(int $objectTypeID): void
+    {
+        $values = [
+            'group' => [],
+            'user' => [],
+        ];
+
+        if ($this->objectID !== null) {
+            $permissions = ACLHandler::getInstance()->getPermissions($objectTypeID, [$this->objectID]);
+            foreach (\array_keys($values) as $type) {
+                $values[$type] = $permissions[$type][$this->objectID] ?? [];
+            }
+        }
+
+        ACLHandler::getInstance()->readValues($objectTypeID, [
+            'group' => \json_encode($values['group'], \JSON_THROW_ON_ERROR),
+            'user' => \json_encode($values['user'], \JSON_THROW_ON_ERROR),
+        ]);
+    }
+
     #[\Override]
     public function cleanup(): static
     {
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/poll/PollOptionListFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/poll/PollOptionListFormField.class.php
new file mode 100644
index 00000000000..a99f4d6856b
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/form/builder/field/poll/PollOptionListFormField.class.php
@@ -0,0 +1,219 @@
+<?php
+
+namespace wcf\system\form\builder\field\poll;
+
+use CuyZ\Valinor\Mapper\MappingError;
+use CuyZ\Valinor\Mapper\Source\Source;
+use CuyZ\Valinor\MapperBuilder;
+use wcf\data\poll\option\PollOption;
+use wcf\system\form\builder\field\AbstractFormField;
+use wcf\system\form\builder\field\validation\FormFieldValidationError;
+use wcf\system\l10n\L10nStorage;
+use wcf\system\language\LanguageFactory;
+use wcf\util\StringUtil;
+
+/**
+ * Form field to manage the options of a poll, each option can either have a
+ * single value or a value per language.
+ *
+ * In contrast to `PollOptionsFormField`, this field does not depend on a
+ * wysiwyg field and is intended for use with the `PollBuilder`.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @phpstan-import-type L10nValue from L10nStorage
+ * @phpstan-type PollOptionValue array{optionID: int, optionValue: L10nValue}
+ */
+final class PollOptionListFormField extends AbstractFormField
+{
+    /**
+     * @inheritDoc
+     */
+    protected $javaScriptDataHandlerModule = 'WoltLabSuite/Core/Form/Builder/Field/PollOptionList';
+
+    /**
+     * @inheritDoc
+     */
+    protected $templateName = 'shared_pollOptionListFormField';
+
+    /**
+     * @inheritDoc
+     */
+    protected $value = [];
+
+    private bool $invalidValue = false;
+
+    public function __construct()
+    {
+        $this->label('wcf.poll.options')
+            ->description('wcf.poll.options.description');
+    }
+
+    #[\Override]
+    public function readValue()
+    {
+        if (!$this->getDocument()->hasRequestData($this->getPrefixedId())) {
+            return $this;
+        }
+
+        $this->value = [];
+        $this->invalidValue = false;
+
+        $value = $this->getDocument()->getRequestData($this->getPrefixedId());
+        if (!\is_string($value) || $value === '') {
+            return $this;
+        }
+
+        try {
+            $options = (new MapperBuilder())->mapper()->map(
+                <<<'EOT'
+                    list<array{
+                        optionID: int,
+                        optionValue: array<non-negative-int, string>,
+                    }>
+                    EOT,
+                Source::json($value)
+            );
+        } catch (MappingError) {
+            $this->invalidValue = true;
+
+            return $this;
+        }
+
+        foreach ($options as $option) {
+            $optionValue = self::normalizeValue($option['optionValue']);
+            if ($optionValue === []) {
+                continue;
+            }
+
+            $this->value[] = [
+                'optionID' => \max($option['optionID'], 0),
+                'optionValue' => $optionValue,
+            ];
+        }
+
+        $this->value = \array_slice($this->value, 0, \POLL_MAX_OPTIONS);
+
+        return $this;
+    }
+
+    /**
+     * Trims the values and removes empty values. A value per language is
+     * discarded entirely if it has no value for any language, a monolingual
+     * value must not be combined with values per language.
+     *
+     * @param array<int, string> $values
+     * @return L10nValue
+     */
+    private static function normalizeValue(array $values): array
+    {
+        if (isset($values[L10nStorage::MONOLINGUAL])) {
+            $value = \mb_substr(StringUtil::trim($values[L10nStorage::MONOLINGUAL]), 0, 255);
+
+            return $value === '' ? [] : [L10nStorage::MONOLINGUAL => $value];
+        }
+
+        $languageIDs = \array_map(
+            static fn($language) => $language->languageID,
+            LanguageFactory::getInstance()->getLanguages()
+        );
+
+        $normalizedValues = [];
+        foreach ($values as $languageID => $value) {
+            if (!\in_array($languageID, $languageIDs, true)) {
+                continue;
+            }
+
+            $normalizedValues[$languageID] = \mb_substr(StringUtil::trim($value), 0, 255);
+        }
+
+        foreach ($normalizedValues as $value) {
+            if ($value !== '') {
+                return $normalizedValues;
+            }
+        }
+
+        return [];
+    }
+
+    /**
+     * Accepts a list of either `PollOption` objects or `PollOptionValue` arrays.
+     */
+    #[\Override]
+    public function value(mixed $value)
+    {
+        $options = [];
+        foreach ($value as $option) {
+            if ($option instanceof PollOption) {
+                $options[] = [
+                    'optionID' => $option->optionID,
+                    'optionValue' => $option->getL10nValues('optionValue'),
+                ];
+            } elseif (\is_array($option) && isset($option['optionID'], $option['optionValue'])) {
+                $options[] = [
+                    'optionID' => $option['optionID'],
+                    'optionValue' => $option['optionValue'],
+                ];
+            } else {
+                throw new \InvalidArgumentException(
+                    "Given value array contains invalid value of type " . \gettype($option) . " for field '{$this->getId()}'."
+                );
+            }
+        }
+
+        return parent::value($options);
+    }
+
+    /**
+     * @return list<PollOptionValue>
+     */
+    #[\Override]
+    public function getValue()
+    {
+        return $this->value;
+    }
+
+    /**
+     * Returns true if at least one option has a value per language.
+     */
+    public function hasL10nValues(): bool
+    {
+        foreach ($this->value as $option) {
+            if (!isset($option['optionValue'][L10nStorage::MONOLINGUAL])) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    #[\Override]
+    public function validate()
+    {
+        if ($this->invalidValue) {
+            $this->addValidationError(new FormFieldValidationError('invalid'));
+
+            return;
+        }
+
+        if ($this->isRequired() && $this->value === []) {
+            $this->addValidationError(new FormFieldValidationError('empty'));
+        }
+
+        parent::validate();
+    }
+
+    #[\Override]
+    public function getHtmlVariables()
+    {
+        return [
+            'availableLanguages' => \array_map(
+                static fn($language) => $language->__toString(),
+                LanguageFactory::getInstance()->getLanguages()
+            ),
+        ];
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/form/builder/field/poll/PollOptionsFormField.class.php b/wcfsetup/install/files/lib/system/form/builder/field/poll/PollOptionsFormField.class.php
index b17e43dc2fb..1800948aed7 100644
--- a/wcfsetup/install/files/lib/system/form/builder/field/poll/PollOptionsFormField.class.php
+++ b/wcfsetup/install/files/lib/system/form/builder/field/poll/PollOptionsFormField.class.php
@@ -17,6 +17,7 @@
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
  * @since   5.2
+ * @deprecated 6.3 Use `PollOptionListFormField` instead.
  */
 final class PollOptionsFormField extends AbstractFormField
 {
diff --git a/wcfsetup/install/files/lib/system/importer/AbstractPollImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractPollImporter.class.php
index 4ef3925f737..ff206c4b9d4 100644
--- a/wcfsetup/install/files/lib/system/importer/AbstractPollImporter.class.php
+++ b/wcfsetup/install/files/lib/system/importer/AbstractPollImporter.class.php
@@ -2,8 +2,10 @@
 
 namespace wcf\system\importer;
 
+use wcf\data\object\type\ObjectTypeCache;
 use wcf\data\poll\Poll;
-use wcf\data\poll\PollEditor;
+use wcf\data\poll\PollBuilder;
+use wcf\system\l10n\L10nStorage;
 
 /**
  * Imports polls.
@@ -11,6 +13,7 @@
  * @author  Marcel Werk
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @deprecated 6.3 Only supports the legacy polls that are bound to a content object.
  */
 class AbstractPollImporter extends AbstractImporter
 {
@@ -34,7 +37,31 @@ class AbstractPollImporter extends AbstractImporter
     #[\Override]
     public function import(mixed $oldID, array $data, array $additionalData = [])
     {
-        $poll = PollEditor::create(\array_merge($data, ['objectTypeID' => $this->objectTypeID]));
+        $builder = PollBuilder::forCreate()
+            ->setContainer(
+                ObjectTypeCache::getInstance()->getObjectType($this->objectTypeID)->objectType,
+                $data['objectID'] ?? 0
+            )
+            ->setTime($data['time'] ?? \TIME_NOW)
+            ->setQuestion([L10nStorage::MONOLINGUAL => (string)($data['question'] ?? '')]);
+        unset($data['objectID'], $data['objectTypeID'], $data['time'], $data['question']);
+
+        foreach ($data as $key => $value) {
+            match ($key) {
+                'endTime' => $builder->setEndTime($value),
+                'isChangeable' => $builder->setIsChangeable((bool)$value),
+                'isPublic' => $builder->setIsPublic((bool)$value),
+                'sortByVotes' => $builder->setSortByVotes((bool)$value),
+                'resultsRequireVote' => $builder->setResultsRequireVote((bool)$value),
+                'resultsRequireEnd' => $builder->setResultsRequireEnd((bool)$value),
+                'minVotes' => $builder->setMinVotes($value),
+                'maxVotes' => $builder->setMaxVotes($value),
+                'votes' => $builder->setVotes($value),
+                default => $builder->setCustomProperty($key, $value),
+            };
+        }
+
+        $poll = $builder->create();
 
         ImportHandler::getInstance()->saveNewID($this->objectTypeName, $oldID, $poll->pollID);
 
diff --git a/wcfsetup/install/files/lib/system/importer/AbstractPollOptionImporter.class.php b/wcfsetup/install/files/lib/system/importer/AbstractPollOptionImporter.class.php
index 37cd42c64db..c5eaf3e9188 100644
--- a/wcfsetup/install/files/lib/system/importer/AbstractPollOptionImporter.class.php
+++ b/wcfsetup/install/files/lib/system/importer/AbstractPollOptionImporter.class.php
@@ -3,7 +3,8 @@
 namespace wcf\system\importer;
 
 use wcf\data\poll\option\PollOption;
-use wcf\data\poll\option\PollOptionEditor;
+use wcf\data\poll\option\PollOptionBuilder;
+use wcf\system\l10n\L10nStorage;
 
 /**
  * Imports poll votes.
@@ -11,6 +12,7 @@
  * @author  Marcel Werk
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @deprecated 6.3 Only supports the legacy polls that are bound to a content object.
  */
 class AbstractPollOptionImporter extends AbstractImporter
 {
@@ -39,7 +41,20 @@ public function import(mixed $oldID, array $data, array $additionalData = [])
             return 0;
         }
 
-        $option = PollOptionEditor::create($data);
+        $builder = PollOptionBuilder::forCreate()
+            ->setPollID($data['pollID'])
+            ->setOptionValue([L10nStorage::MONOLINGUAL => (string)($data['optionValue'] ?? '')]);
+        unset($data['pollID'], $data['optionValue']);
+
+        foreach ($data as $key => $value) {
+            match ($key) {
+                'votes' => $builder->setVotes($value),
+                'showOrder' => $builder->setShowOrder($value),
+                default => $builder->setCustomProperty($key, $value),
+            };
+        }
+
+        $option = $builder->create();
 
         ImportHandler::getInstance()->saveNewID($this->objectTypeName, $oldID, $option->optionID);
 
diff --git a/wcfsetup/install/files/lib/system/interaction/user/PollInteractions.class.php b/wcfsetup/install/files/lib/system/interaction/user/PollInteractions.class.php
new file mode 100644
index 00000000000..aa5a12f2f79
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/interaction/user/PollInteractions.class.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace wcf\system\interaction\user;
+
+use wcf\action\PollEditAction;
+use wcf\data\poll\Poll;
+use wcf\event\interaction\user\PollInteractionCollecting;
+use wcf\system\event\EventHandler;
+use wcf\system\interaction\AbstractInteractionProvider;
+use wcf\system\interaction\DeleteInteraction;
+use wcf\system\interaction\FormBuilderDialogInteraction;
+use wcf\system\request\LinkHandler;
+
+/**
+ * Interaction provider for standalone polls.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class PollInteractions extends AbstractInteractionProvider
+{
+    public function __construct()
+    {
+        $this->addInteractions([
+            new FormBuilderDialogInteraction(
+                'edit',
+                LinkHandler::getInstance()->getControllerLink(PollEditAction::class, ['id' => '%s']),
+                'wcf.global.button.edit',
+                static fn(Poll $poll) => $poll->canManage()
+            ),
+            new DeleteInteraction(
+                'core/polls/%s',
+                static fn(Poll $poll) => $poll->canManage()
+            ),
+        ]);
+
+        EventHandler::getInstance()->fire(
+            new PollInteractionCollecting($this)
+        );
+    }
+
+    #[\Override]
+    public function getObjectClassName(): string
+    {
+        return Poll::class;
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/listView/user/PollManagerListView.class.php b/wcfsetup/install/files/lib/system/listView/user/PollManagerListView.class.php
new file mode 100644
index 00000000000..1b550aaf296
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/listView/user/PollManagerListView.class.php
@@ -0,0 +1,128 @@
+<?php
+
+namespace wcf\system\listView\user;
+
+use wcf\action\PollEditAction;
+use wcf\data\poll\Poll;
+use wcf\data\poll\PollList;
+use wcf\event\listView\user\PollManagerListViewInitialized;
+use wcf\system\interaction\InteractionContextMenuComponentConfiguration;
+use wcf\system\interaction\user\PollInteractions;
+use wcf\system\l10n\L10nStorage;
+use wcf\system\listView\AbstractListView;
+use wcf\system\listView\ListViewPrimaryButton;
+use wcf\system\listView\ListViewSortField;
+use wcf\system\request\LinkHandler;
+use wcf\system\style\FontAwesomeIcon;
+use wcf\system\WCF;
+use wcf\util\StringUtil;
+
+/**
+ * List view of the poll manager that is used to embed standalone polls into
+ * messages.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ *
+ * @extends AbstractListView<Poll, PollList>
+ */
+class PollManagerListView extends AbstractListView
+{
+    public function __construct(
+        public readonly string $searchString = '',
+    ) {
+        $this->addAvailableSortFields([
+            new ListViewSortField('time', 'wcf.poll.time', defaultSortOrder: 'DESC'),
+            new ListViewSortField('question', 'wcf.poll.question', 'question'),
+            new ListViewSortField('votes', 'wcf.poll.votes', defaultSortOrder: 'DESC'),
+        ]);
+
+        // The selection is handled by the poll manager itself.
+        $this->setInteractionProvider(new PollInteractions());
+        $this->setInteractionContextMenuComponentConfiguration(new InteractionContextMenuComponentConfiguration(
+            buttonCssClassName: 'pollManager__item__menuButton'
+        ));
+
+        $this->setAdditionalHeaderContent(\sprintf(
+            '<label class="pollManager__search">%s<input type="search" class="pollManager__searchInput" placeholder="%s" value="%s"></label>'
+                . '<div class="pollManager__config" data-add-endpoint="%s" hidden></div>',
+            FontAwesomeIcon::fromValues('magnifying-glass')->toHtml(16),
+            StringUtil::encodeHTML(WCF::getLanguage()->get('wcf.poll.search.placeholder')),
+            StringUtil::encodeHTML($this->searchString),
+            StringUtil::encodeHTML(LinkHandler::getInstance()->getControllerLink(PollEditAction::class))
+        ));
+
+        if (WCF::getSession()->hasPermission('user.poll.canCreatePoll')) {
+            $this->setPrimaryButton(ListViewPrimaryButton::forButton(
+                'wcf.poll.add',
+                FontAwesomeIcon::fromValues('plus'),
+                'pollManager__addButton'
+            ));
+        }
+
+        $this->setItemsPerPage(30);
+        $this->setDefaultSortField('time');
+        $this->setDefaultSortOrder('DESC');
+        $this->setCssClassName('pollManager');
+    }
+
+    #[\Override]
+    protected function createObjectList(): PollList
+    {
+        $list = new PollList();
+        $list->getConditionBuilder()->add('poll.objectTypeID IS NULL');
+
+        // required to sort and search by the localized question
+        $questionSelect = (new L10nStorage(Poll::getL10nDefinition()))->getSubSelect('question', 'poll');
+        if ($list->sqlSelects !== '') {
+            $list->sqlSelects .= ',';
+        }
+        $list->sqlSelects .= $questionSelect . ' AS question';
+
+        if (!WCF::getSession()->hasPermission('mod.poll.canManagePoll')) {
+            $list->getConditionBuilder()->add('poll.userID = ?', [WCF::getUser()->userID]);
+        }
+
+        if ($this->searchString !== '') {
+            $list->getConditionBuilder()->add(
+                $questionSelect . ' LIKE ?',
+                ['%' . WCF::getDB()->escapeLikeValue($this->searchString) . '%']
+            );
+        }
+
+        return $list;
+    }
+
+    #[\Override]
+    public function isAccessible(): bool
+    {
+        if (\MODULE_POLL === 0 || WCF::getUser()->userID === 0) {
+            return false;
+        }
+
+        return WCF::getSession()->hasPermission('user.poll.canCreatePoll')
+            || WCF::getSession()->hasPermission('mod.poll.canManagePoll');
+    }
+
+    #[\Override]
+    public function getParameters(): array
+    {
+        return [
+            'searchString' => $this->searchString,
+        ];
+    }
+
+    #[\Override]
+    public function renderItems(): string
+    {
+        return WCF::getTPL()->render('wcf', 'shared_pollManagerListItems', ['view' => $this]);
+    }
+
+    #[\Override]
+    protected function getInitializedEvent(): PollManagerListViewInitialized
+    {
+        return new PollManagerListViewInitialized($this);
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/message/embedded/object/PollMessageEmbeddedObjectHandler.class.php b/wcfsetup/install/files/lib/system/message/embedded/object/PollMessageEmbeddedObjectHandler.class.php
new file mode 100644
index 00000000000..ef218e5a8b3
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/message/embedded/object/PollMessageEmbeddedObjectHandler.class.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace wcf\system\message\embedded\object;
+
+use wcf\data\poll\PollList;
+use wcf\system\html\input\HtmlInputProcessor;
+
+/**
+ * Parses standalone polls that are embedded via the `[poll]` bbcode.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+class PollMessageEmbeddedObjectHandler extends AbstractMessageEmbeddedObjectHandler
+{
+    #[\Override]
+    public function parse(HtmlInputProcessor $htmlInputProcessor, array $embeddedData)
+    {
+        $pollIDs = [];
+        foreach ($embeddedData['poll'] ?? [] as $attributes) {
+            $pollID = (int)($attributes[0] ?? 0);
+            if ($pollID > 0) {
+                $pollIDs[] = $pollID;
+            }
+        }
+
+        return \array_values(\array_unique($pollIDs));
+    }
+
+    #[\Override]
+    public function loadObjects(array $objectIDs)
+    {
+        // The list shares a collection, which loads the options of all polls at once.
+        $pollList = new PollList();
+        $pollList->setObjectIDs($objectIDs);
+        $pollList->readObjects();
+
+        return $pollList->getObjects();
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/poll/AbstractPollHandler.class.php b/wcfsetup/install/files/lib/system/poll/AbstractPollHandler.class.php
index 75428626d00..e4ff20b2b47 100644
--- a/wcfsetup/install/files/lib/system/poll/AbstractPollHandler.class.php
+++ b/wcfsetup/install/files/lib/system/poll/AbstractPollHandler.class.php
@@ -10,6 +10,7 @@
  * @author  Alexander Ebert
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 abstract class AbstractPollHandler extends SingletonFactory implements IPollHandler
 {
diff --git a/wcfsetup/install/files/lib/system/poll/IPollHandler.class.php b/wcfsetup/install/files/lib/system/poll/IPollHandler.class.php
index 881f54aa212..c018bf5eb9d 100644
--- a/wcfsetup/install/files/lib/system/poll/IPollHandler.class.php
+++ b/wcfsetup/install/files/lib/system/poll/IPollHandler.class.php
@@ -10,6 +10,7 @@
  * @author  Alexander Ebert
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 interface IPollHandler
 {
diff --git a/wcfsetup/install/files/lib/system/poll/LegacyPollConverter.class.php b/wcfsetup/install/files/lib/system/poll/LegacyPollConverter.class.php
new file mode 100644
index 00000000000..8841c1de1a1
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/poll/LegacyPollConverter.class.php
@@ -0,0 +1,144 @@
+<?php
+
+namespace wcf\system\poll;
+
+use wcf\data\poll\Poll;
+use wcf\data\user\group\UserGroup;
+use wcf\system\acl\ACLHandler;
+use wcf\system\WCF;
+
+/**
+ * Converts polls that belong to a poll container into standalone polls that
+ * are embedded into the content via the `[poll]` bbcode. Used by the rebuild
+ * data workers of the poll containers.
+ *
+ * Standalone polls are accessible independently of the content, the access to
+ * the content is therefore stored as the acl of the poll, see `PollAclSnapshot`.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class LegacyPollConverter
+{
+    /**
+     * Converts the given poll into a standalone poll owned by the given user
+     * and stores the given acl values.
+     */
+    public static function convert(Poll $poll, ?int $userID, string $username, PollAclSnapshot $snapshot): void
+    {
+        if ($poll->isStandalone()) {
+            throw new \InvalidArgumentException("The poll '{$poll->pollID}' is already a standalone poll.");
+        }
+
+        $objectTypeID = ACLHandler::getInstance()->getObjectTypeID('com.woltlab.wcf.poll');
+        $optionIDs = [];
+        foreach (ACLHandler::getInstance()->getOptions($objectTypeID) as $option) {
+            $optionIDs[$option->optionName] = $option->optionID;
+        }
+
+        WCF::getDB()->beginTransaction();
+        $committed = false;
+        try {
+            $sql = "UPDATE  wcf1_poll
+                    SET     objectTypeID = NULL,
+                            objectID = 0,
+                            userID = ?,
+                            username = ?
+                    WHERE   pollID = ?";
+            $statement = WCF::getDB()->prepare($sql);
+            $statement->execute([$userID, $username, $poll->pollID]);
+
+            ACLHandler::getInstance()->readValues($objectTypeID, $snapshot->toAclValues($optionIDs));
+            ACLHandler::getInstance()->save($poll->pollID, $objectTypeID);
+
+            WCF::getDB()->commitTransaction();
+            $committed = true;
+        } finally {
+            ACLHandler::getInstance()->resetValues($objectTypeID);
+
+            if (!$committed) {
+                WCF::getDB()->rollBackTransaction();
+            }
+        }
+    }
+
+    /**
+     * Prepends the `[poll]` bbcode of the given poll to the given message, the
+     * legacy polls were displayed above the message.
+     */
+    public static function prependEmbed(string $message, int $pollID, bool $isHtml): string
+    {
+        if (!$isHtml) {
+            return "[poll={$pollID}][/poll]\n" . $message;
+        }
+
+        return \sprintf(
+            '<woltlab-metacode data-name="poll" data-attributes="%s"></woltlab-metacode>',
+            \base64_encode(\json_encode([$pollID], \JSON_THROW_ON_ERROR))
+        ) . $message;
+    }
+
+    /**
+     * Evaluates the access to the content for each group and returns the
+     * resulting snapshot.
+     *
+     * The callbacks receive the representative group set of the group, see
+     * `getRepresentativeGroupSets()`, and whether the set represents the
+     * guests. Guests can never vote. The everyone group is always denied, which
+     * ensures that the acl always yields a value for every user.
+     *
+     * @param callable(list<int>, bool): bool $canView
+     * @param callable(list<int>, bool): bool $canVote
+     */
+    public static function createSnapshot(callable $canView, callable $canVote): PollAclSnapshot
+    {
+        $guestGroupIDs = UserGroup::getGroupIDsByType([UserGroup::GUESTS]);
+
+        $groupView = $groupVote = [];
+        foreach (self::getRepresentativeGroupSets() as $groupID => $groupIDs) {
+            if ($groupIDs === []) {
+                $groupView[$groupID] = $groupVote[$groupID] = false;
+
+                continue;
+            }
+
+            $isGuest = \array_intersect($guestGroupIDs, $groupIDs) !== [];
+            $groupView[$groupID] = $canView($groupIDs, $isGuest);
+            $groupVote[$groupID] = !$isGuest && $canVote($groupIDs, $isGuest);
+        }
+
+        return new PollAclSnapshot($groupView, $groupVote);
+    }
+
+    /**
+     * Returns the group set that represents the members of each group:
+     *
+     * - everyone: `[]`, the group is always denied
+     * - guests: `[EVERYONE, GUESTS]`, which equals the groups of a guest
+     * - registered users: `[EVERYONE, USERS]`
+     * - any other group: `[EVERYONE, USERS, groupID]`, because the members of
+     *   a group are always registered users
+     *
+     * @return array<int, list<int>> `groupID => groupIDs`
+     */
+    private static function getRepresentativeGroupSets(): array
+    {
+        $everyone = UserGroup::getGroupIDsByType([UserGroup::EVERYONE]);
+        $guests = UserGroup::getGroupIDsByType([UserGroup::GUESTS]);
+        $users = UserGroup::getGroupIDsByType([UserGroup::USERS]);
+
+        $groupSets = [];
+        foreach (UserGroup::getAllGroups() as $group) {
+            $groupSets[$group->groupID] = match ($group->groupType) {
+                UserGroup::EVERYONE => [],
+                UserGroup::GUESTS => [...$everyone, ...$guests],
+                UserGroup::USERS => [...$everyone, ...$users],
+                default => [...$everyone, ...$users, $group->groupID],
+            };
+        }
+
+        return $groupSets;
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/poll/PollAclSnapshot.class.php b/wcfsetup/install/files/lib/system/poll/PollAclSnapshot.class.php
new file mode 100644
index 00000000000..7091bef796b
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/poll/PollAclSnapshot.class.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace wcf\system\poll;
+
+/**
+ * Snapshot of the access to the content a legacy poll belonged to, written as
+ * the acl of the poll when it is converted into a standalone poll.
+ *
+ * The values are evaluated per representative group set (see
+ * `LegacyPollConverter::createSnapshot()`), user-specific permissions are not
+ * reflected. The `canViewPoll` values are omitted if every group can view the
+ * content.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class PollAclSnapshot
+{
+    /**
+     * @param array<int, bool> $groupView `groupID => canViewPoll`
+     * @param array<int, bool> $groupVote `groupID => canVotePoll`
+     */
+    public function __construct(
+        public readonly array $groupView,
+        public readonly array $groupVote,
+    ) {}
+
+    /**
+     * Returns true if every group can view the content.
+     */
+    public function isPublic(): bool
+    {
+        return !\in_array(false, $this->groupView, true);
+    }
+
+    /**
+     * Returns the values in the format expected by `ACLHandler::readValues()`.
+     *
+     * @param array<string, int> $optionIDs `optionName => optionID`
+     * @return array{group: string, user: string}
+     */
+    public function toAclValues(array $optionIDs): array
+    {
+        $values = [];
+        if (!$this->isPublic()) {
+            foreach ($this->groupView as $groupID => $value) {
+                $values[$groupID][$optionIDs['canViewPoll']] = (int)$value;
+            }
+        }
+        foreach ($this->groupVote as $groupID => $value) {
+            $values[$groupID][$optionIDs['canVotePoll']] = (int)$value;
+        }
+
+        return [
+            'group' => \json_encode($values, \JSON_THROW_ON_ERROR),
+            // An empty value is required, `ACLHandler` falls back to `$_POST` otherwise.
+            'user' => '[]',
+        ];
+    }
+}
diff --git a/wcfsetup/install/files/lib/system/poll/PollManager.class.php b/wcfsetup/install/files/lib/system/poll/PollManager.class.php
index 9acb32c3309..bd57609200a 100644
--- a/wcfsetup/install/files/lib/system/poll/PollManager.class.php
+++ b/wcfsetup/install/files/lib/system/poll/PollManager.class.php
@@ -2,18 +2,21 @@
 
 namespace wcf\system\poll;
 
+use wcf\command\poll\CreatePoll;
+use wcf\command\poll\DeletePolls;
+use wcf\command\poll\UpdatePoll;
 use wcf\data\IPollContainer;
 use wcf\data\object\type\ObjectType;
 use wcf\data\object\type\ObjectTypeCache;
 use wcf\data\poll\option\PollOptionList;
 use wcf\data\poll\Poll;
-use wcf\data\poll\PollAction;
+use wcf\data\poll\PollBuilder;
 use wcf\data\poll\PollList;
-use wcf\system\database\util\PreparedStatementConditionBuilder;
 use wcf\system\exception\ImplementationException;
 use wcf\system\exception\ParentClassException;
 use wcf\system\exception\SystemException;
 use wcf\system\exception\UserInputException;
+use wcf\system\l10n\L10nStorage;
 use wcf\system\SingletonFactory;
 use wcf\system\WCF;
 use wcf\util\StringUtil;
@@ -24,6 +27,7 @@
  * @author  Alexander Ebert
  * @copyright   2001-2019 WoltLab GmbH
  * @license GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @deprecated 6.3 Use standalone polls that are embedded through the `[poll]` BBCode instead.
  */
 class PollManager extends SingletonFactory
 {
@@ -75,7 +79,7 @@ class PollManager extends SingletonFactory
 
     /**
      * list of poll options
-     * @var string[]
+     * @var array<int, array{optionID: int, optionValue: string}>
      */
     protected $pollOptions = [];
 
@@ -96,13 +100,15 @@ protected function init()
      */
     public function removePolls(array $pollIDs)
     {
-        $conditions = new PreparedStatementConditionBuilder();
-        $conditions->add("pollID IN (?)", [$pollIDs]);
+        if ($pollIDs === []) {
+            return;
+        }
 
-        $sql = "DELETE FROM wcf1_poll
-                " . $conditions;
-        $statement = WCF::getDB()->prepare($sql);
-        $statement->execute($conditions->getParameters());
+        $pollList = new PollList();
+        $pollList->setObjectIDs($pollIDs);
+        $pollList->readObjects();
+
+        (new DeletePolls($pollList->getObjects()))();
     }
 
     /**
@@ -143,14 +149,11 @@ public function setObject(string $objectType, int $objectID, ?int $pollID = 0)
             ];
 
             // load poll options
-            $sql = "SELECT      optionID, optionValue
-                    FROM        wcf1_poll_option
-                    WHERE       pollID = ?
-                    ORDER BY    showOrder ASC";
-            $statement = WCF::getDB()->prepare($sql);
-            $statement->execute([$this->poll->pollID]);
-            while ($row = $statement->fetchArray()) {
-                $this->pollOptions[] = $row;
+            foreach ($this->poll->getOptions() as $option) {
+                $this->pollOptions[] = [
+                    'optionID' => $option->optionID,
+                    'optionValue' => $option->getOptionValue(),
+                ];
             }
         }
 
@@ -292,38 +295,62 @@ public function save(?int $objectID = null)
                 throw new SystemException("Could not create poll, missing object type");
             }
 
-            $data = $this->pollData;
-            $data['objectID'] = $this->objectID;
-            $data['objectTypeID'] = $this->cache[$this->objectType]->objectTypeID;
-            $data['time'] = \TIME_NOW;
-
-            $action = new PollAction([], 'create', [
-                'data' => $data,
-                'options' => $this->pollOptions,
-            ]);
-            $returnValues = $action->executeAction();
-            $this->poll = $returnValues['returnValues'];
+            $builder = PollBuilder::forCreate()
+                ->setContainer($this->objectType, $this->objectID)
+                ->setTime(\TIME_NOW)
+                ->setOptions($this->getOptionsForBuilder());
+            $this->applyPollData($builder);
+
+            $this->poll = (new CreatePoll($builder))();
         } else {
             // remove poll
             if (empty($this->pollData['question'])) {
-                $action = new PollAction([$this->poll], 'delete');
-                $action->executeAction();
+                (new DeletePolls([$this->poll]))();
                 $this->poll = null;
 
                 return 0;
             } else {
                 // update existing poll
-                $action = new PollAction([$this->poll], 'update', [
-                    'data' => $this->pollData,
-                    'options' => $this->pollOptions,
-                ]);
-                $action->executeAction();
+                $builder = PollBuilder::forUpdate($this->poll)
+                    ->setOptions($this->getOptionsForBuilder());
+                $this->applyPollData($builder);
+
+                $this->poll = (new UpdatePoll($builder))();
             }
         }
 
         return $this->poll->pollID;
     }
 
+    private function applyPollData(PollBuilder $builder): void
+    {
+        $builder
+            ->setQuestion([L10nStorage::MONOLINGUAL => (string)$this->pollData['question']])
+            ->setEndTime((int)$this->pollData['endTime'])
+            ->setIsChangeable((bool)$this->pollData['isChangeable'])
+            ->setIsPublic((bool)$this->pollData['isPublic'])
+            ->setResultsRequireVote((bool)$this->pollData['resultsRequireVote'])
+            ->setSortByVotes((bool)$this->pollData['sortByVotes'])
+            ->setMaxVotes((int)$this->pollData['maxVotes']);
+    }
+
+    /**
+     * @return list<array{optionID: int, optionValue: array<int, string>}>
+     */
+    private function getOptionsForBuilder(): array
+    {
+        $options = $this->pollOptions;
+        \ksort($options);
+
+        return \array_values(\array_map(
+            static fn(array $option) => [
+                'optionID' => $option['optionID'],
+                'optionValue' => [L10nStorage::MONOLINGUAL => $option['optionValue']],
+            ],
+            $options
+        ));
+    }
+
     /**
      * Saves the poll for the given poll container using the given poll data and returns the id
      * of the relevant poll or `null` if the poll container has no poll after the update.
@@ -466,7 +493,7 @@ public function getPollOptions(array $pollIDs)
      */
     public function getRelatedObject(Poll $poll)
     {
-        if ($poll->objectID !== 0) {
+        if (!$poll->isStandalone() && $poll->objectID !== 0) {
             return $this->getHandler($poll->objectTypeID)->getRelatedObject($poll);
         }
 
diff --git a/wcfsetup/install/files/lib/system/view/poll/PollWidgetView.class.php b/wcfsetup/install/files/lib/system/view/poll/PollWidgetView.class.php
new file mode 100644
index 00000000000..de86eb2d474
--- /dev/null
+++ b/wcfsetup/install/files/lib/system/view/poll/PollWidgetView.class.php
@@ -0,0 +1,87 @@
+<?php
+
+namespace wcf\system\view\poll;
+
+use wcf\data\poll\Poll;
+use wcf\system\interaction\InteractionContextMenuComponent;
+use wcf\system\interaction\InteractionContextMenuComponentConfiguration;
+use wcf\system\interaction\user\PollInteractions;
+use wcf\system\WCF;
+use wcf\util\StringUtil;
+
+/**
+ * Renders a standalone poll that has been embedded into a message.
+ *
+ * The output contains both the vote form and the results, the client switches
+ * between them without reloading the poll.
+ *
+ * @author      Marcel Werk
+ * @copyright   2001-2026 WoltLab GmbH
+ * @license     GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
+ * @since       6.3
+ */
+final class PollWidgetView implements \Stringable
+{
+    public function __construct(
+        private readonly Poll $poll,
+    ) {}
+
+    #[\Override]
+    public function __toString(): string
+    {
+        // The order of the results can differ from the order of the options,
+        // the results are reordered through CSS to keep the rows in place.
+        $resultPositions = [];
+        $leadingVotes = 0;
+        foreach (\array_values($this->poll->getOptions(true)) as $position => $option) {
+            $resultPositions[$option->optionID] = $position;
+            $leadingVotes = \max($leadingVotes, $option->votes);
+        }
+
+        // The same poll can be embedded multiple times on a page.
+        $elementID = 'poll' . $this->poll->pollID . '_' . \substr(StringUtil::getRandomID(), 0, 8);
+
+        $interactionButton = $interactionInitialization = '';
+        if ($this->poll->canManage()) {
+            // The widget itself serves as the container of the interactions.
+            $component = new InteractionContextMenuComponent(
+                new PollInteractions(),
+                new InteractionContextMenuComponentConfiguration(
+                    cssClassName: 'pollWidget__interactions',
+                    buttonCssClassName: 'pollWidget__interactionButton',
+                )
+            );
+            $interactionButton = $component->renderButton($this->poll);
+            if ($interactionButton !== '') {
+                $interactionInitialization = $component->renderInitialization($elementID);
+            }
+        }
+
+        return WCF::getTPL()->render('wcf', 'shared_bbcode_poll', [
+            'poll' => $this->poll,
+            'options' => $this->poll->getOptions(),
+            'resultPositions' => $resultPositions,
+            'leadingVotes' => $leadingVotes,
+            'initialState' => $this->getInitialState(),
+            'elementID' => $elementID,
+            'interactionButton' => $interactionButton,
+            'interactionInitialization' => $interactionInitialization,
+        ]);
+    }
+
+    /**
+     * @return 'vote'|'results'
+     */
+    private function getInitialState(): string
+    {
+        if ($this->poll->canVote() && !$this->poll->isParticipant()) {
+            return 'vote';
+        }
+
+        if ($this->poll->canSeeResult()) {
+            return 'results';
+        }
+
+        return 'vote';
+    }
+}
diff --git a/wcfsetup/install/files/style/ui/poll.scss b/wcfsetup/install/files/style/ui/poll.scss
index 1ed26e09858..af2f6349be7 100644
--- a/wcfsetup/install/files/style/ui/poll.scss
+++ b/wcfsetup/install/files/style/ui/poll.scss
@@ -1,4 +1,4 @@
-/* poll create/edit form */
+/* poll create/edit form, deprecated since 6.3: use standalone polls that are embedded through the `[poll]` BBCode instead */
 .pollOptionContainer .pollOptionInput {
 	column-gap: 5px;
 	margin: 5px 0;
@@ -22,7 +22,7 @@
 	}
 }
 
-/* displayed poll */
+/* displayed poll, deprecated since 6.3: use standalone polls that are embedded through the `[poll]` BBCode instead */
 .pollContainer {
 	background-color: var(--wcfContentContainerBackground);
 	border: 1px solid var(--wcfContentBorderInner);
@@ -99,3 +99,198 @@
 html[data-color-scheme="dark"] .pollMeterValue {
 	background-color: rgb(255 255 255 / 34%);
 }
+
+/* option list of the poll editor dialog */
+.pollOptionList {
+	display: flex;
+	flex-direction: column;
+	gap: 5px;
+}
+
+.pollOptionListItem {
+	align-items: center;
+	column-gap: 5px;
+	display: flex;
+}
+
+.pollOptionListItem__handle {
+	cursor: move;
+}
+
+.pollOptionListItem .inputAddon,
+.pollOptionListItem__value {
+	flex: 1 1 auto;
+}
+
+.pollOptionList + .pollOptionList__addItem {
+	margin-top: 10px;
+}
+
+/* poll manager */
+.dialog.dialog--pollManager {
+	height: min(640px, calc(100vh - 140px), var(--dialog-max-height));
+	max-width: min(720px, var(--dialog-max-width));
+	min-height: min(420px, var(--dialog-max-height));
+	width: 100%;
+
+	.dialog__document,
+	.dialog__form {
+		height: 100%;
+	}
+
+	.dialog__content {
+		flex: 1 1 auto;
+	}
+
+	.dialog__control {
+		border-top: 1px solid var(--wcfContentBorderInner);
+		margin-top: 0;
+		padding-top: 12px;
+	}
+}
+
+.dialog--pollManager .listView__header {
+	align-items: center;
+	background-color: var(--wcfContentBackground);
+	border-bottom: 1px solid var(--wcfContentBorderInner);
+	gap: 8px;
+	margin-bottom: 16px;
+	padding: 0 0 12px;
+	position: sticky;
+	top: 0;
+	z-index: 3;
+
+	.listView__header__additionalContent {
+		flex: 1 1 200px;
+	}
+
+	.button {
+		min-height: 36px;
+	}
+}
+
+/* The selection is handled by the poll manager, there is no edit mode. */
+.dialog--pollManager .listView__header__button:has(> .listView__editMode__toggle) {
+	display: none;
+}
+
+.pollManager__search {
+	align-items: center;
+	display: flex;
+	flex: 1 1 auto;
+	position: relative;
+
+	> fa-icon {
+		color: var(--wcfContentDimmedText);
+		left: 10px;
+		pointer-events: none;
+		position: absolute;
+	}
+}
+
+.pollManager__searchInput {
+	min-height: 36px;
+	padding-left: 34px !important;
+	width: 100%;
+}
+
+.listView__items.pollManager {
+	display: flex;
+	flex-direction: column;
+	gap: 8px;
+}
+
+.pollManager__item {
+	align-items: center;
+	border: 1px solid var(--wcfContentBorderInner);
+	border-radius: var(--wcfBorderRadius);
+	cursor: pointer;
+	display: flex;
+	gap: 12px;
+	padding: 10px 12px;
+
+	&:hover {
+		background-color: var(--wcfTabularBoxBackgroundActive);
+	}
+
+	&:focus-visible {
+		outline: 2px solid var(--wcfContentLink);
+		outline-offset: 1px;
+	}
+}
+
+.pollManager__item--selected {
+	border-color: var(--wcfContentLink);
+	box-shadow: 0 0 0 1px var(--wcfContentLink);
+}
+
+.pollManager__item__indicator {
+	align-items: center;
+	border: 2px solid var(--wcfContentBorderInner);
+	border-radius: 50%;
+	color: #fff;
+	display: flex;
+	flex: 0 0 auto;
+	height: 22px;
+	justify-content: center;
+	width: 22px;
+
+	> fa-icon {
+		visibility: hidden;
+	}
+}
+
+.pollManager__item--selected .pollManager__item__indicator {
+	background-color: var(--wcfButtonPrimaryBackground);
+	border-color: var(--wcfButtonPrimaryBackground);
+
+	> fa-icon {
+		visibility: visible;
+	}
+}
+
+.pollManager__item__content {
+	flex: 1 1 auto;
+	min-width: 0;
+}
+
+.pollManager__item__question {
+	color: var(--wcfContentHeadlineText);
+	font-weight: 500;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.pollManager__item__meta {
+	color: var(--wcfContentDimmedText);
+	font-size: 12px;
+}
+
+.pollManager__item__menu {
+	flex: 0 0 auto;
+}
+
+.pollManager__selectionInfo {
+	align-self: center;
+	color: var(--wcfContentDimmedText);
+	grid-area: extra;
+	min-width: 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+
+	strong {
+		color: var(--wcfContentHeadlineText);
+		font-weight: 500;
+	}
+}
+
+.dialog__control--duo-stacked,
+.dialog__control--extra-stacked,
+.dialog__control--tripple-stacked {
+	.pollManager__selectionInfo {
+		grid-area: auto;
+		grid-column: 1 / -1;
+	}
+}
diff --git a/wcfsetup/install/files/style/ui/pollWidget.scss b/wcfsetup/install/files/style/ui/pollWidget.scss
new file mode 100644
index 00000000000..2f8af06a102
--- /dev/null
+++ b/wcfsetup/install/files/style/ui/pollWidget.scss
@@ -0,0 +1,296 @@
+/* embedded standalone poll, the question is qualified to override the styles of `.htmlContent` */
+.pollWidget {
+	background-color: var(--wcfContentContainerBackground);
+	border: 1px solid var(--wcfContentBorderInner);
+	border-radius: var(--wcfBorderRadiusContainer);
+	color: var(--wcfContentText);
+	margin: 20px 0;
+	max-width: 600px;
+
+	&[aria-busy="true"] {
+		cursor: progress;
+	}
+}
+
+.pollWidget__header {
+	padding: 18px 18px 14px;
+}
+
+.pollWidget__eyebrow {
+	align-items: center;
+	color: var(--wcfContentDimmedText);
+	display: flex;
+	flex-wrap: wrap;
+	gap: 6px;
+
+	@include wcfFontSmall;
+}
+
+.pollWidget__label {
+	font-weight: 500;
+	letter-spacing: 0.06em;
+	text-transform: uppercase;
+}
+
+.pollWidget__separator {
+	background-color: currentColor;
+	border-radius: 50%;
+	height: 3px;
+	width: 3px;
+}
+
+.pollWidget__interactions {
+	margin-left: auto;
+}
+
+.pollWidget__interactionButton {
+	align-items: center;
+	border-radius: var(--wcfBorderRadius);
+	color: var(--wcfContentDimmedText);
+	cursor: pointer;
+	display: flex;
+	height: 28px;
+	justify-content: center;
+	margin: -6px -6px -6px 0;
+	width: 28px;
+
+	&:hover,
+	.dropdownOpen > & {
+		background-color: var(--wcfTabularBoxBackgroundActive);
+		color: var(--wcfContentText);
+	}
+}
+
+.pollWidget h3.pollWidget__question {
+	color: var(--wcfContentHeadlineText);
+	margin: 8px 0 0;
+	text-wrap: pretty;
+
+	@include wcfFontHeadline;
+
+	& {
+		font-weight: 600;
+	}
+}
+
+.pollWidget__hint {
+	color: var(--wcfContentDimmedText);
+	margin-top: 4px;
+
+	@include wcfFontSmall;
+}
+
+.pollWidget__options {
+	display: flex;
+	flex-direction: column;
+	gap: 6px;
+	padding: 0 12px;
+}
+
+.pollWidget__option {
+	align-items: center;
+	background-color: color-mix(in srgb, var(--wcfContentText) 3%, transparent);
+	border: 1px solid var(--wcfContentBorderInner);
+	border-radius: var(--wcfBorderRadius);
+	display: flex;
+	gap: 11px;
+	isolation: isolate;
+	overflow: hidden;
+	padding: 0 12px;
+	position: relative;
+}
+
+.pollWidget__indicator,
+.pollWidget__ownVote {
+	border-radius: 50%;
+	flex: 0 0 auto;
+	height: 16px;
+	position: relative;
+	width: 16px;
+}
+
+.pollWidget__indicator {
+	border: 1.5px solid var(--wcfContentDimmedText);
+}
+
+.pollWidget__input[type="checkbox"] + .pollWidget__indicator {
+	border-radius: var(--wcfBorderRadius);
+}
+
+.pollWidget__input:checked + .pollWidget__indicator {
+	background-color: var(--wcfButtonPrimaryBackground);
+	border-color: var(--wcfButtonPrimaryBackground);
+}
+
+.pollWidget__input[type="radio"]:checked + .pollWidget__indicator {
+	box-shadow: inset 0 0 0 3px var(--wcfContentContainerBackground);
+}
+
+.pollWidget__input[type="checkbox"]:checked + .pollWidget__indicator::after,
+.pollWidget__ownVote::after {
+	border: solid var(--wcfButtonPrimaryText);
+	border-width: 0 2px 2px 0;
+	content: "";
+	height: 8px;
+	left: 50%;
+	position: absolute;
+	top: 45%;
+	transform: translate(-50%, -50%) rotate(45deg);
+	width: 4px;
+}
+
+.pollWidget__text {
+	min-width: 0;
+	overflow-wrap: anywhere;
+	padding: 10px 0;
+}
+
+.pollWidget__ownVote {
+	background-color: var(--wcfButtonPrimaryBackground);
+}
+
+.pollWidget__bar {
+	animation: pollWidgetBar 0.5s cubic-bezier(0.2, 0.7, 0.2, 1);
+	background-color: color-mix(in srgb, var(--wcfContentText) 8%, transparent);
+	inset: 0 auto 0 0;
+	position: absolute;
+	width: var(--pollWidget-percent);
+	z-index: -1;
+}
+
+.pollWidget__option--leading .pollWidget__bar {
+	background-color: color-mix(in srgb, var(--wcfButtonPrimaryBackground) 18%, transparent);
+}
+
+@keyframes pollWidgetBar {
+	from {
+		width: 0;
+	}
+}
+
+@media (prefers-reduced-motion: reduce) {
+	.pollWidget__bar {
+		animation: none;
+	}
+}
+
+.pollWidget__value {
+	align-items: baseline;
+	color: var(--wcfContentDimmedText);
+	display: flex;
+	flex: 0 0 auto;
+	font-variant-numeric: tabular-nums;
+	gap: 8px;
+	margin-left: auto;
+}
+
+.pollWidget__count {
+	@include wcfFontSmall;
+}
+
+.pollWidget__percent {
+	font-weight: 500;
+	min-width: 38px;
+	text-align: right;
+}
+
+.pollWidget__option--leading .pollWidget__percent {
+	color: var(--wcfContentText);
+	font-weight: 600;
+}
+
+/* vote state */
+.pollWidget[data-state="vote"] {
+	.pollWidget__hint--results,
+	.pollWidget__actions--results,
+	.pollWidget__bar,
+	.pollWidget__value,
+	.pollWidget__resultLabel,
+	.pollWidget__ownVote {
+		display: none;
+	}
+}
+
+.pollWidget[data-state="vote"][data-can-vote="true"] .pollWidget__option {
+	cursor: pointer;
+
+	&:hover {
+		background-color: var(--wcfTabularBoxBackgroundActive);
+	}
+
+	&:has(.pollWidget__input:checked) {
+		background-color: color-mix(in srgb, var(--wcfButtonPrimaryBackground) 9%, transparent);
+		border-color: var(--wcfButtonPrimaryBackground);
+	}
+
+	&:has(.pollWidget__input:focus-visible) {
+		outline: 2px solid var(--wcfContentLink);
+		outline-offset: 1px;
+	}
+
+	&:has(.pollWidget__input:disabled) {
+		cursor: not-allowed;
+		opacity: 0.5;
+	}
+}
+
+/* results state */
+.pollWidget[data-state="results"] {
+	.pollWidget__hint--vote,
+	.pollWidget__actions--vote,
+	.pollWidget__indicator {
+		display: none;
+	}
+
+	.pollWidget__option {
+		border-color: transparent;
+		order: var(--pollWidget-order);
+	}
+}
+
+.pollWidget__footer {
+	border-top: 1px solid var(--wcfContentBorderInner);
+	display: flex;
+	flex-direction: column;
+	gap: 12px;
+	margin-top: 14px;
+	padding: 12px 18px 16px;
+
+	&:not(:has(> *)) {
+		display: none;
+	}
+}
+
+.pollWidget__meta {
+	color: var(--wcfContentDimmedText);
+	display: flex;
+	flex-wrap: wrap;
+	gap: 6px 14px;
+
+	@include wcfFontSmall;
+}
+
+.pollWidget__metaItem {
+	align-items: center;
+	display: flex;
+	gap: 6px;
+}
+
+.pollWidget__actions {
+	align-items: center;
+	display: flex;
+	flex-wrap: wrap;
+	gap: 10px;
+}
+
+.pollWidget__link {
+	color: var(--wcfContentDimmedText);
+	cursor: pointer;
+	margin-left: auto;
+
+	@include wcfFontSmall;
+
+	&:hover {
+		text-decoration: underline;
+	}
+}
diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 8eef1973ee0..65f1ff681b4 100644
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -21,6 +21,8 @@
 	<category name="wcf.acl.option">
 		<item name="wcf.acl.option.com.woltlab.wcf.label.canViewLabel"><![CDATA[Kann Labels sehen]]></item>
 		<item name="wcf.acl.option.com.woltlab.wcf.label.canSetLabel"><![CDATA[Kann Labels setzen]]></item>
+		<item name="wcf.acl.option.com.woltlab.wcf.poll.canViewPoll"><![CDATA[Kann Umfrage sehen]]></item>
+		<item name="wcf.acl.option.com.woltlab.wcf.poll.canVotePoll"><![CDATA[Kann an Umfrage teilnehmen]]></item>
 		<item name="wcf.acl.option.com.woltlab.wcf.article.category.canViewCategory"><![CDATA[Kann Kategorie betreten]]></item>
 		<item name="wcf.acl.option.com.woltlab.wcf.article.category.canReadArticle"><![CDATA[Kann Artikel lesen]]></item>
 	</category>
@@ -783,6 +785,13 @@ Sie erreichen das Fehlerprotokoll unter: {link controller='ExceptionLogView' isE
 		<item name="wcf.acp.group.option.category.admin.user.option"><![CDATA[Benutzerprofilfelder]]></item>
 		<item name="wcf.acp.group.option.admin.user.canManageUserOption"><![CDATA[Kann Benutzerprofilfelder verwalten]]></item>
 		<item name="wcf.acp.group.option.category.user.message.attachment"><![CDATA[Dateianhänge]]></item>
+		<item name="wcf.acp.group.option.category.user.message.poll"><![CDATA[Umfragen]]></item>
+		<item name="wcf.acp.group.option.user.poll.canVotePoll"><![CDATA[Kann an Umfragen teilnehmen]]></item>
+		<item name="wcf.acp.group.option.user.poll.canVotePoll.description"><![CDATA[Gilt für Umfragen, die in Nachrichten eingebunden werden.]]></item>
+		<item name="wcf.acp.group.option.user.poll.canCreatePoll"><![CDATA[Kann Umfragen erstellen]]></item>
+		<item name="wcf.acp.group.option.user.poll.canCreatePoll.description"><![CDATA[Umfragen können in Nachrichten eingebunden werden.]]></item>
+		<item name="wcf.acp.group.option.user.poll.canStartPublicPoll"><![CDATA[Kann öffentliche Umfragen erstellen]]></item>
+		<item name="wcf.acp.group.option.user.poll.canStartPublicPoll.description"><![CDATA[Die Teilnehmer öffentlicher Umfragen sind für andere Benutzer sichtbar.]]></item>
 		<item name="wcf.acp.group.option.user.attachment.maxSize"><![CDATA[Maximale Dateianhangsgröße]]></item>
 		<item name="wcf.acp.group.option.user.attachment.allowedExtensions"><![CDATA[Erlaubte Dateiendungen]]></item>
 		<item name="wcf.acp.group.option.user.attachment.maxCount"><![CDATA[Maximale Dateianhänge pro Nachricht]]></item>
@@ -900,6 +909,9 @@ Sie erreichen das Fehlerprotokoll unter: {link controller='ExceptionLogView' isE
 		<item name="wcf.acp.group.option.admin.content.cms.canUseMedia"><![CDATA[Kann Medien einbinden]]></item>
 		<item name="wcf.acp.group.option.category.mod.cms"><![CDATA[CMS]]></item>
 		<item name="wcf.acp.group.option.category.mod.article"><![CDATA[Artikel]]></item>
+		<item name="wcf.acp.group.option.category.mod.poll"><![CDATA[Umfragen]]></item>
+		<item name="wcf.acp.group.option.mod.poll.canManagePoll"><![CDATA[Kann alle Umfragen verwalten]]></item>
+		<item name="wcf.acp.group.option.mod.poll.canManagePoll.description"><![CDATA[Gilt für Umfragen, die in Nachrichten eingebunden werden.]]></item>
 		<item name="wcf.acp.group.option.category.mod.page"><![CDATA[Seiten]]></item>
 		<item name="wcf.acp.group.option.category.user.article"><![CDATA[Artikel]]></item>
 		<item name="wcf.acp.group.option.category.user.page"><![CDATA[Seiten]]></item>
@@ -3823,6 +3835,7 @@ Dateianhänge:
 		<item name="wcf.editor.button.group.format"><![CDATA[Text formatieren]]></item>
 		<item name="wcf.editor.button.group.list"><![CDATA[Listen]]></item>
 		<item name="wcf.editor.button.media"><![CDATA[Media]]></item>
+		<item name="wcf.editor.button.poll"><![CDATA[Umfrage]]></item>
 		<item name="wcf.editor.button.page"><![CDATA[CMS-Seite]]></item>
 		<item name="wcf.editor.restoreDraft"><![CDATA[Möchten Sie den zwischengespeicherten Entwurf wiederherstellen?]]></item>
 		<item name="wcf.editor.restoreDraft.preview"><![CDATA[Vorschau]]></item>
@@ -4451,6 +4464,7 @@ Dateianhänge:
 	</category>
 	<category name="wcf.poll">
 		<item name="wcf.poll.button.addOption"><![CDATA[Weitere Antwort hinzufügen]]></item>
+		<item name="wcf.poll.button.changeVote"><![CDATA[Stimme ändern]]></item>
 		<item name="wcf.poll.button.removeOption"><![CDATA[Antwort entfernen]]></item>
 		<item name="wcf.poll.button.showParticipants"><![CDATA[Teilnehmer auflisten]]></item>
 		<item name="wcf.poll.button.showResult"><![CDATA[Ergebnis anzeigen]]></item>
@@ -4463,6 +4477,9 @@ Dateianhänge:
 		<item name="wcf.poll.management"><![CDATA[Umfrage]]></item>
 		<item name="wcf.poll.maxVotes"><![CDATA[Anzahl erlaubter Antworten]]></item>
 		<item name="wcf.poll.maxVotes.error.invalid"><![CDATA[Die Anzahl der erlaubten Antworten liegt über den tatsächlich verfügbaren Antworten.]]></item>
+		<item name="wcf.poll.minVotes"><![CDATA[Mindestanzahl an Antworten]]></item>
+		<item name="wcf.poll.minVotes.description"><![CDATA[Teilnehmer müssen mindestens so viele Antworten wählen. Entspricht der Wert der Anzahl erlaubter Antworten, müssen alle Stimmen genutzt werden.]]></item>
+		<item name="wcf.poll.minVotes.error.invalid"><![CDATA[Die Mindestanzahl darf die Anzahl erlaubter Antworten nicht übersteigen.]]></item>
 		<item name="wcf.poll.multipleVotes"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du kannst{else}Sie können{/if} {#$poll->maxVotes} Antwortmöglichkeiten wählen.]]></item>
 		<item name="wcf.poll.noVotes"><![CDATA[Bisher keine Stimmen]]></item>
 		<item name="wcf.poll.options"><![CDATA[Antworten]]></item>
@@ -4471,9 +4488,32 @@ Dateianhänge:
 		<item name="wcf.poll.restrictedResult"><![CDATA[Das Ergebnis ist nur für Teilnehmer sichtbar.]]></item>
 		<item name="wcf.poll.resultsRequireVote"><![CDATA[Ergebnis erst nach Abgabe der Stimme sichtbar]]></item>
 		<item name="wcf.poll.resultsRequireVote.description"><![CDATA[Das Ergebnis ist erst mit dem Ablauf der Umfrage oder der Abgabe einer Stimme sichtbar.]]></item>
+		<item name="wcf.poll.resultsRequireEnd"><![CDATA[Ergebnis erst nach Ende der Umfrage anzeigen]]></item>
+		<item name="wcf.poll.resultsRequireEnd.description"><![CDATA[Das Ergebnis ist bis zum Ende der Umfrage für niemanden sichtbar, auch nicht für Teilnehmer.]]></item>
+		<item name="wcf.poll.resultsRequireEnd.error.endTimeRequired"><![CDATA[Diese Option erfordert ein Ende der Umfrage.]]></item>
 		<item name="wcf.poll.sortByVotes"><![CDATA[Ergebnis nach Stimmen sortieren]]></item>
 		<item name="wcf.poll.totalVotes"><![CDATA[Insgesamt {#$poll->votes} Stimme{if $poll->votes != 1}n{/if}]]></item>
 		<item name="wcf.poll.endTimeInfo"><![CDATA[Umfrage endet am {@$poll->endTime|plainTime}]]></item>
+		<item name="wcf.poll.access"><![CDATA[Zugriff]]></item>
+		<item name="wcf.poll.add"><![CDATA[Umfrage erstellen]]></item>
+		<item name="wcf.poll.edit"><![CDATA[Umfrage bearbeiten]]></item>
+		<item name="wcf.poll.manager"><![CDATA[Umfragen]]></item>
+		<item name="wcf.poll.manager.item.meta"><![CDATA[{#$poll->votes} Stimme{if $poll->votes != 1}n{/if} · erstellt am {@$poll->time|plainTime}{if $poll->isFinished()} · beendet{/if}]]></item>
+		<item name="wcf.poll.manager.selection.none"><![CDATA[Keine Umfrage ausgewählt]]></item>
+		<item name="wcf.poll.search.placeholder"><![CDATA[Umfragen durchsuchen …]]></item>
+		<item name="wcf.poll.time"><![CDATA[Erstellt]]></item>
+		<item name="wcf.poll.votes"><![CDATA[Stimmen]]></item>
+		<item name="wcf.poll.widget.label"><![CDATA[Umfrage]]></item>
+		<item name="wcf.poll.widget.votes"><![CDATA[{#$poll->votes} Stimme{if $poll->votes != 1}n{/if}]]></item>
+		<item name="wcf.poll.widget.hint.multiple"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Wähle{else}Wählen Sie{/if} bis zu {#$poll->maxVotes} Antworten.]]></item>
+		<item name="wcf.poll.widget.hint.exactly"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Wähle{else}Wählen Sie{/if} genau {#$poll->maxVotes} Antworten.]]></item>
+		<item name="wcf.poll.widget.hint.range"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Wähle{else}Wählen Sie{/if} {#$poll->getRequiredVotes()} bis {#$poll->maxVotes} Antworten.]]></item>
+		<item name="wcf.poll.widget.hint.voted"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du hast{else}Sie haben{/if} abgestimmt.]]></item>
+		<item name="wcf.poll.widget.hint.resultsAfterEnd"><![CDATA[Das Ergebnis wird nach Ende der Umfrage angezeigt.]]></item>
+		<item name="wcf.poll.widget.ownVote"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Deine{else}Ihre{/if} Stimme]]></item>
+		<item name="wcf.poll.widget.endTime"><![CDATA[Endet am {@$poll->endTime|plainTime}]]></item>
+		<item name="wcf.poll.widget.ended"><![CDATA[Beendet am {@$poll->endTime|plainTime}]]></item>
+		<item name="wcf.poll.widget.optionResult"><![CDATA[: {#$option->votes} Stimme{if $option->votes != 1}n{/if}, {#$option->getRelativeVotes($poll)} %]]></item>
 	</category>
 	<category name="wcf.reactions">
 		<item name="wcf.reactions.summary.title"><![CDATA[Reaktionen]]></item>
diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index 2397762b774..b39972d1a2c 100644
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -21,6 +21,8 @@
 	<category name="wcf.acl.option">
 		<item name="wcf.acl.option.com.woltlab.wcf.label.canViewLabel"><![CDATA[Can view labels]]></item>
 		<item name="wcf.acl.option.com.woltlab.wcf.label.canSetLabel"><![CDATA[Can set labels]]></item>
+		<item name="wcf.acl.option.com.woltlab.wcf.poll.canViewPoll"><![CDATA[Can view poll]]></item>
+		<item name="wcf.acl.option.com.woltlab.wcf.poll.canVotePoll"><![CDATA[Can vote in poll]]></item>
 		<item name="wcf.acl.option.com.woltlab.wcf.article.category.canViewCategory"><![CDATA[Can access the category]]></item>
 		<item name="wcf.acl.option.com.woltlab.wcf.article.category.canReadArticle"><![CDATA[Can read articles]]></item>
 	</category>
@@ -761,6 +763,13 @@ You can access the error log at: {link controller='ExceptionLogView' isEmail=tru
 		<item name="wcf.acp.group.option.category.admin.user.option"><![CDATA[User Profile Fields]]></item>
 		<item name="wcf.acp.group.option.admin.user.canManageUserOption"><![CDATA[Can manage user profile fields]]></item>
 		<item name="wcf.acp.group.option.category.user.message.attachment"><![CDATA[Attachments]]></item>
+		<item name="wcf.acp.group.option.category.user.message.poll"><![CDATA[Polls]]></item>
+		<item name="wcf.acp.group.option.user.poll.canVotePoll"><![CDATA[Can participate in polls]]></item>
+		<item name="wcf.acp.group.option.user.poll.canVotePoll.description"><![CDATA[Applies to polls that are embedded into messages.]]></item>
+		<item name="wcf.acp.group.option.user.poll.canCreatePoll"><![CDATA[Can create polls]]></item>
+		<item name="wcf.acp.group.option.user.poll.canCreatePoll.description"><![CDATA[Polls can be embedded into messages.]]></item>
+		<item name="wcf.acp.group.option.user.poll.canStartPublicPoll"><![CDATA[Can create public polls]]></item>
+		<item name="wcf.acp.group.option.user.poll.canStartPublicPoll.description"><![CDATA[The participants of public polls are visible to other users.]]></item>
 		<item name="wcf.acp.group.option.user.attachment.maxSize"><![CDATA[Maximum Attachment File Size]]></item>
 		<item name="wcf.acp.group.option.user.attachment.allowedExtensions"><![CDATA[Allowed Attachment File Extensions]]></item>
 		<item name="wcf.acp.group.option.user.attachment.maxCount"><![CDATA[Maximum Attachments per Message]]></item>
@@ -878,6 +887,9 @@ You can access the error log at: {link controller='ExceptionLogView' isEmail=tru
 		<item name="wcf.acp.group.option.admin.content.cms.canUseMedia"><![CDATA[Can use media]]></item>
 		<item name="wcf.acp.group.option.category.mod.cms"><![CDATA[CMS]]></item>
 		<item name="wcf.acp.group.option.category.mod.article"><![CDATA[Articles]]></item>
+		<item name="wcf.acp.group.option.category.mod.poll"><![CDATA[Polls]]></item>
+		<item name="wcf.acp.group.option.mod.poll.canManagePoll"><![CDATA[Can manage all polls]]></item>
+		<item name="wcf.acp.group.option.mod.poll.canManagePoll.description"><![CDATA[Applies to polls that are embedded into messages.]]></item>
 		<item name="wcf.acp.group.option.category.mod.page"><![CDATA[Pages]]></item>
 		<item name="wcf.acp.group.option.category.user.article"><![CDATA[Articles]]></item>
 		<item name="wcf.acp.group.option.category.user.page"><![CDATA[Pages]]></item>
@@ -3769,6 +3781,7 @@ Attachments:
 		<item name="wcf.editor.button.group.format"><![CDATA[Format Text]]></item>
 		<item name="wcf.editor.button.group.list"><![CDATA[Lists]]></item>
 		<item name="wcf.editor.button.media"><![CDATA[Media]]></item>
+		<item name="wcf.editor.button.poll"><![CDATA[Poll]]></item>
 		<item name="wcf.editor.button.page"><![CDATA[CMS Page]]></item>
 		<item name="wcf.editor.restoreDraft"><![CDATA[Do you want to restore the saved draft?]]></item>
 		<item name="wcf.editor.restoreDraft.preview"><![CDATA[Preview]]></item>
@@ -4450,6 +4463,7 @@ Attachments:
 	</category>
 	<category name="wcf.poll">
 		<item name="wcf.poll.button.addOption"><![CDATA[Add Another Option]]></item>
+		<item name="wcf.poll.button.changeVote"><![CDATA[Change Vote]]></item>
 		<item name="wcf.poll.button.removeOption"><![CDATA[Remove Option]]></item>
 		<item name="wcf.poll.button.showParticipants"><![CDATA[List Participants]]></item>
 		<item name="wcf.poll.button.showResult"><![CDATA[Display Result]]></item>
@@ -4462,6 +4476,9 @@ Attachments:
 		<item name="wcf.poll.management"><![CDATA[Poll]]></item>
 		<item name="wcf.poll.maxVotes"><![CDATA[Maximum Poll Votes]]></item>
 		<item name="wcf.poll.maxVotes.error.invalid"><![CDATA[The maximum number of votes allowed exceeds the number of available options.]]></item>
+		<item name="wcf.poll.minVotes"><![CDATA[Minimum Number of Answers]]></item>
+		<item name="wcf.poll.minVotes.description"><![CDATA[Participants have to choose at least this many answers. If the value matches the number of allowed answers, all votes have to be used.]]></item>
+		<item name="wcf.poll.minVotes.error.invalid"><![CDATA[The minimum number of answers must not exceed the number of allowed answers.]]></item>
 		<item name="wcf.poll.multipleVotes"><![CDATA[You can select up to {#$poll->maxVotes} options.]]></item>
 		<item name="wcf.poll.noVotes"><![CDATA[No votes yet]]></item>
 		<item name="wcf.poll.options"><![CDATA[Poll Options]]></item>
@@ -4470,9 +4487,32 @@ Attachments:
 		<item name="wcf.poll.restrictedResult"><![CDATA[The result is only visible to the participants.]]></item>
 		<item name="wcf.poll.resultsRequireVote"><![CDATA[Restrict the results to the participants only]]></item>
 		<item name="wcf.poll.resultsRequireVote.description"><![CDATA[The results are invisible unless the poll ended or the user voted.]]></item>
+		<item name="wcf.poll.resultsRequireEnd"><![CDATA[Show results only after the poll has ended]]></item>
+		<item name="wcf.poll.resultsRequireEnd.description"><![CDATA[The results remain hidden from everyone, including participants, until the poll has ended.]]></item>
+		<item name="wcf.poll.resultsRequireEnd.error.endTimeRequired"><![CDATA[This option requires an end time for the poll.]]></item>
 		<item name="wcf.poll.sortByVotes"><![CDATA[Sort result by votes]]></item>
 		<item name="wcf.poll.totalVotes"><![CDATA[A total of {#$poll->votes} vote{if $poll->votes != 1}s{/if}]]></item>
 		<item name="wcf.poll.endTimeInfo"><![CDATA[Poll ends on {@$poll->endTime|plainTime}]]></item>
+		<item name="wcf.poll.access"><![CDATA[Access]]></item>
+		<item name="wcf.poll.add"><![CDATA[Create Poll]]></item>
+		<item name="wcf.poll.edit"><![CDATA[Edit Poll]]></item>
+		<item name="wcf.poll.manager"><![CDATA[Polls]]></item>
+		<item name="wcf.poll.manager.item.meta"><![CDATA[{#$poll->votes} vote{if $poll->votes != 1}s{/if} · created {@$poll->time|plainTime}{if $poll->isFinished()} · ended{/if}]]></item>
+		<item name="wcf.poll.manager.selection.none"><![CDATA[No poll selected]]></item>
+		<item name="wcf.poll.search.placeholder"><![CDATA[Search polls …]]></item>
+		<item name="wcf.poll.time"><![CDATA[Created]]></item>
+		<item name="wcf.poll.votes"><![CDATA[Votes]]></item>
+		<item name="wcf.poll.widget.label"><![CDATA[Poll]]></item>
+		<item name="wcf.poll.widget.votes"><![CDATA[{#$poll->votes} Vote{if $poll->votes != 1}s{/if}]]></item>
+		<item name="wcf.poll.widget.hint.multiple"><![CDATA[Choose up to {#$poll->maxVotes} answers.]]></item>
+		<item name="wcf.poll.widget.hint.exactly"><![CDATA[Choose exactly {#$poll->maxVotes} answers.]]></item>
+		<item name="wcf.poll.widget.hint.range"><![CDATA[Choose {#$poll->getRequiredVotes()} to {#$poll->maxVotes} answers.]]></item>
+		<item name="wcf.poll.widget.hint.voted"><![CDATA[You have voted.]]></item>
+		<item name="wcf.poll.widget.hint.resultsAfterEnd"><![CDATA[The results will be shown once the poll has ended.]]></item>
+		<item name="wcf.poll.widget.ownVote"><![CDATA[Your vote]]></item>
+		<item name="wcf.poll.widget.endTime"><![CDATA[Ends on {@$poll->endTime|plainTime}]]></item>
+		<item name="wcf.poll.widget.ended"><![CDATA[Ended on {@$poll->endTime|plainTime}]]></item>
+		<item name="wcf.poll.widget.optionResult"><![CDATA[: {#$option->votes} vote{if $option->votes != 1}s{/if}, {#$option->getRelativeVotes($poll)} %]]></item>
 	</category>
 	<category name="wcf.reactions">
 		<item name="wcf.reactions.summary.title"><![CDATA[Reactions]]></item>
diff --git a/wcfsetup/setup/db/install_com.woltlab.wcf.php b/wcfsetup/setup/db/install_com.woltlab.wcf.php
index 3f99455bd7d..aa7f4efa3fb 100644
--- a/wcfsetup/setup/db/install_com.woltlab.wcf.php
+++ b/wcfsetup/setup/db/install_com.woltlab.wcf.php
@@ -3155,12 +3155,13 @@
     DatabaseTable::create('wcf1_poll')
         ->columns([
             ObjectIdDatabaseTableColumn::create('pollID'),
-            NotNullInt10DatabaseTableColumn::create('objectTypeID'),
+            IntDatabaseTableColumn::create('objectTypeID'),
             NotNullInt10DatabaseTableColumn::create('objectID')
                 ->defaultValue(0),
-            VarcharDatabaseTableColumn::create('question')
-                ->length(255)
+            IntDatabaseTableColumn::create('userID'),
+            NotNullVarchar255DatabaseTableColumn::create('username')
                 ->defaultValue(''),
+            DefaultFalseBooleanDatabaseTableColumn::create('isMultilingual'),
             NotNullInt10DatabaseTableColumn::create('time')
                 ->defaultValue(0),
             NotNullInt10DatabaseTableColumn::create('endTime')
@@ -3169,6 +3170,9 @@
             DefaultFalseBooleanDatabaseTableColumn::create('isPublic'),
             DefaultFalseBooleanDatabaseTableColumn::create('sortByVotes'),
             DefaultFalseBooleanDatabaseTableColumn::create('resultsRequireVote'),
+            DefaultFalseBooleanDatabaseTableColumn::create('resultsRequireEnd'),
+            NotNullInt10DatabaseTableColumn::create('minVotes')
+                ->defaultValue(1),
             NotNullInt10DatabaseTableColumn::create('maxVotes')
                 ->defaultValue(1),
             NotNullInt10DatabaseTableColumn::create('votes')
@@ -3185,13 +3189,42 @@
                 ->referencedColumns(['objectTypeID'])
                 ->onDelete('CASCADE')
                 ->onUpdate('NO ACTION'),
+            DatabaseTableForeignKey::create()
+                ->columns(['userID'])
+                ->referencedTable('wcf1_user')
+                ->referencedColumns(['userID'])
+                ->onDelete('SET NULL')
+                ->onUpdate('NO ACTION'),
+        ]),
+    DatabaseTable::create('wcf1_poll_l10n')
+        ->columns([
+            NotNullInt10DatabaseTableColumn::create('pollID'),
+            IntDatabaseTableColumn::create('languageID'),
+            VarcharDatabaseTableColumn::create('question')
+                ->length(255),
+        ])
+        ->indices([
+            DatabaseTableIndex::create('pollID')
+                ->columns(['pollID', 'languageID']),
+        ])
+        ->foreignKeys([
+            DatabaseTableForeignKey::create()
+                ->columns(['pollID'])
+                ->referencedTable('wcf1_poll')
+                ->referencedColumns(['pollID'])
+                ->onDelete('CASCADE')
+                ->onUpdate('NO ACTION'),
+            DatabaseTableForeignKey::create()
+                ->columns(['languageID'])
+                ->referencedTable('wcf1_language')
+                ->referencedColumns(['languageID'])
+                ->onDelete('CASCADE')
+                ->onUpdate('NO ACTION'),
         ]),
     DatabaseTable::create('wcf1_poll_option')
         ->columns([
             ObjectIdDatabaseTableColumn::create('optionID'),
             NotNullInt10DatabaseTableColumn::create('pollID'),
-            NotNullVarchar255DatabaseTableColumn::create('optionValue')
-                ->defaultValue(''),
             NotNullInt10DatabaseTableColumn::create('votes')
                 ->defaultValue(0),
             NotNullInt10DatabaseTableColumn::create('showOrder')
@@ -3209,6 +3242,31 @@
                 ->onDelete('CASCADE')
                 ->onUpdate('NO ACTION'),
         ]),
+    DatabaseTable::create('wcf1_poll_option_l10n')
+        ->columns([
+            NotNullInt10DatabaseTableColumn::create('optionID'),
+            IntDatabaseTableColumn::create('languageID'),
+            VarcharDatabaseTableColumn::create('optionValue')
+                ->length(255),
+        ])
+        ->indices([
+            DatabaseTableIndex::create('optionID')
+                ->columns(['optionID', 'languageID']),
+        ])
+        ->foreignKeys([
+            DatabaseTableForeignKey::create()
+                ->columns(['optionID'])
+                ->referencedTable('wcf1_poll_option')
+                ->referencedColumns(['optionID'])
+                ->onDelete('CASCADE')
+                ->onUpdate('NO ACTION'),
+            DatabaseTableForeignKey::create()
+                ->columns(['languageID'])
+                ->referencedTable('wcf1_language')
+                ->referencedColumns(['languageID'])
+                ->onDelete('CASCADE')
+                ->onUpdate('NO ACTION'),
+        ]),
     DatabaseTable::create('wcf1_poll_option_vote')
         ->columns([
             NotNullInt10DatabaseTableColumn::create('pollID'),