diff --git a/app/soapbox/components/status.tsx b/app/soapbox/components/status.tsx
index 812f8d377..c3417c35e 100644
--- a/app/soapbox/components/status.tsx
+++ b/app/soapbox/components/status.tsx
@@ -342,7 +342,7 @@ class Status extends ImmutablePureComponent<IStatus, IStatusState> {
   render() {
     let media = null;
     const poll = null;
-    let prepend, rebloggedByText, reblogContent, reblogElement, reblogElementMobile;
+    let prepend, rebloggedByText, reblogElement, reblogElementMobile;
 
     const { intl, hidden, featured, unread, group } = this.props;
 
@@ -447,7 +447,6 @@ class Status extends ImmutablePureComponent<IStatus, IStatusState> {
 
       // @ts-ignore what the FUCK
       account = status.account;
-      reblogContent = status.contentHtml;
       status = status.reblog;
     }
 
@@ -646,7 +645,6 @@ class Status extends ImmutablePureComponent<IStatus, IStatusState> {
 
               <StatusContent
                 status={status}
-                reblogContent={reblogContent}
                 onClick={this.handleClick}
                 expanded={!status.hidden}
                 onExpandedToggle={this.handleExpandedToggle}
diff --git a/app/soapbox/components/status_content.js b/app/soapbox/components/status_content.js
deleted file mode 100644
index 663480a75..000000000
--- a/app/soapbox/components/status_content.js
+++ /dev/null
@@ -1,297 +0,0 @@
-import classnames from 'classnames';
-import PropTypes from 'prop-types';
-import React from 'react';
-import ImmutablePropTypes from 'react-immutable-proptypes';
-import { FormattedMessage } from 'react-intl';
-import { connect } from 'react-redux';
-import { withRouter } from 'react-router-dom';
-
-import { getSoapboxConfig } from 'soapbox/actions/soapbox';
-import Icon from 'soapbox/components/icon';
-import Poll from 'soapbox/components/poll';
-import { addGreentext } from 'soapbox/utils/greentext';
-import { onlyEmoji } from 'soapbox/utils/rich_content';
-
-import { isRtl } from '../rtl';
-
-import Permalink from './permalink';
-
-const MAX_HEIGHT = 642; // 20px * 32 (+ 2px padding at the top)
-const BIG_EMOJI_LIMIT = 10;
-
-const mapStateToProps = state => ({
-  greentext: getSoapboxConfig(state).get('greentext'),
-});
-
-export default @connect(mapStateToProps)
-@withRouter
-class StatusContent extends React.PureComponent {
-
-  static propTypes = {
-    status: ImmutablePropTypes.record.isRequired,
-    reblogContent: PropTypes.string,
-    expanded: PropTypes.bool,
-    onExpandedToggle: PropTypes.func,
-    onClick: PropTypes.func,
-    collapsable: PropTypes.bool,
-    greentext: PropTypes.bool,
-    history: PropTypes.object,
-  };
-
-  state = {
-    hidden: true,
-    collapsed: null, //  `collapsed: null` indicates that an element doesn't need collapsing, while `true` or `false` indicates that it does (and is/isn't).
-  };
-
-  _updateStatusLinks() {
-    const node = this.node;
-
-    if (!node) {
-      return;
-    }
-
-    const links = node.querySelectorAll('a');
-
-    for (let i = 0; i < links.length; ++i) {
-      const link = links[i];
-      if (link.classList.contains('status-link')) {
-        continue;
-      }
-      link.classList.add('status-link');
-      link.setAttribute('rel', 'nofollow noopener');
-      link.setAttribute('target', '_blank');
-
-      const mention = this.props.status.get('mentions').find(item => link.href === `${item.get('url')}`);
-
-      if (mention) {
-        link.addEventListener('click', this.onMentionClick.bind(this, mention), false);
-        link.setAttribute('title', mention.get('acct'));
-      } else if (link.textContent[0] === '#' || (link.previousSibling && link.previousSibling.textContent && link.previousSibling.textContent[link.previousSibling.textContent.length - 1] === '#')) {
-        link.addEventListener('click', this.onHashtagClick.bind(this, link.text), false);
-      } else {
-        link.setAttribute('title', link.href);
-      }
-    }
-  }
-
-  setCollapse() {
-    const node = this.node;
-
-    if (!node) {
-      return;
-    }
-
-    if (
-      this.props.collapsable
-      && this.props.onClick
-      && this.state.collapsed === null
-      && this.props.status.get('spoiler_text').length === 0
-    ) {
-      if (node.clientHeight > MAX_HEIGHT) {
-        this.setState({ collapsed: true });
-      }
-    }
-  }
-
-  setOnlyEmoji = () => {
-    if (!this.node) return;
-    const only = onlyEmoji(this.node, BIG_EMOJI_LIMIT, true);
-
-    if (only !== this.state.onlyEmoji) {
-      this.setState({ onlyEmoji: only });
-    }
-  }
-
-  refresh = () => {
-    this.setCollapse();
-    this._updateStatusLinks();
-    this.setOnlyEmoji();
-  }
-
-  componentDidMount() {
-    this.refresh();
-  }
-
-  componentDidUpdate() {
-    this.refresh();
-  }
-
-  onMentionClick = (mention, e) => {
-    if (this.props.history && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-      this.props.history.push(`/@${mention.get('acct')}`);
-    }
-  }
-
-  onHashtagClick = (hashtag, e) => {
-    hashtag = hashtag.replace(/^#/, '').toLowerCase();
-
-    if (this.props.history && e.button === 0 && !(e.ctrlKey || e.metaKey)) {
-      e.preventDefault();
-      this.props.history.push(`/tags/${hashtag}`);
-    }
-  }
-
-  handleMouseDown = (e) => {
-    this.startXY = [e.clientX, e.clientY];
-  }
-
-  handleMouseUp = (e) => {
-    if (!this.startXY) {
-      return;
-    }
-
-    const [ startX, startY ] = this.startXY;
-    const [ deltaX, deltaY ] = [Math.abs(e.clientX - startX), Math.abs(e.clientY - startY)];
-
-    if (e.target.localName === 'button' || e.target.localName === 'a' || (e.target.parentNode && (e.target.parentNode.localName === 'button' || e.target.parentNode.localName === 'a'))) {
-      return;
-    }
-
-    if (deltaX + deltaY < 5 && e.button === 0 && this.props.onClick) {
-      this.props.onClick();
-    }
-
-    this.startXY = null;
-  }
-
-  handleSpoilerClick = (e) => {
-    e.preventDefault();
-
-    if (this.props.onExpandedToggle) {
-      // The parent manages the state
-      this.props.onExpandedToggle();
-    } else {
-      this.setState({ hidden: !this.state.hidden });
-    }
-  }
-
-  handleCollapsedClick = (e) => {
-    e.preventDefault();
-    this.setState({ collapsed: !this.state.collapsed });
-  }
-
-  setRef = (c) => {
-    this.node = c;
-  }
-
-  parseHtml = html => {
-    const { greentext } = this.props;
-    if (greentext) return addGreentext(html);
-    return html;
-  }
-
-  getHtmlContent = () => {
-    const { status } = this.props;
-    const html = status.get('contentHtml');
-    return this.parseHtml(html);
-  }
-
-  render() {
-    const { status } = this.props;
-    const { onlyEmoji } = this.state;
-
-    if (status.get('content').length === 0) {
-      return null;
-    }
-
-    const hidden = this.props.onExpandedToggle ? !this.props.expanded : this.state.hidden;
-
-    const content = { __html: this.getHtmlContent() };
-    const spoilerContent = { __html: status.get('spoilerHtml') };
-    const directionStyle = { direction: 'ltr' };
-    const classNames = classnames('status__content', {
-      'status__content--with-action': this.props.onClick && this.props.history,
-      'status__content--with-spoiler': status.get('spoiler_text').length > 0,
-      'status__content--collapsed': this.state.collapsed === true,
-      'status__content--big': onlyEmoji,
-    });
-
-    if (isRtl(status.get('search_index'))) {
-      directionStyle.direction = 'rtl';
-    }
-
-    const readMoreButton = (
-      <button className='status__content__read-more-button' onClick={this.props.onClick} key='read-more'>
-        <FormattedMessage id='status.read_more' defaultMessage='Read more' /><Icon id='angle-right' fixedWidth />
-      </button>
-    );
-
-    if (status.get('spoiler_text').length > 0) {
-      let mentionsPlaceholder = '';
-
-      const mentionLinks = status.get('mentions').map(item => (
-        <Permalink to={`/@${item.get('acct')}`} href={`/@${item.get('acct')}`} key={item.get('id')} className='mention'>
-          @<span>{item.get('username')}</span>
-        </Permalink>
-      )).reduce((aggregate, item) => [...aggregate, item, ' '], []);
-
-      const toggleText = hidden ? <FormattedMessage id='status.show_more' defaultMessage='Show more' /> : <FormattedMessage id='status.show_less' defaultMessage='Show less' />;
-
-      if (hidden) {
-        mentionsPlaceholder = <div>{mentionLinks}</div>;
-      }
-
-      return (
-        <div className={classNames} ref={this.setRef} tabIndex='0' style={directionStyle} onMouseDown={this.handleMouseDown} onMouseUp={this.handleMouseUp}>
-          <p style={{ marginBottom: hidden && status.get('mentions').isEmpty() ? '0px' : null }}>
-            <span dangerouslySetInnerHTML={spoilerContent} lang={status.get('language')} />
-            {' '}
-            <button tabIndex='0' className={`status__content__spoiler-link ${hidden ? 'status__content__spoiler-link--show-more' : 'status__content__spoiler-link--show-less'}`} onClick={this.handleSpoilerClick}>{toggleText}</button>
-          </p>
-
-          {mentionsPlaceholder}
-
-          <div tabIndex={!hidden ? 0 : null} className={`status__content__text ${!hidden ? 'status__content__text--visible' : ''}`} style={directionStyle} dangerouslySetInnerHTML={content} lang={status.get('language')} />
-
-          {!hidden && !!status.get('poll') && <Poll id={status.get('poll')} status={status.get('url')} />}
-        </div>
-      );
-    } else if (this.props.onClick) {
-      const output = [
-        <div
-          ref={this.setRef}
-          tabIndex='0'
-          key='content'
-          className={classNames}
-          style={directionStyle}
-          dangerouslySetInnerHTML={content}
-          lang={status.get('language')}
-          onMouseDown={this.handleMouseDown}
-          onMouseUp={this.handleMouseUp}
-        />,
-      ];
-
-      if (this.state.collapsed) {
-        output.push(readMoreButton);
-      }
-
-      if (status.get('poll')) {
-        output.push(<Poll id={status.get('poll')} key='poll' status={status.get('url')} />);
-      }
-
-      return output;
-    } else {
-      const output = [
-        <div
-          ref={this.setRef}
-          tabIndex='0'
-          key='content'
-          className={classnames('status__content', {
-            'status__content--big': onlyEmoji,
-          })}
-          style={directionStyle}
-          dangerouslySetInnerHTML={content}
-          lang={status.get('language')}
-        />,
-      ];
-
-      if (status.get('poll')) {
-        output.push(<Poll id={status.get('poll')} key='poll' status={status.get('url')} />);
-      }
-
-      return output;
-    }
-  }
-
-}
diff --git a/app/soapbox/components/status_content.tsx b/app/soapbox/components/status_content.tsx
new file mode 100644
index 000000000..ef53d55a0
--- /dev/null
+++ b/app/soapbox/components/status_content.tsx
@@ -0,0 +1,296 @@
+import classNames from 'classnames';
+import React, { useState, useRef, useEffect } from 'react';
+import { FormattedMessage } from 'react-intl';
+import { useHistory } from 'react-router-dom';
+
+import Icon from 'soapbox/components/icon';
+import Poll from 'soapbox/components/poll';
+import { useSoapboxConfig } from 'soapbox/hooks';
+import { addGreentext } from 'soapbox/utils/greentext';
+import { onlyEmoji as isOnlyEmoji } from 'soapbox/utils/rich_content';
+
+import { isRtl } from '../rtl';
+
+import type { Status, Mention } from 'soapbox/types/entities';
+
+const MAX_HEIGHT = 642; // 20px * 32 (+ 2px padding at the top)
+const BIG_EMOJI_LIMIT = 10;
+
+type Point = [
+  x: number,
+  y: number,
+]
+
+interface IReadMoreButton {
+  onClick: React.MouseEventHandler,
+}
+
+/** Button to expand a truncated status (due to too much content) */
+const ReadMoreButton: React.FC<IReadMoreButton> = ({ onClick }) => (
+  <button className='status__content__read-more-button' onClick={onClick}>
+    <FormattedMessage id='status.read_more' defaultMessage='Read more' />
+    <Icon id='angle-right' fixedWidth />
+  </button>
+);
+
+interface ISpoilerButton {
+  onClick: React.MouseEventHandler,
+  hidden: boolean,
+  tabIndex?: number,
+}
+
+/** Button to expand status text behind a content warning */
+const SpoilerButton: React.FC<ISpoilerButton> = ({ onClick, hidden, tabIndex }) => (
+  <button
+    tabIndex={tabIndex}
+    className={classNames(
+      'inline-block rounded-md px-1.5 py-0.5 ml-[0.5em]',
+      'text-black dark:text-white',
+      'font-bold text-[11px] uppercase',
+      'bg-primary-100 dark:bg-primary-900',
+      'hover:bg-primary-300 dark:hover:bg-primary-600',
+      'focus:bg-primary-200 dark:focus:bg-primary-600',
+      'hover:no-underline',
+      'duration-100',
+    )}
+    onClick={onClick}
+  >
+    {hidden ? (
+      <FormattedMessage id='status.show_more' defaultMessage='Show more' />
+    ) : (
+      <FormattedMessage id='status.show_less' defaultMessage='Show less' />
+    )}
+  </button>
+);
+
+interface IStatusContent {
+  status: Status,
+  expanded?: boolean,
+  onExpandedToggle?: () => void,
+  onClick?: () => void,
+  collapsable?: boolean,
+}
+
+/** Renders the text content of a status */
+const StatusContent: React.FC<IStatusContent> = ({ status, expanded = false, onExpandedToggle, onClick, collapsable = false }) => {
+  const history = useHistory();
+
+  const [hidden, setHidden] = useState(true);
+  const [collapsed, setCollapsed] = useState(false);
+  const [onlyEmoji, setOnlyEmoji] = useState(false);
+
+  const startXY = useRef<Point>();
+  const node = useRef<HTMLDivElement>(null);
+
+  const { greentext } = useSoapboxConfig();
+
+  const onMentionClick = (mention: Mention, e: MouseEvent) => {
+    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+      e.preventDefault();
+      history.push(`/@${mention.acct}`);
+    }
+  };
+
+  const onHashtagClick = (hashtag: string, e: MouseEvent) => {
+    hashtag = hashtag.replace(/^#/, '').toLowerCase();
+
+    if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
+      e.preventDefault();
+      history.push(`/tags/${hashtag}`);
+    }
+  };
+
+  const updateStatusLinks = () => {
+    if (!node.current) return;
+
+    const links = node.current.querySelectorAll('a');
+
+    links.forEach(link => {
+      // Skip already processed
+      if (link.classList.contains('status-link')) return;
+
+      // Add attributes
+      link.classList.add('status-link');
+      link.setAttribute('rel', 'nofollow noopener');
+      link.setAttribute('target', '_blank');
+
+      const mention = status.mentions.find(mention => link.href === `${mention.url}`);
+
+      // Add event listeners on mentions and hashtags
+      if (mention) {
+        link.addEventListener('click', onMentionClick.bind(link, mention), false);
+        link.setAttribute('title', mention.acct);
+      } else if (link.textContent?.charAt(0) === '#' || (link.previousSibling?.textContent?.charAt(link.previousSibling.textContent.length - 1) === '#')) {
+        link.addEventListener('click', onHashtagClick.bind(link, link.text), false);
+      } else {
+        link.setAttribute('title', link.href);
+      }
+    });
+  };
+
+  const maybeSetCollapsed = (): void => {
+    if (!node.current) return;
+
+    if (collapsable && onClick && !collapsed && status.spoiler_text.length === 0) {
+      if (node.current.clientHeight > MAX_HEIGHT) {
+        setCollapsed(true);
+      }
+    }
+  };
+
+  const maybeSetOnlyEmoji = (): void => {
+    if (!node.current) return;
+    const only = isOnlyEmoji(node.current, BIG_EMOJI_LIMIT, true);
+
+    if (only !== onlyEmoji) {
+      setOnlyEmoji(only);
+    }
+  };
+
+  const refresh = (): void => {
+    maybeSetCollapsed();
+    maybeSetOnlyEmoji();
+    updateStatusLinks();
+  };
+
+  useEffect(() => {
+    refresh();
+  });
+
+  const handleMouseDown: React.EventHandler<React.MouseEvent> = (e) => {
+    startXY.current = [e.clientX, e.clientY];
+  };
+
+  const handleMouseUp: React.EventHandler<React.MouseEvent> = (e) => {
+    if (!startXY.current) return;
+    const target = e.target as HTMLElement;
+    const parentNode = target.parentNode as HTMLElement;
+
+    const [ startX, startY ] = startXY.current;
+    const [ deltaX, deltaY ] = [Math.abs(e.clientX - startX), Math.abs(e.clientY - startY)];
+
+    if (target.localName === 'button' || target.localName === 'a' || (parentNode && (parentNode.localName === 'button' || parentNode.localName === 'a'))) {
+      return;
+    }
+
+    if (deltaX + deltaY < 5 && e.button === 0 && onClick) {
+      onClick();
+    }
+
+    startXY.current = undefined;
+  };
+
+  const handleSpoilerClick: React.EventHandler<React.MouseEvent> = (e) => {
+    e.preventDefault();
+    e.stopPropagation();
+
+    if (onExpandedToggle) {
+      // The parent manages the state
+      onExpandedToggle();
+    } else {
+      setHidden(!hidden);
+    }
+  };
+
+  const getHtmlContent = (): string => {
+    const { contentHtml: html } = status;
+    if (greentext) return addGreentext(html);
+    return html;
+  };
+
+  if (status.content.length === 0) {
+    return null;
+  }
+
+  const isHidden = onExpandedToggle ? !expanded : hidden;
+
+  const content = { __html: getHtmlContent() };
+  const spoilerContent = { __html: status.spoilerHtml };
+  const directionStyle: React.CSSProperties = { direction: 'ltr' };
+  const className = classNames('status__content', {
+    'status__content--with-action': onClick,
+    'status__content--with-spoiler': status.spoiler_text.length > 0,
+    'status__content--collapsed': collapsed,
+    'status__content--big': onlyEmoji,
+  });
+
+  if (isRtl(status.search_index)) {
+    directionStyle.direction = 'rtl';
+  }
+
+  if (status.spoiler_text.length > 0) {
+    return (
+      <div className={className} ref={node} tabIndex={0} style={directionStyle} onMouseDown={handleMouseDown} onMouseUp={handleMouseUp}>
+        <p style={{ marginBottom: isHidden && status.mentions.isEmpty() ? 0 : undefined }}>
+          <span dangerouslySetInnerHTML={spoilerContent} lang={status.language || undefined} />
+
+          <SpoilerButton
+            tabIndex={0}
+            onClick={handleSpoilerClick}
+            hidden={isHidden}
+          />
+        </p>
+
+        <div
+          tabIndex={!isHidden ? 0 : undefined}
+          className={classNames('status__content__text', {
+            'status__content__text--visible': !isHidden,
+          })}
+          style={directionStyle}
+          dangerouslySetInnerHTML={content}
+          lang={status.language || undefined}
+        />
+
+        {!isHidden && status.poll && typeof status.poll === 'string' && (
+          <Poll id={status.poll} status={status.url} />
+        )}
+      </div>
+    );
+  } else if (onClick) {
+    const output = [
+      <div
+        ref={node}
+        tabIndex={0}
+        key='content'
+        className={className}
+        style={directionStyle}
+        dangerouslySetInnerHTML={content}
+        lang={status.language || undefined}
+        onMouseDown={handleMouseDown}
+        onMouseUp={handleMouseUp}
+      />,
+    ];
+
+    if (collapsed) {
+      output.push(<ReadMoreButton onClick={onClick} key='read-more' />);
+    }
+
+    if (status.poll && typeof status.poll === 'string') {
+      output.push(<Poll id={status.poll} key='poll' status={status.url} />);
+    }
+
+    return <>{output}</>;
+  } else {
+    const output = [
+      <div
+        ref={node}
+        tabIndex={0}
+        key='content'
+        className={classNames('status__content', {
+          'status__content--big': onlyEmoji,
+        })}
+        style={directionStyle}
+        dangerouslySetInnerHTML={content}
+        lang={status.language || undefined}
+      />,
+    ];
+
+    if (status.poll && typeof status.poll === 'string') {
+      output.push(<Poll id={status.poll} key='poll' status={status.url} />);
+    }
+
+    return <>{output}</>;
+  }
+};
+
+export default StatusContent;