diff --git a/app/javascript/styles/mastodon/rich_text.scss b/app/javascript/styles/mastodon/rich_text.scss
index c77c23bc4..5bab6e13f 100644
--- a/app/javascript/styles/mastodon/rich_text.scss
+++ b/app/javascript/styles/mastodon/rich_text.scss
@@ -54,6 +54,32 @@
   ol {
     list-style-type: decimal;
   }
+
+  h1 {
+    font-size: 1.5em;
+    font-weight: 700;
+    margin: 1em 0;
+  }
+
+  h2 {
+    font-size: 1.25em;
+    font-weight: 700;
+    margin: 1em 0;
+  }
+
+  h3 {
+    font-size: 1.125em;
+    font-weight: 700;
+    margin: 1em 0;
+  }
+
+  h4,
+  h5,
+  h6 {
+    font-size: 1em;
+    font-weight: 700;
+    margin: 1em 0;
+  }
 }
 
 .reply-indicator__content {
diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb
index d5497dbdd..a4cbee40f 100644
--- a/app/lib/activitypub/activity/create.rb
+++ b/app/lib/activitypub/activity/create.rb
@@ -78,8 +78,8 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     @silenced_account_ids = []
     @params               = {}
 
-    process_inline_images if @object['content'].present? && @object['type'] == 'Article'
     process_status_params
+    process_inline_images if @object['content'].present? && @object['type'] == 'Article'
     process_tags
     process_audience
 
@@ -117,7 +117,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
       account: @account,
       text: converted_object_type? ? converted_text : (@status_parser.text || ''),
       language: @status_parser.language,
-      spoiler_text: converted_object_type? ? '' : (@status_parser.spoiler_text || (@object['type'] == 'Article' && text_from_name) || ''),
+      spoiler_text: converted_object_type? ? '' : ((@object['type'] == 'Article' && text_from_name) || @status_parser.spoiler_text || ''),
       created_at: @status_parser.created_at,
       edited_at: @status_parser.edited_at && @status_parser.edited_at != @status_parser.created_at ? @status_parser.edited_at : nil,
       override_timestamps: @options[:override_timestamps],
@@ -132,14 +132,15 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
     }
   end
 
-  class Handler < ::Ox::Sax
-    attr_reader :srcs, :alts
+  class TextHandler < ::Ox::Sax
+    attr_reader :srcs, :alts, :original_srcs
 
-    def initialize(_block)
+    def initialize
       super
       @stack = []
       @srcs = []
       @alts = {}
+      @original_srcs = []
     end
 
     def start_element(element_name)
@@ -148,8 +149,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
 
     def end_element(_element_name)
       self_name, self_attributes = @stack[-1]
+      # Create a list of image srcs and their alt text
       if self_name == :img && !self_attributes[:src].nil?
         @srcs << self_attributes[:src]
+        @original_srcs << self_attributes[:src].clone
         @alts[self_attributes[:src]] = self_attributes[:alt]
       end
       @stack.pop
@@ -163,11 +166,10 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
   end
 
   def process_inline_images
-    proc = proc { |name| Rails.logger.debug name }
-    handler = Handler.new(proc)
+    handler = TextHandler.new
     Ox.sax_parse(handler, @object['content'])
     handler.srcs.each do |src|
-      # Handle images where the src is formatted as "/foo/bar.png"
+      # Handle images where the src is formatted as "/foo/bar.biz"
       # we assume that the `url` field is populated which lets us infer
       # the protocol and domain of the _original_ article, as though
       # we were looking at it via a web browser
@@ -176,11 +178,15 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
         src = site + src
       end
 
+      # if media is set to reject from this domain, replace the src with an empty string
       if skip_download?
         @object['content'].gsub!(src, '')
         next
       end
 
+      # Create a local proxy media file for each image in the post
+      # TODO: what about <video> or <audio> elements? should we handle them?
+      # TODO: is there a max number of images we should be handling? maybe if there's more than that or there is just too much rich media, we should not render the post at all and do a converted stub?
       media_attachment = MediaAttachment.create(account: @account, remote_url: src, description: handler.alts[src], focus: nil)
       media_attachment.download_file!
       media_attachment.save
