diff --git a/Gemfile b/Gemfile
index 9327840c..571e4098 100644
--- a/Gemfile
+++ b/Gemfile
@@ -63,7 +63,7 @@ gem 'barnes'
 #gem 'levenshtein-ffi'
 
 # Forum
-gem 'thredded'
+gem 'thredded', git: 'https://github.com/indentlabs/thredded.git', branch: 'feature/report-posts'
 gem 'rails-ujs'
 
 # Workers
diff --git a/Gemfile.lock b/Gemfile.lock
index 60802fc5..8f9da3b6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,6 +4,33 @@ GIT
   specs:
     serendipitous (0.0.2)
 
+GIT
+  remote: https://github.com/indentlabs/thredded.git
+  revision: 4578ebb60d258cb8dc67dae1d1d1476526519ed0
+  branch: feature/report-posts
+  specs:
+    thredded (0.16.8)
+      active_record_union (>= 1.3.0)
+      autoprefixer-rails
+      db_text_search (~> 0.3.0)
+      friendly_id
+      html-pipeline
+      htmlentities
+      inline_svg
+      kaminari
+      kramdown (>= 2.0.0)
+      kramdown-parser-gfm
+      nokogiri
+      onebox (~> 1.8, >= 1.8.48)
+      pundit (>= 1.1.0)
+      rails (>= 4.2.10)
+      rb-gravatar
+      rinku
+      sanitize
+      sassc-rails (>= 2.0.0)
+      sprockets-es6
+      timeago_js
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -58,7 +85,7 @@ GEM
     ast (2.4.0)
     authority (3.3.0)
       activesupport (>= 3.0.0)
-    autoprefixer-rails (9.4.5)
+    autoprefixer-rails (9.4.8)
       execjs
     aws-eventstream (1.0.1)
     aws-partitions (1.131.0)
@@ -235,7 +262,9 @@ GEM
       activerecord
       kaminari-core (= 1.1.1)
     kaminari-core (1.1.1)
-    kramdown (1.17.0)
+    kramdown (2.1.0)
+    kramdown-parser-gfm (1.0.1)
+      kramdown (~> 2.0)
     libv8 (6.7.288.46.1)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -285,7 +314,7 @@ GEM
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    onebox (1.8.76)
+    onebox (1.8.78)
       htmlentities (~> 4.3)
       moneta (~> 1.0)
       multi_json (~> 1.11)
@@ -313,7 +342,7 @@ GEM
     puma (3.12.0)
     puma-heroku (1.0.0)
       puma (~> 3.0)
-    pundit (2.0.0)
+    pundit (2.0.1)
       activesupport (>= 3.0.0)
     rack (2.0.6)
     rack-mini-profiler (1.0.1)
@@ -389,7 +418,7 @@ GEM
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
-    rinku (2.0.4)
+    rinku (2.0.5)
     rmagick (2.16.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -494,26 +523,6 @@ GEM
       climate_control (>= 0.0.3, < 1.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    thredded (0.16.4)
-      active_record_union (>= 1.3.0)
-      autoprefixer-rails
-      db_text_search (~> 0.3.0)
-      friendly_id
-      html-pipeline
-      htmlentities
-      inline_svg
-      kaminari
-      kramdown (>= 1.17.0)
-      nokogiri
-      onebox (~> 1.8, >= 1.8.48)
-      pundit (>= 1.1.0)
-      rails (>= 4.2.10)
-      rb-gravatar
-      rinku
-      sanitize
-      sassc-rails (>= 2.0.0)
-      sprockets-es6
-      timeago_js
     tilt (2.0.9)
     timeago_js (3.0.2)
     tzinfo (1.2.5)
@@ -609,7 +618,7 @@ DEPENDENCIES
   stackprof
   stripe
   stripe_event
-  thredded
+  thredded!
   tzinfo-data
   uglifier (>= 1.3.0)
   web-console
@@ -619,4 +628,4 @@ RUBY VERSION
    ruby 2.5.1p57
 
 BUNDLED WITH
-   1.16.4
+   1.17.3