diff --git a/Gemfile b/Gemfile
index 65c631563..38a19fa1a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,7 +10,6 @@ gem "govuk_app_config"
 gem "govuk_personalisation"
 gem "govuk_publishing_components"
 gem "htmlentities"
-gem "mail", "~> 2.7.1"  # TODO: remove once https://github.com/mikel/mail/issues/1489 is fixed.
 gem "plek"
 gem "rails-controller-testing"
 gem "rails-i18n"
diff --git a/Gemfile.lock b/Gemfile.lock
index 9a0148dcb..2e26dd5f6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -185,8 +185,11 @@ GEM
     loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.0.1)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
@@ -409,7 +412,6 @@ DEPENDENCIES
   govuk_test
   htmlentities
   i18n-coverage
-  mail (~> 2.7.1)
   minitest-reporters
   mocha
   plek