diff --git a/src/components/common/messaging/MessageBase.tsx b/src/components/common/messaging/MessageBase.tsx
index cd9d4b8c10729cabfc69df2182b6cfb574a0e40a..6efa2284ef5da40c60de4394872de5e870899b22 100644
--- a/src/components/common/messaging/MessageBase.tsx
+++ b/src/components/common/messaging/MessageBase.tsx
@@ -133,7 +133,7 @@ export const MessageContent = styled.div`
     min-width: 0;
     flex-grow: 1;
     display: flex;
-    overflow: hidden;
+    // overflow: hidden;
     font-size: .875rem;
     flex-direction: column;
     justify-content: center;
diff --git a/src/pages/channels/messaging/MessageEditor.tsx b/src/pages/channels/messaging/MessageEditor.tsx
index e177736cbf1ce32364e83315d95865ba681a1e63..7e8ecd17195f28cbc79825a1bdff7dd8c2c82fda 100644
--- a/src/pages/channels/messaging/MessageEditor.tsx
+++ b/src/pages/channels/messaging/MessageEditor.tsx
@@ -5,6 +5,7 @@ import { useContext, useEffect, useState } from "preact/hooks";
 import { AppContext } from "../../../context/revoltjs/RevoltClient";
 import { isTouchscreenDevice } from "../../../lib/isTouchscreenDevice";
 import { IntermediateContext, useIntermediate } from "../../../context/intermediate/Intermediate";
+import AutoComplete, { useAutoComplete } from "../../../components/common/AutoComplete";
 
 const EditorBase = styled.div`
     display: flex;
@@ -13,6 +14,7 @@ const EditorBase = styled.div`
     textarea {
         resize: none;
         padding: 12px;
+        font-size: .875rem;
         border-radius: 3px;
         white-space: pre-wrap;
         background: var(--secondary-header);
@@ -70,16 +72,27 @@ export default function MessageEditor({ message, finish }: Props) {
         return () => document.body.removeEventListener("keyup", keyUp);
     }, [focusTaken]);
 
+    const { onChange, onKeyUp, onKeyDown, onFocus, onBlur, ...autoCompleteProps } =
+        useAutoComplete(v => setContent(v ?? ''), {
+            users: { type: 'all' }
+        });
+
     return (
         <EditorBase>
+            <AutoComplete detached {...autoCompleteProps} />
             <TextAreaAutoSize
                 forceFocus
                 maxRows={3}
                 padding={12}
                 value={content}
                 maxLength={2000}
-                onChange={ev => setContent(ev.currentTarget.value)}
+                onChange={ev => {
+                    onChange(ev);
+                    setContent(ev.currentTarget.value)
+                }}
                 onKeyDown={e => {
+                    if (onKeyDown(e)) return;
+
                     if (
                         !e.shiftKey &&
                         e.key === "Enter" &&
@@ -89,6 +102,9 @@ export default function MessageEditor({ message, finish }: Props) {
                         save();
                     }
                 }}
+                onKeyUp={onKeyUp}
+                onFocus={onFocus}
+                onBlur={onBlur}
             />
             <span className="caption">
                 escape to <a onClick={finish}>cancel</a> &middot;