diff --git a/CHANGELOG b/CHANGELOG
index 121b03be32014f35fbbed37b8ce679928e94833e..7b34095af9f6e5aaff015296eb4d7e62f23dcbd1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.8.0 (unreleased)
   - Project#open_branches has been cleaned up and no longer loads entire records into memory.
   - Make build status canceled if any of the jobs was canceled and none failed
+  - Bump mail_room to 0.7.0 to fix stuck IDLE connections
   - Remove future dates from contribution calendar graph.
   - Use ActionDispatch Remote IP for Akismet checking
   - Fix error when visiting commit builds page before build was updated
diff --git a/Gemfile b/Gemfile
index 25c13fda57545713b3e9f4a1c6f47b2e76704a4f..8210f4cb3d58e10f1b8bfe3b0edc778af2aa9a71 100644
--- a/Gemfile
+++ b/Gemfile
@@ -319,7 +319,7 @@ gem "newrelic_rpm", '~> 3.14'
 
 gem 'octokit', '~> 4.3.0'
 
-gem "mail_room", "~> 0.6.1"
+gem "mail_room", "~> 0.7"
 
 gem 'email_reply_parser', '~> 0.5.8'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b1e954e0884ea9063be07fb46940f3c9ca0e02ee..5ea4347112ceb1112b16805be35422bbd167a29f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -465,7 +465,7 @@ GEM
       systemu (~> 2.6.2)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    mail_room (0.6.1)
+    mail_room (0.7.0)
     method_source (0.8.2)
     mime-types (2.99.1)
     mimemagic (0.3.0)
@@ -961,7 +961,7 @@ DEPENDENCIES
   letter_opener_web (~> 1.3.0)
   licensee (~> 8.0.0)
   loofah (~> 2.0.3)
-  mail_room (~> 0.6.1)
+  mail_room (~> 0.7)
   method_source (~> 0.8)
   minitest (~> 5.7.0)
   mousetrap-rails (~> 1.4.6)