diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0be3fa7d1..92cd71b897 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,10 @@
 
 * Revert adjusting bootstrap scripts for developing on Windows
 
+* Channel input - replaced ContentEditable with textarea
+
+* Fix - up/down arrows now work properly inside channel input (textarea)
+
 [2.0.1-alpha.2]
 
 * UI layer for taken usernames for desktop and mobile
diff --git a/packages/desktop/cypress/snapshots/base/src/renderer/components/Channel/Channel.regression.cy.tsx/message input words wrapping-base.png b/packages/desktop/cypress/snapshots/base/src/renderer/components/Channel/Channel.regression.cy.tsx/message input words wrapping-base.png
index 199d3f83f1..3d1caa34a7 100644
Binary files a/packages/desktop/cypress/snapshots/base/src/renderer/components/Channel/Channel.regression.cy.tsx/message input words wrapping-base.png and b/packages/desktop/cypress/snapshots/base/src/renderer/components/Channel/Channel.regression.cy.tsx/message input words wrapping-base.png differ
diff --git a/packages/desktop/package-lock.json b/packages/desktop/package-lock.json
index 766696fb1a..ae6b1a5a16 100644
--- a/packages/desktop/package-lock.json
+++ b/packages/desktop/package-lock.json
@@ -109,7 +109,6 @@
         "rc-scrollbars": "^1.1.5",
         "react": "18.1.0",
         "react-alice-carousel": "^1.15.3",
-        "react-contenteditable": "^3.3.3",
         "react-copy-to-clipboard": "^5.1.0",
         "react-dnd": "^16.0.1",
         "react-dnd-html5-backend": "^16.0.1",
@@ -26973,12 +26972,6 @@
         "chance": "^1.0.4"
       }
     },
-    "node_modules/fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
-    },
     "node_modules/fast-glob": {
       "version": "3.2.11",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
@@ -38548,19 +38541,6 @@
         "react": "^0.14.0 || ^15.0.0-0 || ^16.0.0-0"
       }
     },
-    "node_modules/react-contenteditable": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/react-contenteditable/-/react-contenteditable-3.3.3.tgz",
-      "integrity": "sha512-3sOt9x6A7SzHqJgFRqKfaUnIh2tdxrdnJcE/0g1dN/g3twsqNxMxUCJGWvZUUDIQjUzqdSz6tsnGdddrPr5UNg==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^2.0.1",
-        "prop-types": "^15.7.1"
-      },
-      "peerDependencies": {
-        "react": ">=16.3"
-      }
-    },
     "node_modules/react-copy-to-clipboard": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz",
@@ -66622,12 +66602,6 @@
         "chance": "^1.0.4"
       }
     },
-    "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
-    },
     "fast-glob": {
       "version": "3.2.11",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz",
@@ -75550,16 +75524,6 @@
         }
       }
     },
-    "react-contenteditable": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/react-contenteditable/-/react-contenteditable-3.3.3.tgz",
-      "integrity": "sha512-3sOt9x6A7SzHqJgFRqKfaUnIh2tdxrdnJcE/0g1dN/g3twsqNxMxUCJGWvZUUDIQjUzqdSz6tsnGdddrPr5UNg==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^2.0.1",
-        "prop-types": "^15.7.1"
-      }
-    },
     "react-copy-to-clipboard": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz",
diff --git a/packages/desktop/package.json b/packages/desktop/package.json
index 6a151ec6a4..ac4cc8707a 100644
--- a/packages/desktop/package.json
+++ b/packages/desktop/package.json
@@ -231,7 +231,6 @@
     "rc-scrollbars": "^1.1.5",
     "react": "18.1.0",
     "react-alice-carousel": "^1.15.3",
-    "react-contenteditable": "^3.3.3",
     "react-copy-to-clipboard": "^5.1.0",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
