diff --git a/Gemfile b/Gemfile
index 282c503d3c8adc222e9092983cd46e72dc5f025e..c75cd8dfb19ba2a02480a95bcd5a96d0a70a1bef 100644
--- a/Gemfile
+++ b/Gemfile
@@ -430,7 +430,7 @@ end
 gem 'octokit', '~> 4.15'
 
 # https://gitlab.com/gitlab-org/gitlab/issues/207207
-gem 'gitlab-mail_room', '~> 0.0.7', require: 'mail_room'
+gem 'gitlab-mail_room', '~> 0.0.8', require: 'mail_room'
 
 gem 'email_reply_trimmer', '~> 0.1'
 gem 'html2text'
diff --git a/Gemfile.lock b/Gemfile.lock
index 22ebab2492c449f7b98c0314266acd0db2b7591a..dea06439221e4cf560635a16b4c235aa8cd23915 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -443,7 +443,7 @@ GEM
       opentracing (~> 0.4)
       redis (> 3.0.0, < 5.0.0)
     gitlab-license (1.0.0)
-    gitlab-mail_room (0.0.7)
+    gitlab-mail_room (0.0.8)
     gitlab-markup (1.7.1)
     gitlab-net-dns (0.9.1)
     gitlab-pg_query (1.3.0)
@@ -1356,7 +1356,7 @@ DEPENDENCIES
   gitlab-fog-azure-rm (~> 1.0)
   gitlab-labkit (= 0.13.3)
   gitlab-license (~> 1.0)
-  gitlab-mail_room (~> 0.0.7)
+  gitlab-mail_room (~> 0.0.8)
   gitlab-markup (~> 1.7.1)
   gitlab-net-dns (~> 0.9.1)
   gitlab-pg_query (~> 1.3)
diff --git a/changelogs/unreleased/sh-upgrade-mailroom-0-0-8.yml b/changelogs/unreleased/sh-upgrade-mailroom-0-0-8.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7fc59cce7a1972f3bcd2aef6e67f2b24cdf19e36
--- /dev/null
+++ b/changelogs/unreleased/sh-upgrade-mailroom-0-0-8.yml
@@ -0,0 +1,5 @@
+---
+title: Upgrade mailroom to v0.0.8
+merge_request: 49834
+author:
+type: fixed