@@ -323,6 +329,12 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
       next if media_attachment_parser.remote_url.blank? || media_attachments.size >= 4
 
       begin
+        # get the src values of embedded images in a post, skip creating attachments for them since
+        # they will have attachments created in the process_inline_images method
+        handler = TextHandler.new
+        Ox.sax_parse(handler, @object['content'])
+        next if handler.original_srcs.include?(media_attachment_parser.remote_url)
+
         media_attachment = MediaAttachment.create(
           account: @account,
           remote_url: media_attachment_parser.remote_url,
diff --git a/app/lib/activitypub/activity/update.rb b/app/lib/activitypub/activity/update.rb
index 973706f59..fcfa148a9 100644
--- a/app/lib/activitypub/activity/update.rb
+++ b/app/lib/activitypub/activity/update.rb
@@ -8,7 +8,7 @@ class ActivityPub::Activity::Update < ActivityPub::Activity
 
     if equals_or_includes_any?(@object['type'], %w(Application Group Organization Person Service))
       update_account
-    elsif equals_or_includes_any?(@object['type'], %w(Note Question))
+    elsif equals_or_includes_any?(@object['type'], %w(Note Question Article))
       update_status
     elsif converted_object_type?
       Status.find_by(uri: object_uri, account_id: @account.id)
diff --git a/app/lib/activitypub/parser/status_parser.rb b/app/lib/activitypub/parser/status_parser.rb
index 6699dc21b..cfa3adbe6 100644
--- a/app/lib/activitypub/parser/status_parser.rb
+++ b/app/lib/activitypub/parser/status_parser.rb
@@ -31,7 +31,9 @@ class ActivityPub::Parser::StatusParser
   end
 
   def text
-    if @object['content'].present?
+    if @object['content'].present? && @object['name'].present?
+      @object['content'].prepend("<h1>#{@object['name']}</h1>")
+    elsif @object['content'].present?
       @object['content']
     elsif content_language_map?
       @object['contentMap'].values.first
diff --git a/lib/sanitize_ext/sanitize_config.rb b/lib/sanitize_ext/sanitize_config.rb
index 85acb7cd8..91454fc35 100644
--- a/lib/sanitize_ext/sanitize_config.rb
+++ b/lib/sanitize_ext/sanitize_config.rb
@@ -55,26 +55,17 @@ class Sanitize
       current_node.replace(Nokogiri::XML::Text.new(current_node.text, current_node.document)) unless LINK_PROTOCOLS.include?(scheme)
     end
 
-    UNSUPPORTED_ELEMENTS_TRANSFORMER = lambda do |env|
-      return unless %w(h6).include?(env[:node_name])
-
-      current_node = env[:node]
-
-      current_node.name = 'strong'
-      current_node.wrap('<p></p>')
-    end
-
     MASTODON_STRICT ||= freeze_config(
-      elements: %w(p br span a abbr del pre blockquote code b strong i em h1 h2 h3 h4 h5 ul ol li img u),
+      elements: %w(p br span a del s pre blockquote code b strong i em ul ol li ruby rt rp img h1 h2 h3 h4 h5 h6),
 
       attributes: {
-        'abbr' => %w(title),
-        'blockquote' => %w(cite),
-        'img' => %w(src alt),
         'a' => %w(href rel class translate title),
         'span' => %w(class translate),
         'ol' => %w(start reversed),
         'li' => %w(value),
+        'img' => %w(src alt title),
+        'abbr' => %w(title),
+        'blockquote' => %w(cite),
       },
 
       add_attributes: {
@@ -84,12 +75,14 @@ class Sanitize
         },
       },
 
-      protocols: {},
+      protocols: {
+        'a' => { 'href' => HTTP_PROTOCOLS },
+        'blockquote' => { 'cite' => HTTP_PROTOCOLS },
+      },
 
       transformers: [
         CLASS_WHITELIST_TRANSFORMER,
         TRANSLATE_TRANSFORMER,
-        UNSUPPORTED_ELEMENTS_TRANSFORMER,
         UNSUPPORTED_HREF_TRANSFORMER,
       ]
     )