diff --git a/app/containers/MessageBox/index.tsx b/app/containers/MessageBox/index.tsx
index d8d6a8133..b8afdacb6 100644
--- a/app/containers/MessageBox/index.tsx
+++ b/app/containers/MessageBox/index.tsx
@@ -9,7 +9,7 @@ import { Q } from '@nozbe/watermelondb';
 import { TouchableWithoutFeedback } from 'react-native-gesture-handler';
 
 import { generateTriggerId } from '../../lib/methods/actions';
-import TextInput, { IThemedTextInput } from '../../presentation/TextInput';
+import TextInput, { IThemedTextInput } from '../TextInput';
 import { userTyping as userTypingAction } from '../../actions/room';
 import styles from './styles';
 import database from '../../lib/database';
diff --git a/app/containers/SearchBox.tsx b/app/containers/SearchBox.tsx
index 75174e474..34432f5d7 100644
--- a/app/containers/SearchBox.tsx
+++ b/app/containers/SearchBox.tsx
@@ -5,7 +5,7 @@ import Touchable from 'react-native-platform-touchable';
 import { themes } from '../lib/constants';
 import I18n from '../i18n';
 import { CustomIcon } from './CustomIcon';
-import TextInput from '../presentation/TextInput';
+import TextInput from './TextInput';
 import { useTheme } from '../theme';
 import { isIOS } from '../utils/deviceInfo';
 import sharedStyles from '../views/Styles';
diff --git a/app/containers/SearchHeader.tsx b/app/containers/SearchHeader.tsx
index 589ef1d2b..6b5e31fc1 100644
--- a/app/containers/SearchHeader.tsx
+++ b/app/containers/SearchHeader.tsx
@@ -5,7 +5,7 @@ import I18n from '../i18n';
 import { useTheme } from '../theme';
 import sharedStyles from '../views/Styles';
 import { themes } from '../lib/constants';
-import TextInput from '../presentation/TextInput';
+import TextInput from './TextInput';
 import { isIOS, isTablet } from '../utils/deviceInfo';
 import { useOrientation } from '../dimensions';
 
diff --git a/app/containers/TextInput.tsx b/app/containers/TextInput/FormTextInput.tsx
similarity index 91%
rename from app/containers/TextInput.tsx
rename to app/containers/TextInput/FormTextInput.tsx
index 5f6471e2e..f013b9f09 100644
--- a/app/containers/TextInput.tsx
+++ b/app/containers/TextInput/FormTextInput.tsx
@@ -2,12 +2,12 @@ import React from 'react';
 import { StyleProp, StyleSheet, Text, TextInputProps, TextInput as RNTextInput, TextStyle, View, ViewStyle } from 'react-native';
 import Touchable from 'react-native-platform-touchable';
 