diff --git a/packages/desktop/src/renderer/components/Channel/Channel.regression.cy.tsx b/packages/desktop/src/renderer/components/Channel/Channel.regression.cy.tsx
index cb07239f0c..304db04a14 100644
--- a/packages/desktop/src/renderer/components/Channel/Channel.regression.cy.tsx
+++ b/packages/desktop/src/renderer/components/Channel/Channel.regression.cy.tsx
@@ -43,16 +43,13 @@ describe('Scroll behavior test', () => {
 
   it('scroll should be at the bottom after entering channel', () => {
     cy.get(channelContent).compareSnapshot('after launch', {
-      capture: 'fullPage'
+      capture: 'fullPage',
     })
   })
 
   it('scroll should be at the bottom after sending messages', () => {
     cy.get(messageInput).focus().type('luke where are you?').type('{enter}')
-    cy.get(messageInput)
-      .focus()
-      .type('you underestimate the power of the force')
-      .type('{enter}')
+    cy.get(messageInput).focus().type('you underestimate the power of the force').type('{enter}')
     cy.get(channelContent).compareSnapshot('send after enter')
   })
 
@@ -62,10 +59,7 @@ describe('Scroll behavior test', () => {
     cy.get(channelContent).compareSnapshot('scroll to the middle')
 
     cy.get(messageInput).focus().type('obi wan was wrong').type('{enter}')
-    cy.get(messageInput)
-      .focus()
-      .type('actually, he is on the dark side')
-      .type('{enter}')
+    cy.get(messageInput).focus().type('actually, he is on the dark side').type('{enter}')
 
     cy.get(channelContent).compareSnapshot('send after scroll')
   })
@@ -91,7 +85,7 @@ describe('Scroll behavior test', () => {
   it('PageUp keydown should scroll message list up.', () => {
     cy.get(messageInput).focus().type('{pageup}')
     cy.get(channelContent).compareSnapshot('after pageup', {
-      capture: 'fullPage'
+      capture: 'fullPage',
     })
   })
 
@@ -99,7 +93,7 @@ describe('Scroll behavior test', () => {
     cy.get(channelContent).scrollTo(0, 0)
     cy.get(messageInput).focus().type('{pagedown}')
     cy.get(channelContent).compareSnapshot('after pagedown', {
-      capture: 'fullPage'
+      capture: 'fullPage',
     })
   })
 
@@ -109,7 +103,7 @@ describe('Scroll behavior test', () => {
       .type('luke where are you?')
       .type('{shift+enter}')
       .type('you underestimate the power of the force')
-      .should('have.text', 'luke where are you?you underestimate the power of the force')
+      .should('have.text', 'luke where are you?\nyou underestimate the power of the force')
   })
 
   it('Check words wrapping in message input', () => {
@@ -120,9 +114,7 @@ describe('Scroll behavior test', () => {
       }
       return word
     }
-    cy.get(messageInput)
-      .focus()
-      .type(longWord())
+    cy.get(messageInput).focus().type(longWord())
 
     cy.get(messageInput).compareSnapshot('message input words wrapping')
   })
diff --git a/packages/desktop/src/renderer/components/SearchModal/SearchModal.tsx b/packages/desktop/src/renderer/components/SearchModal/SearchModal.tsx
index 906752382c..590ce7354a 100644
--- a/packages/desktop/src/renderer/components/SearchModal/SearchModal.tsx
+++ b/packages/desktop/src/renderer/components/SearchModal/SearchModal.tsx
@@ -58,7 +58,7 @@ const SearchModal = () => {
     }
   }, [handleKeyDown])
 
-  if (dynamicSearchedChannelsSelector.length === 0) return null
+  if (!searchChannelModal.open || dynamicSearchedChannelsSelector.length === 0) return null
   return (
     <SearchModalComponent
       {...searchChannelModal}
diff --git a/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.stories.tsx b/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.stories.tsx
index 3ca9d2cf6d..041dec94fb 100644
--- a/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.stories.tsx
+++ b/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.stories.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { ComponentStory, ComponentMeta } from '@storybook/react'
-
+import CssBaseline from '@mui/material/CssBaseline'
 import { INPUT_STATE } from './InputState.enum'
 
 import { ChannelInputComponent, ChannelInputProps } from './ChannelInput'
@@ -20,7 +20,6 @@ export const LongMessage = Template.bind({})
 
 const args: ChannelInputProps = {
   channelId: 'channelId',
-  channelParticipants: [{ nickname: 'john' }, { nickname: 'emily' }],
   inputPlaceholder: '#general as @alice',
   onChange: function (_arg: string): void {},
   onKeyPress: function (input: string): void {
@@ -35,7 +34,6 @@ const args: ChannelInputProps = {
 
 const argsDisabledInput: ChannelInputProps = {
   channelId: 'channelId',
-  channelParticipants: [{ nickname: 'john' }, { nickname: 'emily' }],
   inputPlaceholder: '#general as @alice',
   onChange: function (_arg: string): void {},
   onKeyPress: function (input: string): void {
@@ -246,7 +244,6 @@ not easy being.
 
 const argsLongMessage: ChannelInputProps = {
   channelId: 'channelId',
-  channelParticipants: [{ nickname: 'john' }, { nickname: 'emily' }],
   inputPlaceholder: '#general as @alice',
   initialMessage: initialMessage,
   onChange: function (_arg: string): void {},
diff --git a/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.test.tsx b/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.test.tsx
index 1568bf8301..7af8a90005 100644
--- a/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.test.tsx
+++ b/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.test.tsx
@@ -28,7 +28,7 @@ describe('ChannelInput', () => {
       <body>
         <div>
           <div
-            class="MuiGrid-root ChannelInputroot css-j3fbgh-MuiGrid-root"
+            class="MuiGrid-root ChannelInputroot css-1n4ubjj-MuiGrid-root"
           >
             <div
               class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-column ChannelInputrootContent css-6gh8l0-MuiGrid-root"
@@ -39,18 +39,11 @@ describe('ChannelInput', () => {
                 <div
                   class="MuiGrid-root MuiGrid-container MuiGrid-item MuiGrid-grid-xs-true ChannelInputtextfield css-1r61agb-MuiGrid-root"
                 >
-                  <div
-                    class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-true ChannelInputtextArea css-1vd824g-MuiGrid-root"
-                  >
-                    <div
-                      class="ChannelInputinput"
-                      contenteditable="true"
-                      data-testid="messageInput"
-                      placeholder="Message #channel as @user"
-                    >
-                      
-                    </div>
-                  </div>
+                  <textarea
+                    class="ChannelInputinput"
+                    data-testid="messageInput"
+                    placeholder="Message #channel as @user"
+                  />
                   <div
                     class="ChannelInputicons"
                   >
@@ -121,7 +114,7 @@ describe('ChannelInput', () => {
       <body>
         <div>
           <div
-            class="MuiGrid-root ChannelInputroot ChannelInputnotAllowed css-j3fbgh-MuiGrid-root"
+            class="MuiGrid-root ChannelInputroot ChannelInputnotAllowed css-1n4ubjj-MuiGrid-root"
           >
             <div
               class="MuiGrid-root MuiGrid-container MuiGrid-direction-xs-column ChannelInputrootContent css-6gh8l0-MuiGrid-root"
@@ -132,19 +125,12 @@ describe('ChannelInput', () => {
                 <div
                   class="MuiGrid-root MuiGrid-container MuiGrid-item MuiGrid-grid-xs-true ChannelInputtextfield css-1r61agb-MuiGrid-root"
                 >
-                  <div
-                    class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-true ChannelInputtextArea css-1vd824g-MuiGrid-root"
-                  >
-                    <div
-                      class="ChannelInputinput"
-                      contenteditable="false"
-                      data-testid="messageInput"
-                      disabled=""
-                      placeholder="Message #channel as @user"
-                    >
-                      
-                    </div>
-                  </div>
+                  <textarea
+                    class="ChannelInputinput"
+                    data-testid="messageInput"
+                    disabled=""
+                    placeholder="Message #channel as @user"
+                  />
                   <div
                     class="ChannelInputicons"
                   >
diff --git a/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.tsx b/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.tsx
index c6921b7746..35b46473f1 100644
--- a/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.tsx
+++ b/packages/desktop/src/renderer/components/widgets/channels/ChannelInput/ChannelInput.tsx
@@ -1,6 +1,5 @@
 import React, { ReactElement, useCallback } from 'react'
 import classNames from 'classnames'
-import ContentEditable, { ContentEditableEvent } from 'react-contenteditable'
 import Picker, { EmojiStyle } from 'emoji-picker-react'
 import Grid from '@mui/material/Grid'
 import { styled } from '@mui/material/styles'
@@ -14,7 +13,6 @@ import emojiBlack from '../../../../static/images/emojiBlack.svg'
 import paperclipGray from '../../../../static/images/paperclipGray.svg'
 import paperclipBlack from '../../../../static/images/paperclipBlack.svg'
 import path from 'path'
-import { isDefined } from '@quiet/common'
 
 const PREFIX = 'ChannelInput'
 
@@ -41,7 +39,6 @@ const classes = {
   notAllowed: `${PREFIX}notAllowed`,
   inputFiles: `${PREFIX}inputFiles`,
   icons: `${PREFIX}icons`,
-  textArea: `${PREFIX}textArea`,
 }
 
 const maxHeight = 300
@@ -62,11 +59,17 @@ const StyledChannelInput = styled(Grid)(({ theme }) => ({
     to: { opacity: 1 },
   },
   [`& .${classes.input}`]: {
+    display: 'block',
+    border: 0,
+    resize: 'none',
+    fontFamily: 'inherit',
     whiteSpace: 'break-spaces',
     width: '100%',
     fontSize: 14,
     outline: 'none',
     padding: '12px 16px',
+    scrollPaddingBottom: '12px',
+    height: '48px',
     lineHeight: '24px',
     '&:empty': {
       '&:before': {
@@ -75,6 +78,9 @@ const StyledChannelInput = styled(Grid)(({ theme }) => ({
         color: '#aaa',
       },
     },
+    '&::placeholder': {
+      color: '#aaa',
+    },
     wordBreak: 'break-word',
     position: 'relative',
     paddingRight: '60px',
@@ -200,15 +206,11 @@ const StyledChannelInput = styled(Grid)(({ theme }) => ({
     alignItems: 'center',
     alignCntent: 'stretch',
   },
-  [`& .${classes.textArea}`]: {
-    maxHeight: maxHeight,
-  },
 }))
 
 export interface ChannelInputProps {
   channelId: string
   channelName?: string
-  channelParticipants?: Array<{ nickname: string }>
   inputPlaceholder: string
   inputState?: INPUT_STATE
   initialMessage?: string
@@ -224,7 +226,6 @@ export interface ChannelInputProps {
 
 export const ChannelInputComponent: React.FC<ChannelInputProps> = ({
   channelId,
-  channelParticipants = [],
   inputPlaceholder,
   inputState = INPUT_STATE.AVAILABLE,
   initialMessage = '',
@@ -237,114 +238,36 @@ export const ChannelInputComponent: React.FC<ChannelInputProps> = ({
   handleClipboardFiles,
   handleOpenFiles,
 }) => {
-  const [_anchorEl, setAnchorEl] = React.useState<HTMLDivElement>()
-  const [mentionsToSelect, setMentionsToSelect] = React.useState<
-    Array<{
-      nickname: string
-    }>
-  >([])
-  const messageRef = React.useRef<string>()
-  const refSelected = React.useRef<number>()
-  const isFirstRenderRef = React.useRef(true)
-
-  const mentionsToSelectRef = React.useRef<any[]>()
-
-  const inputRef = React.createRef<ContentEditable & HTMLDivElement & any>() // any for updater.enqueueForceUpdate
-
+  const textAreaRef = React.createRef<HTMLTextAreaElement>()
   const fileInput = React.useRef<HTMLInputElement>(null)
 
   const [focused, setFocused] = React.useState(false)
-  const [selected, setSelected] = React.useState(0)
 
   const [emojiHovered, setEmojiHovered] = React.useState(false)
   const [fileExplorerHovered, setFileExplorerHovered] = React.useState(false)
   const [openEmoji, setOpenEmoji] = React.useState(false)
 
-  const [htmlMessage, setHtmlMessage] = React.useState<string>(initialMessage)
   const [message, setMessage] = React.useState(initialMessage)
 
-  React.useEffect(() => {
-    inputRef.current?.el.current.focus()
-  }, [inputRef])
-
-  React.useEffect(() => {
-    inputRef.current.updater.enqueueForceUpdate(inputRef.current)
-  }, [inputPlaceholder, channelId])
-
-  // Use reference to bypass memorization
-  React.useEffect(() => {
-    refSelected.current = selected
-  }, [selected])
-
-  const isRefSelected = (refSelected: number | undefined): refSelected is number => {
-    return typeof refSelected === 'number'
-  }
-
-  React.useEffect(() => {
-    mentionsToSelectRef.current = mentionsToSelect
-  }, [mentionsToSelect])
-
-  React.useEffect(() => {
-    if (!message) {
-      setHtmlMessage('')
-    }
-  }, [message])
-
   React.useEffect(() => {
     setMessage(initialMessage)
-    setHtmlMessage(initialMessage)
-    if (!isFirstRenderRef.current) {
-      return () => {
-        if (messageRef?.current) {
-          onChange(messageRef.current)
-        }
-      }
-    }
-    isFirstRenderRef.current = false
+    const ref = textAreaRef.current
+    if (!ref) return
+    if (!initialMessage) return
+    adjustTextAreaHeight(ref)
   }, [channelId])
 
   React.useEffect(() => {
-    messageRef.current = message
-  }, [message])
-
-  const findMentions = React.useCallback(
-    (text: string) => {
-      // Search for any mention in message string
-      const result: string = text.replace(
-        /(<span([^>]*)>)?@([a-z0-9]?\w*)(<\/span>)?/gi,
-        (match, span, _class, nickname) => {
-          // Ignore already established mentions
-          if (span?.includes('class')) {
-            return match
-          }
-
-          nickname = nickname ?? ''
-          const possibleMentions = channelParticipants
-            .filter(
-              user =>
-                user.nickname.startsWith(nickname) && !channelParticipants.find(user => user.nickname === nickname)
-            )
-            .filter(isDefined)
-
-          if (JSON.stringify(mentionsToSelect) !== JSON.stringify(possibleMentions)) {
-            setMentionsToSelect(possibleMentions)
-            setTimeout(() => {
-              setSelected(0)
-            }, 0)
-          }
-
-          // Wrap mention in spans to be able to treat it as an anchor for popper
-          console.log('Returning wrapped mentions', nickname)
-          return `<span>@${nickname}</span>`
-        }
-      )
-
-      return result
-    },
-    [mentionsToSelect, setMentionsToSelect]
-  )
-
-  const sanitizedHtml = findMentions(htmlMessage)
+    textAreaRef.current?.focus()
+  }, [textAreaRef])
+
+  const adjustTextAreaHeight = (el: HTMLTextAreaElement) => {
+    // Workaround for making textarea's height adapt to the content
+    el.style.height = ''
+    if (el.scrollHeight > el.clientHeight) {
+      el.style.height = `${el.scrollHeight}px`
+    }
+  }
 
   const caretLineTraversal = (focusLine: Node | null | undefined, anchorLinePosition = 0) => {
     if (!focusLine?.nodeValue) return
@@ -364,20 +287,13 @@ export const ChannelInputComponent: React.FC<ChannelInputProps> = ({
   }
 
   const onChangeCb = useCallback(
-    (e: ContentEditableEvent) => {
+    (e: React.ChangeEvent<HTMLTextAreaElement>) => {
       if (inputState === INPUT_STATE.AVAILABLE) {
-        // @ts-expect-error
-        setMessage(e.nativeEvent.target.innerText)
-        // @ts-expect-error
-        if (!e.nativeEvent.target.innerText) {
-          setHtmlMessage('')
-        } else {
-          setHtmlMessage(e.target.value)
-        }
+        setMessage(e.target.value)
+        adjustTextAreaHeight(e.target)
       }
-      setAnchorEl(e.currentTarget.lastElementChild)
     },
-    [setAnchorEl, onChange, setHtmlMessage]
+    [onChange]
   )
 
   const inputStateRef = React.useRef(inputState)
@@ -385,51 +301,8 @@ export const ChannelInputComponent: React.FC<ChannelInputProps> = ({
     inputStateRef.current = inputState
   })
 
-  const mentionSelectAction = (e: React.MouseEvent | React.KeyboardEvent) => {
-    e.preventDefault()
-    if (!mentionsToSelectRef.current || !refSelected.current) return
-    const nickname = mentionsToSelectRef.current[refSelected.current].nickname
-    setHtmlMessage(htmlMessage => {
-      const wrapped = `<span class="${classes.highlight}">@${nickname}</span>&nbsp;`
-      return htmlMessage.replace(/<span>[^/]*<\/span>$/g, wrapped)
-    })
-    // Replace mentions characters with full nickname in original message string
-    setMessage(message.replace(/(\b(\w+)$)/, `${nickname} `))
-    // Clear popper items after choosing mention
-    setMentionsToSelect([])
-    inputRef.current?.el.current.focus()
-  }
-
   const onKeyDownCb = useCallback(
     (e: React.KeyboardEvent) => {
-      if (!isRefSelected(refSelected.current)) {
-        throw new Error('refSelected is on unexpected type')
-      }
-      if (!mentionsToSelectRef?.current) {
-        return
-      }
-      if (mentionsToSelectRef.current.length) {
-        if (e.nativeEvent.keyCode === 40) {
-          if (refSelected.current + 1 >= mentionsToSelectRef.current.length) {
-            setSelected(0)
-          } else {
-            setSelected(refSelected.current + 1)
-          }
-          e.preventDefault()
-        }
-        if (e.nativeEvent.keyCode === 38) {
-          if (refSelected.current - 1 < 0) {
-            setSelected(mentionsToSelectRef.current.length - 1)
-          } else {
-            setSelected(refSelected.current - 1)
-          }
-          e.preventDefault()
-        }
-        if (e.nativeEvent.keyCode === 13 || e.nativeEvent.keyCode === 9) {
-          mentionSelectAction(e)
-        }
-      }
-
       if (e.key === 'ArrowDown') {
         const anchorNode: Node | null | undefined = window?.getSelection()?.anchorNode
 
@@ -481,16 +354,16 @@ export const ChannelInputComponent: React.FC<ChannelInputProps> = ({
         caretLineTraversal(previousNode, window?.getSelection()?.anchorOffset)
       }
 
-      if (e.nativeEvent.keyCode === 13) {
+      if (e.nativeEvent.key === 'Enter') {
         if (e.shiftKey) {
           // Accept this input for additional lines in the message box
         } else if (inputStateRef.current === INPUT_STATE.AVAILABLE) {
           e.preventDefault()
           const target = e.target as HTMLInputElement
-          onChange(target.innerText)
-          onKeyPress(target.innerText)
+          onChange(target.value)
+          onKeyPress(target.value)
           setMessage('')
-          setHtmlMessage('')
+          target.style.height = ''
         } else {
           e.preventDefault()
           if (infoClass !== classNames(classes.backdrop, classes.blinkAnimation)) {
@@ -500,18 +373,7 @@ export const ChannelInputComponent: React.FC<ChannelInputProps> = ({
         }
       }
     },
-    [
-      inputState,
-      message,
-      mentionsToSelectRef,
-      onChange,
-      onKeyPress,
-      setMessage,
-      setHtmlMessage,
-      infoClass,
-      setInfoClass,
-      setSelected,
-    ]
+    [inputState, message, onChange, onKeyPress, setMessage, infoClass, setInfoClass]
   )
 
   const handleFileInput = (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -535,22 +397,6 @@ export const ChannelInputComponent: React.FC<ChannelInputProps> = ({
         direction='column'
         justifyContent='center'
       >
-        {/* <MentionPoper anchorEl={anchorEl} selected={selected}>
-          {mentionsToSelect.map((target, index) => (
-            <MentionElement
-              key={index}
-              name={target.nickname}
-              highlight={index === selected}
-              onMouseEnter={() => {
-                setSelected(index)
-              }}
-              channelName={channelName}
-              onClick={e => {
-                mentionSelectAction(e)
-              }}
-            />
-          ))}
-        </MentionPoper> */}
         <Grid
           container
           direction='row'
@@ -577,37 +423,31 @@ export const ChannelInputComponent: React.FC<ChannelInputProps> = ({
               justifyContent='center'
               alignItems='center'
             >
-              <Grid item xs className={classes.textArea}>
-                <ContentEditable
-                  ref={inputRef}
-                  placeholder={`Message ${inputPlaceholder}`}
-                  className={classes.input}
-                  onClick={() => {
-                    if (!focused) {
-                      setFocused(true)
-                    }
-                  }}
-                  disabled={inputState !== INPUT_STATE.AVAILABLE}
-                  html={sanitizedHtml}
-                  onChange={onChangeCb}
-                  onKeyDown={onKeyDownCb}
-                  onPaste={async e => {
-                    e.preventDefault()
-                    const files = e.clipboardData.files
-                    for (let i = 0; i < files.length; i++) {
-                      const fileExt = path.extname(files[i].name).toLowerCase()
-                      const fileName = path.basename(files[i].name, fileExt)
-                      const arrayBuffer = await files[i].arrayBuffer()
-                      handleClipboardFiles(arrayBuffer, fileExt, fileName)
-                    }
-                    if (!files.length) {
-                      const text = e.clipboardData.getData('text/plain').replace(/(\r\n|\r|\n)/g, '<br />')
-                      document.execCommand('insertHTML', false, text)
-                    }
-                  }}
-                  data-testid='messageInput'
-                />
-              </Grid>
+              <textarea
+                ref={textAreaRef}
+                placeholder={`Message ${inputPlaceholder}`}
+                className={classes.input}
+                onClick={() => {
+                  if (!focused) {
+                    setFocused(true)
+                  }
+                }}
+                value={message}
+                disabled={inputState !== INPUT_STATE.AVAILABLE}
+                onChange={onChangeCb}
+                onKeyDown={onKeyDownCb}
+                onPaste={async e => {
+                  const files = e.clipboardData.files
+                  if (files.length) e.preventDefault()
+                  for (let i = 0; i < files.length; i++) {
+                    const fileExt = path.extname(files[i].name).toLowerCase()
+                    const fileName = path.basename(files[i].name, fileExt)
+                    const arrayBuffer = await files[i].arrayBuffer()
+                    handleClipboardFiles(arrayBuffer, fileExt, fileName)
+                  }
+                }}
+                data-testid='messageInput'
+              />
               {children}
               <div className={classes.icons}>
                 <Grid item className={classes.actions}>
@@ -662,7 +502,6 @@ export const ChannelInputComponent: React.FC<ChannelInputProps> = ({
                       <div data-testid={'emoji-picker'} className={classes.picker}>
                         <Picker
                           onEmojiClick={(emojiData, _event) => {
-                            setHtmlMessage(htmlMessage => htmlMessage + emojiData.emoji)
                             setMessage(message + emojiData.emoji)
                             setOpenEmoji(false)
                           }}
diff --git a/packages/desktop/src/rtl-tests/channel.main.test.tsx b/packages/desktop/src/rtl-tests/channel.main.test.tsx
index 2cf0685aa8..09d6022f8a 100644
--- a/packages/desktop/src/rtl-tests/channel.main.test.tsx
+++ b/packages/desktop/src/rtl-tests/channel.main.test.tsx
@@ -634,8 +634,7 @@ describe('Channel', () => {
 
     const messageInput = screen.getByTestId('messageInput')
 
-    // Why does the first letter not get entered?
-    await userEvent.type(messageInput, 'mmulti-line{Shift>}{Enter}{/Shift}message{Shift>}{Enter}{/Shift}hello')
+    await userEvent.type(messageInput, 'multi-line{Shift>}{Enter}{/Shift}message{Shift>}{Enter}{/Shift}hello')
     expect(messageInput.textContent).toBe('multi-line\nmessage\nhello')
   })
 
diff --git a/packages/e2e-tests/src/selectors.ts b/packages/e2e-tests/src/selectors.ts
index dad7cd0bd9..f567b21c89 100644
--- a/packages/e2e-tests/src/selectors.ts
+++ b/packages/e2e-tests/src/selectors.ts
@@ -7,6 +7,7 @@ export class App {
   isOpened: boolean
   constructor(buildSetupConfig?: BuildSetupInit) {
     this.buildSetup = new BuildSetup({ ...buildSetupConfig })
+    this.isOpened = false
   }
 
   get driver(): ThenableWebDriver {
@@ -252,7 +253,7 @@ export class Channel {
   }
 
   get messageInput() {
-    return this.driver.wait(until.elementLocated(By.xpath('//div[@data-testid="messageInput"]')))
+    return this.driver.wait(until.elementLocated(By.xpath('//*[@data-testid="messageInput"]')))
   }
 
   async sendMessage(message: string) {