diff --git a/src/api/gramjs/gramjsBuilders/index.ts b/src/api/gramjs/gramjsBuilders/index.ts
index bbbb3a98c..3dccbbbe6 100644
--- a/src/api/gramjs/gramjsBuilders/index.ts
+++ b/src/api/gramjs/gramjsBuilders/index.ts
@@ -294,6 +294,8 @@ export function buildMtpMessageEntity(entity: ApiMessageEntity): GramJs.TypeMess
         length,
         userId: new GramJs.InputUser({ userId: BigInt(userId!), accessHash: user!.accessHash! }),
       });
+    case ApiMessageEntityTypes.Spoiler:
+      return new GramJs.MessageEntitySpoiler({ offset, length });
     default:
       return new GramJs.MessageEntityUnknown({ offset, length });
   }
diff --git a/src/components/common/helpers/renderMessageText.tsx b/src/components/common/helpers/renderMessageText.tsx
index 482129b21..01be7df45 100644
--- a/src/components/common/helpers/renderMessageText.tsx
+++ b/src/components/common/helpers/renderMessageText.tsx
@@ -499,6 +499,8 @@ function processEntityAsHtml(
         data-entity-type="${entity.type}"
         dir="auto"
       >${renderedContent}</a>`;
+    case ApiMessageEntityTypes.Spoiler:
+      return `||${renderedContent}||`;
     default:
       return renderedContent;
   }
diff --git a/src/components/middle/composer/TextFormatter.tsx b/src/components/middle/composer/TextFormatter.tsx
index ee1aae35d..190b421cd 100644
--- a/src/components/middle/composer/TextFormatter.tsx
+++ b/src/components/middle/composer/TextFormatter.tsx
@@ -253,6 +253,12 @@ const TextFormatter: FC<OwnProps> = ({
     selectedRange, selectedTextFormats.strikethrough,
   ]);
 
+  const handleSpoilerText = useCallback(() => {
+    const text = getSelectedText();
+    document.execCommand('insertHTML', false, `||${text}||`);
+    onClose();
+  }, [getSelectedText, onClose]);
+
   const handleMonospaceText = useCallback(() => {
     if (selectedTextFormats.monospace) {
       const element = getSelectedElement();
@@ -314,6 +320,7 @@ const TextFormatter: FC<OwnProps> = ({
       i: handleItalicText,
       m: handleMonospaceText,
       s: handleStrikethroughText,
+      p: handleSpoilerText,
     };
 
     const handler = HANDLERS_BY_KEY[getKeyFromEvent(e)];
@@ -330,9 +337,8 @@ const TextFormatter: FC<OwnProps> = ({
     e.stopPropagation();
     handler();
   }, [
-    handleBoldText, handleItalicText, handleUnderlineText,
-    handleMonospaceText, handleStrikethroughText,
-    openLinkControl,
+    openLinkControl, handleBoldText, handleUnderlineText, handleItalicText, handleMonospaceText,
+    handleStrikethroughText, handleSpoilerText,
   ]);
 
   useEffect(() => {
@@ -380,6 +386,13 @@ const TextFormatter: FC<OwnProps> = ({
       onKeyDown={handleContainerKeyDown}
     >
       <div className="TextFormatter-buttons">
+        <Button
+          color="translucent"
+          ariaLabel="Spoiler text"
+          onClick={handleSpoilerText}
+        >
+          <i className="icon-eye-closed" />
+        </Button>
         <Button
           color="translucent"
           ariaLabel="Bold text"
diff --git a/src/util/parseMessageInput.ts b/src/util/parseMessageInput.ts
index 9a55a63b6..87aeb333c 100644
--- a/src/util/parseMessageInput.ts
+++ b/src/util/parseMessageInput.ts
@@ -96,6 +96,10 @@ function parseMarkdown(html: string) {
     /(^|\s)(?!<code[^<]*|<\/)[~]{2}([^~\n]+)[~]{2}(?![^<]*<\/code>)(\s|$)/g,
     '$1<s>$2</s>$3',
   );
+  parsedHtml = parsedHtml.replace(
+    /(^|\s)(?!<code[^<]*|<\/)[|]{2}([^|\n]+)[|]{2}(?![^<]*<\/code>)(\s|$)/g,
+    `$1<span data-entity-type="${ApiMessageEntityTypes.Spoiler}">$2</span>$3`,
+  );
 
   return parsedHtml;
 }