diff --git a/examples/SampleApp/src/screens/ChannelScreen.tsx b/examples/SampleApp/src/screens/ChannelScreen.tsx
index 9f50ee470f..9f5c174031 100644
--- a/examples/SampleApp/src/screens/ChannelScreen.tsx
+++ b/examples/SampleApp/src/screens/ChannelScreen.tsx
@@ -117,10 +117,9 @@ const ChannelHeader: React.FC<ChannelHeaderProps> = ({ channel }) => {
 // Either provide channel or channelId.
 export const ChannelScreen: React.FC<ChannelScreenProps> = ({
   navigation,
-  route: {
-    params: { channel: channelFromProp, channelId, messageId },
-  },
+  route,
 }) => {
+  const { channel: channelFromProp, channelId, messageId } = route.params;
   const {
     chatClient,
     messageListImplementation,
@@ -180,14 +179,20 @@ export const ChannelScreen: React.FC<ChannelScreenProps> = ({
       if (!thread || !channel) {
         return;
       }
+
+      if (messageId) {
+        navigation.setParams({ messageId: undefined });
+      }
+
       setSelectedThread(thread);
       setThread(thread);
       navigation.navigate('ThreadScreen', {
         channel,
         thread,
+        targetedMessageId: undefined,
       });
     },
-    [channel, navigation, setThread],
+    [channel, messageId, navigation, setThread],
   );
 
   const onAlsoSentToChannelHeaderPress = useCallback(
@@ -195,6 +200,11 @@ export const ChannelScreen: React.FC<ChannelScreenProps> = ({
       if (!channel || !parentMessage) {
         return;
       }
+
+      if (messageId) {
+        navigation.setParams({ messageId: undefined });
+      }
+
       setSelectedThread(parentMessage);
       setThread(parentMessage);
       const params: StackNavigatorParamList['ThreadScreen'] = {
@@ -202,11 +212,11 @@ export const ChannelScreen: React.FC<ChannelScreenProps> = ({
         targetedMessageId,
         thread: parentMessage,
       };
-      const hasThreadInStack = navigation.getState().routes.some((route) => {
-        if (route.name !== 'ThreadScreen') {
+      const hasThreadInStack = navigation.getState().routes.some((stackRoute) => {
+        if (stackRoute.name !== 'ThreadScreen') {
           return false;
         }
-        const routeParams = route.params as StackNavigatorParamList['ThreadScreen'] | undefined;
+        const routeParams = stackRoute.params as StackNavigatorParamList['ThreadScreen'] | undefined;
         const routeThreadId =
           (routeParams?.thread as LocalMessage)?.id ??
           (routeParams?.thread as ThreadType)?.thread?.id;
@@ -221,7 +231,7 @@ export const ChannelScreen: React.FC<ChannelScreenProps> = ({
 
       navigation.navigate('ThreadScreen', params);
     },
-    [channel, navigation, setThread],
+    [channel, messageId, navigation, setThread],
   );
 
   const handleMessageInfo = useCallback((message: LocalMessage) => {
diff --git a/examples/SampleApp/src/screens/ThreadScreen.tsx b/examples/SampleApp/src/screens/ThreadScreen.tsx
index 715ff04515..dc7347ed9f 100644
--- a/examples/SampleApp/src/screens/ThreadScreen.tsx
+++ b/examples/SampleApp/src/screens/ThreadScreen.tsx
@@ -74,10 +74,9 @@ const ThreadHeader: React.FC<ThreadHeaderProps> = ({ thread }) => {
 
 export const ThreadScreen: React.FC<ThreadScreenProps> = ({
   navigation,
-  route: {
-    params: { channel, thread, targetedMessageId: targetedMessageIdFromParams },
-  },
+  route,
 }) => {
+  const { channel, thread, targetedMessageId: targetedMessageIdFromParams } = route.params;
   const {
     theme: {
       semantics,
@@ -88,6 +87,7 @@ export const ThreadScreen: React.FC<ThreadScreenProps> = ({
   const { t } = useTranslationContext();
   const { setThread } = useStreamChatContext();
   const { messageInputFloating, messageListImplementation } = useAppContext();
+
   const onPressMessage: NonNullable<React.ComponentProps<typeof Channel>['onPressMessage']> = (
     payload,
   ) => {
@@ -126,11 +126,11 @@ export const ThreadScreen: React.FC<ThreadScreenProps> = ({
       };
       const hasChannelInStack = navigation
         .getState()
-        .routes.some((route) => {
-          if (route.name !== 'ChannelScreen') {
+        .routes.some((stackRoute) => {
+          if (stackRoute.name !== 'ChannelScreen') {
             return false;
           }
-          const routeParams = route.params as StackNavigatorParamList['ChannelScreen'] | undefined;
+          const routeParams = stackRoute.params as StackNavigatorParamList['ChannelScreen'] | undefined;
           const routeChannelId = routeParams?.channel?.id ?? routeParams?.channelId;
           return routeChannelId === channel.id;
         });
diff --git a/package/src/components/Poll/CreatePollContent.tsx b/package/src/components/Poll/CreatePollContent.tsx
index 75eb97e370..775cee2d72 100644
--- a/package/src/components/Poll/CreatePollContent.tsx
+++ b/package/src/components/Poll/CreatePollContent.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { StyleSheet, Switch, Text, View } from 'react-native';
 
 import { ScrollView } from 'react-native-gesture-handler';
-import { useSharedValue } from 'react-native-reanimated';
+import Animated, { LinearTransition, useSharedValue } from 'react-native-reanimated';
 
 import { PollComposerState, VotingVisibility } from 'stream-chat';
 
@@ -153,49 +153,57 @@ export const CreatePollContent = () => {
       >
         <NameField />
         <CreatePollOptions currentOptionPositions={currentOptionPositions} />
-        <View style={[styles.optionCardWrapper, optionCardWrapper]}>
+        <Animated.View
+          layout={LinearTransition.duration(200)}
+          style={[styles.optionCardWrapper, optionCardWrapper]}
+        >
           <MultipleAnswersField />
-          <View style={[styles.optionCard, anonymousPoll.wrapper]}>
-            <View style={[styles.optionCardContent, anonymousPoll.optionCardContent]}>
-              <Text style={[styles.title, anonymousPoll.title]}>{t('Anonymous voting')}</Text>
-              <Text style={[styles.description, anonymousPoll.description]}>Hide who voted</Text>
-            </View>
+          <Animated.View
+            layout={LinearTransition.duration(200)}
+            style={[styles.optionCardWrapper, optionCardWrapper]}
+          >
+            <View style={[styles.optionCard, anonymousPoll.wrapper]}>
+              <View style={[styles.optionCardContent, anonymousPoll.optionCardContent]}>
+                <Text style={[styles.title, anonymousPoll.title]}>{t('Anonymous voting')}</Text>
+                <Text style={[styles.description, anonymousPoll.description]}>Hide who voted</Text>
+              </View>
 
-            <Switch
-              onValueChange={onAnonymousPollChangeHandler}
-              value={isAnonymousPoll}
-              style={[styles.optionCardSwitch, anonymousPoll.optionCardSwitch]}
-            />
-          </View>
-          <View style={[styles.optionCard, suggestOption.wrapper]}>
-            <View style={[styles.optionCardContent, suggestOption.optionCardContent]}>
-              <Text style={[styles.title, suggestOption.title]}>{t('Suggest an option')}</Text>
-              <Text style={[styles.description, suggestOption.description]}>
-                Let others add options
-              </Text>
+              <Switch
+                onValueChange={onAnonymousPollChangeHandler}
+                value={isAnonymousPoll}
+                style={[styles.optionCardSwitch, anonymousPoll.optionCardSwitch]}
+              />
             </View>
+            <View style={[styles.optionCard, suggestOption.wrapper]}>
+              <View style={[styles.optionCardContent, suggestOption.optionCardContent]}>
+                <Text style={[styles.title, suggestOption.title]}>{t('Suggest an option')}</Text>
+                <Text style={[styles.description, suggestOption.description]}>
+                  Let others add options
+                </Text>
+              </View>
 
-            <Switch
-              onValueChange={onAllowUserSuggestedOptionsChangeHandler}
-              value={allowUserSuggestedOptions}
-              style={[styles.optionCardSwitch, suggestOption.optionCardSwitch]}
-            />
-          </View>
-          <View style={[styles.optionCard, addComment.wrapper]}>
-            <View style={[styles.optionCardContent, addComment.optionCardContent]}>
-              <Text style={[styles.title, addComment.title]}>{t('Add a comment')}</Text>
-              <Text style={[styles.description, addComment.description]}>
-                Add a comment to the poll
-              </Text>
+              <Switch
+                onValueChange={onAllowUserSuggestedOptionsChangeHandler}
+                value={allowUserSuggestedOptions}
+                style={[styles.optionCardSwitch, suggestOption.optionCardSwitch]}
+              />
             </View>
+            <View style={[styles.optionCard, addComment.wrapper]}>
+              <View style={[styles.optionCardContent, addComment.optionCardContent]}>
+                <Text style={[styles.title, addComment.title]}>{t('Add a comment')}</Text>
+                <Text style={[styles.description, addComment.description]}>
+                  Add a comment to the poll
+                </Text>
+              </View>
 
-            <Switch
-              onValueChange={onAllowAnswersChangeHandler}
-              value={allowAnswers}
-              style={[styles.optionCardSwitch, addComment.optionCardSwitch]}
-            />
-          </View>
-        </View>
+              <Switch
+                onValueChange={onAllowAnswersChangeHandler}
+                value={allowAnswers}
+                style={[styles.optionCardSwitch, addComment.optionCardSwitch]}
+              />
+            </View>
+          </Animated.View>
+        </Animated.View>
       </ScrollView>
     </>
   );
diff --git a/package/src/components/Poll/Poll.tsx b/package/src/components/Poll/Poll.tsx
index b0e63bbd20..dfaea9d8e7 100644
--- a/package/src/components/Poll/Poll.tsx
+++ b/package/src/components/Poll/Poll.tsx
@@ -3,7 +3,7 @@ import { StyleSheet, Text, View } from 'react-native';
 
 import { PollOption as PollOptionClass } from 'stream-chat';
 
-import { PollButtons, PollOption } from './components';
+import { PollButtons, PollOption, ShowAllOptionsButton } from './components';
 
 import { usePollState } from './hooks/usePollState';
 
@@ -16,6 +16,7 @@ import {
 } from '../../contexts';
 
 import { primitives } from '../../theme';
+import { defaultPollOptionCount } from '../../utils/constants';
 
 export type PollProps = Pick<PollContextValue, 'poll' | 'message'> &
   Pick<MessagesContextValue, 'PollContent'>;
@@ -79,10 +80,11 @@ export const PollContent = ({
       {PollHeaderOverride ? <PollHeaderOverride /> : <PollHeader />}
       <View style={[styles.optionsWrapper, optionsWrapper]}>
         {options
-          ?.slice(0, 10)
+          ?.slice(0, defaultPollOptionCount)
           ?.map((option: PollOptionClass) => (
             <PollOption key={`message_poll_option_${option.id}`} option={option} />
           ))}
+        <ShowAllOptionsButton />
       </View>
       {PollButtonsOverride ? <PollButtonsOverride /> : <PollButtons />}
     </View>
diff --git a/package/src/components/Poll/components/CreatePollOptions.tsx b/package/src/components/Poll/components/CreatePollOptions.tsx
index 300d970bb5..2bafed4678 100644
--- a/package/src/components/Poll/components/CreatePollOptions.tsx
+++ b/package/src/components/Poll/components/CreatePollOptions.tsx
@@ -12,7 +12,6 @@ import Animated, {
   useSharedValue,
   withDelay,
   withSpring,
-  withTiming,
 } from 'react-native-reanimated';
 
 import { PollComposerOption, PollComposerState } from 'stream-chat';
@@ -580,11 +579,11 @@ export const CreatePollOptions = ({ currentOptionPositions }: CreatePollOptionsP
   useAnimatedReaction(
     () => currentOptionPositions.value.totalHeight,
     (currentValue, previousValue) => {
-      if (currentValue !== previousValue) {
-        animatedOptionsContainerHeight.value = withTiming(currentValue, {
-          duration: 200,
-        });
+      if (currentValue === previousValue) {
+        return;
       }
+
+      animatedOptionsContainerHeight.value = currentValue;
     },
   );
 
@@ -707,7 +706,7 @@ export const CreatePollOptions = ({ currentOptionPositions }: CreatePollOptionsP
   return (
     <View style={[styles.container, container]}>
       <Text style={[styles.title, title]}>{t('Options')}</Text>
-      <Animated.View style={animatedOptionsContainerStyle}>
+      <Animated.View layout={LinearTransition.duration(200)} style={animatedOptionsContainerStyle}>
         {options.map((option, index) => (
           <MemoizedCreatePollOption
             optionsCount={options.length}
diff --git a/package/src/components/Poll/components/MultipleAnswersField.tsx b/package/src/components/Poll/components/MultipleAnswersField.tsx
index 2d28921637..f7cd0805ef 100644
--- a/package/src/components/Poll/components/MultipleAnswersField.tsx
+++ b/package/src/components/Poll/components/MultipleAnswersField.tsx
@@ -1,26 +1,20 @@
 import React, { useCallback, useMemo, useState } from 'react';
 import { StyleSheet, Switch, Text, View } from 'react-native';
 
-import { PollComposerState } from 'stream-chat';
+import Animated, { LinearTransition } from 'react-native-reanimated';
+
+import { MultipleVotesSettings } from './MultipleVotesSettings';
 
 import { useTheme, useTranslationContext } from '../../../contexts';
 import { useMessageComposer } from '../../../contexts/messageInputContext/hooks/useMessageComposer';
-import { useStateStore } from '../../../hooks/useStateStore';
 import { primitives } from '../../../theme';
-import { Input } from '../../ui/Input/Input';
-
-const pollComposerStateSelector = (state: PollComposerState) => ({
-  error: state.errors.max_votes_allowed,
-  max_votes_allowed: state.data.max_votes_allowed,
-});
 
 export const MultipleAnswersField = () => {
   const [allowMultipleVotes, setAllowMultipleVotes] = useState<boolean>(false);
   const { t } = useTranslationContext();
   const messageComposer = useMessageComposer();
   const { pollComposer } = messageComposer;
-  const { handleFieldBlur, updateFields } = pollComposer;
-  const { error, max_votes_allowed } = useStateStore(pollComposer.state, pollComposerStateSelector);
+  const { updateFields } = pollComposer;
 
   const {
     theme: {
@@ -40,24 +34,16 @@ export const MultipleAnswersField = () => {
     [updateFields],
   );
 
-  const onChangeTextHandler = useCallback(
-    async (newText: string) => {
-      await updateFields({ max_votes_allowed: newText });
-    },
-    [updateFields],
-  );
-
-  const onBlurHandler = useCallback(async () => {
-    await handleFieldBlur('max_votes_allowed');
-  }, [handleFieldBlur]);
-
   return (
-    <View style={[styles.multipleAnswersWrapper, multipleAnswers.wrapper]}>
+    <Animated.View
+      layout={LinearTransition.duration(200)}
+      style={[styles.multipleAnswersWrapper, multipleAnswers.wrapper]}
+    >
       <View style={[styles.optionCard, multipleAnswers.optionCard]}>
         <View style={[styles.optionCardContent, multipleAnswers.optionCardContent]}>
-          <Text style={[styles.title, multipleAnswers.title]}>{t('Multiple answers')}</Text>
+          <Text style={[styles.title, multipleAnswers.title]}>{t('Multiple votes')}</Text>
           <Text style={[styles.description, multipleAnswers.description]}>
-            Select more than one option
+            {t('Select more than one option')}
           </Text>
         </View>
         <Switch
@@ -66,21 +52,8 @@ export const MultipleAnswersField = () => {
           style={[styles.optionCardSwitch, multipleAnswers.optionCardSwitch]}
         />
       </View>
-      {allowMultipleVotes ? (
-        <Input
-          inputMode='numeric'
-          placeholder={t('Maximum votes per person')}
-          variant='ghost'
-          state={max_votes_allowed && error ? 'error' : 'default'}
-          onChangeText={onChangeTextHandler}
-          onBlur={onBlurHandler}
-          helperText={true}
-          infoText={t('Type a number from 2 to 10')}
-          errorMessage={error ? t(error) : undefined}
-          containerStyle={styles.maxVotesInput}
-        />
-      ) : null}
-    </View>
+      {allowMultipleVotes ? <MultipleVotesSettings /> : null}
+    </Animated.View>
   );
 };
 
@@ -90,14 +63,11 @@ const useStyles = () => {
   } = useTheme();
   return useMemo(() => {
     return StyleSheet.create({
-      maxVotesInput: {
-        paddingLeft: 0,
-      },
       multipleAnswersWrapper: {
         backgroundColor: semantics.inputOptionCardBg,
         padding: primitives.spacingMd,
         borderRadius: primitives.radiusLg,
-        gap: primitives.spacingSm,
+        gap: primitives.spacingMd,
       },
       title: {
         color: semantics.textPrimary,
@@ -119,9 +89,6 @@ const useStyles = () => {
         justifyContent: 'space-between',
         flexDirection: 'row',
       },
-      optionCardWrapper: {
-        gap: primitives.spacingMd,
-      },
       optionCardSwitch: { width: 64 },
     });
   }, [semantics]);
diff --git a/package/src/components/Poll/components/MultipleVotesSettings.tsx b/package/src/components/Poll/components/MultipleVotesSettings.tsx
new file mode 100644
index 0000000000..4ad730f768
--- /dev/null
+++ b/package/src/components/Poll/components/MultipleVotesSettings.tsx
@@ -0,0 +1,229 @@
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { Platform, StyleSheet, Switch, Text, TextInput, View } from 'react-native';
+
+import Animated, { LinearTransition, StretchInY, StretchOutY } from 'react-native-reanimated';
+
+import { PollComposerState } from 'stream-chat';
+
+import { useTheme, useTranslationContext } from '../../../contexts';
+import { useMessageComposer } from '../../../contexts/messageInputContext/hooks/useMessageComposer';
+import { useStableCallback } from '../../../hooks';
+import { useStateStore } from '../../../hooks/useStateStore';
+import { Minus, Plus } from '../../../icons';
+import { primitives } from '../../../theme';
+import { Button } from '../../ui';
+
+const pollComposerStateSelector = (state: PollComposerState) => ({
+  max_votes_allowed: state.data.max_votes_allowed,
+});
+
+const MaxVotesTextInput = () => {
+  const messageComposer = useMessageComposer();
+  const { pollComposer } = messageComposer;
+  const { handleFieldBlur, updateFields } = pollComposer;
+  const { max_votes_allowed } = useStateStore(pollComposer.state, pollComposerStateSelector);
+  const {
+    theme: {
+      poll: {
+        createContent: { multipleAnswers },
+      },
+    },
+  } = useTheme();
+  const hasSelectedInitialValueRef = useRef(false);
+  const inputRef = useRef<TextInput>(null);
+
+  const styles = useStyles();
+
+  const onChangeTextHandler = useCallback(
+    async (newText: string) => {
+      await updateFields({ max_votes_allowed: newText });
+    },
+    [updateFields],
+  );
+
+  const onBlurHandler = useCallback(async () => {
+    await handleFieldBlur('max_votes_allowed');
+  }, [handleFieldBlur]);
+
+  useEffect(() => {
+    if (hasSelectedInitialValueRef.current || max_votes_allowed.length === 0) {
+      return;
+    }
+
+    hasSelectedInitialValueRef.current = true;
+
+    const focusFrame = requestAnimationFrame(() => {
+      inputRef.current?.focus();
+
+      if (Platform.OS !== 'ios') {
+        return;
+      }
+
+      requestAnimationFrame(() => {
+        inputRef.current?.setNativeProps({
+          selection: {
+            end: max_votes_allowed.length,
+            start: 0,
+          },
+        });
+      });
+    });
+
+    return () => {
+      cancelAnimationFrame(focusFrame);
+    };
+  }, [max_votes_allowed.length]);
+
+  return (
+    <TextInput
+      autoFocus
+      inputMode='numeric'
+      onBlur={onBlurHandler}
+      onChangeText={onChangeTextHandler}
+      ref={inputRef}
+      selectTextOnFocus
+      style={[styles.input, multipleAnswers.input]}
+      value={max_votes_allowed}
+    />
+  );
+};
+
+export const MultipleVotesSettings = () => {
+  const [allowMaxVotesPerPerson, setAllowMaxVotesPerPerson] = useState<boolean>(false);
+  const { t } = useTranslationContext();
+  const messageComposer = useMessageComposer();
+  const { pollComposer } = messageComposer;
+  const { updateFields } = pollComposer;
+  const { max_votes_allowed } = useStateStore(pollComposer.state, pollComposerStateSelector);
+  const {
+    theme: {
+      poll: {
+        createContent: { multipleAnswers },
+      },
+    },
+  } = useTheme();
+  const styles = useStyles();
+
+  const decrementDisabled = Number(max_votes_allowed) <= 2;
+  const incrementDisabled = Number(max_votes_allowed) >= 10;
+
+  const decrementMaxVotes = useStableCallback(async () => {
+    const numericValue = Number(pollComposer.state.getLatestValue().data.max_votes_allowed.trim());
+    if (Number.isInteger(numericValue)) {
+      await updateFields({ max_votes_allowed: String(numericValue - 1) });
+    }
+  });
+
+  const incrementMaxVotes = useStableCallback(async () => {
+    const numericValue = Number(pollComposer.state.getLatestValue().data.max_votes_allowed.trim());
+    if (Number.isInteger(numericValue)) {
+      await updateFields({ max_votes_allowed: String(numericValue + 1) });
+    }
+  });
+
+  const onMaxVotesPerPersonHandler = useStableCallback(async (value: boolean) => {
+    const currentValue = pollComposer.state.getLatestValue().data.max_votes_allowed;
+    setAllowMaxVotesPerPerson(value);
+    await updateFields({
+      max_votes_allowed: value ? (currentValue === '' ? '2' : currentValue) : '',
+    });
+  });
+
+  return (
+    <Animated.View
+      layout={LinearTransition.duration(200)}
+      entering={StretchInY.duration(200)}
+      exiting={StretchOutY.duration(200)}
+      style={[styles.settingsWrapper, multipleAnswers.settingsWrapper]}
+    >
+      <View style={[styles.optionCard, multipleAnswers.optionCard]}>
+        <View style={[styles.optionCardContent, multipleAnswers.optionCardContent]}>
+          <Text style={[styles.title, multipleAnswers.title]}>{t('Limit votes per person')}</Text>
+          <Text style={[styles.description, multipleAnswers.description]}>
+            {t('Choose between 2–10 options')}
+          </Text>
+        </View>
+        <Switch
+          onValueChange={onMaxVotesPerPersonHandler}
+          value={allowMaxVotesPerPerson}
+          style={[styles.optionCardSwitch, multipleAnswers.optionCardSwitch]}
+        />
+      </View>
+      {allowMaxVotesPerPerson ? (
+        <Animated.View
+          entering={StretchInY.duration(200)}
+          exiting={StretchOutY.duration(200)}
+          style={[styles.row, multipleAnswers.row]}
+        >
+          <Button
+            variant='secondary'
+            type='outline'
+            size='md'
+            iconOnly
+            LeadingIcon={Minus}
+            onPress={decrementMaxVotes}
+            disabled={decrementDisabled}
+            testID='max-votes-decrement'
+          />
+          <MaxVotesTextInput />
+          <Button
+            variant='secondary'
+            type='outline'
+            size='md'
+            iconOnly
+            LeadingIcon={Plus}
+            onPress={incrementMaxVotes}
+            disabled={incrementDisabled}
+            testID='max-votes-increment'
+          />
+        </Animated.View>
+      ) : null}
+    </Animated.View>
+  );
+};
+
+const useStyles = () => {
+  const {
+    theme: { semantics },
+  } = useTheme();
+
+  return useMemo(() => {
+    return StyleSheet.create({
+      title: {
+        color: semantics.textPrimary,
+        fontSize: primitives.typographyFontSizeMd,
+        fontWeight: primitives.typographyFontWeightSemiBold,
+        lineHeight: primitives.typographyLineHeightNormal,
+      },
+      description: {
+        color: semantics.textTertiary,
+        fontSize: primitives.typographyFontSizeSm,
+        fontWeight: primitives.typographyFontWeightRegular,
+        lineHeight: primitives.typographyLineHeightNormal,
+      },
+      optionCardContent: {
+        gap: primitives.spacingXxs,
+      },
+      optionCard: {
+        alignItems: 'center',
+        justifyContent: 'space-between',
+        flexDirection: 'row',
+      },
+      optionCardSwitch: { width: 64 },
+      settingsWrapper: {
+        gap: primitives.spacingMd,
+      },
+      row: {
+        alignItems: 'center',
+        flexDirection: 'row',
+        gap: primitives.spacingXxs,
+      },
+      input: {
+        color: semantics.textPrimary,
+        fontSize: primitives.typographyFontSizeMd,
+        paddingHorizontal: primitives.spacingSm,
+        paddingVertical: primitives.spacingMd,
+      },
+    });
+  }, [semantics]);
+};
diff --git a/package/src/components/Poll/components/PollButtons.tsx b/package/src/components/Poll/components/PollButtons.tsx
index aa30911df2..6abdcdae6f 100644
--- a/package/src/components/Poll/components/PollButtons.tsx
+++ b/package/src/components/Poll/components/PollButtons.tsx
@@ -1,5 +1,6 @@
 import React, { useCallback, useMemo, useState } from 'react';
 import { Modal, StyleSheet, View } from 'react-native';
+import { GestureHandlerRootView } from 'react-native-gesture-handler';
 
 import { GenericPollButton, PollButtonProps } from './Button';
 import { PollAnswersList } from './PollAnswersList';
@@ -10,6 +11,7 @@ import { PollResults } from './PollResults';
 
 import { useChatContext, usePollContext, useTheme, useTranslationContext } from '../../../contexts';
 import { primitives } from '../../../theme';
+import { defaultPollOptionCount } from '../../../utils/constants';
 import { SafeAreaViewWrapper } from '../../UIComponents/SafeAreaViewWrapper';
 import { useIsPollCreatedByCurrentUser } from '../hook/useIsPollCreatedByCurrentUser';
 import { usePollState } from '../hooks/usePollState';
@@ -45,10 +47,12 @@ export const ViewResultsButton = (props: PollButtonProps) => {
       />
       {showResults ? (
         <Modal animationType='slide' onRequestClose={onRequestClose} visible={showResults}>
-          <SafeAreaViewWrapper style={styles.safeArea}>
-            <PollModalHeader onPress={onRequestClose} title={t('Poll Results')} />
-            <PollResults message={message} poll={poll} />
-          </SafeAreaViewWrapper>
+          <GestureHandlerRootView style={styles.modalRoot}>
+            <SafeAreaViewWrapper style={styles.safeArea}>
+              <PollModalHeader onPress={onRequestClose} title={t('Poll Results')} />
+              <PollResults message={message} poll={poll} />
+            </SafeAreaViewWrapper>
+          </GestureHandlerRootView>
         </Modal>
       ) : null}
     </>
@@ -79,18 +83,20 @@ export const ShowAllOptionsButton = (props: PollButtonProps) => {
 
   return (
     <>
-      {options && options.length > 10 ? (
+      {options && options.length > defaultPollOptionCount ? (
         <GenericPollButton
           onPress={onPressHandler}
-          label={t('See all {{count}} options', { count: options.length })}
+          label={t('+{{count}} More Options', { count: options.length - defaultPollOptionCount })}
         />
       ) : null}
       {showAllOptions ? (
         <Modal animationType='slide' onRequestClose={onRequestClose} visible={showAllOptions}>
-          <SafeAreaViewWrapper style={styles.safeArea}>
-            <PollModalHeader onPress={onRequestClose} title={t('Poll Options')} />
-            <PollAllOptions message={message} poll={poll} />
-          </SafeAreaViewWrapper>
+          <GestureHandlerRootView style={styles.modalRoot}>
+            <SafeAreaViewWrapper style={styles.safeArea}>
+              <PollModalHeader onPress={onRequestClose} title={t('Poll Options')} />
+              <PollAllOptions message={message} poll={poll} />
+            </SafeAreaViewWrapper>
+          </GestureHandlerRootView>
         </Modal>
       ) : null}
     </>
@@ -129,10 +135,12 @@ export const ShowAllCommentsButton = (props: PollButtonProps) => {
       ) : null}
       {showAnswers ? (
         <Modal animationType='slide' onRequestClose={onRequestClose} visible={showAnswers}>
-          <SafeAreaViewWrapper style={styles.safeArea}>
-            <PollModalHeader onPress={onRequestClose} title={t('Poll Comments')} />
-            <PollAnswersList message={message} poll={poll} />
-          </SafeAreaViewWrapper>
+          <GestureHandlerRootView style={styles.modalRoot}>
+            <SafeAreaViewWrapper style={styles.safeArea}>
+              <PollModalHeader onPress={onRequestClose} title={t('Poll Comments')} />
+              <PollAnswersList message={message} poll={poll} />
+            </SafeAreaViewWrapper>
+          </GestureHandlerRootView>
         </Modal>
       ) : null}
     </>
@@ -236,7 +244,6 @@ export const PollButtons = () => {
     <View style={styles.buttonsContainer}>
       <ViewResultsButton />
       <EndVoteButton />
-      <ShowAllOptionsButton />
       <SuggestOptionButton />
       <AddCommentButton />
       <ShowAllCommentsButton />
@@ -252,6 +259,9 @@ const useStyles = () => {
   return useMemo(() => {
     return StyleSheet.create({
       buttonsContainer: { gap: primitives.spacingXs },
+      modalRoot: {
+        flex: 1,
+      },
       endVoteButton: {
         borderColor: isPollCreatedByClient
           ? semantics.chatBorderOnChatOutgoing
diff --git a/package/src/components/Poll/components/PollInputDialog.tsx b/package/src/components/Poll/components/PollInputDialog.tsx
index b6e761bbcc..539d546401 100644
--- a/package/src/components/Poll/components/PollInputDialog.tsx
+++ b/package/src/components/Poll/components/PollInputDialog.tsx
@@ -9,6 +9,7 @@ import {
   TextInput,
   View,
 } from 'react-native';
+import { GestureHandlerRootView } from 'react-native-gesture-handler';
 
 import Animated, { LinearTransition, ZoomIn } from 'react-native-reanimated';
 
@@ -50,44 +51,48 @@ export const PollInputDialog = ({
 
   return (
     <Modal animationType='fade' onRequestClose={closeDialog} transparent={true} visible={visible}>
-      <KeyboardAvoidingView
-        behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-        style={[styles.transparentContainer, transparentContainer]}
-      >
-        <Animated.View
-          entering={ZoomIn.duration(200)}
-          layout={LinearTransition.duration(200)}
-          style={[styles.container, { backgroundColor: white }, container]}
+      <GestureHandlerRootView style={styles.modalRoot}>
+        <KeyboardAvoidingView
+          behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+          style={[styles.transparentContainer, transparentContainer]}
         >
-          <Text style={[styles.title, { color: black }, titleStyle]}>{title}</Text>
-          <TextInput
-            autoFocus={true}
-            onChangeText={setDialogInput}
-            placeholder={t('Ask a question')}
-            style={[styles.input, { color: black }, input]}
-            value={dialogInput}
-          />
-          <View style={[styles.buttonContainer, buttonContainer]}>
-            <Pressable
-              onPress={closeDialog}
-              style={({ pressed }) => ({ opacity: pressed ? 0.5 : 1 })}
-            >
-              <Text style={[styles.button, { color: accent_dark_blue }, button]}>
-                {t('Cancel')}
-              </Text>
-            </Pressable>
-            <Pressable
-              onPress={() => {
-                onSubmit(dialogInput);
-                closeDialog();
-              }}
-              style={({ pressed }) => ({ marginLeft: 32, opacity: pressed ? 0.5 : 1 })}
-            >
-              <Text style={[styles.button, { color: accent_dark_blue }, button]}>{t('SEND')}</Text>
-            </Pressable>
-          </View>
-        </Animated.View>
-      </KeyboardAvoidingView>
+          <Animated.View
+            entering={ZoomIn.duration(200)}
+            layout={LinearTransition.duration(200)}
+            style={[styles.container, { backgroundColor: white }, container]}
+          >
+            <Text style={[styles.title, { color: black }, titleStyle]}>{title}</Text>
+            <TextInput
+              autoFocus={true}
+              onChangeText={setDialogInput}
+              placeholder={t('Ask a question')}
+              style={[styles.input, { color: black }, input]}
+              value={dialogInput}
+            />
+            <View style={[styles.buttonContainer, buttonContainer]}>
+              <Pressable
+                onPress={closeDialog}
+                style={({ pressed }) => ({ opacity: pressed ? 0.5 : 1 })}
+              >
+                <Text style={[styles.button, { color: accent_dark_blue }, button]}>
+                  {t('Cancel')}
+                </Text>
+              </Pressable>
+              <Pressable
+                onPress={() => {
+                  onSubmit(dialogInput);
+                  closeDialog();
+                }}
+                style={({ pressed }) => ({ marginLeft: 32, opacity: pressed ? 0.5 : 1 })}
+              >
+                <Text style={[styles.button, { color: accent_dark_blue }, button]}>
+                  {t('SEND')}
+                </Text>
+              </Pressable>
+            </View>
+          </Animated.View>
+        </KeyboardAvoidingView>
+      </GestureHandlerRootView>
     </Modal>
   );
 };
@@ -103,6 +108,9 @@ const styles = StyleSheet.create({
     paddingTop: 32,
     width: '80%',
   },
+  modalRoot: {
+    flex: 1,
+  },
   input: {
     alignItems: 'center',
     borderColor: 'gray',
diff --git a/package/src/components/Poll/components/PollResults/PollResultItem.tsx b/package/src/components/Poll/components/PollResults/PollResultItem.tsx
index 61c92aa364..812ff835d5 100644
--- a/package/src/components/Poll/components/PollResults/PollResultItem.tsx
+++ b/package/src/components/Poll/components/PollResults/PollResultItem.tsx
@@ -1,5 +1,6 @@
 import React, { useCallback, useMemo, useState } from 'react';
 import { Modal, StyleSheet, Text, View } from 'react-native';
+import { GestureHandlerRootView } from 'react-native-gesture-handler';
 
 import { LocalMessage, Poll, PollOption, PollVote as PollVoteClass } from 'stream-chat';
 
@@ -64,10 +65,12 @@ export const ShowAllVotesButton = (props: ShowAllVotesButtonProps) => {
           onRequestClose={() => setShowAllVotes(false)}
           visible={showAllVotes}
         >
-          <SafeAreaViewWrapper style={styles.safeArea}>
-            <PollModalHeader onPress={() => setShowAllVotes(false)} title={t('Votes')} />
-            <PollOptionFullResults message={message} option={option} poll={poll} />
-          </SafeAreaViewWrapper>
+          <GestureHandlerRootView style={styles.modalRoot}>
+            <SafeAreaViewWrapper style={styles.safeArea}>
+              <PollModalHeader onPress={() => setShowAllVotes(false)} title={t('Votes')} />
+              <PollOptionFullResults message={message} option={option} poll={poll} />
+            </SafeAreaViewWrapper>
+          </GestureHandlerRootView>
         </Modal>
       ) : null}
     </>
@@ -136,6 +139,9 @@ const useStyles = () => {
           alignItems: 'center',
           paddingBottom: primitives.spacingXs,
         },
+        modalRoot: {
+          flex: 1,
+        },
         title: {
           flex: 1,
           fontSize: primitives.typographyFontSizeLg,
diff --git a/package/src/components/Poll/components/index.ts b/package/src/components/Poll/components/index.ts
index 4e917d632c..5cfc99b017 100644
--- a/package/src/components/Poll/components/index.ts
+++ b/package/src/components/Poll/components/index.ts
@@ -3,6 +3,7 @@ export * from './PollButtons';
 export * from './CreatePollOptions';
 export * from './PollAnswersList';
 export * from './PollInputDialog';
+export * from './MultipleVotesSettings';
 export * from './PollOption';
 export * from './PollResults';
 export * from './PollModalHeader';
diff --git a/package/src/components/Poll/hooks/usePollState.ts b/package/src/components/Poll/hooks/usePollState.ts
index 9100724b5e..64ec01068c 100644
--- a/package/src/components/Poll/hooks/usePollState.ts
+++ b/package/src/components/Poll/hooks/usePollState.ts
@@ -80,10 +80,9 @@ export const usePollState = (): UsePollStateReturnType => {
 
   const addOption = useCallback(
     async (optionText: string) => {
-      const { poll_option } = await poll.createOption({ text: optionText });
-      await poll.castVote(poll_option.id, message.id);
+      await poll.createOption({ text: optionText });
     },
-    [message, poll],
+    [poll],
   );
   const addComment = useCallback(
     (answerText: string) => poll.addAnswer(answerText, message.id),
diff --git a/package/src/components/ProgressControl/WaveProgressBar.tsx b/package/src/components/ProgressControl/WaveProgressBar.tsx
index be18c346d4..b4c0a86748 100644
--- a/package/src/components/ProgressControl/WaveProgressBar.tsx
+++ b/package/src/components/ProgressControl/WaveProgressBar.tsx
@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo, useState } from 'react';
-import { Platform, StyleSheet, View } from 'react-native';
+import { StyleSheet, View } from 'react-native';
 import { Gesture, GestureDetector } from 'react-native-gesture-handler';
 import Animated, {
   runOnJS,
@@ -53,8 +53,6 @@ const WAVE_MIN_HEIGHT = 2;
 export const WaveProgressBar = React.memo(
   (props: WaveProgressBarProps) => {
     const [width, setWidth] = useState<number>(0);
-    /* On Android, the seek doesn't work for AAC files, hence we disable progress drag for now */
-    const showProgressDrag = Platform.OS === 'ios';
     const {
       amplitudesCount = Math.max(20, Math.floor(width / (WAVEFORM_WIDTH + WAVEFORM_GAP))),
       isPlaying = false,
@@ -99,7 +97,6 @@ export const WaveProgressBar = React.memo(
     const pan = useMemo(
       () =>
         Gesture.Pan()
-          .enabled(showProgressDrag)
           .maxPointers(1)
           .onStart(() => {
             if (onStartDrag) {
@@ -116,7 +113,7 @@ export const WaveProgressBar = React.memo(
               runOnJS(onEndDrag)(state.value);
             }
           }),
-      [fullWidth, onEndDrag, onStartDrag, showProgressDrag, state, waveFormNumberFromProgress],
+      [fullWidth, onEndDrag, onStartDrag, state, waveFormNumberFromProgress],
     );
 
     const stringifiedWaveformData = waveformData.toString();
@@ -162,7 +159,7 @@ export const WaveProgressBar = React.memo(
               ]}
             />
           ))}
-          {showProgressDrag && (onEndDrag || onProgressDrag) && (
+          {(onEndDrag || onProgressDrag) && (
             <Animated.View style={[thumbStyles, thumb]}>
               <ProgressControlThumb isPlaying={isPlaying} />
             </Animated.View>
diff --git a/package/src/contexts/themeContext/utils/theme.ts b/package/src/contexts/themeContext/utils/theme.ts
index 91282f358b..9ff4d45a9b 100644
--- a/package/src/contexts/themeContext/utils/theme.ts
+++ b/package/src/contexts/themeContext/utils/theme.ts
@@ -850,7 +850,9 @@ export type Theme = {
       };
       multipleAnswers: {
         description: TextStyle;
+        input: TextStyle;
         row: ViewStyle;
+        settingsWrapper: ViewStyle;
         title: TextStyle;
         optionCard: ViewStyle;
         optionCardContent: ViewStyle;
@@ -1758,8 +1760,10 @@ export const defaultTheme: Theme = {
       multipleAnswers: {
         row: {},
         description: {},
+        input: {},
         optionCardContent: {},
         optionCardSwitch: {},
+        settingsWrapper: {},
         title: {},
         optionCard: {},
         wrapper: {},
diff --git a/package/src/i18n/en.json b/package/src/i18n/en.json
index 345b5a8128..83ec2eef9a 100644
--- a/package/src/i18n/en.json
+++ b/package/src/i18n/en.json
@@ -57,11 +57,13 @@
   "Location": "Location",
   "Mark as Unread": "Mark as Unread",
   "Maximum number of files reached": "Maximum number of files reached",
-  "Maximum votes per person": "Maximum votes per person",
   "Message Reactions": "Message Reactions",
   "Message deleted": "Message deleted",
   "Message flagged": "Message flagged",
-  "Multiple answers": "Multiple answers",
+  "Multiple votes": "Multiple votes",
+  "Select more than one option": "Select more than one option",
+  "Limit votes per person": "Limit votes per person",
+  "Choose between 2–10 options": "Choose between 2–10 options",
   "Mute User": "Mute User",
   "No chats here yet…": "No chats here yet…",
   "No threads here yet": "No threads here yet",
@@ -91,9 +93,6 @@
   "Resend": "Resend",
   "SEND": "SEND",
   "Search": "Search",
-  "See all {{count}} options_many": "See all {{count}} options_many",
-  "See all {{count}} options_one": "See all {{count}} options",
-  "See all {{count}} options_other": "See all {{count}} options",
   "Select More Photos": "Select More Photos",
   "Select one": "Select one",
   "Select one or more": "Select one or more",
@@ -203,5 +202,8 @@
   "{{memberCount}} members, {{onlineCount}} online_many": "{{memberCount}} members, {{onlineCount}} online",
   "{{count}} unread": "{{count}} unread",
   "{{count}} new messages": "{{count}} new messages",
-  "Unsupported Attachment": "Unsupported Attachment"
+  "Unsupported Attachment": "Unsupported Attachment",
+  "+{{count}} More Options_one": "+{{count}} More Option",
+  "+{{count}} More Options_other": "+{{count}} More Options",
+  "+{{count}} More Options_many": "+{{count}} More Options"
 }
diff --git a/package/src/i18n/es.json b/package/src/i18n/es.json
index 39256f20f0..b77327700e 100644
--- a/package/src/i18n/es.json
+++ b/package/src/i18n/es.json
@@ -57,11 +57,13 @@
   "Location": "Ubicación",
   "Mark as Unread": "Marcar como no leído",
   "Maximum number of files reached": "Número máximo de archivos alcanzado",
-  "Maximum votes per person": "Máximo de votos por persona",
   "Message Reactions": "Reacciones al mensaje",
   "Message deleted": "Mensaje eliminado",
   "Message flagged": "Mensaje reportado",
-  "Multiple answers": "Respuestas múltiples",
+  "Multiple votes": "Votos múltiples",
+  "Select more than one option": "Selecciona más de una opción",
+  "Limit votes per person": "Limita los votos por persona",
+  "Choose between 2–10 options": "Elige entre 2 y 10 opciones",
   "Mute User": "Silenciar usuario",
   "No chats here yet…": "No hay chats aquí todavía...",
   "No threads here yet": "Aún no hay hilos aquí",
@@ -91,9 +93,6 @@
   "Resend": "Reenviar",
   "SEND": "ENVIAR",
   "Search": "Buscar",
-  "See all {{count}} options_many": "Ver las {{count}} opciones",
-  "See all {{count}} options_one": "Ver las {{count}} opciones",
-  "See all {{count}} options_other": "Ver las {{count}} opciones",
   "Select More Photos": "Seleccionar más fotos",
   "Select one": "Seleccionar una",
   "Select one or more": "Seleccionar una o más",
@@ -203,5 +202,8 @@
   "{{memberCount}} members, {{onlineCount}} online_many": "{{memberCount}} miembros, {{onlineCount}} en línea",
   "{{count}} unread": "{{count}} no leídos",
   "{{count}} new messages": "{{count}} nuevos mensajes",
-  "Unsupported Attachment": "Adjunto no admitido"
+  "Unsupported Attachment": "Adjunto no admitido",
+  "+{{count}} More Options_one": "+{{count}} opción más",
+  "+{{count}} More Options_other": "+{{count}} opciones más",
+  "+{{count}} More Options_many": "+{{count}} opciones más"
 }
diff --git a/package/src/i18n/fr.json b/package/src/i18n/fr.json
index 2688bba1e2..ce7d7b0576 100644
--- a/package/src/i18n/fr.json
+++ b/package/src/i18n/fr.json
@@ -57,11 +57,13 @@
   "Location": "Emplacement",
   "Mark as Unread": "Marquer comme non lu",
   "Maximum number of files reached": "Nombre maximal de fichiers atteint",
-  "Maximum votes per person": "Maximum de votes par personne",
   "Message Reactions": "Réactions aux messages",
   "Message deleted": "Message supprimé",
   "Message flagged": "Message signalé",
-  "Multiple answers": "Réponses multiples",
+  "Multiple votes": "Votes multiples",
+  "Select more than one option": "Sélectionnez plus d’une option",
+  "Limit votes per person": "Limiter les votes par personne",
+  "Choose between 2–10 options": "Choisissez entre 2 et 10 options",
   "Mute User": "Utilisateur muet",
   "No chats here yet…": "Pas de discussions ici pour le moment…",
   "No threads here yet": "Aucun fil ici pour le moment",
@@ -91,9 +93,6 @@
   "Resend": "Renvoyer",
   "SEND": "ENVOYER",
   "Search": "Rechercher",
-  "See all {{count}} options_many": "Voir les {{count}} options",
-  "See all {{count}} options_one": "Voir les {{count}} options",
-  "See all {{count}} options_other": "Voir les {{count}} options",
   "Select More Photos": "Sélectionner plus de photos",
   "Select one": "Sélectionner une",
   "Select one or more": "Sélectionner une ou plusieurs",
@@ -203,5 +202,8 @@
   "{{memberCount}} members, {{onlineCount}} online_many": "{{memberCount}} membres, {{onlineCount}} en ligne",
   "{{count}} unread": "{{count}} non lus",
   "{{count}} new messages": "{{count}} nouveaux messages",
-  "Unsupported Attachment": "Pièce jointe non prise en charge"
+  "Unsupported Attachment": "Pièce jointe non prise en charge",
+  "+{{count}} More Options_one": "+{{count}} option supplémentaire",
+  "+{{count}} More Options_other": "+{{count}} options supplémentaires",
+  "+{{count}} More Options_many": "+{{count}} options supplémentaires"
 }
diff --git a/package/src/i18n/he.json b/package/src/i18n/he.json
index 1ca7bdf69f..d4477de558 100644
--- a/package/src/i18n/he.json
+++ b/package/src/i18n/he.json
@@ -57,11 +57,13 @@
   "Location": "מיקום",
   "Mark as Unread": "סמן כלא נקרא",
   "Maximum number of files reached": "הגעת למספר המרבי של קבצים",
-  "Maximum votes per person": "מקסימום הצבעות לאדם",
   "Message Reactions": "תגובות להודעה",
   "Message deleted": "ההודעה נמחקה",
   "Message flagged": "ההודעה סומנה",
-  "Multiple answers": "תשובות מרובות",
+  "Multiple votes": "הצבעות מרובות",
+  "Select more than one option": "בחר/י יותר מאפשרות אחת",
+  "Limit votes per person": "הגבל/י את מספר ההצבעות לאדם",
+  "Choose between 2–10 options": "בחר/י בין 2 ל-10 אפשרויות",
   "Mute User": "השתק/י משתמש",
   "No chats here yet…": "אין צ'אטים כאן עדיין...",
   "No threads here yet": "אין שרשורים כאן עדיין",
@@ -91,9 +93,6 @@
   "Resend": "שלח/י שוב",
   "SEND": "שלח",
   "Search": "חפש/י",
-  "See all {{count}} options_many": "הצג את כל {{count}} האפשרויות",
-  "See all {{count}} options_one": "הצג את כל {{count}} האפשרויות",
-  "See all {{count}} options_other": "הצג את כל {{count}} האפשרויות",
   "Select More Photos": "בחר עוד תמונות",
   "Select one": "בחר אחת",
   "Select one or more": "בחר אחת או יותר",
@@ -203,5 +202,8 @@
   "{{memberCount}} members, {{onlineCount}} online_many": "{{memberCount}} חברים, {{onlineCount}} מחוברים",
   "{{count}} unread": "{{count}} שטרם נקרא",
   "{{count}} new messages": "{{count}} הודעות חדשות",
-  "Unsupported Attachment": "קובץ לא נתמך"
+  "Unsupported Attachment": "קובץ לא נתמך",
+  "+{{count}} More Options_one": "+עוד אפשרות {{count}}",
+  "+{{count}} More Options_other": "+עוד {{count}} אפשרויות",
+  "+{{count}} More Options_many": "+עוד {{count}} אפשרויות"
 }
diff --git a/package/src/i18n/hi.json b/package/src/i18n/hi.json
index aab5519ee4..bff5a3a5f2 100644
--- a/package/src/i18n/hi.json
+++ b/package/src/i18n/hi.json
@@ -57,11 +57,13 @@
   "Location": "स्थान",
   "Mark as Unread": "अपठित मार्क करें",
   "Maximum number of files reached": "फ़ाइलों की अधिकतम संख्या पहुँच गई",
-  "Maximum votes per person": "प्रति व्यक्ति अधिकतम वोट",
   "Message Reactions": "संदेश प्रतिक्रियाएँ",
   "Message deleted": "मैसेज हटा दिया गया",
   "Message flagged": "संदेश को ध्वजांकित किया गया",
-  "Multiple answers": "एक से अधिक उत्तर",
+  "Multiple votes": "एकाधिक वोट",
+  "Select more than one option": "एक से अधिक विकल्प चुनें",
+  "Limit votes per person": "प्रति व्यक्ति वोट सीमित करें",
+  "Choose between 2–10 options": "2–10 विकल्प चुनें",
   "Mute User": "उपयोगकर्ता को म्यूट करें",
   "No chats here yet…": "अभी तक यहाँ कोई चैट नहीं है...",
   "No threads here yet": "यहाँ अभी तक कोई थ्रेड्स नहीं हैं",
@@ -91,9 +93,6 @@
   "Resend": "पुन: भेजें",
   "SEND": "भेजें",
   "Search": "खोजें",
-  "See all {{count}} options_many": "सभी {{count}} विकल्प देखें",
-  "See all {{count}} options_one": "सभी {{count}} विकल्प देखें",
-  "See all {{count}} options_other": "सभी {{count}} विकल्प देखें",
   "Select More Photos": "अधिक फ़ोटो चुनें",
   "Select one": "एक चुनें",
   "Select one or more": "एक या अधिक चुनें",
@@ -203,5 +202,8 @@
   "{{memberCount}} members, {{onlineCount}} online_many": "{{memberCount}} सदस्य, {{onlineCount}} ऑनलाइन",
   "{{count}} unread": "{{count}} ना पढ़े हुए",
   "{{count}} new messages": "{{count}} नये संदेश",
-  "Unsupported Attachment": "असमर्थित अटैचमेंट"
+  "Unsupported Attachment": "असमर्थित अटैचमेंट",
+  "+{{count}} More Options_one": "+{{count}} और विकल्प",
+  "+{{count}} More Options_other": "+{{count}} और विकल्प",
+  "+{{count}} More Options_many": "+{{count}} और विकल्प"
 }
diff --git a/package/src/i18n/it.json b/package/src/i18n/it.json
index 99d1c1a159..62c86697ec 100644
--- a/package/src/i18n/it.json
+++ b/package/src/i18n/it.json
@@ -57,11 +57,13 @@
   "Location": "Posizione",
   "Mark as Unread": "Segna come non letto",
   "Maximum number of files reached": "Numero massimo di file raggiunto",
-  "Maximum votes per person": "Massimo voti per persona",
   "Message Reactions": "Reazioni ai Messaggi",
   "Message deleted": "Messaggio cancellato",
   "Message flagged": "Messaggio contrassegnato",
-  "Multiple answers": "Risposte multiple",
+  "Multiple votes": "Voti multipli",
+  "Select more than one option": "Seleziona più di un'opzione",
+  "Limit votes per person": "Limita i voti per persona",
+  "Choose between 2–10 options": "Scegli tra 2 e 10 opzioni",
   "Mute User": "Utente Muto",
   "No chats here yet…": "Non ci sono ancora chat qui...",
   "No threads here yet": "Nessun thread qui ancora",
@@ -91,9 +93,6 @@
   "Resend": "Invia di nuovo",
   "SEND": "INVIA",
   "Search": "Cerca",
-  "See all {{count}} options_many": "Vedi tutte le {{count}} opzioni",
-  "See all {{count}} options_one": "Vedi tutte le {{count}} opzioni",
-  "See all {{count}} options_other": "Vedi tutte le {{count}} opzioni",
   "Select More Photos": "Seleziona Altre foto",
   "Select one": "Seleziona una",
   "Select one or more": "Seleziona una o più",
@@ -203,5 +202,8 @@
   "{{memberCount}} members, {{onlineCount}} online_many": "{{memberCount}} membri, {{onlineCount}} online",
   "{{count}} unread": "{{count}} non letti",
   "{{count}} new messages": "{{count}} nuovi messaggi",
-  "Unsupported Attachment": "Allegato non supportato"
+  "Unsupported Attachment": "Allegato non supportato",
+  "+{{count}} More Options_one": "+{{count}} altra opzione",
+  "+{{count}} More Options_other": "+{{count}} altre opzioni",
+  "+{{count}} More Options_many": "+{{count}} altre opzioni"
 }
diff --git a/package/src/i18n/ja.json b/package/src/i18n/ja.json
index 9a33fc55e0..8d4f0649c3 100644
--- a/package/src/i18n/ja.json
+++ b/package/src/i18n/ja.json
@@ -57,11 +57,13 @@
   "Location": "位置情報",
   "Mark as Unread": "未読としてマーク",
   "Maximum number of files reached": "ファイルの最大数に達しました",
-  "Maximum votes per person": "1人あたりの最大投票数",
   "Message Reactions": "メッセージのリアクション",
   "Message deleted": "メッセージが削除されました",
   "Message flagged": "メッセージにフラグが付けられました",
-  "Multiple answers": "複数回答",
+  "Multiple votes": "複数投票",
+  "Select more than one option": "2つ以上のオプションを選択",
+  "Limit votes per person": "1人あたりの投票数を制限",
+  "Choose between 2–10 options": "2～10個のオプションから選択",
   "Mute User": "ユーザーをミュートする",
   "No chats here yet…": "まだチャットはありません…",
   "No threads here yet": "まだスレッドがありません",
@@ -91,9 +93,6 @@
   "Resend": "再送",
   "SEND": "送信",
   "Search": "検索",
-  "See all {{count}} options_many": "すべての{{count}}オプションを表示",
-  "See all {{count}} options_one": "{{count}} 個のオプションをすべて表示",
-  "See all {{count}} options_other": "{{count}} 個のオプションをすべて表示",
   "Select More Photos": "さらに写真を選択",
   "Select one": "1つ選択",
   "Select one or more": "1つ以上選択",
@@ -203,5 +202,8 @@
   "{{memberCount}} members, {{onlineCount}} online_many": "{{memberCount}}人のメンバー、{{onlineCount}}人がオンライン",
   "{{count}} unread": "{{count}} 未読",
   "{{count}} new messages": "{{count}} 新しいメッセージ",
-  "Unsupported Attachment": "サポートされていない添付ファイル"
+  "Unsupported Attachment": "サポートされていない添付ファイル",
+  "+{{count}} More Options_one": "+{{count}} 件の追加オプション",
+  "+{{count}} More Options_other": "+{{count}} 件の追加オプション",
+  "+{{count}} More Options_many": "+{{count}} 件の追加オプション"
 }
diff --git a/package/src/i18n/ko.json b/package/src/i18n/ko.json
index d39d084e2b..e923136fd2 100644
--- a/package/src/i18n/ko.json
+++ b/package/src/i18n/ko.json
@@ -57,11 +57,13 @@
   "Location": "위치",
   "Mark as Unread": "읽지 않음으로 표시",
   "Maximum number of files reached": "최대 파일 수에 도달했습니다",
-  "Maximum votes per person": "사람당 최대 투표 수",
   "Message Reactions": "메시지의 리액션",
   "Message deleted": "메시지가 삭제되었습니다.",
   "Message flagged": "메시지에 플래그가 지정되었습니다",
-  "Multiple answers": "다중 답변",
+  "Multiple votes": "복수 투표",
+  "Select more than one option": "두 개 이상의 옵션을 선택하세요",
+  "Limit votes per person": "1인당 투표 수 제한",
+  "Choose between 2–10 options": "2~10개의 옵션 중에서 선택하세요",
   "Mute User": "사용자를 음소거",
   "No chats here yet…": "아직 여기에 채팅이 없어요…",
   "No threads here yet": "아직 스레드가 없습니다",
@@ -91,9 +93,6 @@
   "Resend": "재전송",
   "SEND": "보내기",
   "Search": "검색",
-  "See all {{count}} options_many": "모든 {{count}} 옵션 보기",
-  "See all {{count}} options_one": "모든 {{count}} 옵션 보기",
-  "See all {{count}} options_other": "모든 {{count}} 옵션 보기",
   "Select More Photos": "추가 사진 선택",
   "Select one": "하나 선택",
   "Select one or more": "하나 이상 선택",
@@ -203,5 +202,8 @@
   "{{memberCount}} members, {{onlineCount}} online_many": "{{memberCount}}명, {{onlineCount}}명 온라인",
   "{{count}} unread": "{{count}} 읽지 않은",
   "{{count}} new messages": "{{count}} 새로운 메시지",
-  "Unsupported Attachment": "지원하지 않는 첨부파일"
+  "Unsupported Attachment": "지원하지 않는 첨부파일",
+  "+{{count}} More Options_one": "+옵션 {{count}}개 더",
+  "+{{count}} More Options_other": "+옵션 {{count}}개 더",
+  "+{{count}} More Options_many": "+옵션 {{count}}개 더"
 }
diff --git a/package/src/i18n/nl.json b/package/src/i18n/nl.json
index 2c81b62879..531f0d44a2 100644
--- a/package/src/i18n/nl.json
+++ b/package/src/i18n/nl.json
@@ -57,11 +57,13 @@
   "Location": "Locatie",
   "Mark as Unread": "Markeer als ongelezen",
   "Maximum number of files reached": "Maximaal aantal bestanden bereikt",
-  "Maximum votes per person": "Maximaal aantal stemmen per persoon",
   "Message Reactions": "Bericht Reacties",
   "Message deleted": "Bericht verwijderd",
   "Message flagged": "Bericht gemarkeerd",
-  "Multiple answers": "Meerdere antwoorden",
+  "Multiple votes": "Meerdere stemmen",
+  "Select more than one option": "Selecteer meer dan één optie",
+  "Limit votes per person": "Beperk stemmen per persoon",
+  "Choose between 2–10 options": "Kies tussen 2 en 10 opties",
   "Mute User": "Gebruiker dempen",
   "No chats here yet…": "Nog geen chats hier…",
   "No threads here yet": "Hier zijn nog geen threads",
@@ -91,9 +93,6 @@
   "Resend": "Opnieuw versturen",
   "SEND": "VERZENDEN",
   "Search": "Zoeken",
-  "See all {{count}} options_many": "Bekijk alle {{count}} opties",
-  "See all {{count}} options_one": "Bekijk alle {{count}} opties",
-  "See all {{count}} options_other": "Bekijk alle {{count}} opties",
   "Select More Photos": "Selecteer Meer foto's",
   "Select one": "Kies één",
   "Select one or more": "Kies één of meer",
@@ -203,5 +202,8 @@
   "{{memberCount}} members, {{onlineCount}} online_many": "{{memberCount}} leden, {{onlineCount}} online",
   "{{count}} unread": "{{count}} ongelezen",
   "{{count}} new messages": "{{count}} nieuwe berichten",
-  "Unsupported Attachment": "Ondersteunde bijlage"
+  "Unsupported Attachment": "Ondersteunde bijlage",
+  "+{{count}} More Options_one": "+{{count}} extra optie",
+  "+{{count}} More Options_other": "+{{count}} extra opties",
+  "+{{count}} More Options_many": "+{{count}} extra opties"
 }
diff --git a/package/src/i18n/pt-br.json b/package/src/i18n/pt-br.json
index 5436639351..b43806a1e6 100644
--- a/package/src/i18n/pt-br.json
+++ b/package/src/i18n/pt-br.json
@@ -57,11 +57,13 @@
   "Location": "Localização",
   "Mark as Unread": "Marcar como não lido",
   "Maximum number of files reached": "Número máximo de arquivos atingido",
-  "Maximum votes per person": "Máximo de votos por pessoa",
   "Message Reactions": "Reações à Mensagem",
   "Message deleted": "Mensagem excluída",
   "Message flagged": "Mensagem sinalizada",
-  "Multiple answers": "Múltiplas respostas",
+  "Multiple votes": "Votos múltiplos",
+  "Select more than one option": "Selecione mais de uma opção",
+  "Limit votes per person": "Limite os votos por pessoa",
+  "Choose between 2–10 options": "Escolha entre 2 e 10 opções",
   "Mute User": "Silenciar Usuário",
   "No chats here yet…": "Ainda não há chats aqui...",
   "No threads here yet": "Ainda não há tópicos aqui",
@@ -91,9 +93,6 @@
   "Resend": "Reenviar",
   "SEND": "ENVIAR",
   "Search": "Pesquisar",
-  "See all {{count}} options_many": "Ver todas as {{count}} opções",
-  "See all {{count}} options_one": "Ver todas as {{count}} opções",
-  "See all {{count}} options_other": "Ver todas as {{count}} opções",
   "Select More Photos": "Selecionar Mais Fotos",
   "Select one": "Selecione uma",
   "Select one or more": "Selecione uma ou mais",
@@ -203,5 +202,8 @@
   "{{memberCount}} members, {{onlineCount}} online_many": "{{memberCount}} membros, {{onlineCount}} online",
   "{{count}} unread": "{{count}} não lidas",
   "{{count}} new messages": "{{count}} novas mensagens",
-  "Unsupported Attachment": "Anexo não suportado"
+  "Unsupported Attachment": "Anexo não suportado",
+  "+{{count}} More Options_one": "+{{count}} opção a mais",
+  "+{{count}} More Options_other": "+{{count}} opções a mais",
+  "+{{count}} More Options_many": "+{{count}} opções a mais"
 }
diff --git a/package/src/i18n/ru.json b/package/src/i18n/ru.json
index dcbdbce37a..ee0a2522fc 100644
--- a/package/src/i18n/ru.json
+++ b/package/src/i18n/ru.json
@@ -57,11 +57,13 @@
   "Location": "Местоположение",
   "Mark as Unread": "Отметить как непрочитанное",
   "Maximum number of files reached": "Достигнуто максимальное количество файлов",
-  "Maximum votes per person": "Максимальное количество голосов на человека",
   "Message Reactions": "Сообщения Реакции",
   "Message deleted": "Сообщение удалено",
   "Message flagged": "Сообщение отмечено",
-  "Multiple answers": "Несколько ответов",
+  "Multiple votes": "Несколько голосов",
+  "Select more than one option": "Выберите больше одного варианта",
+  "Limit votes per person": "Ограничить количество голосов на человека",
+  "Choose between 2–10 options": "Выберите от 2 до 10 вариантов",
   "Mute User": "Отключить пользователя",
   "No chats here yet…": "Здесь пока нет чатов…",
   "No threads here yet": "Здесь пока нет потоков",
@@ -91,9 +93,6 @@
   "Resend": "Отправить",
   "SEND": "ОТПРАВИТЬ",
   "Search": "Поиск",
-  "See all {{count}} options_many": "Посмотреть все {{count}} вариантов",
-  "See all {{count}} options_one": "Посмотреть все {{count}} вариант",
-  "See all {{count}} options_other": "Посмотреть все {{count}} вариантов",
   "Select More Photos": "Выбрать больше фотографий",
   "Select one": "Выберите один",
   "Select one or more": "Выберите один или несколько",
@@ -203,5 +202,8 @@
   "{{memberCount}} members, {{onlineCount}} online_many": "{{memberCount}} участников, {{onlineCount}} онлайн",
   "{{count}} unread": "{{count}} непрочитанных",
   "{{count}} new messages": "{{count}} новых сообщений",
-  "Unsupported Attachment": "Неподдерживаемое вложение"
+  "Unsupported Attachment": "Неподдерживаемое вложение",
+  "+{{count}} More Options_one": "+ещё {{count}} вариант",
+  "+{{count}} More Options_other": "+ещё {{count}} варианта",
+  "+{{count}} More Options_many": "+ещё {{count}} вариантов"
 }
diff --git a/package/src/i18n/tr.json b/package/src/i18n/tr.json
index b7e804cf1a..c7d0a35a0b 100644
--- a/package/src/i18n/tr.json
+++ b/package/src/i18n/tr.json
@@ -57,11 +57,13 @@
   "Location": "Konum",
   "Mark as Unread": "Okunmamış olarak işaretle",
   "Maximum number of files reached": "Maksimum dosya sayısına ulaşıldı",
-  "Maximum votes per person": "Kişi başına maksimum oy",
   "Message Reactions": "Mesaj Tepkileri",
   "Message deleted": "Mesaj silindi",
   "Message flagged": "Mesaj işaretlendi",
-  "Multiple answers": "Birden fazla yanıt",
+  "Multiple votes": "Çoklu oy",
+  "Select more than one option": "Birden fazla seçenek seçin",
+  "Limit votes per person": "Kişi başına oy sayısını sınırla",
+  "Choose between 2–10 options": "2 ile 10 arasında seçenek seçin",
   "Mute User": "Kullanıcıyı sessize al",
   "No chats here yet…": "Henüz burada sohbet yok…",
   "No threads here yet": "Burada henüz akış yok",
@@ -91,9 +93,6 @@
   "Resend": "Yeniden gönder",
   "SEND": "GÖNDER",
   "Search": "Ara",
-  "See all {{count}} options_many": "Tüm {{count}} seçeneklerini gör",
-  "See all {{count}} options_one": "Tüm {{count}} seçeneği gör",
-  "See all {{count}} options_other": "Tüm {{count}} seçeneği gör",
   "Select More Photos": "Daha Fazla Fotoğraf Seçin",
   "Select one": "Birini seç",
   "Select one or more": "Bir veya daha fazlasını seç",
@@ -203,5 +202,8 @@
   "{{memberCount}} members, {{onlineCount}} online_many": "{{memberCount}} üye, {{onlineCount}} çevrimiçi",
   "{{count}} unread": "{{count}} okunmamış",
   "{{count}} new messages": "{{count}} yeni mesaj",
-  "Unsupported Attachment": "Desteklenmeyen ek"
+  "Unsupported Attachment": "Desteklenmeyen ek",
+  "+{{count}} More Options_one": "+{{count}} seçenek daha",
+  "+{{count}} More Options_other": "+{{count}} seçenek daha",
+  "+{{count}} More Options_many": "+{{count}} seçenek daha"
 }
diff --git a/package/src/icons/Minus.tsx b/package/src/icons/Minus.tsx
new file mode 100644
index 0000000000..ccc8ecea15
--- /dev/null
+++ b/package/src/icons/Minus.tsx
@@ -0,0 +1,11 @@
+import React from 'react';
+
+import Svg, { Path } from 'react-native-svg';
+
+import { IconProps } from './utils/base';
+
+export const Minus = ({ height, width, ...rest }: IconProps) => (
+  <Svg width={width} height={height} viewBox='0 0 20 20' fill='none' {...rest}>
+    <Path d='M5.625 10H10H14.375' strokeWidth={1.5} strokeLinecap='round' {...rest} />
+  </Svg>
+);
diff --git a/package/src/icons/index.ts b/package/src/icons/index.ts
index dcb6c39e59..a3ee131885 100644
--- a/package/src/icons/index.ts
+++ b/package/src/icons/index.ts
@@ -30,6 +30,8 @@ export * from './PDF';
 export * from './Picture';
 export * from './Pin';
 export * from './Play';
+export * from './Plus';
+export * from './Minus';
 export * from './Refresh';
 export * from './Resend';
 export * from './Search';
diff --git a/package/src/utils/constants.ts b/package/src/utils/constants.ts
index 8aa35e802d..e4039332fd 100644
--- a/package/src/utils/constants.ts
+++ b/package/src/utils/constants.ts
@@ -4,5 +4,5 @@ export const defaultMentionAllAppUsersQuery = {
   options: {},
   sort: {},
 };
-export const POLL_OPTION_HEIGHT = 56; // (48px + 8px) 48 is the height of the input and 8 is the spacing between each option.
+export const defaultPollOptionCount = 5;
 export const ONE_SECOND_IN_MILLISECONDS = 1000;