-import sharedStyles from '../views/Styles';
-import TextInput from '../presentation/TextInput';
-import { themes } from '../lib/constants';
-import { CustomIcon, TIconsName } from './CustomIcon';
-import ActivityIndicator from './ActivityIndicator';
-import { TSupportedThemes } from '../theme';
+import sharedStyles from '../../views/Styles';
+import TextInput from './index';
+import { themes } from '../../lib/constants';
+import { CustomIcon, TIconsName } from '../CustomIcon';
+import ActivityIndicator from '../ActivityIndicator';
+import { TSupportedThemes } from '../../theme';
 
 const styles = StyleSheet.create({
 	error: {
@@ -70,7 +70,7 @@ interface IRCTextInputState {
 	showPassword: boolean;
 }
 
-export default class RCTextInput extends React.PureComponent<IRCTextInputProps, IRCTextInputState> {
+export default class FormTextInput extends React.PureComponent<IRCTextInputProps, IRCTextInputState> {
 	static defaultProps = {
 		error: {},
 		theme: 'light'
diff --git a/app/containers/TextInput.stories.js b/app/containers/TextInput/TextInput.stories.js
similarity index 72%
rename from app/containers/TextInput.stories.js
rename to app/containers/TextInput/TextInput.stories.js
index d0e6c6044..c4a985136 100644
--- a/app/containers/TextInput.stories.js
+++ b/app/containers/TextInput/TextInput.stories.js
@@ -3,7 +3,7 @@ import React from 'react';
 import { storiesOf } from '@storybook/react-native';
 
 import { View, StyleSheet } from 'react-native';
-import TextInput from './TextInput';
+import FormTextInput from './FormTextInput';
 
 const styles = StyleSheet.create({
 	paddingHorizontal: {
@@ -23,9 +23,9 @@ const theme = 'light';
 stories.add('Short and Long Text', () => (
 	<>
 		<View style={styles.paddingHorizontal}>
-			<TextInput label='Short Text' placeholder='placeholder' value={item.name} theme={theme} />
+			<FormTextInput label='Short Text' placeholder='placeholder' value={item.name} theme={theme} />
 
-			<TextInput label='Long Text' placeholder='placeholder' value={item.longText} theme={theme} />
+			<FormTextInput label='Long Text' placeholder='placeholder' value={item.longText} theme={theme} />
 		</View>
 	</>
 ));
diff --git a/app/containers/__snapshots__/TextInput.stories.storyshot b/app/containers/TextInput/__snapshots__/TextInput.stories.storyshot
similarity index 100%
rename from app/containers/__snapshots__/TextInput.stories.storyshot
rename to app/containers/TextInput/__snapshots__/TextInput.stories.storyshot
diff --git a/app/presentation/TextInput.tsx b/app/containers/TextInput/index.tsx
similarity index 83%
rename from app/presentation/TextInput.tsx
rename to app/containers/TextInput/index.tsx
index 8c2a16cdd..449ea2d5e 100644
--- a/app/presentation/TextInput.tsx
+++ b/app/containers/TextInput/index.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { I18nManager, StyleProp, StyleSheet, TextInput, TextStyle } from 'react-native';
 
-import { IRCTextInputProps } from '../containers/TextInput';
-import { themes } from '../lib/constants';
-import { TSupportedThemes } from '../theme';
+import { IRCTextInputProps } from './FormTextInput';
+import { themes } from '../../lib/constants';
+import { TSupportedThemes } from '../../theme';
 
 const styles = StyleSheet.create({
 	input: {
diff --git a/app/containers/TwoFactor/index.tsx b/app/containers/TwoFactor/index.tsx
index a83af6c26..31f68c2e5 100644
--- a/app/containers/TwoFactor/index.tsx
+++ b/app/containers/TwoFactor/index.tsx
@@ -6,7 +6,7 @@ import Modal from 'react-native-modal';
 import useDeepCompareEffect from 'use-deep-compare-effect';
 import { connect } from 'react-redux';
 
-import TextInput from '../TextInput';
+import FormTextInput from '../TextInput/FormTextInput';
 import I18n from '../../i18n';
 import EventEmitter from '../../utils/events';
 import { useTheme } from '../../theme';
@@ -114,7 +114,7 @@ const TwoFactor = React.memo(({ isMasterDetail }: { isMasterDetail: boolean }) =
 					]}>
 					<Text style={[styles.title, { color }]}>{I18n.t(method?.title || 'Two_Factor_Authentication')}</Text>
 					{method?.text ? <Text style={[styles.subtitle, { color }]}>{I18n.t(method.text)}</Text> : null}
-					<TextInput
+					<FormTextInput
 						value={code}
 						theme={theme}
 						inputRef={(e: any) => InteractionManager.runAfterInteractions(() => e?.getNativeRef()?.focus())}
diff --git a/app/containers/UIKit/MultiSelect/index.tsx b/app/containers/UIKit/MultiSelect/index.tsx
index ef4b1fb87..61f917349 100644
--- a/app/containers/UIKit/MultiSelect/index.tsx
+++ b/app/containers/UIKit/MultiSelect/index.tsx
@@ -13,7 +13,7 @@ import {
 import { BLOCK_CONTEXT } from '@rocket.chat/ui-kit';
 
 import Button from '../../Button';
-import TextInput from '../../TextInput';
+import FormTextInput from '../../TextInput/FormTextInput';
 import { textParser } from '../utils';
 import { themes } from '../../../lib/constants';
 import I18n from '../../../i18n';
@@ -139,7 +139,7 @@ export const MultiSelect = React.memo(
 			return (
 				<View style={[styles.modal, { backgroundColor: themes[theme].backgroundColor }]}>
 					<View style={[styles.content, { backgroundColor: themes[theme].backgroundColor }]}>
-						<TextInput
+						<FormTextInput
 							testID='multi-select-search'
 							onChangeText={onSearch || onSearchChange}
 							placeholder={I18n.t('Search')}
diff --git a/app/containers/UIKit/index.tsx b/app/containers/UIKit/index.tsx
index 31806d7cf..70a3a532e 100644
--- a/app/containers/UIKit/index.tsx
+++ b/app/containers/UIKit/index.tsx
@@ -5,7 +5,7 @@ import { BLOCK_CONTEXT, UiKitParserMessage, UiKitParserModal, uiKitMessage, uiKi
 
 import Markdown, { MarkdownPreview } from '../markdown';
 import Button from '../Button';
-import TextInput from '../TextInput';
+import FormTextInput from '../TextInput/FormTextInput';
 import { textParser, useBlockContext } from './utils';
 import { themes } from '../../lib/constants';
 import sharedStyles from '../../views/Styles';
@@ -171,7 +171,7 @@ class ModalParser extends UiKitParserModal {
 		const { theme } = useContext(ThemeContext);
 		const { multiline, actionId, placeholder } = element;
 		return (
-			<TextInput
+			<FormTextInput
 				key={actionId}
 				placeholder={plainText(placeholder)}
 				multiline={multiline}
diff --git a/app/views/CreateChannelView.tsx b/app/views/CreateChannelView.tsx
index 4b9b9e0a6..989d0fb98 100644
--- a/app/views/CreateChannelView.tsx
+++ b/app/views/CreateChannelView.tsx
@@ -4,7 +4,7 @@ import { FlatList, ScrollView, StyleSheet, Switch, Text, View, SwitchProps } fro
 import { dequal } from 'dequal';
 
 import * as List from '../containers/List';
-import TextInput from '../presentation/TextInput';
+import TextInput from '../containers/TextInput';
 import Loading from '../containers/Loading';
 import { createChannelRequest } from '../actions/createChannel';
 import { removeUser } from '../actions/selectedUsers';
diff --git a/app/views/CreateDiscussionView/index.tsx b/app/views/CreateDiscussionView/index.tsx
index cc6495595..c4beb1952 100644
--- a/app/views/CreateDiscussionView/index.tsx
+++ b/app/views/CreateDiscussionView/index.tsx
@@ -11,7 +11,7 @@ import * as HeaderButton from '../../containers/HeaderButton';
 import StatusBar from '../../containers/StatusBar';
 import { withTheme } from '../../theme';
 import { getUserSelector } from '../../selectors/login';
-import TextInput from '../../containers/TextInput';
+import FormTextInput from '../../containers/TextInput/FormTextInput';
 import Navigation from '../../lib/navigation/appNavigation';
 import { createDiscussionRequest, ICreateDiscussionRequestData } from '../../actions/createDiscussion';
 import { showErrorAlert } from '../../utils/info';
@@ -167,7 +167,7 @@ class CreateChannelView extends React.Component<ICreateChannelViewProps, ICreate
 							serverVersion={serverVersion}
 							theme={theme}
 						/>
-						<TextInput
+						<FormTextInput
 							label={I18n.t('Discussion_name')}
 							testID='multi-select-discussion-name'
 							placeholder={I18n.t('A_meaningful_name_for_the_discussion_room')}
diff --git a/app/views/E2EEncryptionSecurityView.tsx b/app/views/E2EEncryptionSecurityView.tsx
index c20392172..8a46468a3 100644
--- a/app/views/E2EEncryptionSecurityView.tsx
+++ b/app/views/E2EEncryptionSecurityView.tsx
@@ -10,7 +10,7 @@ import I18n from '../i18n';
 import log, { events, logEvent } from '../utils/log';
 import { TSupportedThemes, withTheme } from '../theme';
 import SafeAreaView from '../containers/SafeAreaView';
-import TextInput from '../containers/TextInput';
+import FormTextInput from '../containers/TextInput/FormTextInput';
 import Button from '../containers/Button';
 import { getUserSelector } from '../selectors/login';
 import { PADDING_HORIZONTAL } from '../containers/List/constants';
@@ -133,7 +133,7 @@ class E2EEncryptionSecurityView extends React.Component<IE2EEncryptionSecurityVi
 					<Text style={[styles.description, { color: themes[theme!].bodyText }]}>
 						{I18n.t('E2E_encryption_change_password_description')}
 					</Text>
-					<TextInput
+					<FormTextInput
 						inputRef={this.setNewPasswordRef}
 						placeholder={I18n.t('New_Password')}
 						returnKeyType='send'
diff --git a/app/views/E2EEnterYourPasswordView.tsx b/app/views/E2EEnterYourPasswordView.tsx
index bef50cafe..8cc58e53f 100644
--- a/app/views/E2EEnterYourPasswordView.tsx
+++ b/app/views/E2EEnterYourPasswordView.tsx
@@ -9,7 +9,7 @@ import Button from '../containers/Button';
 import * as HeaderButton from '../containers/HeaderButton';
 import SafeAreaView from '../containers/SafeAreaView';
 import StatusBar from '../containers/StatusBar';
-import TextInput from '../containers/TextInput';
+import FormTextInput from '../containers/TextInput/FormTextInput';
 import { IBaseScreen } from '../definitions';
 import I18n from '../i18n';
 import KeyboardView from '../containers/KeyboardView';
@@ -75,7 +75,7 @@ class E2EEnterYourPasswordView extends React.Component<TE2EEnterYourPasswordView
 					<SafeAreaView
 						style={[styles.container, { backgroundColor: themes[theme].backgroundColor }]}
 						testID='e2e-enter-your-password-view'>
-						<TextInput
+						<FormTextInput
 							inputRef={(e: RNTextInput) => {
 								this.passwordInput = e;
 							}}
diff --git a/app/views/ForgotPasswordView.tsx b/app/views/ForgotPasswordView.tsx
index 5ab4775e4..6c99cd724 100644
--- a/app/views/ForgotPasswordView.tsx
+++ b/app/views/ForgotPasswordView.tsx
@@ -3,7 +3,7 @@ import { Text } from 'react-native';
 
 import Button from '../containers/Button';
 import FormContainer, { FormContainerInner } from '../containers/FormContainer';
-import TextInput from '../containers/TextInput';
+import FormTextInput from '../containers/TextInput/FormTextInput';
 import I18n from '../i18n';
 import { themes } from '../lib/constants';
 import { Services } from '../lib/services';
@@ -92,7 +92,7 @@ class ForgotPasswordView extends React.Component<IForgotPasswordViewProps, IForg
 					<Text style={[sharedStyles.loginTitle, sharedStyles.textBold, { color: themes[theme].titleText }]}>
 						{I18n.t('Forgot_password')}
 					</Text>
-					<TextInput
+					<FormTextInput
 						autoFocus
 						placeholder={I18n.t('Email')}
 						keyboardType='email-address'
diff --git a/app/views/InviteUsersView/index.tsx b/app/views/InviteUsersView/index.tsx
index 0850f28d1..37fd6033b 100644
--- a/app/views/InviteUsersView/index.tsx
+++ b/app/views/InviteUsersView/index.tsx
@@ -8,7 +8,7 @@ import Button from '../../containers/Button';
 import Markdown from '../../containers/markdown';
 import SafeAreaView from '../../containers/SafeAreaView';
 import StatusBar from '../../containers/StatusBar';
-import RCTextInput from '../../containers/TextInput';
+import FormTextInput from '../../containers/TextInput/FormTextInput';
 import { IApplicationState, IBaseScreen } from '../../definitions';
 import I18n from '../../i18n';
 import { ChatsStackParamList } from '../../stacks/types';
@@ -92,7 +92,7 @@ const InviteUsersView = ({ route, navigation }: IInviteUsersViewProps): React.Re
 				showsVerticalScrollIndicator={false}>
 				<StatusBar />
 				<View style={styles.innerContainer}>
-					<RCTextInput label={I18n.t('Invite_Link')} theme={theme} value={invite && invite.url} editable={false} />
+					<FormTextInput label={I18n.t('Invite_Link')} theme={theme} value={invite && invite.url} editable={false} />
 					{renderExpiration()}
 					<View style={[styles.divider, { backgroundColor: colors.separatorColor }]} />
 					<Button title={I18n.t('Share_Link')} type='primary' onPress={share} theme={theme} />
diff --git a/app/views/LivechatEditView.tsx b/app/views/LivechatEditView.tsx
index 96f4932c1..9356977c2 100644
--- a/app/views/LivechatEditView.tsx
+++ b/app/views/LivechatEditView.tsx
@@ -7,7 +7,7 @@ import { BLOCK_CONTEXT } from '@rocket.chat/ui-kit';
 
 import { TSupportedThemes, withTheme } from '../theme';
 import { themes } from '../lib/constants';
-import TextInput from '../containers/TextInput';
+import FormTextInput from '../containers/TextInput/FormTextInput';
 import KeyboardView from '../containers/KeyboardView';
 import I18n from '../i18n';
 import { LISTENER } from '../containers/Toast';
@@ -193,7 +193,7 @@ const LivechatEditView = ({
 			<ScrollView {...scrollPersistTaps} style={styles.container}>
 				<SafeAreaView>
 					<Title title={visitor?.username} theme={theme} />
-					<TextInput
+					<FormTextInput
 						label={I18n.t('Name')}
 						defaultValue={visitor?.name}
 						onChangeText={text => onChangeText('name', text)}
@@ -203,7 +203,7 @@ const LivechatEditView = ({
 						theme={theme}
 						editable={!!permissions[0]}
 					/>
-					<TextInput
+					<FormTextInput
 						label={I18n.t('Email')}
 						inputRef={e => {
 							inputs.name = e;
@@ -216,7 +216,7 @@ const LivechatEditView = ({
 						theme={theme}
 						editable={!!permissions[0]}
 					/>
-					<TextInput
+					<FormTextInput
 						label={I18n.t('Phone')}
 						inputRef={e => {
 							inputs.phone = e;
@@ -236,7 +236,7 @@ const LivechatEditView = ({
 						editable={!!permissions[0]}
 					/>
 					{Object.entries(customFields?.visitor || {}).map(([key, value], index, array) => (
-						<TextInput
+						<FormTextInput
 							label={key}
 							defaultValue={value}
 							inputRef={e => {
@@ -254,7 +254,7 @@ const LivechatEditView = ({
 						/>
 					))}
 					<Title title={I18n.t('Conversation')} theme={theme} />
-					<TextInput
+					<FormTextInput
 						label={I18n.t('Topic')}
 						inputRef={e => {
 							inputs.topic = e;
@@ -280,7 +280,7 @@ const LivechatEditView = ({
 					/>
 
 					{Object.entries(customFields?.livechat || {}).map(([key, value], index, array: any) => (
-						<TextInput
+						<FormTextInput
 							label={key}
 							defaultValue={value}
 							inputRef={e => {
diff --git a/app/views/LoginView.tsx b/app/views/LoginView.tsx
index 7c948f637..c38fde5a1 100644
--- a/app/views/LoginView.tsx
+++ b/app/views/LoginView.tsx
@@ -9,7 +9,7 @@ import Button from '../containers/Button';
 import FormContainer, { FormContainerInner } from '../containers/FormContainer';
 import * as HeaderButton from '../containers/HeaderButton';
 import LoginServices from '../containers/LoginServices';
-import TextInput from '../containers/TextInput';
+import FormTextInput from '../containers/TextInput/FormTextInput';
 import { IApplicationState, IBaseScreen } from '../definitions';
 import I18n from '../i18n';
 import { OutsideParamList } from '../stacks/types';
@@ -157,7 +157,7 @@ class LoginView extends React.Component<ILoginViewProps, ILoginViewState> {
 		return (
 			<>
 				<Text style={[styles.title, sharedStyles.textBold, { color: themes[theme].titleText }]}>{I18n.t('Login')}</Text>
-				<TextInput
+				<FormTextInput
 					label={I18n.t('Username_or_email')}
 					containerStyle={styles.inputContainer}
 					placeholder={Accounts_EmailOrUsernamePlaceholder || I18n.t('Username_or_email')}
@@ -173,7 +173,7 @@ class LoginView extends React.Component<ILoginViewProps, ILoginViewState> {
 					theme={theme}
 					value={user}
 				/>
-				<TextInput
+				<FormTextInput
 					label={I18n.t('Password')}
 					containerStyle={styles.inputContainer}
 					inputRef={e => {
diff --git a/app/views/NewServerView/ServerInput/index.tsx b/app/views/NewServerView/ServerInput/index.tsx
index 63bfd0c94..9fba123b2 100644
--- a/app/views/NewServerView/ServerInput/index.tsx
+++ b/app/views/NewServerView/ServerInput/index.tsx
@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { FlatList, StyleSheet, TextInputProps, View } from 'react-native';
 
-import TextInput from '../../../containers/TextInput';
+import FormTextInput from '../../../containers/TextInput/FormTextInput';
 import * as List from '../../../containers/List';
 import { themes } from '../../../lib/constants';
 import I18n from '../../../i18n';
@@ -50,7 +50,7 @@ const ServerInput = ({
 	const [focused, setFocused] = useState(false);
 	return (
 		<View style={styles.container}>
-			<TextInput
+			<FormTextInput
 				label={I18n.t('Enter_workspace_URL')}
 				placeholder={I18n.t('Workspace_URL_Example')}
 				containerStyle={styles.inputContainer}
diff --git a/app/views/ProfileView/index.tsx b/app/views/ProfileView/index.tsx
index f27ed08f9..d256f70e9 100644
--- a/app/views/ProfileView/index.tsx
+++ b/app/views/ProfileView/index.tsx
@@ -16,7 +16,7 @@ import scrollPersistTaps from '../../utils/scrollPersistTaps';
 import { showConfirmationAlert, showErrorAlert } from '../../utils/info';
 import { LISTENER } from '../../containers/Toast';
 import EventEmitter from '../../utils/events';
-import RCTextInput from '../../containers/TextInput';
+import FormTextInput from '../../containers/TextInput/FormTextInput';
 import log, { events, logEvent } from '../../utils/log';
 import I18n from '../../i18n';
 import Button from '../../containers/Button';
@@ -412,7 +412,7 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 								this.setState({ customFields: { ...customFields, ...newValue } });
 							}}
 							value={customFields[key]}>
-							<RCTextInput
+							<FormTextInput
 								inputRef={e => {
 									// @ts-ignore
 									this[key] = e;
@@ -428,7 +428,7 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 				}
 
 				return (
-					<RCTextInput
+					<FormTextInput
 						inputRef={e => {
 							// @ts-ignore
 							this[key] = e;
@@ -499,7 +499,7 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 						<View style={styles.avatarContainer} testID='profile-view-avatar'>
 							<Avatar text={user.username} avatar={avatar?.url} isStatic={avatar?.url} size={100} />
 						</View>
-						<RCTextInput
+						<FormTextInput
 							editable={Accounts_AllowRealNameChange}
 							inputStyle={[!Accounts_AllowRealNameChange && styles.disabled]}
 							inputRef={e => {
@@ -515,7 +515,7 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 							testID='profile-view-name'
 							theme={theme}
 						/>
-						<RCTextInput
+						<FormTextInput
 							editable={Accounts_AllowUsernameChange}
 							inputStyle={[!Accounts_AllowUsernameChange && styles.disabled]}
 							inputRef={e => {
@@ -531,7 +531,7 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 							testID='profile-view-username'
 							theme={theme}
 						/>
-						<RCTextInput
+						<FormTextInput
 							editable={Accounts_AllowEmailChange}
 							inputStyle={[!Accounts_AllowEmailChange && styles.disabled]}
 							inputRef={e => {
@@ -549,7 +549,7 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 							testID='profile-view-email'
 							theme={theme}
 						/>
-						<RCTextInput
+						<FormTextInput
 							editable={Accounts_AllowPasswordChange}
 							inputStyle={[!Accounts_AllowPasswordChange && styles.disabled]}
 							inputRef={e => {
@@ -573,7 +573,7 @@ class ProfileView extends React.Component<IProfileViewProps, IProfileViewState>
 							theme={theme}
 						/>
 						{this.renderCustomFields()}
-						<RCTextInput
+						<FormTextInput
 							editable={Accounts_AllowUserAvatarChange}
 							inputStyle={[!Accounts_AllowUserAvatarChange && styles.disabled]}
 							inputRef={e => {
diff --git a/app/views/RegisterView.tsx b/app/views/RegisterView.tsx
index bd3d78d30..bd9e73ffd 100644
--- a/app/views/RegisterView.tsx
+++ b/app/views/RegisterView.tsx
@@ -9,7 +9,7 @@ import Button from '../containers/Button';
 import FormContainer, { FormContainerInner } from '../containers/FormContainer';
 import * as HeaderButton from '../containers/HeaderButton';
 import LoginServices from '../containers/LoginServices';
-import TextInput from '../containers/TextInput';
+import FormTextInput from '../containers/TextInput/FormTextInput';
 import { IApplicationState, IBaseScreen } from '../definitions';
 import I18n from '../i18n';
 import { getShowLoginButton } from '../selectors/login';
@@ -187,7 +187,7 @@ class RegisterView extends React.Component<IProps, any> {
 										this.setState({ customFields: { ...customFields, ...newValue } });
 									}}
 									value={customFields[key]}>
-									<TextInput
+									<FormTextInput
 										inputRef={e => {
 											// @ts-ignore
 											this[key] = e;
@@ -202,7 +202,7 @@ class RegisterView extends React.Component<IProps, any> {
 						}
 
 						return (
-							<TextInput
+							<FormTextInput
 								inputRef={e => {
 									// @ts-ignore
 									this[key] = e;
@@ -243,7 +243,7 @@ class RegisterView extends React.Component<IProps, any> {
 				<FormContainerInner>
 					<LoginServices navigation={navigation} theme={theme} separator />
 					<Text style={[styles.title, sharedStyles.textBold, { color: themes[theme].titleText }]}>{I18n.t('Sign_Up')}</Text>
-					<TextInput
+					<FormTextInput
 						label={I18n.t('Name')}
 						containerStyle={styles.inputContainer}
 						placeholder={I18n.t('Name')}
@@ -255,7 +255,7 @@ class RegisterView extends React.Component<IProps, any> {
 						testID='register-view-name'
 						theme={theme}
 					/>
-					<TextInput
+					<FormTextInput
 						label={I18n.t('Username')}
 						containerStyle={styles.inputContainer}
 						inputRef={e => {
@@ -270,7 +270,7 @@ class RegisterView extends React.Component<IProps, any> {
 						testID='register-view-username'
 						theme={theme}
 					/>
-					<TextInput
+					<FormTextInput
 						label={I18n.t('Email')}
 						containerStyle={styles.inputContainer}
 						inputRef={e => {
@@ -286,7 +286,7 @@ class RegisterView extends React.Component<IProps, any> {
 						testID='register-view-email'
 						theme={theme}
 					/>
-					<TextInput
+					<FormTextInput
 						label={I18n.t('Password')}
 						containerStyle={styles.inputContainer}
 						inputRef={e => {
diff --git a/app/views/RoomInfoEditView/index.tsx b/app/views/RoomInfoEditView/index.tsx
index 0dd518b01..eb6411448 100644
--- a/app/views/RoomInfoEditView/index.tsx
+++ b/app/views/RoomInfoEditView/index.tsx
@@ -14,7 +14,7 @@ import Avatar from '../../containers/Avatar';
 import Loading from '../../containers/Loading';
 import SafeAreaView from '../../containers/SafeAreaView';
 import StatusBar from '../../containers/StatusBar';
-import RCTextInput from '../../containers/TextInput';
+import FormTextInput from '../../containers/TextInput/FormTextInput';
 import { LISTENER } from '../../containers/Toast';
 import { MultiSelect } from '../../containers/UIKit/MultiSelect';
 import {
@@ -585,7 +585,7 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
 								)}
 							</Avatar>
 						</TouchableOpacity>
-						<RCTextInput
+						<FormTextInput
 							inputRef={e => {
 								this.name = e;
 							}}
@@ -599,7 +599,7 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
 							theme={theme}
 							testID='room-info-edit-view-name'
 						/>
-						<RCTextInput
+						<FormTextInput
 							inputRef={e => {
 								this.description = e;
 							}}
@@ -612,7 +612,7 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
 							theme={theme}
 							testID='room-info-edit-view-description'
 						/>
-						<RCTextInput
+						<FormTextInput
 							inputRef={e => {
 								this.topic = e;
 							}}
@@ -625,7 +625,7 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
 							theme={theme}
 							testID='room-info-edit-view-topic'
 						/>
-						<RCTextInput
+						<FormTextInput
 							inputRef={e => {
 								this.announcement = e;
 							}}
@@ -638,7 +638,7 @@ class RoomInfoEditView extends React.Component<IRoomInfoEditViewProps, IRoomInfo
 							theme={theme}
 							testID='room-info-edit-view-announcement'
 						/>
-						<RCTextInput
+						<FormTextInput
 							inputRef={e => {
 								this.joinCode = e;
 							}}
diff --git a/app/views/RoomView/JoinCode.tsx b/app/views/RoomView/JoinCode.tsx
index db1bf1e41..dcbccae65 100644
--- a/app/views/RoomView/JoinCode.tsx
+++ b/app/views/RoomView/JoinCode.tsx
@@ -5,7 +5,7 @@ import { connect } from 'react-redux';
 
 import I18n from '../../i18n';
 import Button from '../../containers/Button';
-import TextInput from '../../containers/TextInput';
+import FormTextInput from '../../containers/TextInput/FormTextInput';
 import sharedStyles from '../Styles';
 import { themes } from '../../lib/constants';
 import { IApplicationState } from '../../definitions';
@@ -86,7 +86,7 @@ const JoinCode = React.memo(
 							{ backgroundColor: themes[theme].backgroundColor }
 						]}>
 						<Text style={[styles.title, { color: themes[theme].titleText }]}>{I18n.t('Insert_Join_Code')}</Text>
-						<TextInput
+						<FormTextInput
 							value={code}
 							theme={theme}
 							// TODO: find a way to type this ref
diff --git a/app/views/RoomsListView/Header/Header.tsx b/app/views/RoomsListView/Header/Header.tsx
index a8c0dd80d..5f3668016 100644
--- a/app/views/RoomsListView/Header/Header.tsx
+++ b/app/views/RoomsListView/Header/Header.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { StyleSheet, Text, TextInputProps, TouchableOpacity, TouchableOpacityProps, View } from 'react-native';
 
-import TextInput from '../../../presentation/TextInput';
+import TextInput from '../../../containers/TextInput';
 import I18n from '../../../i18n';
 import sharedStyles from '../../Styles';
 import { themes } from '../../../lib/constants';
diff --git a/app/views/SearchMessagesView/index.tsx b/app/views/SearchMessagesView/index.tsx
index 2e6252bee..015013abc 100644
--- a/app/views/SearchMessagesView/index.tsx
+++ b/app/views/SearchMessagesView/index.tsx
@@ -8,7 +8,7 @@ import { dequal } from 'dequal';
 
 import { ISubscription, SubscriptionType } from '../../definitions/ISubscription';
 import { IAttachment } from '../../definitions/IAttachment';
-import RCTextInput from '../../containers/TextInput';
+import FormTextInput from '../../containers/TextInput/FormTextInput';
 import ActivityIndicator from '../../containers/ActivityIndicator';
 import Markdown from '../../containers/markdown';
 import debounce from '../../utils/debounce';
@@ -322,7 +322,7 @@ class SearchMessagesView extends React.Component<ISearchMessagesViewProps, ISear
 			<SafeAreaView style={{ backgroundColor: themes[theme].backgroundColor }} testID='search-messages-view'>
 				<StatusBar />
 				<View style={styles.searchContainer}>
-					<RCTextInput
+					<FormTextInput
 						autoFocus
 						label={I18n.t('Search')}
 						onChangeText={this.search}
diff --git a/app/views/SendEmailConfirmationView.tsx b/app/views/SendEmailConfirmationView.tsx
index 7ab89dd99..90dc01d04 100644
--- a/app/views/SendEmailConfirmationView.tsx
+++ b/app/views/SendEmailConfirmationView.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 
 import { OutsideParamList } from '../stacks/types';
-import TextInput from '../containers/TextInput';
+import FormTextInput from '../containers/TextInput/FormTextInput';
 import Button from '../containers/Button';
 import { showErrorAlert } from '../utils/info';
 import isValidEmail from '../utils/isValidEmail';
@@ -59,7 +59,7 @@ const SendEmailConfirmationView = ({ navigation, route }: ISendEmailConfirmation
 	return (
 		<FormContainer testID='send-email-confirmation-view'>
 			<FormContainerInner>
-				<TextInput
+				<FormTextInput
 					autoFocus
 					placeholder={I18n.t('Email')}
 					keyboardType='email-address'
diff --git a/app/views/SetUsernameView.tsx b/app/views/SetUsernameView.tsx
index 184195e66..7197d16bc 100644
--- a/app/views/SetUsernameView.tsx
+++ b/app/views/SetUsernameView.tsx
@@ -11,7 +11,7 @@ import { themes } from '../lib/constants';
 import Button from '../containers/Button';
 import SafeAreaView from '../containers/SafeAreaView';
 import StatusBar from '../containers/StatusBar';
-import TextInput from '../containers/TextInput';
+import FormTextInput from '../containers/TextInput/FormTextInput';
 import { IApplicationState } from '../definitions';
 import { SetUsernameStackParamList } from '../definitions/navigationTypes';
 import I18n from '../i18n';
@@ -118,7 +118,7 @@ class SetUsernameView extends React.Component<ISetUsernameViewProps, ISetUsernam
 						<Text style={[sharedStyles.loginSubtitle, sharedStyles.textRegular, { color: themes[theme].titleText }]}>
 							{I18n.t('Set_username_subtitle')}
 						</Text>
-						<TextInput
+						<FormTextInput
 							autoFocus
 							placeholder={I18n.t('Username')}
 							returnKeyType='send'
diff --git a/app/views/ShareListView/Header/Header.tsx b/app/views/ShareListView/Header/Header.tsx
index a3b017c48..5f01d090b 100644
--- a/app/views/ShareListView/Header/Header.tsx
+++ b/app/views/ShareListView/Header/Header.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { StyleSheet, Text, View } from 'react-native';
 
-import TextInput from '../../../presentation/TextInput';
+import TextInput from '../../../containers/TextInput';
 import I18n from '../../../i18n';
 import { themes } from '../../../lib/constants';
 import sharedStyles from '../../Styles';
diff --git a/app/views/ShareView/index.tsx b/app/views/ShareView/index.tsx
index 18063abfe..7cc5cdb8b 100644
--- a/app/views/ShareView/index.tsx
+++ b/app/views/ShareView/index.tsx
@@ -14,7 +14,7 @@ import * as HeaderButton from '../../containers/HeaderButton';
 import { isBlocked } from '../../utils/room';
 import { isReadOnly } from '../../utils/isReadOnly';
 import { TSupportedThemes, withTheme } from '../../theme';
-import TextInput from '../../containers/TextInput';
+import FormTextInput from '../../containers/TextInput/FormTextInput';
 import MessageBox from '../../containers/MessageBox';
 import SafeAreaView from '../../containers/SafeAreaView';
 import { getUserSelector } from '../../selectors/login';
@@ -332,7 +332,7 @@ class ShareView extends Component<IShareViewProps, IShareViewState> {
 		}
 
 		return (
-			<TextInput
+			<FormTextInput
 				containerStyle={styles.inputContainer}
 				inputStyle={[styles.input, styles.textInput, { backgroundColor: themes[theme].focusedBackground }]}
 				placeholder=''
diff --git a/app/views/StatusView/index.tsx b/app/views/StatusView/index.tsx
index 5f02d7c18..e64d1f435 100644
--- a/app/views/StatusView/index.tsx
+++ b/app/views/StatusView/index.tsx
@@ -9,7 +9,7 @@ import * as List from '../../containers/List';
 import Loading from '../../containers/Loading';
 import SafeAreaView from '../../containers/SafeAreaView';
 import StatusIcon from '../../containers/Status/Status';
-import TextInput from '../../containers/TextInput';
+import FormTextInput from '../../containers/TextInput/FormTextInput';
 import { IApplicationState, TUserStatus } from '../../definitions';
 import I18n from '../../i18n';
 import { showToast } from '../../lib/methods/helpers/showToast';
@@ -162,7 +162,7 @@ const StatusView = (): React.ReactElement => {
 				renderItem={({ item }) => <Status status={item} statusText={statusText} />}
 				ListHeaderComponent={
 					<>
-						<TextInput
+						<FormTextInput
 							theme={theme}
 							value={statusText}
 							containerStyle={styles.inputContainer}
diff --git a/storybook/stories/index.js b/storybook/stories/index.js
index f24e19003..7e0e57cb7 100644
--- a/storybook/stories/index.js
+++ b/storybook/stories/index.js
@@ -18,7 +18,7 @@ import '../../app/containers/BackgroundContainer/index.stories.js';
 import '../../app/containers/RoomHeader/RoomHeader.stories.js';
 import '../../app/views/RoomView/LoadMore/LoadMore.stories';
 import '../../app/views/CannedResponsesListView/CannedResponseItem.stories';
-import '../../app/containers/TextInput.stories';
+import '../../app/containers/TextInput/TextInput.stories';
 import '../../app/containers/message/Components/CollapsibleQuote/CollapsibleQuote.stories';
 
 // Change here to see themed storybook